Merged in fix/puffs-map-in-map (pull request #23)

fix: move puffs map to own container

Approved-by: Michael Zetterberg

components/Current/Aside.tsx

@@ -1,6 +1,4 @@
-import { Fragment } from "react"
+import Puffs from "./Asides/Puffs"
-
-import Puff from "./Asides/Puff"
 
 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 (
+            return <Puffs key={`block-${idx}`} puffs={block.puff.puffConnection.edges} />
-              <Fragment key={`puff-${idx}`}>
-                {block.puff.puffConnection.edges.map(puff => (
-                  <Puff key={puff.node.system.uid} {...puff.node} />
-                ))}
-              </Fragment>
-            )
           default:
             return null
         }

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"
 import Image from "@/components/Image"
 
-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) {

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} />
+      ))}
+    </>
+  )
+}

lib/graphql/Fragments/Puff.graphql

@@ -14,7 +14,6 @@ fragment Puff on Puff {
     href
     title
   }
-  link_text
   pageConnection {
     edges {
       node {

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>[]
+}

types/requests/puff.ts

@@ -11,7 +11,6 @@ export type Puff = {
     href: string
     title: string
   }
-  link_text?: string
   pageConnection: Edges<PageLink>
   system: {
     uid: string