Fix conditional display of theme according by the config

GeotrekCE · Jan 25, 2024 · 37e3a52 · 37e3a52
1 parent 9eace71
commit 37e3a52
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 24 deletions.
diff --git a/frontend/config/resultCard.json b/frontend/config/resultCard.json
@@ -1,11 +1,11 @@
 {
   "trek": {
-     "location": {
-       "display": true
-     },
-     "labels": {
-       "display": true
-     },
+    "location": {
+      "display": true
+    },
+    "themes": {
+      "display": true
+    },
     "informations": ["difficulty", "duration", "distance", "positiveElevation"]
   }
-}
+}
diff --git a/frontend/customization/config/resultCard.json b/frontend/customization/config/resultCard.json
@@ -1,11 +1,11 @@
 {
   "trek": {
-     "location": {
-       "display": true
-     },
-     "labels": {
-       "display": true
-     },
+    "location": {
+      "display": true
+    },
+    "themes": {
+      "display": true
+    },
     "informations": ["difficulty", "duration", "distance", "positiveElevation"]
   }
-}
+}
diff --git a/frontend/jestAfterEnv.setup.tsx b/frontend/jestAfterEnv.setup.tsx
@@ -234,14 +234,17 @@ setConfig({
     },
     resultCard: {
       trek: {
-          location: {
-            display: true
-          },
-          labels: {
-            display: true
-          },
-        informations: ["difficulty", "duration", "distance", "positiveElevation"]
-      }
+        location: {
+          display: true,
+        },
+        themes: {
+          display: true,
+        },
+        labels: {
+          display: true,
+        },
+        informations: ['difficulty', 'duration', 'distance', 'positiveElevation'],
+      },
     },
     detailsSectionHtml: {
       forecastWidget: { default: '<iframe\n  id="widget_autocomplete_preview"\n  className="w-full"\n  height="150"\n  src="https://meteofrance.com/widget/prevision/{{ cityCode }}0"\n></iframe>\n' }

diff --git a/frontend/src/modules/results/adapter.ts b/frontend/src/modules/results/adapter.ts
@@ -12,7 +12,11 @@ import { formatDistance } from './utils';
 const {
   publicRuntimeConfig: {
     resultCard: {
-      trek: { location, labels, informations = [] },
+      trek: {
+        location,
+        themes: { display: displayThemes },
+        informations = [],
+      },
     },
   },
 } = getNextConfig();
@@ -58,7 +62,7 @@ export const adaptTrekResultList = ({
     place: (location.display === true && cityDictionnary[rawResult.departure_city]?.name) || null,
     name: rawResult.name,
     tags:
-      labels.display === true ? rawResult.themes.map(themeId => themes[themeId]?.label || '') : [],
+      displayThemes === true ? rawResult.themes.map(themeId => themes[themeId]?.label || '') : [],
     attachments: getThumbnails(rawResult.attachments),
     category: activities[rawResult.practice] ?? null,
     informations: [