fix: rename retried-wrapped fetch to make caching work again

server/routers/contentstack/myPages/navigation/query.ts

@@ -13,19 +13,15 @@ import {
   generateTag,
   generateTags,
 } from "@/utils/generateTag"
-import { removeMultipleSlashes } from "@/utils/url"
 
 import {
   type GetNavigationMyPagesData,
   type GetNavigationMyPagesRefsData,
   getNavigationSchema,
-  type MenuItems,
   navigationPayloadSchema,
   navigationRefsPayloadSchema,
 } from "./output"
-import { getConnections } from "./utils"
-
-import { PageLinkEnum } from "@/types/requests/pageLinks"
+import { getConnections, mapMenuItems } from "./utils"
 
 const meter = metrics.getMeter("trpc.navigationMyPages")
 const getNavigationMyPagesRefsCounter = meter.createCounter(
@@ -47,39 +43,6 @@ const getNavigationMyPagesFailCounter = meter.createCounter(
   "trpc.contentstack.navigationMyPages.get-fail"
 )
 
-export function mapMenuItems(menuItems: MenuItems) {
-  return menuItems.map((menuItem) => {
-    return {
-      ...menuItem,
-      links: menuItem.links
-        .filter((link) => {
-          // If content is unpublished or in other way inaccessible in Contentstack
-          // there will be no edges, filter out those links.
-          return !!link.page.edges[0]
-        })
-        .map((link) => {
-          const page = link.page.edges[0].node
-          let originalUrl = undefined
-          if (
-            page.__typename === PageLinkEnum.ContentPage ||
-            page.__typename === PageLinkEnum.LoyaltyPage
-          ) {
-            if (page.web.original_url) {
-              originalUrl = page.web.original_url
-            }
-          }
-          return {
-            lang: page.system.locale,
-            linkText: link.link_text ? link.link_text : page.title,
-            uid: page.system.uid,
-            url: removeMultipleSlashes(`/${page.system.locale}/${page.url}`),
-            originalUrl,
-          }
-        }),
-    }
-  })
-}
-
 export const navigationQueryRouter = router({
   get: contentstackBaseProcedure.query(async function ({ ctx }) {
     const { lang } = ctx
@@ -92,7 +55,10 @@ export const navigationQueryRouter = router({
       GetNavigationMyPagesRefs,
       { locale: lang },
       {
-        tags: [generateRefsResponseTag(lang, "navigation_my_pages")],
+        cache: "force-cache",
+        next: {
+          tags: [generateRefsResponseTag(lang, "navigation_my_pages")],
+        },
       }
     )
 
@@ -157,7 +123,10 @@ export const navigationQueryRouter = router({
     const response = await request<GetNavigationMyPagesData>(
       GetNavigationMyPages,
       { locale: lang },
-      { tags }
+      {
+        cache: "force-cache",
+        next: { tags },
+      }
     )
 
     if (!response.data) {

server/routers/contentstack/myPages/navigation/utils.ts

@@ -1,6 +1,9 @@
+import { removeMultipleSlashes } from "@/utils/url"
+
+import { PageLinkEnum } from "@/types/requests/pageLinks"
 import type { Edges } from "@/types/requests/utils/edges"
 import type { NodeRefs } from "@/types/requests/utils/refs"
-import type { GetNavigationMyPagesRefsData } from "./output"
+import type { GetNavigationMyPagesRefsData, MenuItems } from "./output"
 
 export function getConnections(refs: GetNavigationMyPagesRefsData) {
   const connections: Edges<NodeRefs>[] = []
@@ -14,3 +17,36 @@ export function getConnections(refs: GetNavigationMyPagesRefsData) {
 
   return connections
 }
+
+export function mapMenuItems(menuItems: MenuItems) {
+  return menuItems.map((menuItem) => {
+    return {
+      ...menuItem,
+      links: menuItem.links
+        .filter((link) => {
+          // If content is unpublished or in other way inaccessible in Contentstack
+          // there will be no edges, filter out those links.
+          return !!link.page.edges[0]
+        })
+        .map((link) => {
+          const page = link.page.edges[0].node
+          let originalUrl = undefined
+          if (
+            page.__typename === PageLinkEnum.ContentPage ||
+            page.__typename === PageLinkEnum.LoyaltyPage
+          ) {
+            if (page.web.original_url) {
+              originalUrl = page.web.original_url
+            }
+          }
+          return {
+            lang: page.system.locale,
+            linkText: link.link_text ? link.link_text : page.title,
+            uid: page.system.uid,
+            url: removeMultipleSlashes(`/${page.system.locale}/${page.url}`),
+            originalUrl,
+          }
+        }),
+    }
+  })
+}