From 5cd30c9ab1330e4586506343362ee96de8ee0e1f Mon Sep 17 00:00:00 2001
From: Valentyne Stigloher <pixunil@posteo.eu>
Date: Sat, 12 Oct 2024 19:24:41 +0200
Subject: [PATCH] (fix) pronoun group display for any pronouns with a group

---
 ...tegory.vue => ExampleCategoryListItem.vue} |   0
 components/PronounGroup.vue                   |  13 +-
 pages/pronouns/any.vue                        | 168 +++++++++---------
 pages/pronouns/pronoun.vue                    |   2 +-
 4 files changed, 94 insertions(+), 89 deletions(-)
 rename components/{ExampleCategory.vue => ExampleCategoryListItem.vue} (100%)

diff --git a/components/ExampleCategory.vue b/components/ExampleCategoryListItem.vue
similarity index 100%
rename from components/ExampleCategory.vue
rename to components/ExampleCategoryListItem.vue
diff --git a/components/PronounGroup.vue b/components/PronounGroup.vue
index cbe13550b..1499762a6 100644
--- a/components/PronounGroup.vue
+++ b/components/PronounGroup.vue
@@ -1,9 +1,16 @@
 <script setup lang="ts">
 import type { PronounGroup, Pronoun } from '~/src/classes.ts';
 
-defineProps<{
-    pronounGroup: { group: PronounGroup, groupPronouns: Pronoun[] };
+const props = defineProps<{
+    pronounGroup: { group: PronounGroup, groupPronouns: Record<string, Pronoun> | Pronoun[] };
 }>();
+
+const pronouns = computed(() => {
+    if (Array.isArray(props.pronounGroup.groupPronouns)) {
+        return props.pronounGroup.groupPronouns;
+    }
+    return Object.values(props.pronounGroup.groupPronouns);
+});
 </script>
 
 <template>
@@ -18,7 +25,7 @@ defineProps<{
                     <em><LinkedText :text="pronounGroup.group.description" /></em>
                 </div>
                 <ul class="list-unstyled">
-                    <SimplePronounList :pronouns="pronounGroup.groupPronouns" />
+                    <SimplePronounList :pronouns="pronouns" />
                 </ul>
             </li>
             <nuxt-link :to="{ name: 'pronouns' }" class="list-group-item list-group-item-action text-center">
diff --git a/pages/pronouns/any.vue b/pages/pronouns/any.vue
index 19124163b..86bb7b629 100644
--- a/pages/pronouns/any.vue
+++ b/pages/pronouns/any.vue
@@ -1,3 +1,80 @@
+<script setup lang="ts">
+import { ExampleCategory } from '~/src/classes.ts';
+import { examples, pronouns, pronounLibrary } from '~/src/data.ts';
+import type { Pronoun, MergedPronounGroup } from '~/src/classes.ts';
+
+
+definePageMeta({
+    translatedPaths: (config) => {
+        if (!config.pronouns.enabled || !config.pronouns.any) {
+            return [];
+        }
+        return {
+            'pronouns-any': {
+                paths: withPronounPrefixes(config, [`/${encodeURIComponent(config.pronouns.any)}`]),
+            },
+            'pronouns-any-group': {
+                paths: withPronounPrefixes(config, [`/${encodeURIComponent(config.pronouns.any)}\\::group`]),
+            },
+        };
+    },
+});
+
+const { $translator: translator } = useNuxtApp();
+const route = useRoute();
+const router = useRouter();
+const config = useConfig();
+const groupKey = route.params.group as string;
+
+let pronounGroups: MergedPronounGroup['groups'] = [];
+let short = translator.translate('pronouns.any.short');
+if (groupKey) {
+    const merged = pronounLibrary.byKey()[groupKey];
+    pronounGroups = merged.groups;
+    short = merged.short(translator);
+}
+
+const exampleCategories = computed(() => {
+    return ExampleCategory.from(examples, config);
+});
+
+useSimpleHead({
+    title: `${translator.translate('pronouns.intro')}: ${short}`.trim(),
+    banner: `api/banner${route.path.replace(/\/$/, '')}.png`,
+}, translator);
+
+
+const comprehensive = computed({
+    get() {
+        return config.pronouns.comprehensive ? Object.hasOwn(route.query, config.pronouns.comprehensive) : false;
+    },
+    set(value) {
+        if (value === comprehensive.value || !config.pronouns.comprehensive) {
+            // prevent warning that $router.replace has no effect
+            return;
+        }
+        const query = structuredClone(route.query);
+        if (value) {
+            query[config.pronouns.comprehensive] = null;
+        } else {
+            delete query[config.pronouns.comprehensive];
+        }
+        router.replace({ query });
+    },
+});
+const pronounsChoice = computed(() => {
+    if (!pronounGroups.length) {
+        return Object.values(pronouns).filter((p) => !p.hidden);
+    }
+
+    let choice: Record<string, Pronoun> = {};
+    for (const pronounGroup of pronounGroups) {
+        choice = { ...choice, ...pronounGroup.groupPronouns };
+    }
+    return Object.values(choice).filter((p) => !p.hidden);
+});
+</script>
+
 <template>
     <Page>
         <NotFound v-if="pronounGroups === undefined" />
@@ -37,7 +114,7 @@
 
                 <ul>
                     <template v-for="exampleCategory in exampleCategories">
-                        <ExampleCategory
+                        <ExampleCategoryListItem
                             v-if="!exampleCategory.comprehensive || comprehensive"
                             :example-category="exampleCategory"
                             :pronouns-choice="pronounsChoice"
@@ -47,7 +124,11 @@
                 </ul>
             </section>
 
-            <PronounGroup v-for="pronounGroup in pronounGroups" :key="pronounGroup.name" :pronoun-group="pronounGroup" />
+            <PronounGroup
+                v-for="pronounGroup in pronounGroups"
+                :key="pronounGroup.group.name"
+                :pronoun-group="pronounGroup"
+            />
 
             <AdPlaceholder :phkey="['content-0', 'content-mobile-0']" />
 
@@ -69,86 +150,3 @@
         </div>
     </Page>
 </template>
-
-<script>
-import { examples, pronouns, pronounLibrary } from '~/src/data.ts';
-import { useNuxtApp } from 'nuxt/app';
-import useSimpleHead from '~/composables/useSimpleHead.ts';
-import { ExampleCategory } from '~/src/classes.ts';
-import useConfig from '~/composables/useConfig.ts';
-
-export default {
-    setup() {
-        definePageMeta({
-            translatedPaths: (config) => {
-                if (!config.pronouns.enabled || !config.pronouns.any) {
-                    return [];
-                }
-                return {
-                    'pronouns-any': {
-                        paths: withPronounPrefixes(config, [`/${encodeURIComponent(config.pronouns.any)}`]),
-                    },
-                    'pronouns-any-group': {
-                        paths: withPronounPrefixes(config, [`/${encodeURIComponent(config.pronouns.any)}\\::group`]),
-                    },
-                };
-            },
-        });
-
-        const { $translator: translator } = useNuxtApp();
-        const route = useRoute();
-        const config = useConfig();
-        const groupKey = route.params.group;
-        let pronounGroups = [];
-        let short;
-        if (groupKey) {
-            const merged = pronounLibrary.byKey()[groupKey];
-            pronounGroups = merged.groups;
-            short = merged.short(translator);
-        } else {
-            short = translator.translate('pronouns.any.short');
-        }
-        useSimpleHead({
-            title: `${translator.translate('pronouns.intro')}: ${short}`.trim(),
-            banner: `api/banner${route.path.replace(/\/$/, '')}.png`,
-        }, translator);
-        return {
-            config,
-            short,
-            pronounGroups,
-            exampleCategories: ExampleCategory.from(examples, config),
-        };
-    },
-    computed: {
-        comprehensive: {
-            get() {
-                return Object.hasOwn(this.$route.query, this.config.pronouns.comprehensive);
-            },
-            set(value) {
-                if (value === this.comprehensive) {
-                    // prevent warning that $router.replace has no effect
-                    return;
-                }
-                const query = structuredClone(this.$route.query);
-                if (value) {
-                    query[this.config.pronouns.comprehensive] = null;
-                } else {
-                    delete query[this.config.pronouns.comprehensive];
-                }
-                this.$router.replace({ query });
-            },
-        },
-        pronounsChoice() {
-            if (!this.pronounGroups.length) {
-                return Object.values(pronouns).filter((p) => !p.hidden);
-            }
-
-            let choice = {};
-            for (const pronounGroup of this.pronounGroups) {
-                choice = { ...choice, ...pronounGroup.groupPronouns };
-            }
-            return Object.values(choice).filter((p) => !p.hidden);
-        },
-    },
-};
-</script>
diff --git a/pages/pronouns/pronoun.vue b/pages/pronouns/pronoun.vue
index 130bbca62..d10b00eb1 100644
--- a/pages/pronouns/pronoun.vue
+++ b/pages/pronouns/pronoun.vue
@@ -63,7 +63,7 @@
 
                 <ul>
                     <template v-for="exampleCategory in exampleCategories">
-                        <ExampleCategory
+                        <ExampleCategoryListItem
                             v-if="!exampleCategory.comprehensive || comprehensive"
                             :example-category="exampleCategory"
                             :pronouns-choice="[selectedPronoun]"