From 03daf0540e5802e02e83741ebe1833715e0c7ca3 Mon Sep 17 00:00:00 2001
From: Arvid Norlin <arvid.norlin@scandichotels.com>
Date: Wed, 24 Apr 2024 16:15:46 +0200
Subject: [PATCH] fix: correct Shortcuts

---
 components/MyPages/AccountPage/Content.tsx             | 10 +++++++---
 components/MyPages/Blocks/Shortcuts/index.tsx          |  3 ++-
 .../AccountPage/AccountPageContentShortcuts.graphql    |  2 ++
 types/components/myPages/myPage/shortcuts.ts           |  8 +++++++-
 types/requests/myPages/accountpage.ts                  |  8 +++++---
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/components/MyPages/AccountPage/Content.tsx b/components/MyPages/AccountPage/Content.tsx
index b3e46a9a6..1b6a67218 100644
--- a/components/MyPages/AccountPage/Content.tsx
+++ b/components/MyPages/AccountPage/Content.tsx
@@ -66,9 +66,13 @@ export default function Content({ user, lang, content }: ContentProps) {
               />
             )
           case ContentEntries.AccountPageContentShortcuts:
-            const shortcuts = item.shortcuts.shortcuts.map(
-              (shortcut) => shortcut.linkConnection.edges[0].node
-            )
+            const shortcuts = item.shortcuts.shortcuts.map((shortcut) => {
+              return {
+                text: shortcut.text,
+                openInNewTab: shortcut.open_in_new_tab,
+                ...shortcut.linkConnection.edges[0].node,
+              }
+            })
             return (
               <Shortcuts
                 shortcuts={shortcuts}
diff --git a/components/MyPages/Blocks/Shortcuts/index.tsx b/components/MyPages/Blocks/Shortcuts/index.tsx
index fbb408397..a53cb6e08 100644
--- a/components/MyPages/Blocks/Shortcuts/index.tsx
+++ b/components/MyPages/Blocks/Shortcuts/index.tsx
@@ -26,8 +26,9 @@ export default function Shortcuts({
             className={styles.link}
             href={shortcut.url}
             key={shortcut.title}
+            target={shortcut.openInNewTab ? "_blank" : undefined}
           >
-            <span>{shortcut.title}</span>
+            <span>{shortcut.text ? shortcut.text : shortcut.title}</span>
             <Image
               alt="Chevron Icon"
               height={20}
diff --git a/lib/graphql/Fragments/MyPages/AccountPage/AccountPageContentShortcuts.graphql b/lib/graphql/Fragments/MyPages/AccountPage/AccountPageContentShortcuts.graphql
index 4bcfc1044..817954557 100644
--- a/lib/graphql/Fragments/MyPages/AccountPage/AccountPageContentShortcuts.graphql
+++ b/lib/graphql/Fragments/MyPages/AccountPage/AccountPageContentShortcuts.graphql
@@ -7,6 +7,8 @@ fragment AccountPageContentShortcuts on AccountPageContentShortcuts {
     title
     preamble
     shortcuts {
+      text
+      open_in_new_tab
       linkConnection {
         edges {
           node {
diff --git a/types/components/myPages/myPage/shortcuts.ts b/types/components/myPages/myPage/shortcuts.ts
index df586f313..3f98546a0 100644
--- a/types/components/myPages/myPage/shortcuts.ts
+++ b/types/components/myPages/myPage/shortcuts.ts
@@ -1,7 +1,13 @@
 import { ReactNode } from "react"
 
 export type ShortcutsProps = {
-  shortcuts: { url: string; title: string }[]
+  shortcuts: {
+    url: string
+    title: string
+    openInNewTab?: boolean
+    text?: string
+  }[]
   title: string | ReactNode
   subtitle?: string
+  openInNewTab?: boolean
 }
diff --git a/types/requests/myPages/accountpage.ts b/types/requests/myPages/accountpage.ts
index 64c37c19b..b25cc295b 100644
--- a/types/requests/myPages/accountpage.ts
+++ b/types/requests/myPages/accountpage.ts
@@ -1,8 +1,9 @@
 import { AllRequestResponse } from "../utils/all"
-import type { Typename } from "../utils/typename"
-import type { Edges } from "../utils/edges"
 import { PageLink } from "../utils/pageLink"
+
 import { RTEDocument } from "@/types/rte/node"
+import type { Edges } from "../utils/edges"
+import type { Typename } from "../utils/typename"
 
 export enum DynamicContentComponents {
   membership_overview = "membership_overview",
@@ -20,8 +21,9 @@ export enum ContentEntries {
 }
 
 type Shortcut = {
-  text: string
   linkConnection: Edges<PageLink>
+  open_in_new_tab: boolean
+  text: string
 }
 
 type DynamicContent = {