From 93089289b52c8db618c479fdea308a45fa8b255d Mon Sep 17 00:00:00 2001
From: Simon Emanuelsson <simon.emanuelsson@scandichotels.com>
Date: Mon, 12 Feb 2024 16:43:46 +0100
Subject: [PATCH] fix: move puffs map to own container

---
 components/Current/Aside.tsx                     | 12 ++----------
 .../Current/Asides/{ => Puffs}/Puff/index.tsx    |  2 +-
 .../Asides/{ => Puffs}/Puff/puff.module.css      |  0
 .../Asides/{ => Puffs}/Puff/renderOptions.tsx    |  0
 components/Current/Asides/Puffs/index.tsx        | 16 ++++++++++++++++
 lib/graphql/Fragments/Puff.graphql               |  1 -
 types/components/current/asides/puffs.ts         |  6 ++++++
 types/requests/puff.ts                           |  1 -
 8 files changed, 25 insertions(+), 13 deletions(-)
 rename components/Current/Asides/{ => Puffs}/Puff/index.tsx (96%)
 rename components/Current/Asides/{ => Puffs}/Puff/puff.module.css (100%)
 rename components/Current/Asides/{ => Puffs}/Puff/renderOptions.tsx (100%)
 create mode 100644 components/Current/Asides/Puffs/index.tsx
 create mode 100644 types/components/current/asides/puffs.ts

diff --git a/components/Current/Aside.tsx b/components/Current/Aside.tsx
index 5f9e36c78..ea16faef9 100644
--- a/components/Current/Aside.tsx
+++ b/components/Current/Aside.tsx
@@ -1,6 +1,4 @@
-import { Fragment } from "react"
-
-import Puff from "./Asides/Puff"
+import Puffs from "./Asides/Puffs"
 
 import { AsideTypenameEnum } from "@/types/requests/utils/typename"
 import type { AsideProps } from "@/types/components/current/aside"
@@ -18,13 +16,7 @@ export default function Aside({ blocks }: AsideProps) {
           case AsideTypenameEnum.CurrentBlocksPageAsideContact:
             return null
           case AsideTypenameEnum.CurrentBlocksPageAsidePuff:
-            return (
-              <Fragment key={`puff-${idx}`}>
-                {block.puff.puffConnection.edges.map(puff => (
-                  <Puff key={puff.node.system.uid} {...puff.node} />
-                ))}
-              </Fragment>
-            )
+            return <Puffs key={`block-${idx}`} puffs={block.puff.puffConnection.edges} />
           default:
             return null
         }
diff --git a/components/Current/Asides/Puff/index.tsx b/components/Current/Asides/Puffs/Puff/index.tsx
similarity index 96%
rename from components/Current/Asides/Puff/index.tsx
rename to components/Current/Asides/Puffs/Puff/index.tsx
index ac2054e42..5cf64b2a5 100644
--- a/components/Current/Asides/Puff/index.tsx
+++ b/components/Current/Asides/Puffs/Puff/index.tsx
@@ -8,7 +8,7 @@ import styles from "./puff.module.css"
 
 import type { PuffProps } from "@/types/components/current/asides/puff"
 
-export default function Puff({ imageConnection, is_internal, link, link_text, pageConnection, text, title }: PuffProps) {
+export default function Puff({ imageConnection, is_internal, link, pageConnection, text, title }: PuffProps) {
   if (is_internal) {
     const page = pageConnection.edges[0]
     if (!page?.node?.url) {
diff --git a/components/Current/Asides/Puff/puff.module.css b/components/Current/Asides/Puffs/Puff/puff.module.css
similarity index 100%
rename from components/Current/Asides/Puff/puff.module.css
rename to components/Current/Asides/Puffs/Puff/puff.module.css
diff --git a/components/Current/Asides/Puff/renderOptions.tsx b/components/Current/Asides/Puffs/Puff/renderOptions.tsx
similarity index 100%
rename from components/Current/Asides/Puff/renderOptions.tsx
rename to components/Current/Asides/Puffs/Puff/renderOptions.tsx
diff --git a/components/Current/Asides/Puffs/index.tsx b/components/Current/Asides/Puffs/index.tsx
new file mode 100644
index 000000000..a071c3062
--- /dev/null
+++ b/components/Current/Asides/Puffs/index.tsx
@@ -0,0 +1,16 @@
+import Puff from "./Puff"
+
+import type { PuffsProps } from "@/types/components/current/asides/puffs"
+
+export default function Puffs({ puffs }: PuffsProps) {
+  if (!puffs.length) {
+    return null
+  }
+  return (
+    <>
+      {puffs.map(puff => (
+        <Puff key={puff.node.system.uid} {...puff.node} />
+      ))}
+    </>
+  )
+}
diff --git a/lib/graphql/Fragments/Puff.graphql b/lib/graphql/Fragments/Puff.graphql
index 73a55e429..e8e22d952 100644
--- a/lib/graphql/Fragments/Puff.graphql
+++ b/lib/graphql/Fragments/Puff.graphql
@@ -14,7 +14,6 @@ fragment Puff on Puff {
     href
     title
   }
-  link_text
   pageConnection {
     edges {
       node {
diff --git a/types/components/current/asides/puffs.ts b/types/components/current/asides/puffs.ts
new file mode 100644
index 000000000..9a1691b91
--- /dev/null
+++ b/types/components/current/asides/puffs.ts
@@ -0,0 +1,6 @@
+import type { Node } from "@/types/requests/utils/edges"
+import type { Puff } from "@/types/requests/puff"
+
+export type PuffsProps = {
+  puffs: Node<Puff>[]
+}
diff --git a/types/requests/puff.ts b/types/requests/puff.ts
index b1d6fc553..4a591a333 100644
--- a/types/requests/puff.ts
+++ b/types/requests/puff.ts
@@ -11,7 +11,6 @@ export type Puff = {
     href: string
     title: string
   }
-  link_text?: string
   pageConnection: Edges<PageLink>
   system: {
     uid: string