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

middlewares/cmsContent.ts

@@ -2,10 +2,12 @@ import { type NextMiddleware, NextResponse } from "next/server"
 
 import { notFound } from "@/server/errors/next"
 
+import { fetchAndCacheEntry } from "@/services/cms/fetchAndCacheEntry"
+import { getUidAndContentTypeByPath } from "@/services/cms/getUidAndContentTypeByPath"
 import { findLang } from "@/utils/languages"
 import { removeTrailingSlash } from "@/utils/url"
 
-import { fetchAndCacheEntry, getDefaultRequestHeaders } from "./utils"
+import { getDefaultRequestHeaders } from "./utils"
 
 import type { MiddlewareMatcher } from "@/types/middleware"
 import { PageContentTypeEnum } from "@/types/requests/contentType"
@@ -17,22 +19,21 @@ export const middleware: NextMiddleware = async (request) => {
   const pathWithoutTrailingSlash = removeTrailingSlash(nextUrl.pathname)
 
   const contentTypePathName = pathWithoutTrailingSlash.replace(`/${lang}`, "")
-  const isPreview = request.nextUrl.pathname.includes("/preview")
-  const searchParams = new URLSearchParams(request.nextUrl.searchParams)
 
-  let { contentType, uid } = await fetchAndCacheEntry(
-    isPreview
-      ? contentTypePathName.replace("/preview", "")
-      : contentTypePathName,
-    lang
-  )
+  const isPreview = request.nextUrl.pathname.includes("/preview")
+
+  const incomingPathName = isPreview
+    ? contentTypePathName.replace("/preview", "")
+    : contentTypePathName
+
+  let { contentType, uid } = await getUidAndContentTypeByPath(incomingPathName)
+
+  const searchParams = new URLSearchParams(request.nextUrl.searchParams)
 
   if (!contentType || !uid) {
     // Routes to subpages we need to check if the parent of the incomingPathName exists.
     // Then we considered the incomingPathName to be a subpage. These subpages do not live in the CMS.
-    const incomingPathName = isPreview
-      ? contentTypePathName.replace("/preview", "")
-      : contentTypePathName
+
     const incomingPathNameParts = incomingPathName.split("/")
 
     // If the incomingPathName has 2 or more parts, it could possibly be a subpage.

middlewares/myPages.ts

@@ -1,4 +1,4 @@
-import { NextResponse } from "next/server"
+import { type  NextMiddleware,NextResponse  } from "next/server"
 
 import {
   myPages,
@@ -6,15 +6,13 @@ import {
   profile,
   profileEdit,
 } from "@/constants/routes/myPages"
-import { env } from "@/env/server"
-import { internalServerError, notFound } from "@/server/errors/next"
+import { notFound } from "@/server/errors/next"
 import { getPublicNextURL } from "@/server/utils"
 
+import { fetchAndCacheEntry } from "@/services/cms/fetchAndCacheEntry"
 import { findLang } from "@/utils/languages"
 
-import { fetchAndCacheEntry, getDefaultRequestHeaders } from "./utils"
-
-import type { NextMiddleware } from "next/server"
+import { getDefaultRequestHeaders } from "./utils"
 
 import type { MiddlewareMatcher } from "@/types/middleware"
 

middlewares/utils.ts

@@ -1,13 +1,10 @@
 import { getPublicNextURL } from "@/server/utils"
 
-import { resolve as resolveEntry } from "@/utils/entry"
 import { findLang } from "@/utils/languages"
 import { removeTrailingSlash } from "@/utils/url"
 
 import type { NextRequest } from "next/server"
 
-import type { Lang } from "@/constants/languages"
-
 export function getDefaultRequestHeaders(request: NextRequest) {
   const lang = findLang(request.nextUrl.pathname)!
   const nextUrlPublic = getPublicNextURL(request)
@@ -23,49 +20,3 @@ export function getDefaultRequestHeaders(request: NextRequest) {
 
   return headers
 }
-
-const entryResponseCache: Map<
-  string,
-  {
-    contentType: string | null
-    uid: string | null
-    expiresAt: number
-  }
-> = new Map()
-let size: number = 0
-
-export const fetchAndCacheEntry = async (path: string, lang: Lang) => {
-  const cacheKey = `${path + lang}`
-  const cachedResponse = entryResponseCache.get(cacheKey)
-
-  if (cachedResponse && cachedResponse.expiresAt > Date.now() / 1000) {
-    console.log("[CMS MIDDLEWARE]: CACHE HIT")
-    return cachedResponse
-  }
-
-  if (cachedResponse && cachedResponse.expiresAt < Date.now() / 1000) {
-    console.log("[CMS MIDDLEWARE]: CACHE STALE")
-    size -= JSON.stringify(cachedResponse).length
-    entryResponseCache.delete(cacheKey)
-  } else {
-    console.log("[CMS MIDDLEWARE]: CACHE MISS")
-  }
-
-  const { contentType, uid } = await resolveEntry(path, lang)
-  let expiresAt = Date.now() / 1000
-  if (!contentType || !uid) {
-    expiresAt += 600
-  } else {
-    expiresAt += 3600 * 12
-  }
-  const entryCache = { contentType, uid, expiresAt }
-  size += JSON.stringify(entryCache).length
-  console.log("[CMS MIDDLEWARE] Adding to cache", entryCache)
-  console.log("[CMS MIDDLEWARE] Cache size (total)", size)
-  entryResponseCache.set(cacheKey, entryCache)
-
-  return {
-    contentType,
-    uid,
-  }
-}

middlewares/webView.ts

@@ -9,11 +9,11 @@ import {
 import { env } from "@/env/server"
 import { badRequest, notFound } from "@/server/errors/next"
 
+import { fetchAndCacheEntry } from "@/services/cms/fetchAndCacheEntry"
 import { decryptData } from "@/utils/aes"
-import { resolve as resolveEntry } from "@/utils/entry"
 import { findLang } from "@/utils/languages"
 
-import { fetchAndCacheEntry, getDefaultRequestHeaders } from "./utils"
+import { getDefaultRequestHeaders } from "./utils"
 
 import type { MiddlewareMatcher } from "@/types/middleware"