Call commonDictionaries with fetchQuery

GeotrekCE · Jul 16, 2024 · 01cfc84 · 01cfc84
1 parent 1bd6a93
commit 01cfc84
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 24 deletions.
diff --git a/frontend/src/pages/event/[touristicEvent].tsx b/frontend/src/pages/event/[touristicEvent].tsx
@@ -27,10 +27,9 @@ export const getServerSideProps: GetServerSideProps = async context => {
     }),
   });
   try {
-    const commonDictionaries = await getCommonDictionaries(locale);
-    await queryClient.prefetchQuery({
+    const commonDictionaries = await queryClient.fetchQuery({
       queryKey: ['commonDictionaries', locale],
-      queryFn: () => commonDictionaries,
+      queryFn: () => getCommonDictionaries(locale),
     });
 
     const details = await getTouristicEventDetails(id, locale, commonDictionaries);

diff --git a/frontend/src/pages/index.tsx b/frontend/src/pages/index.tsx
@@ -15,10 +15,9 @@ export const getServerSideProps: GetServerSideProps = async context => {
   const suggestions = adaptSuggestions(homePageConfig.suggestions, locale);
 
   if (suggestions !== null) {
-    const commonDictionaries = await getCommonDictionaries(locale);
-    await queryClient.prefetchQuery({
+    const commonDictionaries = await queryClient.fetchQuery({
       queryKey: ['commonDictionaries', locale],
-      queryFn: () => commonDictionaries,
+      queryFn: () => getCommonDictionaries(locale),
     });
 
     const activitySuggestionIds = suggestions.flatMap(suggestion =>

diff --git a/frontend/src/pages/information/[flatPage].tsx b/frontend/src/pages/information/[flatPage].tsx
@@ -27,10 +27,9 @@ export const getServerSideProps: GetServerSideProps = async context => {
       }),
     });
 
-    const commonDictionaries = await getCommonDictionaries(locale);
-    await queryClient.prefetchQuery({
+    const commonDictionaries = await queryClient.fetchQuery({
       queryKey: ['commonDictionaries', locale],
-      queryFn: () => commonDictionaries,
+      queryFn: () => getCommonDictionaries(locale),
     });
 
     const details = await getFlatPageDetails(id, locale, commonDictionaries);

diff --git a/frontend/src/pages/outdoor-course/[outdoorCourse].tsx b/frontend/src/pages/outdoor-course/[outdoorCourse].tsx
@@ -28,10 +28,9 @@ export const getServerSideProps: GetServerSideProps = async context => {
   });
 
   try {
-    const commonDictionaries = await getCommonDictionaries(locale);
-    await queryClient.prefetchQuery({
+    const commonDictionaries = await queryClient.fetchQuery({
       queryKey: ['commonDictionaries', locale],
-      queryFn: () => commonDictionaries,
+      queryFn: () => getCommonDictionaries(locale),
     });
 
     const details = await getOutdoorCourseDetails(id, locale, commonDictionaries);

diff --git a/frontend/src/pages/outdoor-site/[outdoorSite].tsx b/frontend/src/pages/outdoor-site/[outdoorSite].tsx
@@ -26,10 +26,9 @@ export const getServerSideProps: GetServerSideProps = async context => {
   });
 
   try {
-    const commonDictionaries = await getCommonDictionaries(locale);
-    await queryClient.prefetchQuery({
+    const commonDictionaries = await queryClient.fetchQuery({
       queryKey: ['commonDictionaries', locale],
-      queryFn: () => commonDictionaries,
+      queryFn: () => getCommonDictionaries(locale),
     });
 
     const details = await getOutdoorSiteDetails(id, locale, commonDictionaries);

diff --git a/frontend/src/pages/search.tsx b/frontend/src/pages/search.tsx
@@ -43,10 +43,9 @@ export const getServerSideProps: GetServerSideProps = async context => {
       endDate: context.query.endDate ?? '',
     };
 
-    const commonDictionaries = await getCommonDictionaries(locale);
-    await queryClient.prefetchQuery({
+    const commonDictionaries = await queryClient.fetchQuery({
       queryKey: ['commonDictionaries', locale],
-      queryFn: () => commonDictionaries,
+      queryFn: () => getCommonDictionaries(locale),
     });
 
     await queryClient.prefetchQuery({

diff --git a/frontend/src/pages/service/[touristicContent].tsx b/frontend/src/pages/service/[touristicContent].tsx
@@ -28,10 +28,9 @@ export const getServerSideProps: GetServerSideProps = async context => {
   });
 
   try {
-    const commonDictionaries = await getCommonDictionaries(locale);
-    await queryClient.prefetchQuery({
+    const commonDictionaries = await queryClient.fetchQuery({
       queryKey: ['commonDictionaries', locale],
-      queryFn: () => commonDictionaries,
+      queryFn: () => getCommonDictionaries(locale),
     });
 
     const details = await getTouristicContentDetails(id, locale, commonDictionaries);

diff --git a/frontend/src/pages/trek/[slug].tsx b/frontend/src/pages/trek/[slug].tsx
@@ -28,10 +28,9 @@ export const getServerSideProps: GetServerSideProps = async context => {
   });
 
   try {
-    const commonDictionaries = await getCommonDictionaries(locale);
-    await queryClient.prefetchQuery({
+    const commonDictionaries = await queryClient.fetchQuery({
       queryKey: ['commonDictionaries', locale],
-      queryFn: () => commonDictionaries,
+      queryFn: () => getCommonDictionaries(locale),
     });
 
     const details = await getDetails(id, locale, commonDictionaries);