fixing localeSelector by including page slug into graphql localeData …

…fetch
partio-scout · Jan 20, 2025 · 03caab8 · 03caab8
1 parent 9d67dd0
commit 03caab8
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 7 deletions.
diff --git a/configs/createPages.ts b/configs/createPages.ts
@@ -90,6 +90,7 @@ async function handleActivity(
       locale: activity.locale,
       id: activity.id,
       strapi_id: activity.strapi_id,
+      slug: activityPath,
     },
   };
 
@@ -150,6 +151,7 @@ async function handleActivityGroup(
       id: activityGroup?.id,
       strapi_id: activityGroup?.strapi_id,
       ageGroupId: activityGroupData?.age_group.strapi_id,
+      slug: activityGroupPath,
     },
   };
 
@@ -190,6 +192,7 @@ async function handleAgeGroup(
       locale: ageGroup?.locale,
       id: ageGroup.id,
       strapi_id: ageGroup.strapi_id,
+      slug: ageGroupPath,
     },
   };
 
@@ -360,6 +363,7 @@ async function createContentPage(
       locale: pageDataResponse.data?.strapiContentPage.locale,
       id: pageDataResponse?.data?.strapiContentPage.id,
       strapi_id: pageDataResponse?.data?.strapiContentPage.strapi_id,
+      slug: pagePath,
     },
   };
 

diff --git a/configs/typeDefs.gql b/configs/typeDefs.gql
@@ -16,6 +16,7 @@ type SitePageContext @dontInfer {
   id: Int!
   strapi_id: Int
   ageGroupId: Int
+  slug: String
 }
 
 type ActivityLogo implements Node @dontInfer {

diff --git a/src/templates/activityGroupTemplate/index.tsx b/src/templates/activityGroupTemplate/index.tsx
@@ -145,8 +145,9 @@ query Query(
   $strapi_id: Int,
   $locale: String,
   $ageGroupId: Int,
+  $slug: String,
 ) {
-  localeData: allSitePage(filter: { context: { locale: { eq: $locale } } }) {
+  localeData: allSitePage(filter: { context: { locale: { eq: $locale }, slug: { eq: $slug } } }) {
     nodes {
       ...SitePageLocaleFragment
     }

diff --git a/src/templates/activityTemplate/index.tsx b/src/templates/activityTemplate/index.tsx
@@ -74,8 +74,13 @@ const ActivityPageTemplate = ({ path, data }: PageProps<ActivityQueryType, Activ
 export default ActivityPageTemplate;
 
 export const query = graphql`
-query getActivity($strapi_id: Int, $locale: String, $type: String) {
-  localeData: allSitePage(filter: { context: { locale: { eq: $locale }, type: { eq: $type } } }) {
+query getActivity(
+  $strapi_id: Int,
+  $locale: String,
+  $type: String,
+  $slug: String,
+) {
+  localeData: allSitePage(filter: { context: { locale: { eq: $locale }, type: { eq: $type }, slug: { eq: $slug } } }) {
     nodes {
       ...SitePageLocaleFragment
     }

diff --git a/src/templates/ageGroupTemplate/index.tsx b/src/templates/ageGroupTemplate/index.tsx
@@ -103,9 +103,14 @@ const AgeGroupTemplate = ({ path, data }: PageProps<QueryType, AgeGroupPageTempl
 export default AgeGroupTemplate;
 
 export const query = graphql`
-query AgeGroupQuery($locale: String, $strapi_id: Int, $id: String) {
+query AgeGroupQuery(
+  $locale: String,
+  $strapi_id: Int,
+  $id: String,
+  $slug: String,
+) {
   localeData: allSitePage(
-    filter: {context: {locale: {eq: $locale}, type: {eq: "ActivityGroup"}}}
+    filter: {context: {locale: {eq: $locale}, type: {eq: "ActivityGroup"}, slug: { eq: $slug }}}
   ) {
     nodes {
       ...SitePageLocaleFragment

diff --git a/src/templates/contentPageTemplate/index.tsx b/src/templates/contentPageTemplate/index.tsx
@@ -66,8 +66,13 @@ const ContentPageTemplate = ({ path, data }: PageProps<ContentPageQueryType, Con
 export default ContentPageTemplate;
 
 export const query = graphql`
-query getContentPage($locale: String, $type: String, $id: String) {
-  localeData: allSitePage(filter: { context: { locale: { eq: $locale }, type: { eq: $type } } }) {
+query getContentPage(
+  $locale: String,
+  $type: String,
+  $id: String,
+  $slug: String,
+) {
+  localeData: allSitePage(filter: { context: { locale: { eq: $locale }, type: { eq: $type }, slug: { eq: $slug } } }) {
     nodes {
       ...SitePageLocaleFragment
     }