feat(sw-187): Refactor footer output and fixed urls to include language

server/routers/contentstack/base/output.ts

@@ -280,100 +280,155 @@ const validateExternalLink = z
 
 const validateInternalLink = z
   .object({
-    edges: z.array(
-      z.object({
-        node: z.object({
-          title: z.string().optional(),
-          url: z.string().optional(),
-        }),
-      })
-    ),
+    edges: z
+      .array(
+        z.object({
+          node: z.object({
+            system: z.object({
+              uid: z.string(),
+              locale: z.nativeEnum(Lang),
+            }),
+            url: z.string(),
+            title: z.string(),
+            web: z
+              .object({
+                original_url: z.string(),
+              })
+              .optional(),
+          }),
+        })
+      )
+      .max(1),
+  })
+  .transform((data) => {
+    const node = data.edges[0]?.node
+    if (!node) {
+      return null
+    }
+    const url = node.url
+    const originalUrl = node.web?.original_url
+    const lang = node.system.locale
+
+    return {
+      url: originalUrl || removeMultipleSlashes(`/${lang}/${url}`),
+      title: node.title,
+    }
   })
   .optional()
 
-export const validateLinkItem = z.object({
-  open_in_new_tab: z.boolean(),
-  link: validateExternalLink,
-  pageConnection: validateInternalLink,
-})
+export const validateLinkItem = z
+  .object({
+    open_in_new_tab: z.boolean(),
+    link: validateExternalLink,
+    pageConnection: validateInternalLink,
+  })
+  .transform((data) => {
+    return {
+      url: data.pageConnection?.url ?? data.link?.href ?? "",
+      title: data.pageConnection?.title ?? data.link?.title,
+      openInNewTab: data.open_in_new_tab,
+      isExternal: !!data.link?.href,
+    }
+  })
 
-export const validateFooterConfigSchema = z.object({
-  all_footer: z.object({
-    items: z.array(
-      z.object({
-        main_links: z.array(validateLinkItem),
-        app_downloads: z.object({
-          title: z.string(),
-          links: z.array(
-            z.object({
-              type: z.string(),
-              href: validateExternalLink,
-            })
-          ),
-        }),
-        secondary_links: z.array(
-          z.object({
+export const validateFooterConfigSchema = z
+  .object({
+    all_footer: z.object({
+      items: z.array(
+        z.object({
+          main_links: z.array(validateLinkItem),
+          app_downloads: z.object({
             title: z.string(),
-            links: z.array(validateLinkItem),
-          })
-        ),
-        social_media: z.object({
-          links: z.array(
+            links: z.array(
+              z.object({
+                type: z.string(),
+                href: validateExternalLink,
+              })
+            ),
+          }),
+          secondary_links: z.array(
             z.object({
-              type: z.string(),
-              href: validateExternalLink,
+              title: z.string(),
+              links: z.array(validateLinkItem),
             })
           ),
-        }),
-        tertiary_links: z.array(validateLinkItem),
-      })
-    ),
-  }),
-})
+          social_media: z.object({
+            links: z.array(
+              z.object({
+                type: z.string(),
+                href: validateExternalLink,
+              })
+            ),
+          }),
+          tertiary_links: z.array(validateLinkItem),
+        })
+      ),
+    }),
+  })
+  .transform((data) => {
+    const {
+      main_links,
+      app_downloads,
+      secondary_links,
+      social_media,
+      tertiary_links,
+    } = data.all_footer.items[0]
+
+    return {
+      mainLinks: main_links,
+      appDownloads: app_downloads,
+      secondaryLinks: secondary_links,
+      socialMedia: social_media,
+      tertiaryLinks: tertiary_links,
+    }
+  })
 
 const pageConnectionRefs = z.object({
-  edges: z.array(
-    z.object({
-      node: z.object({
-        __typename: z.nativeEnum(PageLinkEnum),
-        system: z.object({
-          content_type_uid: z.string(),
-          uid: z.string(),
+  edges: z
+    .array(
+      z.object({
+        node: z.object({
+          system: z.object({
+            content_type_uid: z.string(),
+            uid: z.string(),
+          }),
         }),
-      }),
-    })
-  ),
+      })
+    )
+    .max(1),
 })
 
 export const validateFooterRefConfigSchema = z.object({
   all_footer: z.object({
-    items: z.array(
-      z.object({
-        main_links: z.array(
-          z.object({
-            pageConnection: pageConnectionRefs,
-          })
-        ),
-        secondary_links: z.array(
-          z.object({
-            links: z.array(
-              z.object({
-                pageConnection: pageConnectionRefs,
-              })
-            ),
-          })
-        ),
-        tertiary_links: z.array(
-          z.object({
-            pageConnection: pageConnectionRefs,
-          })
-        ),
-        system: z.object({
-          content_type_uid: z.string(),
-          uid: z.string(),
-        }),
-      })
-    ),
+    items: z
+      .array(
+        z.object({
+          main_links: z.array(
+            z.object({
+              pageConnection: pageConnectionRefs,
+            })
+          ),
+          secondary_links: z.array(
+            z.object({
+              links: z.array(
+                z.object({
+                  pageConnection: pageConnectionRefs,
+                })
+              ),
+            })
+          ),
+          tertiary_links: z.array(
+            z.object({
+              pageConnection: pageConnectionRefs,
+            })
+          ),
+          system: z.object({
+            content_type_uid: z.string(),
+            uid: z.string(),
+          }),
+        })
+      )
+      .length(1),
   }),
 })
 

server/routers/contentstack/base/query.ts

@@ -37,11 +37,7 @@ import {
   validateFooterConfigSchema,
   validateFooterRefConfigSchema,
 } from "./output"
-import {
-  getConnections,
-  getFooterConnections,
-  transformPageConnectionLinks,
-} from "./utils"
+import { getConnections, getFooterConnections } from "./utils"
 
 import type {
   FooterDataRaw,
@@ -658,28 +654,7 @@ export const baseQueryRouter = router({
       "contentstack.footer success",
       JSON.stringify({ query: { lang } })
     )
-    const validatedFooterData = validatedFooterConfig.data.all_footer.items[0]
-    const mainLinks = transformPageConnectionLinks(
-      validatedFooterData.main_links
-    )
 
-    const secondaryLinks = validatedFooterData.secondary_links.map(
-      (section) => ({
-        title: section.title,
-        links: transformPageConnectionLinks(section.links),
-      })
-    )
-
-    const tertiaryLinks = transformPageConnectionLinks(
-      validatedFooterData.tertiary_links
-    )
-
-    return {
-      mainLinks: mainLinks,
-      appDownloads: validatedFooterData.app_downloads,
-      secondaryLinks: secondaryLinks,
-      socialMedia: validatedFooterData.social_media,
-      tertiaryLinks: tertiaryLinks,
-    }
+    return validatedFooterConfig.data
   }),
 })

server/routers/contentstack/base/utils.ts

@@ -69,27 +69,3 @@ export function getFooterConnections(refs: FooterRefDataRaw) {
 
   return connections
 }
-
-export function transformPageConnectionLinks(links: FooterLinkItem[]) {
-  if (!links) return []
-  return links.flatMap((link) => {
-    if (link.pageConnection?.edges.length) {
-      return link.pageConnection.edges.map((edge) => ({
-        title: edge.node.title || "",
-        url: edge.node.url || "",
-        openInNewTab: link.open_in_new_tab,
-        isExternal: false,
-      }))
-    } else if (link.link) {
-      return [
-        {
-          title: link.link.title,
-          url: link.link.href,
-          openInNewTab: link.open_in_new_tab,
-          isExternal: true,
-        },
-      ]
-    }
-    return []
-  })
-}