Merge pull request #547 from GeotrekCE/develop

Develop > Main / Prepare 3.5.4
GeotrekCE · Jan 20, 2022 · decc652 · decc652
2 parents 3492e3a + 8a021b0
commit decc652
Show file tree

Hide file tree

Showing 15 changed files with 58 additions and 20 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,5 +1,15 @@
 # Changelog
 
+3.5.4 (2022-01-20)
+------------------
+
+**🐛 Fixes**
+
+* Do not display empty filters (#518 by @dtrucs)
+* Correctly display tags inside list descriptions items (#540 by @dtrucs)
+* Sort activities by order defined in API (#539 by @dtrucs)
+* Fix sitemap generation when Outdoor module is disabled (by @dtrucs)
+
 3.5.3 (2021-12-17)
 ------------------
 

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "geotrek-rando-frontend",
-  "version": "3.5.3",
+  "version": "3.5.4",
   "private": true,
   "scripts": {
     "debug": "NODE_OPTIONS='--inspect' next ./src",

diff --git a/frontend/src/components/pages/details/components/DetailsDescription/DetailsDescription.tsx b/frontend/src/components/pages/details/components/DetailsDescription/DetailsDescription.tsx
@@ -92,23 +92,26 @@ const StyledListWithSteps = styled(HtmlText)`
   }
   & > ol > li {
     counter-increment: item;
-    display: flex;
-    align-items: center;
-    padding-top: ${getSpacing(4)};
+    margin-top: ${getSpacing(4)};
     ${desktopOnly(css`
-      padding-top: ${getSpacing(10)};
+      margin-top: ${getSpacing(10)};
     `)}
+    position: relative;
+    padding-left: ${getSpacing(12)};
   }
   & > ol > li:first-child {
-    padding: 0;
+    margin-top: 0;
   }
   & > ol > li::before {
+    position: absolute;
+    left: 0;
+    top: 50%;
+    transform: translateY(-50%);
     font-size: 14px;
     content: counter(item);
     border-radius: 100%;
     width: ${getSpacing(6.5)};
     height: ${getSpacing(6.5)};
-    flex: none;
     margin-right: ${getSpacing(3.5)};
     color: white;
     background-color: ${colorPalette.redMarker};

diff --git a/...ls/components/DetailsDescription/__tests__/__snapshots__/DetailsDescription.test.tsx.snap b/...ls/components/DetailsDescription/__tests__/__snapshots__/DetailsDescription.test.tsx.snap
@@ -23,7 +23,7 @@ Object {
           id="details_descriptionContent"
         >
           <div
-            class="utils__HtmlText-sc-16l79i-0 DetailsDescription__StyledListWithSteps-sc-136483c-0 jgscmn djlvYe"
+            class="utils__HtmlText-sc-16l79i-0 DetailsDescription__StyledListWithSteps-sc-136483c-0 jgscmn kpWlwT"
           >
             <p>
               Du parking remonter la vallée du Sélé par le sentier qui suit la rive gauche du torrent de Celse Nière. Après une longue montée en faux plat, le sentier remonte des lacets raides jusqu'à la jonction avec le sentier du refuge du Sélé (1993 m).
@@ -72,7 +72,7 @@ Object {
         id="details_descriptionContent"
       >
         <div
-          class="utils__HtmlText-sc-16l79i-0 DetailsDescription__StyledListWithSteps-sc-136483c-0 jgscmn djlvYe"
+          class="utils__HtmlText-sc-16l79i-0 DetailsDescription__StyledListWithSteps-sc-136483c-0 jgscmn kpWlwT"
         >
           <p>
             Du parking remonter la vallée du Sélé par le sentier qui suit la rive gauche du torrent de Celse Nière. Après une longue montée en faux plat, le sentier remonte des lacets raides jusqu'à la jonction avec le sentier du refuge du Sélé (1993 m).

diff --git a/frontend/src/components/pages/search/components/FilterBar/ShowFilters.tsx b/frontend/src/components/pages/search/components/FilterBar/ShowFilters.tsx
@@ -10,6 +10,10 @@ interface Props {
 }
 
 const ShowFilters: React.FC<Props> = ({ item, setFilterSelectedOptions, hideLabel = false }) => {
+  // The API can send empty item
+  if (item.label === '' && item.options.length === 0) {
+    return null;
+  }
   return item.options.length > 10 ? (
     <SelectableDropdown
       key={item.id}

diff --git a/frontend/src/modules/activities/adapter.ts b/frontend/src/modules/activities/adapter.ts
@@ -40,9 +40,10 @@ export const adaptActivities = (rawActivities: Partial<RawListActivity>[]): Acti
 export const adaptActivitiesFilter = (
   rawActivities: Partial<RawListActivity>[],
 ): ActivityFilter[] =>
-  rawActivities.filter(isCompleteRawListActivity).map(({ name, pictogram, id }) => ({
+  rawActivities.filter(isCompleteRawListActivity).map(({ name, pictogram, id, order = null }) => ({
     name,
     pictogram,
     id: `${id}`,
+    order,
     type: 'PRACTICE',
   }));
diff --git a/frontend/src/modules/activities/connector.ts b/frontend/src/modules/activities/connector.ts
@@ -36,6 +36,9 @@ export const getActivity = async (
   return adaptActivity(rawActivity);
 };
 
+const sortedActivitiesByOrder = (a: ActivityFilter, b: ActivityFilter) =>
+  (a.order ?? Infinity) - (b.order ?? Infinity);
+
 export const getActivityBarContent = async (language: string): Promise<ActivityFilter[]> => {
   const [rawPractices, rawTouristicContentCategories, rawOutdoorPractices, rawTouristicEvents] =
     await Promise.all([
@@ -46,9 +49,15 @@ export const getActivityBarContent = async (language: string): Promise<ActivityF
     ]);
 
   return [
-    ...adaptActivitiesFilter(rawPractices.results),
-    ...adaptOutdoorPracticesForActivities(rawOutdoorPractices ? rawOutdoorPractices.results : []),
-    ...adaptTouristicContentCategoryList(rawTouristicContentCategories.results),
-    ...adaptTouristicEventTypesForActivities(rawTouristicEvents ? rawTouristicEvents.results : []),
+    ...adaptActivitiesFilter(rawPractices.results).sort(sortedActivitiesByOrder),
+    ...adaptOutdoorPracticesForActivities(
+      rawOutdoorPractices ? rawOutdoorPractices.results : [],
+    ).sort(sortedActivitiesByOrder),
+    ...adaptTouristicContentCategoryList(rawTouristicContentCategories.results).sort(
+      sortedActivitiesByOrder,
+    ),
+    ...adaptTouristicEventTypesForActivities(
+      rawTouristicEvents ? rawTouristicEvents.results : [],
+    ).sort(sortedActivitiesByOrder),
   ];
 };
diff --git a/frontend/src/modules/activities/interface.ts b/frontend/src/modules/activities/interface.ts
@@ -23,5 +23,6 @@ export interface ActivityChoices {
 
 export interface ActivityFilter extends Activity {
   id: string;
+  order: null | number;
   type: 'PRACTICE' | 'OUTDOOR_PRACTICE' | 'CATEGORY' | 'TOURISTIC_EVENT_TYPE';
 }
diff --git a/frontend/src/modules/outdoorPractice/adapter.ts b/frontend/src/modules/outdoorPractice/adapter.ts
@@ -1,7 +1,7 @@
 import { ActivityFilter } from '../activities/interface';
 import { OUTDOOR_ID } from '../filters/constant';
 import { FilterWithoutType } from '../filters/interface';
-import { OutdoorPractice, OutdoorPracticeChoices, RawOutdoorPractice } from './interface';
+import { OutdoorPracticeChoices, RawOutdoorPractice } from './interface';
 
 export const adaptOutdoorPractices = ({
   rawOutdoorPractices,
@@ -23,9 +23,10 @@ export const adaptOutdoorPractices = ({
 export const adaptOutdoorPracticesForActivities = (
   rawOutdoorPractices: RawOutdoorPractice[],
 ): ActivityFilter[] =>
-  rawOutdoorPractices.map(({ name, id, pictogram }) => ({
+  rawOutdoorPractices.map(({ name, id, pictogram, order = null }) => ({
     id,
     name,
+    order,
     pictogram,
     type: 'OUTDOOR_PRACTICE',
   }));

diff --git a/frontend/src/modules/outdoorPractice/interface.ts b/frontend/src/modules/outdoorPractice/interface.ts
@@ -1,5 +1,6 @@
 export interface RawOutdoorPractice {
   id: string;
+  order: null | number;
   sector: number;
   name: string;
   pictogram: string;

diff --git a/frontend/src/modules/touristicContentCategory/adapter.ts b/frontend/src/modules/touristicContentCategory/adapter.ts
@@ -28,10 +28,11 @@ export const adaptTouristicContentCategoryList = (
 ): ActivityFilter[] =>
   rawToutisticContentCategories
     .filter(isCompleteRawListTouristicContentCategory)
-    .map(({ label, pictogram, id }) => ({
+    .map(({ label, pictogram, id, order = null }) => ({
       name: label,
       pictogram,
       id: `${id}`,
+      order,
       type: 'CATEGORY',
     }));
 

diff --git a/frontend/src/modules/touristicContentCategory/interface.ts b/frontend/src/modules/touristicContentCategory/interface.ts
@@ -4,6 +4,7 @@ export interface RawTouristicContentCategory {
   id: number;
   pictogram: string;
   label: string;
+  order: null | number;
   types: TouristicContentType[];
 }
 

diff --git a/frontend/src/modules/touristicEventType/adapter.ts b/frontend/src/modules/touristicEventType/adapter.ts
@@ -23,9 +23,10 @@ export const adaptTouristicEventTypes = ({
 export const adaptTouristicEventTypesForActivities = (
   rawTouristicEventTypes: RawTouristicEventType[],
 ): ActivityFilter[] =>
-  rawTouristicEventTypes.map(({ type, id, pictogram }) => ({
+  rawTouristicEventTypes.map(({ type, id, pictogram, order = null }) => ({
     id,
     name: type,
+    order,
     pictogram,
     type: 'TOURISTIC_EVENT_TYPE',
   }));

diff --git a/frontend/src/modules/touristicEventType/interface.ts b/frontend/src/modules/touristicEventType/interface.ts
@@ -1,5 +1,6 @@
 export interface RawTouristicEventType {
   id: string;
+  order: null | number;
   type: string;
   pictogram: string;
 }

diff --git a/frontend/src/pages/sitemap.xml.tsx b/frontend/src/pages/sitemap.xml.tsx
@@ -86,7 +86,9 @@ const getApiContentForLanguage = async (language: string): Promise<string> => {
     )
     .join('');
 
-  const outdoorSites = await getOutdoorSiteForLanguage(language);
+  const outdoorSites = getGlobalConfig().enableOutdoor
+    ? await getOutdoorSiteForLanguage(language)
+    : [];
   const outdoorSitesUrls = outdoorSites
     .map(({ id, name }) =>
       name && id
@@ -97,7 +99,9 @@ const getApiContentForLanguage = async (language: string): Promise<string> => {
     )
     .join('');
 
-  const outdoorCourses = await getOutdoorCourseForLanguage(language);
+  const outdoorCourses = getGlobalConfig().enableOutdoor
+    ? await getOutdoorCourseForLanguage(language)
+    : [];
   const outdoorCoursesUrls = outdoorCourses
     .map(({ id, name }) =>
       name && id