feat(WEB-112): adjust current-blocks-page to new model

components/Current/Aside/Puff/index.tsx

@@ -0,0 +1,42 @@
+import { renderOptions } from "./renderOptions"
+
+import Image from "@/components/Image"
+import JsonToHtml from "@/components/JsonToHtml"
+
+import styles from "./puff.module.css"
+
+import type { PuffProps } from "@/types/components/current/asides/puff"
+
+export default function Puff({
+  imageConnection,
+  link,
+  text,
+  title,
+}: PuffProps) {
+  return (
+    <a className={styles.link} href={link.href}>
+      <article>
+        {imageConnection.edges.map((image) => (
+          <Image
+            alt={image.node.title}
+            className={styles.image}
+            height={image.node.dimension.height}
+            key={image.node.system.uid}
+            src={image.node.url}
+            width={image.node.dimension.width}
+          />
+        ))}
+        <section className={styles.content}>
+          <header>
+            <h3 className={styles.heading}>{title}</h3>
+          </header>
+          <JsonToHtml
+            embeds={[]}
+            nodes={text.json.children}
+            renderOptions={renderOptions}
+          />
+        </section>
+      </article>
+    </a>
+  )
+}

components/Current/Aside/Puffs/Puff/index.tsx

@@ -1,74 +0,0 @@
-import { renderOptions } from "./renderOptions"
-
-import Image from "@/components/Image"
-import JsonToHtml from "@/components/JsonToHtml"
-import Link from "next/link"
-
-import styles from "./puff.module.css"
-
-import type { PuffProps } from "@/types/components/current/asides/puff"
-
-export default function Puff({
-  imageConnection,
-  is_internal,
-  link,
-  pageConnection,
-  text,
-  title,
-}: PuffProps) {
-  if (is_internal) {
-    const page = pageConnection.edges[0]
-    if (!page?.node?.url) {
-      return null
-    }
-    return (
-      <Link className={styles.link} href={`/${page.node.system.locale}${page.node.url}`}>
-        <PuffContent
-          imageConnection={imageConnection}
-          text={text}
-          title={title}
-        />
-      </Link>
-    )
-  }
-  return (
-    <a className={styles.link} href={link.href} target="_blank">
-      <PuffContent
-        imageConnection={imageConnection}
-        text={text}
-        title={title}
-      />
-    </a>
-  )
-}
-
-function PuffContent({
-  imageConnection,
-  text,
-  title,
-}: Pick<PuffProps, "imageConnection" | "text" | "title">) {
-  return (
-    <article>
-      {imageConnection.edges.map((image) => (
-        <Image
-          alt={image.node.title}
-          className={styles.image}
-          height={image.node.dimension.height}
-          key={image.node.system.uid}
-          src={image.node.url}
-          width={image.node.dimension.width}
-        />
-      ))}
-      <section className={styles.content}>
-        <header>
-          <h3 className={styles.heading}>{title}</h3>
-        </header>
-        <JsonToHtml
-          embeds={text.embedded_itemsConnection.edges}
-          nodes={text.json.children}
-          renderOptions={renderOptions}
-        />
-      </section>
-    </article>
-  )
-}

components/Current/Aside/Puffs/index.tsx

@@ -1,16 +0,0 @@
-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} />
-      ))}
-    </>
-  )
-}

components/Current/Aside/index.tsx

@@ -1,4 +1,4 @@
-import Puffs from "./Puffs"
+import Puff from "./Puff"
 import Contacts from "./Contacts"
 
 import { AsideTypenameEnum } from "@/types/requests/utils/typename"
@@ -25,9 +25,9 @@ export default function Aside({ blocks }: AsideProps) {
             )
           case AsideTypenameEnum.CurrentBlocksPageAsidePuff:
             return (
-              <Puffs
+              <Puff
                 key={`block-${idx}`}
-                puffs={block.puff.puffConnection.edges}
+                {...block.puff}
               />
             )
           default: