Fix the call of popupResult in map Popup component

GeotrekCE · Dec 6, 2023 · 7b73b98 · 7b73b98
1 parent f407e9b
commit 7b73b98
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/frontend/src/components/Map/components/Popup/index.tsx b/frontend/src/components/Map/components/Popup/index.tsx
@@ -35,8 +35,9 @@ const PopupContent: React.FC<PropsPC> = ({ showButton, id, type, parentId, conte
   let isLoading = false;
   let trekPopupResult = null;
 
+  const popupResult = usePopupResult(id.toString(), true, type);
+
   if (!content && type) {
-    const popupResult = usePopupResult(id.toString(), true, type);
     isLoading = popupResult.isLoading;
     trekPopupResult = popupResult.trekPopupResult;
   } else {

diff --git a/frontend/src/components/Map/hooks/usePopupResult.ts b/frontend/src/components/Map/hooks/usePopupResult.ts
@@ -12,7 +12,7 @@ import { getOutdoorSitePopupResult } from '../../../modules/outdoorSite/connecto
 export const usePopupResult = (
   id: string,
   shouldFetch: boolean,
-  type: 'TREK' | 'TOURISTIC_CONTENT' | 'OUTDOOR_SITE' | 'TOURISTIC_EVENT',
+  type: 'TREK' | 'TOURISTIC_CONTENT' | 'OUTDOOR_SITE' | 'TOURISTIC_EVENT' | null,
 ) => {
   const language = useRouter().locale ?? getDefaultLanguage();
   const commonDictionaries = queryCommonDictionaries(language);
@@ -31,7 +31,7 @@ export const usePopupResult = (
   const { data: trekPopupResult, isLoading } = useQuery<PopupResult, Error>(
     ['popupResult', id, language],
     fetchData,
-    { enabled: shouldFetch && commonDictionaries !== undefined },
+    { enabled: type !== null && shouldFetch && commonDictionaries !== undefined },
   );
 
   return {