From 24974eba376506a543e8d47bd877ca51b3969ca2 Mon Sep 17 00:00:00 2001
From: Bruno Perel <brunoperel@gmail.com>
Date: Fri, 5 Jul 2024 13:17:33 +0200
Subject: [PATCH] Rename "not-so-good" to "average" whattheduck: Add "Back to
 search results" button, don't reset the title search input after clicking on
 a search result

---
 apps/dumili/translations/messages.en.json     |  6 ++---
 apps/web/src/components/StorySearch.vue       |  4 +--
 apps/web/translations/messages.en.json        |  6 ++---
 apps/whattheduck/src/stores/app.ts            |  2 +-
 .../src/views/CoverSearchResults.vue          |  2 +-
 apps/whattheduck/src/views/Search.vue         | 25 ++++++++++++-------
 apps/whattheduck/translations/en.json         |  2 +-
 packages/types/SimpleStory.ts                 |  2 +-
 8 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/apps/dumili/translations/messages.en.json b/apps/dumili/translations/messages.en.json
index 74d381370..0f4b68990 100644
--- a/apps/dumili/translations/messages.en.json
+++ b/apps/dumili/translations/messages.en.json
@@ -145,7 +145,7 @@
   "E-mail à": "E-mail to",
   "En bon état": "In good condition",
   "En mauvais état": "In bad condition",
-  "En état moyen": "In not-so-good condition",
+  "En état moyen": "In average condition",
   "En vente par": "On sale by",
   "En état indéfini": "In undefined condition",
   "Enlever la mention \"A vendre\"": "Remove the \"For sale\" label",
@@ -236,7 +236,7 @@
   "Marketplace": "Marketplace",
   "Marquer comme en bon état": "Mark as in good condition",
   "Marquer comme en mauvais état": "Mark as in bad condition",
-  "Marquer comme en état moyen": "Mark as in not-so-good condition",
+  "Marquer comme en état moyen": "Mark as in average condition",
   "Marquer comme non possédé(s)": "Mark as missing",
   "Marquer comme possédé(s)": "Mark as possessed",
   "Marquer comme à vendre": "Mark as on sale",
@@ -286,7 +286,7 @@
   "Numéro": "Issue",
   "Numéro en bon état : pas d'ajustement": "Issue in good condition: no change from the original quotation",
   "Numéro en mauvais état : 30% de la cote": "Issue in bad condition: 30% of the original quotation",
-  "Numéro en état moyen : 70% de la cote": "Issue in not-so-good condition: 70% of the original quotation",
+  "Numéro en état moyen : 70% de la cote": "Issue in average condition: 70% of the original quotation",
   "Numéros déjà dans la collection": "Issues that are already in your collection",
   "Numéro inconnu": "Unknown issue",
   "Numéros manquants": "Missing issues",
diff --git a/apps/web/src/components/StorySearch.vue b/apps/web/src/components/StorySearch.vue
index e6d5d19db..529b8b4b3 100644
--- a/apps/web/src/components/StorySearch.vue
+++ b/apps/web/src/components/StorySearch.vue
@@ -192,8 +192,8 @@ const runSearch = async (value: string) => {
               publicationcode: collectionPublicationCode,
               issuenumber: collectionIssueNumber,
             }) =>
-              story
-                .issues!.map(
+              story.issues
+                .map(
                   ({ publicationcode, issuenumber }) =>
                     `${publicationcode}-${issuenumber}`,
                 )
diff --git a/apps/web/translations/messages.en.json b/apps/web/translations/messages.en.json
index 5e5059326..365cfbd4e 100644
--- a/apps/web/translations/messages.en.json
+++ b/apps/web/translations/messages.en.json
@@ -140,7 +140,7 @@
   "E-mail à": "E-mail to",
   "En bon état": "In good condition",
   "En mauvais état": "In bad condition",
-  "En état moyen": "In not-so-good condition",
+  "En état moyen": "In average condition",
   "En vente par": "On sale by",
   "En état indéfini": "In undefined condition",
   "Enlever la mention \"A vendre\"": "Remove the \"For sale\" label",
@@ -224,7 +224,7 @@
   "Marketplace": "Marketplace",
   "Marquer comme en bon état": "Mark as in good condition",
   "Marquer comme en mauvais état": "Mark as in bad condition",
-  "Marquer comme en état moyen": "Mark as in not-so-good condition",
+  "Marquer comme en état moyen": "Mark as in average condition",
   "Marquer comme non possédé(s)": "Mark as missing",
   "Marquer comme possédé(s)": "Mark as possessed",
   "Marquer comme à vendre": "Mark as on sale",
@@ -273,7 +273,7 @@
   "Numéro": "Issue",
   "Numéro en bon état : pas d'ajustement": "Issue in good condition: no change from the original quotation",
   "Numéro en mauvais état : 30% de la cote": "Issue in bad condition: 30% of the original quotation",
-  "Numéro en état moyen : 70% de la cote": "Issue in not-so-good condition: 70% of the original quotation",
+  "Numéro en état moyen : 70% de la cote": "Issue in average condition: 70% of the original quotation",
   "Numéros déjà dans la collection": "Issues that are already in your collection",
   "Numéros manquants": "Missing issues",
   "Numéros non référencés": "Non-existing issues",
diff --git a/apps/whattheduck/src/stores/app.ts b/apps/whattheduck/src/stores/app.ts
index 9442e6ce3..bd4f10a4f 100644
--- a/apps/whattheduck/src/stores/app.ts
+++ b/apps/whattheduck/src/stores/app.ts
@@ -96,7 +96,7 @@ export const app = defineStore('app', () => {
       : null,
   );
   const issuenumber = computed(() => navigationItemGroups.value.issuenumber);
-  const extraIssuenumbers = computed(() => navigationItemGroups.value.extra_issuenumbers?.split(','));
+  const extraIssuenumbers = computed(() => navigationItemGroups.value.extra_issuenumbers?.split(',') || []);
 
   const copyListModes = [
     {
diff --git a/apps/whattheduck/src/views/CoverSearchResults.vue b/apps/whattheduck/src/views/CoverSearchResults.vue
index 5dc108d4c..3c7d9c974 100644
--- a/apps/whattheduck/src/views/CoverSearchResults.vue
+++ b/apps/whattheduck/src/views/CoverSearchResults.vue
@@ -46,7 +46,7 @@
                     ><ion-row v-if="cover.estimationMin || cover.estimationMax"
                       ><ion-col><ion-icon :ios="pricetagOutline" :android="pricetagSharp"></ion-icon></ion-col
                       ><ion-col class="ion-text-left"
-                        ><template v-if="estimationMin && estimationMax"
+                        ><template v-if="cover.estimationMin && cover.estimationMax"
                           ><template v-if="cover.estimationMax === cover.estimationMin">{{
                             t('Environ {estimation} €', { estimation: cover.estimationMin })
                           }}</template>
diff --git a/apps/whattheduck/src/views/Search.vue b/apps/whattheduck/src/views/Search.vue
index 506623326..17d3dcd89 100644
--- a/apps/whattheduck/src/views/Search.vue
+++ b/apps/whattheduck/src/views/Search.vue
@@ -27,7 +27,6 @@
           v-for="story of storyResults?.results"
           @click="
             selectedStory = story;
-            storyTitle = '';
           "
         >
           <ion-label
@@ -38,7 +37,12 @@
         </ion-item>
       </ion-list>
       <template v-if="selectedStory">
-        <div style="margin: 1rem 0">{{ selectedStory.title }} {{ t('a été publiée dans les numéros suivants :') }}</div>
+        <div style="margin: 1rem 0"><b>{{ selectedStory.title }}</b> {{ t('a été publiée dans les numéros suivants :') }}</div>
+        <ion-button size="small"
+          @click="
+            selectedStory = null;
+          "
+          >&nbsp;<ion-icon :md="arrowBackSharp" :ios="arrowBackOutline"></ion-icon>{{ t('Retour aux résultats d\'histoire') }}</ion-button>
         <ion-list>
           <ion-item
             v-for="issue of selectedStory.issues"
@@ -64,6 +68,8 @@ import FullIssue from '~/components/FullIssue.vue';
 import { app } from '~/stores/app';
 import { wtdcollection } from '~/stores/wtdcollection';
 import type { IssueWithCollectionIssues } from '~/stores/wtdcollection';
+import { issue_condition } from '~prisma-clients/client_dm';
+import { arrowBackOutline, arrowBackSharp } from 'ionicons/icons';
 
 const {
   coa: { services: coaServices },
@@ -79,12 +85,13 @@ const { currentNavigationItem } = storeToRefs(app());
 const router = useRouter();
 
 type StoryResult = StorySearchResults['results'][number];
-interface AugmentedStoryResult {
-  issues: Pick<NonNullable<StoryResult['issues']>[number], 'publicationcode' | 'issuenumber' | 'issuecode'> & {
+type AugmentedStoryResult = StoryResult & {
+  collectionConditions: issue_condition[];
+  issues:  {
     countrycode: string;
     publicationName: string;
     collectionIssues: IssueWithCollectionIssues['collectionIssues'];
-  };
+  }[];
 }
 
 const storyTitle = ref('');
@@ -101,27 +108,27 @@ watch(storyTitle, async (newValue) => {
 
   await fetchPublicationNames(
     data
-      .map((story) => story.issues!)
+      .map((story) => story.issues)
       .flat()
       .map(({ publicationcode }) => publicationcode),
   );
 
   storyResults.value = {
     results: data.map((story) => {
-      const collectionIssues = story.issues!.map(
+      const collectionIssues = story.issues.map(
         ({ issuecode }) => issuesByIssueCode.value![issuecode.replace(/ +/g, ' ')] || [],
       );
       const collectionConditions = collectionIssues.flat().map(({ condition }) => condition);
       return {
         ...story,
         collectionConditions,
-        issues: story.issues?.map(({ publicationcode, issuenumber, issuecode }, idx) => ({
+        issues: story.issues.map(({ publicationcode, issuenumber, issuecode }, idx) => ({
           publicationcode,
           countrycode: publicationcode.split('/')[0],
           publicationName: publicationNames.value[publicationcode] || publicationcode,
           issuenumber,
           issuecode,
-          collectionIssues: collectionIssues[idx],
+          collectionIssues: collectionIssues[idx]!,
         })),
       };
     }),
diff --git a/apps/whattheduck/translations/en.json b/apps/whattheduck/translations/en.json
index 0980ca528..8df5a4027 100644
--- a/apps/whattheduck/translations/en.json
+++ b/apps/whattheduck/translations/en.json
@@ -55,7 +55,7 @@
   "Erreur interne": "Internal error",
   "Erreur réseau": "Network error",
   "Erreur": "Error",
-  "Etat moyen": "Not-so-good condition",
+  "Etat moyen": "Average condition",
   "Etat non spécifié": "Unspecified condition",
   "Etat": "Condition",
   "Etats des numéros": "Issue conditions",
diff --git a/packages/types/SimpleStory.ts b/packages/types/SimpleStory.ts
index 8a311e3e2..6f35c3972 100644
--- a/packages/types/SimpleStory.ts
+++ b/packages/types/SimpleStory.ts
@@ -5,5 +5,5 @@ export interface SimpleStory {
   entirepages: number;
   title: string;
   score: number;
-  issues: SimpleIssue[] | null;
+  issues: SimpleIssue[];
 }