fix: sync current header with static-pages

components/Current/Header/MainMenu/index.tsx

@@ -3,20 +3,16 @@ import { useState } from "react"
 
 import Image from "@/components/Image"
 
-import Mobile from "../LanguageSwitcher/Mobile"
-
 import styles from "./mainMenu.module.css"
 
 import type { MainMenuProps } from "@/types/components/current/header/mainMenu"
 
 export default function MainMenu({
-  currentLanguage,
   frontpageLinkText,
   homeHref,
   links,
   logo,
   topMenuMobileLinks,
-  urls,
 }: MainMenuProps) {
   const [isOpen, setIsOpen] = useState(false)
 
@@ -69,8 +65,8 @@ export default function MainMenu({
             data-collapsable="main-menu"
             id="main-menu"
           >
-            {links.map((link) => (
-              <li className={styles.li} key={link.href}>
+            {links.map((link, i) => (
+              <li className={styles.li} key={link.href + i}>
                 <a className={styles.link} href={link.href}>
                   {link.title}
                 </a>
@@ -78,8 +74,8 @@ export default function MainMenu({
             ))}
 
             <ul className={styles.mobileList}>
-              {topMenuMobileLinks.map(({ link }) => (
-                <li className={styles.mobileLi} key={link.href}>
+              {topMenuMobileLinks.map(({ link }, i) => (
+                <li className={styles.mobileLi} key={link.href + i}>
                   <a className={styles.mobileLink} href={link.href}>
                     {link.title}
                   </a>
@@ -87,11 +83,9 @@ export default function MainMenu({
               ))}
             </ul>
 
-            {urls ? (
-              <li className={styles.mobileLi}>
-                <Mobile currentLanguage={currentLanguage} urls={urls} />
-              </li>
-            ) : null}
+            {/* {languageSwitcher ? (
+              <li className={styles.mobileLi}>{languageSwitcher}</li>
+            ) : null} */}
           </ul>
         </nav>
       </div>

components/Current/Header/TopMenu/index.tsx

@@ -1,33 +1,29 @@
-import Desktop from "../LanguageSwitcher/Desktop"
-
 import styles from "./topMenu.module.css"
 
 import type { TopMenuProps } from "@/types/components/current/header/topMenu"
 
-export default function TopMenu({ currentLanguage, frontpageLinkText, homeHref, links, urls }: TopMenuProps) {
+export default function TopMenu({
+  frontpageLinkText,
+  homeHref,
+  links,
+}: TopMenuProps) {
   return (
     <div className={styles.topMenu}>
       <div className={styles.container}>
-        <a
-          className={styles.homeLink}
-          href={homeHref}
-        >
+        <a className={styles.homeLink} href={homeHref}>
           {frontpageLinkText}
         </a>
 
         <ul className={styles.list}>
-          {urls ? (
+          {/* {languageSwitcher ? (
             <li className="nav-secondary__item hidden-xxsmall hidden-xsmall hidden-small">
-              <Desktop currentLanguage={currentLanguage} urls={urls} />
+              {languageSwitcher}
             </li>
-          ) : null}
+          ) : null} */}
 
-          {links.map(({ link }) => (
-            <li key={link.href}>
-              <a
-                className={styles.link}
-                href={link.href}
-              >
+          {links.map(({ link }, i) => (
+            <li key={link.href + i}>
+              <a className={styles.link} href={link.href}>
                 {link.title}
               </a>
             </li>

components/Current/Header/index.tsx

@@ -1,13 +1,6 @@
 import { homeHrefs } from "@/constants/homeHrefs"
-import { languages } from "@/constants/languages"
 import { env } from "@/env/server"
-import { batchRequest } from "@/lib/graphql/batchRequest"
-import { GetHeader } from "@/lib/graphql/Query/Header.graphql"
-import {
-  GetDaDeEnUrls,
-  GetFiNoSvUrls,
-} from "@/lib/graphql/Query/LanguageSwitcher.graphql"
-import { request } from "@/lib/graphql/request"
+import { serverClient } from "@/lib/trpc/server"
 
 import MainMenu from "./MainMenu"
 import OfflineBanner from "./OfflineBanner"
@@ -15,72 +8,33 @@ import TopMenu from "./TopMenu"
 
 import styles from "./header.module.css"
 
-import type { HeaderProps } from "@/types/components/current/header"
 import { LangParams } from "@/types/params"
-import type { HeaderQueryData } from "@/types/requests/header"
-import type { LanguageSwitcherQueryData } from "@/types/requests/languageSwitcher"
 
-export default async function Header({ lang, uid }: LangParams & HeaderProps) {
-  try {
-    const variables = {
-      locale: lang,
-      uid,
-    }
+export default async function Header({ lang }: LangParams) {
+  const data = await serverClient().contentstack.config.header()
 
-    const { data } = await request<HeaderQueryData>(
-      GetHeader,
-      { locale: lang },
-      { next: { tags: [`header-${lang}`] } }
-    )
-    const { data: urls } = await batchRequest<LanguageSwitcherQueryData>([
-      {
-        document: GetDaDeEnUrls,
-        tags: [`DA-DE-EN-${uid}`],
-        variables,
-      },
-      {
-        document: GetFiNoSvUrls,
-        tags: [`FI-NO-SV-${uid}`],
-        variables,
-      },
-    ])
+  const homeHref = homeHrefs[env.NODE_ENV][lang]
+  const { frontpage_link_text, logo, menu, top_menu } = data
 
-    if (!data.all_header.items.length) {
-      return null
-    }
+  const topMenuMobileLinks = top_menu.links
+    .filter((link) => link.show_on_mobile)
+    .sort((a, b) => (a.sort_order_mobile < b.sort_order_mobile ? 1 : -1))
 
-    const currentLanguage = languages[lang]
-    const homeHref = homeHrefs[env.NODE_ENV][lang]
-    const { frontpage_link_text, logoConnection, menu, top_menu } =
-      data.all_header.items[0]
-    const logo = logoConnection.edges?.[0]?.node
-    const topMenuMobileLinks = top_menu.links
-      .filter((link) => link.show_on_mobile)
-      .sort((a, b) => (a.sort_order_mobile < b.sort_order_mobile ? 1 : -1))
-
-    return (
-      <header className={styles.header} role="banner">
-        <OfflineBanner />
-        <TopMenu
-          currentLanguage={currentLanguage}
-          frontpageLinkText={frontpage_link_text}
-          homeHref={homeHref}
-          links={top_menu.links}
-          urls={urls}
-        />
-        <MainMenu
-          currentLanguage={currentLanguage}
-          frontpageLinkText={frontpage_link_text}
-          homeHref={homeHref}
-          links={menu.links}
-          logo={logo}
-          topMenuMobileLinks={topMenuMobileLinks}
-          urls={urls}
-        />
-      </header>
-    )
-  } catch (error) {
-    console.error(error)
-    return null
-  }
+  return (
+    <header className={styles.header} role="banner">
+      <OfflineBanner />
+      <TopMenu
+        frontpageLinkText={frontpage_link_text}
+        homeHref={homeHref}
+        links={top_menu.links}
+      />
+      <MainMenu
+        frontpageLinkText={frontpage_link_text}
+        homeHref={homeHref}
+        links={menu.links}
+        logo={logo}
+        topMenuMobileLinks={topMenuMobileLinks}
+      />
+    </header>
+  )
 }

components/Loyalty/Sidebar/JoinLoyalty/Contact/ContactRow/index.tsx

@@ -8,7 +8,7 @@ import styles from "./contactRow.module.css"
 import type { ContactRowProps } from "@/types/components/loyalty/sidebar"
 
 export default async function ContactRow({ contact }: ContactRowProps) {
-  const data = await serverClient().contentstack.contactConfig.get()
+  const data = await serverClient().contentstack.config.contact()
 
   const val = getValueFromContactConfig(contact.contact_field, data)