Merged in feat/refactor-header-footer-sitewidealert (pull request #1374)

Refactor: removed parallel routes for header, footer and sidewidealert. Langswitcher and sidewidealert now client components

* feat - removed parallel routes and made sidepeek and sitewidealerts as client components

* Langswitcher as client component

* Fixed lang switcher for current header

* Passing lang when fetching siteconfig

* Merge branch 'master' into feat/refactor-header-footer-sitewidealert

* Refactor

* Removed dead code

* Show only languages that has translation

* Refetch sitewidealert every 60 seconds

* Merge branch 'master' into feat/refactor-header-footer-sitewidealert

* Removed sidepeek parallel route from my-stay

* Added missing env.var to env.test

* Removed console.log


Approved-by: Joakim Jäderberg

server/routers/contentstack/base/query.ts

@@ -616,156 +616,161 @@ export const baseQueryRouter = router({
 
     return validatedFooterConfig.data
   }),
-  siteConfig: contentstackBaseProcedure.query(async ({ ctx }) => {
-    const { lang } = ctx
+  siteConfig: contentstackBaseProcedure
+    .input(langInput)
+    .query(async ({ input, ctx }) => {
+      const lang = input?.lang ?? ctx.lang
 
-    getSiteConfigRefCounter.add(1, { lang })
-    console.info(
-      "contentstack.siteConfig.ref start",
-      JSON.stringify({ query: { lang } })
-    )
-    const responseRef = await request<GetSiteConfigRefData>(
-      GetSiteConfigRef,
-      {
-        locale: lang,
-      },
-      {
-        cache: "force-cache",
-        next: {
-          tags: [generateRefsResponseTag(lang, "site_config")],
-        },
-      }
-    )
-
-    if (!responseRef.data) {
-      const notFoundError = notFound(responseRef)
-      getSiteConfigRefFailCounter.add(1, {
-        lang,
-        error_type: "not_found",
-        error: JSON.stringify({ code: notFoundError.code }),
-      })
-      console.error(
-        "contentstack.siteConfig.refs not found error",
-        JSON.stringify({
-          query: {
-            lang,
-          },
-          error: { code: notFoundError.code },
-        })
+      getSiteConfigRefCounter.add(1, { lang })
+      console.info(
+        "contentstack.siteConfig.ref start",
+        JSON.stringify({ query: { lang } })
       )
-      throw notFoundError
-    }
-
-    const validatedSiteConfigRef = siteConfigRefSchema.safeParse(
-      responseRef.data
-    )
-
-    if (!validatedSiteConfigRef.success) {
-      getSiteConfigRefFailCounter.add(1, {
-        lang,
-        error_type: "validation_error",
-        error: JSON.stringify(validatedSiteConfigRef.error),
-      })
-      console.error(
-        "contentstack.siteConfig.refs validation error",
-        JSON.stringify({
-          query: {
-            lang,
-          },
-          error: validatedSiteConfigRef.error,
-        })
-      )
-      return null
-    }
-
-    const connections = getSiteConfigConnections(validatedSiteConfigRef.data)
-    const siteConfigUid = responseRef.data.all_site_config.items[0].system.uid
-
-    const tags = [
-      generateTagsFromSystem(lang, connections),
-      generateTag(lang, siteConfigUid),
-    ].flat()
-
-    getSiteConfigRefSuccessCounter.add(1, { lang })
-    console.info(
-      "contentstack.siteConfig.refs success",
-      JSON.stringify({ query: { lang } })
-    )
-
-    getSiteConfigCounter.add(1, { lang })
-    console.info(
-      "contentstack.siteConfig start",
-      JSON.stringify({ query: { lang } })
-    )
-    const [siteConfigResponse, contactConfig] = await Promise.all([
-      request<GetSiteConfigData>(
-        GetSiteConfig,
+      const responseRef = await request<GetSiteConfigRefData>(
+        GetSiteConfigRef,
         {
           locale: lang,
         },
         {
           cache: "force-cache",
-          next: { tags },
+          next: {
+            tags: [generateRefsResponseTag(lang, "site_config")],
+          },
         }
-      ),
-      getContactConfig(lang),
-    ])
-
-    if (!siteConfigResponse.data) {
-      const notFoundError = notFound(siteConfigResponse)
-
-      getSiteConfigFailCounter.add(1, {
-        lang,
-        error_type: "not_found",
-        error: JSON.stringify({ code: notFoundError.code }),
-      })
-
-      console.error(
-        "contentstack.siteConfig not found error",
-        JSON.stringify({ query: { lang }, error: { code: notFoundError.code } })
       )
 
-      throw notFoundError
-    }
-
-    const validatedSiteConfig = siteConfigSchema.safeParse(
-      siteConfigResponse.data
-    )
-
-    if (!validatedSiteConfig.success) {
-      getSiteConfigFailCounter.add(1, {
-        lang,
-        error_type: "validation_error",
-        error: JSON.stringify(validatedSiteConfig.error),
-      })
-      console.error(
-        "contentstack.siteConfig validation error",
-        JSON.stringify({
-          query: { lang },
-          error: validatedSiteConfig.error,
+      if (!responseRef.data) {
+        const notFoundError = notFound(responseRef)
+        getSiteConfigRefFailCounter.add(1, {
+          lang,
+          error_type: "not_found",
+          error: JSON.stringify({ code: notFoundError.code }),
         })
+        console.error(
+          "contentstack.siteConfig.refs not found error",
+          JSON.stringify({
+            query: {
+              lang,
+            },
+            error: { code: notFoundError.code },
+          })
+        )
+        throw notFoundError
+      }
+
+      const validatedSiteConfigRef = siteConfigRefSchema.safeParse(
+        responseRef.data
       )
-      return null
-    }
 
-    getSiteConfigSuccessCounter.add(1, { lang })
-    console.info(
-      "contentstack.siteConfig success",
-      JSON.stringify({ query: { lang } })
-    )
+      if (!validatedSiteConfigRef.success) {
+        getSiteConfigRefFailCounter.add(1, {
+          lang,
+          error_type: "validation_error",
+          error: JSON.stringify(validatedSiteConfigRef.error),
+        })
+        console.error(
+          "contentstack.siteConfig.refs validation error",
+          JSON.stringify({
+            query: {
+              lang,
+            },
+            error: validatedSiteConfigRef.error,
+          })
+        )
+        return null
+      }
 
-    const { sitewideAlert } = validatedSiteConfig.data
+      const connections = getSiteConfigConnections(validatedSiteConfigRef.data)
+      const siteConfigUid = responseRef.data.all_site_config.items[0].system.uid
 
-    return {
-      ...validatedSiteConfig.data,
-      sitewideAlert: sitewideAlert
-        ? {
-            ...sitewideAlert,
-            phoneContact: contactConfig
-              ? getAlertPhoneContactData(sitewideAlert, contactConfig)
-              : null,
+      const tags = [
+        generateTagsFromSystem(lang, connections),
+        generateTag(lang, siteConfigUid),
+      ].flat()
+
+      getSiteConfigRefSuccessCounter.add(1, { lang })
+      console.info(
+        "contentstack.siteConfig.refs success",
+        JSON.stringify({ query: { lang } })
+      )
+
+      getSiteConfigCounter.add(1, { lang })
+      console.info(
+        "contentstack.siteConfig start",
+        JSON.stringify({ query: { lang } })
+      )
+      const [siteConfigResponse, contactConfig] = await Promise.all([
+        request<GetSiteConfigData>(
+          GetSiteConfig,
+          {
+            locale: lang,
+          },
+          {
+            cache: "force-cache",
+            next: { tags },
           }
-        : null,
-    }
-  }),
+        ),
+        getContactConfig(lang),
+      ])
+
+      if (!siteConfigResponse.data) {
+        const notFoundError = notFound(siteConfigResponse)
+
+        getSiteConfigFailCounter.add(1, {
+          lang,
+          error_type: "not_found",
+          error: JSON.stringify({ code: notFoundError.code }),
+        })
+
+        console.error(
+          "contentstack.siteConfig not found error",
+          JSON.stringify({
+            query: { lang },
+            error: { code: notFoundError.code },
+          })
+        )
+
+        throw notFoundError
+      }
+
+      const validatedSiteConfig = siteConfigSchema.safeParse(
+        siteConfigResponse.data
+      )
+
+      if (!validatedSiteConfig.success) {
+        getSiteConfigFailCounter.add(1, {
+          lang,
+          error_type: "validation_error",
+          error: JSON.stringify(validatedSiteConfig.error),
+        })
+        console.error(
+          "contentstack.siteConfig validation error",
+          JSON.stringify({
+            query: { lang },
+            error: validatedSiteConfig.error,
+          })
+        )
+        return null
+      }
+
+      getSiteConfigSuccessCounter.add(1, { lang })
+      console.info(
+        "contentstack.siteConfig success",
+        JSON.stringify({ query: { lang } })
+      )
+
+      const { sitewideAlert } = validatedSiteConfig.data
+
+      return {
+        ...validatedSiteConfig.data,
+        sitewideAlert: sitewideAlert
+          ? {
+              ...sitewideAlert,
+              phoneContact: contactConfig
+                ? getAlertPhoneContactData(sitewideAlert, contactConfig)
+                : null,
+            }
+          : null,
+      }
+    }),
 })

server/routers/contentstack/languageSwitcher/input.ts

@@ -0,0 +1,10 @@
+import { z } from "zod"
+
+import { Lang } from "@/constants/languages"
+
+export const getLanguageSwitcherInput = z
+  .object({
+    lang: z.nativeEnum(Lang),
+    pathName: z.string(),
+  })
+  .optional()

server/routers/contentstack/languageSwitcher/query.ts

@@ -46,8 +46,10 @@ import {
 import { internalServerError } from "@/server/errors/trpc"
 import { publicProcedure, router } from "@/server/trpc"
 
+import { getUidAndContentTypeByPath } from "@/services/cms/getUidAndContentTypeByPath"
 import { generateTag } from "@/utils/generateTag"
 
+import { getLanguageSwitcherInput } from "./input"
 import { validateLanguageSwitcherData } from "./output"
 import { languageSwitcherAffix } from "./utils"
 
@@ -163,87 +165,103 @@ async function getLanguageSwitcher(options: LanguageSwitcherVariables) {
 }
 
 export const languageSwitcherQueryRouter = router({
-  get: publicProcedure.query(async ({ ctx }) => {
-    if (!ctx.uid || !ctx.lang) {
-      return { lang: ctx.lang, urls: baseUrls }
-    }
-    getLanguageSwitcherCounter.add(1, {
-      uid: ctx.uid,
-      lang: ctx.lang,
-      contentType: ctx.contentType,
-    })
-    console.info(
-      "contentstack.languageSwitcher start",
-      JSON.stringify({
-        query: {
-          uid: ctx.uid,
-          lang: ctx.lang,
-          contentType: ctx.contentType,
-        },
+  get: publicProcedure
+    .input(getLanguageSwitcherInput)
+    .query(async ({ input, ctx }) => {
+      let uid = ctx.uid
+      let contentType = ctx.contentType
+      let lang = ctx.lang ?? input?.lang
+
+      if (input) {
+        const data = await getUidAndContentTypeByPath(input.pathName)
+        uid = data.uid
+        contentType = data.contentType ?? ctx.contentType
+      }
+
+      if (!uid || !lang) {
+        return { lang: lang, urls: baseUrls }
+      }
+
+      getLanguageSwitcherCounter.add(1, {
+        uid: uid,
+        lang: lang,
+        contentType: contentType,
       })
-    )
-    const res = await getLanguageSwitcher({
-      contentType: ctx.contentType!,
-      uid: ctx.uid,
-    })
-
-    const urls = Object.keys(res.data).reduce<LanguageSwitcherData>(
-      (acc, key) => {
-        const item = res.data[key as Lang]
-        const url = item
-          ? item.web?.original_url || `/${key}${item.url}`
-          : undefined
-
-        return {
-          ...acc,
-          [key]: { url, isExternal: !!item?.web?.original_url },
-        }
-      },
-      {} as LanguageSwitcherData
-    )
-
-    const validatedLanguageSwitcherData =
-      validateLanguageSwitcherData.safeParse(urls)
-
-    if (!validatedLanguageSwitcherData.success) {
-      getLanguageSwitcherFailCounter.add(1, {
-        uid: ctx.uid,
-        lang: ctx.lang,
-        contentType: ctx.contentType,
-        error_type: "validation_error",
-        error: JSON.stringify(validatedLanguageSwitcherData.error),
-      })
-      console.error(
-        "contentstack.languageSwitcher validation error",
+      console.info(
+        "contentstack.languageSwitcher start",
         JSON.stringify({
           query: {
-            uid: ctx.uid,
-            lang: ctx.lang,
-            contentType: ctx.contentType,
+            uid: uid,
+            lang: lang,
+            contentType: contentType,
           },
-          error: validatedLanguageSwitcherData.error,
         })
       )
-      return null
-    }
-    getLanguageSwitcherSuccessCounter.add(1, {
-      uid: ctx.uid,
-      lang: ctx.lang,
-      contentType: ctx.contentType,
-    })
-    console.info(
-      "contentstack.languageSwitcher success",
-      JSON.stringify({
-        query: {
-          uid: ctx.uid,
-          lang: ctx.lang,
-          contentType: ctx.contentType,
-        },
+      const res = await getLanguageSwitcher({
+        contentType: contentType!,
+        uid: uid,
       })
-    )
-    return {
-      lang: ctx.lang,
-      urls,
-    }
-  }),
+
+      const urls = Object.keys(res.data).reduce<LanguageSwitcherData>(
+        (acc, key) => {
+          const item = res.data[key as Lang]
+
+          if (!item?.url) return acc // Skip languages without a URL
+
+          const url = item
+            ? item.web?.original_url || `/${key}${item.url}`
+            : undefined
+
+          return {
+            ...acc,
+            [key]: { url, isExternal: !!item?.web?.original_url },
+          }
+        },
+        {} as LanguageSwitcherData
+      )
+
+      const validatedLanguageSwitcherData =
+        validateLanguageSwitcherData.safeParse(urls)
+
+      if (!validatedLanguageSwitcherData.success) {
+        getLanguageSwitcherFailCounter.add(1, {
+          uid: uid,
+          lang: lang,
+          contentType: contentType,
+          error_type: "validation_error",
+          error: JSON.stringify(validatedLanguageSwitcherData.error),
+        })
+        console.error(
+          "contentstack.languageSwitcher validation error",
+          JSON.stringify({
+            query: {
+              uid: uid,
+              lang: lang,
+              contentType: contentType,
+            },
+            error: validatedLanguageSwitcherData.error,
+          })
+        )
+        return null
+      }
+      getLanguageSwitcherSuccessCounter.add(1, {
+        uid: uid,
+        lang: lang,
+        contentType: contentType,
+      })
+      console.info(
+        "contentstack.languageSwitcher success",
+        JSON.stringify({
+          query: {
+            uid: uid,
+            lang: lang,
+            contentType: contentType,
+          },
+        })
+      )
+      return {
+        lang: lang,
+        urls,
+      }
+    }),
 })