From ff893a84bce2cc81aec89cb3ebac536f9aae618f Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Thu, 11 Jul 2024 18:57:24 +0200
Subject: [PATCH 001/100] chore: bump default php memory limit

---
 .lagoon/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.lagoon/Dockerfile b/.lagoon/Dockerfile
index db5094463..5c0858c05 100644
--- a/.lagoon/Dockerfile
+++ b/.lagoon/Dockerfile
@@ -60,6 +60,7 @@ COPY --from=builder /tmp/.deploy/cms /app
 
 WORKDIR /app
 ENV WEBROOT=web
+ENV PHP_MEMORY_LIMIT=2048
 
 # ====================================================================================================
 # PHP IMAGE
@@ -73,6 +74,7 @@ COPY --from=cli /app /app
 
 WORKDIR /app
 ENV WEBROOT=web
+ENV PHP_MEMORY_LIMIT=2048
 
 # ====================================================================================================
 # NGINX IMAGE

From 3091d2d1a9954ac0a5ed9f1baf3c4478010ac149 Mon Sep 17 00:00:00 2001
From: Alex Tkachev <alex.leksat@gmail.com>
Date: Sun, 14 Jul 2024 13:45:16 +0400
Subject: [PATCH 002/100] feat(SLB-451): conditional content block

---
 .../src/blocks/conditional.tsx                | 171 ++++++++++++++++++
 packages/drupal/gutenberg_blocks/src/index.ts |   1 +
 .../52ee5cc7-0ac5-49b5-8550-ce59476bd4ac.yml  |  62 +++++++
 packages/schema/src/fragments/Page.gql        |   1 +
 .../PageContent/BlockConditional.gql          |  17 ++
 packages/schema/src/schema.graphql            |  19 ++
 .../PageContent/BlockConditional.tsx          |  30 +++
 .../src/components/Organisms/PageDisplay.tsx  |  61 ++++---
 tests/schema/specs/blocks.spec.ts             |  55 ++++++
 9 files changed, 393 insertions(+), 24 deletions(-)
 create mode 100644 packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
 create mode 100644 packages/drupal/test_content/content/node/52ee5cc7-0ac5-49b5-8550-ce59476bd4ac.yml
 create mode 100644 packages/schema/src/fragments/PageContent/BlockConditional.gql
 create mode 100644 packages/ui/src/components/Organisms/PageContent/BlockConditional.tsx

diff --git a/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx b/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
new file mode 100644
index 000000000..131c59b2f
--- /dev/null
+++ b/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
@@ -0,0 +1,171 @@
+import clsx from 'clsx';
+import { InnerBlocks, InspectorControls } from 'wordpress__block-editor';
+import { registerBlockType } from 'wordpress__blocks';
+import { BaseControl, PanelBody } from 'wordpress__components';
+
+// @ts-ignore
+const { t: __ } = Drupal;
+
+registerBlockType(`custom/conditional`, {
+  title: __('Conditional content'),
+  category: 'layout',
+  icon: 'category',
+  // Allow the block only at the root level to avoid GraphQL fragment recursion.
+  parent: ['custom/content'],
+  attributes: {
+    displayFrom: {
+      type: 'string',
+      default: '',
+    },
+    displayTo: {
+      type: 'string',
+      default: '',
+    },
+    purpose: {
+      type: 'string',
+      default: '',
+    },
+  },
+  edit(props) {
+    const { attributes, setAttributes } = props;
+
+    const displayFrom = attributes.displayFrom as string | undefined;
+    const displayTo = attributes.displayTo as string | undefined;
+    const purpose = ((attributes.purpose as string) || '').trim();
+
+    // Same logic as in BlockConditional.tsx
+    const active = {
+      scheduledDisplay: [
+        displayFrom
+          ? new Date(displayFrom).getTime() <= new Date().getTime()
+          : true,
+        displayTo ? new Date(displayTo).getTime() > new Date().getTime() : true,
+      ].every(Boolean),
+    };
+    const isActive = Object.values(active).every(Boolean);
+
+    const conditions = {
+      scheduledDisplay:
+        displayFrom || displayTo
+          ? '🕒 ' +
+            __('Scheduled display') +
+            ': ' +
+            [
+              displayFrom
+                ? __('From') + ' ' + new Date(displayFrom).toLocaleString()
+                : '',
+              displayTo
+                ? __('To') + ' ' + new Date(displayTo).toLocaleString()
+                : '',
+            ]
+              .filter(Boolean)
+              .join(' ')
+          : '',
+    };
+    const hasConditions = Object.values(conditions).some(Boolean);
+    const summary = hasConditions ? (
+      Object.entries(conditions)
+        .filter(([, value]) => !!value)
+        .map(([key, value]) => <div key={key}>{value}</div>)
+    ) : (
+      <div>{'ℹ️ ' + __('No conditions set')}</div>
+    );
+
+    return (
+      <div className={clsx('container-wrapper', { 'bg-gray-100': !isActive })}>
+        <div className={'container-label'}>{__('Conditional content')}</div>
+        <div className="text-sm text-gray-500">{summary}</div>
+        <details open={isActive}>
+          <summary
+            style={{ cursor: 'pointer', padding: 0 }}
+            className="text-sm text-gray-500"
+          >
+            {purpose || __('Content')}
+          </summary>
+          <InnerBlocks
+            templateLock={false}
+            template={[['core/paragraph', {}]]}
+          />
+        </details>
+        <InspectorControls>
+          <PanelBody title={__('Purpose')}>
+            <BaseControl id="purpose">
+              <input
+                type="text"
+                id="purpose"
+                defaultValue={purpose}
+                onChange={(event) => {
+                  setAttributes({ purpose: event.target.value });
+                }}
+              />
+            </BaseControl>
+            <BaseControl
+              id="purpose-decription"
+              label={__(
+                'The value is not exposed to the frontend and serves to identify the reason of the conditional content (e.g. Summer Campaign).',
+              )}
+            >
+              <div />
+            </BaseControl>
+          </PanelBody>
+          <PanelBody title={__('Scheduled display')}>
+            <BaseControl id="displayFrom" label={__('From')}>
+              <br />
+              <input
+                type="datetime-local"
+                id="displayFrom"
+                defaultValue={displayFrom ? isoToLocalTime(displayFrom) : ''}
+                onChange={(event) => {
+                  setAttributes({
+                    displayFrom: event.target.value
+                      ? localToIsoTime(event.target.value)
+                      : '',
+                  });
+                }}
+              />
+            </BaseControl>
+            <BaseControl id="displayTo" label={__('To')}>
+              <br />
+              <input
+                type="datetime-local"
+                id="displayTo"
+                defaultValue={displayTo ? isoToLocalTime(displayTo) : ''}
+                onChange={(event) => {
+                  setAttributes({
+                    displayTo: event.target.value
+                      ? localToIsoTime(event.target.value)
+                      : '',
+                  });
+                }}
+              />
+            </BaseControl>
+            <BaseControl
+              id="decription"
+              label={
+                __('Time zone') +
+                ': ' +
+                Intl.DateTimeFormat().resolvedOptions().timeZone
+              }
+            >
+              <div />
+            </BaseControl>
+          </PanelBody>
+        </InspectorControls>
+      </div>
+    );
+  },
+
+  save() {
+    return <InnerBlocks.Content />;
+  },
+});
+
+function localToIsoTime(localTime: string) {
+  return new Date(localTime).toISOString();
+}
+
+function isoToLocalTime(isoTime: string) {
+  const date = new Date(isoTime);
+  date.setMinutes(date.getMinutes() - date.getTimezoneOffset());
+  return date.toISOString().slice(0, 16);
+}
diff --git a/packages/drupal/gutenberg_blocks/src/index.ts b/packages/drupal/gutenberg_blocks/src/index.ts
index 9a846e2b3..256fb2d0c 100644
--- a/packages/drupal/gutenberg_blocks/src/index.ts
+++ b/packages/drupal/gutenberg_blocks/src/index.ts
@@ -10,6 +10,7 @@ import './blocks/image-with-text';
 import './filters/list';
 import './blocks/cta';
 import './blocks/quote';
+import './blocks/conditional';
 import './blocks/horizontal-separator';
 import './blocks/accordion';
 import './blocks/accordion-item-text';
diff --git a/packages/drupal/test_content/content/node/52ee5cc7-0ac5-49b5-8550-ce59476bd4ac.yml b/packages/drupal/test_content/content/node/52ee5cc7-0ac5-49b5-8550-ce59476bd4ac.yml
new file mode 100644
index 000000000..d59c3dc67
--- /dev/null
+++ b/packages/drupal/test_content/content/node/52ee5cc7-0ac5-49b5-8550-ce59476bd4ac.yml
@@ -0,0 +1,62 @@
+_meta:
+  version: '1.0'
+  entity_type: node
+  uuid: 52ee5cc7-0ac5-49b5-8550-ce59476bd4ac
+  bundle: page
+  default_langcode: en
+default:
+  revision_uid:
+    -
+      target_id: 1
+  status:
+    -
+      value: true
+  uid:
+    -
+      target_id: 1
+  title:
+    -
+      value: 'Conditional blocks'
+  created:
+    -
+      value: 1715684657
+  promote:
+    -
+      value: false
+  sticky:
+    -
+      value: false
+  moderation_state:
+    -
+      value: published
+  path:
+    -
+      alias: /conditional-blocks
+      langcode: en
+      pathauto: 0
+  content_translation_source:
+    -
+      value: und
+  content_translation_outdated:
+    -
+      value: false
+  body:
+    -
+      value: |-
+        <!-- wp:custom/hero /-->
+
+        <!-- wp:custom/content -->
+        <!-- wp:custom/conditional {"displayFrom":"2024-05-16T11:05:00.000Z","displayTo":"2024-05-23T13:03:00.000Z","purpose":"Summer Campaign"} -->
+        <!-- wp:paragraph -->
+        <p>Complete</p>
+        <!-- /wp:paragraph -->
+        <!-- /wp:custom/conditional -->
+
+        <!-- wp:custom/conditional -->
+        <!-- wp:paragraph -->
+        <p>No conditions</p>
+        <!-- /wp:paragraph -->
+        <!-- /wp:custom/conditional -->
+        <!-- /wp:custom/content -->
+      format: gutenberg
+      summary: ''
diff --git a/packages/schema/src/fragments/Page.gql b/packages/schema/src/fragments/Page.gql
index 28f7127f2..33a67a4d5 100644
--- a/packages/schema/src/fragments/Page.gql
+++ b/packages/schema/src/fragments/Page.gql
@@ -38,6 +38,7 @@ fragment Page on Page {
     ...BlockHorizontalSeparator
     ...BlockAccordion
     ...BlockInfoGrid
+    ...BlockConditional
   }
   metaTags {
     tag
diff --git a/packages/schema/src/fragments/PageContent/BlockConditional.gql b/packages/schema/src/fragments/PageContent/BlockConditional.gql
new file mode 100644
index 000000000..5016b930f
--- /dev/null
+++ b/packages/schema/src/fragments/PageContent/BlockConditional.gql
@@ -0,0 +1,17 @@
+fragment BlockConditional on BlockConditional {
+  displayFrom
+  displayTo
+  content {
+    __typename
+    ...BlockMarkup
+    ...BlockMedia
+    ...BlockForm
+    ...BlockImageTeasers
+    ...BlockCta
+    ...BlockImageWithText
+    ...BlockQuote
+    ...BlockHorizontalSeparator
+    ...BlockAccordion
+    ...BlockInfoGrid
+  }
+}
diff --git a/packages/schema/src/schema.graphql b/packages/schema/src/schema.graphql
index 8784b0a90..5d47f54fc 100644
--- a/packages/schema/src/schema.graphql
+++ b/packages/schema/src/schema.graphql
@@ -198,6 +198,18 @@ type Hero {
     @webformIdToUrl(id: "$")
 }
 
+union CommonContent @resolveEditorBlockType =
+  | BlockMarkup
+  | BlockMedia
+  | BlockForm
+  | BlockImageTeasers
+  | BlockCta
+  | BlockImageWithText
+  | BlockQuote
+  | BlockHorizontalSeparator
+  | BlockAccordion
+  | BlockInfoGrid
+
 union PageContent @resolveEditorBlockType =
   | BlockMarkup
   | BlockMedia
@@ -209,6 +221,7 @@ union PageContent @resolveEditorBlockType =
   | BlockHorizontalSeparator
   | BlockAccordion
   | BlockInfoGrid
+  | BlockConditional
 
 type BlockForm @type(id: "custom/form") {
   url: Url @resolveEditorBlockAttribute(key: "formId") @webformIdToUrl(id: "$")
@@ -318,6 +331,12 @@ type BlockHorizontalSeparator @type(id: "custom/horizontal-separator") {
   markup: Markup! @resolveEditorBlockMarkup
 }
 
+type BlockConditional @type(id: "custom/conditional") {
+  displayFrom: String @resolveEditorBlockAttribute(key: "displayFrom")
+  displayTo: String @resolveEditorBlockAttribute(key: "displayTo")
+  content: [CommonContent] @resolveEditorBlockChildren
+}
+
 input PaginationInput {
   limit: Int!
   offset: Int!
diff --git a/packages/ui/src/components/Organisms/PageContent/BlockConditional.tsx b/packages/ui/src/components/Organisms/PageContent/BlockConditional.tsx
new file mode 100644
index 000000000..b401ead14
--- /dev/null
+++ b/packages/ui/src/components/Organisms/PageContent/BlockConditional.tsx
@@ -0,0 +1,30 @@
+import { BlockConditionalFragment } from '@custom/schema';
+import React, { useEffect, useState } from 'react';
+
+import { isTruthy } from '../../../utils/isTruthy';
+import { CommonContent } from '../PageDisplay';
+
+export function BlockConditional(props: BlockConditionalFragment) {
+  const [isActive, setIsActive] = useState(false);
+  useEffect(() => {
+    const active = {
+      scheduledDisplay: [
+        props.displayFrom
+          ? new Date(props.displayFrom).getTime() <= new Date().getTime()
+          : true,
+        props.displayTo
+          ? new Date(props.displayTo).getTime() > new Date().getTime()
+          : true,
+      ].every(Boolean),
+    };
+    setIsActive(Object.values(active).every(Boolean));
+  }, []);
+
+  return isActive ? (
+    <>
+      {props.content?.filter(isTruthy).map((block, index) => {
+        return <CommonContent key={index} {...block} />;
+      })}
+    </>
+  ) : null;
+}
diff --git a/packages/ui/src/components/Organisms/PageDisplay.tsx b/packages/ui/src/components/Organisms/PageDisplay.tsx
index c5999faf9..a97ef64ce 100644
--- a/packages/ui/src/components/Organisms/PageDisplay.tsx
+++ b/packages/ui/src/components/Organisms/PageDisplay.tsx
@@ -1,5 +1,5 @@
 'use client';
-import { PageFragment } from '@custom/schema';
+import { BlockConditionalFragment, PageFragment } from '@custom/schema';
 import React from 'react';
 
 import { isTruthy } from '../../utils/isTruthy';
@@ -7,6 +7,7 @@ import { UnreachableCaseError } from '../../utils/unreachable-case-error';
 import { BreadCrumbs } from '../Molecules/Breadcrumbs';
 import { PageTransition } from '../Molecules/PageTransition';
 import { BlockAccordion } from './PageContent/BlockAccordion';
+import { BlockConditional } from './PageContent/BlockConditional';
 import { BlockCta } from './PageContent/BlockCta';
 import { BlockForm } from './PageContent/BlockForm';
 import { BlockHorizontalSeparator } from './PageContent/BlockHorizontalSeparator';
@@ -25,32 +26,44 @@ export function PageDisplay(page: PageFragment) {
         {!page.hero && <BreadCrumbs />}
         {page.hero && <PageHero {...page.hero} />}
         {page?.content?.filter(isTruthy).map((block, index) => {
-          switch (block.__typename) {
-            case 'BlockMedia':
-              return <BlockMedia key={index} {...block} />;
-            case 'BlockMarkup':
-              return <BlockMarkup key={index} {...block} />;
-            case 'BlockForm':
-              return <BlockForm key={index} {...block} />;
-            case 'BlockImageTeasers':
-              return <BlockImageTeasers key={index} {...block} />;
-            case 'BlockCta':
-              return <BlockCta key={index} {...block} />;
-            case 'BlockImageWithText':
-              return <BlockImageWithText key={index} {...block} />;
-            case 'BlockQuote':
-              return <BlockQuote key={index} {...block} />;
-            case 'BlockHorizontalSeparator':
-              return <BlockHorizontalSeparator key={index} {...block} />;
-            case 'BlockAccordion':
-              return <BlockAccordion key={index} {...block} />;
-            case 'BlockInfoGrid':
-              return <BlockInfoGrid key={index} {...block} />;
-            default:
-              throw new UnreachableCaseError(block);
+          if (block.__typename === 'BlockConditional') {
+            return <BlockConditional key={index} {...block} />;
+          } else {
+            return <CommonContent key={index} {...block} />;
           }
         })}
       </div>
     </PageTransition>
   );
 }
+
+type CommonContentBlock = NonNullable<
+  Required<BlockConditionalFragment>['content'][number]
+>;
+
+export function CommonContent(props: CommonContentBlock) {
+  switch (props.__typename) {
+    case 'BlockMedia':
+      return <BlockMedia {...props} />;
+    case 'BlockMarkup':
+      return <BlockMarkup {...props} />;
+    case 'BlockForm':
+      return <BlockForm {...props} />;
+    case 'BlockImageTeasers':
+      return <BlockImageTeasers {...props} />;
+    case 'BlockCta':
+      return <BlockCta {...props} />;
+    case 'BlockImageWithText':
+      return <BlockImageWithText {...props} />;
+    case 'BlockQuote':
+      return <BlockQuote {...props} />;
+    case 'BlockHorizontalSeparator':
+      return <BlockHorizontalSeparator />;
+    case 'BlockAccordion':
+      return <BlockAccordion {...props} />;
+    case 'BlockInfoGrid':
+      return <BlockInfoGrid {...props} />;
+    default:
+      throw new UnreachableCaseError(props);
+  }
+}
diff --git a/tests/schema/specs/blocks.spec.ts b/tests/schema/specs/blocks.spec.ts
index 6ac6df879..397b4f543 100644
--- a/tests/schema/specs/blocks.spec.ts
+++ b/tests/schema/specs/blocks.spec.ts
@@ -643,3 +643,58 @@ test('Block - info grid', async () => {
     }
   `);
 });
+
+test('Conditional', async () => {
+  const result = await fetch(gql`
+    {
+      _loadDrupalPage(id: "52ee5cc7-0ac5-49b5-8550-ce59476bd4ac") {
+        content {
+          __typename
+          ... on BlockConditional {
+            content {
+              ... on BlockMarkup {
+                markup
+              }
+            }
+            displayFrom
+            displayTo
+          }
+        }
+      }
+    }
+  `);
+  expect(result).toMatchInlineSnapshot(`
+    {
+      "data": {
+        "_loadDrupalPage": {
+          "content": [
+            {
+              "__typename": "BlockConditional",
+              "content": [
+                {
+                  "markup": "
+    <p>Complete</p>
+    ",
+                },
+              ],
+              "displayFrom": "2024-05-16T11:05:00.000Z",
+              "displayTo": "2024-05-23T13:03:00.000Z",
+            },
+            {
+              "__typename": "BlockConditional",
+              "content": [
+                {
+                  "markup": "
+    <p>No conditions</p>
+    ",
+                },
+              ],
+              "displayFrom": null,
+              "displayTo": null,
+            },
+          ],
+        },
+      },
+    }
+  `);
+});

From 212a3ebaadd57c4da14e5b9c0f0e61d29fa12f9d Mon Sep 17 00:00:00 2001
From: Luqmaan Essop <luqmaan.essop@amazeelabs.com>
Date: Fri, 19 Jul 2024 07:42:27 +0000
Subject: [PATCH 003/100] feat(SLB:455): a11y enhancements

---
 .../src/components/Organisms/ContentHub.tsx   | 85 ++++++++++---------
 1 file changed, 47 insertions(+), 38 deletions(-)

diff --git a/packages/ui/src/components/Organisms/ContentHub.tsx b/packages/ui/src/components/Organisms/ContentHub.tsx
index 5dface3d5..978b7c304 100644
--- a/packages/ui/src/components/Organisms/ContentHub.tsx
+++ b/packages/ui/src/components/Organisms/ContentHub.tsx
@@ -1,5 +1,11 @@
 import { useIntl } from '@amazeelabs/react-intl';
-import { ContentHubQuery, Image, Link, Locale } from '@custom/schema';
+import {
+  ContentHubQuery,
+  ContentHubResultItemFragment,
+  Image,
+  Link,
+  Locale,
+} from '@custom/schema';
 import qs from 'query-string';
 import React from 'react';
 
@@ -52,43 +58,7 @@ export function ContentHub({ pageSize = 10 }: { pageSize: number }) {
             <ul className="my-8 grid md:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8">
               {data?.contentHub.items.filter(isTruthy).map((item) => (
                 <li key={item.path}>
-                  <div className="max-w-sm bg-white border border-gray-200 rounded-lg shadow dark:bg-gray-800 dark:border-gray-700 overflow-hidden">
-                    <Link href={item.path} className="rounded-t-lg">
-                      {item.teaserImage ? (
-                        <Image {...item.teaserImage} className="w-full" />
-                      ) : (
-                        <div className="aspect-[4/3] bg-indigo-200" />
-                      )}
-                    </Link>
-                    <div className="p-5">
-                      <Link href={item.path}>
-                        <h5 className="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white">
-                          {item.title}
-                        </h5>
-                      </Link>
-                      <Link
-                        href={item.path}
-                        className="inline-flex items-center px-3 py-2 text-sm font-medium text-center text-white bg-blue-700 rounded-lg hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800"
-                      >
-                        Read more
-                        <svg
-                          className="rtl:rotate-180 w-3.5 h-3.5 ms-2"
-                          aria-hidden="true"
-                          xmlns="http://www.w3.org/2000/svg"
-                          fill="none"
-                          viewBox="0 0 14 10"
-                        >
-                          <path
-                            stroke="currentColor"
-                            strokeLinecap="round"
-                            strokeLinejoin="round"
-                            strokeWidth="2"
-                            d="M1 5h12m0 0L9 1m4 4L9 9"
-                          />
-                        </svg>
-                      </Link>
-                    </div>
-                  </div>
+                  <Card {...item} />
                 </li>
               ))}
             </ul>
@@ -99,3 +69,42 @@ export function ContentHub({ pageSize = 10 }: { pageSize: number }) {
     </div>
   );
 }
+
+export const Card = (item: ContentHubResultItemFragment) => (
+  <article className="focus-within:outline focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-indigo-600 relative max-w-sm bg-white rounded-lg hover:shadow dark:bg-gray-800 dark:border-gray-700 overflow-hidden">
+    <div className="rounded-t-lg">
+      {item.teaserImage ? (
+        <Image {...item.teaserImage} className="w-full" />
+      ) : (
+        <div className="aspect-[4/3] bg-indigo-200" />
+      )}
+    </div>
+    <div className="p-5">
+      <h5 className="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white">
+        {item.title}
+      </h5>
+      <Link
+        href={item.path}
+        className="inline-flex items-center px-3 py-2 text-sm font-medium text-center text-blue-700 border border-blue-700 rounded-lg hover:bg-blue-800 hover:text-white focus:outline-offset-4 dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800 after:content-[''] after:absolute after:inset-0"
+      >
+        <span className="invisible w-0 h-0 overflow-hidden">{item.title} </span>
+        Read more
+        <svg
+          className="rtl:rotate-180 w-3.5 h-3.5 ms-2"
+          aria-hidden="true"
+          xmlns="http://www.w3.org/2000/svg"
+          fill="none"
+          viewBox="0 0 14 10"
+        >
+          <path
+            stroke="currentColor"
+            strokeLinecap="round"
+            strokeLinejoin="round"
+            strokeWidth="2"
+            d="M1 5h12m0 0L9 1m4 4L9 9"
+          />
+        </svg>
+      </Link>
+    </div>
+  </article>
+);

From 52926988f4fa25340391ad9ecde2d387e3a04786 Mon Sep 17 00:00:00 2001
From: Luqmaan Essop <luqmaan.essop@amazeelabs.com>
Date: Fri, 19 Jul 2024 08:02:47 +0000
Subject: [PATCH 004/100] chore(SLB:455): update tests

---
 tests/e2e/specs/drupal/content-hub.spec.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/e2e/specs/drupal/content-hub.spec.ts b/tests/e2e/specs/drupal/content-hub.spec.ts
index a65b17fc1..d3cc1fac2 100644
--- a/tests/e2e/specs/drupal/content-hub.spec.ts
+++ b/tests/e2e/specs/drupal/content-hub.spec.ts
@@ -10,7 +10,8 @@ test.describe('content hub', () => {
   test('lists pages in alphabetic order', async ({ page }) => {
     await page.goto(websiteUrl('/en/content-hub'));
     const content = await page.getByRole('main');
-    await expect(content.getByText('Architecture')).toBeVisible();
+    const heading = page.getByRole('heading', { name: 'Architecture', level: 5 });
+    await expect(heading).toBeVisible();
     await expect(content.getByText('PHP')).not.toBeVisible();
   });
 

From f8f0deba1ba0ba3586a1658c20da0f4b1a98a96d Mon Sep 17 00:00:00 2001
From: Luqmaan Essop <luqmaan.essop@amazeelabs.com>
Date: Fri, 19 Jul 2024 08:05:28 +0000
Subject: [PATCH 005/100] chore(SLB:455): prettier

---
 tests/e2e/specs/drupal/content-hub.spec.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/e2e/specs/drupal/content-hub.spec.ts b/tests/e2e/specs/drupal/content-hub.spec.ts
index d3cc1fac2..de78f4fa8 100644
--- a/tests/e2e/specs/drupal/content-hub.spec.ts
+++ b/tests/e2e/specs/drupal/content-hub.spec.ts
@@ -10,7 +10,10 @@ test.describe('content hub', () => {
   test('lists pages in alphabetic order', async ({ page }) => {
     await page.goto(websiteUrl('/en/content-hub'));
     const content = await page.getByRole('main');
-    const heading = page.getByRole('heading', { name: 'Architecture', level: 5 });
+    const heading = page.getByRole('heading', {
+      name: 'Architecture',
+      level: 5,
+    });
     await expect(heading).toBeVisible();
     await expect(content.getByText('PHP')).not.toBeVisible();
   });

From 59c0413941725fc3f2fe094977b775b513b70046 Mon Sep 17 00:00:00 2001
From: Luqmaan Essop <luqmaan.essop@amazeelabs.com>
Date: Fri, 19 Jul 2024 09:02:14 +0000
Subject: [PATCH 006/100] chore(SLB:455): update tests

---
 tests/e2e/specs/drupal/content-hub.spec.ts | 26 +++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/tests/e2e/specs/drupal/content-hub.spec.ts b/tests/e2e/specs/drupal/content-hub.spec.ts
index de78f4fa8..dfed98e72 100644
--- a/tests/e2e/specs/drupal/content-hub.spec.ts
+++ b/tests/e2e/specs/drupal/content-hub.spec.ts
@@ -21,10 +21,14 @@ test.describe('content hub', () => {
   test('allows to switch pages', async ({ page }) => {
     await page.goto(websiteUrl('/en/content-hub'));
     const content = await page.getByRole('main');
-    await expect(content.getByText('Architecture')).toBeVisible();
+    const heading = page.getByRole('heading', {
+      name: 'Architecture',
+      level: 5,
+    });
+    await expect(heading).toBeVisible();
     await expect(content.getByText('Gatsby')).not.toBeVisible();
     await content.getByText('Next').click();
-    await expect(content.getByText('Architecture')).not.toBeVisible();
+    await expect(heading).not.toBeVisible();
     await expect(content.getByText('Gatsby')).toBeVisible();
   });
 
@@ -33,7 +37,11 @@ test.describe('content hub', () => {
     const content = await page.getByRole('main');
     await content.getByPlaceholder('Keyword').fill('technologies');
     await content.getByRole('button', { name: 'Search' }).click();
-    await expect(content.getByText('Architecture')).not.toBeVisible();
+    const heading = page.getByRole('heading', {
+      name: 'Architecture',
+      level: 5,
+    });
+    await expect(heading).not.toBeVisible();
     await expect(content.getByText('Technologies')).toBeVisible();
   });
 
@@ -43,8 +51,16 @@ test.describe('content hub', () => {
     // Change language to German.
     await quickActions.changeLanguageTo(SiteLanguage.Deutsch);
     const content = await page.getByRole('main');
-    await expect(content.getByText('Architektur')).toBeVisible();
-    await expect(content.getByText('Architecture')).not.toBeVisible();
+    const deHeading = page.getByRole('heading', {
+      name: 'Architektur',
+      level: 5,
+    });
+    const enHeading = page.getByRole('heading', {
+      name: 'Architecture',
+      level: 5,
+    });
+    await expect(deHeading).toBeVisible();
+    await expect(enHeading).not.toBeVisible();
     await expect(content.getByText('Gatsby')).not.toBeVisible();
   });
 });

From 650149651edbc027e20aaa98a2056149f9060af0 Mon Sep 17 00:00:00 2001
From: Luqmaan Essop <luqmaan.essop@amazeelabs.com>
Date: Fri, 19 Jul 2024 09:30:17 +0000
Subject: [PATCH 007/100] chore(SLB:455): update tests

---
 tests/e2e/specs/drupal/content-hub.spec.ts | 73 +++++++++++++++-------
 1 file changed, 49 insertions(+), 24 deletions(-)

diff --git a/tests/e2e/specs/drupal/content-hub.spec.ts b/tests/e2e/specs/drupal/content-hub.spec.ts
index dfed98e72..e6e9a55ad 100644
--- a/tests/e2e/specs/drupal/content-hub.spec.ts
+++ b/tests/e2e/specs/drupal/content-hub.spec.ts
@@ -21,15 +21,27 @@ test.describe('content hub', () => {
   test('allows to switch pages', async ({ page }) => {
     await page.goto(websiteUrl('/en/content-hub'));
     const content = await page.getByRole('main');
-    const heading = page.getByRole('heading', {
-      name: 'Architecture',
-      level: 5,
-    });
-    await expect(heading).toBeVisible();
+
+    await expect(
+      content.getByRole('heading', {
+        name: 'Architecture',
+        level: 5,
+      }),
+    ).toBeVisible();
     await expect(content.getByText('Gatsby')).not.toBeVisible();
     await content.getByText('Next').click();
-    await expect(heading).not.toBeVisible();
-    await expect(content.getByText('Gatsby')).toBeVisible();
+    await expect(
+      content.getByRole('heading', {
+        name: 'Architecture',
+        level: 5,
+      }),
+    ).not.toBeVisible();
+    await expect(
+      content.getByRole('heading', {
+        name: 'Gatsby',
+        level: 5,
+      }),
+    ).toBeVisible();
   });
 
   test('allows to search for items', async ({ page }) => {
@@ -37,12 +49,18 @@ test.describe('content hub', () => {
     const content = await page.getByRole('main');
     await content.getByPlaceholder('Keyword').fill('technologies');
     await content.getByRole('button', { name: 'Search' }).click();
-    const heading = page.getByRole('heading', {
-      name: 'Architecture',
-      level: 5,
-    });
-    await expect(heading).not.toBeVisible();
-    await expect(content.getByText('Technologies')).toBeVisible();
+    await expect(
+      content.getByRole('heading', {
+        name: 'Architecture',
+        level: 5,
+      }),
+    ).not.toBeVisible();
+    await expect(
+      content.getByRole('heading', {
+        name: 'Technologies',
+        level: 5,
+      }),
+    ).toBeVisible();
   });
 
   test('returns language specific results', async ({ page }) => {
@@ -51,16 +69,23 @@ test.describe('content hub', () => {
     // Change language to German.
     await quickActions.changeLanguageTo(SiteLanguage.Deutsch);
     const content = await page.getByRole('main');
-    const deHeading = page.getByRole('heading', {
-      name: 'Architektur',
-      level: 5,
-    });
-    const enHeading = page.getByRole('heading', {
-      name: 'Architecture',
-      level: 5,
-    });
-    await expect(deHeading).toBeVisible();
-    await expect(enHeading).not.toBeVisible();
-    await expect(content.getByText('Gatsby')).not.toBeVisible();
+    await expect(
+      content.getByRole('heading', {
+        name: 'Architektur',
+        level: 5,
+      }),
+    ).toBeVisible();
+    await expect(
+      content.getByRole('heading', {
+        name: 'Architecture',
+        level: 5,
+      }),
+    ).not.toBeVisible();
+    await expect(
+      content.getByRole('heading', {
+        name: 'Gatsby',
+        level: 5,
+      }),
+    ).not.toBeVisible();
   });
 });

From 149dddac0d5b5ead02196771aa2e011caf0ba812 Mon Sep 17 00:00:00 2001
From: Luqmaan Essop <luqmaan.essop@amazeelabs.com>
Date: Thu, 25 Jul 2024 08:31:02 +0000
Subject: [PATCH 008/100] style(SLB-455): a11y adjustments

---
 .../src/components/Organisms/ContentHub.tsx   | 84 +++++++++++--------
 1 file changed, 47 insertions(+), 37 deletions(-)

diff --git a/packages/ui/src/components/Organisms/ContentHub.tsx b/packages/ui/src/components/Organisms/ContentHub.tsx
index 978b7c304..480c9b4c3 100644
--- a/packages/ui/src/components/Organisms/ContentHub.tsx
+++ b/packages/ui/src/components/Organisms/ContentHub.tsx
@@ -70,41 +70,51 @@ export function ContentHub({ pageSize = 10 }: { pageSize: number }) {
   );
 }
 
-export const Card = (item: ContentHubResultItemFragment) => (
-  <article className="focus-within:outline focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-indigo-600 relative max-w-sm bg-white rounded-lg hover:shadow dark:bg-gray-800 dark:border-gray-700 overflow-hidden">
-    <div className="rounded-t-lg">
-      {item.teaserImage ? (
-        <Image {...item.teaserImage} className="w-full" />
-      ) : (
-        <div className="aspect-[4/3] bg-indigo-200" />
-      )}
-    </div>
-    <div className="p-5">
-      <h5 className="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white">
-        {item.title}
-      </h5>
-      <Link
-        href={item.path}
-        className="inline-flex items-center px-3 py-2 text-sm font-medium text-center text-blue-700 border border-blue-700 rounded-lg hover:bg-blue-800 hover:text-white focus:outline-offset-4 dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800 after:content-[''] after:absolute after:inset-0"
-      >
-        <span className="invisible w-0 h-0 overflow-hidden">{item.title} </span>
-        Read more
-        <svg
-          className="rtl:rotate-180 w-3.5 h-3.5 ms-2"
-          aria-hidden="true"
-          xmlns="http://www.w3.org/2000/svg"
-          fill="none"
-          viewBox="0 0 14 10"
+const Card = (item: ContentHubResultItemFragment) => {
+  const id = item.title.toLowerCase().replace(/\s+/g, '-');
+
+  return (
+    <article
+      aria-labelledby={id}
+      className="focus-within:outline focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-indigo-600 relative max-w-sm bg-white rounded-lg hover:shadow dark:bg-gray-800 dark:border-gray-700 overflow-hidden flex flex-col-reverse"
+    >
+      <div className="p-5">
+        <h5
+          id={id}
+          className="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white"
         >
-          <path
-            stroke="currentColor"
-            strokeLinecap="round"
-            strokeLinejoin="round"
-            strokeWidth="2"
-            d="M1 5h12m0 0L9 1m4 4L9 9"
-          />
-        </svg>
-      </Link>
-    </div>
-  </article>
-);
+          {item.title}
+        </h5>
+        <Link
+          href={item.path}
+          className="inline-flex items-center px-3 py-2 text-sm font-medium text-center text-blue-700 border border-blue-700 rounded-lg hover:bg-blue-800 hover:text-white focus:outline-offset-4 dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800 after:content-[''] after:absolute after:inset-0"
+        >
+          <span className="sr-only w-0 h-0 overflow-hidden">{item.title}</span>
+          Read more
+          <svg
+            className="rtl:rotate-180 w-3.5 h-3.5 ms-2"
+            aria-hidden="true"
+            xmlns="http://www.w3.org/2000/svg"
+            fill="none"
+            viewBox="0 0 14 10"
+          >
+            <path
+              stroke="currentColor"
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              strokeWidth="2"
+              d="M1 5h12m0 0L9 1m4 4L9 9"
+            />
+          </svg>
+        </Link>
+      </div>
+      <div className="rounded-t-lg">
+        {item.teaserImage ? (
+          <Image {...item.teaserImage} className="w-full" />
+        ) : (
+          <div className="aspect-[4/3] bg-indigo-200" />
+        )}
+      </div>
+    </article>
+  );
+};

From 99567c6dd6975f267d433a176db79b8bcb05d20c Mon Sep 17 00:00:00 2001
From: Luqmaan Essop <luqmaan.essop@amazeelabs.com>
Date: Thu, 25 Jul 2024 09:08:36 +0000
Subject: [PATCH 009/100] style(SLB-455): a11y adjustments more

---
 .../src/components/Organisms/ContentHub.tsx   | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/ui/src/components/Organisms/ContentHub.tsx b/packages/ui/src/components/Organisms/ContentHub.tsx
index 480c9b4c3..90148d9a8 100644
--- a/packages/ui/src/components/Organisms/ContentHub.tsx
+++ b/packages/ui/src/components/Organisms/ContentHub.tsx
@@ -56,9 +56,9 @@ export function ContentHub({ pageSize = 10 }: { pageSize: number }) {
         {data?.contentHub.total ? (
           <>
             <ul className="my-8 grid md:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8">
-              {data?.contentHub.items.filter(isTruthy).map((item) => (
+              {data?.contentHub.items.filter(isTruthy).map((item, index) => (
                 <li key={item.path}>
-                  <Card {...item} />
+                  <Card item={item} id={index} />
                 </li>
               ))}
             </ul>
@@ -70,24 +70,28 @@ export function ContentHub({ pageSize = 10 }: { pageSize: number }) {
   );
 }
 
-const Card = (item: ContentHubResultItemFragment) => {
-  const id = item.title.toLowerCase().replace(/\s+/g, '-');
-
+const Card = ({
+  item,
+  id,
+}: {
+  item: ContentHubResultItemFragment;
+  id: number;
+}) => {
   return (
     <article
-      aria-labelledby={id}
-      className="focus-within:outline focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-indigo-600 relative max-w-sm bg-white rounded-lg hover:shadow dark:bg-gray-800 dark:border-gray-700 overflow-hidden flex flex-col-reverse"
+      aria-labelledby={`${id}`}
+      className="focus-within:outline focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-indigo-600 relative max-w-sm bg-white rounded-lg hover:shadow overflow-hidden flex flex-col-reverse"
     >
       <div className="p-5">
         <h5
-          id={id}
-          className="mb-2 text-2xl font-bold tracking-tight text-gray-900 dark:text-white"
+          id={`${id}`}
+          className="mb-2 text-2xl font-bold tracking-tight text-gray-900"
         >
           {item.title}
         </h5>
         <Link
           href={item.path}
-          className="inline-flex items-center px-3 py-2 text-sm font-medium text-center text-blue-700 border border-blue-700 rounded-lg hover:bg-blue-800 hover:text-white focus:outline-offset-4 dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800 after:content-[''] after:absolute after:inset-0"
+          className="inline-flex items-center px-3 py-2 text-sm font-medium text-center text-blue-700 border border-blue-700 rounded-lg hover:bg-blue-800 hover:text-white focus:outline-offset-4 after:content-[''] after:absolute after:inset-0"
         >
           <span className="sr-only w-0 h-0 overflow-hidden">{item.title}</span>
           Read more

From 1db61021d425c9f93bae67f262004cba73e2b031 Mon Sep 17 00:00:00 2001
From: Luqmaan Essop <luqmaan.essop@amazeelabs.com>
Date: Thu, 25 Jul 2024 12:29:08 +0000
Subject: [PATCH 010/100] style(SLB-455): a11y adjustments more

---
 .../src/components/Organisms/ContentHub.tsx   | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/ui/src/components/Organisms/ContentHub.tsx b/packages/ui/src/components/Organisms/ContentHub.tsx
index 90148d9a8..854c77fa9 100644
--- a/packages/ui/src/components/Organisms/ContentHub.tsx
+++ b/packages/ui/src/components/Organisms/ContentHub.tsx
@@ -56,11 +56,14 @@ export function ContentHub({ pageSize = 10 }: { pageSize: number }) {
         {data?.contentHub.total ? (
           <>
             <ul className="my-8 grid md:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8">
-              {data?.contentHub.items.filter(isTruthy).map((item, index) => (
-                <li key={item.path}>
-                  <Card item={item} id={index} />
-                </li>
-              ))}
+              {data?.contentHub.items.filter(isTruthy).map((item, index) => {
+                const formattedIndex = index.toString();
+                return (
+                  <li key={item.path}>
+                    <Card item={item} id={formattedIndex} />
+                  </li>
+                );
+              })}
             </ul>
             <Pagination pageSize={pageSize} total={data.contentHub.total} />
           </>
@@ -75,16 +78,16 @@ const Card = ({
   id,
 }: {
   item: ContentHubResultItemFragment;
-  id: number;
+  id: string;
 }) => {
   return (
     <article
-      aria-labelledby={`${id}`}
+      aria-labelledby={'heading-' + id}
       className="focus-within:outline focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-indigo-600 relative max-w-sm bg-white rounded-lg hover:shadow overflow-hidden flex flex-col-reverse"
     >
       <div className="p-5">
         <h5
-          id={`${id}`}
+          id={'heading-' + id}
           className="mb-2 text-2xl font-bold tracking-tight text-gray-900"
         >
           {item.title}

From 5b52d3535ed99a3d6a5ff2b6ba5f7241b0fa594f Mon Sep 17 00:00:00 2001
From: Alex Tkachev <alex.leksat@gmail.com>
Date: Sun, 28 Jul 2024 13:52:36 +0400
Subject: [PATCH 011/100] chore(SLB-451): behavior/style improvements WIP

---
 packages/drupal/gutenberg_blocks/css/edit.css | 31 ++++++++++
 .../src/blocks/conditional.tsx                | 60 +++++++++++++++----
 2 files changed, 79 insertions(+), 12 deletions(-)

diff --git a/packages/drupal/gutenberg_blocks/css/edit.css b/packages/drupal/gutenberg_blocks/css/edit.css
index 7dc32cdc3..cad110943 100644
--- a/packages/drupal/gutenberg_blocks/css/edit.css
+++ b/packages/drupal/gutenberg_blocks/css/edit.css
@@ -27,6 +27,14 @@
   min-height: 250px;
 }
 
+.gutenberg__editor .container-wrapper.no-margin {
+  margin: 0;
+}
+
+.gutenberg__editor .container-wrapper.no-min-height {
+  min-height: 0;
+}
+
 .gutenberg__editor .container-wrapper .container-label {
   font: bold 12px Sans-Serif;
   letter-spacing: 2px;
@@ -129,3 +137,26 @@
 .gutenberg__editor .drupal-preview-sidebar--header button {
   margin-right: 5px;
 }
+
+.gutenberg__editor .collapsible-container .title {
+  display: flex;
+  cursor: pointer;
+}
+
+.gutenberg__editor .collapsible-container .title .left {
+  width: 34px;
+  background-color: #666666;
+  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16'%3e%3cpath d='M5.21 1.314L3.79 2.723l5.302 5.353-5.303 5.354 1.422 1.408 6.697-6.762z' fill='%230036B1'/%3e%3c/svg%3e");
+  background-repeat: no-repeat;
+  background-position: 10px;
+  rotate: -90deg;
+}
+
+.gutenberg__editor .collapsible-container.is-open .title .left {
+  rotate: 90deg;
+}
+
+.gutenberg__editor .collapsible-container .title .right {
+  flex: 1;
+  padding-left: 10px;
+}
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx b/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
index 131c59b2f..d4668c86d 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
@@ -1,4 +1,5 @@
 import clsx from 'clsx';
+import { PropsWithChildren, useState } from 'react';
 import { InnerBlocks, InspectorControls } from 'wordpress__block-editor';
 import { registerBlockType } from 'wordpress__blocks';
 import { BaseControl, PanelBody } from 'wordpress__components';
@@ -72,21 +73,18 @@ registerBlockType(`custom/conditional`, {
     );
 
     return (
-      <div className={clsx('container-wrapper', { 'bg-gray-100': !isActive })}>
-        <div className={'container-label'}>{__('Conditional content')}</div>
-        <div className="text-sm text-gray-500">{summary}</div>
-        <details open={isActive}>
-          <summary
-            style={{ cursor: 'pointer', padding: 0 }}
-            className="text-sm text-gray-500"
-          >
-            {purpose || __('Content')}
-          </summary>
+      <>
+        <CollapsibleContainer
+          title={purpose || __('Conditional content')}
+          label={__('Conditional content')}
+          isActive={isActive}
+        >
+          <div className="text-sm text-gray-500">{summary}</div>
           <InnerBlocks
             templateLock={false}
             template={[['core/paragraph', {}]]}
           />
-        </details>
+        </CollapsibleContainer>
         <InspectorControls>
           <PanelBody title={__('Purpose')}>
             <BaseControl id="purpose">
@@ -151,7 +149,7 @@ registerBlockType(`custom/conditional`, {
             </BaseControl>
           </PanelBody>
         </InspectorControls>
-      </div>
+      </>
     );
   },
 
@@ -169,3 +167,41 @@ function isoToLocalTime(isoTime: string) {
   date.setMinutes(date.getMinutes() - date.getTimezoneOffset());
   return date.toISOString().slice(0, 16);
 }
+
+function CollapsibleContainer({
+  children,
+  label,
+  title,
+  isActive,
+}: PropsWithChildren<{ label: string; title: string; isActive: boolean }>) {
+  const [isOpen, setIsOpen] = useState(isActive);
+  return (
+    <div
+      className={clsx('collapsible-container', {
+        'bg-gray-100': !isActive,
+        'is-open': isOpen,
+      })}
+    >
+      <div
+        className="title"
+        onClick={() => {
+          setIsOpen(!isOpen);
+        }}
+      >
+        <div className="left"></div>
+        <div className="text-gray-500 right">{title}</div>
+      </div>
+
+      {isOpen ? (
+        <div
+          className={clsx('container-wrapper no-margin', {
+            'no-min-height': !isOpen,
+          })}
+        >
+          <div className={'container-label'}>{label}</div>
+          {children}
+        </div>
+      ) : null}
+    </div>
+  );
+}

From ed55134d9619c08aaa984af0273562ece9af94dc Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Mon, 29 Jul 2024 14:27:47 +0200
Subject: [PATCH 012/100] style(SLB-455): set formattted id

---
 packages/ui/src/components/Organisms/ContentHub.tsx | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/ui/src/components/Organisms/ContentHub.tsx b/packages/ui/src/components/Organisms/ContentHub.tsx
index 854c77fa9..e7947048d 100644
--- a/packages/ui/src/components/Organisms/ContentHub.tsx
+++ b/packages/ui/src/components/Organisms/ContentHub.tsx
@@ -57,10 +57,9 @@ export function ContentHub({ pageSize = 10 }: { pageSize: number }) {
           <>
             <ul className="my-8 grid md:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8">
               {data?.contentHub.items.filter(isTruthy).map((item, index) => {
-                const formattedIndex = index.toString();
                 return (
                   <li key={item.path}>
-                    <Card item={item} id={formattedIndex} />
+                    <Card item={item} id={index} />
                   </li>
                 );
               })}
@@ -78,16 +77,18 @@ const Card = ({
   id,
 }: {
   item: ContentHubResultItemFragment;
-  id: string;
+  id: number;
 }) => {
+  const formattedID = 'heading-' + id;
+
   return (
     <article
-      aria-labelledby={'heading-' + id}
+      aria-labelledby={formattedID}
       className="focus-within:outline focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-indigo-600 relative max-w-sm bg-white rounded-lg hover:shadow overflow-hidden flex flex-col-reverse"
     >
       <div className="p-5">
         <h5
-          id={'heading-' + id}
+          id={formattedID}
           className="mb-2 text-2xl font-bold tracking-tight text-gray-900"
         >
           {item.title}

From 932a63ca9a83201b35f575036781f177a612c605 Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Tue, 30 Jul 2024 14:31:13 +0200
Subject: [PATCH 013/100] fix: move nested plugin above tailwindcss to remove
 error about nesting configuration

---
 packages/ui/src/postcss.config.cjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui/src/postcss.config.cjs b/packages/ui/src/postcss.config.cjs
index 00af9fd0b..e333492ca 100644
--- a/packages/ui/src/postcss.config.cjs
+++ b/packages/ui/src/postcss.config.cjs
@@ -2,8 +2,8 @@ module.exports = {
   plugins: {
     'postcss-import-ext-glob': {},
     'postcss-import': {},
+    'tailwindcss/nesting': 'postcss-nested',
     tailwindcss: require('./tailwind.config.cjs'),
-    'postcss-nested': {},
     autoprefixer: {},
     'postcss-prefix-selector': {
       prefix:

From 25e65ba9987f6aa7f92c18e6ef6b13d4fee47dfc Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Tue, 30 Jul 2024 17:51:04 +0200
Subject: [PATCH 014/100] chore(SLB-459): add focusable false to accordion

---
 .../Organisms/PageContent/BlockAccordion.tsx       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
index 994fad5dd..bce6e7674 100644
--- a/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
+++ b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
@@ -30,7 +30,7 @@ export function BlockAccordion(props: BlockAccordionFragment) {
       <div className="container-content">
         <div className="container-text">
           {props.items.map((item, index) => (
-            <Disclosure key={index}>
+            <Disclosure as="div" key={index}>
               {({ open }) => (
                 <>
                   <DisclosureButton
@@ -45,9 +45,9 @@ export function BlockAccordion(props: BlockAccordionFragment) {
                     </span>
                     <span>
                       {open ? (
-                        <ChevronUpIcon className={'h-6 w-6'} />
+                        <ChevronUpIcon className={'h-6 w-6'} focusable={false} />
                       ) : (
-                        <ChevronDownIcon className={'h-6 w-6'} />
+                        <ChevronDownIcon className={'h-6 w-6'} focusable={false} />
                       )}
                     </span>
                   </DisclosureButton>
@@ -98,19 +98,19 @@ export function BlockAccordion(props: BlockAccordionFragment) {
   );
 }
 
-function AccordionIcon({ icon }: { icon: string }) {
+function AccordionIcon({ icon, focusable = false }: { icon: string, focusable?: boolean }) {
   switch (icon) {
     case 'questionmark':
       return (
-        <QuestionMarkCircleIcon className="w-5 h-5 me-2 shrink-0 text-gray-500" />
+        <QuestionMarkCircleIcon className="w-5 h-5 me-2 shrink-0 text-gray-500" focusable={focusable} />
       );
     case 'checkmark':
       return (
-        <CheckCircleIcon className="w-5 h-5 me-2 shrink-0 text-gray-500" />
+        <CheckCircleIcon className="w-5 h-5 me-2 shrink-0 text-gray-500" focusable={focusable} />
       );
     case 'arrow':
       return (
-        <ArrowRightCircleIcon className="w-5 h-5 me-2 shrink-0 text-gray-500" />
+        <ArrowRightCircleIcon className="w-5 h-5 me-2 shrink-0 text-gray-500" focusable={focusable} />
       );
     default:
       return null;

From d0949115b0c998eb2204baed189ffe8ca525f8f5 Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Tue, 30 Jul 2024 17:51:41 +0200
Subject: [PATCH 015/100] chore(SLB-459): add heading with adjustable level
 based on props to accordion

---
 .../Organisms/PageContent/BlockAccordion.tsx  | 57 +++++++++++++------
 1 file changed, 39 insertions(+), 18 deletions(-)

diff --git a/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
index bce6e7674..e16820778 100644
--- a/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
+++ b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
@@ -24,7 +24,26 @@ const unorderedItems: Plugin<[], Element> = () => (tree) => {
   });
 };
 
-export function BlockAccordion(props: BlockAccordionFragment) {
+const Heading = ({ level, className, children }: { level?: string; className?: string, children: React.ReactNode }) => {
+  switch (level) {
+    case 'h1':
+      return <h1 className={className}>{children}</h1>;
+    case 'h2':
+      return <h2 className={className}>{children}</h2>;
+    case 'h3':
+      return <h3 className={className}>{children}</h3>;
+    case 'h4':
+      return <h4 className={className}>{children}</h4>;
+    case 'h5':
+      return <h5 className={className}>{children}</h5>;
+    case 'h6':
+      return <h6 className={className}>{children}</h6>;
+    default:
+      return <h2 className={className}>{children}</h2>;
+  }
+}
+
+export function BlockAccordion(props: BlockAccordionFragment & { headingLevel?: string }) {
   return (
     <div className="container-page my-10">
       <div className="container-content">
@@ -33,24 +52,26 @@ export function BlockAccordion(props: BlockAccordionFragment) {
             <Disclosure as="div" key={index}>
               {({ open }) => (
                 <>
-                  <DisclosureButton
-                    className={clsx(
-                      'border-b border-gray-200 last:border-0 flex w-full items-center justify-between p-4 pl-1 text-left font-medium text-lg hover:bg-gray-100',
-                      { 'text-black': open, 'text-gray-500': !open },
-                    )}
-                  >
-                    <span className="flex items-center">
-                      {item.icon && <AccordionIcon icon={item.icon} />}{' '}
-                      {item.title}
-                    </span>
-                    <span>
-                      {open ? (
-                        <ChevronUpIcon className={'h-6 w-6'} focusable={false} />
-                      ) : (
-                        <ChevronDownIcon className={'h-6 w-6'} focusable={false} />
+                  <Heading level={props.headingLevel}>
+                    <DisclosureButton
+                      className={clsx(
+                        'border-b border-gray-200 last:border-0 flex w-full items-center justify-between p-4 pl-1 text-left font-medium text-lg hover:bg-gray-100',
+                        { 'text-black': open, 'text-gray-500': !open },
                       )}
-                    </span>
-                  </DisclosureButton>
+                    >
+                      <span className="flex items-center">
+                        {item.icon && <AccordionIcon icon={item.icon} />}{' '}
+                        {item.title}
+                      </span>
+                      <span>
+                        {open ? (
+                          <ChevronUpIcon className={'h-6 w-6'} focusable={false} />
+                        ) : (
+                          <ChevronDownIcon className={'h-6 w-6'} focusable={false} />
+                        )}
+                      </span>
+                    </DisclosureButton>
+                  </Heading>
                   <DisclosurePanel
                     className={clsx(
                       'py-5 text-base font-normal text-gray-500',

From 44de92b426a4a4da1ffdf5806363560ef6dfeaee Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Tue, 30 Jul 2024 18:06:45 +0200
Subject: [PATCH 016/100] chore(SLB-459): use a type with union

---
 .../components/Organisms/PageContent/BlockAccordion.tsx    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
index e16820778..a22c03063 100644
--- a/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
+++ b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
@@ -24,7 +24,12 @@ const unorderedItems: Plugin<[], Element> = () => (tree) => {
   });
 };
 
-const Heading = ({ level, className, children }: { level?: string; className?: string, children: React.ReactNode }) => {
+type HeadingProps = {
+  level: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6',
+  className?: string,
+  children: React.ReactNode,
+};
+const Heading = ({ level, className, children }: HeadingProps) => {
   switch (level) {
     case 'h1':
       return <h1 className={className}>{children}</h1>;

From 9951346c69282406f6ecc05162ab6e9387c9ef2b Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Tue, 30 Jul 2024 18:14:20 +0200
Subject: [PATCH 017/100] chore(SLB-459): revert the union type till we
 implement backend

---
 .../ui/src/components/Organisms/PageContent/BlockAccordion.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
index a22c03063..3d8d58f73 100644
--- a/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
+++ b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
@@ -25,7 +25,7 @@ const unorderedItems: Plugin<[], Element> = () => (tree) => {
 };
 
 type HeadingProps = {
-  level: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6',
+  level?: string,
   className?: string,
   children: React.ReactNode,
 };

From 0b0bd85e98164f2ef69f623e3563d77005b881f0 Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Tue, 30 Jul 2024 18:18:37 +0200
Subject: [PATCH 018/100] chore(SLB-459): pnpm test:format:fix

---
 .../Organisms/PageContent/BlockAccordion.tsx  | 45 ++++++++++++++-----
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
index 3d8d58f73..75c64244c 100644
--- a/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
+++ b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
@@ -25,9 +25,9 @@ const unorderedItems: Plugin<[], Element> = () => (tree) => {
 };
 
 type HeadingProps = {
-  level?: string,
-  className?: string,
-  children: React.ReactNode,
+  level?: string;
+  className?: string;
+  children: React.ReactNode;
 };
 const Heading = ({ level, className, children }: HeadingProps) => {
   switch (level) {
@@ -46,9 +46,11 @@ const Heading = ({ level, className, children }: HeadingProps) => {
     default:
       return <h2 className={className}>{children}</h2>;
   }
-}
+};
 
-export function BlockAccordion(props: BlockAccordionFragment & { headingLevel?: string }) {
+export function BlockAccordion(
+  props: BlockAccordionFragment & { headingLevel?: string },
+) {
   return (
     <div className="container-page my-10">
       <div className="container-content">
@@ -70,9 +72,15 @@ export function BlockAccordion(props: BlockAccordionFragment & { headingLevel?:
                       </span>
                       <span>
                         {open ? (
-                          <ChevronUpIcon className={'h-6 w-6'} focusable={false} />
+                          <ChevronUpIcon
+                            className={'h-6 w-6'}
+                            focusable={false}
+                          />
                         ) : (
-                          <ChevronDownIcon className={'h-6 w-6'} focusable={false} />
+                          <ChevronDownIcon
+                            className={'h-6 w-6'}
+                            focusable={false}
+                          />
                         )}
                       </span>
                     </DisclosureButton>
@@ -124,19 +132,34 @@ export function BlockAccordion(props: BlockAccordionFragment & { headingLevel?:
   );
 }
 
-function AccordionIcon({ icon, focusable = false }: { icon: string, focusable?: boolean }) {
+function AccordionIcon({
+  icon,
+  focusable = false,
+}: {
+  icon: string;
+  focusable?: boolean;
+}) {
   switch (icon) {
     case 'questionmark':
       return (
-        <QuestionMarkCircleIcon className="w-5 h-5 me-2 shrink-0 text-gray-500" focusable={focusable} />
+        <QuestionMarkCircleIcon
+          className="w-5 h-5 me-2 shrink-0 text-gray-500"
+          focusable={focusable}
+        />
       );
     case 'checkmark':
       return (
-        <CheckCircleIcon className="w-5 h-5 me-2 shrink-0 text-gray-500" focusable={focusable} />
+        <CheckCircleIcon
+          className="w-5 h-5 me-2 shrink-0 text-gray-500"
+          focusable={focusable}
+        />
       );
     case 'arrow':
       return (
-        <ArrowRightCircleIcon className="w-5 h-5 me-2 shrink-0 text-gray-500" focusable={focusable} />
+        <ArrowRightCircleIcon
+          className="w-5 h-5 me-2 shrink-0 text-gray-500"
+          focusable={focusable}
+        />
       );
     default:
       return null;

From fa89bf3c4fa277220633eb4d9b8a4c41ca47d879 Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Tue, 30 Jul 2024 18:38:43 +0200
Subject: [PATCH 019/100] chore(SLB-459): fix border styling for accordion
 items

---
 .../src/components/Organisms/PageContent/BlockAccordion.tsx  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
index 75c64244c..d8db34e8b 100644
--- a/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
+++ b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
@@ -56,13 +56,13 @@ export function BlockAccordion(
       <div className="container-content">
         <div className="container-text">
           {props.items.map((item, index) => (
-            <Disclosure as="div" key={index}>
+            <Disclosure as="div" className="border-b border-gray-200 last:border-0" key={index}>
               {({ open }) => (
                 <>
                   <Heading level={props.headingLevel}>
                     <DisclosureButton
                       className={clsx(
-                        'border-b border-gray-200 last:border-0 flex w-full items-center justify-between p-4 pl-1 text-left font-medium text-lg hover:bg-gray-100',
+                        'flex w-full items-center justify-between p-4 pl-1 text-left font-medium text-lg hover:bg-gray-100',
                         { 'text-black': open, 'text-gray-500': !open },
                       )}
                     >
@@ -88,7 +88,6 @@ export function BlockAccordion(
                   <DisclosurePanel
                     className={clsx(
                       'py-5 text-base font-normal text-gray-500',
-                      { 'border-b border-gray-200 last:border-0': open },
                     )}
                   >
                     <div className="sm:w-full md:w-4/5">

From fd3af15f18080b7c0e5a09f4840f83ea87c0a539 Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Tue, 30 Jul 2024 20:48:34 +0200
Subject: [PATCH 020/100] chore(SLB-459): pnpm test:format:fix

---
 .../Organisms/PageContent/BlockAccordion.tsx           | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
index d8db34e8b..4af11434b 100644
--- a/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
+++ b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
@@ -56,7 +56,11 @@ export function BlockAccordion(
       <div className="container-content">
         <div className="container-text">
           {props.items.map((item, index) => (
-            <Disclosure as="div" className="border-b border-gray-200 last:border-0" key={index}>
+            <Disclosure
+              as="div"
+              className="border-b border-gray-200 last:border-0"
+              key={index}
+            >
               {({ open }) => (
                 <>
                   <Heading level={props.headingLevel}>
@@ -86,9 +90,7 @@ export function BlockAccordion(
                     </DisclosureButton>
                   </Heading>
                   <DisclosurePanel
-                    className={clsx(
-                      'py-5 text-base font-normal text-gray-500',
-                    )}
+                    className={clsx('py-5 text-base font-normal text-gray-500')}
                   >
                     <div className="sm:w-full md:w-4/5">
                       {item.textContent?.markup && (

From 73b982d72b423881951f4377e1020561231476e5 Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Tue, 30 Jul 2024 22:15:29 +0200
Subject: [PATCH 021/100] chore(SLB-459): add new heading level select field to
 accordion gutenberg block

---
 .../gutenberg_blocks/src/blocks/accordion.tsx | 68 ++++++++++++++++---
 .../fragments/PageContent/BlockAccordion.gql  |  1 +
 packages/schema/src/schema.graphql            |  1 +
 .../Organisms/PageContent/BlockAccordion.tsx  |  2 +-
 4 files changed, 60 insertions(+), 12 deletions(-)

diff --git a/packages/drupal/gutenberg_blocks/src/blocks/accordion.tsx b/packages/drupal/gutenberg_blocks/src/blocks/accordion.tsx
index 924746dd8..8097819ea 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/accordion.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/accordion.tsx
@@ -1,24 +1,70 @@
-import { InnerBlocks } from 'wordpress__block-editor';
+import { InnerBlocks, InspectorControls } from 'wordpress__block-editor';
 import { registerBlockType } from 'wordpress__blocks';
+import { PanelBody, SelectControl } from 'wordpress__components';
 
 // @ts-ignore
 const { t: __ } = Drupal;
 
+enum HeadingLevels {
+  H2 = 'h2',
+  H3 = 'h3',
+  H4 = 'h4',
+  H5 = 'h5',
+}
+
 registerBlockType('custom/accordion', {
   title: __('Accordion'),
   icon: 'menu',
   category: 'layout',
-  attributes: {},
-  edit: () => {
+  attributes: {
+    headingLevel: {
+      type: 'string',
+      default: HeadingLevels.H2,
+    },
+  },
+  edit: (props) => {
+    const { setAttributes } = props;
+
     return (
-      <div className={'container-wrapper'}>
-        <div className={'container-label'}>{__('Accordion')}</div>
-        <InnerBlocks
-          templateLock={false}
-          allowedBlocks={['custom/accordion-item-text']}
-          template={[['custom/accordion-item-text']]}
-        />
-      </div>
+      <>
+        <InspectorControls>
+          <PanelBody title={__('Heading Level')}>
+            <SelectControl
+              value={props.attributes.headingLevel as string}
+              options={[
+                {
+                  label: __('Heading 2'),
+                  value: HeadingLevels.H2,
+                },
+                {
+                  label: __('Heading 3'),
+                  value: HeadingLevels.H3,
+                },
+                {
+                  label: __('Heading 4'),
+                  value: HeadingLevels.H4,
+                },
+                {
+                  label: __('Heading 5'),
+                  value: HeadingLevels.H5,
+                },
+              ]}
+              onChange={(headingLevel: string) => {
+                setAttributes({ headingLevel });
+              }}
+            />
+          </PanelBody>
+        </InspectorControls>
+
+        <div className={'container-wrapper'}>
+          <div className={'container-label'}>{__('Accordion')}</div>
+          <InnerBlocks
+            templateLock={false}
+            allowedBlocks={['custom/accordion-item-text']}
+            template={[['custom/accordion-item-text']]}
+          />
+        </div>
+      </>
     );
   },
   save: () => <InnerBlocks.Content />,
diff --git a/packages/schema/src/fragments/PageContent/BlockAccordion.gql b/packages/schema/src/fragments/PageContent/BlockAccordion.gql
index 0f77b257d..fe6e3681e 100644
--- a/packages/schema/src/fragments/PageContent/BlockAccordion.gql
+++ b/packages/schema/src/fragments/PageContent/BlockAccordion.gql
@@ -1,4 +1,5 @@
 fragment BlockAccordion on BlockAccordion {
+  headingLevel
   items {
     ...BlockAccordionItemText
   }
diff --git a/packages/schema/src/schema.graphql b/packages/schema/src/schema.graphql
index fd351b736..7a2dc72dd 100644
--- a/packages/schema/src/schema.graphql
+++ b/packages/schema/src/schema.graphql
@@ -254,6 +254,7 @@ type BlockImageTeaser @default @value {
 }
 
 type BlockAccordion @type(id: "custom/accordion") {
+  headingLevel: String! @resolveEditorBlockAttribute(key: "headingLevel")
   items: [BlockAccordionItemText!]! @resolveEditorBlockChildren
 }
 
diff --git a/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
index 4af11434b..2501cbb98 100644
--- a/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
+++ b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
@@ -49,7 +49,7 @@ const Heading = ({ level, className, children }: HeadingProps) => {
 };
 
 export function BlockAccordion(
-  props: BlockAccordionFragment & { headingLevel?: string },
+  props: BlockAccordionFragment,
 ) {
   return (
     <div className="container-page my-10">

From b8ea4ae3f7b55d0520a4197f763d4367036ea667 Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Tue, 30 Jul 2024 22:19:04 +0200
Subject: [PATCH 022/100] chore(SLB-459): pnpm test:format:fix

---
 .../src/components/Organisms/PageContent/BlockAccordion.tsx   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
index 2501cbb98..ddf3a6ca0 100644
--- a/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
+++ b/packages/ui/src/components/Organisms/PageContent/BlockAccordion.tsx
@@ -48,9 +48,7 @@ const Heading = ({ level, className, children }: HeadingProps) => {
   }
 };
 
-export function BlockAccordion(
-  props: BlockAccordionFragment,
-) {
+export function BlockAccordion(props: BlockAccordionFragment) {
   return (
     <div className="container-page my-10">
       <div className="container-content">

From 9e1c24112ee58f927ef387cc6b83b069f5264e7b Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Wed, 31 Jul 2024 10:30:59 +0200
Subject: [PATCH 023/100] chore: update github actions to latest

---
 .github/actions/setup/action.yml               |  6 +++---
 .github/workflows/deploy.yml                   |  4 ++--
 .github/workflows/estimate.yml                 |  4 ++--
 .github/workflows/high_content_volume.yml      |  2 +-
 .github/workflows/merge_dev_to_stage.yml       |  2 +-
 .github/workflows/tag_release.yml              |  4 ++--
 .github/workflows/test.yml                     | 14 +++++++-------
 .github/workflows/test_without_turbo_cache.yml |  6 +++---
 .github/workflows/write-dashboard.yml          |  4 ++--
 9 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index a8a611e13..345d9b371 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -4,7 +4,7 @@ runs:
   using: 'composite'
   steps:
     - name: Setup Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v4
       with:
         node-version: 18
 
@@ -16,14 +16,14 @@ runs:
     - uses: pnpm/action-setup@v4
       name: Install pnpm
       with:
-        version: 8.6.12
+        version: 9.4.0
 
     - name: Get pnpm store directory
       id: pnpm-cache
       shell: bash
       run: echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       name: Setup pnpm cache
       with:
         path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 83587e7ac..256e3f6df 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -8,10 +8,10 @@ on:
 jobs:
   test:
     name: Deploy
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/estimate.yml b/.github/workflows/estimate.yml
index d492e2c0c..8b6b76fc4 100644
--- a/.github/workflows/estimate.yml
+++ b/.github/workflows/estimate.yml
@@ -6,7 +6,7 @@ jobs:
   estimate:
     name: Estimate
     if: vars.JIRA_PROJECT_ID != ''
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Start Check Run
         id: check
@@ -27,7 +27,7 @@ jobs:
         run: npm install -g @amazeelabs/estimator
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/high_content_volume.yml b/.github/workflows/high_content_volume.yml
index 88bbda211..b3474552a 100644
--- a/.github/workflows/high_content_volume.yml
+++ b/.github/workflows/high_content_volume.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
diff --git a/.github/workflows/merge_dev_to_stage.yml b/.github/workflows/merge_dev_to_stage.yml
index 55ca2f714..78edc2398 100644
--- a/.github/workflows/merge_dev_to_stage.yml
+++ b/.github/workflows/merge_dev_to_stage.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: 'dev'
 
diff --git a/.github/workflows/tag_release.yml b/.github/workflows/tag_release.yml
index 3d2c2dcf5..6d60fa34a 100644
--- a/.github/workflows/tag_release.yml
+++ b/.github/workflows/tag_release.yml
@@ -15,11 +15,11 @@ jobs:
         id: date
         run: echo "::set-output name=date::$(date +'%Y-%m-%d/%H/%M/%S')"
       - name: Checkout branch "prod"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: prod
       - name: Create Git tag for PR
-        uses: actions/github-script@v4
+        uses: actions/github-script@v7
         with:
           script: |
             github.git.createRef({
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d23873f19..edf0ade21 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   test:
     name: Test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Init check
         if: ${{ github.repository != 'AmazeeLabs/silverback-template'}}
@@ -14,7 +14,7 @@ jobs:
           instructions.' && false
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -38,7 +38,7 @@ jobs:
           TURBO_TEAM: 'local'
 
       - name: Upload Playwright report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: playwright-report
@@ -56,7 +56,7 @@ jobs:
           fi
 
       - name: Publish to Chromatic
-        uses: chromaui/action@v1
+        uses: chromaui/action@v11
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
@@ -94,13 +94,13 @@ jobs:
   update_dashboard:
     name: Update dashboard
     if: github.ref == 'refs/heads/release' && vars.JIRA_PROJECT_ID != ''
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Install estimator
         run: npm install -g @amazeelabs/estimator
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -118,7 +118,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Setup Ruby
diff --git a/.github/workflows/test_without_turbo_cache.yml b/.github/workflows/test_without_turbo_cache.yml
index 757b757c0..7faf17889 100644
--- a/.github/workflows/test_without_turbo_cache.yml
+++ b/.github/workflows/test_without_turbo_cache.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   test:
     name: Test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Init check
         if: ${{ github.repository != 'AmazeeLabs/silverback-template'}}
@@ -14,7 +14,7 @@ jobs:
           instructions.' && false
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -35,7 +35,7 @@ jobs:
           TURBO_TEAM: 'local'
 
       - name: Upload Playwright report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: playwright-report
diff --git a/.github/workflows/write-dashboard.yml b/.github/workflows/write-dashboard.yml
index 418c9c555..01186ab98 100644
--- a/.github/workflows/write-dashboard.yml
+++ b/.github/workflows/write-dashboard.yml
@@ -6,13 +6,13 @@ jobs:
   write_dashboard:
     name: Write dashboard history
     if: github.ref == 'refs/heads/release' && vars.JIRA_PROJECT_ID != ''
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Install estimator
         run: npm install -g @amazeelabs/estimator
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

From a551977398c5174237a47356a368e2ab1b31fbba Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Wed, 31 Jul 2024 14:29:57 +0200
Subject: [PATCH 024/100] fix: revert pnpm change

---
 .github/actions/setup/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 345d9b371..658c20cda 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -16,7 +16,7 @@ runs:
     - uses: pnpm/action-setup@v4
       name: Install pnpm
       with:
-        version: 9.4.0
+        version: 8.6.12
 
     - name: Get pnpm store directory
       id: pnpm-cache

From 7bb0ea6870776058a776745009843b7bb5799bcd Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Mon, 5 Aug 2024 20:53:29 +0200
Subject: [PATCH 025/100] fix: type drupal

---
 packages/schema/codegen.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/schema/codegen.ts b/packages/schema/codegen.ts
index 7dc41889a..7a0ea92c9 100644
--- a/packages/schema/codegen.ts
+++ b/packages/schema/codegen.ts
@@ -40,7 +40,7 @@ const config: CodegenConfig = {
         context: ['gatsby'],
       },
     },
-    // Directive autoloader for Drupla.
+    // Directive autoloader for Drupal.
     'build/drupal-autoload.json': {
       plugins: ['@amazeelabs/codegen-autoloader'],
       config: {

From 279f85554f7c9c6e5b6d15ac5b90a90af4636a19 Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Tue, 6 Aug 2024 09:16:21 +0200
Subject: [PATCH 026/100] chore(SLB-451): update sidebar styling, manually add
 built tailwind css classes to edit.css for now

---
 .idea/prettier.xml                            |   3 +-
 packages/drupal/gutenberg_blocks/css/edit.css |  45 +++----
 .../src/blocks/conditional.tsx                | 123 ++++++++++--------
 .../drupal/gutenberg_blocks/vite.config.ts    |   2 +
 4 files changed, 94 insertions(+), 79 deletions(-)

diff --git a/.idea/prettier.xml b/.idea/prettier.xml
index 0d96645cd..a3175fe71 100644
--- a/.idea/prettier.xml
+++ b/.idea/prettier.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="PrettierConfiguration">
+    <option name="myConfigurationMode" value="AUTOMATIC" />
     <option name="myRunOnSave" value="true" />
     <option name="myRunOnReformat" value="true" />
     <option name="myFilesPattern" value="**/**" />
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/packages/drupal/gutenberg_blocks/css/edit.css b/packages/drupal/gutenberg_blocks/css/edit.css
index cad110943..03f6ad69b 100644
--- a/packages/drupal/gutenberg_blocks/css/edit.css
+++ b/packages/drupal/gutenberg_blocks/css/edit.css
@@ -27,14 +27,6 @@
   min-height: 250px;
 }
 
-.gutenberg__editor .container-wrapper.no-margin {
-  margin: 0;
-}
-
-.gutenberg__editor .container-wrapper.no-min-height {
-  min-height: 0;
-}
-
 .gutenberg__editor .container-wrapper .container-label {
   font: bold 12px Sans-Serif;
   letter-spacing: 2px;
@@ -138,25 +130,34 @@
   margin-right: 5px;
 }
 
-.gutenberg__editor .collapsible-container .title {
+.\[\&\>div\]\:flex > div {
   display: flex;
-  cursor: pointer;
 }
 
-.gutenberg__editor .collapsible-container .title .left {
-  width: 34px;
-  background-color: #666666;
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16'%3e%3cpath d='M5.21 1.314L3.79 2.723l5.302 5.353-5.303 5.354 1.422 1.408 6.697-6.762z' fill='%230036B1'/%3e%3c/svg%3e");
-  background-repeat: no-repeat;
-  background-position: 10px;
-  rotate: -90deg;
+.\[\&\>div\]\:flex-col-reverse > div {
+  flex-direction: column-reverse;
 }
 
-.gutenberg__editor .collapsible-container.is-open .title .left {
-  rotate: 90deg;
+.\[\&\>div\]\:gap-4 > div {
+  gap: 1rem;
 }
 
-.gutenberg__editor .collapsible-container .title .right {
-  flex: 1;
-  padding-left: 10px;
+.flex {
+  display: flex;
+}
+
+.flex-col {
+  flex-direction: column;
+}
+
+.items-start {
+  align-items: flex-start;
+}
+
+.gap-4 {
+  gap: 1rem;
+}
+
+.\!m-0 {
+  margin: 0 !important;
 }
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx b/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
index d4668c86d..376415e28 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
@@ -2,7 +2,12 @@ import clsx from 'clsx';
 import { PropsWithChildren, useState } from 'react';
 import { InnerBlocks, InspectorControls } from 'wordpress__block-editor';
 import { registerBlockType } from 'wordpress__blocks';
-import { BaseControl, PanelBody } from 'wordpress__components';
+import {
+  BaseControl,
+  PanelBody,
+  PanelRow,
+  TextControl,
+} from 'wordpress__components';
 
 // @ts-ignore
 const { t: __ } = Drupal;
@@ -87,66 +92,73 @@ registerBlockType(`custom/conditional`, {
         </CollapsibleContainer>
         <InspectorControls>
           <PanelBody title={__('Purpose')}>
-            <BaseControl id="purpose">
-              <input
-                type="text"
+            <PanelRow>
+              <TextControl
                 id="purpose"
-                defaultValue={purpose}
-                onChange={(event) => {
-                  setAttributes({ purpose: event.target.value });
-                }}
+                label={__(
+                  'The value is not exposed to the frontend and serves to identify the reason of the conditional content (e.g. Summer Campaign).',
+                )}
+                value={purpose}
+                onChange={(value: string) => setAttributes({ purpose: value })}
+                className={
+                  '[&>div]:flex [&>div]:gap-4 [&>div]:flex-col-reverse'
+                }
               />
-            </BaseControl>
-            <BaseControl
-              id="purpose-decription"
-              label={__(
-                'The value is not exposed to the frontend and serves to identify the reason of the conditional content (e.g. Summer Campaign).',
-              )}
-            >
-              <div />
-            </BaseControl>
+            </PanelRow>
           </PanelBody>
+
           <PanelBody title={__('Scheduled display')}>
-            <BaseControl id="displayFrom" label={__('From')}>
-              <br />
-              <input
-                type="datetime-local"
+            <PanelRow className={'flex flex-col items-start gap-4'}>
+              <BaseControl
                 id="displayFrom"
-                defaultValue={displayFrom ? isoToLocalTime(displayFrom) : ''}
-                onChange={(event) => {
-                  setAttributes({
-                    displayFrom: event.target.value
-                      ? localToIsoTime(event.target.value)
-                      : '',
-                  });
-                }}
-              />
-            </BaseControl>
-            <BaseControl id="displayTo" label={__('To')}>
-              <br />
-              <input
-                type="datetime-local"
+                label={__('From')}
+                className={'[&>div]:flex [&>div]:gap-4 !m-0'}
+              >
+                <input
+                  type="datetime-local"
+                  id="displayFrom"
+                  defaultValue={displayFrom ? isoToLocalTime(displayFrom) : ''}
+                  onChange={(event) => {
+                    setAttributes({
+                      displayFrom: event.target.value
+                        ? localToIsoTime(event.target.value)
+                        : '',
+                    });
+                  }}
+                />
+              </BaseControl>
+              <BaseControl
                 id="displayTo"
-                defaultValue={displayTo ? isoToLocalTime(displayTo) : ''}
-                onChange={(event) => {
-                  setAttributes({
-                    displayTo: event.target.value
-                      ? localToIsoTime(event.target.value)
-                      : '',
-                  });
+                label={__('To')}
+                className={'[&>div]:flex [&>div]:gap-4 !m-0'}
+              >
+                <input
+                  type="datetime-local"
+                  id="displayTo"
+                  defaultValue={displayTo ? isoToLocalTime(displayTo) : ''}
+                  onChange={(event) => {
+                    setAttributes({
+                      displayTo: event.target.value
+                        ? localToIsoTime(event.target.value)
+                        : '',
+                    });
+                  }}
+                />
+              </BaseControl>
+            </PanelRow>
+            <PanelRow>
+              <p
+                className={'text-sm'}
+                style={{
+                  fontSize: '0.875rem',
+                  lineHeight: '1.25rem',
                 }}
-              />
-            </BaseControl>
-            <BaseControl
-              id="decription"
-              label={
-                __('Time zone') +
-                ': ' +
-                Intl.DateTimeFormat().resolvedOptions().timeZone
-              }
-            >
-              <div />
-            </BaseControl>
+              >
+                {__('Time zone') +
+                  ': ' +
+                  Intl.DateTimeFormat().resolvedOptions().timeZone}
+              </p>
+            </PanelRow>
           </PanelBody>
         </InspectorControls>
       </>
@@ -188,8 +200,7 @@ function CollapsibleContainer({
           setIsOpen(!isOpen);
         }}
       >
-        <div className="left"></div>
-        <div className="text-gray-500 right">{title}</div>
+        <div className="text-gray-500">{title}</div>
       </div>
 
       {isOpen ? (
diff --git a/packages/drupal/gutenberg_blocks/vite.config.ts b/packages/drupal/gutenberg_blocks/vite.config.ts
index 427f3514a..07a4dfe53 100644
--- a/packages/drupal/gutenberg_blocks/vite.config.ts
+++ b/packages/drupal/gutenberg_blocks/vite.config.ts
@@ -10,6 +10,7 @@ export default defineConfig({
       fileName: 'gutenberg_blocks',
     },
     rollupOptions: {
+      strictDeprecations: true,
       external: [
         'react',
         'react-dom',
@@ -23,6 +24,7 @@ export default defineConfig({
         'wordpress__hooks',
       ],
       output: {
+        strict: true,
         globals: {
           react: 'React',
           wordpress__blocks: 'wp.blocks',

From 5c1df253b3d8cad236196a51c1a8c83758ff79f5 Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Wed, 7 Aug 2024 09:18:39 +0200
Subject: [PATCH 027/100] chore: adjust the details styling a bit

---
 .../src/blocks/conditional.tsx                | 64 +++++++++----------
 1 file changed, 29 insertions(+), 35 deletions(-)

diff --git a/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx b/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
index 376415e28..adacee75c 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
@@ -84,25 +84,26 @@ registerBlockType(`custom/conditional`, {
           label={__('Conditional content')}
           isActive={isActive}
         >
-          <div className="text-sm text-gray-500">{summary}</div>
-          <InnerBlocks
-            templateLock={false}
-            template={[['core/paragraph', {}]]}
-          />
+          <div className="p-4 text-sm text-gray-500">{summary}</div>
+          <div className={clsx('p-4 border-t', { 'bg-gray-100': !isActive })}>
+            <InnerBlocks
+              templateLock={false}
+              template={[['core/paragraph', {}]]}
+            />
+          </div>
         </CollapsibleContainer>
         <InspectorControls>
           <PanelBody title={__('Purpose')}>
             <PanelRow>
               <TextControl
                 id="purpose"
-                label={__(
-                  'The value is not exposed to the frontend and serves to identify the reason of the conditional content (e.g. Summer Campaign).',
-                )}
+                hideLabelFromVision={true}
+                label={__('Purpose')}
                 value={purpose}
                 onChange={(value: string) => setAttributes({ purpose: value })}
-                className={
-                  '[&>div]:flex [&>div]:gap-4 [&>div]:flex-col-reverse'
-                }
+                help={__(
+                  'The value is not exposed to the frontend and serves to identify the reason of the conditional content (e.g. Summer Campaign).',
+                )}
               />
             </PanelRow>
           </PanelBody>
@@ -186,33 +187,26 @@ function CollapsibleContainer({
   title,
   isActive,
 }: PropsWithChildren<{ label: string; title: string; isActive: boolean }>) {
-  const [isOpen, setIsOpen] = useState(isActive);
+  const isLabelDifferentToTitle = label !== title;
+
   return (
-    <div
-      className={clsx('collapsible-container', {
-        'bg-gray-100': !isActive,
-        'is-open': isOpen,
-      })}
-    >
+    <>
       <div
-        className="title"
-        onClick={() => {
-          setIsOpen(!isOpen);
-        }}
+        className={clsx('border border-gray-200', {
+          'bg-red-100': !isActive,
+        })}
       >
-        <div className="text-gray-500">{title}</div>
-      </div>
+        <details>
+          <summary>
+            {title}{' '}
+            {isLabelDifferentToTitle ? (
+              <span className="text-sm m-2">({label})</span>
+            ) : null}{' '}
+          </summary>
 
-      {isOpen ? (
-        <div
-          className={clsx('container-wrapper no-margin', {
-            'no-min-height': !isOpen,
-          })}
-        >
-          <div className={'container-label'}>{label}</div>
-          {children}
-        </div>
-      ) : null}
-    </div>
+          <div className="border-t">{children}</div>
+        </details>
+      </div>
+    </>
   );
 }

From 1047a5106627abd415b974719890f7e04dbe5d69 Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Wed, 7 Aug 2024 09:45:10 +0200
Subject: [PATCH 028/100] fix: remove unused import

---
 packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx b/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
index adacee75c..0af6e9133 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
@@ -1,5 +1,5 @@
 import clsx from 'clsx';
-import { PropsWithChildren, useState } from 'react';
+import { PropsWithChildren } from 'react';
 import { InnerBlocks, InspectorControls } from 'wordpress__block-editor';
 import { registerBlockType } from 'wordpress__blocks';
 import {

From 633b7b66f792f21d65347fa432334a07e129edd1 Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Wed, 7 Aug 2024 13:57:57 +0200
Subject: [PATCH 029/100] chore: finalise styling, add support for multiple
 conditions

---
 packages/drupal/gutenberg_blocks/css/edit.css |  64 +++++++++
 .../src/blocks/conditional.tsx                | 132 +++++++++++-------
 2 files changed, 142 insertions(+), 54 deletions(-)

diff --git a/packages/drupal/gutenberg_blocks/css/edit.css b/packages/drupal/gutenberg_blocks/css/edit.css
index 03f6ad69b..3702388d1 100644
--- a/packages/drupal/gutenberg_blocks/css/edit.css
+++ b/packages/drupal/gutenberg_blocks/css/edit.css
@@ -142,6 +142,43 @@
   gap: 1rem;
 }
 
+.\[\&\>div\>label\]\:w-4 > div > label {
+  width: 1rem;
+}
+
+.\[\&\>div\>label\]\:mb-0 > div > label {
+  margin-bottom: 0;
+}
+
+.\[\&\>div\>label\]\:my-auto > div > label {
+  margin-top: auto;
+  margin-bottom: auto;
+}
+
+.font-extralight {
+  font-weight: 200;
+}
+
+.text-gray-600 {
+  --tw-text-opacity: 1;
+  color: rgb(75 85 99 / var(--tw-text-opacity));
+}
+
+.text-neutral-500 {
+  --tw-text-opacity: 1;
+  color: rgb(115 115 115 / var(--tw-text-opacity));
+}
+
+.text-sm {
+  font-size: 0.875rem;
+  line-height: 1.25rem;
+}
+
+.text-xs {
+  font-size: 0.75rem;
+  line-height: 1rem;
+}
+
 .flex {
   display: flex;
 }
@@ -161,3 +198,30 @@
 .\!m-0 {
   margin: 0 !important;
 }
+
+details[open] {
+  padding-bottom: 1em;
+}
+
+details[open] > summary::before {
+  transform: rotate(-90deg);
+}
+
+summary::marker {
+  content: none;
+}
+
+summary::before {
+  position: relative;
+  left: calc(var(--space-s) * -1);
+  display: inline-block;
+  width: var(--space-m);
+  height: var(--space-m);
+  margin-top: calc(var(--space-m) / -2);
+  content: '';
+  transition: transform var(--details-transform-transition-duration) ease-in 0s;
+  transform: rotate(90deg);
+  text-align: center;
+  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16'%3e%3cpath d='M5.21 1.314L3.79 2.723l5.302 5.353-5.303 5.354 1.422 1.408 6.697-6.762z' fill='%23545560'/%3e%3c/svg%3e");
+  background-size: contain;
+}
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx b/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
index 0af6e9133..36b10528d 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
@@ -1,5 +1,5 @@
 import clsx from 'clsx';
-import { PropsWithChildren } from 'react';
+import React, { PropsWithChildren } from 'react';
 import { InnerBlocks, InspectorControls } from 'wordpress__block-editor';
 import { registerBlockType } from 'wordpress__blocks';
 import {
@@ -12,8 +12,18 @@ import {
 // @ts-ignore
 const { t: __ } = Drupal;
 
+type ConditionsType = {
+  [key: string]: {
+    label: string;
+    visible: boolean;
+    template: JSX.Element;
+  };
+};
+
+const blockTitle = __('Conditional content');
+
 registerBlockType(`custom/conditional`, {
-  title: __('Conditional content'),
+  title: blockTitle,
   category: 'layout',
   icon: 'category',
   // Allow the block only at the root level to avoid GraphQL fragment recursion.
@@ -50,41 +60,61 @@ registerBlockType(`custom/conditional`, {
     };
     const isActive = Object.values(active).every(Boolean);
 
-    const conditions = {
-      scheduledDisplay:
-        displayFrom || displayTo
-          ? '🕒 ' +
-            __('Scheduled display') +
-            ': ' +
-            [
-              displayFrom
-                ? __('From') + ' ' + new Date(displayFrom).toLocaleString()
-                : '',
-              displayTo
-                ? __('To') + ' ' + new Date(displayTo).toLocaleString()
-                : '',
-            ]
-              .filter(Boolean)
-              .join(' ')
-          : '',
+    const conditions: ConditionsType = {
+      scheduledDisplay: {
+        label: '⏱️ ' + __('Scheduled display'),
+        visible: !!(displayFrom || displayTo),
+        template: (
+          <>
+            {displayFrom ? (
+              <>
+                <span className="font-extralight">{__('From')}</span>{' '}
+                {new Date(displayFrom).toLocaleString()}
+              </>
+            ) : null}
+            {displayFrom && displayTo ? <span>{' - '}</span> : null}
+            {displayTo ? (
+              <>
+                <span className="font-extralight">{__('To')}</span>{' '}
+                {new Date(displayTo).toLocaleString()}
+              </>
+            ) : null}
+          </>
+        ),
+      },
+      device: {
+        label: '📱 ' + __('Device'),
+        visible: false,
+        template: <>{'Mobile only.'}</>,
+      },
     };
-    const hasConditions = Object.values(conditions).some(Boolean);
-    const summary = hasConditions ? (
+
+    const hasConditions = Object.values(conditions)
+      .filter(({ visible }) => visible)
+      .some(Boolean);
+
+    const conditionsSummary = hasConditions ? (
       Object.entries(conditions)
         .filter(([, value]) => !!value)
-        .map(([key, value]) => <div key={key}>{value}</div>)
+        .filter(([, { visible }]) => visible)
+        .map(([key, { label, template }]) => (
+          <>
+            <div>{label}</div>
+            {template}
+          </>
+        ))
     ) : (
-      <div>{'ℹ️ ' + __('No conditions set')}</div>
+      <>{'ℹ️ ' + __('No conditions set')}</>
     );
 
     return (
       <>
         <CollapsibleContainer
-          title={purpose || __('Conditional content')}
-          label={__('Conditional content')}
+          title={purpose || blockTitle}
+          label={blockTitle}
           isActive={isActive}
         >
-          <div className="p-4 text-sm text-gray-500">{summary}</div>
+          <div className="p-4 text-sm text-gray-500">{conditionsSummary}</div>
           <div className={clsx('p-4 border-t', { 'bg-gray-100': !isActive })}>
             <InnerBlocks
               templateLock={false}
@@ -113,7 +143,9 @@ registerBlockType(`custom/conditional`, {
               <BaseControl
                 id="displayFrom"
                 label={__('From')}
-                className={'[&>div]:flex [&>div]:gap-4 !m-0'}
+                className={
+                  '[&>div]:flex [&>div]:gap-4 [&>div>label]:w-4 [&>div>label]:my-auto !m-0'
+                }
               >
                 <input
                   type="datetime-local"
@@ -131,7 +163,9 @@ registerBlockType(`custom/conditional`, {
               <BaseControl
                 id="displayTo"
                 label={__('To')}
-                className={'[&>div]:flex [&>div]:gap-4 !m-0'}
+                className={
+                  '[&>div]:flex [&>div]:gap-4 [&>div>label]:w-4 [&>div>label]:mb-0 [&>div>label]:my-auto !m-0'
+                }
               >
                 <input
                   type="datetime-local"
@@ -148,13 +182,7 @@ registerBlockType(`custom/conditional`, {
               </BaseControl>
             </PanelRow>
             <PanelRow>
-              <p
-                className={'text-sm'}
-                style={{
-                  fontSize: '0.875rem',
-                  lineHeight: '1.25rem',
-                }}
-              >
+              <p className={'text-xs text-neutral-500'}>
                 {__('Time zone') +
                   ': ' +
                   Intl.DateTimeFormat().resolvedOptions().timeZone}
@@ -171,42 +199,38 @@ registerBlockType(`custom/conditional`, {
   },
 });
 
-function localToIsoTime(localTime: string) {
+const localToIsoTime = (localTime: string) => {
   return new Date(localTime).toISOString();
-}
+};
 
-function isoToLocalTime(isoTime: string) {
+const isoToLocalTime = (isoTime: string) => {
   const date = new Date(isoTime);
   date.setMinutes(date.getMinutes() - date.getTimezoneOffset());
   return date.toISOString().slice(0, 16);
-}
+};
 
-function CollapsibleContainer({
+const CollapsibleContainer = ({
   children,
   label,
   title,
   isActive,
-}: PropsWithChildren<{ label: string; title: string; isActive: boolean }>) {
+}: PropsWithChildren<{ label: string; title: string; isActive: boolean }>) => {
   const isLabelDifferentToTitle = label !== title;
 
   return (
     <>
-      <div
-        className={clsx('border border-gray-200', {
-          'bg-red-100': !isActive,
-        })}
-      >
-        <details>
-          <summary>
-            {title}{' '}
-            {isLabelDifferentToTitle ? (
-              <span className="text-sm m-2">({label})</span>
-            ) : null}{' '}
-          </summary>
+      <div className={'container-wrapper'}>
+        <div className={'container-label'}>{label}</div>
+        <details
+          className={clsx('border border-gray-200', {
+            'bg-gray-100': !isActive,
+          })}
+        >
+          <summary>{title}</summary>
 
           <div className="border-t">{children}</div>
         </details>
       </div>
     </>
   );
-}
+};

From 38e1df0ba5e3a5888841bcac822540f92c11ad1c Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Thu, 27 Jun 2024 14:32:25 +0200
Subject: [PATCH 030/100] refactor(SLB-442): adjust preview tablet size

---
 packages/drupal/gutenberg_blocks/src/preview.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/drupal/gutenberg_blocks/src/preview.ts b/packages/drupal/gutenberg_blocks/src/preview.ts
index 1fdd5e874..659d4a5e9 100644
--- a/packages/drupal/gutenberg_blocks/src/preview.ts
+++ b/packages/drupal/gutenberg_blocks/src/preview.ts
@@ -20,8 +20,8 @@
               {
                 label: Drupal.t('Tablet'),
                 id: 'tablet',
-                width: 1024,
-                height: 824,
+                width: 768,
+                height: 1024,
                 iconPath:
                   '/modules/contrib/silverback_external_preview/icons/tablet.svg',
               },

From c2065aa5ac2905c38561b0ee44ee90daab4cd406 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Thu, 27 Jun 2024 18:10:55 +0200
Subject: [PATCH 031/100] feat(SLB-442): improve preview ui

---
 packages/drupal/gutenberg_blocks/css/edit.css | 37 ++++++++++
 .../drupal/gutenberg_blocks/src/preview.ts    | 68 ++++++++++---------
 2 files changed, 72 insertions(+), 33 deletions(-)

diff --git a/packages/drupal/gutenberg_blocks/css/edit.css b/packages/drupal/gutenberg_blocks/css/edit.css
index 7dc32cdc3..55c0ecd92 100644
--- a/packages/drupal/gutenberg_blocks/css/edit.css
+++ b/packages/drupal/gutenberg_blocks/css/edit.css
@@ -129,3 +129,40 @@
 .gutenberg__editor .drupal-preview-sidebar--header button {
   margin-right: 5px;
 }
+
+.gutenberg__editor .drupal-preview-sidebar--header select {
+  min-width: 350px;
+  position: relative;
+  appearance: none;
+  -webkit-appearance: none;
+  padding: 0.455em 6em 0.575em 1em;
+  background-color: #fff;
+  border: 1px solid #caced1;
+  border-radius: 0.25rem;
+  color: #000;
+  cursor: pointer;
+}
+
+/* Preview select */
+.gutenberg__editor .drupal-preview-sidebar--header select::before,
+.gutenberg__editor .drupal-preview-sidebar--header select::after {
+  --size: 0.3rem;
+  content: "";
+  position: absolute;
+  right: 1rem;
+  pointer-events: none;
+}
+
+.gutenberg__editor .drupal-preview-sidebar--header select::before {
+  border-left: var(--size) solid transparent;
+  border-right: var(--size) solid transparent;
+  border-bottom: var(--size) solid black;
+  top: 40%;
+}
+
+.gutenberg__editor .drupal-preview-sidebar--header select::after {
+  border-left: var(--size) solid transparent;
+  border-right: var(--size) solid transparent;
+  border-top: var(--size) solid black;
+  top: 55%;
+}
diff --git a/packages/drupal/gutenberg_blocks/src/preview.ts b/packages/drupal/gutenberg_blocks/src/preview.ts
index 659d4a5e9..5d2f15f5e 100644
--- a/packages/drupal/gutenberg_blocks/src/preview.ts
+++ b/packages/drupal/gutenberg_blocks/src/preview.ts
@@ -22,42 +22,35 @@
                 id: 'tablet',
                 width: 768,
                 height: 1024,
-                iconPath:
-                  '/modules/contrib/silverback_external_preview/icons/tablet.svg',
               },
               {
                 label: Drupal.t('Laptop'),
                 id: 'laptop',
                 width: 1366,
                 height: 786,
-                iconPath:
-                  '/modules/contrib/silverback_external_preview/icons/laptop.svg',
               },
               {
                 label: Drupal.t('Desktop'),
                 id: 'desktop',
                 width: 1920,
                 height: 1080,
-                iconPath:
-                  '/modules/contrib/silverback_external_preview/icons/desktop.svg',
-              },
-              {
-                label: Drupal.t('Full'),
-                id: 'full',
-                width: -1,
-                height: -1,
-                iconPath:
-                  '/modules/contrib/silverback_external_preview/icons/full.svg',
               },
             ];
 
-            let previewButtons = '';
-            previewSizes.forEach((size) => {
-              previewButtons += `
-                <button
-                  class="components-button is-primary drupal-preview-sidebar--button__${size.id}" 
-                >${size.label}</button>`;
-            });
+            const previewButton = `<button class="components-button is-primary external-preview">${Drupal.t('Preview')} ↗</button>`
+
+            const getPreviewSelect = () => {
+              let previewSelect = '<select class="external-preview">';
+              previewSizes.forEach((size) => {
+                if (size.width <= window.screen.width) {
+                  const selectOption = `<option value="${size.id}">${size.label} (${size.width} x ${size.height})</option>`;
+                  previewSelect += selectOption;
+                }
+              });
+              previewSelect += '</select>';
+              return previewSelect;
+            }
+            const previewSelect = getPreviewSelect();
 
             const previewSidebarMarkup = `
               <div class="interface-interface-skeleton__secondary-sidebar drupal-preview-sidebar" role="region" aria-label="Drupal preview" tabindex="-1">
@@ -80,7 +73,7 @@
                   </div>
                   <div class="drupal-preview-sidebar components-panel">
                     <div class="drupal-preview-sidebar--header">
-                      ${previewButtons}
+                      ${previewSelect} ${previewButton}
                     </div>
                     <div class="drupal-preview-sidebar--iframe-wrapper">
                       <iframe width="100%" height="800px" 
@@ -102,17 +95,26 @@
                   $('.drupal-preview-sidebar').remove();
                 },
               );
-              previewSizes.forEach((size) => {
-                $('.drupal-preview-sidebar--button__' + size.id).on(
-                  'click',
-                  function () {
-                    const windowFeatures =
-                      size.width !== -1 && size.height !== -1
-                        ? `resizable,height=${size.height},width=${size.width}`
-                        : `resizable,height=${screen.height},width=${screen.width}`;
-                    window.open(previewUrl, 'preview', windowFeatures);
-                  },
-                );
+
+              const $previewButton = $('button.external-preview');
+              $('select.external-preview').on(
+                'change',
+                function (event: Event) {
+                  const selectedSize = $(event.target).val();
+                  const size = previewSizes.find((size) => size.id === selectedSize);
+                  if (!size) {
+                    return;
+                  }
+                  $previewButton.data('windowHeight', size.height);
+                  $previewButton.data('windowWidth', size.width);
+                },
+              ).trigger('change');
+              $previewButton.on('click', function (event: Event) {
+                const target = $(event.target);
+                const windowWidth = target.data('windowWidth');
+                const windowHeight = target.data('windowHeight');
+                const windowFeatures = `resizable,height=${windowHeight},width=${windowWidth}`;
+                window.open(previewUrl, 'preview', windowFeatures);
               });
             } else {
               $('.drupal-preview-sidebar').remove();

From 875dcf4afbd75a617050753ec7172d525a290054 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Thu, 27 Jun 2024 18:42:16 +0200
Subject: [PATCH 032/100] chore(SLB-442): prettier

---
 packages/drupal/gutenberg_blocks/src/preview.ts | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/drupal/gutenberg_blocks/src/preview.ts b/packages/drupal/gutenberg_blocks/src/preview.ts
index 5d2f15f5e..71939cdf7 100644
--- a/packages/drupal/gutenberg_blocks/src/preview.ts
+++ b/packages/drupal/gutenberg_blocks/src/preview.ts
@@ -37,7 +37,7 @@
               },
             ];
 
-            const previewButton = `<button class="components-button is-primary external-preview">${Drupal.t('Preview')} ↗</button>`
+            const previewButton = `<button class="components-button is-primary external-preview">${Drupal.t('Preview')} ↗</button>`;
 
             const getPreviewSelect = () => {
               let previewSelect = '<select class="external-preview">';
@@ -49,7 +49,7 @@
               });
               previewSelect += '</select>';
               return previewSelect;
-            }
+            };
             const previewSelect = getPreviewSelect();
 
             const previewSidebarMarkup = `
@@ -97,18 +97,19 @@
               );
 
               const $previewButton = $('button.external-preview');
-              $('select.external-preview').on(
-                'change',
-                function (event: Event) {
+              $('select.external-preview')
+                .on('change', function (event: Event) {
                   const selectedSize = $(event.target).val();
-                  const size = previewSizes.find((size) => size.id === selectedSize);
+                  const size = previewSizes.find(
+                    (size) => size.id === selectedSize,
+                  );
                   if (!size) {
                     return;
                   }
                   $previewButton.data('windowHeight', size.height);
                   $previewButton.data('windowWidth', size.width);
-                },
-              ).trigger('change');
+                })
+                .trigger('change');
               $previewButton.on('click', function (event: Event) {
                 const target = $(event.target);
                 const windowWidth = target.data('windowWidth');

From 775f45902dadce43ad3b7f5b2ad26b358dc68d54 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Thu, 27 Jun 2024 19:24:02 +0200
Subject: [PATCH 033/100] chore(SLB-442): prettier

---
 packages/drupal/gutenberg_blocks/css/edit.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/drupal/gutenberg_blocks/css/edit.css b/packages/drupal/gutenberg_blocks/css/edit.css
index 55c0ecd92..496f61bd6 100644
--- a/packages/drupal/gutenberg_blocks/css/edit.css
+++ b/packages/drupal/gutenberg_blocks/css/edit.css
@@ -147,7 +147,7 @@
 .gutenberg__editor .drupal-preview-sidebar--header select::before,
 .gutenberg__editor .drupal-preview-sidebar--header select::after {
   --size: 0.3rem;
-  content: "";
+  content: '';
   position: absolute;
   right: 1rem;
   pointer-events: none;

From 5287c61dc49cf11429dc72c543fa31e44b9c2b9f Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Mon, 1 Jul 2024 12:07:34 +0200
Subject: [PATCH 034/100] feat(SLB-416): preview link decoupled port

To be moved in silverback-mono
---
 .../drupal/silverback_preview_link/README.md  |  29 +++
 .../silverback_preview_link/composer.json     |  18 ++
 .../silverback_preview_link.settings.yml      |   3 +
 .../schema/silverback_preview_link.schema.yml |  14 ++
 .../silverback_preview_link.info.yml          |  11 +
 .../silverback_preview_link.install           |   6 +
 .../silverback_preview_link.links.menu.yml    |   5 +
 .../silverback_preview_link.module            |  58 +++++
 .../silverback_preview_link.permissions.yml   |   8 +
 .../silverback_preview_link.routing.yml       |  16 ++
 .../silverback_preview_link.services.yml      |  12 ++
 .../PreviewLinkSessionTokenController.php     |  69 ++++++
 .../src/Entity/SilverbackPreviewLink.php      | 198 ++++++++++++++++++
 .../Entity/SilverbackPreviewLinkInterface.php | 110 ++++++++++
 .../src/Form/PreviewLinkForm.php              | 193 +++++++++++++++++
 .../src/Form/SettingsForm.php                 | 190 +++++++++++++++++
 .../src/PreviewLinkExpiry.php                 |  55 +++++
 .../src/PreviewLinkHooks.php                  |  61 ++++++
 .../src/PreviewLinkHost.php                   |  71 +++++++
 .../src/PreviewLinkHostInterface.php          |  49 +++++
 .../src/PreviewLinkStorage.php                |  99 +++++++++
 .../src/PreviewLinkStorageInterface.php       |  19 ++
 .../src/PreviewLinkUtility.php                |  27 +++
 .../src/Routing/PreviewLinkRouteProvider.php  | 100 +++++++++
 .../templates/preview-link.html.twig          |   6 +
 25 files changed, 1427 insertions(+)
 create mode 100644 packages/drupal/silverback_preview_link/README.md
 create mode 100644 packages/drupal/silverback_preview_link/composer.json
 create mode 100644 packages/drupal/silverback_preview_link/config/install/silverback_preview_link.settings.yml
 create mode 100644 packages/drupal/silverback_preview_link/config/schema/silverback_preview_link.schema.yml
 create mode 100644 packages/drupal/silverback_preview_link/silverback_preview_link.info.yml
 create mode 100644 packages/drupal/silverback_preview_link/silverback_preview_link.install
 create mode 100644 packages/drupal/silverback_preview_link/silverback_preview_link.links.menu.yml
 create mode 100644 packages/drupal/silverback_preview_link/silverback_preview_link.module
 create mode 100644 packages/drupal/silverback_preview_link/silverback_preview_link.permissions.yml
 create mode 100644 packages/drupal/silverback_preview_link/silverback_preview_link.routing.yml
 create mode 100644 packages/drupal/silverback_preview_link/silverback_preview_link.services.yml
 create mode 100644 packages/drupal/silverback_preview_link/src/Controller/PreviewLinkSessionTokenController.php
 create mode 100644 packages/drupal/silverback_preview_link/src/Entity/SilverbackPreviewLink.php
 create mode 100644 packages/drupal/silverback_preview_link/src/Entity/SilverbackPreviewLinkInterface.php
 create mode 100644 packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php
 create mode 100644 packages/drupal/silverback_preview_link/src/Form/SettingsForm.php
 create mode 100644 packages/drupal/silverback_preview_link/src/PreviewLinkExpiry.php
 create mode 100644 packages/drupal/silverback_preview_link/src/PreviewLinkHooks.php
 create mode 100644 packages/drupal/silverback_preview_link/src/PreviewLinkHost.php
 create mode 100644 packages/drupal/silverback_preview_link/src/PreviewLinkHostInterface.php
 create mode 100644 packages/drupal/silverback_preview_link/src/PreviewLinkStorage.php
 create mode 100644 packages/drupal/silverback_preview_link/src/PreviewLinkStorageInterface.php
 create mode 100644 packages/drupal/silverback_preview_link/src/PreviewLinkUtility.php
 create mode 100644 packages/drupal/silverback_preview_link/src/Routing/PreviewLinkRouteProvider.php
 create mode 100644 packages/drupal/silverback_preview_link/templates/preview-link.html.twig

diff --git a/packages/drupal/silverback_preview_link/README.md b/packages/drupal/silverback_preview_link/README.md
new file mode 100644
index 000000000..1a9959144
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/README.md
@@ -0,0 +1,29 @@
+# Silverback Preview Link
+
+Decoupled preview with access token. Integrates with Silverback autosave.
+
+The primary use case for this module is:
+
+- Use case #1
+- Use case #2
+- Use case #3
+
+## REQUIREMENTS
+
+DESCRIBE_MODULE_DEPENDENCIES_HERE
+
+This module is inspired by the [Preview Link](https://www.drupal.org/project/preview_link) module
+but does not depend on it as the use cases are different, this module 
+- is suitable for a decoupled setup
+- handles access based on GraphQL
+- enables autosave preview to share instant preview updates
+
+## INSTALLATION
+
+Install as you would normally install a contributed Drupal module.
+See: https://www.drupal.org/node/895232 for further information.
+
+## CONFIGURATION
+- Configuration step #1
+- Configuration step #2
+- Configuration step #3
diff --git a/packages/drupal/silverback_preview_link/composer.json b/packages/drupal/silverback_preview_link/composer.json
new file mode 100644
index 000000000..a5ebfd650
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/composer.json
@@ -0,0 +1,18 @@
+{
+  "name": "amazeelabs/silverback_preview_link",
+  "type": "drupal-module",
+  "version": "1.0.0",
+  "description": "Decoupled preview with access token.",
+  "homepage": "https://github.com/AmazeeLabs/silverback-mono/tree/development/packages/composer/amazeelabs/silverback_preview_link#readme",
+  "license": "GPL-2.0+",
+  "repositories": [
+    {
+      "type": "composer",
+      "url": "https://packages.drupal.org/8"
+    }
+  ],
+  "require": {
+    "php": ">=8.2",
+    "drupal/dynamic_entity_reference": "^3 || ^4"
+  }
+}
diff --git a/packages/drupal/silverback_preview_link/config/install/silverback_preview_link.settings.yml b/packages/drupal/silverback_preview_link/config/install/silverback_preview_link.settings.yml
new file mode 100644
index 000000000..6de5f6ebd
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/config/install/silverback_preview_link.settings.yml
@@ -0,0 +1,3 @@
+enabled_entity_types: {}
+expiry_seconds : 86400
+multiple_entities: false
diff --git a/packages/drupal/silverback_preview_link/config/schema/silverback_preview_link.schema.yml b/packages/drupal/silverback_preview_link/config/schema/silverback_preview_link.schema.yml
new file mode 100644
index 000000000..46ac9633b
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/config/schema/silverback_preview_link.schema.yml
@@ -0,0 +1,14 @@
+silverback_preview_link.settings:
+  type: config_object
+  mapping:
+    enabled_entity_types:
+      type: sequence
+      sequence:
+        type: sequence
+        sequence:
+          type: string
+    expiry_seconds:
+      type: integer
+    multiple_entities:
+      label: Whether Preview Links can reference multiple entities.
+      type: boolean
diff --git a/packages/drupal/silverback_preview_link/silverback_preview_link.info.yml b/packages/drupal/silverback_preview_link/silverback_preview_link.info.yml
new file mode 100644
index 000000000..ce9e7d5a8
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/silverback_preview_link.info.yml
@@ -0,0 +1,11 @@
+name: 'Silverback Preview Link'
+type: module
+description: 'Decoupled preview with access token. Integrates with Silverback autosave.'
+package: Silverback
+configure: silverback_preview_link.settings
+core_version_requirement: ^10 || ^11
+dependencies:
+  - dynamic_entity_reference:dynamic_entity_reference
+  - silverback_autosave:silverback_autosave
+  - silverback_gatsby:silverback_gatsby
+  - silverback_external_preview:silverback_external_preview
diff --git a/packages/drupal/silverback_preview_link/silverback_preview_link.install b/packages/drupal/silverback_preview_link/silverback_preview_link.install
new file mode 100644
index 000000000..2b0ab0470
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/silverback_preview_link.install
@@ -0,0 +1,6 @@
+<?php
+
+/**
+ * @file
+ * Install, update and uninstall functions for the Silverback Preview Link module.
+ */
diff --git a/packages/drupal/silverback_preview_link/silverback_preview_link.links.menu.yml b/packages/drupal/silverback_preview_link/silverback_preview_link.links.menu.yml
new file mode 100644
index 000000000..c2ba767f7
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/silverback_preview_link.links.menu.yml
@@ -0,0 +1,5 @@
+silverback_preview_link.settings:
+  route_name: silverback_preview_link.settings
+  parent: system.admin_config_content
+  title: Silverback Preview Link
+  description: 'Manage preview link settings.'
diff --git a/packages/drupal/silverback_preview_link/silverback_preview_link.module b/packages/drupal/silverback_preview_link/silverback_preview_link.module
new file mode 100644
index 000000000..247d77b51
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/silverback_preview_link.module
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * @file
+ * Primary module hooks for Silverback Preview Link module.
+ */
+
+use Drupal\silverback_preview_link\PreviewLinkUtility;
+use Drupal\silverback_preview_link\Routing\PreviewLinkRouteProvider;
+use Drupal\silverback_preview_link\PreviewLinkHooks;
+
+/**
+ * Implements hook_entity_type_alter().
+ */
+function silverback_preview_link_entity_type_alter(array &$entity_types): void {
+  $supported_entity_types = array_filter(
+    $entity_types,
+    [PreviewLinkUtility::class, 'isEntityTypeSupported'],
+  );
+
+  /** @var \Drupal\Core\Entity\ContentEntityType $type */
+  foreach ($supported_entity_types as $type) {
+    $providers = $type->getRouteProviderClasses() ?: [];
+    if (count($providers['silverback_preview_link'] ?? []) === 0) {
+      $providers['silverback_preview_link'] = PreviewLinkRouteProvider::class;
+      $type->setHandlerClass('route_provider', $providers);
+    }
+
+    if (!$type->hasLinkTemplate('preview-link-generate')) {
+      $type->setLinkTemplate('preview-link-generate', $type->getLinkTemplate('canonical') . '/generate-preview-link');
+    }
+  }
+}
+
+/**
+ * Implements hook_cron().
+ */
+function silverback_preview_link_cron(): void {
+  \Drupal::classResolver(PreviewLinkHooks::class)->cron();
+}
+
+/**
+ * Implements hook_theme().
+ */
+function silverback_preview_link_theme(array $existing, string $type, string $theme, string $path): array {
+  return [
+    'preview_link' => [
+      'path' => $path . '/templates',
+      'template' => 'preview-link',
+      'variables' => [
+        'title' => NULL,
+        'link' => NULL,
+        'description' => NULL,
+        'remaining_lifetime' => NULL,
+      ],
+    ],
+  ];
+}
diff --git a/packages/drupal/silverback_preview_link/silverback_preview_link.permissions.yml b/packages/drupal/silverback_preview_link/silverback_preview_link.permissions.yml
new file mode 100644
index 000000000..fc17f9be0
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/silverback_preview_link.permissions.yml
@@ -0,0 +1,8 @@
+administer silverback preview link settings:
+  title: 'Administer Silverback preview link settings'
+  description: 'Allows the user to administer the preview link settings'
+  restrict access: TRUE
+
+generate silverback preview links:
+  title: 'Generate Silverback preview links'
+  description: 'Allows the user to generate a preview link for a piece of content'
diff --git a/packages/drupal/silverback_preview_link/silverback_preview_link.routing.yml b/packages/drupal/silverback_preview_link/silverback_preview_link.routing.yml
new file mode 100644
index 000000000..36b10ac7c
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/silverback_preview_link.routing.yml
@@ -0,0 +1,16 @@
+silverback_preview_link.settings:
+  path: '/admin/config/content/silverback_preview_link'
+  defaults:
+    _form: '\Drupal\silverback_preview_link\Form\SettingsForm'
+    _title: 'Silverback preview link'
+    _description: 'Manage Preview link settings.'
+  requirements:
+    _permission: 'administer silverback preview link settings'
+
+silverback_preview_link.session_tokens.remove:
+  path: '/silverback-preview-link/session-tokens/remove'
+  defaults:
+    _controller: '\Drupal\silverback_preview_link\Controller\PreviewLinkSessionTokenController::removeTokens'
+    _title: 'Remove all Preview Link session tokens'
+  requirements:
+    _access_preview_session_exists: 'TRUE'
diff --git a/packages/drupal/silverback_preview_link/silverback_preview_link.services.yml b/packages/drupal/silverback_preview_link/silverback_preview_link.services.yml
new file mode 100644
index 000000000..7806033c5
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/silverback_preview_link.services.yml
@@ -0,0 +1,12 @@
+services:
+  silverback_preview_link.link_expiry:
+    class: Drupal\silverback_preview_link\PreviewLinkExpiry
+    arguments: ['@config.factory']
+  silverback_preview_link.host:
+    class: Drupal\silverback_preview_link\PreviewLinkHost
+    arguments:
+      - '@entity_type.manager'
+      - '@datetime.time'
+  logger.channel.preview_link:
+    parent: logger.channel_base
+    arguments: [ 'silverback_preview_link' ]
diff --git a/packages/drupal/silverback_preview_link/src/Controller/PreviewLinkSessionTokenController.php b/packages/drupal/silverback_preview_link/src/Controller/PreviewLinkSessionTokenController.php
new file mode 100644
index 000000000..c730f56f1
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/src/Controller/PreviewLinkSessionTokenController.php
@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\silverback_preview_link\Controller;
+
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Messenger\MessengerInterface;
+use Drupal\Core\StringTranslation\TranslationInterface;
+use Drupal\Core\TempStore\PrivateTempStoreFactory;
+use Drupal\Core\Url;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * Controller for removing tokens from the session.
+ */
+class PreviewLinkSessionTokenController extends ControllerBase {
+
+  /**
+   * PreviewLinkSessionTokenController constructor.
+   *
+   * @param \Drupal\Core\StringTranslation\TranslationInterface $stringTranslation
+   *   The string translation service.
+   * @param \Drupal\Core\Messenger\MessengerInterface $messenger
+   *   The messenger.
+   * @param \Drupal\Core\TempStore\PrivateTempStoreFactory $privateTempStoreFactory
+   *   The tempstore factory.
+   */
+  final public function __construct(
+    TranslationInterface $stringTranslation,
+    MessengerInterface $messenger,
+    protected PrivateTempStoreFactory $privateTempStoreFactory,
+  ) {
+    $this->messenger = $messenger;
+    $this->stringTranslation = $stringTranslation;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('string_translation'),
+      $container->get('messenger'),
+      $container->get('tempstore.private'),
+    );
+  }
+
+  /**
+   * Removes tokens from the users' session.
+   */
+  public function removeTokens(): Response {
+    $collection = $this->privateTempStoreFactory->get('preview_link');
+    $hasKeys = $collection->get('keys') !== NULL;
+    $collection->delete('keys');
+    if ($hasKeys) {
+      $this->messenger->addMessage($this->t('Removed preview link tokens.'));
+    }
+    else {
+      $this->messenger->addWarning($this->t('No preview link tokens associated with this session.'));
+    }
+
+    $destination = Url::fromRoute('<front>');
+    return new RedirectResponse($destination->toString());
+  }
+
+}
diff --git a/packages/drupal/silverback_preview_link/src/Entity/SilverbackPreviewLink.php b/packages/drupal/silverback_preview_link/src/Entity/SilverbackPreviewLink.php
new file mode 100644
index 000000000..5858e33e7
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/src/Entity/SilverbackPreviewLink.php
@@ -0,0 +1,198 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\silverback_preview_link\Entity;
+
+use Drupal\Component\Assertion\Inspector;
+use Drupal\Core\Entity\ContentEntityBase;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\Core\Url;
+
+/**
+ * Defines the Silverback preview link entity class.
+ *
+ * @ContentEntityType(
+ *   id = "silverback_preview_link",
+ *   label = @Translation("Preview Link"),
+ *   base_table = "silverback_preview_link",
+ *   handlers = {
+ *     "storage" = "Drupal\silverback_preview_link\PreviewLinkStorage",
+ *     "form" = {
+ *       "silverback_preview_link" = "Drupal\silverback_preview_link\Form\PreviewLinkForm"
+ *     }
+ *   },
+ *   entity_keys = {
+ *     "id" = "id"
+ *   }
+ * )
+ *
+ * @property \Drupal\dynamic_entity_reference\Plugin\Field\FieldType\DynamicEntityReferenceFieldItemList $entities
+ */
+class SilverbackPreviewLink extends ContentEntityBase implements SilverbackPreviewLinkInterface {
+
+  /**
+   * Keep track on whether we need a new token upon save.
+   *
+   * @var bool
+   */
+  protected $needsNewToken = FALSE;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getUrl(EntityInterface $entity): Url {
+    return Url::fromRoute(sprintf('entity.%s.silverback_preview_link', $entity->getEntityTypeId()), [
+      $entity->getEntityTypeId() => $entity->id(),
+      'preview_token' => $this->getToken(),
+    ]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getToken(): string {
+    return $this->get('token')->value;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setToken($token) {
+    $this->set('token', $token);
+    // Add a second so our testing always works.
+    $this->set('generated_timestamp', time() + 1);
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function regenerateToken($needs_new_token = FALSE): bool {
+    $current_value = $this->needsNewToken;
+    $this->needsNewToken = $needs_new_token;
+    return $current_value;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getGeneratedTimestamp(): int {
+    return (int) $this->get('generated_timestamp')->value;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getEntities(): array {
+    return $this->entities->referencedEntities();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setEntities(array $entities) {
+    assert(Inspector::assertAllObjects($entities, EntityInterface::class));
+    return $this->set('entities', $entities);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function addEntity(EntityInterface $entity) {
+    $this->entities->appendItem($entity);
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getExpiry(): ?\DateTimeImmutable {
+    $value = $this->expiry->value ?? NULL;
+    if (!is_numeric($value)) {
+      return NULL;
+    }
+
+    return new \DateTimeImmutable('@' . $value);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setExpiry(\DateTimeInterface $expiry) {
+    return $this->set('expiry', $expiry->getTimestamp());
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
+    $fields = parent::baseFieldDefinitions($entity_type);
+    $fields['token'] = BaseFieldDefinition::create('string')
+      ->setLabel(t('Preview Token'))
+      ->setDescription(t('A token that allows any user to view a preview of this entity.'))
+      ->setRequired(TRUE);
+
+    $fields['entities'] = BaseFieldDefinition::create('dynamic_entity_reference')
+      ->setLabel(t('Entities'))
+      ->setDescription(t('The associated entities this preview link unlocks.'))
+      ->setRequired(TRUE)
+      ->setCardinality(FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED)
+      ->addConstraint('PreviewLinkEntitiesUniqueConstraint', [])
+      ->setSettings(static::entitiesDefaultFieldSettings())
+      ->setDisplayOptions('form', [
+        'type' => 'preview_link_entities_widget',
+        'weight' => 10,
+      ]);
+
+    $fields['generated_timestamp'] = BaseFieldDefinition::create('timestamp')
+      ->setLabel(t('Generated Timestamp'))
+      ->setDescription(t('The time the link was generated'))
+      ->setRequired(TRUE);
+
+    $fields['expiry'] = BaseFieldDefinition::create('timestamp')
+      ->setLabel(t('Time this Preview Link expires.'))
+      ->setDescription(t('The time after which the preview link is no longer valid.'))
+      ->setDefaultValueCallback(static::class . '::expiryDefaultValue')
+      ->setRequired(TRUE);
+
+    return $fields;
+  }
+
+  /**
+   * Rewrites settings for 'entities' dynamic_entity_reference field.
+   *
+   * DynamicEntityReferenceItem::defaultFieldSettings doesnt receive any context
+   * so we need to change the default handlers manually.
+   */
+  public static function entitiesDefaultFieldSettings(): array {
+    $labels = \Drupal::service('entity_type.repository')->getEntityTypeLabels(TRUE);
+    $options = $labels[(string) t('Content', [], ['context' => 'Entity type group'])];
+    $settings = [
+      'exclude_entity_types' => TRUE,
+      'entity_type_ids' => [],
+    ];
+    $settings += array_fill_keys(array_keys($options), [
+      'handler' => 'silverback_preview_link',
+      'handler_settings' => [],
+    ]);
+    return $settings;
+  }
+
+  /**
+   * Get default value for 'expiry' field.
+   *
+   * @return int<0, max>
+   *   A timestamp.
+   */
+  public static function expiryDefaultValue(): int {
+    $time = \Drupal::time();
+    /** @var \Drupal\preview_link\PreviewLinkExpiry $linkExpiry */
+    $linkExpiry = \Drupal::service('silverback_preview_link.link_expiry');
+    return max(0, $time->getRequestTime() + $linkExpiry->getLifetime());
+  }
+
+}
diff --git a/packages/drupal/silverback_preview_link/src/Entity/SilverbackPreviewLinkInterface.php b/packages/drupal/silverback_preview_link/src/Entity/SilverbackPreviewLinkInterface.php
new file mode 100644
index 000000000..5962d9dc3
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/src/Entity/SilverbackPreviewLinkInterface.php
@@ -0,0 +1,110 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\silverback_preview_link\Entity;
+
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Url;
+
+/**
+ * Interface for the preview link entity.
+ */
+interface SilverbackPreviewLinkInterface extends ContentEntityInterface {
+
+  /**
+   * The URL for this preview link for an entity.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   A host entity.
+   *
+   * @return \Drupal\Core\Url
+   *   The url object.
+   */
+  public function getUrl(EntityInterface $entity): Url;
+
+  /**
+   * Gets thew new token.
+   *
+   * @return string
+   *   The token.
+   */
+  public function getToken(): string;
+
+  /**
+   * Set the new token.
+   *
+   * @param string $token
+   *   The new token.
+   *
+   * @return $this
+   *   Return this for chaining.
+   */
+  public function setToken(string $token);
+
+  /**
+   * Mark the entity needing a new token. Only updated upon save.
+   *
+   * @param bool $needs_new_token
+   *   Tell this entity to generate a new token.
+   *
+   * @return bool
+   *   TRUE if it was currently marked to generate otherwise FALSE.
+   */
+  public function regenerateToken($needs_new_token = FALSE): bool;
+
+  /**
+   * Gets the timestamp stamp of when the token was generated.
+   *
+   * @return int
+   *   The timestamp.
+   */
+  public function getGeneratedTimestamp(): int;
+
+  /**
+   * Get entities this preview link unlocks.
+   *
+   * Ideally preview link access is determined via PreviewLinkHost service.
+   *
+   * @return \Drupal\Core\Entity\EntityInterface[]
+   *   Associated entities.
+   */
+  public function getEntities(): array;
+
+  /**
+   * Set the entity this preview link unlocks.
+   *
+   * @return $this
+   *   Return this for chaining.
+   */
+  public function setEntities(array $entities);
+
+  /**
+   * Add an entity for this preview link to unlock.
+   *
+   * @return $this
+   *   Return this for chaining.
+   */
+  public function addEntity(EntityInterface $entity);
+
+  /**
+   * Get expiration date.
+   *
+   * @return \DateTimeImmutable|null
+   *   The expiration date, or NULL if not set.
+   */
+  public function getExpiry(): ?\DateTimeImmutable;
+
+  /**
+   * Set the expiration date.
+   *
+   * @param \DateTimeInterface $expiry
+   *   The expiration date.
+   *
+   * @return $this
+   *   Return this for chaining.
+   */
+  public function setExpiry(\DateTimeInterface $expiry);
+
+}
diff --git a/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php b/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php
new file mode 100644
index 000000000..97d48e997
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php
@@ -0,0 +1,193 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\silverback_preview_link\Form;
+
+use Drupal\Component\Datetime\TimeInterface;
+use Drupal\Core\Datetime\DateFormatterInterface;
+use Drupal\Core\Entity\ContentEntityForm;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityRepositoryInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Messenger\MessengerInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Url;
+use Drupal\silverback_preview_link\Entity\SilverbackPreviewLink;
+use Drupal\silverback_preview_link\PreviewLinkExpiry;
+use Drupal\silverback_preview_link\PreviewLinkHostInterface;
+use Drupal\silverback_preview_link\PreviewLinkStorageInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Preview link form.
+ *
+ * @internal
+ *
+ * @property \Drupal\silverback_preview_link\Entity\SilverbackPreviewLinkInterface $entity
+ */
+final class PreviewLinkForm extends ContentEntityForm {
+
+  /**
+   * PreviewLinkForm constructor.
+   */
+  public function __construct(
+    EntityRepositoryInterface $entity_repository,
+    EntityTypeBundleInfoInterface $entity_type_bundle_info,
+    TimeInterface $time,
+    protected DateFormatterInterface $dateFormatter,
+    protected PreviewLinkExpiry $linkExpiry,
+    MessengerInterface $messenger,
+    protected PreviewLinkHostInterface $previewLinkHost,
+  ) {
+    parent::__construct($entity_repository, $entity_type_bundle_info, $time);
+    $this->messenger = $messenger;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container): self {
+    return new static(
+      $container->get('entity.repository'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('datetime.time'),
+      $container->get('date.formatter'),
+      $container->get('silverback_preview_link.link_expiry'),
+      $container->get('messenger'),
+      $container->get('silverback_preview_link.host'),
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'silverback_preview_link_entity_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getEntityFromRouteMatch(RouteMatchInterface $route_match, $entity_type_id) {
+    $host = $this->getHostEntity($route_match);
+    $previewLinks = $this->previewLinkHost->getPreviewLinks($host);
+    if (count($previewLinks) > 0) {
+      return reset($previewLinks);
+    }
+    else {
+      $storage = $this->entityTypeManager->getStorage('silverback_preview_link');
+      assert($storage instanceof PreviewLinkStorageInterface);
+      $previewLink = SilverbackPreviewLink::create()->addEntity($host);
+      $previewLink->save();
+      return $previewLink;
+    }
+  }
+
+  /**
+   * Get the entity referencing this Preview Link.
+   *
+   * @param \Drupal\Core\Routing\RouteMatchInterface $routeMatch
+   *   A route match.
+   *
+   * @return \Drupal\Core\Entity\EntityInterface
+   *   The host entity.
+   */
+  public function getHostEntity(RouteMatchInterface $routeMatch): EntityInterface {
+    return parent::getEntityFromRouteMatch($routeMatch, $routeMatch->getRouteObject()->getOption('silverback_preview_link.entity_type_id'));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, RouteMatchInterface $routeMatch = NULL) {
+    if (!isset($routeMatch)) {
+      throw new \LogicException('Route match not populated from argument resolver');
+    }
+
+    $host = $this->getHostEntity($routeMatch);
+    $description = $this->t('Generate a preview link for the <em>@entity_label</em> entity. Preview links will expire @lifetime after they were created.', [
+      '@entity_label' => $host->label(),
+      '@lifetime' => $this->dateFormatter->formatInterval($this->linkExpiry->getLifetime(), 1),
+    ]);
+
+    /** @var \Drupal\silverback_preview_link\Entity\SilverbackPreviewLinkInterface $previewLink */
+    $previewLink = $this->getEntity();
+    // @todo route is for the frontend.
+    $link = Url::fromRoute('<front>');
+//    $link = Url::fromRoute('entity.' . $host->getEntityTypeId() . '.silverback_preview_link', [
+//      $host->getEntityTypeId() => $host->id(),
+//      'preview_token' => $previewLink->getToken(),
+//    ]);
+
+    $form = parent::buildForm($form, $form_state);
+    $remainingSeconds = max(0, ($this->entity->getExpiry()?->getTimestamp() ?? 0) - $this->time->getRequestTime());
+    $form['preview_link'] = [
+      '#theme' => 'preview_link',
+      '#title' => $this->t('Preview link'),
+      '#weight' => -9999,
+      '#description' => $description,
+      '#remaining_lifetime' => $this->dateFormatter->formatInterval($remainingSeconds),
+      '#link' => $link
+        ->setAbsolute()
+        ->toString(),
+    ];
+
+    $form['actions']['regenerate_submit'] = $form['actions']['submit'];
+    $form['actions']['regenerate_submit']['#value'] = $this->t('Save and regenerate preview link');
+    // Shift ::save to after ::regenerateToken.
+    $form['actions']['regenerate_submit']['#submit'] = array_diff($form['actions']['regenerate_submit']['#submit'], ['::save']);
+    $form['actions']['regenerate_submit']['#submit'][] = '::regenerateToken';
+    $form['actions']['regenerate_submit']['#submit'][] = '::save';
+
+    $form['actions']['reset'] = [
+      '#type' => 'submit',
+      '#value' => $this->t('Reset lifetime'),
+      '#submit' => ['::resetLifetime', '::save'],
+      '#weight' => 100,
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save(array $form, FormStateInterface $form_state) {
+    $result = parent::save($form, $form_state);
+    $this->messenger()->addStatus($this->t('Preview Link saved.'));
+    return $result;
+  }
+
+  /**
+   * Regenerates preview link token.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   */
+  public function regenerateToken(array &$form, FormStateInterface $form_state): void {
+    $this->entity->regenerateToken(TRUE);
+    $this->messenger()->addMessage($this->t('The token has been regenerated.'));
+  }
+
+  /**
+   * Resets the lifetime of the preview link.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   */
+  public function resetLifetime(array &$form, FormStateInterface $form_state): void {
+    $expiry = new \DateTimeImmutable('@' . $this->time->getRequestTime());
+    $expiry = $expiry->modify('+' . $this->linkExpiry->getLifetime() . ' seconds');
+    $this->entity->setExpiry($expiry);
+    $this->messenger()->addMessage($this->t('Preview link will now expire at %time.', [
+      '%time' => $this->dateFormatter->format($expiry->getTimestamp()),
+    ]));
+  }
+
+}
diff --git a/packages/drupal/silverback_preview_link/src/Form/SettingsForm.php b/packages/drupal/silverback_preview_link/src/Form/SettingsForm.php
new file mode 100644
index 000000000..e4af66de6
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/src/Form/SettingsForm.php
@@ -0,0 +1,190 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\silverback_preview_link\Form;
+
+use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Form\ConfigFormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\preview_link\PreviewLinkUtility;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Allow settings to be changed from the UI for Silverback preview link.
+ */
+class SettingsForm extends ConfigFormBase {
+
+  /**
+   * Constructs a SettingsForm.
+   */
+  public function __construct(ConfigFactoryInterface $configFactory,
+    protected EntityTypeBundleInfoInterface $bundleInfo,
+    protected EntityTypeManagerInterface $entityTypeManager,
+  ) {
+    parent::__construct($configFactory);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('config.factory'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('entity_type.manager'),
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEditableConfigNames(): array {
+    return [
+      $this->getConfigName(),
+    ];
+  }
+
+  /**
+   * A method to get the config name.
+   *
+   * @return string
+   *   The config name.
+   */
+  private function getConfigName(): string {
+    return 'silverback_preview_link.settings';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId(): string {
+    return 'silverback_preview_link_settings_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state): array {
+    $config = $this->config($this->getConfigName());
+    $form = parent::buildForm($form, $form_state);
+
+    $form['bundles'] = [
+      '#type' => 'details',
+    ];
+    $form['bundles']['help'] = [
+      '#markup' => $this->t('Enable entity type/bundles for use with preview link.'),
+    ];
+    $selectedOptions = $this->getSelectedEntityTypeOptions();
+    $form['bundles']['enabled_entity_types'] = [
+      '#type' => 'tableselect',
+      '#header' => [
+        $this->t('Entity type'),
+        $this->t('Bundle'),
+      ],
+      '#options' => $this->getEntityTypeOptions(),
+      '#default_value' => array_fill_keys($selectedOptions, TRUE),
+    ];
+    // Collapse the details element if anything is enabled.
+    $form['bundles']['#title'] = $this->t('Enabled types (@count)', [
+      '@count' => count($selectedOptions),
+    ]);
+    $form['bundles']['#open'] = count($selectedOptions) === 0;
+
+    $form['multiple_entities'] = [
+      '#type' => 'checkbox',
+      '#title' => 'Multiple entities',
+      '#description' => $this->t('Whether preview links can reference multiple entities.'),
+      '#default_value' => $config->get('multiple_entities'),
+    ];
+    $form['expiry_seconds'] = [
+      '#type' => 'number',
+      '#title' => 'Expiry seconds',
+      '#description' => $this->t('The number of seconds before a preview link expires.'),
+      '#default_value' => $config->get('expiry_seconds') ?: 604800,
+      '#min' => 1,
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    $config = $this->config($this->getConfigName());
+
+    $config->set('multiple_entities', $form_state->getValue('multiple_entities'));
+    $config->set('expiry_seconds', $form_state->getValue('expiry_seconds'));
+
+    $config->clear('enabled_entity_types');
+    foreach (array_keys(array_filter($form_state->getValue('enabled_entity_types'))) as $enabledBundle) {
+      if (strpos($enabledBundle, ':') !== FALSE) {
+        [$entityTypeId, $bundle] = explode(':', $enabledBundle);
+        $bundles = $config->get('enabled_entity_types.' . $entityTypeId) ?: [];
+        $bundles[] = $bundle;
+        $config->set('enabled_entity_types.' . $entityTypeId, $bundles);
+      }
+      else {
+        $entityTypeId = $enabledBundle;
+        $config->set('enabled_entity_types.' . $entityTypeId, []);
+      }
+    }
+
+    $config->save();
+    parent::submitForm($form, $form_state);
+  }
+
+  /**
+   * The options available for the user to select for bundle types.
+   *
+   * @return array
+   *   A 'entity_id:bundle' style array of possible options.
+   */
+  protected function getEntityTypeOptions(): array {
+    $options = [];
+    $entityTypes = $this->entityTypeManager->getDefinitions();
+    $entityTypes = array_filter($entityTypes, [
+      PreviewLinkUtility::class,
+      'isEntityTypeSupported',
+    ]);
+    foreach ($entityTypes as $entityTypeId => $info) {
+      $options[$entityTypeId] = [
+        ['data' => ['#markup' => '<strong>' . $info->getLabel() . '</strong>']],
+        ['data' => ['#markup' => $this->t('<em>If selected and no bundles are selected, all bundles will be enabled.</em>')]],
+      ];
+      foreach ($this->bundleInfo->getBundleInfo($entityTypeId) as $bundle => $bundleInfo) {
+        if ($entityTypeId === $bundle) {
+          continue;
+        }
+        $options[sprintf('%s:%s', $entityTypeId, $bundle)] = [
+          $info->getLabel() ?: '',
+          $bundleInfo['label'] ?: '',
+        ];
+      }
+    }
+    return $options;
+  }
+
+  /**
+   * The enabled entities and bundles for preview link to apply to.
+   *
+   * @return array
+   *   A 'entity_id:bundle' style array of selected options.
+   */
+  protected function getSelectedEntityTypeOptions(): array {
+    $config = $this->config($this->getConfigName());
+    $configured = $config->get('enabled_entity_types') ?: [];
+    $selected = [];
+    foreach ($configured as $entityTypeId => $bundles) {
+      $selected[] = $entityTypeId;
+      foreach ($bundles as $bundle) {
+        $selected[] = sprintf('%s:%s', $entityTypeId, $bundle);
+      }
+    }
+    return $selected;
+  }
+
+}
diff --git a/packages/drupal/silverback_preview_link/src/PreviewLinkExpiry.php b/packages/drupal/silverback_preview_link/src/PreviewLinkExpiry.php
new file mode 100644
index 000000000..80417198d
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/src/PreviewLinkExpiry.php
@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\silverback_preview_link;
+
+use Drupal\Core\Config\ConfigFactoryInterface;
+
+/**
+ * Calculates link expiry time.
+ */
+class PreviewLinkExpiry {
+
+  /**
+   * Default expiry time in seconds. This amounts to 7 days.
+   *
+   * @var int
+   */
+  const DEFAULT_EXPIRY_SECONDS = 86400;
+
+  /**
+   * Statically cache the lifetime.
+   *
+   * @var int|null
+   */
+  protected ?int $lifetime = NULL;
+
+  /**
+   * LinkExpiry constructor.
+   *
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $configFactory
+   *   The configuration factory.
+   */
+  public function __construct(
+    protected ConfigFactoryInterface $configFactory,
+  ) {
+  }
+
+  /**
+   * Calculates default lifetime of a preview link.
+   *
+   * @return int
+   *   Lifetime in seconds.
+   *
+   * @phpstan-return int<0, max>
+   */
+  public function getLifetime(): int {
+    if (!isset($this->lifetime)) {
+      $config = $this->configFactory->get('silverback_preview_link.settings');
+      $this->lifetime = (int) ($config->get('expiry_seconds') ?: self::DEFAULT_EXPIRY_SECONDS);
+    }
+    return max(0, $this->lifetime);
+  }
+
+}
diff --git a/packages/drupal/silverback_preview_link/src/PreviewLinkHooks.php b/packages/drupal/silverback_preview_link/src/PreviewLinkHooks.php
new file mode 100644
index 000000000..5b8af06e2
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/src/PreviewLinkHooks.php
@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\silverback_preview_link;
+
+use Drupal\Component\Datetime\TimeInterface;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Drupal hooks.
+ */
+class PreviewLinkHooks implements ContainerInjectionInterface {
+
+  /**
+   * PreviewLinkHooks constructor.
+   */
+  final public function __construct(
+    protected PreviewLinkStorageInterface $previewLinkStorage,
+    protected TimeInterface $time,
+  ) {
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    /** @var \Drupal\silverback_preview_link\PreviewLinkStorageInterface $storage */
+    $storage = $container->get('entity_type.manager')->getStorage('silverack_preview_link');
+    return new static(
+      $storage,
+      $container->get('datetime.time'),
+    );
+  }
+
+  /**
+   * Implements hook_cron().
+   *
+   * Cleans up expired Preview Links.
+   *
+   * @see \preview_link_cron()
+   */
+  public function cron(): void {
+    $ids = $this->previewLinkStorage->getQuery()
+      ->accessCheck(FALSE)
+      ->condition('expiry', $this->time->getRequestTime(), '<')
+      ->execute();
+
+    // If there are no expired links then nothing to do.
+    if (count($ids) === 0) {
+      return;
+    }
+
+    $previewLinks = $this->previewLinkStorage->loadMultiple($ids);
+    // Simply delete the preview links. A new one will be regenerated at a later
+    // date as required.
+    $this->previewLinkStorage->delete($previewLinks);
+  }
+
+}
diff --git a/packages/drupal/silverback_preview_link/src/PreviewLinkHost.php b/packages/drupal/silverback_preview_link/src/PreviewLinkHost.php
new file mode 100644
index 000000000..10ed12165
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/src/PreviewLinkHost.php
@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\silverback_preview_link;
+
+use Drupal\Component\Datetime\TimeInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\silverback_preview_link\PreviewLinkStorageInterface;
+
+/**
+ * Service for relationships between preview links and entities they unlock.
+ */
+class PreviewLinkHost implements PreviewLinkHostInterface {
+
+  protected PreviewLinkStorageInterface $previewLinkStorage;
+
+  /**
+   * PreviewLinkHost constructor.
+   */
+  final public function __construct(
+    EntityTypeManagerInterface $entityTypeManager,
+    protected TimeInterface $time,
+  ) {
+    /** @var \Drupal\silverback_preview_link\PreviewLinkStorageInterface $storage */
+    $storage = $entityTypeManager->getStorage('silverback_preview_link');
+    $this->previewLinkStorage = $storage;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getPreviewLinks(EntityInterface $entity): array {
+    $ids = $this->previewLinkStorage->getQuery()
+      ->accessCheck()
+      ->condition('entities.target_type', $entity->getEntityTypeId())
+      ->condition('entities.target_id', $entity->id())
+      ->execute();
+    return $this->previewLinkStorage->loadMultiple($ids);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function isToken(EntityInterface $entity, array $tokens): bool {
+    $count = $this->previewLinkStorage->getQuery()
+      ->accessCheck()
+      ->condition('entities.target_type', $entity->getEntityTypeId())
+      ->condition('entities.target_id', $entity->id())
+      ->condition('token', $tokens, 'IN')
+      ->count()
+      ->execute();
+    return $count > 0;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function hasPreviewLinks(EntityInterface $entity): bool {
+    $count = $this->previewLinkStorage->getQuery()
+      ->accessCheck()
+      ->condition('entities.target_type', $entity->getEntityTypeId())
+      ->condition('entities.target_id', $entity->id())
+      ->condition('expiry', $this->time->getRequestTime(), '>')
+      ->count()
+      ->execute();
+    return $count > 0;
+  }
+
+}
diff --git a/packages/drupal/silverback_preview_link/src/PreviewLinkHostInterface.php b/packages/drupal/silverback_preview_link/src/PreviewLinkHostInterface.php
new file mode 100644
index 000000000..aebdc16a9
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/src/PreviewLinkHostInterface.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\silverback_preview_link;
+
+use Drupal\Core\Entity\EntityInterface;
+
+/**
+ * Interface for relationships between preview links and entities they unlock.
+ */
+interface PreviewLinkHostInterface {
+
+  /**
+   * Get preview links for an entity.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   An entity.
+   *
+   * @return \Drupal\silverback_preview_link\Entity\SilverbackPreviewLinkInterface[]
+   *   Preview links associated with an entity.
+   */
+  public function getPreviewLinks(EntityInterface $entity): array;
+
+  /**
+   * Determines if a token unlocks an entity.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   An entity.
+   * @param string[] $tokens
+   *   An array of Preview Link tokens.
+   *
+   * @return bool
+   *   Whether if at least one provided token grants access to the entity.
+   */
+  public function isToken(EntityInterface $entity, array $tokens): bool;
+
+  /**
+   * Determines if an entity has any active preview links.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   An entity.
+   *
+   * @return bool
+   *   Whether the entity has any associated preview links.
+   */
+  public function hasPreviewLinks(EntityInterface $entity): bool;
+
+}
diff --git a/packages/drupal/silverback_preview_link/src/PreviewLinkStorage.php b/packages/drupal/silverback_preview_link/src/PreviewLinkStorage.php
new file mode 100644
index 000000000..da77792eb
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/src/PreviewLinkStorage.php
@@ -0,0 +1,99 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\silverback_preview_link;
+
+use Drupal\Component\Datetime\TimeInterface;
+use Drupal\Component\Uuid\UuidInterface;
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Cache\MemoryCache\MemoryCacheInterface;
+use Drupal\Core\Database\Connection;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
+use Drupal\Core\Language\LanguageManagerInterface;
+use Drupal\silverback_preview_link\Entity\SilverbackPreviewLinkInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Preview Link entity storage.
+ */
+final class PreviewLinkStorage extends SqlContentEntityStorage implements PreviewLinkStorageInterface {
+
+  /**
+   * Constructs a new PreviewLinkStorage.
+   */
+  public function __construct(
+    EntityTypeInterface $entity_type,
+    Connection $database,
+    EntityFieldManagerInterface $entity_field_manager,
+    CacheBackendInterface $cache,
+    LanguageManagerInterface $language_manager,
+    MemoryCacheInterface $memory_cache,
+    EntityTypeBundleInfoInterface $entity_type_bundle_info,
+    EntityTypeManagerInterface $entity_type_manager,
+    UuidInterface $uuid,
+    protected TimeInterface $time,
+  ) {
+    parent::__construct($entity_type, $database, $entity_field_manager, $cache, $language_manager, $memory_cache, $entity_type_bundle_info, $entity_type_manager);
+    $this->uuidService = $uuid;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type): self {
+    return new static(
+      $entity_type,
+      $container->get('database'),
+      $container->get('entity_field.manager'),
+      $container->get('cache.entity'),
+      $container->get('language_manager'),
+      $container->get('entity.memory_cache'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('entity_type.manager'),
+      $container->get('uuid'),
+      $container->get('datetime.time'),
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function create(array $values = []) {
+    return parent::create($values + [
+      'token' => $this->generateUniqueToken(),
+      'generated_timestamp' => $this->time->getRequestTime(),
+    ]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save(EntityInterface $entity) {
+    assert($entity instanceof SilverbackPreviewLinkInterface);
+    if ($entity->regenerateToken()) {
+      $entity->setToken($this->generateUniqueToken());
+    }
+    return parent::save($entity);
+  }
+
+  /**
+   * Gets the unique token for the link.
+   *
+   * This token is unique every time we generate a link, there is nothing
+   * from the original entity involved in the token so it does not need to be
+   * cryptographically secure, only sufficiently random which UUID is.
+   *
+   * @return string
+   *   A unique identifier for this preview link.
+   */
+  protected function generateUniqueToken(): string {
+    return $this->uuidService->generate();
+  }
+
+}
diff --git a/packages/drupal/silverback_preview_link/src/PreviewLinkStorageInterface.php b/packages/drupal/silverback_preview_link/src/PreviewLinkStorageInterface.php
new file mode 100644
index 000000000..81a59e582
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/src/PreviewLinkStorageInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\silverback_preview_link;
+
+use Drupal\Core\Entity\Sql\SqlEntityStorageInterface;
+use Drupal\silverback_preview_link\Entity\SilverbackPreviewLinkInterface;
+
+/**
+ * Interface for Preview Link entities.
+ *
+ * @method \Drupal\silverback_preview_link\Entity\SilverbackPreviewLinkInterface[] loadMultiple(array $ids = NULL)
+ * @method \Drupal\silverback_preview_link\Entity\SilverbackPreviewLinkInterface create(array $values = [])
+ * @method int save(SilverbackPreviewLinkInterface $entity)
+ */
+interface PreviewLinkStorageInterface extends SqlEntityStorageInterface {
+
+}
diff --git a/packages/drupal/silverback_preview_link/src/PreviewLinkUtility.php b/packages/drupal/silverback_preview_link/src/PreviewLinkUtility.php
new file mode 100644
index 000000000..e2a368e79
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/src/PreviewLinkUtility.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\silverback_preview_link;
+
+use Drupal\Core\Entity\EntityTypeInterface;
+
+/**
+ * Preview link utility.
+ */
+class PreviewLinkUtility {
+
+  /**
+   * Determines if an entity type is supported by Preview Link.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entityType
+   *   An entity type.
+   *
+   * @return bool
+   *   Whether an entity type is supported by Preview Link.
+   */
+  public static function isEntityTypeSupported(EntityTypeInterface $entityType): bool {
+    return $entityType->isRevisionable() && $entityType->hasLinkTemplate('canonical');
+  }
+
+}
diff --git a/packages/drupal/silverback_preview_link/src/Routing/PreviewLinkRouteProvider.php b/packages/drupal/silverback_preview_link/src/Routing/PreviewLinkRouteProvider.php
new file mode 100644
index 000000000..4c971cdfd
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/src/Routing/PreviewLinkRouteProvider.php
@@ -0,0 +1,100 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\silverback_preview_link\Routing;
+
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\Routing\EntityRouteProviderInterface;
+use Symfony\Component\Routing\Route;
+use Symfony\Component\Routing\RouteCollection;
+
+/**
+ * Preview Link route provider.
+ */
+class PreviewLinkRouteProvider implements EntityRouteProviderInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRoutes(EntityTypeInterface $entity_type) {
+    $collection = new RouteCollection();
+
+    $generateRoute = $this->getGeneratePreviewLinkRoute($entity_type);
+    if ($generateRoute !== NULL) {
+      $entity_type_id = $entity_type->id();
+      $collection->add("entity.{$entity_type_id}.silverback_preview_link_generate", $generateRoute);
+    }
+
+//    $linkRoute = $this->getPreviewLinkRoute($entity_type);
+//    if ($linkRoute !== NULL) {
+//      $entity_type_id = $entity_type->id();
+//      $collection->add("entity.{$entity_type_id}.preview_link", $linkRoute);
+//    }
+
+    return $collection;
+  }
+
+  /**
+   * Gets the route for generating and viewing preview links for this entity.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getGeneratePreviewLinkRoute(EntityTypeInterface $entity_type): ?Route {
+    $entity_type_id = $entity_type->id();
+    $route = new Route($entity_type->getLinkTemplate('preview-link-generate'));
+
+    $route
+      ->setDefaults([
+        '_entity_form' => "silverback_preview_link.silverback_preview_link",
+        '_title' => 'Preview',
+      ])
+      ->setRequirement('_permission', 'generate silverback preview links')
+      ->setRequirement('_access_preview_enabled', 'TRUE')
+      ->setOption('silverback_preview_link.entity_type_id', $entity_type_id)
+      ->setOption('_admin_route', TRUE)
+      ->setOption('parameters', [
+        $entity_type_id => ['type' => 'entity:' . $entity_type_id],
+      ]);
+
+    return $route;
+  }
+
+//  /**
+//   * Gets the preview link route.
+//   *
+//   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+//   *   The entity type.
+//   *
+//   * @return \Symfony\Component\Routing\Route|null
+//   *   The generated route, if available.
+//   */
+//  protected function getPreviewLinkRoute(EntityTypeInterface $entity_type): ?Route {
+//    $entity_type_id = $entity_type->id();
+//    $route = new Route('/preview-link/' . $entity_type_id . '/{' . $entity_type_id . '}/{preview_token}');
+//
+//    $route
+//      ->setDefaults([
+//        '_controller' => 'Drupal\preview_link\Controller\PreviewLinkController::preview',
+//        '_title_callback' => 'Drupal\preview_link\Controller\PreviewLinkController::title',
+//      ])
+//      ->setRequirement('_entity_access', $entity_type_id . '.view')
+//      ->setRequirement('_access_preview_enabled', 'TRUE')
+//      ->setOption('preview_link.entity_type_id', $entity_type_id)
+//      ->setOption('parameters', [
+//        $entity_type_id => [
+//          'type' => 'entity:' . $entity_type_id,
+//          'load_latest_revision' => TRUE,
+//        ],
+//        'preview_token' => ['type' => 'string'],
+//      ])
+//      ->setOption('_preview_link_route', TRUE);
+//
+//    return $route;
+//  }
+
+}
diff --git a/packages/drupal/silverback_preview_link/templates/preview-link.html.twig b/packages/drupal/silverback_preview_link/templates/preview-link.html.twig
new file mode 100644
index 000000000..d8660c32b
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/templates/preview-link.html.twig
@@ -0,0 +1,6 @@
+<div class="preview-link">
+  <p>{{ description }}</p>
+  <h2 class="preview-link__title">{{ title }}</h2>
+  <p><span class="label">{{ 'Link:'|t }}</span> <span class="preview-link__link"><a href="{{ link }}">{{ link }}</a></span></p>
+  <p><span class="label">{{ 'Expiry:'|t }} </span>{{ remaining_lifetime }}</p>
+</div>

From 6a240bf97ae8b4cc473bb2a75eed7fba6844439d Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Mon, 1 Jul 2024 15:23:34 +0200
Subject: [PATCH 035/100] feat(SLB-416): preview link decoupled port

To be moved in silverback-mono
---
 .../drupal/silverback_preview_link/README.md  |  31 ++----
 .../silverback_preview_link.module            |  32 ++++--
 .../PreviewLinkSessionTokenController.php     |   2 +-
 .../src/Entity/SilverbackPreviewLink.php      |   8 +-
 .../src/Form/PreviewLinkForm.php              | 102 +++++++++++------
 .../src/Form/SettingsForm.php                 |   2 +-
 .../SilverbackPreviewLinkSelection.php        |  26 +++++
 .../FieldWidget/PreviewLinkEntitiesWidget.php | 103 ++++++++++++++++++
 ...ackPreviewLinkEntitiesUniqueConstraint.php |  26 +++++
 ...wLinkEntitiesUniqueConstraintValidator.php |  44 ++++++++
 .../src/Routing/PreviewLinkRouteProvider.php  |  41 +------
 .../templates/preview-link.html.twig          |  10 +-
 12 files changed, 319 insertions(+), 108 deletions(-)
 create mode 100644 packages/drupal/silverback_preview_link/src/Plugin/EntityReferenceSelection/SilverbackPreviewLinkSelection.php
 create mode 100644 packages/drupal/silverback_preview_link/src/Plugin/Field/FieldWidget/PreviewLinkEntitiesWidget.php
 create mode 100644 packages/drupal/silverback_preview_link/src/Plugin/Validation/Constraint/SilverbackPreviewLinkEntitiesUniqueConstraint.php
 create mode 100644 packages/drupal/silverback_preview_link/src/Plugin/Validation/Constraint/SilverbackPreviewLinkEntitiesUniqueConstraintValidator.php

diff --git a/packages/drupal/silverback_preview_link/README.md b/packages/drupal/silverback_preview_link/README.md
index 1a9959144..0328e5c88 100644
--- a/packages/drupal/silverback_preview_link/README.md
+++ b/packages/drupal/silverback_preview_link/README.md
@@ -2,28 +2,21 @@
 
 Decoupled preview with access token. Integrates with Silverback autosave.
 
-The primary use case for this module is:
-
-- Use case #1
-- Use case #2
-- Use case #3
-
-## REQUIREMENTS
-
-DESCRIBE_MODULE_DEPENDENCIES_HERE
-
 This module is inspired by the [Preview Link](https://www.drupal.org/project/preview_link) module
-but does not depend on it as the use cases are different, this module 
+but does not depend on it as the use case is different. This module 
 - is suitable for a decoupled setup
 - handles access based on GraphQL
-- enables autosave preview to share instant preview updates
+- uses silverback_autosave to share instant preview updates
 
-## INSTALLATION
+Due to the decoupled nature, it does not cover additional logic brought by 
+the Preview Link module:
+- Route subscribers for canonical entity access
+- Entity canonical access control handlers
+- Route provider and Controller for preview links
+- Event subscribers for node canonical redirect
+- ...
 
-Install as you would normally install a contributed Drupal module.
-See: https://www.drupal.org/node/895232 for further information.
+## Configuration
 
-## CONFIGURATION
-- Configuration step #1
-- Configuration step #2
-- Configuration step #3
+- Enable entity types and bundles `/admin/config/content/silverback_preview_link`
+- Optionally change the default expiry time that is set to 1 day
diff --git a/packages/drupal/silverback_preview_link/silverback_preview_link.module b/packages/drupal/silverback_preview_link/silverback_preview_link.module
index 247d77b51..8006e1aa3 100644
--- a/packages/drupal/silverback_preview_link/silverback_preview_link.module
+++ b/packages/drupal/silverback_preview_link/silverback_preview_link.module
@@ -1,13 +1,13 @@
 <?php
 
-/**
- * @file
- * Primary module hooks for Silverback Preview Link module.
- */
-
 use Drupal\silverback_preview_link\PreviewLinkUtility;
 use Drupal\silverback_preview_link\Routing\PreviewLinkRouteProvider;
 use Drupal\silverback_preview_link\PreviewLinkHooks;
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Access\AccessResultInterface;
 
 /**
  * Implements hook_entity_type_alter().
@@ -49,10 +49,28 @@ function silverback_preview_link_theme(array $existing, string $type, string $th
       'template' => 'preview-link',
       'variables' => [
         'title' => NULL,
-        'link' => NULL,
-        'description' => NULL,
+        'preview_url' => NULL,
+        'link_description' => NULL,
+        'actions_description' => NULL,
         'remaining_lifetime' => NULL,
       ],
     ],
   ];
 }
+
+/**
+ * Implements hook_entity_field_access().
+ */
+function silverback_preview_link_entity_field_access(string $operation, FieldDefinitionInterface $field_definition, AccountInterface $account, FieldItemListInterface $items = NULL): AccessResultInterface {
+  $storageDefinition = $field_definition->getFieldStorageDefinition();
+  if ($storageDefinition->getTargetEntityTypeId() !== 'silverback_preview_link') {
+    return AccessResult::neutral();
+  }
+
+  if ($storageDefinition->getName() === 'entities' && $operation === 'edit') {
+    return AccessResult::forbiddenIf(\Drupal::configFactory()->get('silverback_preview_link.settings')->get('multiple_entities') !== TRUE)
+      ->addCacheTags(['config:preview_link.settings']);
+  }
+
+  return AccessResult::neutral();
+}
diff --git a/packages/drupal/silverback_preview_link/src/Controller/PreviewLinkSessionTokenController.php b/packages/drupal/silverback_preview_link/src/Controller/PreviewLinkSessionTokenController.php
index c730f56f1..c7e340811 100644
--- a/packages/drupal/silverback_preview_link/src/Controller/PreviewLinkSessionTokenController.php
+++ b/packages/drupal/silverback_preview_link/src/Controller/PreviewLinkSessionTokenController.php
@@ -52,7 +52,7 @@ public static function create(ContainerInterface $container) {
    * Removes tokens from the users' session.
    */
   public function removeTokens(): Response {
-    $collection = $this->privateTempStoreFactory->get('preview_link');
+    $collection = $this->privateTempStoreFactory->get('silverback_preview_link');
     $hasKeys = $collection->get('keys') !== NULL;
     $collection->delete('keys');
     if ($hasKeys) {
diff --git a/packages/drupal/silverback_preview_link/src/Entity/SilverbackPreviewLink.php b/packages/drupal/silverback_preview_link/src/Entity/SilverbackPreviewLink.php
index 5858e33e7..030f2aca7 100644
--- a/packages/drupal/silverback_preview_link/src/Entity/SilverbackPreviewLink.php
+++ b/packages/drupal/silverback_preview_link/src/Entity/SilverbackPreviewLink.php
@@ -141,10 +141,10 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
       ->setDescription(t('The associated entities this preview link unlocks.'))
       ->setRequired(TRUE)
       ->setCardinality(FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED)
-      ->addConstraint('PreviewLinkEntitiesUniqueConstraint', [])
+      ->addConstraint('SilverbackPreviewLinkEntitiesUniqueConstraint', [])
       ->setSettings(static::entitiesDefaultFieldSettings())
       ->setDisplayOptions('form', [
-        'type' => 'preview_link_entities_widget',
+        'type' => 'silverback_preview_link_entities_widget',
         'weight' => 10,
       ]);
 
@@ -165,7 +165,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
   /**
    * Rewrites settings for 'entities' dynamic_entity_reference field.
    *
-   * DynamicEntityReferenceItem::defaultFieldSettings doesnt receive any context
+   * DynamicEntityReferenceItem::defaultFieldSettings doesn't receive any context,
    * so we need to change the default handlers manually.
    */
   public static function entitiesDefaultFieldSettings(): array {
@@ -190,7 +190,7 @@ public static function entitiesDefaultFieldSettings(): array {
    */
   public static function expiryDefaultValue(): int {
     $time = \Drupal::time();
-    /** @var \Drupal\preview_link\PreviewLinkExpiry $linkExpiry */
+    /** @var \Drupal\silverback_preview_link\PreviewLinkExpiry $linkExpiry */
     $linkExpiry = \Drupal::service('silverback_preview_link.link_expiry');
     return max(0, $time->getRequestTime() + $linkExpiry->getLifetime());
   }
diff --git a/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php b/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php
index 97d48e997..94ab5bcf6 100644
--- a/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php
+++ b/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php
@@ -14,6 +14,7 @@
 use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
+use Drupal\node\NodeInterface;
 use Drupal\silverback_preview_link\Entity\SilverbackPreviewLink;
 use Drupal\silverback_preview_link\PreviewLinkExpiry;
 use Drupal\silverback_preview_link\PreviewLinkHostInterface;
@@ -107,46 +108,83 @@ public function buildForm(array $form, FormStateInterface $form_state, RouteMatc
     }
 
     $host = $this->getHostEntity($routeMatch);
-    $description = $this->t('Generate a preview link for the <em>@entity_label</em> entity. Preview links will expire @lifetime after they were created.', [
-      '@entity_label' => $host->label(),
-      '@lifetime' => $this->dateFormatter->formatInterval($this->linkExpiry->getLifetime(), 1),
-    ]);
-
-    /** @var \Drupal\silverback_preview_link\Entity\SilverbackPreviewLinkInterface $previewLink */
-    $previewLink = $this->getEntity();
-    // @todo route is for the frontend.
-    $link = Url::fromRoute('<front>');
-//    $link = Url::fromRoute('entity.' . $host->getEntityTypeId() . '.silverback_preview_link', [
-//      $host->getEntityTypeId() => $host->id(),
-//      'preview_token' => $previewLink->getToken(),
-//    ]);
-
     $form = parent::buildForm($form, $form_state);
+
+    if ($host instanceof NodeInterface) {
+      /** @var \Drupal\silverback_preview_link\Entity\SilverbackPreviewLinkInterface $silverbackPreviewLink */
+      $silverbackPreviewLink = $this->getEntity();
+      /** @var \Drupal\silverback_external_preview\ExternalPreviewLink $externalPreviewLink */
+      $externalPreviewLink = \Drupal::service('silverback_external_preview.external_preview_link');
+      $externalPreviewUrl = $externalPreviewLink->createPreviewUrlFromEntity($host);
+      $query = $externalPreviewUrl->getOption('query') ?? [];
+      $query['preview_user_id'] = $this->currentUser()->id();
+      $query['preview_access_token'] = $silverbackPreviewLink->getToken();
+      $externalPreviewUrl->setOption('query', $query);
+    }
+    else {
+      \Drupal::messenger()->addError('Preview link is only available for nodes.');
+      // This could be refactored to get the storage.
+      // Implement nodes for now as we are still using Drupal Gutenberg 2.x that
+      // is not entity type agnostic.
+      // $link = Url::fromRoute('entity.' . $host->getEntityTypeId() . '.silverback_preview_link', [
+      //   $host->getEntityTypeId() => $host->id(),
+      //   'preview_token' => $previewLink->getToken(),
+      // ]);
+      return $form;
+    }
+
+    $originalAgeFormatted = $this->dateFormatter->formatInterval($this->linkExpiry->getLifetime(), 1);
     $remainingSeconds = max(0, ($this->entity->getExpiry()?->getTimestamp() ?? 0) - $this->time->getRequestTime());
+    $remainingAgeFormatted = $this->dateFormatter->formatInterval($remainingSeconds);
+    $isNewToken = $this->linkExpiry->getLifetime() === $remainingSeconds;
+
+    if ($isNewToken) {
+      $buttonsDescription = $this->t('<p><a href=":url" target="_blank">Live preview link</a> for <em>@entity_label</em>. Expires @lifetime after creation.</p>', [
+        ':url' => $externalPreviewUrl
+          ->setAbsolute()
+          ->toString(),
+        '@entity_label' => $host->label(),
+        '@lifetime' => $originalAgeFormatted,
+      ]);
+      $actionsDescription = NULL;
+    }
+    else {
+      $buttonsDescription = $this->t('<p><a href=":url" target="_blank">Live preview link</a> for <em>@entity_label</em>. Expires in @lifetime.</p>', [
+        ':url' => $externalPreviewUrl
+          ->setAbsolute()
+          ->toString(),
+        '@entity_label' => $host->label(),
+        '@lifetime' => $remainingAgeFormatted,
+      ]);
+      $actionsDescription = $this->t('If a new link is generated, active preview link will get invalidated.');
+    }
+
     $form['preview_link'] = [
       '#theme' => 'preview_link',
       '#title' => $this->t('Preview link'),
       '#weight' => -9999,
-      '#description' => $description,
-      '#remaining_lifetime' => $this->dateFormatter->formatInterval($remainingSeconds),
-      '#link' => $link
-        ->setAbsolute()
-        ->toString(),
+      '#link_description' => $buttonsDescription,
+      '#actions_description' => $actionsDescription,
+      '#remaining_lifetime' => $remainingAgeFormatted,
+      '#preview_url' => NULL,
     ];
 
-    $form['actions']['regenerate_submit'] = $form['actions']['submit'];
-    $form['actions']['regenerate_submit']['#value'] = $this->t('Save and regenerate preview link');
-    // Shift ::save to after ::regenerateToken.
-    $form['actions']['regenerate_submit']['#submit'] = array_diff($form['actions']['regenerate_submit']['#submit'], ['::save']);
-    $form['actions']['regenerate_submit']['#submit'][] = '::regenerateToken';
-    $form['actions']['regenerate_submit']['#submit'][] = '::save';
-
-    $form['actions']['reset'] = [
-      '#type' => 'submit',
-      '#value' => $this->t('Reset lifetime'),
-      '#submit' => ['::resetLifetime', '::save'],
-      '#weight' => 100,
-    ];
+    if (!$isNewToken) {
+      $form['actions']['regenerate_submit'] = $form['actions']['submit'];
+      $form['actions']['regenerate_submit']['#value'] = $this->t('Generate new link');
+      // Shift ::save to after ::regenerateToken.
+      $form['actions']['regenerate_submit']['#submit'] = array_diff($form['actions']['regenerate_submit']['#submit'], ['::save']);
+      $form['actions']['regenerate_submit']['#submit'][] = '::regenerateToken';
+      $form['actions']['regenerate_submit']['#submit'][] = '::save';
+
+      $form['actions']['reset'] = [
+        '#type' => 'submit',
+        '#value' => $this->t('Reset current link expiry to @lifetime', ['@lifetime' => $originalAgeFormatted]),
+        '#submit' => ['::resetLifetime', '::save'],
+        '#weight' => 100,
+      ];
+    }
+    unset($form['actions']['submit']);
 
     return $form;
   }
diff --git a/packages/drupal/silverback_preview_link/src/Form/SettingsForm.php b/packages/drupal/silverback_preview_link/src/Form/SettingsForm.php
index e4af66de6..6c8d69f0d 100644
--- a/packages/drupal/silverback_preview_link/src/Form/SettingsForm.php
+++ b/packages/drupal/silverback_preview_link/src/Form/SettingsForm.php
@@ -9,7 +9,7 @@
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\preview_link\PreviewLinkUtility;
+use Drupal\silverback_preview_link\PreviewLinkUtility;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
diff --git a/packages/drupal/silverback_preview_link/src/Plugin/EntityReferenceSelection/SilverbackPreviewLinkSelection.php b/packages/drupal/silverback_preview_link/src/Plugin/EntityReferenceSelection/SilverbackPreviewLinkSelection.php
new file mode 100644
index 000000000..621ca0730
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/src/Plugin/EntityReferenceSelection/SilverbackPreviewLinkSelection.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\silverback_preview_link\Plugin\EntityReferenceSelection;
+
+use Drupal\Core\Entity\Plugin\EntityReferenceSelection\DefaultSelection;
+
+/**
+ * Provides specific access control for the node entity type.
+ *
+ * This selection plugin can be changed by altering EntityReferenceSelection
+ * manager definitions or by altering base field definitions.
+ *
+ * @EntityReferenceSelection(
+ *   id = "silverback_preview_link",
+ *   label = @Translation("Preview Link Default"),
+ *   group = "silverback_preview_link",
+ *   weight = 0,
+ *   deriver = "Drupal\Core\Entity\Plugin\Derivative\DefaultSelectionDeriver"
+ * )
+ */
+final class SilverbackPreviewLinkSelection extends DefaultSelection {
+
+}
+
diff --git a/packages/drupal/silverback_preview_link/src/Plugin/Field/FieldWidget/PreviewLinkEntitiesWidget.php b/packages/drupal/silverback_preview_link/src/Plugin/Field/FieldWidget/PreviewLinkEntitiesWidget.php
new file mode 100644
index 000000000..dfd42cfe2
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/src/Plugin/Field/FieldWidget/PreviewLinkEntitiesWidget.php
@@ -0,0 +1,103 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\silverback_preview_link\Plugin\Field\FieldWidget;
+
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\dynamic_entity_reference\Plugin\Field\FieldWidget\DynamicEntityReferenceWidget;
+use Drupal\silverback_preview_link\Form\PreviewLinkForm;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Form widget for entities field on Preview Link.
+ *
+ * Prevents mixing referenced entity types, unless they were created
+ * programmatically.
+ *
+ * @FieldWidget(
+ *   id = "silverback_preview_link_entities_widget",
+ *   label = @Translation("Preview Link Entities Widget"),
+ *   description = @Translation("Widget for selecting entities related to a Preview Link"),
+ *   field_types = {
+ *     "dynamic_entity_reference"
+ *   }
+ * )
+ *
+ * @internal
+ */
+final class PreviewLinkEntitiesWidget extends DynamicEntityReferenceWidget {
+
+  /**
+   * The current route match.
+   *
+   * @var \Drupal\Core\Routing\RouteMatchInterface
+   */
+  protected RouteMatchInterface $routeMatch;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    $instance = parent::create($container, $configuration, $plugin_id, $plugin_definition);
+    $instance->routeMatch = $container->get('current_route_match');
+    return $instance;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function isApplicable(FieldDefinitionInterface $field_definition) {
+    $storageDefinition = $field_definition->getFieldStorageDefinition();
+    return $storageDefinition->getTargetEntityTypeId() === 'silverback_preview_link' && $storageDefinition->getName() === 'entities';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
+    $element = parent::formElement($items, $delta, $element, $form, $form_state);
+    $formObject = $form_state->getFormObject();
+    if (!$formObject instanceof PreviewLinkForm) {
+      throw new \LogicException('Can only be used with PreviewLinkForm');
+    }
+
+    /** @var \Drupal\dynamic_entity_reference\Plugin\Field\FieldType\DynamicEntityReferenceItem $item */
+    $item = $items->get($delta);
+    $targetType = $item->target_type;
+    $targetId = $item->target_id;
+    $host = $formObject->getHostEntity($this->routeMatch);
+    $hostEntityTypeId = $host->getEntityTypeId();
+
+    // Swap select field to value.
+    if ($element['target_type']['#type'] !== 'value') {
+      $element['target_type'] = [
+        '#type' => 'value',
+        '#value' => $targetType,
+      ];
+    }
+
+    // If target type not set yet (e.g for new items). Set the value.
+    if (empty($targetType)) {
+      // Force new items to be the same as host entity type.
+      $element['target_type']['#value'] = $hostEntityTypeId;
+
+      // Set otherwise autocomplete will use the wrong route.
+      $settings = $this->getFieldSettings();
+      $element['target_id']['#target_type'] = $hostEntityTypeId;
+      $element['target_id']['#selection_handler'] = $settings[$hostEntityTypeId]['handler'];
+      $element['target_id']['#selection_settings'] = $settings[$hostEntityTypeId]['handler_settings'];
+    }
+
+    // Protect host entity from modification.
+    if ($targetType == $hostEntityTypeId && $targetId == $host->id()) {
+      $element['target_id']['#disabled'] = TRUE;
+    }
+
+    return $element;
+  }
+
+}
diff --git a/packages/drupal/silverback_preview_link/src/Plugin/Validation/Constraint/SilverbackPreviewLinkEntitiesUniqueConstraint.php b/packages/drupal/silverback_preview_link/src/Plugin/Validation/Constraint/SilverbackPreviewLinkEntitiesUniqueConstraint.php
new file mode 100644
index 000000000..ac033f266
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/src/Plugin/Validation/Constraint/SilverbackPreviewLinkEntitiesUniqueConstraint.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\silverback_preview_link\Plugin\Validation\Constraint;
+
+use Symfony\Component\Validator\Constraint;
+
+/**
+ * Ensures each entity is referenced at most once.
+ *
+ * @Constraint(
+ *   id = "SilverbackPreviewLinkEntitiesUniqueConstraint",
+ *   label = @Translation("Validates referenced value uniqueness", context = "Validation"),
+ * )
+ */
+class SilverbackPreviewLinkEntitiesUniqueConstraint extends Constraint {
+
+  /**
+   * Violation message for when an entity is referenced multiple times.
+   *
+   * @var string
+   */
+  public $multipleReferences = '%entity_type is already referenced by item #%other_delta.';
+
+}
diff --git a/packages/drupal/silverback_preview_link/src/Plugin/Validation/Constraint/SilverbackPreviewLinkEntitiesUniqueConstraintValidator.php b/packages/drupal/silverback_preview_link/src/Plugin/Validation/Constraint/SilverbackPreviewLinkEntitiesUniqueConstraintValidator.php
new file mode 100644
index 000000000..1e8e5014e
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/src/Plugin/Validation/Constraint/SilverbackPreviewLinkEntitiesUniqueConstraintValidator.php
@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\silverback_preview_link\Plugin\Validation\Constraint;
+
+use Drupal\dynamic_entity_reference\Plugin\Field\FieldType\DynamicEntityReferenceFieldItemList;
+use Drupal\dynamic_entity_reference\Plugin\Field\FieldType\DynamicEntityReferenceItem;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+
+/**
+ * Validates the SilverbackPreviewLinkEntitiesUniqueConstraint constraint.
+ */
+class SilverbackPreviewLinkEntitiesUniqueConstraintValidator extends ConstraintValidator {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validate($value, Constraint $constraint): void {
+    assert($constraint instanceof SilverbackPreviewLinkEntitiesUniqueConstraint);
+    assert($value instanceof DynamicEntityReferenceFieldItemList);
+
+    $entities = [];
+    foreach ($value as $delta => $item) {
+      assert($item instanceof DynamicEntityReferenceItem);
+      $entity = $item->entity;
+      $hash = $item->target_type . '|' . $item->target_id;
+      $duplicateDelta = array_search($hash, $entities, TRUE);
+      if ($duplicateDelta !== FALSE) {
+        $this->context
+          ->buildViolation($constraint->multipleReferences)
+          ->setParameter('%entity_type', $entity !== NULL ? $entity->getEntityType()->getSingularLabel() : $item->target_type)
+          ->setParameter('%other_delta', (string) ($duplicateDelta + 1))
+          ->atPath((string) $delta)
+          ->addViolation();
+      }
+      else {
+        $entities[$delta] = $hash;
+      }
+    }
+  }
+
+}
diff --git a/packages/drupal/silverback_preview_link/src/Routing/PreviewLinkRouteProvider.php b/packages/drupal/silverback_preview_link/src/Routing/PreviewLinkRouteProvider.php
index 4c971cdfd..6f87611a6 100644
--- a/packages/drupal/silverback_preview_link/src/Routing/PreviewLinkRouteProvider.php
+++ b/packages/drupal/silverback_preview_link/src/Routing/PreviewLinkRouteProvider.php
@@ -26,12 +26,6 @@ public function getRoutes(EntityTypeInterface $entity_type) {
       $collection->add("entity.{$entity_type_id}.silverback_preview_link_generate", $generateRoute);
     }
 
-//    $linkRoute = $this->getPreviewLinkRoute($entity_type);
-//    if ($linkRoute !== NULL) {
-//      $entity_type_id = $entity_type->id();
-//      $collection->add("entity.{$entity_type_id}.preview_link", $linkRoute);
-//    }
-
     return $collection;
   }
 
@@ -51,7 +45,7 @@ protected function getGeneratePreviewLinkRoute(EntityTypeInterface $entity_type)
     $route
       ->setDefaults([
         '_entity_form' => "silverback_preview_link.silverback_preview_link",
-        '_title' => 'Preview',
+        '_title' => 'Share preview',
       ])
       ->setRequirement('_permission', 'generate silverback preview links')
       ->setRequirement('_access_preview_enabled', 'TRUE')
@@ -64,37 +58,4 @@ protected function getGeneratePreviewLinkRoute(EntityTypeInterface $entity_type)
     return $route;
   }
 
-//  /**
-//   * Gets the preview link route.
-//   *
-//   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-//   *   The entity type.
-//   *
-//   * @return \Symfony\Component\Routing\Route|null
-//   *   The generated route, if available.
-//   */
-//  protected function getPreviewLinkRoute(EntityTypeInterface $entity_type): ?Route {
-//    $entity_type_id = $entity_type->id();
-//    $route = new Route('/preview-link/' . $entity_type_id . '/{' . $entity_type_id . '}/{preview_token}');
-//
-//    $route
-//      ->setDefaults([
-//        '_controller' => 'Drupal\preview_link\Controller\PreviewLinkController::preview',
-//        '_title_callback' => 'Drupal\preview_link\Controller\PreviewLinkController::title',
-//      ])
-//      ->setRequirement('_entity_access', $entity_type_id . '.view')
-//      ->setRequirement('_access_preview_enabled', 'TRUE')
-//      ->setOption('preview_link.entity_type_id', $entity_type_id)
-//      ->setOption('parameters', [
-//        $entity_type_id => [
-//          'type' => 'entity:' . $entity_type_id,
-//          'load_latest_revision' => TRUE,
-//        ],
-//        'preview_token' => ['type' => 'string'],
-//      ])
-//      ->setOption('_preview_link_route', TRUE);
-//
-//    return $route;
-//  }
-
 }
diff --git a/packages/drupal/silverback_preview_link/templates/preview-link.html.twig b/packages/drupal/silverback_preview_link/templates/preview-link.html.twig
index d8660c32b..b848a082e 100644
--- a/packages/drupal/silverback_preview_link/templates/preview-link.html.twig
+++ b/packages/drupal/silverback_preview_link/templates/preview-link.html.twig
@@ -1,6 +1,8 @@
 <div class="preview-link">
-  <p>{{ description }}</p>
-  <h2 class="preview-link__title">{{ title }}</h2>
-  <p><span class="label">{{ 'Link:'|t }}</span> <span class="preview-link__link"><a href="{{ link }}">{{ link }}</a></span></p>
-  <p><span class="label">{{ 'Expiry:'|t }} </span>{{ remaining_lifetime }}</p>
+  <h2 class="preview-link__title hidden">{{ title }}</h2>
+  <p>{{ link_description }}</p>
+  {% if preview_url is not empty %}
+    <p><strong class="preview-link__link"><a href="{{ preview_url }}" target="_blank">{{ preview_url }}</a></strong></p>
+  {% endif %}
+  <p>{{ actions_description }}</p>
 </div>

From 5493aae5784a671b7f7e840ead1e63d1644e1588 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Mon, 1 Jul 2024 19:29:26 +0200
Subject: [PATCH 036/100] feat(SLB-416): share button

---
 .../gutenberg_blocks/gutenberg_blocks.module   |  5 +++++
 .../drupal/gutenberg_blocks/src/preview.ts     | 18 +++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/packages/drupal/gutenberg_blocks/gutenberg_blocks.module b/packages/drupal/gutenberg_blocks/gutenberg_blocks.module
index 61d7a515b..dfa896614 100644
--- a/packages/drupal/gutenberg_blocks/gutenberg_blocks.module
+++ b/packages/drupal/gutenberg_blocks/gutenberg_blocks.module
@@ -27,6 +27,7 @@ function gutenberg_blocks_form_node_form_alter(&$form, FormStateInterface $form_
   /** @var \Drupal\node\NodeInterface $node */
   $node = $form_state->getFormObject()->getEntity();
   if (Utils::getGutenbergFields($node)) {
+    // Perhaps move in Silverback preview link module.
     $form['actions']['preview_link'] = [
       '#type' => 'link',
       '#title' => t('Preview'),
@@ -44,7 +45,11 @@ function gutenberg_blocks_form_node_form_alter(&$form, FormStateInterface $form_
     $previewUrl = $externalPreviewLink->createPreviewUrlFromEntity($node)->toString();
     $form['#attached']['drupalSettings']['preview'] = [
       'previewUrl' => $previewUrl,
+      // Link template does not work out here, check why.
+      //'previewTokenUrl' => $node->toUrl('preview-link-generate')->toString(),
+      'previewTokenUrl' => '/node/' . $node->id() . '/generate-preview-link',
     ];
+    $form['#attached']['library'][] = 'core/drupal.dialog.ajax';
 
     // Load all open webforms and populate them into drupalSettings.
     $languageManager = \Drupal::languageManager();
diff --git a/packages/drupal/gutenberg_blocks/src/preview.ts b/packages/drupal/gutenberg_blocks/src/preview.ts
index 71939cdf7..7aadbfc65 100644
--- a/packages/drupal/gutenberg_blocks/src/preview.ts
+++ b/packages/drupal/gutenberg_blocks/src/preview.ts
@@ -14,8 +14,6 @@
                 id: 'mobile',
                 width: 375,
                 height: 725,
-                iconPath:
-                  '/modules/contrib/silverback_external_preview/icons/mobile.svg',
               },
               {
                 label: Drupal.t('Tablet'),
@@ -52,6 +50,18 @@
             };
             const previewSelect = getPreviewSelect();
 
+            const shareButton = `<a 
+              class="components-external-link components-button share-preview use-ajax" 
+              href="${drupalSettings.preview.previewTokenUrl}"
+              data-dialog-type="modal"
+              data-dialog-options="{&quot;width&quot;:550,&quot;height&quot;:280}" 
+              rel="external noreferrer noopener">
+                ${Drupal.t('Share preview')}<span class="components-visually-hidden">${Drupal.t('(opens in a new tab)')}</span>
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="components-external-link__icon css-6wogo1-StyledIcon etxm6pv0" role="img" aria-hidden="true" focusable="false">
+                  <path d="M18.2 17c0 .7-.6 1.2-1.2 1.2H7c-.7 0-1.2-.6-1.2-1.2V7c0-.7.6-1.2 1.2-1.2h3.2V4.2H7C5.5 4.2 4.2 5.5 4.2 7v10c0 1.5 1.2 2.8 2.8 2.8h10c1.5 0 2.8-1.2 2.8-2.8v-3.6h-1.5V17zM14.9 3v1.5h3.7l-6.4 6.4 1.1 1.1 6.4-6.4v3.7h1.5V3h-6.3z"></path>
+                </svg>
+            </a>`;
+
             const previewSidebarMarkup = `
               <div class="interface-interface-skeleton__secondary-sidebar drupal-preview-sidebar" role="region" aria-label="Drupal preview" tabindex="-1">
                 <div class="interface-complementary-area edit-post-sidebar">
@@ -73,7 +83,8 @@
                   </div>
                   <div class="drupal-preview-sidebar components-panel">
                     <div class="drupal-preview-sidebar--header">
-                      ${previewSelect} ${previewButton}
+                      <div>${previewSelect} ${previewButton}</div>
+                      <div>${shareButton}</div>
                     </div>
                     <div class="drupal-preview-sidebar--iframe-wrapper">
                       <iframe width="100%" height="800px" 
@@ -97,6 +108,7 @@
               );
 
               const $previewButton = $('button.external-preview');
+              const $shareButton = $('button.share-preview');
               $('select.external-preview')
                 .on('change', function (event: Event) {
                   const selectedSize = $(event.target).val();

From f52f32d189ea18eeb67dbc2d95e910941bdb0cf7 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Wed, 3 Jul 2024 19:15:45 +0200
Subject: [PATCH 037/100] feat(SLB-416): ajaxify preview link form

---
 .../src/Form/PreviewLinkForm.php              | 45 ++++++++++++++++++-
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php b/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php
index 94ab5bcf6..8eb9a7668 100644
--- a/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php
+++ b/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php
@@ -5,6 +5,11 @@
 namespace Drupal\silverback_preview_link\Form;
 
 use Drupal\Component\Datetime\TimeInterface;
+use Drupal\Component\Utility\Html;
+use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Ajax\AjaxResponse;
+use Drupal\Core\Ajax\PrependCommand;
+use Drupal\Core\Ajax\ReplaceCommand;
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Entity\EntityInterface;
@@ -13,7 +18,6 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Url;
 use Drupal\node\NodeInterface;
 use Drupal\silverback_preview_link\Entity\SilverbackPreviewLink;
 use Drupal\silverback_preview_link\PreviewLinkExpiry;
@@ -109,6 +113,8 @@ public function buildForm(array $form, FormStateInterface $form_state, RouteMatc
 
     $host = $this->getHostEntity($routeMatch);
     $form = parent::buildForm($form, $form_state);
+    // See https://www.drupal.org/project/drupal/issues/2897377
+    $form['#id'] = Html::getId($form_state->getBuildInfo()['form_id']);
 
     if ($host instanceof NodeInterface) {
       /** @var \Drupal\silverback_preview_link\Entity\SilverbackPreviewLinkInterface $silverbackPreviewLink */
@@ -176,11 +182,17 @@ public function buildForm(array $form, FormStateInterface $form_state, RouteMatc
       $form['actions']['regenerate_submit']['#submit'] = array_diff($form['actions']['regenerate_submit']['#submit'], ['::save']);
       $form['actions']['regenerate_submit']['#submit'][] = '::regenerateToken';
       $form['actions']['regenerate_submit']['#submit'][] = '::save';
+      $form['actions']['regenerate_submit']['#ajax'] = [
+        'callback' => [get_called_class(), 'ajaxRefreshForm'],
+      ];
 
       $form['actions']['reset'] = [
         '#type' => 'submit',
         '#value' => $this->t('Reset current link expiry to @lifetime', ['@lifetime' => $originalAgeFormatted]),
         '#submit' => ['::resetLifetime', '::save'],
+        '#ajax' => [
+          'callback' => [get_called_class(), 'ajaxRefreshForm'],
+        ],
         '#weight' => 100,
       ];
     }
@@ -189,12 +201,41 @@ public function buildForm(array $form, FormStateInterface $form_state, RouteMatc
     return $form;
   }
 
+  public static function ajaxRefreshForm(array $form, FormStateInterface $form_state) {
+    $triggering_element = $form_state->getTriggeringElement();
+    $element = NULL;
+    if (!empty($triggering_element['#ajax']['element'])) {
+      $element = NestedArray::getValue($form, $triggering_element['#ajax']['element']);
+    }
+    // Element not specified or not found. Show messages on top of the form.
+    if (!$element) {
+      $element = $form;
+    }
+    $response = new AjaxResponse();
+    $response->addCommand(new ReplaceCommand('[data-drupal-selector="' . $form['#attributes']['data-drupal-selector'] . '"]', $form));
+    $response->addCommand(new PrependCommand('[data-drupal-selector="' . $element['#attributes']['data-drupal-selector'] . '"]', ['#type' => 'status_messages']));
+
+    return $response;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    // For ajax.
+    $form_state->setRebuild();
+    parent::submitForm($form, $form_state);
+    // Update the changed timestamp of the entity.
+    $this->updateChangedTime($this->entity);
+  }
+
+
   /**
    * {@inheritdoc}
    */
   public function save(array $form, FormStateInterface $form_state) {
     $result = parent::save($form, $form_state);
-    $this->messenger()->addStatus($this->t('Preview Link saved.'));
+    //$this->messenger()->addStatus($this->t('Preview Link saved.'));
     return $result;
   }
 

From 13bb2fecccc010946cae2b4a3b9fee4bc384e61e Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Wed, 3 Jul 2024 19:28:57 +0200
Subject: [PATCH 038/100] refactor(SLB-416): give a bit more space for messages

---
 packages/drupal/gutenberg_blocks/src/preview.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/drupal/gutenberg_blocks/src/preview.ts b/packages/drupal/gutenberg_blocks/src/preview.ts
index 7aadbfc65..a99e39dc4 100644
--- a/packages/drupal/gutenberg_blocks/src/preview.ts
+++ b/packages/drupal/gutenberg_blocks/src/preview.ts
@@ -54,7 +54,7 @@
               class="components-external-link components-button share-preview use-ajax" 
               href="${drupalSettings.preview.previewTokenUrl}"
               data-dialog-type="modal"
-              data-dialog-options="{&quot;width&quot;:550,&quot;height&quot;:280}" 
+              data-dialog-options="{&quot;width&quot;:550,&quot;height&quot;:500}" 
               rel="external noreferrer noopener">
                 ${Drupal.t('Share preview')}<span class="components-visually-hidden">${Drupal.t('(opens in a new tab)')}</span>
                 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="components-external-link__icon css-6wogo1-StyledIcon etxm6pv0" role="img" aria-hidden="true" focusable="false">
@@ -108,7 +108,6 @@
               );
 
               const $previewButton = $('button.external-preview');
-              const $shareButton = $('button.share-preview');
               $('select.external-preview')
                 .on('change', function (event: Event) {
                   const selectedSize = $(event.target).val();

From d3210893e44c811d897f11ca81a6d1b455b1f10b Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Wed, 3 Jul 2024 19:55:08 +0200
Subject: [PATCH 039/100] refactor(SLB-416): better wording, add timezone info

---
 .idea/dataSources.xml                             | 15 +++++++++++++++
 .../src/Form/PreviewLinkForm.php                  |  7 +++----
 2 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 .idea/dataSources.xml

diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
new file mode 100644
index 000000000..49a276bee
--- /dev/null
+++ b/.idea/dataSources.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name=".sqlite driver - .sqlite" uuid="7e531972-e128-4d8d-8ede-b563564b887a">
+      <driver-ref>d3b8aa80-75a4-4431-a24d-d6e0c8fd1e7c</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
+      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/apps/cms/web/sites/default/files/.sqlite</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+      </jdbc-additional-properties>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+  </component>
+</project>
\ No newline at end of file
diff --git a/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php b/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php
index 8eb9a7668..8801a8135 100644
--- a/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php
+++ b/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php
@@ -229,13 +229,11 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->updateChangedTime($this->entity);
   }
 
-
   /**
    * {@inheritdoc}
    */
   public function save(array $form, FormStateInterface $form_state) {
     $result = parent::save($form, $form_state);
-    //$this->messenger()->addStatus($this->t('Preview Link saved.'));
     return $result;
   }
 
@@ -249,7 +247,7 @@ public function save(array $form, FormStateInterface $form_state) {
    */
   public function regenerateToken(array &$form, FormStateInterface $form_state): void {
     $this->entity->regenerateToken(TRUE);
-    $this->messenger()->addMessage($this->t('The token has been regenerated.'));
+    $this->messenger()->addMessage($this->t('The live preview link token has been regenerated.'));
   }
 
   /**
@@ -264,8 +262,9 @@ public function resetLifetime(array &$form, FormStateInterface $form_state): voi
     $expiry = new \DateTimeImmutable('@' . $this->time->getRequestTime());
     $expiry = $expiry->modify('+' . $this->linkExpiry->getLifetime() . ' seconds');
     $this->entity->setExpiry($expiry);
+    $timezone = date_default_timezone_get();
     $this->messenger()->addMessage($this->t('Preview link will now expire at %time.', [
-      '%time' => $this->dateFormatter->format($expiry->getTimestamp()),
+      '%time' => $this->dateFormatter->format($expiry->getTimestamp(), 'custom', 'd/m/y H:i', $timezone) . ' ('. $timezone .')',
     ]));
   }
 

From 7556a9d862bbb5095dfe124d8b8d44a3b8ef3d98 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Wed, 3 Jul 2024 19:58:34 +0200
Subject: [PATCH 040/100] refactor(SLB-416): reset the expiry when generating a
 new token

---
 .../src/Form/PreviewLinkForm.php                 | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php b/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php
index 8801a8135..aa399080f 100644
--- a/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php
+++ b/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php
@@ -247,6 +247,8 @@ public function save(array $form, FormStateInterface $form_state) {
    */
   public function regenerateToken(array &$form, FormStateInterface $form_state): void {
     $this->entity->regenerateToken(TRUE);
+    $expiry = $this->getExpiry();
+    $this->entity->setExpiry($expiry);
     $this->messenger()->addMessage($this->t('The live preview link token has been regenerated.'));
   }
 
@@ -259,8 +261,7 @@ public function regenerateToken(array &$form, FormStateInterface $form_state): v
    *   The current state of the form.
    */
   public function resetLifetime(array &$form, FormStateInterface $form_state): void {
-    $expiry = new \DateTimeImmutable('@' . $this->time->getRequestTime());
-    $expiry = $expiry->modify('+' . $this->linkExpiry->getLifetime() . ' seconds');
+    $expiry = $this->getExpiry();
     $this->entity->setExpiry($expiry);
     $timezone = date_default_timezone_get();
     $this->messenger()->addMessage($this->t('Preview link will now expire at %time.', [
@@ -268,4 +269,15 @@ public function resetLifetime(array &$form, FormStateInterface $form_state): voi
     ]));
   }
 
+  /**
+   * Helper to reset the expiry.
+   *
+   * @return \DateTimeImmutable|false
+   * @throws \Exception
+   */
+  private function getExpiry() {
+    $expiry = new \DateTimeImmutable('@' . $this->time->getRequestTime());
+    return $expiry->modify('+' . $this->linkExpiry->getLifetime() . ' seconds');
+  }
+
 }

From 294e4ddbb4bc83103c769c5e8384bd4a71a1e9fe Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 5 Jul 2024 12:02:58 +0200
Subject: [PATCH 041/100] feat(SLB-416): minimal ui implementation for preview
 and preview 403

---
 .../src/components/Routes/Preview.stories.tsx | 87 +++++++++++++++++++
 packages/ui/src/components/Routes/Preview.tsx | 44 +++++++++-
 2 files changed, 128 insertions(+), 3 deletions(-)
 create mode 100644 packages/ui/src/components/Routes/Preview.stories.tsx

diff --git a/packages/ui/src/components/Routes/Preview.stories.tsx b/packages/ui/src/components/Routes/Preview.stories.tsx
new file mode 100644
index 000000000..53bb972cd
--- /dev/null
+++ b/packages/ui/src/components/Routes/Preview.stories.tsx
@@ -0,0 +1,87 @@
+import {
+  FrameQuery,
+  Locale,
+  OperationExecutor,
+  PreviewDrupalPageQuery,
+  Url,
+} from '@custom/schema';
+import { Meta, StoryObj } from '@storybook/react';
+import React from 'react';
+
+import { AccordionItemText } from '../Organisms/PageContent/BlockAccordion.stories';
+import { Default as BlockImageTeasers } from '../Organisms/PageContent/BlockImageTeasers.stories';
+import { ImageRight } from '../Organisms/PageContent/BlockImageWithText.stories';
+import { Mixed, Paragraph } from '../Organisms/PageContent/BlockMarkup.stories';
+import { WithCaption } from '../Organisms/PageContent/BlockMedia.stories';
+import { Default as FrameStory } from './Frame.stories';
+import { Preview } from './Preview';
+
+export default {
+  component: Preview,
+  parameters: {
+    layout: 'fullscreen',
+  },
+} satisfies Meta<typeof Preview>;
+
+export const Default = {
+  render: (args) => {
+    return (
+      <OperationExecutor executor={() => args} id={PreviewDrupalPageQuery}>
+        <OperationExecutor executor={FrameStory.args} id={FrameQuery}>
+          <Preview />
+        </OperationExecutor>
+      </OperationExecutor>
+    );
+  },
+  args: {
+    preview: {
+      title: 'Page Title',
+      locale: 'en',
+      translations: [
+        {
+          locale: Locale.En,
+          path: '/test' as Url,
+        },
+      ],
+      path: '/test' as Url,
+      content: [
+        {
+          __typename: 'BlockImageTeasers',
+          ...BlockImageTeasers.args,
+        },
+        {
+          __typename: 'BlockMarkup',
+          ...Mixed.args,
+        },
+        {
+          __typename: 'BlockMedia',
+          ...WithCaption.args,
+        },
+        {
+          __typename: 'BlockMarkup',
+          ...Paragraph.args,
+        },
+        {
+          __typename: 'BlockImageWithText',
+          ...ImageRight.args,
+        },
+        {
+          __typename: 'BlockAccordion',
+          ...AccordionItemText.args,
+        },
+        {
+          __typename: 'BlockImageTeasers',
+          ...BlockImageTeasers.args,
+        },
+      ] as Exclude<PreviewDrupalPageQuery['preview'], undefined>['content'],
+    },
+  },
+  parameters: {
+    location: new URL('local:/gatsby-turbo'),
+  },
+} satisfies StoryObj<PreviewDrupalPageQuery>;
+
+export const Preview403 = {
+  ...Default,
+  args: {},
+} satisfies StoryObj<PreviewDrupalPageQuery>;
diff --git a/packages/ui/src/components/Routes/Preview.tsx b/packages/ui/src/components/Routes/Preview.tsx
index 5f3d4f14b..f731d4a81 100644
--- a/packages/ui/src/components/Routes/Preview.tsx
+++ b/packages/ui/src/components/Routes/Preview.tsx
@@ -1,10 +1,16 @@
 'use client';
-import type { OperationVariables } from '@custom/schema';
-import { PreviewDrupalPageQuery, useLocation } from '@custom/schema';
+import {
+  OperationVariables,
+  Url,
+  Locale,
+  PreviewDrupalPageQuery,
+  useLocation,
+} from '@custom/schema';
 import React from 'react';
 
 import { clear, useOperation } from '../../utils/operation';
 import { PageDisplay } from '../Organisms/PageDisplay';
+import { useIntl } from 'react-intl';
 
 function usePreviewParameters(): OperationVariables<
   typeof PreviewDrupalPageQuery
@@ -14,7 +20,15 @@ function usePreviewParameters(): OperationVariables<
   const nid = location.searchParams.get('nid');
   const rid = location.searchParams.get('rid');
   const lang = location.searchParams.get('lang');
-  return { id: nid || '', rid: rid || '', locale: lang || 'en' };
+  const previewUserId = location.searchParams.get('preview_user_id');
+  const previewAccessToken = location.searchParams.get('preview_access_token');
+  return {
+    id: nid || '',
+    rid: rid || '',
+    locale: lang || 'en',
+    preview_user_id: previewUserId || '',
+    preview_access_token: previewAccessToken || '',
+  };
 }
 
 export function usePreviewRefresh() {
@@ -23,6 +37,8 @@ export function usePreviewRefresh() {
     entity_type_id?: string;
     entity_id?: string;
     langcode?: string;
+    preview_user_id?: string;
+    preview_access_token?: string;
   }) => {
     if (
       // TODO: Extend for non-node entities?
@@ -37,7 +53,29 @@ export function usePreviewRefresh() {
 
 export function Preview() {
   const { data } = useOperation(PreviewDrupalPageQuery, usePreviewParameters());
+  const intl = useIntl();
   if (data?.preview) {
     return <PageDisplay {...data.preview} />;
+  } else {
+    // @todo: load this content from Drupal settings, create a ForbiddenPage component.
+    const data403 = {
+      preview: {
+        title: '403 Forbidden',
+        locale: 'en' as Locale,
+        translations: [],
+        path: '/403' as Url,
+        content: [
+          {
+            __typename: 'BlockMarkup',
+            markup: `<p>${intl.formatMessage({
+              defaultMessage:
+                'You do not have access to this page. Your access token might have expired.',
+              id: 'e7yFQY',
+            })}</p>`,
+          },
+        ] as Exclude<PreviewDrupalPageQuery['preview'], undefined>['content'],
+      },
+    };
+    return <PageDisplay {...data403.preview} />;
   }
 }

From f71412a923f80f678d6ff1934784943bca390479 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 5 Jul 2024 12:03:48 +0200
Subject: [PATCH 042/100] feat(SLB-416): preview schema

---
 .../schema/src/operations/PreviewDrupalPage.gql | 10 ++++++++--
 packages/schema/src/schema.graphql              | 17 +++++++++++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/packages/schema/src/operations/PreviewDrupalPage.gql b/packages/schema/src/operations/PreviewDrupalPage.gql
index 1d7a5939c..852365960 100644
--- a/packages/schema/src/operations/PreviewDrupalPage.gql
+++ b/packages/schema/src/operations/PreviewDrupalPage.gql
@@ -1,5 +1,11 @@
-query PreviewDrupalPage($id: ID!, $rid: ID, $locale: String!) {
-  preview: previewDrupalPage(id: $id, rid: $rid, locale: $locale) {
+query PreviewDrupalPage($id: ID!, $rid: ID, $locale: String!, $preview_user_id: ID, $preview_access_token: String) {
+  preview: previewDrupalPage(
+    id: $id,
+    rid: $rid,
+    locale: $locale,
+    preview_user_id: $preview_user_id,
+    preview_access_token: $preview_access_token,
+  ) {
     ...Page
   }
 }
diff --git a/packages/schema/src/schema.graphql b/packages/schema/src/schema.graphql
index fd351b736..2325a12fb 100644
--- a/packages/schema/src/schema.graphql
+++ b/packages/schema/src/schema.graphql
@@ -330,8 +330,21 @@ input PaginationInput {
 
 type Query {
   previewDecapPage: DecapPage
-  previewDrupalPage(id: ID!, rid: ID, locale: String!): DrupalPage
-    @fetchEntity(type: "node", id: "$id", rid: "$rid", language: "$locale")
+  previewDrupalPage(
+    id: ID!
+    rid: ID
+    locale: String!
+    preview_user_id: ID
+    preview_access_token: String
+  ): DrupalPage
+    @fetchEntity(
+      type: "node"
+      id: "$id"
+      rid: "$rid"
+      language: "$locale"
+      preview_user_id: "$preview_user_id"
+      preview_access_token: "$preview_access_token"
+    )
 
   metaNavigations: [MetaNavigation]
     @gatsbyNodes(type: "MetaNavigation")

From 8fcbf498740c48e493826fb6d98523352db7a333 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 5 Jul 2024 13:39:14 +0200
Subject: [PATCH 043/100] feat(SLB-416): add access checker service

---
 .../silverback_preview_link.services.yml      |  5 ++
 .../src/Access/PreviewLinkAccessCheck.php     | 49 +++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 packages/drupal/silverback_preview_link/src/Access/PreviewLinkAccessCheck.php

diff --git a/packages/drupal/silverback_preview_link/silverback_preview_link.services.yml b/packages/drupal/silverback_preview_link/silverback_preview_link.services.yml
index 7806033c5..a1d259462 100644
--- a/packages/drupal/silverback_preview_link/silverback_preview_link.services.yml
+++ b/packages/drupal/silverback_preview_link/silverback_preview_link.services.yml
@@ -1,4 +1,9 @@
 services:
+  access_check.silverback_preview_link:
+    class: Drupal\silverback_preview_link\Access\PreviewLinkAccessCheck
+    arguments: [ '@silverback_preview_link.host' ]
+    tags:
+      - { name: access_check, applies_to: _access_preview_link }
   silverback_preview_link.link_expiry:
     class: Drupal\silverback_preview_link\PreviewLinkExpiry
     arguments: ['@config.factory']
diff --git a/packages/drupal/silverback_preview_link/src/Access/PreviewLinkAccessCheck.php b/packages/drupal/silverback_preview_link/src/Access/PreviewLinkAccessCheck.php
new file mode 100644
index 000000000..32f017d7b
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/src/Access/PreviewLinkAccessCheck.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\silverback_preview_link\Access;
+
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Access\AccessResultInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Routing\Access\AccessInterface;
+use Drupal\silverback_preview_link\PreviewLinkHostInterface;
+
+/**
+ * Preview link access check.
+ */
+class PreviewLinkAccessCheck implements AccessInterface {
+
+  /**
+   * PreviewLinkAccessCheck constructor.
+   */
+  public function __construct(
+    protected PreviewLinkHostInterface $previewLinkHost,
+  ) {
+  }
+
+  /**
+   * Checks access to the preview link.
+   */
+  public function access(EntityInterface $entity = NULL, string $preview_token = NULL): AccessResultInterface {
+    $neutral = AccessResult::neutral()->addCacheableDependency($entity);
+    if (!$preview_token || !$entity) {
+      return $neutral;
+    }
+
+    // If we can't find a valid preview link then ignore this.
+    if (!$this->previewLinkHost->hasPreviewLinks($entity)) {
+      return $neutral->setReason('This entity does not have a preview link.');
+    }
+
+    // If an entity has a preview link that doesn't match up,
+    // then explicitly deny access.
+    if (!$this->previewLinkHost->isToken($entity, [$preview_token])) {
+      return AccessResult::forbidden('Preview token is invalid.')->addCacheableDependency($entity);
+    }
+
+    return AccessResult::allowed()->addCacheableDependency($entity);
+  }
+
+}

From 05bfeae4e591f6796795b054edaeb3d4ed5b25c2 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 5 Jul 2024 14:28:29 +0200
Subject: [PATCH 044/100] refactor(SLB-416): remove session_tokens controller

---
 .../silverback_preview_link.routing.yml       |  8 ---
 .../PreviewLinkSessionTokenController.php     | 69 -------------------
 2 files changed, 77 deletions(-)
 delete mode 100644 packages/drupal/silverback_preview_link/src/Controller/PreviewLinkSessionTokenController.php

diff --git a/packages/drupal/silverback_preview_link/silverback_preview_link.routing.yml b/packages/drupal/silverback_preview_link/silverback_preview_link.routing.yml
index 36b10ac7c..f6e7ad556 100644
--- a/packages/drupal/silverback_preview_link/silverback_preview_link.routing.yml
+++ b/packages/drupal/silverback_preview_link/silverback_preview_link.routing.yml
@@ -6,11 +6,3 @@ silverback_preview_link.settings:
     _description: 'Manage Preview link settings.'
   requirements:
     _permission: 'administer silverback preview link settings'
-
-silverback_preview_link.session_tokens.remove:
-  path: '/silverback-preview-link/session-tokens/remove'
-  defaults:
-    _controller: '\Drupal\silverback_preview_link\Controller\PreviewLinkSessionTokenController::removeTokens'
-    _title: 'Remove all Preview Link session tokens'
-  requirements:
-    _access_preview_session_exists: 'TRUE'
diff --git a/packages/drupal/silverback_preview_link/src/Controller/PreviewLinkSessionTokenController.php b/packages/drupal/silverback_preview_link/src/Controller/PreviewLinkSessionTokenController.php
deleted file mode 100644
index c7e340811..000000000
--- a/packages/drupal/silverback_preview_link/src/Controller/PreviewLinkSessionTokenController.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\silverback_preview_link\Controller;
-
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Messenger\MessengerInterface;
-use Drupal\Core\StringTranslation\TranslationInterface;
-use Drupal\Core\TempStore\PrivateTempStoreFactory;
-use Drupal\Core\Url;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * Controller for removing tokens from the session.
- */
-class PreviewLinkSessionTokenController extends ControllerBase {
-
-  /**
-   * PreviewLinkSessionTokenController constructor.
-   *
-   * @param \Drupal\Core\StringTranslation\TranslationInterface $stringTranslation
-   *   The string translation service.
-   * @param \Drupal\Core\Messenger\MessengerInterface $messenger
-   *   The messenger.
-   * @param \Drupal\Core\TempStore\PrivateTempStoreFactory $privateTempStoreFactory
-   *   The tempstore factory.
-   */
-  final public function __construct(
-    TranslationInterface $stringTranslation,
-    MessengerInterface $messenger,
-    protected PrivateTempStoreFactory $privateTempStoreFactory,
-  ) {
-    $this->messenger = $messenger;
-    $this->stringTranslation = $stringTranslation;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('string_translation'),
-      $container->get('messenger'),
-      $container->get('tempstore.private'),
-    );
-  }
-
-  /**
-   * Removes tokens from the users' session.
-   */
-  public function removeTokens(): Response {
-    $collection = $this->privateTempStoreFactory->get('silverback_preview_link');
-    $hasKeys = $collection->get('keys') !== NULL;
-    $collection->delete('keys');
-    if ($hasKeys) {
-      $this->messenger->addMessage($this->t('Removed preview link tokens.'));
-    }
-    else {
-      $this->messenger->addWarning($this->t('No preview link tokens associated with this session.'));
-    }
-
-    $destination = Url::fromRoute('<front>');
-    return new RedirectResponse($destination->toString());
-  }
-
-}

From 8e89c66956b28e8903db389332eb36d293383915 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 5 Jul 2024 14:29:45 +0200
Subject: [PATCH 045/100] feat(SLB-416): generate preview link access checker

---
 .../silverback_preview_link.services.yml      |  7 +-
 .../src/Access/PreviewEnabledAccessCheck.php  | 80 +++++++++++++++++++
 2 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 packages/drupal/silverback_preview_link/src/Access/PreviewEnabledAccessCheck.php

diff --git a/packages/drupal/silverback_preview_link/silverback_preview_link.services.yml b/packages/drupal/silverback_preview_link/silverback_preview_link.services.yml
index a1d259462..8d9039f55 100644
--- a/packages/drupal/silverback_preview_link/silverback_preview_link.services.yml
+++ b/packages/drupal/silverback_preview_link/silverback_preview_link.services.yml
@@ -4,6 +4,11 @@ services:
     arguments: [ '@silverback_preview_link.host' ]
     tags:
       - { name: access_check, applies_to: _access_preview_link }
+  access_check.preview_enabled:
+    class: Drupal\silverback_preview_link\Access\PreviewEnabledAccessCheck
+    arguments: [ '@config.factory' ]
+    tags:
+      - { name: access_check, applies_to: _access_preview_enabled }
   silverback_preview_link.link_expiry:
     class: Drupal\silverback_preview_link\PreviewLinkExpiry
     arguments: ['@config.factory']
@@ -12,6 +17,6 @@ services:
     arguments:
       - '@entity_type.manager'
       - '@datetime.time'
-  logger.channel.preview_link:
+  logger.channel.silverback_preview_link:
     parent: logger.channel_base
     arguments: [ 'silverback_preview_link' ]
diff --git a/packages/drupal/silverback_preview_link/src/Access/PreviewEnabledAccessCheck.php b/packages/drupal/silverback_preview_link/src/Access/PreviewEnabledAccessCheck.php
new file mode 100644
index 000000000..9b574974b
--- /dev/null
+++ b/packages/drupal/silverback_preview_link/src/Access/PreviewEnabledAccessCheck.php
@@ -0,0 +1,80 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\silverback_preview_link\Access;
+
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Access\AccessResultInterface;
+use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Config\ImmutableConfig;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Routing\Access\AccessInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Symfony\Component\Routing\Route;
+
+/**
+ * Generate preview link access check.
+ */
+class PreviewEnabledAccessCheck implements AccessInterface {
+
+  protected ImmutableConfig $config;
+
+  /**
+   * PreviewEnabledAccessCheck constructor.
+   */
+  public function __construct(ConfigFactoryInterface $configFactory) {
+    $this->config = $configFactory->get('silverback_preview_link.settings');
+  }
+
+  /**
+   * Checks access to both the generate route and the preview route.
+   */
+  public function access(Route $route, RouteMatchInterface $route_match): AccessResultInterface {
+    // Get the entity for both the preview route and the generate preview link
+    // route.
+    $entity = match($route->getOption('silverback_preview_link.entity_type_id')) {
+      NULL => $route_match->getParameter('entity'),
+      default => $route_match->getParameter($route->getOption('silverback_preview_link.entity_type_id')),
+    };
+
+    return AccessResult::allowedIf($this->entityTypeAndBundleEnabled($entity))
+      ->addCacheableDependency($entity)
+      ->addCacheContexts(['route'])
+      ->addCacheableDependency($this->config);
+  }
+
+  /**
+   * Check if the entity type and bundle are enabled.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity.
+   *
+   * @return bool
+   *   TRUE if enabled, FALSE otherwise.
+   */
+  protected function entityTypeAndBundleEnabled(EntityInterface $entity): bool {
+    $enabled_entity_types = $this->config->get('enabled_entity_types');
+
+    // If no entity types are specified, fallback to allowing all.
+    if (count($enabled_entity_types) === 0) {
+      return TRUE;
+    }
+
+    // If the entity type exists in the configuration object.
+    if (isset($enabled_entity_types[$entity->getEntityTypeId()])) {
+      $enabled_bundles = $enabled_entity_types[$entity->getEntityTypeId()];
+      // If no bundles were specified, assume all bundles are enabled.
+      if (count($enabled_bundles) === 0) {
+        return TRUE;
+      }
+      // Otherwise fallback to requiring the specific bundle.
+      if (in_array($entity->bundle(), $enabled_bundles, TRUE)) {
+        return TRUE;
+      }
+    }
+
+    return FALSE;
+  }
+
+}

From b253fa299d52cc1a726d6b899b2096abb754297d Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 5 Jul 2024 14:33:58 +0200
Subject: [PATCH 046/100] docs(SLB-416): update readme

---
 packages/drupal/silverback_preview_link/README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/drupal/silverback_preview_link/README.md b/packages/drupal/silverback_preview_link/README.md
index 0328e5c88..6854ce52e 100644
--- a/packages/drupal/silverback_preview_link/README.md
+++ b/packages/drupal/silverback_preview_link/README.md
@@ -3,14 +3,15 @@
 Decoupled preview with access token. Integrates with Silverback autosave.
 
 This module is inspired by the [Preview Link](https://www.drupal.org/project/preview_link) module
-but does not depend on it as the use case is different. This module 
+but does not depend on it as the use case is different. This module
 - is suitable for a decoupled setup
 - handles access based on GraphQL
 - uses silverback_autosave to share instant preview updates
+- integrates with the Gutenberg editor
 
-Due to the decoupled nature, it does not cover additional logic brought by 
+Due to the decoupled nature, it does not cover additional logic brought by
 the Preview Link module:
-- Route subscribers for canonical entity access
+- Most of the route subscribers
 - Entity canonical access control handlers
 - Route provider and Controller for preview links
 - Event subscribers for node canonical redirect

From 1ecab0038df4621b170d54166345d22a46f0bbe0 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 5 Jul 2024 14:41:44 +0200
Subject: [PATCH 047/100] chore(SLB-416): move silverback_preview_link to
 silverback-mono

---
 .../drupal/silverback_preview_link/README.md  |  23 --
 .../silverback_preview_link/composer.json     |  18 --
 .../silverback_preview_link.settings.yml      |   3 -
 .../schema/silverback_preview_link.schema.yml |  14 -
 .../silverback_preview_link.info.yml          |  11 -
 .../silverback_preview_link.install           |   6 -
 .../silverback_preview_link.links.menu.yml    |   5 -
 .../silverback_preview_link.module            |  76 -----
 .../silverback_preview_link.permissions.yml   |   8 -
 .../silverback_preview_link.routing.yml       |   8 -
 .../silverback_preview_link.services.yml      |  22 --
 .../src/Access/PreviewEnabledAccessCheck.php  |  80 -----
 .../src/Access/PreviewLinkAccessCheck.php     |  49 ---
 .../src/Entity/SilverbackPreviewLink.php      | 198 ------------
 .../Entity/SilverbackPreviewLinkInterface.php | 110 -------
 .../src/Form/PreviewLinkForm.php              | 283 ------------------
 .../src/Form/SettingsForm.php                 | 190 ------------
 .../SilverbackPreviewLinkSelection.php        |  26 --
 .../FieldWidget/PreviewLinkEntitiesWidget.php | 103 -------
 ...ackPreviewLinkEntitiesUniqueConstraint.php |  26 --
 ...wLinkEntitiesUniqueConstraintValidator.php |  44 ---
 .../src/PreviewLinkExpiry.php                 |  55 ----
 .../src/PreviewLinkHooks.php                  |  61 ----
 .../src/PreviewLinkHost.php                   |  71 -----
 .../src/PreviewLinkHostInterface.php          |  49 ---
 .../src/PreviewLinkStorage.php                |  99 ------
 .../src/PreviewLinkStorageInterface.php       |  19 --
 .../src/PreviewLinkUtility.php                |  27 --
 .../src/Routing/PreviewLinkRouteProvider.php  |  61 ----
 .../templates/preview-link.html.twig          |   8 -
 30 files changed, 1753 deletions(-)
 delete mode 100644 packages/drupal/silverback_preview_link/README.md
 delete mode 100644 packages/drupal/silverback_preview_link/composer.json
 delete mode 100644 packages/drupal/silverback_preview_link/config/install/silverback_preview_link.settings.yml
 delete mode 100644 packages/drupal/silverback_preview_link/config/schema/silverback_preview_link.schema.yml
 delete mode 100644 packages/drupal/silverback_preview_link/silverback_preview_link.info.yml
 delete mode 100644 packages/drupal/silverback_preview_link/silverback_preview_link.install
 delete mode 100644 packages/drupal/silverback_preview_link/silverback_preview_link.links.menu.yml
 delete mode 100644 packages/drupal/silverback_preview_link/silverback_preview_link.module
 delete mode 100644 packages/drupal/silverback_preview_link/silverback_preview_link.permissions.yml
 delete mode 100644 packages/drupal/silverback_preview_link/silverback_preview_link.routing.yml
 delete mode 100644 packages/drupal/silverback_preview_link/silverback_preview_link.services.yml
 delete mode 100644 packages/drupal/silverback_preview_link/src/Access/PreviewEnabledAccessCheck.php
 delete mode 100644 packages/drupal/silverback_preview_link/src/Access/PreviewLinkAccessCheck.php
 delete mode 100644 packages/drupal/silverback_preview_link/src/Entity/SilverbackPreviewLink.php
 delete mode 100644 packages/drupal/silverback_preview_link/src/Entity/SilverbackPreviewLinkInterface.php
 delete mode 100644 packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php
 delete mode 100644 packages/drupal/silverback_preview_link/src/Form/SettingsForm.php
 delete mode 100644 packages/drupal/silverback_preview_link/src/Plugin/EntityReferenceSelection/SilverbackPreviewLinkSelection.php
 delete mode 100644 packages/drupal/silverback_preview_link/src/Plugin/Field/FieldWidget/PreviewLinkEntitiesWidget.php
 delete mode 100644 packages/drupal/silverback_preview_link/src/Plugin/Validation/Constraint/SilverbackPreviewLinkEntitiesUniqueConstraint.php
 delete mode 100644 packages/drupal/silverback_preview_link/src/Plugin/Validation/Constraint/SilverbackPreviewLinkEntitiesUniqueConstraintValidator.php
 delete mode 100644 packages/drupal/silverback_preview_link/src/PreviewLinkExpiry.php
 delete mode 100644 packages/drupal/silverback_preview_link/src/PreviewLinkHooks.php
 delete mode 100644 packages/drupal/silverback_preview_link/src/PreviewLinkHost.php
 delete mode 100644 packages/drupal/silverback_preview_link/src/PreviewLinkHostInterface.php
 delete mode 100644 packages/drupal/silverback_preview_link/src/PreviewLinkStorage.php
 delete mode 100644 packages/drupal/silverback_preview_link/src/PreviewLinkStorageInterface.php
 delete mode 100644 packages/drupal/silverback_preview_link/src/PreviewLinkUtility.php
 delete mode 100644 packages/drupal/silverback_preview_link/src/Routing/PreviewLinkRouteProvider.php
 delete mode 100644 packages/drupal/silverback_preview_link/templates/preview-link.html.twig

diff --git a/packages/drupal/silverback_preview_link/README.md b/packages/drupal/silverback_preview_link/README.md
deleted file mode 100644
index 6854ce52e..000000000
--- a/packages/drupal/silverback_preview_link/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Silverback Preview Link
-
-Decoupled preview with access token. Integrates with Silverback autosave.
-
-This module is inspired by the [Preview Link](https://www.drupal.org/project/preview_link) module
-but does not depend on it as the use case is different. This module
-- is suitable for a decoupled setup
-- handles access based on GraphQL
-- uses silverback_autosave to share instant preview updates
-- integrates with the Gutenberg editor
-
-Due to the decoupled nature, it does not cover additional logic brought by
-the Preview Link module:
-- Most of the route subscribers
-- Entity canonical access control handlers
-- Route provider and Controller for preview links
-- Event subscribers for node canonical redirect
-- ...
-
-## Configuration
-
-- Enable entity types and bundles `/admin/config/content/silverback_preview_link`
-- Optionally change the default expiry time that is set to 1 day
diff --git a/packages/drupal/silverback_preview_link/composer.json b/packages/drupal/silverback_preview_link/composer.json
deleted file mode 100644
index a5ebfd650..000000000
--- a/packages/drupal/silverback_preview_link/composer.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "name": "amazeelabs/silverback_preview_link",
-  "type": "drupal-module",
-  "version": "1.0.0",
-  "description": "Decoupled preview with access token.",
-  "homepage": "https://github.com/AmazeeLabs/silverback-mono/tree/development/packages/composer/amazeelabs/silverback_preview_link#readme",
-  "license": "GPL-2.0+",
-  "repositories": [
-    {
-      "type": "composer",
-      "url": "https://packages.drupal.org/8"
-    }
-  ],
-  "require": {
-    "php": ">=8.2",
-    "drupal/dynamic_entity_reference": "^3 || ^4"
-  }
-}
diff --git a/packages/drupal/silverback_preview_link/config/install/silverback_preview_link.settings.yml b/packages/drupal/silverback_preview_link/config/install/silverback_preview_link.settings.yml
deleted file mode 100644
index 6de5f6ebd..000000000
--- a/packages/drupal/silverback_preview_link/config/install/silverback_preview_link.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-enabled_entity_types: {}
-expiry_seconds : 86400
-multiple_entities: false
diff --git a/packages/drupal/silverback_preview_link/config/schema/silverback_preview_link.schema.yml b/packages/drupal/silverback_preview_link/config/schema/silverback_preview_link.schema.yml
deleted file mode 100644
index 46ac9633b..000000000
--- a/packages/drupal/silverback_preview_link/config/schema/silverback_preview_link.schema.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-silverback_preview_link.settings:
-  type: config_object
-  mapping:
-    enabled_entity_types:
-      type: sequence
-      sequence:
-        type: sequence
-        sequence:
-          type: string
-    expiry_seconds:
-      type: integer
-    multiple_entities:
-      label: Whether Preview Links can reference multiple entities.
-      type: boolean
diff --git a/packages/drupal/silverback_preview_link/silverback_preview_link.info.yml b/packages/drupal/silverback_preview_link/silverback_preview_link.info.yml
deleted file mode 100644
index ce9e7d5a8..000000000
--- a/packages/drupal/silverback_preview_link/silverback_preview_link.info.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: 'Silverback Preview Link'
-type: module
-description: 'Decoupled preview with access token. Integrates with Silverback autosave.'
-package: Silverback
-configure: silverback_preview_link.settings
-core_version_requirement: ^10 || ^11
-dependencies:
-  - dynamic_entity_reference:dynamic_entity_reference
-  - silverback_autosave:silverback_autosave
-  - silverback_gatsby:silverback_gatsby
-  - silverback_external_preview:silverback_external_preview
diff --git a/packages/drupal/silverback_preview_link/silverback_preview_link.install b/packages/drupal/silverback_preview_link/silverback_preview_link.install
deleted file mode 100644
index 2b0ab0470..000000000
--- a/packages/drupal/silverback_preview_link/silverback_preview_link.install
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-/**
- * @file
- * Install, update and uninstall functions for the Silverback Preview Link module.
- */
diff --git a/packages/drupal/silverback_preview_link/silverback_preview_link.links.menu.yml b/packages/drupal/silverback_preview_link/silverback_preview_link.links.menu.yml
deleted file mode 100644
index c2ba767f7..000000000
--- a/packages/drupal/silverback_preview_link/silverback_preview_link.links.menu.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-silverback_preview_link.settings:
-  route_name: silverback_preview_link.settings
-  parent: system.admin_config_content
-  title: Silverback Preview Link
-  description: 'Manage preview link settings.'
diff --git a/packages/drupal/silverback_preview_link/silverback_preview_link.module b/packages/drupal/silverback_preview_link/silverback_preview_link.module
deleted file mode 100644
index 8006e1aa3..000000000
--- a/packages/drupal/silverback_preview_link/silverback_preview_link.module
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-use Drupal\silverback_preview_link\PreviewLinkUtility;
-use Drupal\silverback_preview_link\Routing\PreviewLinkRouteProvider;
-use Drupal\silverback_preview_link\PreviewLinkHooks;
-use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Access\AccessResultInterface;
-
-/**
- * Implements hook_entity_type_alter().
- */
-function silverback_preview_link_entity_type_alter(array &$entity_types): void {
-  $supported_entity_types = array_filter(
-    $entity_types,
-    [PreviewLinkUtility::class, 'isEntityTypeSupported'],
-  );
-
-  /** @var \Drupal\Core\Entity\ContentEntityType $type */
-  foreach ($supported_entity_types as $type) {
-    $providers = $type->getRouteProviderClasses() ?: [];
-    if (count($providers['silverback_preview_link'] ?? []) === 0) {
-      $providers['silverback_preview_link'] = PreviewLinkRouteProvider::class;
-      $type->setHandlerClass('route_provider', $providers);
-    }
-
-    if (!$type->hasLinkTemplate('preview-link-generate')) {
-      $type->setLinkTemplate('preview-link-generate', $type->getLinkTemplate('canonical') . '/generate-preview-link');
-    }
-  }
-}
-
-/**
- * Implements hook_cron().
- */
-function silverback_preview_link_cron(): void {
-  \Drupal::classResolver(PreviewLinkHooks::class)->cron();
-}
-
-/**
- * Implements hook_theme().
- */
-function silverback_preview_link_theme(array $existing, string $type, string $theme, string $path): array {
-  return [
-    'preview_link' => [
-      'path' => $path . '/templates',
-      'template' => 'preview-link',
-      'variables' => [
-        'title' => NULL,
-        'preview_url' => NULL,
-        'link_description' => NULL,
-        'actions_description' => NULL,
-        'remaining_lifetime' => NULL,
-      ],
-    ],
-  ];
-}
-
-/**
- * Implements hook_entity_field_access().
- */
-function silverback_preview_link_entity_field_access(string $operation, FieldDefinitionInterface $field_definition, AccountInterface $account, FieldItemListInterface $items = NULL): AccessResultInterface {
-  $storageDefinition = $field_definition->getFieldStorageDefinition();
-  if ($storageDefinition->getTargetEntityTypeId() !== 'silverback_preview_link') {
-    return AccessResult::neutral();
-  }
-
-  if ($storageDefinition->getName() === 'entities' && $operation === 'edit') {
-    return AccessResult::forbiddenIf(\Drupal::configFactory()->get('silverback_preview_link.settings')->get('multiple_entities') !== TRUE)
-      ->addCacheTags(['config:preview_link.settings']);
-  }
-
-  return AccessResult::neutral();
-}
diff --git a/packages/drupal/silverback_preview_link/silverback_preview_link.permissions.yml b/packages/drupal/silverback_preview_link/silverback_preview_link.permissions.yml
deleted file mode 100644
index fc17f9be0..000000000
--- a/packages/drupal/silverback_preview_link/silverback_preview_link.permissions.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-administer silverback preview link settings:
-  title: 'Administer Silverback preview link settings'
-  description: 'Allows the user to administer the preview link settings'
-  restrict access: TRUE
-
-generate silverback preview links:
-  title: 'Generate Silverback preview links'
-  description: 'Allows the user to generate a preview link for a piece of content'
diff --git a/packages/drupal/silverback_preview_link/silverback_preview_link.routing.yml b/packages/drupal/silverback_preview_link/silverback_preview_link.routing.yml
deleted file mode 100644
index f6e7ad556..000000000
--- a/packages/drupal/silverback_preview_link/silverback_preview_link.routing.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-silverback_preview_link.settings:
-  path: '/admin/config/content/silverback_preview_link'
-  defaults:
-    _form: '\Drupal\silverback_preview_link\Form\SettingsForm'
-    _title: 'Silverback preview link'
-    _description: 'Manage Preview link settings.'
-  requirements:
-    _permission: 'administer silverback preview link settings'
diff --git a/packages/drupal/silverback_preview_link/silverback_preview_link.services.yml b/packages/drupal/silverback_preview_link/silverback_preview_link.services.yml
deleted file mode 100644
index 8d9039f55..000000000
--- a/packages/drupal/silverback_preview_link/silverback_preview_link.services.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-services:
-  access_check.silverback_preview_link:
-    class: Drupal\silverback_preview_link\Access\PreviewLinkAccessCheck
-    arguments: [ '@silverback_preview_link.host' ]
-    tags:
-      - { name: access_check, applies_to: _access_preview_link }
-  access_check.preview_enabled:
-    class: Drupal\silverback_preview_link\Access\PreviewEnabledAccessCheck
-    arguments: [ '@config.factory' ]
-    tags:
-      - { name: access_check, applies_to: _access_preview_enabled }
-  silverback_preview_link.link_expiry:
-    class: Drupal\silverback_preview_link\PreviewLinkExpiry
-    arguments: ['@config.factory']
-  silverback_preview_link.host:
-    class: Drupal\silverback_preview_link\PreviewLinkHost
-    arguments:
-      - '@entity_type.manager'
-      - '@datetime.time'
-  logger.channel.silverback_preview_link:
-    parent: logger.channel_base
-    arguments: [ 'silverback_preview_link' ]
diff --git a/packages/drupal/silverback_preview_link/src/Access/PreviewEnabledAccessCheck.php b/packages/drupal/silverback_preview_link/src/Access/PreviewEnabledAccessCheck.php
deleted file mode 100644
index 9b574974b..000000000
--- a/packages/drupal/silverback_preview_link/src/Access/PreviewEnabledAccessCheck.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\silverback_preview_link\Access;
-
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Access\AccessResultInterface;
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Config\ImmutableConfig;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Routing\Access\AccessInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Symfony\Component\Routing\Route;
-
-/**
- * Generate preview link access check.
- */
-class PreviewEnabledAccessCheck implements AccessInterface {
-
-  protected ImmutableConfig $config;
-
-  /**
-   * PreviewEnabledAccessCheck constructor.
-   */
-  public function __construct(ConfigFactoryInterface $configFactory) {
-    $this->config = $configFactory->get('silverback_preview_link.settings');
-  }
-
-  /**
-   * Checks access to both the generate route and the preview route.
-   */
-  public function access(Route $route, RouteMatchInterface $route_match): AccessResultInterface {
-    // Get the entity for both the preview route and the generate preview link
-    // route.
-    $entity = match($route->getOption('silverback_preview_link.entity_type_id')) {
-      NULL => $route_match->getParameter('entity'),
-      default => $route_match->getParameter($route->getOption('silverback_preview_link.entity_type_id')),
-    };
-
-    return AccessResult::allowedIf($this->entityTypeAndBundleEnabled($entity))
-      ->addCacheableDependency($entity)
-      ->addCacheContexts(['route'])
-      ->addCacheableDependency($this->config);
-  }
-
-  /**
-   * Check if the entity type and bundle are enabled.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity.
-   *
-   * @return bool
-   *   TRUE if enabled, FALSE otherwise.
-   */
-  protected function entityTypeAndBundleEnabled(EntityInterface $entity): bool {
-    $enabled_entity_types = $this->config->get('enabled_entity_types');
-
-    // If no entity types are specified, fallback to allowing all.
-    if (count($enabled_entity_types) === 0) {
-      return TRUE;
-    }
-
-    // If the entity type exists in the configuration object.
-    if (isset($enabled_entity_types[$entity->getEntityTypeId()])) {
-      $enabled_bundles = $enabled_entity_types[$entity->getEntityTypeId()];
-      // If no bundles were specified, assume all bundles are enabled.
-      if (count($enabled_bundles) === 0) {
-        return TRUE;
-      }
-      // Otherwise fallback to requiring the specific bundle.
-      if (in_array($entity->bundle(), $enabled_bundles, TRUE)) {
-        return TRUE;
-      }
-    }
-
-    return FALSE;
-  }
-
-}
diff --git a/packages/drupal/silverback_preview_link/src/Access/PreviewLinkAccessCheck.php b/packages/drupal/silverback_preview_link/src/Access/PreviewLinkAccessCheck.php
deleted file mode 100644
index 32f017d7b..000000000
--- a/packages/drupal/silverback_preview_link/src/Access/PreviewLinkAccessCheck.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\silverback_preview_link\Access;
-
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Access\AccessResultInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Routing\Access\AccessInterface;
-use Drupal\silverback_preview_link\PreviewLinkHostInterface;
-
-/**
- * Preview link access check.
- */
-class PreviewLinkAccessCheck implements AccessInterface {
-
-  /**
-   * PreviewLinkAccessCheck constructor.
-   */
-  public function __construct(
-    protected PreviewLinkHostInterface $previewLinkHost,
-  ) {
-  }
-
-  /**
-   * Checks access to the preview link.
-   */
-  public function access(EntityInterface $entity = NULL, string $preview_token = NULL): AccessResultInterface {
-    $neutral = AccessResult::neutral()->addCacheableDependency($entity);
-    if (!$preview_token || !$entity) {
-      return $neutral;
-    }
-
-    // If we can't find a valid preview link then ignore this.
-    if (!$this->previewLinkHost->hasPreviewLinks($entity)) {
-      return $neutral->setReason('This entity does not have a preview link.');
-    }
-
-    // If an entity has a preview link that doesn't match up,
-    // then explicitly deny access.
-    if (!$this->previewLinkHost->isToken($entity, [$preview_token])) {
-      return AccessResult::forbidden('Preview token is invalid.')->addCacheableDependency($entity);
-    }
-
-    return AccessResult::allowed()->addCacheableDependency($entity);
-  }
-
-}
diff --git a/packages/drupal/silverback_preview_link/src/Entity/SilverbackPreviewLink.php b/packages/drupal/silverback_preview_link/src/Entity/SilverbackPreviewLink.php
deleted file mode 100644
index 030f2aca7..000000000
--- a/packages/drupal/silverback_preview_link/src/Entity/SilverbackPreviewLink.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\silverback_preview_link\Entity;
-
-use Drupal\Component\Assertion\Inspector;
-use Drupal\Core\Entity\ContentEntityBase;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\Core\Url;
-
-/**
- * Defines the Silverback preview link entity class.
- *
- * @ContentEntityType(
- *   id = "silverback_preview_link",
- *   label = @Translation("Preview Link"),
- *   base_table = "silverback_preview_link",
- *   handlers = {
- *     "storage" = "Drupal\silverback_preview_link\PreviewLinkStorage",
- *     "form" = {
- *       "silverback_preview_link" = "Drupal\silverback_preview_link\Form\PreviewLinkForm"
- *     }
- *   },
- *   entity_keys = {
- *     "id" = "id"
- *   }
- * )
- *
- * @property \Drupal\dynamic_entity_reference\Plugin\Field\FieldType\DynamicEntityReferenceFieldItemList $entities
- */
-class SilverbackPreviewLink extends ContentEntityBase implements SilverbackPreviewLinkInterface {
-
-  /**
-   * Keep track on whether we need a new token upon save.
-   *
-   * @var bool
-   */
-  protected $needsNewToken = FALSE;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getUrl(EntityInterface $entity): Url {
-    return Url::fromRoute(sprintf('entity.%s.silverback_preview_link', $entity->getEntityTypeId()), [
-      $entity->getEntityTypeId() => $entity->id(),
-      'preview_token' => $this->getToken(),
-    ]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getToken(): string {
-    return $this->get('token')->value;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setToken($token) {
-    $this->set('token', $token);
-    // Add a second so our testing always works.
-    $this->set('generated_timestamp', time() + 1);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function regenerateToken($needs_new_token = FALSE): bool {
-    $current_value = $this->needsNewToken;
-    $this->needsNewToken = $needs_new_token;
-    return $current_value;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getGeneratedTimestamp(): int {
-    return (int) $this->get('generated_timestamp')->value;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getEntities(): array {
-    return $this->entities->referencedEntities();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setEntities(array $entities) {
-    assert(Inspector::assertAllObjects($entities, EntityInterface::class));
-    return $this->set('entities', $entities);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function addEntity(EntityInterface $entity) {
-    $this->entities->appendItem($entity);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getExpiry(): ?\DateTimeImmutable {
-    $value = $this->expiry->value ?? NULL;
-    if (!is_numeric($value)) {
-      return NULL;
-    }
-
-    return new \DateTimeImmutable('@' . $value);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setExpiry(\DateTimeInterface $expiry) {
-    return $this->set('expiry', $expiry->getTimestamp());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
-    $fields = parent::baseFieldDefinitions($entity_type);
-    $fields['token'] = BaseFieldDefinition::create('string')
-      ->setLabel(t('Preview Token'))
-      ->setDescription(t('A token that allows any user to view a preview of this entity.'))
-      ->setRequired(TRUE);
-
-    $fields['entities'] = BaseFieldDefinition::create('dynamic_entity_reference')
-      ->setLabel(t('Entities'))
-      ->setDescription(t('The associated entities this preview link unlocks.'))
-      ->setRequired(TRUE)
-      ->setCardinality(FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED)
-      ->addConstraint('SilverbackPreviewLinkEntitiesUniqueConstraint', [])
-      ->setSettings(static::entitiesDefaultFieldSettings())
-      ->setDisplayOptions('form', [
-        'type' => 'silverback_preview_link_entities_widget',
-        'weight' => 10,
-      ]);
-
-    $fields['generated_timestamp'] = BaseFieldDefinition::create('timestamp')
-      ->setLabel(t('Generated Timestamp'))
-      ->setDescription(t('The time the link was generated'))
-      ->setRequired(TRUE);
-
-    $fields['expiry'] = BaseFieldDefinition::create('timestamp')
-      ->setLabel(t('Time this Preview Link expires.'))
-      ->setDescription(t('The time after which the preview link is no longer valid.'))
-      ->setDefaultValueCallback(static::class . '::expiryDefaultValue')
-      ->setRequired(TRUE);
-
-    return $fields;
-  }
-
-  /**
-   * Rewrites settings for 'entities' dynamic_entity_reference field.
-   *
-   * DynamicEntityReferenceItem::defaultFieldSettings doesn't receive any context,
-   * so we need to change the default handlers manually.
-   */
-  public static function entitiesDefaultFieldSettings(): array {
-    $labels = \Drupal::service('entity_type.repository')->getEntityTypeLabels(TRUE);
-    $options = $labels[(string) t('Content', [], ['context' => 'Entity type group'])];
-    $settings = [
-      'exclude_entity_types' => TRUE,
-      'entity_type_ids' => [],
-    ];
-    $settings += array_fill_keys(array_keys($options), [
-      'handler' => 'silverback_preview_link',
-      'handler_settings' => [],
-    ]);
-    return $settings;
-  }
-
-  /**
-   * Get default value for 'expiry' field.
-   *
-   * @return int<0, max>
-   *   A timestamp.
-   */
-  public static function expiryDefaultValue(): int {
-    $time = \Drupal::time();
-    /** @var \Drupal\silverback_preview_link\PreviewLinkExpiry $linkExpiry */
-    $linkExpiry = \Drupal::service('silverback_preview_link.link_expiry');
-    return max(0, $time->getRequestTime() + $linkExpiry->getLifetime());
-  }
-
-}
diff --git a/packages/drupal/silverback_preview_link/src/Entity/SilverbackPreviewLinkInterface.php b/packages/drupal/silverback_preview_link/src/Entity/SilverbackPreviewLinkInterface.php
deleted file mode 100644
index 5962d9dc3..000000000
--- a/packages/drupal/silverback_preview_link/src/Entity/SilverbackPreviewLinkInterface.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\silverback_preview_link\Entity;
-
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Url;
-
-/**
- * Interface for the preview link entity.
- */
-interface SilverbackPreviewLinkInterface extends ContentEntityInterface {
-
-  /**
-   * The URL for this preview link for an entity.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   A host entity.
-   *
-   * @return \Drupal\Core\Url
-   *   The url object.
-   */
-  public function getUrl(EntityInterface $entity): Url;
-
-  /**
-   * Gets thew new token.
-   *
-   * @return string
-   *   The token.
-   */
-  public function getToken(): string;
-
-  /**
-   * Set the new token.
-   *
-   * @param string $token
-   *   The new token.
-   *
-   * @return $this
-   *   Return this for chaining.
-   */
-  public function setToken(string $token);
-
-  /**
-   * Mark the entity needing a new token. Only updated upon save.
-   *
-   * @param bool $needs_new_token
-   *   Tell this entity to generate a new token.
-   *
-   * @return bool
-   *   TRUE if it was currently marked to generate otherwise FALSE.
-   */
-  public function regenerateToken($needs_new_token = FALSE): bool;
-
-  /**
-   * Gets the timestamp stamp of when the token was generated.
-   *
-   * @return int
-   *   The timestamp.
-   */
-  public function getGeneratedTimestamp(): int;
-
-  /**
-   * Get entities this preview link unlocks.
-   *
-   * Ideally preview link access is determined via PreviewLinkHost service.
-   *
-   * @return \Drupal\Core\Entity\EntityInterface[]
-   *   Associated entities.
-   */
-  public function getEntities(): array;
-
-  /**
-   * Set the entity this preview link unlocks.
-   *
-   * @return $this
-   *   Return this for chaining.
-   */
-  public function setEntities(array $entities);
-
-  /**
-   * Add an entity for this preview link to unlock.
-   *
-   * @return $this
-   *   Return this for chaining.
-   */
-  public function addEntity(EntityInterface $entity);
-
-  /**
-   * Get expiration date.
-   *
-   * @return \DateTimeImmutable|null
-   *   The expiration date, or NULL if not set.
-   */
-  public function getExpiry(): ?\DateTimeImmutable;
-
-  /**
-   * Set the expiration date.
-   *
-   * @param \DateTimeInterface $expiry
-   *   The expiration date.
-   *
-   * @return $this
-   *   Return this for chaining.
-   */
-  public function setExpiry(\DateTimeInterface $expiry);
-
-}
diff --git a/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php b/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php
deleted file mode 100644
index aa399080f..000000000
--- a/packages/drupal/silverback_preview_link/src/Form/PreviewLinkForm.php
+++ /dev/null
@@ -1,283 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\silverback_preview_link\Form;
-
-use Drupal\Component\Datetime\TimeInterface;
-use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\NestedArray;
-use Drupal\Core\Ajax\AjaxResponse;
-use Drupal\Core\Ajax\PrependCommand;
-use Drupal\Core\Ajax\ReplaceCommand;
-use Drupal\Core\Datetime\DateFormatterInterface;
-use Drupal\Core\Entity\ContentEntityForm;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityRepositoryInterface;
-use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Messenger\MessengerInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\node\NodeInterface;
-use Drupal\silverback_preview_link\Entity\SilverbackPreviewLink;
-use Drupal\silverback_preview_link\PreviewLinkExpiry;
-use Drupal\silverback_preview_link\PreviewLinkHostInterface;
-use Drupal\silverback_preview_link\PreviewLinkStorageInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Preview link form.
- *
- * @internal
- *
- * @property \Drupal\silverback_preview_link\Entity\SilverbackPreviewLinkInterface $entity
- */
-final class PreviewLinkForm extends ContentEntityForm {
-
-  /**
-   * PreviewLinkForm constructor.
-   */
-  public function __construct(
-    EntityRepositoryInterface $entity_repository,
-    EntityTypeBundleInfoInterface $entity_type_bundle_info,
-    TimeInterface $time,
-    protected DateFormatterInterface $dateFormatter,
-    protected PreviewLinkExpiry $linkExpiry,
-    MessengerInterface $messenger,
-    protected PreviewLinkHostInterface $previewLinkHost,
-  ) {
-    parent::__construct($entity_repository, $entity_type_bundle_info, $time);
-    $this->messenger = $messenger;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container): self {
-    return new static(
-      $container->get('entity.repository'),
-      $container->get('entity_type.bundle.info'),
-      $container->get('datetime.time'),
-      $container->get('date.formatter'),
-      $container->get('silverback_preview_link.link_expiry'),
-      $container->get('messenger'),
-      $container->get('silverback_preview_link.host'),
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'silverback_preview_link_entity_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getEntityFromRouteMatch(RouteMatchInterface $route_match, $entity_type_id) {
-    $host = $this->getHostEntity($route_match);
-    $previewLinks = $this->previewLinkHost->getPreviewLinks($host);
-    if (count($previewLinks) > 0) {
-      return reset($previewLinks);
-    }
-    else {
-      $storage = $this->entityTypeManager->getStorage('silverback_preview_link');
-      assert($storage instanceof PreviewLinkStorageInterface);
-      $previewLink = SilverbackPreviewLink::create()->addEntity($host);
-      $previewLink->save();
-      return $previewLink;
-    }
-  }
-
-  /**
-   * Get the entity referencing this Preview Link.
-   *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $routeMatch
-   *   A route match.
-   *
-   * @return \Drupal\Core\Entity\EntityInterface
-   *   The host entity.
-   */
-  public function getHostEntity(RouteMatchInterface $routeMatch): EntityInterface {
-    return parent::getEntityFromRouteMatch($routeMatch, $routeMatch->getRouteObject()->getOption('silverback_preview_link.entity_type_id'));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, RouteMatchInterface $routeMatch = NULL) {
-    if (!isset($routeMatch)) {
-      throw new \LogicException('Route match not populated from argument resolver');
-    }
-
-    $host = $this->getHostEntity($routeMatch);
-    $form = parent::buildForm($form, $form_state);
-    // See https://www.drupal.org/project/drupal/issues/2897377
-    $form['#id'] = Html::getId($form_state->getBuildInfo()['form_id']);
-
-    if ($host instanceof NodeInterface) {
-      /** @var \Drupal\silverback_preview_link\Entity\SilverbackPreviewLinkInterface $silverbackPreviewLink */
-      $silverbackPreviewLink = $this->getEntity();
-      /** @var \Drupal\silverback_external_preview\ExternalPreviewLink $externalPreviewLink */
-      $externalPreviewLink = \Drupal::service('silverback_external_preview.external_preview_link');
-      $externalPreviewUrl = $externalPreviewLink->createPreviewUrlFromEntity($host);
-      $query = $externalPreviewUrl->getOption('query') ?? [];
-      $query['preview_user_id'] = $this->currentUser()->id();
-      $query['preview_access_token'] = $silverbackPreviewLink->getToken();
-      $externalPreviewUrl->setOption('query', $query);
-    }
-    else {
-      \Drupal::messenger()->addError('Preview link is only available for nodes.');
-      // This could be refactored to get the storage.
-      // Implement nodes for now as we are still using Drupal Gutenberg 2.x that
-      // is not entity type agnostic.
-      // $link = Url::fromRoute('entity.' . $host->getEntityTypeId() . '.silverback_preview_link', [
-      //   $host->getEntityTypeId() => $host->id(),
-      //   'preview_token' => $previewLink->getToken(),
-      // ]);
-      return $form;
-    }
-
-    $originalAgeFormatted = $this->dateFormatter->formatInterval($this->linkExpiry->getLifetime(), 1);
-    $remainingSeconds = max(0, ($this->entity->getExpiry()?->getTimestamp() ?? 0) - $this->time->getRequestTime());
-    $remainingAgeFormatted = $this->dateFormatter->formatInterval($remainingSeconds);
-    $isNewToken = $this->linkExpiry->getLifetime() === $remainingSeconds;
-
-    if ($isNewToken) {
-      $buttonsDescription = $this->t('<p><a href=":url" target="_blank">Live preview link</a> for <em>@entity_label</em>. Expires @lifetime after creation.</p>', [
-        ':url' => $externalPreviewUrl
-          ->setAbsolute()
-          ->toString(),
-        '@entity_label' => $host->label(),
-        '@lifetime' => $originalAgeFormatted,
-      ]);
-      $actionsDescription = NULL;
-    }
-    else {
-      $buttonsDescription = $this->t('<p><a href=":url" target="_blank">Live preview link</a> for <em>@entity_label</em>. Expires in @lifetime.</p>', [
-        ':url' => $externalPreviewUrl
-          ->setAbsolute()
-          ->toString(),
-        '@entity_label' => $host->label(),
-        '@lifetime' => $remainingAgeFormatted,
-      ]);
-      $actionsDescription = $this->t('If a new link is generated, active preview link will get invalidated.');
-    }
-
-    $form['preview_link'] = [
-      '#theme' => 'preview_link',
-      '#title' => $this->t('Preview link'),
-      '#weight' => -9999,
-      '#link_description' => $buttonsDescription,
-      '#actions_description' => $actionsDescription,
-      '#remaining_lifetime' => $remainingAgeFormatted,
-      '#preview_url' => NULL,
-    ];
-
-    if (!$isNewToken) {
-      $form['actions']['regenerate_submit'] = $form['actions']['submit'];
-      $form['actions']['regenerate_submit']['#value'] = $this->t('Generate new link');
-      // Shift ::save to after ::regenerateToken.
-      $form['actions']['regenerate_submit']['#submit'] = array_diff($form['actions']['regenerate_submit']['#submit'], ['::save']);
-      $form['actions']['regenerate_submit']['#submit'][] = '::regenerateToken';
-      $form['actions']['regenerate_submit']['#submit'][] = '::save';
-      $form['actions']['regenerate_submit']['#ajax'] = [
-        'callback' => [get_called_class(), 'ajaxRefreshForm'],
-      ];
-
-      $form['actions']['reset'] = [
-        '#type' => 'submit',
-        '#value' => $this->t('Reset current link expiry to @lifetime', ['@lifetime' => $originalAgeFormatted]),
-        '#submit' => ['::resetLifetime', '::save'],
-        '#ajax' => [
-          'callback' => [get_called_class(), 'ajaxRefreshForm'],
-        ],
-        '#weight' => 100,
-      ];
-    }
-    unset($form['actions']['submit']);
-
-    return $form;
-  }
-
-  public static function ajaxRefreshForm(array $form, FormStateInterface $form_state) {
-    $triggering_element = $form_state->getTriggeringElement();
-    $element = NULL;
-    if (!empty($triggering_element['#ajax']['element'])) {
-      $element = NestedArray::getValue($form, $triggering_element['#ajax']['element']);
-    }
-    // Element not specified or not found. Show messages on top of the form.
-    if (!$element) {
-      $element = $form;
-    }
-    $response = new AjaxResponse();
-    $response->addCommand(new ReplaceCommand('[data-drupal-selector="' . $form['#attributes']['data-drupal-selector'] . '"]', $form));
-    $response->addCommand(new PrependCommand('[data-drupal-selector="' . $element['#attributes']['data-drupal-selector'] . '"]', ['#type' => 'status_messages']));
-
-    return $response;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    // For ajax.
-    $form_state->setRebuild();
-    parent::submitForm($form, $form_state);
-    // Update the changed timestamp of the entity.
-    $this->updateChangedTime($this->entity);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save(array $form, FormStateInterface $form_state) {
-    $result = parent::save($form, $form_state);
-    return $result;
-  }
-
-  /**
-   * Regenerates preview link token.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public function regenerateToken(array &$form, FormStateInterface $form_state): void {
-    $this->entity->regenerateToken(TRUE);
-    $expiry = $this->getExpiry();
-    $this->entity->setExpiry($expiry);
-    $this->messenger()->addMessage($this->t('The live preview link token has been regenerated.'));
-  }
-
-  /**
-   * Resets the lifetime of the preview link.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public function resetLifetime(array &$form, FormStateInterface $form_state): void {
-    $expiry = $this->getExpiry();
-    $this->entity->setExpiry($expiry);
-    $timezone = date_default_timezone_get();
-    $this->messenger()->addMessage($this->t('Preview link will now expire at %time.', [
-      '%time' => $this->dateFormatter->format($expiry->getTimestamp(), 'custom', 'd/m/y H:i', $timezone) . ' ('. $timezone .')',
-    ]));
-  }
-
-  /**
-   * Helper to reset the expiry.
-   *
-   * @return \DateTimeImmutable|false
-   * @throws \Exception
-   */
-  private function getExpiry() {
-    $expiry = new \DateTimeImmutable('@' . $this->time->getRequestTime());
-    return $expiry->modify('+' . $this->linkExpiry->getLifetime() . ' seconds');
-  }
-
-}
diff --git a/packages/drupal/silverback_preview_link/src/Form/SettingsForm.php b/packages/drupal/silverback_preview_link/src/Form/SettingsForm.php
deleted file mode 100644
index 6c8d69f0d..000000000
--- a/packages/drupal/silverback_preview_link/src/Form/SettingsForm.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\silverback_preview_link\Form;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Form\ConfigFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\silverback_preview_link\PreviewLinkUtility;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Allow settings to be changed from the UI for Silverback preview link.
- */
-class SettingsForm extends ConfigFormBase {
-
-  /**
-   * Constructs a SettingsForm.
-   */
-  public function __construct(ConfigFactoryInterface $configFactory,
-    protected EntityTypeBundleInfoInterface $bundleInfo,
-    protected EntityTypeManagerInterface $entityTypeManager,
-  ) {
-    parent::__construct($configFactory);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('config.factory'),
-      $container->get('entity_type.bundle.info'),
-      $container->get('entity_type.manager'),
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEditableConfigNames(): array {
-    return [
-      $this->getConfigName(),
-    ];
-  }
-
-  /**
-   * A method to get the config name.
-   *
-   * @return string
-   *   The config name.
-   */
-  private function getConfigName(): string {
-    return 'silverback_preview_link.settings';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId(): string {
-    return 'silverback_preview_link_settings_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state): array {
-    $config = $this->config($this->getConfigName());
-    $form = parent::buildForm($form, $form_state);
-
-    $form['bundles'] = [
-      '#type' => 'details',
-    ];
-    $form['bundles']['help'] = [
-      '#markup' => $this->t('Enable entity type/bundles for use with preview link.'),
-    ];
-    $selectedOptions = $this->getSelectedEntityTypeOptions();
-    $form['bundles']['enabled_entity_types'] = [
-      '#type' => 'tableselect',
-      '#header' => [
-        $this->t('Entity type'),
-        $this->t('Bundle'),
-      ],
-      '#options' => $this->getEntityTypeOptions(),
-      '#default_value' => array_fill_keys($selectedOptions, TRUE),
-    ];
-    // Collapse the details element if anything is enabled.
-    $form['bundles']['#title'] = $this->t('Enabled types (@count)', [
-      '@count' => count($selectedOptions),
-    ]);
-    $form['bundles']['#open'] = count($selectedOptions) === 0;
-
-    $form['multiple_entities'] = [
-      '#type' => 'checkbox',
-      '#title' => 'Multiple entities',
-      '#description' => $this->t('Whether preview links can reference multiple entities.'),
-      '#default_value' => $config->get('multiple_entities'),
-    ];
-    $form['expiry_seconds'] = [
-      '#type' => 'number',
-      '#title' => 'Expiry seconds',
-      '#description' => $this->t('The number of seconds before a preview link expires.'),
-      '#default_value' => $config->get('expiry_seconds') ?: 604800,
-      '#min' => 1,
-    ];
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $config = $this->config($this->getConfigName());
-
-    $config->set('multiple_entities', $form_state->getValue('multiple_entities'));
-    $config->set('expiry_seconds', $form_state->getValue('expiry_seconds'));
-
-    $config->clear('enabled_entity_types');
-    foreach (array_keys(array_filter($form_state->getValue('enabled_entity_types'))) as $enabledBundle) {
-      if (strpos($enabledBundle, ':') !== FALSE) {
-        [$entityTypeId, $bundle] = explode(':', $enabledBundle);
-        $bundles = $config->get('enabled_entity_types.' . $entityTypeId) ?: [];
-        $bundles[] = $bundle;
-        $config->set('enabled_entity_types.' . $entityTypeId, $bundles);
-      }
-      else {
-        $entityTypeId = $enabledBundle;
-        $config->set('enabled_entity_types.' . $entityTypeId, []);
-      }
-    }
-
-    $config->save();
-    parent::submitForm($form, $form_state);
-  }
-
-  /**
-   * The options available for the user to select for bundle types.
-   *
-   * @return array
-   *   A 'entity_id:bundle' style array of possible options.
-   */
-  protected function getEntityTypeOptions(): array {
-    $options = [];
-    $entityTypes = $this->entityTypeManager->getDefinitions();
-    $entityTypes = array_filter($entityTypes, [
-      PreviewLinkUtility::class,
-      'isEntityTypeSupported',
-    ]);
-    foreach ($entityTypes as $entityTypeId => $info) {
-      $options[$entityTypeId] = [
-        ['data' => ['#markup' => '<strong>' . $info->getLabel() . '</strong>']],
-        ['data' => ['#markup' => $this->t('<em>If selected and no bundles are selected, all bundles will be enabled.</em>')]],
-      ];
-      foreach ($this->bundleInfo->getBundleInfo($entityTypeId) as $bundle => $bundleInfo) {
-        if ($entityTypeId === $bundle) {
-          continue;
-        }
-        $options[sprintf('%s:%s', $entityTypeId, $bundle)] = [
-          $info->getLabel() ?: '',
-          $bundleInfo['label'] ?: '',
-        ];
-      }
-    }
-    return $options;
-  }
-
-  /**
-   * The enabled entities and bundles for preview link to apply to.
-   *
-   * @return array
-   *   A 'entity_id:bundle' style array of selected options.
-   */
-  protected function getSelectedEntityTypeOptions(): array {
-    $config = $this->config($this->getConfigName());
-    $configured = $config->get('enabled_entity_types') ?: [];
-    $selected = [];
-    foreach ($configured as $entityTypeId => $bundles) {
-      $selected[] = $entityTypeId;
-      foreach ($bundles as $bundle) {
-        $selected[] = sprintf('%s:%s', $entityTypeId, $bundle);
-      }
-    }
-    return $selected;
-  }
-
-}
diff --git a/packages/drupal/silverback_preview_link/src/Plugin/EntityReferenceSelection/SilverbackPreviewLinkSelection.php b/packages/drupal/silverback_preview_link/src/Plugin/EntityReferenceSelection/SilverbackPreviewLinkSelection.php
deleted file mode 100644
index 621ca0730..000000000
--- a/packages/drupal/silverback_preview_link/src/Plugin/EntityReferenceSelection/SilverbackPreviewLinkSelection.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\silverback_preview_link\Plugin\EntityReferenceSelection;
-
-use Drupal\Core\Entity\Plugin\EntityReferenceSelection\DefaultSelection;
-
-/**
- * Provides specific access control for the node entity type.
- *
- * This selection plugin can be changed by altering EntityReferenceSelection
- * manager definitions or by altering base field definitions.
- *
- * @EntityReferenceSelection(
- *   id = "silverback_preview_link",
- *   label = @Translation("Preview Link Default"),
- *   group = "silverback_preview_link",
- *   weight = 0,
- *   deriver = "Drupal\Core\Entity\Plugin\Derivative\DefaultSelectionDeriver"
- * )
- */
-final class SilverbackPreviewLinkSelection extends DefaultSelection {
-
-}
-
diff --git a/packages/drupal/silverback_preview_link/src/Plugin/Field/FieldWidget/PreviewLinkEntitiesWidget.php b/packages/drupal/silverback_preview_link/src/Plugin/Field/FieldWidget/PreviewLinkEntitiesWidget.php
deleted file mode 100644
index dfd42cfe2..000000000
--- a/packages/drupal/silverback_preview_link/src/Plugin/Field/FieldWidget/PreviewLinkEntitiesWidget.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\silverback_preview_link\Plugin\Field\FieldWidget;
-
-use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\dynamic_entity_reference\Plugin\Field\FieldWidget\DynamicEntityReferenceWidget;
-use Drupal\silverback_preview_link\Form\PreviewLinkForm;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Form widget for entities field on Preview Link.
- *
- * Prevents mixing referenced entity types, unless they were created
- * programmatically.
- *
- * @FieldWidget(
- *   id = "silverback_preview_link_entities_widget",
- *   label = @Translation("Preview Link Entities Widget"),
- *   description = @Translation("Widget for selecting entities related to a Preview Link"),
- *   field_types = {
- *     "dynamic_entity_reference"
- *   }
- * )
- *
- * @internal
- */
-final class PreviewLinkEntitiesWidget extends DynamicEntityReferenceWidget {
-
-  /**
-   * The current route match.
-   *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
-   */
-  protected RouteMatchInterface $routeMatch;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    $instance = parent::create($container, $configuration, $plugin_id, $plugin_definition);
-    $instance->routeMatch = $container->get('current_route_match');
-    return $instance;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function isApplicable(FieldDefinitionInterface $field_definition) {
-    $storageDefinition = $field_definition->getFieldStorageDefinition();
-    return $storageDefinition->getTargetEntityTypeId() === 'silverback_preview_link' && $storageDefinition->getName() === 'entities';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-    $element = parent::formElement($items, $delta, $element, $form, $form_state);
-    $formObject = $form_state->getFormObject();
-    if (!$formObject instanceof PreviewLinkForm) {
-      throw new \LogicException('Can only be used with PreviewLinkForm');
-    }
-
-    /** @var \Drupal\dynamic_entity_reference\Plugin\Field\FieldType\DynamicEntityReferenceItem $item */
-    $item = $items->get($delta);
-    $targetType = $item->target_type;
-    $targetId = $item->target_id;
-    $host = $formObject->getHostEntity($this->routeMatch);
-    $hostEntityTypeId = $host->getEntityTypeId();
-
-    // Swap select field to value.
-    if ($element['target_type']['#type'] !== 'value') {
-      $element['target_type'] = [
-        '#type' => 'value',
-        '#value' => $targetType,
-      ];
-    }
-
-    // If target type not set yet (e.g for new items). Set the value.
-    if (empty($targetType)) {
-      // Force new items to be the same as host entity type.
-      $element['target_type']['#value'] = $hostEntityTypeId;
-
-      // Set otherwise autocomplete will use the wrong route.
-      $settings = $this->getFieldSettings();
-      $element['target_id']['#target_type'] = $hostEntityTypeId;
-      $element['target_id']['#selection_handler'] = $settings[$hostEntityTypeId]['handler'];
-      $element['target_id']['#selection_settings'] = $settings[$hostEntityTypeId]['handler_settings'];
-    }
-
-    // Protect host entity from modification.
-    if ($targetType == $hostEntityTypeId && $targetId == $host->id()) {
-      $element['target_id']['#disabled'] = TRUE;
-    }
-
-    return $element;
-  }
-
-}
diff --git a/packages/drupal/silverback_preview_link/src/Plugin/Validation/Constraint/SilverbackPreviewLinkEntitiesUniqueConstraint.php b/packages/drupal/silverback_preview_link/src/Plugin/Validation/Constraint/SilverbackPreviewLinkEntitiesUniqueConstraint.php
deleted file mode 100644
index ac033f266..000000000
--- a/packages/drupal/silverback_preview_link/src/Plugin/Validation/Constraint/SilverbackPreviewLinkEntitiesUniqueConstraint.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\silverback_preview_link\Plugin\Validation\Constraint;
-
-use Symfony\Component\Validator\Constraint;
-
-/**
- * Ensures each entity is referenced at most once.
- *
- * @Constraint(
- *   id = "SilverbackPreviewLinkEntitiesUniqueConstraint",
- *   label = @Translation("Validates referenced value uniqueness", context = "Validation"),
- * )
- */
-class SilverbackPreviewLinkEntitiesUniqueConstraint extends Constraint {
-
-  /**
-   * Violation message for when an entity is referenced multiple times.
-   *
-   * @var string
-   */
-  public $multipleReferences = '%entity_type is already referenced by item #%other_delta.';
-
-}
diff --git a/packages/drupal/silverback_preview_link/src/Plugin/Validation/Constraint/SilverbackPreviewLinkEntitiesUniqueConstraintValidator.php b/packages/drupal/silverback_preview_link/src/Plugin/Validation/Constraint/SilverbackPreviewLinkEntitiesUniqueConstraintValidator.php
deleted file mode 100644
index 1e8e5014e..000000000
--- a/packages/drupal/silverback_preview_link/src/Plugin/Validation/Constraint/SilverbackPreviewLinkEntitiesUniqueConstraintValidator.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\silverback_preview_link\Plugin\Validation\Constraint;
-
-use Drupal\dynamic_entity_reference\Plugin\Field\FieldType\DynamicEntityReferenceFieldItemList;
-use Drupal\dynamic_entity_reference\Plugin\Field\FieldType\DynamicEntityReferenceItem;
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-
-/**
- * Validates the SilverbackPreviewLinkEntitiesUniqueConstraint constraint.
- */
-class SilverbackPreviewLinkEntitiesUniqueConstraintValidator extends ConstraintValidator {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validate($value, Constraint $constraint): void {
-    assert($constraint instanceof SilverbackPreviewLinkEntitiesUniqueConstraint);
-    assert($value instanceof DynamicEntityReferenceFieldItemList);
-
-    $entities = [];
-    foreach ($value as $delta => $item) {
-      assert($item instanceof DynamicEntityReferenceItem);
-      $entity = $item->entity;
-      $hash = $item->target_type . '|' . $item->target_id;
-      $duplicateDelta = array_search($hash, $entities, TRUE);
-      if ($duplicateDelta !== FALSE) {
-        $this->context
-          ->buildViolation($constraint->multipleReferences)
-          ->setParameter('%entity_type', $entity !== NULL ? $entity->getEntityType()->getSingularLabel() : $item->target_type)
-          ->setParameter('%other_delta', (string) ($duplicateDelta + 1))
-          ->atPath((string) $delta)
-          ->addViolation();
-      }
-      else {
-        $entities[$delta] = $hash;
-      }
-    }
-  }
-
-}
diff --git a/packages/drupal/silverback_preview_link/src/PreviewLinkExpiry.php b/packages/drupal/silverback_preview_link/src/PreviewLinkExpiry.php
deleted file mode 100644
index 80417198d..000000000
--- a/packages/drupal/silverback_preview_link/src/PreviewLinkExpiry.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\silverback_preview_link;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-
-/**
- * Calculates link expiry time.
- */
-class PreviewLinkExpiry {
-
-  /**
-   * Default expiry time in seconds. This amounts to 7 days.
-   *
-   * @var int
-   */
-  const DEFAULT_EXPIRY_SECONDS = 86400;
-
-  /**
-   * Statically cache the lifetime.
-   *
-   * @var int|null
-   */
-  protected ?int $lifetime = NULL;
-
-  /**
-   * LinkExpiry constructor.
-   *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $configFactory
-   *   The configuration factory.
-   */
-  public function __construct(
-    protected ConfigFactoryInterface $configFactory,
-  ) {
-  }
-
-  /**
-   * Calculates default lifetime of a preview link.
-   *
-   * @return int
-   *   Lifetime in seconds.
-   *
-   * @phpstan-return int<0, max>
-   */
-  public function getLifetime(): int {
-    if (!isset($this->lifetime)) {
-      $config = $this->configFactory->get('silverback_preview_link.settings');
-      $this->lifetime = (int) ($config->get('expiry_seconds') ?: self::DEFAULT_EXPIRY_SECONDS);
-    }
-    return max(0, $this->lifetime);
-  }
-
-}
diff --git a/packages/drupal/silverback_preview_link/src/PreviewLinkHooks.php b/packages/drupal/silverback_preview_link/src/PreviewLinkHooks.php
deleted file mode 100644
index 5b8af06e2..000000000
--- a/packages/drupal/silverback_preview_link/src/PreviewLinkHooks.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\silverback_preview_link;
-
-use Drupal\Component\Datetime\TimeInterface;
-use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Drupal hooks.
- */
-class PreviewLinkHooks implements ContainerInjectionInterface {
-
-  /**
-   * PreviewLinkHooks constructor.
-   */
-  final public function __construct(
-    protected PreviewLinkStorageInterface $previewLinkStorage,
-    protected TimeInterface $time,
-  ) {
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    /** @var \Drupal\silverback_preview_link\PreviewLinkStorageInterface $storage */
-    $storage = $container->get('entity_type.manager')->getStorage('silverack_preview_link');
-    return new static(
-      $storage,
-      $container->get('datetime.time'),
-    );
-  }
-
-  /**
-   * Implements hook_cron().
-   *
-   * Cleans up expired Preview Links.
-   *
-   * @see \preview_link_cron()
-   */
-  public function cron(): void {
-    $ids = $this->previewLinkStorage->getQuery()
-      ->accessCheck(FALSE)
-      ->condition('expiry', $this->time->getRequestTime(), '<')
-      ->execute();
-
-    // If there are no expired links then nothing to do.
-    if (count($ids) === 0) {
-      return;
-    }
-
-    $previewLinks = $this->previewLinkStorage->loadMultiple($ids);
-    // Simply delete the preview links. A new one will be regenerated at a later
-    // date as required.
-    $this->previewLinkStorage->delete($previewLinks);
-  }
-
-}
diff --git a/packages/drupal/silverback_preview_link/src/PreviewLinkHost.php b/packages/drupal/silverback_preview_link/src/PreviewLinkHost.php
deleted file mode 100644
index 10ed12165..000000000
--- a/packages/drupal/silverback_preview_link/src/PreviewLinkHost.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\silverback_preview_link;
-
-use Drupal\Component\Datetime\TimeInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\silverback_preview_link\PreviewLinkStorageInterface;
-
-/**
- * Service for relationships between preview links and entities they unlock.
- */
-class PreviewLinkHost implements PreviewLinkHostInterface {
-
-  protected PreviewLinkStorageInterface $previewLinkStorage;
-
-  /**
-   * PreviewLinkHost constructor.
-   */
-  final public function __construct(
-    EntityTypeManagerInterface $entityTypeManager,
-    protected TimeInterface $time,
-  ) {
-    /** @var \Drupal\silverback_preview_link\PreviewLinkStorageInterface $storage */
-    $storage = $entityTypeManager->getStorage('silverback_preview_link');
-    $this->previewLinkStorage = $storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPreviewLinks(EntityInterface $entity): array {
-    $ids = $this->previewLinkStorage->getQuery()
-      ->accessCheck()
-      ->condition('entities.target_type', $entity->getEntityTypeId())
-      ->condition('entities.target_id', $entity->id())
-      ->execute();
-    return $this->previewLinkStorage->loadMultiple($ids);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isToken(EntityInterface $entity, array $tokens): bool {
-    $count = $this->previewLinkStorage->getQuery()
-      ->accessCheck()
-      ->condition('entities.target_type', $entity->getEntityTypeId())
-      ->condition('entities.target_id', $entity->id())
-      ->condition('token', $tokens, 'IN')
-      ->count()
-      ->execute();
-    return $count > 0;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function hasPreviewLinks(EntityInterface $entity): bool {
-    $count = $this->previewLinkStorage->getQuery()
-      ->accessCheck()
-      ->condition('entities.target_type', $entity->getEntityTypeId())
-      ->condition('entities.target_id', $entity->id())
-      ->condition('expiry', $this->time->getRequestTime(), '>')
-      ->count()
-      ->execute();
-    return $count > 0;
-  }
-
-}
diff --git a/packages/drupal/silverback_preview_link/src/PreviewLinkHostInterface.php b/packages/drupal/silverback_preview_link/src/PreviewLinkHostInterface.php
deleted file mode 100644
index aebdc16a9..000000000
--- a/packages/drupal/silverback_preview_link/src/PreviewLinkHostInterface.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\silverback_preview_link;
-
-use Drupal\Core\Entity\EntityInterface;
-
-/**
- * Interface for relationships between preview links and entities they unlock.
- */
-interface PreviewLinkHostInterface {
-
-  /**
-   * Get preview links for an entity.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   An entity.
-   *
-   * @return \Drupal\silverback_preview_link\Entity\SilverbackPreviewLinkInterface[]
-   *   Preview links associated with an entity.
-   */
-  public function getPreviewLinks(EntityInterface $entity): array;
-
-  /**
-   * Determines if a token unlocks an entity.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   An entity.
-   * @param string[] $tokens
-   *   An array of Preview Link tokens.
-   *
-   * @return bool
-   *   Whether if at least one provided token grants access to the entity.
-   */
-  public function isToken(EntityInterface $entity, array $tokens): bool;
-
-  /**
-   * Determines if an entity has any active preview links.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   An entity.
-   *
-   * @return bool
-   *   Whether the entity has any associated preview links.
-   */
-  public function hasPreviewLinks(EntityInterface $entity): bool;
-
-}
diff --git a/packages/drupal/silverback_preview_link/src/PreviewLinkStorage.php b/packages/drupal/silverback_preview_link/src/PreviewLinkStorage.php
deleted file mode 100644
index da77792eb..000000000
--- a/packages/drupal/silverback_preview_link/src/PreviewLinkStorage.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\silverback_preview_link;
-
-use Drupal\Component\Datetime\TimeInterface;
-use Drupal\Component\Uuid\UuidInterface;
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Cache\MemoryCache\MemoryCacheInterface;
-use Drupal\Core\Database\Connection;
-use Drupal\Core\Entity\EntityFieldManagerInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
-use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\silverback_preview_link\Entity\SilverbackPreviewLinkInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Preview Link entity storage.
- */
-final class PreviewLinkStorage extends SqlContentEntityStorage implements PreviewLinkStorageInterface {
-
-  /**
-   * Constructs a new PreviewLinkStorage.
-   */
-  public function __construct(
-    EntityTypeInterface $entity_type,
-    Connection $database,
-    EntityFieldManagerInterface $entity_field_manager,
-    CacheBackendInterface $cache,
-    LanguageManagerInterface $language_manager,
-    MemoryCacheInterface $memory_cache,
-    EntityTypeBundleInfoInterface $entity_type_bundle_info,
-    EntityTypeManagerInterface $entity_type_manager,
-    UuidInterface $uuid,
-    protected TimeInterface $time,
-  ) {
-    parent::__construct($entity_type, $database, $entity_field_manager, $cache, $language_manager, $memory_cache, $entity_type_bundle_info, $entity_type_manager);
-    $this->uuidService = $uuid;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type): self {
-    return new static(
-      $entity_type,
-      $container->get('database'),
-      $container->get('entity_field.manager'),
-      $container->get('cache.entity'),
-      $container->get('language_manager'),
-      $container->get('entity.memory_cache'),
-      $container->get('entity_type.bundle.info'),
-      $container->get('entity_type.manager'),
-      $container->get('uuid'),
-      $container->get('datetime.time'),
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function create(array $values = []) {
-    return parent::create($values + [
-      'token' => $this->generateUniqueToken(),
-      'generated_timestamp' => $this->time->getRequestTime(),
-    ]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save(EntityInterface $entity) {
-    assert($entity instanceof SilverbackPreviewLinkInterface);
-    if ($entity->regenerateToken()) {
-      $entity->setToken($this->generateUniqueToken());
-    }
-    return parent::save($entity);
-  }
-
-  /**
-   * Gets the unique token for the link.
-   *
-   * This token is unique every time we generate a link, there is nothing
-   * from the original entity involved in the token so it does not need to be
-   * cryptographically secure, only sufficiently random which UUID is.
-   *
-   * @return string
-   *   A unique identifier for this preview link.
-   */
-  protected function generateUniqueToken(): string {
-    return $this->uuidService->generate();
-  }
-
-}
diff --git a/packages/drupal/silverback_preview_link/src/PreviewLinkStorageInterface.php b/packages/drupal/silverback_preview_link/src/PreviewLinkStorageInterface.php
deleted file mode 100644
index 81a59e582..000000000
--- a/packages/drupal/silverback_preview_link/src/PreviewLinkStorageInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\silverback_preview_link;
-
-use Drupal\Core\Entity\Sql\SqlEntityStorageInterface;
-use Drupal\silverback_preview_link\Entity\SilverbackPreviewLinkInterface;
-
-/**
- * Interface for Preview Link entities.
- *
- * @method \Drupal\silverback_preview_link\Entity\SilverbackPreviewLinkInterface[] loadMultiple(array $ids = NULL)
- * @method \Drupal\silverback_preview_link\Entity\SilverbackPreviewLinkInterface create(array $values = [])
- * @method int save(SilverbackPreviewLinkInterface $entity)
- */
-interface PreviewLinkStorageInterface extends SqlEntityStorageInterface {
-
-}
diff --git a/packages/drupal/silverback_preview_link/src/PreviewLinkUtility.php b/packages/drupal/silverback_preview_link/src/PreviewLinkUtility.php
deleted file mode 100644
index e2a368e79..000000000
--- a/packages/drupal/silverback_preview_link/src/PreviewLinkUtility.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\silverback_preview_link;
-
-use Drupal\Core\Entity\EntityTypeInterface;
-
-/**
- * Preview link utility.
- */
-class PreviewLinkUtility {
-
-  /**
-   * Determines if an entity type is supported by Preview Link.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entityType
-   *   An entity type.
-   *
-   * @return bool
-   *   Whether an entity type is supported by Preview Link.
-   */
-  public static function isEntityTypeSupported(EntityTypeInterface $entityType): bool {
-    return $entityType->isRevisionable() && $entityType->hasLinkTemplate('canonical');
-  }
-
-}
diff --git a/packages/drupal/silverback_preview_link/src/Routing/PreviewLinkRouteProvider.php b/packages/drupal/silverback_preview_link/src/Routing/PreviewLinkRouteProvider.php
deleted file mode 100644
index 6f87611a6..000000000
--- a/packages/drupal/silverback_preview_link/src/Routing/PreviewLinkRouteProvider.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-namespace Drupal\silverback_preview_link\Routing;
-
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Entity\Routing\EntityRouteProviderInterface;
-use Symfony\Component\Routing\Route;
-use Symfony\Component\Routing\RouteCollection;
-
-/**
- * Preview Link route provider.
- */
-class PreviewLinkRouteProvider implements EntityRouteProviderInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRoutes(EntityTypeInterface $entity_type) {
-    $collection = new RouteCollection();
-
-    $generateRoute = $this->getGeneratePreviewLinkRoute($entity_type);
-    if ($generateRoute !== NULL) {
-      $entity_type_id = $entity_type->id();
-      $collection->add("entity.{$entity_type_id}.silverback_preview_link_generate", $generateRoute);
-    }
-
-    return $collection;
-  }
-
-  /**
-   * Gets the route for generating and viewing preview links for this entity.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type.
-   *
-   * @return \Symfony\Component\Routing\Route|null
-   *   The generated route, if available.
-   */
-  protected function getGeneratePreviewLinkRoute(EntityTypeInterface $entity_type): ?Route {
-    $entity_type_id = $entity_type->id();
-    $route = new Route($entity_type->getLinkTemplate('preview-link-generate'));
-
-    $route
-      ->setDefaults([
-        '_entity_form' => "silverback_preview_link.silverback_preview_link",
-        '_title' => 'Share preview',
-      ])
-      ->setRequirement('_permission', 'generate silverback preview links')
-      ->setRequirement('_access_preview_enabled', 'TRUE')
-      ->setOption('silverback_preview_link.entity_type_id', $entity_type_id)
-      ->setOption('_admin_route', TRUE)
-      ->setOption('parameters', [
-        $entity_type_id => ['type' => 'entity:' . $entity_type_id],
-      ]);
-
-    return $route;
-  }
-
-}
diff --git a/packages/drupal/silverback_preview_link/templates/preview-link.html.twig b/packages/drupal/silverback_preview_link/templates/preview-link.html.twig
deleted file mode 100644
index b848a082e..000000000
--- a/packages/drupal/silverback_preview_link/templates/preview-link.html.twig
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="preview-link">
-  <h2 class="preview-link__title hidden">{{ title }}</h2>
-  <p>{{ link_description }}</p>
-  {% if preview_url is not empty %}
-    <p><strong class="preview-link__link"><a href="{{ preview_url }}" target="_blank">{{ preview_url }}</a></strong></p>
-  {% endif %}
-  <p>{{ actions_description }}</p>
-</div>

From c4f689793da2103ac20ef37633f2a75ad9ed6401 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 5 Jul 2024 14:53:11 +0200
Subject: [PATCH 048/100] feat(SLB-416): silverback_preview_link config

---
 apps/cms/config/sync/silverback_preview_link.settings.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 apps/cms/config/sync/silverback_preview_link.settings.yml

diff --git a/apps/cms/config/sync/silverback_preview_link.settings.yml b/apps/cms/config/sync/silverback_preview_link.settings.yml
new file mode 100644
index 000000000..0974bf8db
--- /dev/null
+++ b/apps/cms/config/sync/silverback_preview_link.settings.yml
@@ -0,0 +1,6 @@
+_core:
+  default_config_hash: XAotqrdAEia8K6UQBOR89_AxeqJJ4Q2ovs2Hx0Ro1xg
+enabled_entity_types:
+  node: {  }
+expiry_seconds: 86400
+multiple_entities: false

From bfc63eb4c9c62e07728518635fda908ae7141090 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 5 Jul 2024 14:53:55 +0200
Subject: [PATCH 049/100] feat(SLB-416): enable silverback_preview_link

---
 apps/cms/config/sync/core.extension.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/cms/config/sync/core.extension.yml b/apps/cms/config/sync/core.extension.yml
index cc8d50cfd..dc3a3f2fe 100644
--- a/apps/cms/config/sync/core.extension.yml
+++ b/apps/cms/config/sync/core.extension.yml
@@ -20,6 +20,7 @@ module:
   dblog: 0
   default_content: 0
   dropzonejs: 0
+  dynamic_entity_reference: 0
   dynamic_page_cache: 0
   editor: 0
   entity_create_split: 0
@@ -71,6 +72,7 @@ module:
   silverback_graphql_persisted: 0
   silverback_gutenberg: 0
   silverback_iframe: 0
+  silverback_preview_link: 0
   silverback_publisher_monitor: 0
   silverback_translations: 0
   simple_oauth: 0

From 4434c6c8d27803ee52c3844edaab41ac053c7e10 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 5 Jul 2024 15:33:20 +0200
Subject: [PATCH 050/100] chore(SLB-416): fix conflicts with rsc changes

---
 .../src/components/Routes/Preview.stories.tsx   | 17 ++++++++++-------
 packages/ui/src/components/Routes/Preview.tsx   |  8 ++++----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/packages/ui/src/components/Routes/Preview.stories.tsx b/packages/ui/src/components/Routes/Preview.stories.tsx
index 53bb972cd..8dc453dd1 100644
--- a/packages/ui/src/components/Routes/Preview.stories.tsx
+++ b/packages/ui/src/components/Routes/Preview.stories.tsx
@@ -1,7 +1,7 @@
 import {
   FrameQuery,
   Locale,
-  OperationExecutor,
+  OperationExecutorsProvider,
   PreviewDrupalPageQuery,
   Url,
 } from '@custom/schema';
@@ -26,16 +26,19 @@ export default {
 export const Default = {
   render: (args) => {
     return (
-      <OperationExecutor executor={() => args} id={PreviewDrupalPageQuery}>
-        <OperationExecutor executor={FrameStory.args} id={FrameQuery}>
-          <Preview />
-        </OperationExecutor>
-      </OperationExecutor>
+      <OperationExecutorsProvider
+        executors={[
+          { executor: args, id: PreviewDrupalPageQuery },
+          { id: FrameQuery, executor: FrameStory.args },
+        ]}
+      >
+        <Preview />
+      </OperationExecutorsProvider>
     );
   },
   args: {
     preview: {
-      title: 'Page Title',
+      title: 'Preview Page Title',
       locale: 'en',
       translations: [
         {
diff --git a/packages/ui/src/components/Routes/Preview.tsx b/packages/ui/src/components/Routes/Preview.tsx
index f731d4a81..c3b206edd 100644
--- a/packages/ui/src/components/Routes/Preview.tsx
+++ b/packages/ui/src/components/Routes/Preview.tsx
@@ -1,16 +1,16 @@
 'use client';
+import type { OperationVariables } from '@custom/schema';
 import {
-  OperationVariables,
-  Url,
-  Locale,
   PreviewDrupalPageQuery,
   useLocation,
+  Locale,
+  Url,
 } from '@custom/schema';
 import React from 'react';
 
 import { clear, useOperation } from '../../utils/operation';
 import { PageDisplay } from '../Organisms/PageDisplay';
-import { useIntl } from 'react-intl';
+import { useIntl } from '@amazeelabs/react-intl';
 
 function usePreviewParameters(): OperationVariables<
   typeof PreviewDrupalPageQuery

From e13dbd6f767e2601df2068d3a159edb7e6692f47 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 5 Jul 2024 16:53:07 +0200
Subject: [PATCH 051/100] refactor(SLB-442): do not filter options based on
 screen size

---
 packages/drupal/gutenberg_blocks/src/preview.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/drupal/gutenberg_blocks/src/preview.ts b/packages/drupal/gutenberg_blocks/src/preview.ts
index a99e39dc4..843d48f5a 100644
--- a/packages/drupal/gutenberg_blocks/src/preview.ts
+++ b/packages/drupal/gutenberg_blocks/src/preview.ts
@@ -40,10 +40,8 @@
             const getPreviewSelect = () => {
               let previewSelect = '<select class="external-preview">';
               previewSizes.forEach((size) => {
-                if (size.width <= window.screen.width) {
-                  const selectOption = `<option value="${size.id}">${size.label} (${size.width} x ${size.height})</option>`;
-                  previewSelect += selectOption;
-                }
+                const selectOption = `<option value="${size.id}">${size.label} (${size.width} x ${size.height})</option>`;
+                previewSelect += selectOption;
               });
               previewSelect += '</select>';
               return previewSelect;

From bc6ce31a1ceb46369ef427aefa77e3657360cb8f Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 5 Jul 2024 18:12:31 +0200
Subject: [PATCH 052/100] fix(SLB-446): open preview in multiple windows

---
 packages/drupal/gutenberg_blocks/src/preview.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/drupal/gutenberg_blocks/src/preview.ts b/packages/drupal/gutenberg_blocks/src/preview.ts
index 843d48f5a..3b659adf8 100644
--- a/packages/drupal/gutenberg_blocks/src/preview.ts
+++ b/packages/drupal/gutenberg_blocks/src/preview.ts
@@ -115,6 +115,7 @@
                   if (!size) {
                     return;
                   }
+                  $previewButton.data('windowTarget', size.id);
                   $previewButton.data('windowHeight', size.height);
                   $previewButton.data('windowWidth', size.width);
                 })
@@ -123,8 +124,9 @@
                 const target = $(event.target);
                 const windowWidth = target.data('windowWidth');
                 const windowHeight = target.data('windowHeight');
+                const windowTarget = target.data('windowTarget');
                 const windowFeatures = `resizable,height=${windowHeight},width=${windowWidth}`;
-                window.open(previewUrl, 'preview', windowFeatures);
+                window.open(previewUrl, windowTarget, windowFeatures);
               });
             } else {
               $('.drupal-preview-sidebar').remove();

From 972b9de6ce217787fd5adf496471ea802e0127eb Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 5 Jul 2024 18:47:17 +0200
Subject: [PATCH 053/100] refactor(SLB-416): adjust dialog height for qr code

---
 packages/drupal/gutenberg_blocks/src/preview.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/drupal/gutenberg_blocks/src/preview.ts b/packages/drupal/gutenberg_blocks/src/preview.ts
index 3b659adf8..b5d8bb001 100644
--- a/packages/drupal/gutenberg_blocks/src/preview.ts
+++ b/packages/drupal/gutenberg_blocks/src/preview.ts
@@ -52,7 +52,7 @@
               class="components-external-link components-button share-preview use-ajax" 
               href="${drupalSettings.preview.previewTokenUrl}"
               data-dialog-type="modal"
-              data-dialog-options="{&quot;width&quot;:550,&quot;height&quot;:500}" 
+              data-dialog-options="{&quot;width&quot;:550,&quot;height&quot;:570}" 
               rel="external noreferrer noopener">
                 ${Drupal.t('Share preview')}<span class="components-visually-hidden">${Drupal.t('(opens in a new tab)')}</span>
                 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="components-external-link__icon css-6wogo1-StyledIcon etxm6pv0" role="img" aria-hidden="true" focusable="false">

From dc44c0ae823950205606c1f609f103ea8b48c2f4 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 12 Jul 2024 15:21:54 +0200
Subject: [PATCH 054/100] feat(SLB-416): add silverback_preview_link

---
 apps/cms/composer.json |   1 +
 apps/cms/composer.lock | 254 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 255 insertions(+)

diff --git a/apps/cms/composer.json b/apps/cms/composer.json
index 895c30606..363d9dd75 100644
--- a/apps/cms/composer.json
+++ b/apps/cms/composer.json
@@ -44,6 +44,7 @@
     "amazeelabs/silverback_gutenberg": "^2.4.8",
     "amazeelabs/silverback_iframe": "^1.3.5",
     "amazeelabs/silverback_iframe_theme": "^1.3.0",
+    "amazeelabs/silverback_preview_link": "^1.1",
     "amazeelabs/silverback_publisher_monitor": "^2.3.2",
     "amazeelabs/silverback_translations": "^1.0.4",
     "composer/installers": "^2.2",
diff --git a/apps/cms/composer.lock b/apps/cms/composer.lock
index e5b22c35c..b48ffebab 100644
--- a/apps/cms/composer.lock
+++ b/apps/cms/composer.lock
@@ -603,6 +603,38 @@
             },
             "time": "2024-01-26T16:14:08+00:00"
         },
+        {
+            "name": "amazeelabs/silverback_preview_link",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/AmazeeLabs/silverback_preview_link.git",
+                "reference": "8ff2d79b21618c450d83256e91d23c769caa8894"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/AmazeeLabs/silverback_preview_link/zipball/8ff2d79b21618c450d83256e91d23c769caa8894",
+                "reference": "8ff2d79b21618c450d83256e91d23c769caa8894",
+                "shasum": ""
+            },
+            "require": {
+                "chillerlan/php-qrcode": "^5",
+                "drupal/dynamic_entity_reference": "^3 || ^4",
+                "php": ">=8.2"
+            },
+            "type": "drupal-module",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "description": "Decoupled preview with access token.",
+            "homepage": "https://github.com/AmazeeLabs/silverback-mono/tree/development/packages/composer/amazeelabs/silverback_preview_link#readme",
+            "support": {
+                "issues": "https://github.com/AmazeeLabs/silverback_preview_link/issues",
+                "source": "https://github.com/AmazeeLabs/silverback_preview_link/tree/1.1.1"
+            },
+            "time": "2024-07-12T03:43:45+00:00"
+        },
         {
             "name": "amazeelabs/silverback_publisher_monitor",
             "version": "2.3.12",
@@ -773,6 +805,165 @@
             },
             "time": "2023-10-21T12:57:05+00:00"
         },
+        {
+            "name": "chillerlan/php-qrcode",
+            "version": "5.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/chillerlan/php-qrcode.git",
+                "reference": "da5bdb82c8755f54de112b271b402aaa8df53269"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/da5bdb82c8755f54de112b271b402aaa8df53269",
+                "reference": "da5bdb82c8755f54de112b271b402aaa8df53269",
+                "shasum": ""
+            },
+            "require": {
+                "chillerlan/php-settings-container": "^2.1.4 || ^3.1",
+                "ext-mbstring": "*",
+                "php": "^7.4 || ^8.0"
+            },
+            "require-dev": {
+                "chillerlan/php-authenticator": "^4.1 || ^5.1",
+                "phan/phan": "^5.4",
+                "phpmd/phpmd": "^2.15",
+                "phpunit/phpunit": "^9.6",
+                "setasign/fpdf": "^1.8.2",
+                "squizlabs/php_codesniffer": "^3.8"
+            },
+            "suggest": {
+                "chillerlan/php-authenticator": "Yet another Google authenticator! Also creates URIs for mobile apps.",
+                "setasign/fpdf": "Required to use the QR FPDF output.",
+                "simple-icons/simple-icons": "SVG icons that you can use to embed as logos in the QR Code"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "chillerlan\\QRCode\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT",
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Kazuhiko Arase",
+                    "homepage": "https://github.com/kazuhikoarase/qrcode-generator"
+                },
+                {
+                    "name": "ZXing Authors",
+                    "homepage": "https://github.com/zxing/zxing"
+                },
+                {
+                    "name": "Ashot Khanamiryan",
+                    "homepage": "https://github.com/khanamiryan/php-qrcode-detector-decoder"
+                },
+                {
+                    "name": "Smiley",
+                    "email": "smiley@chillerlan.net",
+                    "homepage": "https://github.com/codemasher"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/chillerlan/php-qrcode/graphs/contributors"
+                }
+            ],
+            "description": "A QR code generator and reader with a user friendly API. PHP 7.4+",
+            "homepage": "https://github.com/chillerlan/php-qrcode",
+            "keywords": [
+                "phpqrcode",
+                "qr",
+                "qr code",
+                "qr-reader",
+                "qrcode",
+                "qrcode-generator",
+                "qrcode-reader"
+            ],
+            "support": {
+                "docs": "https://php-qrcode.readthedocs.io",
+                "issues": "https://github.com/chillerlan/php-qrcode/issues",
+                "source": "https://github.com/chillerlan/php-qrcode"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.com/donate?hosted_button_id=WLYUNAT9ZTJZ4",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://ko-fi.com/codemasher",
+                    "type": "ko_fi"
+                }
+            ],
+            "time": "2024-02-27T14:37:26+00:00"
+        },
+        {
+            "name": "chillerlan/php-settings-container",
+            "version": "3.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/chillerlan/php-settings-container.git",
+                "reference": "8f93648fac8e6bacac8e00a8d325eba4950295e6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/chillerlan/php-settings-container/zipball/8f93648fac8e6bacac8e00a8d325eba4950295e6",
+                "reference": "8f93648fac8e6bacac8e00a8d325eba4950295e6",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "phan/phan": "^5.4",
+                "phpmd/phpmd": "^2.15",
+                "phpunit/phpunit": "^10.5",
+                "squizlabs/php_codesniffer": "^3.9"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "chillerlan\\Settings\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Smiley",
+                    "email": "smiley@chillerlan.net",
+                    "homepage": "https://github.com/codemasher"
+                }
+            ],
+            "description": "A container class for immutable settings objects. Not a DI container.",
+            "homepage": "https://github.com/chillerlan/php-settings-container",
+            "keywords": [
+                "Settings",
+                "configuration",
+                "container",
+                "helper"
+            ],
+            "support": {
+                "issues": "https://github.com/chillerlan/php-settings-container/issues",
+                "source": "https://github.com/chillerlan/php-settings-container"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.com/donate?hosted_button_id=WLYUNAT9ZTJZ4",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://ko-fi.com/codemasher",
+                    "type": "ko_fi"
+                }
+            ],
+            "time": "2024-03-02T20:07:15+00:00"
+        },
         {
             "name": "cloudinary/cloudinary_php",
             "version": "2.12.0",
@@ -2956,6 +3147,69 @@
                 "#media": "http://drupal.slack.com"
             }
         },
+        {
+            "name": "drupal/dynamic_entity_reference",
+            "version": "3.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/dynamic_entity_reference.git",
+                "reference": "3.2.0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/dynamic_entity_reference-3.2.0.zip",
+                "reference": "3.2.0",
+                "shasum": "a265f7f0723fb085bd729e7624d644475900cf94"
+            },
+            "require": {
+                "drupal/core": "^10 || ^11",
+                "php": ">=8.1"
+            },
+            "require-dev": {
+                "drupal/diff": "*",
+                "mglaman/phpstan-drupal": "^1.1",
+                "phpstan/phpstan": "^1.1",
+                "phpstan/phpstan-deprecation-rules": "^1.0"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "drupal": {
+                    "version": "3.2.0",
+                    "datestamp": "1706486865",
+                    "security-coverage": {
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Lee Rowlands",
+                    "homepage": "https://www.drupal.org/u/larowlan",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Jibran Ijaz",
+                    "homepage": "https://www.drupal.org/u/jibran",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "larowlan",
+                    "homepage": "https://www.drupal.org/user/395439"
+                }
+            ],
+            "description": "Provides a field that allows an entity-reference field to reference more than one entity type.",
+            "homepage": "http://drupal.org/project/dynamic_entity_reference",
+            "support": {
+                "source": "http://cgit.drupalcode.org/dynamic_entity_reference",
+                "issues": "http://drupal.org/project/dynamic_entity_reference",
+                "irc": "irc://irc.freenode.org/drupal-contribute"
+            }
+        },
         {
             "name": "drupal/entity_usage",
             "version": "2.0.0-beta12",

From 8f1df4da4ce4e6bdcdbd9c995871c2c543f78776 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 12 Jul 2024 15:30:41 +0200
Subject: [PATCH 055/100] feat(SLB-416): bump silverback_autosave,
 silverback_gatsby

---
 apps/cms/composer.json              |  3 ---
 apps/cms/composer.lock              | 12 ++++-----
 apps/cms/patches/fetch-entity.patch | 40 -----------------------------
 3 files changed, 6 insertions(+), 49 deletions(-)
 delete mode 100644 apps/cms/patches/fetch-entity.patch

diff --git a/apps/cms/composer.json b/apps/cms/composer.json
index 363d9dd75..038ffbe81 100644
--- a/apps/cms/composer.json
+++ b/apps/cms/composer.json
@@ -104,9 +104,6 @@
       "drupal/userprotect": {
         "Fix site install": "https://www.drupal.org/files/issues/2023-07-28/3349663-8.patch"
       },
-      "amazeelabs/silverback_gatsby": {
-        "Autosave preview": "./patches/fetch-entity.patch"
-      },
       "drupal/gutenberg": {
         "Gutenberg enabled hook": "https://www.drupal.org/files/issues/2024-05-07/gutenberg_enabled_hook_3445677-2.patch",
         "Remove !important from sidebar": "./patches/gutenberg_remove-important-sidebar.patch"
diff --git a/apps/cms/composer.lock b/apps/cms/composer.lock
index b48ffebab..e2d57bde4 100644
--- a/apps/cms/composer.lock
+++ b/apps/cms/composer.lock
@@ -345,16 +345,16 @@
         },
         {
             "name": "amazeelabs/silverback_autosave",
-            "version": "1.2.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/AmazeeLabs/silverback_autosave.git",
-                "reference": "8208ddba6d5da916bf5649b7e0e53efdf491bb7a"
+                "reference": "c65e743f64c96598aec3b8bf1874cc2fd31fd534"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/AmazeeLabs/silverback_autosave/zipball/8208ddba6d5da916bf5649b7e0e53efdf491bb7a",
-                "reference": "8208ddba6d5da916bf5649b7e0e53efdf491bb7a",
+                "url": "https://api.github.com/repos/AmazeeLabs/silverback_autosave/zipball/c65e743f64c96598aec3b8bf1874cc2fd31fd534",
+                "reference": "c65e743f64c96598aec3b8bf1874cc2fd31fd534",
                 "shasum": ""
             },
             "type": "drupal-module",
@@ -365,9 +365,9 @@
             "description": "Adds autosave feature on forms.",
             "support": {
                 "issues": "https://github.com/AmazeeLabs/silverback_autosave/issues",
-                "source": "https://github.com/AmazeeLabs/silverback_autosave/tree/1.2.0"
+                "source": "https://github.com/AmazeeLabs/silverback_autosave/tree/1.3.0"
             },
-            "time": "2024-04-25T13:14:00+00:00"
+            "time": "2024-07-11T08:04:07+00:00"
         },
         {
             "name": "amazeelabs/silverback_campaign_urls",
diff --git a/apps/cms/patches/fetch-entity.patch b/apps/cms/patches/fetch-entity.patch
deleted file mode 100644
index b3a5aeaba..000000000
--- a/apps/cms/patches/fetch-entity.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/Plugin/GraphQL/DataProducer/FetchEntity.php b/src/Plugin/GraphQL/DataProducer/FetchEntity.php
-index ffef6a8..7c84154 100644
---- a/src/Plugin/GraphQL/DataProducer/FetchEntity.php
-+++ b/src/Plugin/GraphQL/DataProducer/FetchEntity.php
-@@ -250,6 +250,35 @@ class FetchEntity extends DataProducerPluginBase implements ContainerFactoryPlug
-         }
-       }
- 
-+      // Autosave: get autosaved values.
-+      if (\Drupal::service('module_handler')->moduleExists('silverback_autosave')) {
-+        $context->mergeCacheMaxAge(0);
-+        // @todo Add DI to both.
-+        $service = \Drupal::service('silverback_autosave.entity_form_storage');
-+        /**
-+         * Quick and dirty because this causes leaked metadata error.
-+         * $entityForm = \Drupal::service('entity.form_builder')->getForm($entity, 'edit');
-+         * $form_id = $entityForm['form_id']['#value'];
-+         */
-+         $form_id = "{$entity->getEntityTypeId()}_{$entity->bundle()}_edit_form";
-+         $autosaved_state = $service->getEntityAndFormState($form_id, $entity->getEntityTypeId(), $entity->id(), $entity->language()->getId(), \Drupal::currentUser()->id());
-+         /** @var \Drupal\Core\Entity\EntityInterface $autosaved_entity */
-+        $autosaved_entity = $autosaved_state['entity'] ?? NULL;
-+        /** @var \Drupal\Core\Form\FormStateInterface $autosaved_form_state */
-+        $autosaved_form_state = $autosaved_state['form_state'] ?? [];
-+        if ($autosaved_entity && !empty($autosaved_form_state)) {
-+          $current_user_input = $autosaved_form_state->getUserInput();
-+          foreach ($autosaved_entity->getFields() as $name => $field) {
-+            if (in_array($name, ['title', 'body']) || str_starts_with($name, 'field_')) {
-+              if (isset($current_user_input[$name])) {
-+                $field->setValue($current_user_input[$name]);
-+              }
-+            }
-+          }
-+          return $autosaved_entity;
-+        }
-+      }
-+
-       return $entity;
-     });
-   }

From f77e382ad99f7a774ed95cb383471306263ee097 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 12 Jul 2024 17:57:40 +0200
Subject: [PATCH 056/100] chore(SLB-416): pretty graphql

---
 .../src/operations/PreviewDrupalPage.gql       | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/schema/src/operations/PreviewDrupalPage.gql b/packages/schema/src/operations/PreviewDrupalPage.gql
index 852365960..bc7636771 100644
--- a/packages/schema/src/operations/PreviewDrupalPage.gql
+++ b/packages/schema/src/operations/PreviewDrupalPage.gql
@@ -1,10 +1,16 @@
-query PreviewDrupalPage($id: ID!, $rid: ID, $locale: String!, $preview_user_id: ID, $preview_access_token: String) {
+query PreviewDrupalPage(
+  $id: ID!
+  $rid: ID
+  $locale: String!
+  $preview_user_id: ID
+  $preview_access_token: String
+) {
   preview: previewDrupalPage(
-    id: $id,
-    rid: $rid,
-    locale: $locale,
-    preview_user_id: $preview_user_id,
-    preview_access_token: $preview_access_token,
+    id: $id
+    rid: $rid
+    locale: $locale
+    preview_user_id: $preview_user_id
+    preview_access_token: $preview_access_token
   ) {
     ...Page
   }

From 6dd8989e65b590b7628b32c56866ed2ab82bceb9 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 12 Jul 2024 18:05:27 +0200
Subject: [PATCH 057/100] chore(SLB-416): lintfix

---
 packages/ui/src/components/Routes/Preview.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/ui/src/components/Routes/Preview.tsx b/packages/ui/src/components/Routes/Preview.tsx
index c3b206edd..2d5a0f113 100644
--- a/packages/ui/src/components/Routes/Preview.tsx
+++ b/packages/ui/src/components/Routes/Preview.tsx
@@ -1,16 +1,16 @@
 'use client';
+import { useIntl } from '@amazeelabs/react-intl';
 import type { OperationVariables } from '@custom/schema';
 import {
-  PreviewDrupalPageQuery,
-  useLocation,
   Locale,
+  PreviewDrupalPageQuery,
   Url,
+  useLocation,
 } from '@custom/schema';
 import React from 'react';
 
 import { clear, useOperation } from '../../utils/operation';
 import { PageDisplay } from '../Organisms/PageDisplay';
-import { useIntl } from '@amazeelabs/react-intl';
 
 function usePreviewParameters(): OperationVariables<
   typeof PreviewDrupalPageQuery
@@ -70,7 +70,7 @@ export function Preview() {
             markup: `<p>${intl.formatMessage({
               defaultMessage:
                 'You do not have access to this page. Your access token might have expired.',
-              id: 'e7yFQY',
+              id: 'iAZszQ',
             })}</p>`,
           },
         ] as Exclude<PreviewDrupalPageQuery['preview'], undefined>['content'],

From cd5d257272706d99f25b5979f52959de33f0a34f Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 12 Jul 2024 19:55:11 +0200
Subject: [PATCH 058/100] fix(SLB-416): workaround language context

---
 packages/drupal/gutenberg_blocks/gutenberg_blocks.module | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/drupal/gutenberg_blocks/gutenberg_blocks.module b/packages/drupal/gutenberg_blocks/gutenberg_blocks.module
index dfa896614..045357faa 100644
--- a/packages/drupal/gutenberg_blocks/gutenberg_blocks.module
+++ b/packages/drupal/gutenberg_blocks/gutenberg_blocks.module
@@ -43,11 +43,12 @@ function gutenberg_blocks_form_node_form_alter(&$form, FormStateInterface $form_
     /** @var \Drupal\silverback_external_preview\ExternalPreviewLink $externalPreviewLink */
     $externalPreviewLink = \Drupal::service('silverback_external_preview.external_preview_link');
     $previewUrl = $externalPreviewLink->createPreviewUrlFromEntity($node)->toString();
+    $langcode = \Drupal::languageManager()->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)->getId();
     $form['#attached']['drupalSettings']['preview'] = [
       'previewUrl' => $previewUrl,
-      // Link template does not work out here, check why.
+      // @todo link template does not work out here, check why.
       //'previewTokenUrl' => $node->toUrl('preview-link-generate')->toString(),
-      'previewTokenUrl' => '/node/' . $node->id() . '/generate-preview-link',
+      'previewTokenUrl' => '/' . $langcode . '/node/' . $node->id() . '/generate-preview-link',
     ];
     $form['#attached']['library'][] = 'core/drupal.dialog.ajax';
 

From defcdcd10eefd60dc252bd27fcfe680e1ad5e3ed Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 12 Jul 2024 23:07:30 +0200
Subject: [PATCH 059/100] feat(SLB-416): error and load states

---
 packages/ui/src/components/Routes/Preview.tsx | 75 ++++++++++++-------
 1 file changed, 50 insertions(+), 25 deletions(-)

diff --git a/packages/ui/src/components/Routes/Preview.tsx b/packages/ui/src/components/Routes/Preview.tsx
index 2d5a0f113..27796d283 100644
--- a/packages/ui/src/components/Routes/Preview.tsx
+++ b/packages/ui/src/components/Routes/Preview.tsx
@@ -10,6 +10,7 @@ import {
 import React from 'react';
 
 import { clear, useOperation } from '../../utils/operation';
+import { Loading } from '../Molecules/Loading';
 import { PageDisplay } from '../Organisms/PageDisplay';
 
 function usePreviewParameters(): OperationVariables<
@@ -52,30 +53,54 @@ export function usePreviewRefresh() {
 }
 
 export function Preview() {
-  const { data } = useOperation(PreviewDrupalPageQuery, usePreviewParameters());
+  const { data, isLoading, error } = useOperation(
+    PreviewDrupalPageQuery,
+    usePreviewParameters(),
+  );
   const intl = useIntl();
-  if (data?.preview) {
-    return <PageDisplay {...data.preview} />;
-  } else {
-    // @todo: load this content from Drupal settings, create a ForbiddenPage component.
-    const data403 = {
-      preview: {
-        title: '403 Forbidden',
-        locale: 'en' as Locale,
-        translations: [],
-        path: '/403' as Url,
-        content: [
-          {
-            __typename: 'BlockMarkup',
-            markup: `<p>${intl.formatMessage({
-              defaultMessage:
-                'You do not have access to this page. Your access token might have expired.',
-              id: 'iAZszQ',
-            })}</p>`,
-          },
-        ] as Exclude<PreviewDrupalPageQuery['preview'], undefined>['content'],
-      },
-    };
-    return <PageDisplay {...data403.preview} />;
-  }
+  // @todo load this content from Drupal settings, create a ForbiddenPage component.
+  // @todo forward error from the backend.
+  const data403 = {
+    preview: {
+      title: '403 Forbidden',
+      locale: 'en' as Locale,
+      translations: [],
+      path: '/403' as Url,
+      content: [
+        {
+          __typename: 'BlockMarkup',
+          markup: `<p>${intl.formatMessage({
+            defaultMessage:
+              'You do not have access to this page. Your access token might have expired.',
+            id: 'iAZszQ',
+          })}</p>`,
+        },
+      ] as Exclude<PreviewDrupalPageQuery['preview'], undefined>['content'],
+    },
+  };
+  return (
+    <>
+      {error ? (
+        <div className="flex items-center justify-center">
+          <div className="my-8 px-3 py-1 text-xs font-medium leading-none text-center text-red-500 bg-red-100 rounded-full">
+            {error}
+          </div>
+        </div>
+      ) : (
+        <>
+          {isLoading ? (
+            <Loading />
+          ) : (
+            <>
+              {data?.preview ? (
+                <PageDisplay {...data.preview} />
+              ) : (
+                <PageDisplay {...data403.preview} />
+              )}
+            </>
+          )}
+        </>
+      )}
+    </>
+  );
 }

From 25b2c223e86be27ddb468c960cba29bb6c8f91bf Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 19 Jul 2024 14:20:38 +0200
Subject: [PATCH 060/100] chore(SLB-416): increase modal size for bigger QR and
 copy input

---
 packages/drupal/gutenberg_blocks/src/preview.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/drupal/gutenberg_blocks/src/preview.ts b/packages/drupal/gutenberg_blocks/src/preview.ts
index b5d8bb001..35e800c54 100644
--- a/packages/drupal/gutenberg_blocks/src/preview.ts
+++ b/packages/drupal/gutenberg_blocks/src/preview.ts
@@ -52,7 +52,7 @@
               class="components-external-link components-button share-preview use-ajax" 
               href="${drupalSettings.preview.previewTokenUrl}"
               data-dialog-type="modal"
-              data-dialog-options="{&quot;width&quot;:550,&quot;height&quot;:570}" 
+              data-dialog-options="{&quot;width&quot;:550,&quot;height&quot;:800}" 
               rel="external noreferrer noopener">
                 ${Drupal.t('Share preview')}<span class="components-visually-hidden">${Drupal.t('(opens in a new tab)')}</span>
                 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="components-external-link__icon css-6wogo1-StyledIcon etxm6pv0" role="img" aria-hidden="true" focusable="false">

From 6d2836cbd3b36a92f0f4e9f7dea558ffe7a10906 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 19 Jul 2024 15:19:17 +0200
Subject: [PATCH 061/100] test(SLB-416): toggle editor sidebar

---
 .../drupal/preview-editor-sidebar.spec.ts     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 tests/e2e/specs/drupal/preview-editor-sidebar.spec.ts

diff --git a/tests/e2e/specs/drupal/preview-editor-sidebar.spec.ts b/tests/e2e/specs/drupal/preview-editor-sidebar.spec.ts
new file mode 100644
index 000000000..c35288741
--- /dev/null
+++ b/tests/e2e/specs/drupal/preview-editor-sidebar.spec.ts
@@ -0,0 +1,21 @@
+import { expect, test } from '@playwright/test';
+
+import { cmsUrl } from '../../helpers/url';
+
+test.describe('instant preview - toggle editor sidebar', () => {
+  test.use({ storageState: '.auth/admin.json' });
+  test('toggle the preview editor sidebar', async ({ page }) => {
+    await page.goto(cmsUrl('/admin/content'));
+    await page.getByRole('link', { name: 'Add content' }).click();
+    await page
+      .getByLabel('Title', { exact: true })
+      .fill('Instant preview sidebar test');
+    await page.locator('#edit-submit').click();
+    await page.locator('#edit-preview-link').click();
+    await expect(page.locator('a').getByText('Share preview')).toBeVisible();
+    await page.locator('#edit-preview-link').click();
+    await expect(
+      page.locator('a').getByText('Share preview'),
+    ).not.toBeVisible();
+  });
+});

From 5a264bfcb782e56e0c119d859db63106597ddfd8 Mon Sep 17 00:00:00 2001
From: Philipp Melab <philipp.melab@gmail.com>
Date: Wed, 24 Jul 2024 16:41:52 +0200
Subject: [PATCH 062/100] chore: update silverback_preview_link

---
 apps/cms/composer.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/cms/composer.lock b/apps/cms/composer.lock
index e2d57bde4..8898b163e 100644
--- a/apps/cms/composer.lock
+++ b/apps/cms/composer.lock
@@ -605,16 +605,16 @@
         },
         {
             "name": "amazeelabs/silverback_preview_link",
-            "version": "1.1.1",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/AmazeeLabs/silverback_preview_link.git",
-                "reference": "8ff2d79b21618c450d83256e91d23c769caa8894"
+                "reference": "7b80175ca429aefbe7cc55d727f5dc7a48b7a7b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/AmazeeLabs/silverback_preview_link/zipball/8ff2d79b21618c450d83256e91d23c769caa8894",
-                "reference": "8ff2d79b21618c450d83256e91d23c769caa8894",
+                "url": "https://api.github.com/repos/AmazeeLabs/silverback_preview_link/zipball/7b80175ca429aefbe7cc55d727f5dc7a48b7a7b0",
+                "reference": "7b80175ca429aefbe7cc55d727f5dc7a48b7a7b0",
                 "shasum": ""
             },
             "require": {
@@ -631,9 +631,9 @@
             "homepage": "https://github.com/AmazeeLabs/silverback-mono/tree/development/packages/composer/amazeelabs/silverback_preview_link#readme",
             "support": {
                 "issues": "https://github.com/AmazeeLabs/silverback_preview_link/issues",
-                "source": "https://github.com/AmazeeLabs/silverback_preview_link/tree/1.1.1"
+                "source": "https://github.com/AmazeeLabs/silverback_preview_link/tree/1.2.0"
             },
-            "time": "2024-07-12T03:43:45+00:00"
+            "time": "2024-07-24T14:25:41+00:00"
         },
         {
             "name": "amazeelabs/silverback_publisher_monitor",

From 986882dcc536c2873bcf952a6b2100321be5a97e Mon Sep 17 00:00:00 2001
From: Philipp Melab <philipp.melab@gmail.com>
Date: Sat, 27 Jul 2024 16:18:42 +0200
Subject: [PATCH 063/100] fix: revert to unbraded qr code

---
 apps/cms/composer.json |  2 +-
 apps/cms/composer.lock | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/cms/composer.json b/apps/cms/composer.json
index 038ffbe81..ecf5e846c 100644
--- a/apps/cms/composer.json
+++ b/apps/cms/composer.json
@@ -44,7 +44,7 @@
     "amazeelabs/silverback_gutenberg": "^2.4.8",
     "amazeelabs/silverback_iframe": "^1.3.5",
     "amazeelabs/silverback_iframe_theme": "^1.3.0",
-    "amazeelabs/silverback_preview_link": "^1.1",
+    "amazeelabs/silverback_preview_link": "^1.5",
     "amazeelabs/silverback_publisher_monitor": "^2.3.2",
     "amazeelabs/silverback_translations": "^1.0.4",
     "composer/installers": "^2.2",
diff --git a/apps/cms/composer.lock b/apps/cms/composer.lock
index 8898b163e..36796b37e 100644
--- a/apps/cms/composer.lock
+++ b/apps/cms/composer.lock
@@ -605,16 +605,16 @@
         },
         {
             "name": "amazeelabs/silverback_preview_link",
-            "version": "1.2.0",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/AmazeeLabs/silverback_preview_link.git",
-                "reference": "7b80175ca429aefbe7cc55d727f5dc7a48b7a7b0"
+                "reference": "ed2063f95ae948dfe39ed31565d0ef5ac82c2281"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/AmazeeLabs/silverback_preview_link/zipball/7b80175ca429aefbe7cc55d727f5dc7a48b7a7b0",
-                "reference": "7b80175ca429aefbe7cc55d727f5dc7a48b7a7b0",
+                "url": "https://api.github.com/repos/AmazeeLabs/silverback_preview_link/zipball/ed2063f95ae948dfe39ed31565d0ef5ac82c2281",
+                "reference": "ed2063f95ae948dfe39ed31565d0ef5ac82c2281",
                 "shasum": ""
             },
             "require": {
@@ -631,9 +631,9 @@
             "homepage": "https://github.com/AmazeeLabs/silverback-mono/tree/development/packages/composer/amazeelabs/silverback_preview_link#readme",
             "support": {
                 "issues": "https://github.com/AmazeeLabs/silverback_preview_link/issues",
-                "source": "https://github.com/AmazeeLabs/silverback_preview_link/tree/1.2.0"
+                "source": "https://github.com/AmazeeLabs/silverback_preview_link/tree/1.5.0"
             },
-            "time": "2024-07-24T14:25:41+00:00"
+            "time": "2024-07-27T14:16:34+00:00"
         },
         {
             "name": "amazeelabs/silverback_publisher_monitor",

From 0de9f5a0833ab464ca42f527e07b9a128981c11b Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Wed, 7 Aug 2024 15:26:12 +0200
Subject: [PATCH 064/100] chore: update composer.lock

---
 apps/cms/composer.lock | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/apps/cms/composer.lock b/apps/cms/composer.lock
index 36796b37e..78d679f9f 100644
--- a/apps/cms/composer.lock
+++ b/apps/cms/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "95a349756daa5580656cc1f2a42f8649",
+    "content-hash": "afb8e971f9cae5e9e79bac11c25290a2",
     "packages": [
         {
             "name": "amazeeio/drupal_integrations",
@@ -969,7 +969,7 @@
             "version": "2.12.0",
             "source": {
                 "type": "git",
-                "url": "git@github.com:cloudinary/cloudinary_php.git",
+                "url": "https://github.com/cloudinary/cloudinary_php.git",
                 "reference": "57290a5e24bee1d65939713f6ef8f75d93f2d6b6"
             },
             "dist": {
@@ -1034,7 +1034,7 @@
             "version": "1.4.0",
             "source": {
                 "type": "git",
-                "url": "git@github.com:cloudinary/php-transformation-builder-sdk.git",
+                "url": "https://github.com/cloudinary/php-transformation-builder-sdk.git",
                 "reference": "a88d3554ddffec3ecd2086bcbd1484757f6b78d8"
             },
             "dist": {
@@ -12216,12 +12216,12 @@
             "version": "v5.2.13",
             "source": {
                 "type": "git",
-                "url": "https://github.com/justinrainbow/json-schema.git",
+                "url": "https://github.com/jsonrainbow/json-schema.git",
                 "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793",
+                "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793",
                 "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793",
                 "shasum": ""
             },
@@ -16247,8 +16247,5 @@
         "php": "^8.2 <8.3"
     },
     "platform-dev": [],
-    "platform-overrides": {
-        "php": "8.2"
-    },
     "plugin-api-version": "2.6.0"
 }

From d021a4d53b2ea728a8046640e0096628c423c1a8 Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Wed, 7 Aug 2024 17:13:44 +0200
Subject: [PATCH 065/100] chore: update styling for arrow area

---
 packages/drupal/gutenberg_blocks/css/edit.css | 84 +++++++++++++++----
 .../src/blocks/accordion-item-text.tsx        |  4 +-
 .../gutenberg_blocks/src/blocks/accordion.tsx |  3 +-
 .../src/blocks/conditional.tsx                | 55 +++++++-----
 .../gutenberg_blocks/src/blocks/content.tsx   |  1 -
 .../gutenberg_blocks/src/blocks/cta.tsx       |  1 -
 .../src/blocks/demo-block.tsx                 |  4 +-
 .../gutenberg_blocks/src/blocks/form.tsx      | 18 +---
 .../gutenberg_blocks/src/blocks/heading.tsx   |  3 +-
 .../gutenberg_blocks/src/blocks/hero.tsx      | 12 +--
 .../src/blocks/horizontal-separator.tsx       |  2 -
 .../src/blocks/image-teaser.tsx               |  3 +-
 .../src/blocks/image-teasers.tsx              |  3 +-
 .../src/blocks/image-with-text.tsx            |  3 +-
 .../src/blocks/info-grid-item.tsx             |  3 +-
 .../gutenberg_blocks/src/blocks/info-grid.tsx |  3 +-
 .../gutenberg_blocks/src/blocks/quote.tsx     |  3 -
 packages/drupal/gutenberg_blocks/src/index.ts | 18 ++++
 18 files changed, 135 insertions(+), 88 deletions(-)

diff --git a/packages/drupal/gutenberg_blocks/css/edit.css b/packages/drupal/gutenberg_blocks/css/edit.css
index 3702388d1..92417cd05 100644
--- a/packages/drupal/gutenberg_blocks/css/edit.css
+++ b/packages/drupal/gutenberg_blocks/css/edit.css
@@ -22,7 +22,8 @@
   display: block;
   position: relative;
   margin: 40px 0;
-  border-left: 34px solid #666666;
+  border-left-width: 34px;
+  border-left-style: solid;
   padding-left: 10px;
   min-height: 250px;
 }
@@ -130,6 +131,21 @@
   margin-right: 5px;
 }
 
+.\!border-stone-500 {
+  --tw-border-opacity: 1;
+  border-color: rgb(120 113 108 / var(--tw-border-opacity)) !important;
+}
+
+.bg-stone-500 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(120 113 108 / var(--tw-bg-opacity));
+}
+
+.text-white {
+  --tw-text-opacity: 1;
+  color: rgb(255 255 255 / var(--tw-text-opacity));
+}
+
 .\[\&\>div\]\:flex > div {
   display: flex;
 }
@@ -195,33 +211,67 @@
   gap: 1rem;
 }
 
-.\!m-0 {
-  margin: 0 !important;
-}
-
-details[open] {
-  padding-bottom: 1em;
+.p-0 {
+  padding: 0;
 }
 
-details[open] > summary::before {
-  transform: rotate(-90deg);
+.\!m-0 {
+  margin: 0 !important;
 }
 
 summary::marker {
   content: none;
 }
 
-summary::before {
+.relative {
   position: relative;
-  left: calc(var(--space-s) * -1);
+}
+
+.inline-block {
   display: inline-block;
+}
+
+.ease-in {
+  transition-timing-function: cubic-bezier(0.4, 0, 1, 1);
+}
+
+.w-\[var\(--space-m\)\] {
   width: var(--space-m);
+}
+
+.h-\[var\(--space-m\)\] {
   height: var(--space-m);
+}
+
+.mt-\[calc\(var\(--space-m\)\/-2\)\] {
   margin-top: calc(var(--space-m) / -2);
-  content: '';
-  transition: transform var(--details-transform-transition-duration) ease-in 0s;
-  transform: rotate(90deg);
-  text-align: center;
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16'%3e%3cpath d='M5.21 1.314L3.79 2.723l5.302 5.353-5.303 5.354 1.422 1.408 6.697-6.762z' fill='%23545560'/%3e%3c/svg%3e");
-  background-size: contain;
+}
+
+.transition-transform {
+  transition-property: transform;
+  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+  transition-duration: 150ms;
+}
+
+.rotate-90 {
+  --tw-rotate: 90deg;
+  transform: translate(var(--tw-translate-x), var(--tw-translate-y))
+    rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y))
+    scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
+}
+
+.duration-\[var\(--details-transform-transition-duration\)\] {
+  transition-duration: var(--details-transform-transition-duration);
+}
+
+details[open] > summary svg {
+  transform: rotate(-90deg);
+}
+
+.grid-cols-\[34px\2c 1fr\] {
+  grid-template-columns: 34px 1fr;
+}
+
+.col-start-2 {
+  grid-column-start: 2;
 }
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/accordion-item-text.tsx b/packages/drupal/gutenberg_blocks/src/blocks/accordion-item-text.tsx
index aaf3f4a6d..0d8d87e3a 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/accordion-item-text.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/accordion-item-text.tsx
@@ -9,8 +9,8 @@ import { registerBlockType } from 'wordpress__blocks';
 import { PanelBody, SelectControl } from 'wordpress__components';
 import { compose, withState } from 'wordpress__compose';
 
-// @ts-ignore
 const { t: __ } = Drupal;
+
 // @ts-ignore
 registerBlockType('custom/accordion-item-text', {
   title: 'Accordion Item Text',
@@ -53,7 +53,7 @@ registerBlockType('custom/accordion-item-text', {
             />
           </PanelBody>
         </InspectorControls>
-        <div className={'container-wrapper'}>
+        <div className={'container-wrapper !border-stone-500'}>
           <div className={'container-label'}>{__('Accordion Item Text')}</div>
           <div
             className={clsx(
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/accordion.tsx b/packages/drupal/gutenberg_blocks/src/blocks/accordion.tsx
index 924746dd8..7d5c57be1 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/accordion.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/accordion.tsx
@@ -1,7 +1,6 @@
 import { InnerBlocks } from 'wordpress__block-editor';
 import { registerBlockType } from 'wordpress__blocks';
 
-// @ts-ignore
 const { t: __ } = Drupal;
 
 registerBlockType('custom/accordion', {
@@ -11,7 +10,7 @@ registerBlockType('custom/accordion', {
   attributes: {},
   edit: () => {
     return (
-      <div className={'container-wrapper'}>
+      <div className={'container-wrapper !border-stone-500'}>
         <div className={'container-label'}>{__('Accordion')}</div>
         <InnerBlocks
           templateLock={false}
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx b/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
index 36b10528d..92f31925a 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
@@ -9,7 +9,6 @@ import {
   TextControl,
 } from 'wordpress__components';
 
-// @ts-ignore
 const { t: __ } = Drupal;
 
 type ConditionsType = {
@@ -68,14 +67,14 @@ registerBlockType(`custom/conditional`, {
           <>
             {displayFrom ? (
               <>
-                <span className="font-extralight">{__('From')}</span>{' '}
+                <span className="font-extralight">{__('From')}:</span>{' '}
                 {new Date(displayFrom).toLocaleString()}
               </>
             ) : null}
-            {displayFrom && displayTo ? <span>{' - '}</span> : null}
+            {displayFrom && displayTo ? ' ' : null}
             {displayTo ? (
               <>
-                <span className="font-extralight">{__('To')}</span>{' '}
+                <span className="font-extralight">{__('To')}:</span>{' '}
                 {new Date(displayTo).toLocaleString()}
               </>
             ) : null}
@@ -99,7 +98,7 @@ registerBlockType(`custom/conditional`, {
         .filter(([, { visible }]) => visible)
         .map(([key, { label, template }]) => (
           <>
-            <div>{label}</div>
+            <div className="font-bold">{label}</div>
             {template}
           </>
         ))
@@ -215,22 +214,40 @@ const CollapsibleContainer = ({
   title,
   isActive,
 }: PropsWithChildren<{ label: string; title: string; isActive: boolean }>) => {
-  const isLabelDifferentToTitle = label !== title;
-
   return (
     <>
-      <div className={'container-wrapper'}>
-        <div className={'container-label'}>{label}</div>
-        <details
-          className={clsx('border border-gray-200', {
-            'bg-gray-100': !isActive,
-          })}
-        >
-          <summary>{title}</summary>
-
-          <div className="border-t">{children}</div>
-        </details>
-      </div>
+      <details
+        className={clsx('border border-gray-200', {
+          'bg-gray-100': !isActive,
+        })}
+      >
+        <summary role="button" className="grid grid-cols-[34px,1fr] p-0">
+          <span
+            className={
+              'bg-stone-500 flex justify-center items-center text-white relative'
+            }
+          >
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              role="presentation"
+              width="16"
+              height="16"
+              className="w-[var(--space-m)] h-[var(--space-m)] transition-transform ease-in duration-[var(--details-transform-transition-duration)] rotate-90"
+            >
+              <path
+                d="M5.21 1.314L3.79 2.723l5.302 5.353-5.303 5.354 1.422 1.408 6.697-6.762z"
+                fill="currentColor"
+              />
+            </svg>
+          </span>
+          <span className="col-start-2 p-4">{title}</span>
+        </summary>
+
+        <div className={'container-wrapper !border-stone-500 !m-0'}>
+          <div className={'container-label'}>{label}</div>
+          <div className={'container-content border-t'}>{children}</div>
+        </div>
+      </details>
     </>
   );
 };
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/content.tsx b/packages/drupal/gutenberg_blocks/src/blocks/content.tsx
index 1aff9b0ac..d5aa26b2a 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/content.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/content.tsx
@@ -1,7 +1,6 @@
 import { InnerBlocks } from 'wordpress__block-editor';
 import { registerBlockType } from 'wordpress__blocks';
 
-// @ts-ignore
 const { t: __ } = Drupal;
 
 const style = {
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/cta.tsx b/packages/drupal/gutenberg_blocks/src/blocks/cta.tsx
index 5b70375d3..e5a3efe3f 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/cta.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/cta.tsx
@@ -9,7 +9,6 @@ import { registerBlockType } from 'wordpress__blocks';
 import { PanelBody, SelectControl, ToggleControl } from 'wordpress__components';
 import { compose, withState } from 'wordpress__compose';
 
-// @ts-ignore
 const { t: __ } = Drupal;
 
 // @ts-ignore
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/demo-block.tsx b/packages/drupal/gutenberg_blocks/src/blocks/demo-block.tsx
index d35d6354d..4c0958f0b 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/demo-block.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/demo-block.tsx
@@ -7,8 +7,8 @@ import { dispatch } from 'wordpress__data';
 
 import { DrupalMediaEntity } from '../utils/drupal-media';
 
-// @ts-ignore
 const { t: __ } = Drupal;
+
 // @ts-ignore
 registerBlockType('custom/demo-block', {
   title: 'Demo Block',
@@ -47,7 +47,7 @@ registerBlockType('custom/demo-block', {
             <p>Block settings</p>
           </PanelBody>
         </InspectorControls>
-        <div className={'container-wrapper'}>
+        <div className={'container-wrapper !border-stone-500'}>
           <div className={'container-label'}>{__('Demo Block')}</div>
           <div className="custom-block-demo-block">
             <RichText
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/form.tsx b/packages/drupal/gutenberg_blocks/src/blocks/form.tsx
index 0de04d3c0..af7ec2fbc 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/form.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/form.tsx
@@ -2,22 +2,6 @@ import { InnerBlocks, InspectorControls } from 'wordpress__block-editor';
 import { registerBlockType } from 'wordpress__blocks';
 import { PanelBody, SelectControl } from 'wordpress__components';
 
-declare const Drupal: { t: (s: string) => string };
-
-declare const drupalSettings: {
-  path: {
-    baseUrl: string;
-    pathPrefix: string;
-  };
-  customGutenbergBlocks: {
-    forms: Array<{
-      id: string;
-      url: string;
-      label: string;
-    }>;
-  };
-};
-
 const { t: __ } = Drupal;
 
 registerBlockType(`custom/form`, {
@@ -53,7 +37,7 @@ registerBlockType(`custom/form`, {
           />
         </PanelBody>
       </InspectorControls>
-      <div className={'container-wrapper'}>
+      <div className={'container-wrapper !border-stone-500'}>
         <div className={'container-label'}>{__('Form')}</div>
         {props.attributes.formId ? (
           <iframe
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/heading.tsx b/packages/drupal/gutenberg_blocks/src/blocks/heading.tsx
index f40cb436e..480173c7c 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/heading.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/heading.tsx
@@ -4,8 +4,9 @@ import { Path, SVG, ToolbarGroup } from 'wordpress__components';
 import { compose, withState } from 'wordpress__compose';
 
 import { cleanUpText } from '../utils/clean-up-text';
-// @ts-ignore
+
 const { t: __ } = Drupal;
+
 // @ts-ignore
 const { sanitizeText } = silverbackGutenbergUtils;
 
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/hero.tsx b/packages/drupal/gutenberg_blocks/src/blocks/hero.tsx
index e87401af8..5630dc8c3 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/hero.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/hero.tsx
@@ -12,18 +12,8 @@ import { dispatch } from 'wordpress__data';
 
 import { DrupalMediaEntity } from '../utils/drupal-media';
 
-declare const drupalSettings: {
-  customGutenbergBlocks: {
-    forms: Array<{
-      id: string;
-      url: string;
-      label: string;
-    }>;
-  };
-};
-
-// @ts-ignore
 const { t: __ } = Drupal;
+
 // @ts-ignore
 const { setPlainTextAttribute } = silverbackGutenbergUtils;
 
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/horizontal-separator.tsx b/packages/drupal/gutenberg_blocks/src/blocks/horizontal-separator.tsx
index 720094b1f..de0fd1d3d 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/horizontal-separator.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/horizontal-separator.tsx
@@ -1,8 +1,6 @@
 import { registerBlockType } from 'wordpress__blocks';
 import { compose, withState } from 'wordpress__compose';
 
-declare const Drupal: { t: (s: string) => string };
-
 const { t: __ } = Drupal;
 
 // @ts-ignore
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/image-teaser.tsx b/packages/drupal/gutenberg_blocks/src/blocks/image-teaser.tsx
index 3306341e0..598b17d9c 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/image-teaser.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/image-teaser.tsx
@@ -8,11 +8,10 @@ import {
 import { registerBlockType } from 'wordpress__blocks';
 import { PanelBody } from 'wordpress__components';
 import { dispatch } from 'wordpress__data';
-
 import { DrupalMediaEntity } from '../utils/drupal-media';
 
-// @ts-ignore
 const { t: __ } = Drupal;
+
 // @ts-ignore
 const { setPlainTextAttribute } = silverbackGutenbergUtils;
 
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/image-teasers.tsx b/packages/drupal/gutenberg_blocks/src/blocks/image-teasers.tsx
index e4d4397a5..72df8d762 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/image-teasers.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/image-teasers.tsx
@@ -1,7 +1,6 @@
 import { InnerBlocks } from 'wordpress__block-editor';
 import { registerBlockType } from 'wordpress__blocks';
 
-// @ts-ignore
 const { t: __ } = Drupal;
 
 registerBlockType('custom/image-teasers', {
@@ -11,7 +10,7 @@ registerBlockType('custom/image-teasers', {
   attributes: {},
   edit: () => {
     return (
-      <div className={'container-wrapper'}>
+      <div className={'container-wrapper !border-stone-500'}>
         <div className={'container-label'}>{__('Image Teasers')}</div>
         <InnerBlocks
           templateLock={false}
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/image-with-text.tsx b/packages/drupal/gutenberg_blocks/src/blocks/image-with-text.tsx
index d4717d4aa..aa40807a1 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/image-with-text.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/image-with-text.tsx
@@ -5,7 +5,6 @@ import { dispatch } from 'wordpress__data';
 
 import { DrupalMediaEntity } from '../utils/drupal-media';
 
-// @ts-ignore
 const { t: __ } = Drupal;
 
 registerBlockType('custom/image-with-text', {
@@ -41,7 +40,7 @@ registerBlockType('custom/image-with-text', {
             />
           </PanelBody>
         </InspectorControls>
-        <div className={'container-wrapper'}>
+        <div className={'container-wrapper !border-stone-500'}>
           <div className={'container-label'}>{__('Image with Text')}</div>
           <DrupalMediaEntity
             classname={'w-full'}
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/info-grid-item.tsx b/packages/drupal/gutenberg_blocks/src/blocks/info-grid-item.tsx
index 5027a7214..8f70bc105 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/info-grid-item.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/info-grid-item.tsx
@@ -8,7 +8,6 @@ import {
   limitedIconListOption,
 } from '../utils/icon-list';
 
-// @ts-ignore
 const { t: __ } = Drupal;
 
 registerBlockType('custom/info-grid-item', {
@@ -44,7 +43,7 @@ registerBlockType('custom/info-grid-item', {
           </PanelBody>
         </InspectorControls>
 
-        <div className={'container-wrapper'}>
+        <div className={'container-wrapper !border-stone-500'}>
           <div className={'container-label'}>{__('Info Grid Item')}</div>
           <div className={'info-grid-icon'} style={{ maxWidth: '50px' }}>
             {iconPreview && (
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/info-grid.tsx b/packages/drupal/gutenberg_blocks/src/blocks/info-grid.tsx
index 599399989..394c61662 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/info-grid.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/info-grid.tsx
@@ -2,7 +2,6 @@ import { InnerBlocks } from 'wordpress__block-editor';
 import { registerBlockType } from 'wordpress__blocks';
 import { useSelect } from 'wordpress__data';
 
-// @ts-ignore
 const { t: __ } = Drupal;
 
 const MAX_BLOCKS: number = 3;
@@ -19,7 +18,7 @@ registerBlockType('custom/info-grid', {
     }));
 
     return (
-      <div className={'container-wrapper'}>
+      <div className={'container-wrapper !border-stone-500'}>
         <div className={'container-label'}>{__('Info Grid')}</div>
         <InnerBlocks
           templateLock={false}
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/quote.tsx b/packages/drupal/gutenberg_blocks/src/blocks/quote.tsx
index d5873d2d7..43bcce02e 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/quote.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/quote.tsx
@@ -2,12 +2,9 @@ import { RichText } from 'wordpress__block-editor';
 import { registerBlockType } from 'wordpress__blocks';
 import { compose, withState } from 'wordpress__compose';
 import { dispatch } from 'wordpress__data';
-
 import { cleanUpText } from '../utils/clean-up-text';
 import { DrupalMediaEntity } from '../utils/drupal-media';
 
-declare const Drupal: { t: (s: string) => string };
-
 const { t: __ } = Drupal;
 
 // @ts-ignore
diff --git a/packages/drupal/gutenberg_blocks/src/index.ts b/packages/drupal/gutenberg_blocks/src/index.ts
index 256fb2d0c..f16b906a3 100644
--- a/packages/drupal/gutenberg_blocks/src/index.ts
+++ b/packages/drupal/gutenberg_blocks/src/index.ts
@@ -1,3 +1,21 @@
+declare global {
+  const Drupal: { t: (s: string) => string };
+
+  const drupalSettings: {
+    path: {
+      baseUrl: string;
+      pathPrefix: string;
+    };
+    customGutenbergBlocks: {
+      forms: Array<{
+        id: string;
+        url: string;
+        label: string;
+      }>;
+    };
+  };
+}
+
 import './customisations';
 import './preview';
 import './blocks/hero';

From 719d7baf06a3cd3728ef46ce46f39f7cb69b3e0a Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Wed, 7 Aug 2024 17:26:16 +0200
Subject: [PATCH 066/100] fix: add typing for Drupal.behaviors and
 drupalSettings.preview - set to any for now

---
 packages/drupal/gutenberg_blocks/src/index.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/drupal/gutenberg_blocks/src/index.ts b/packages/drupal/gutenberg_blocks/src/index.ts
index f16b906a3..9082f0720 100644
--- a/packages/drupal/gutenberg_blocks/src/index.ts
+++ b/packages/drupal/gutenberg_blocks/src/index.ts
@@ -1,7 +1,11 @@
 declare global {
-  const Drupal: { t: (s: string) => string };
+  const Drupal: {
+    behaviors: any;
+    t: (s: string) => string;
+  };
 
   const drupalSettings: {
+    preview: any;
     path: {
       baseUrl: string;
       pathPrefix: string;

From 8f6fb90eb257fc140a7cc8192152376b9bf7b57d Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Wed, 7 Aug 2024 17:36:03 +0200
Subject: [PATCH 067/100] fix: typing

---
 packages/drupal/gutenberg_blocks/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/drupal/gutenberg_blocks/src/index.ts b/packages/drupal/gutenberg_blocks/src/index.ts
index 9082f0720..cddde9106 100644
--- a/packages/drupal/gutenberg_blocks/src/index.ts
+++ b/packages/drupal/gutenberg_blocks/src/index.ts
@@ -1,7 +1,7 @@
 declare global {
   const Drupal: {
     behaviors: any;
-    t: (s: string) => string;
+    t: (s: string, t?: object) => string;
   };
 
   const drupalSettings: {

From 33054bd6a0367a03f80a23378512b566db7df355 Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Wed, 7 Aug 2024 17:50:11 +0200
Subject: [PATCH 068/100] fix: eslint

---
 .../src/blocks/conditional.tsx                |  2 +-
 .../src/blocks/image-teaser.tsx               |  1 +
 .../gutenberg_blocks/src/blocks/quote.tsx     |  1 +
 packages/drupal/gutenberg_blocks/src/index.ts | 38 +++++++++----------
 4 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx b/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
index 92f31925a..47cdc9794 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
@@ -96,7 +96,7 @@ registerBlockType(`custom/conditional`, {
       Object.entries(conditions)
         .filter(([, value]) => !!value)
         .filter(([, { visible }]) => visible)
-        .map(([key, { label, template }]) => (
+        .map(([, { label, template }]) => (
           <>
             <div className="font-bold">{label}</div>
             {template}
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/image-teaser.tsx b/packages/drupal/gutenberg_blocks/src/blocks/image-teaser.tsx
index 598b17d9c..c590a367d 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/image-teaser.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/image-teaser.tsx
@@ -8,6 +8,7 @@ import {
 import { registerBlockType } from 'wordpress__blocks';
 import { PanelBody } from 'wordpress__components';
 import { dispatch } from 'wordpress__data';
+
 import { DrupalMediaEntity } from '../utils/drupal-media';
 
 const { t: __ } = Drupal;
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/quote.tsx b/packages/drupal/gutenberg_blocks/src/blocks/quote.tsx
index 43bcce02e..4158a77b7 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/quote.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/quote.tsx
@@ -2,6 +2,7 @@ import { RichText } from 'wordpress__block-editor';
 import { registerBlockType } from 'wordpress__blocks';
 import { compose, withState } from 'wordpress__compose';
 import { dispatch } from 'wordpress__data';
+
 import { cleanUpText } from '../utils/clean-up-text';
 import { DrupalMediaEntity } from '../utils/drupal-media';
 
diff --git a/packages/drupal/gutenberg_blocks/src/index.ts b/packages/drupal/gutenberg_blocks/src/index.ts
index cddde9106..53934bf52 100644
--- a/packages/drupal/gutenberg_blocks/src/index.ts
+++ b/packages/drupal/gutenberg_blocks/src/index.ts
@@ -1,3 +1,22 @@
+import './customisations';
+import './preview';
+import './blocks/hero';
+import './blocks/content';
+import './blocks/heading';
+import './blocks/form';
+import './blocks/image-teaser';
+import './blocks/image-teasers';
+import './blocks/image-with-text';
+import './filters/list';
+import './blocks/cta';
+import './blocks/quote';
+import './blocks/conditional';
+import './blocks/horizontal-separator';
+import './blocks/accordion';
+import './blocks/accordion-item-text';
+import './blocks/info-grid';
+import './blocks/info-grid-item';
+
 declare global {
   const Drupal: {
     behaviors: any;
@@ -19,22 +38,3 @@ declare global {
     };
   };
 }
-
-import './customisations';
-import './preview';
-import './blocks/hero';
-import './blocks/content';
-import './blocks/heading';
-import './blocks/form';
-import './blocks/image-teaser';
-import './blocks/image-teasers';
-import './blocks/image-with-text';
-import './filters/list';
-import './blocks/cta';
-import './blocks/quote';
-import './blocks/conditional';
-import './blocks/horizontal-separator';
-import './blocks/accordion';
-import './blocks/accordion-item-text';
-import './blocks/info-grid';
-import './blocks/info-grid-item';

From a9a72dcf36b7b18c764a3a7e127d4bc8b829d4ea Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Mon, 12 Aug 2024 10:56:47 +0200
Subject: [PATCH 069/100] fix: set custom heading block for inner accordion
 item

---
 .../drupal/gutenberg_blocks/src/blocks/accordion-item-text.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/drupal/gutenberg_blocks/src/blocks/accordion-item-text.tsx b/packages/drupal/gutenberg_blocks/src/blocks/accordion-item-text.tsx
index aaf3f4a6d..0e01822c0 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/accordion-item-text.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/accordion-item-text.tsx
@@ -76,7 +76,7 @@ registerBlockType('custom/accordion-item-text', {
             />
             <InnerBlocks
               templateLock={false}
-              allowedBlocks={['core/paragraph', 'core/list', 'core/heading']}
+              allowedBlocks={['core/paragraph', 'core/list', 'custom/heading']}
               template={[['core/paragraph', {}]]}
             />
           </div>

From fe983fa0ff915dfb248e4360fa793c6c64cd80ea Mon Sep 17 00:00:00 2001
From: Alex Tkachev <alex.leksat@gmail.com>
Date: Tue, 13 Aug 2024 12:39:13 +0400
Subject: [PATCH 070/100] test: check if decap admin available

---
 tests/e2e/specs/decap/admin.spec.ts | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 tests/e2e/specs/decap/admin.spec.ts

diff --git a/tests/e2e/specs/decap/admin.spec.ts b/tests/e2e/specs/decap/admin.spec.ts
new file mode 100644
index 000000000..df5118eef
--- /dev/null
+++ b/tests/e2e/specs/decap/admin.spec.ts
@@ -0,0 +1,8 @@
+import { expect, test } from '@playwright/test';
+
+import { websiteUrl } from '../../helpers/url';
+
+test('decap admin is available', async ({ page }) => {
+  const response = await page.goto(websiteUrl('/admin'));
+  expect(response?.status()).toBe(200);
+});

From 648669da93b878469acef57b041bc7a1e96ac381 Mon Sep 17 00:00:00 2001
From: Alex Tkachev <alex.leksat@gmail.com>
Date: Tue, 13 Aug 2024 12:42:48 +0400
Subject: [PATCH 071/100] chore: remove duplicate formatting check

It is already performed in the test workflow.
---
 .github/actions/setup/action.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index a8a611e13..50133acbc 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -34,7 +34,3 @@ runs:
     - name: Install dependencies
       shell: bash
       run: pnpm i
-
-    - name: Check formatting
-      shell: bash
-      run: pnpm test:format

From e4eed8d544245f655da5e420abeee8b4fe37f723 Mon Sep 17 00:00:00 2001
From: Vasile Chindris <vasile.chindris@amazee.com>
Date: Thu, 18 Jul 2024 17:18:21 +0300
Subject: [PATCH 072/100] chore(SLB-454): teaser list gutenberg block, wip

---
 .../src/blocks/teaser-item.tsx                |  59 +++++++++
 .../src/blocks/teaser-list.tsx                | 117 ++++++++++++++++++
 packages/drupal/gutenberg_blocks/src/index.ts |   2 +
 packages/schema/src/schema.graphql            |  43 ++++++-
 4 files changed, 218 insertions(+), 3 deletions(-)
 create mode 100644 packages/drupal/gutenberg_blocks/src/blocks/teaser-item.tsx
 create mode 100644 packages/drupal/gutenberg_blocks/src/blocks/teaser-list.tsx

diff --git a/packages/drupal/gutenberg_blocks/src/blocks/teaser-item.tsx b/packages/drupal/gutenberg_blocks/src/blocks/teaser-item.tsx
new file mode 100644
index 000000000..8d4365773
--- /dev/null
+++ b/packages/drupal/gutenberg_blocks/src/blocks/teaser-item.tsx
@@ -0,0 +1,59 @@
+import {
+  // @ts-ignore
+  __experimentalLinkControl as LinkControl,
+} from 'wordpress__block-editor';
+import { registerBlockType } from 'wordpress__blocks';
+
+// @ts-ignore
+registerBlockType('custom/teaser-item', {
+  title: 'Teaser item',
+  icon: 'slides',
+  category: 'layout',
+  parent: ['custom/teaser-list'],
+  attributes: {
+    url: {
+      type: 'string',
+    },
+    // To have an easier integration with entity usage, we also retrieve and
+    // store the uuid and the entity type of internal links.
+    uuid: {
+      type: 'string',
+    },
+    entityType: {
+      type: 'string',
+    },
+  },
+  // @ts-ignore
+  edit: (props) => {
+    return (
+      <div>
+        <LinkControl
+          value={{
+            url: props.attributes.url,
+          }}
+          settings={{}}
+          suggestionsQuery={{
+            type: 'post',
+            // Use the teaser_list linkit profile to fetch suggestions.
+            subtype: 'teaser_list',
+          }}
+          // @ts-ignore
+          onChange={(link) => {
+            props.setAttributes({
+              url: link.url,
+              uuid: link.id,
+              // At the moment, the teaser_list link autocomplete only
+              // returns nodes.
+              // For a more complex case, check the cta component.
+              entityType: link.type !== 'URL' ? 'node' : '',
+            });
+          }}
+        />
+      </div>
+    );
+  },
+
+  save: () => {
+    return null;
+  },
+});
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/teaser-list.tsx b/packages/drupal/gutenberg_blocks/src/blocks/teaser-list.tsx
new file mode 100644
index 000000000..ef586649b
--- /dev/null
+++ b/packages/drupal/gutenberg_blocks/src/blocks/teaser-list.tsx
@@ -0,0 +1,117 @@
+import { InnerBlocks, InspectorControls } from 'wordpress__block-editor';
+import { registerBlockType } from 'wordpress__blocks';
+import {
+  PanelBody,
+  SelectControl,
+  TextControl,
+  ToggleControl,
+} from 'wordpress__components';
+
+// @ts-ignore
+const { t: __ } = Drupal;
+
+// @ts-ignore
+const { setPlainTextAttribute } = silverbackGutenbergUtils;
+
+// @ts-ignore
+registerBlockType('custom/teaser-list', {
+  title: __('Teaser list'),
+  icon: 'slides',
+  category: 'layout',
+  attributes: {
+    layout: {
+      type: 'string',
+      default: 'GRID',
+    },
+    buttonText: {
+      type: 'string',
+    },
+    contentHubEnabled: {
+      type: 'boolean',
+    },
+    limit: {
+      type: 'string',
+    },
+    titleFilter: {
+      typ: 'string',
+    },
+  },
+  edit: (props) => {
+    return (
+      <div className={'container-wrapper'}>
+        <div className={'container-label'}>{__('Teaser list')}</div>
+        <InspectorControls>
+          <PanelBody>
+            <SelectControl
+              label={__('Layout')}
+              value={props.attributes.layout as string}
+              options={[
+                { label: __('Grid'), value: 'GRID' },
+                { label: __('Carousel'), value: 'CAROUSEL' },
+              ]}
+              onChange={(layout) => {
+                props.setAttributes({
+                  layout,
+                });
+              }}
+            />
+            <TextControl
+              value={props.attributes.buttonText as string}
+              label={__('Button text')}
+              onChange={(buttonText: string) => {
+                setPlainTextAttribute(props, 'buttonText', buttonText);
+              }}
+              help={__(
+                'A text to show for the read more link. Leave empty to use the default one (Read more).',
+              )}
+            />
+            <ToggleControl
+              label={__('Enable content hub')}
+              help={__('Enable pulling dynamic content from the content hub.')}
+              checked={props.attributes.contentHubEnabled as boolean}
+              onChange={(contentHubEnabled) => {
+                props.setAttributes({
+                  contentHubEnabled,
+                });
+              }}
+            />
+            {typeof props.attributes.contentHubEnabled !== 'undefined' &&
+            props.attributes.contentHubEnabled ? (
+              <TextControl
+                label={__('Filter: Title')}
+                help={__('Filter results by title / label.')}
+                onChange={(titleFilter) => {
+                  props.setAttributes({
+                    titleFilter,
+                  });
+                }}
+                value={props.attributes.titleFilter as string}
+              />
+            ) : null}
+            {typeof props.attributes.contentHubEnabled !== 'undefined' &&
+            props.attributes.contentHubEnabled ? (
+              <TextControl
+                label={__('Limit')}
+                help={__(
+                  'Set a maximum number of results to show from the content hub.',
+                )}
+                onChange={(limit) => {
+                  props.setAttributes({
+                    limit,
+                  });
+                }}
+                value={props.attributes.limit as string}
+              />
+            ) : null}
+          </PanelBody>
+        </InspectorControls>
+        <InnerBlocks
+          templateLock={false}
+          allowedBlocks={['custom/teaser-item']}
+          template={[]}
+        />
+      </div>
+    );
+  },
+  save: () => <InnerBlocks.Content />,
+});
diff --git a/packages/drupal/gutenberg_blocks/src/index.ts b/packages/drupal/gutenberg_blocks/src/index.ts
index 9a846e2b3..3d86552a5 100644
--- a/packages/drupal/gutenberg_blocks/src/index.ts
+++ b/packages/drupal/gutenberg_blocks/src/index.ts
@@ -15,3 +15,5 @@ import './blocks/accordion';
 import './blocks/accordion-item-text';
 import './blocks/info-grid';
 import './blocks/info-grid-item';
+import './blocks/teaser-list';
+import './blocks/teaser-item';
diff --git a/packages/schema/src/schema.graphql b/packages/schema/src/schema.graphql
index 8784b0a90..9eb61f226 100644
--- a/packages/schema/src/schema.graphql
+++ b/packages/schema/src/schema.graphql
@@ -128,7 +128,8 @@ type FooterNavigation implements Navigation @menu(menu_id: "footer") {
   items: [NavigationItem]! @lang @resolveMenuItems
 }
 
-interface Page implements ContentHubResultItem @resolveEntityBundle {
+interface Page implements ContentHubResultItem & BlockTeaserItemContent
+  @resolveEntityBundle {
   id: ID!
   translations: [Page]
   locale: Locale!
@@ -140,7 +141,7 @@ interface Page implements ContentHubResultItem @resolveEntityBundle {
   metaTags: [MetaTag]
 }
 
-type DecapPage implements ContentHubResultItem & Page
+type DecapPage implements ContentHubResultItem & Page & BlockTeaserItemContent
   @sourceFrom(fn: "getPages") {
   id: ID!
   translations: [Page] @decapPageTranslations
@@ -156,7 +157,7 @@ type DecapPage implements ContentHubResultItem & Page
 """
 A generic page.
 """
-type DrupalPage implements ContentHubResultItem & Page
+type DrupalPage implements ContentHubResultItem & Page & BlockTeaserItemContent
   @entity(type: "node", bundle: "page")
   @type(id: "page") {
   id: ID! @resolveEntityUuid
@@ -209,6 +210,7 @@ union PageContent @resolveEditorBlockType =
   | BlockHorizontalSeparator
   | BlockAccordion
   | BlockInfoGrid
+  | BlockTeaserList
 
 type BlockForm @type(id: "custom/form") {
   url: Url @resolveEditorBlockAttribute(key: "formId") @webformIdToUrl(id: "$")
@@ -318,6 +320,41 @@ type BlockHorizontalSeparator @type(id: "custom/horizontal-separator") {
   markup: Markup! @resolveEditorBlockMarkup
 }
 
+type BlockTeaserList @type(id: "custom/teaser-list") {
+  layout: BlockTeaserListLayout @resolveEditorBlockAttribute(key: "layout")
+  buttonText: String @resolveEditorBlockAttribute(key: "buttonText")
+  staticContent: [BlockTeaserItem] @resolveEditorBlockChildren
+  contentHubEnabled: Boolean
+    @resolveEditorBlockAttribute(key: "contentHubEnabled")
+  filters: BlockTeaserListFilters
+}
+
+type BlockTeaserItem @type(id: "custom/teaser-item") {
+  content: BlockTeaserItemContent
+    @resolveEditorBlockAttribute(key: "uuid")
+    @loadEntity(type: "node", uuid: "$")
+}
+
+enum BlockTeaserListLayout @default @value(string: "GRID") {
+  GRID
+  CAROUSEL
+}
+
+type BlockTeaserListFilters {
+  title: String @resolveEditorBlockAttribute(key: "titleFilter")
+  limit: Int @resolveEditorBlockAttribute(key: "limit")
+}
+
+"""
+Inteface for anything that can appear in the teaser list.
+"""
+interface BlockTeaserItemContent @resolveEntityBundle {
+  path: Url!
+  title: String!
+  hero: Hero
+  teaserImage: MediaImage
+}
+
 input PaginationInput {
   limit: Int!
   offset: Int!

From 256e5259ac8ec624da33f43a61eb72ca93dd7251 Mon Sep 17 00:00:00 2001
From: Vasile Chindris <vasile.chindris@amazee.com>
Date: Wed, 24 Jul 2024 08:15:45 +0300
Subject: [PATCH 073/100] chore(SLB-454): static content in teaser list

---
 apps/cms/composer.json                        |  3 ++
 ...aphql_load_by_uuid_translation_check.patch | 15 +++++++
 packages/drupal/custom/directives.graphql     | 11 +++++
 .../GraphQL/Directive/EntityLoadByUUID.php    | 45 +++++++++++++++++++
 packages/schema/codegen.directives.ts         |  1 +
 packages/schema/src/fragments/Page.gql        |  1 +
 .../fragments/PageContent/BlockTeaserList.gql | 22 +++++++++
 packages/schema/src/schema.graphql            |  2 +-
 .../Organisms/PageContent/BlockTeaserList.tsx | 28 ++++++++++++
 .../src/components/Organisms/PageDisplay.tsx  |  3 ++
 10 files changed, 130 insertions(+), 1 deletion(-)
 create mode 100644 apps/cms/patches/graphql_load_by_uuid_translation_check.patch
 create mode 100644 packages/drupal/custom/directives.graphql
 create mode 100644 packages/drupal/custom/src/Plugin/GraphQL/Directive/EntityLoadByUUID.php
 create mode 100644 packages/schema/src/fragments/PageContent/BlockTeaserList.gql
 create mode 100644 packages/ui/src/components/Organisms/PageContent/BlockTeaserList.tsx

diff --git a/apps/cms/composer.json b/apps/cms/composer.json
index c2e0d6cec..c39a1f77a 100644
--- a/apps/cms/composer.json
+++ b/apps/cms/composer.json
@@ -105,6 +105,9 @@
       "drupal/gutenberg": {
         "Gutenberg enabled hook": "https://www.drupal.org/files/issues/2024-05-07/gutenberg_enabled_hook_3445677-2.patch",
         "Remove !important from sidebar": "./patches/gutenberg_remove-important-sidebar.patch"
+      },
+      "drupal/graphql": {
+        "Check if translation exists when loading an entity by its uuid": "./patches/graphql_load_by_uuid_translation_check.patch"
       }
     },
     "patchLevel": {
diff --git a/apps/cms/patches/graphql_load_by_uuid_translation_check.patch b/apps/cms/patches/graphql_load_by_uuid_translation_check.patch
new file mode 100644
index 000000000..ba9d03d8d
--- /dev/null
+++ b/apps/cms/patches/graphql_load_by_uuid_translation_check.patch
@@ -0,0 +1,15 @@
+diff --git a/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadByUuid.php b/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadByUuid.php
+index 10e2d405..5d1e9b1d 100644
+--- a/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadByUuid.php
++++ b/src/Plugin/GraphQL/DataProducer/Entity/EntityLoadByUuid.php
+@@ -165,7 +165,9 @@ class EntityLoadByUuid extends DataProducerPluginBase implements ContainerFactor
+ 
+       // Get the correct translation.
+       if (isset($language) && $language != $entity->language()->getId() && $entity instanceof TranslatableInterface) {
+-        $entity = $entity->getTranslation($language);
++        if ($entity->hasTranslation($language)) {
++          $entity = $entity->getTranslation($language);
++        }
+         $entity->addCacheContexts(["static:language:{$language}"]);
+       }
+ 
diff --git a/packages/drupal/custom/directives.graphql b/packages/drupal/custom/directives.graphql
new file mode 100644
index 000000000..f7c7b5a7d
--- /dev/null
+++ b/packages/drupal/custom/directives.graphql
@@ -0,0 +1,11 @@
+"""
+Loads a given entity by its uuid.
+
+Provided by the "custom" module.
+Implemented in "Drupal\custom\Plugin\GraphQL\Directive\EntityLoadByUUID".
+"""
+directive @loadByUUID(
+  type: String
+  uuid: String
+  operation: String
+) repeatable on FIELD_DEFINITION | SCALAR | UNION | ENUM | INTERFACE | OBJECT
diff --git a/packages/drupal/custom/src/Plugin/GraphQL/Directive/EntityLoadByUUID.php b/packages/drupal/custom/src/Plugin/GraphQL/Directive/EntityLoadByUUID.php
new file mode 100644
index 000000000..c0b6f759c
--- /dev/null
+++ b/packages/drupal/custom/src/Plugin/GraphQL/Directive/EntityLoadByUUID.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Drupal\custom\Plugin\GraphQL\Directive;
+
+use Drupal\Core\Plugin\PluginBase;
+use Drupal\graphql\GraphQL\Resolver\ResolverInterface;
+use Drupal\graphql\GraphQL\ResolverBuilder;
+use Drupal\graphql_directives\DirectiveInterface;
+use Drupal\graphql_directives\Plugin\GraphQL\Directive\ArgumentTrait;
+
+/**
+ * @Directive(
+ *   id = "loadByUUID",
+ *   description = "Loads a given entity by its uuid",
+ *   arguments = {
+ *     "type" = "String",
+ *     "uuid" = "String",
+ *     "operation" = "String"
+ *   }
+ * )
+ */
+class EntityLoadByUUID extends PluginBase implements DirectiveInterface {
+  use ArgumentTrait;
+
+  /**
+   * {@inheritDoc}
+   * @throws \Exception
+   */
+  public function buildResolver(ResolverBuilder $builder, array $arguments): ResolverInterface {
+    // All other cases require a "type" argument.
+    if (!isset($arguments['type'])) {
+      throw new \Exception('A type must be provided.');
+    }
+    if (!isset($arguments['uuid'])) {
+      throw new \Exception('A uuid must be provided.');
+    }
+
+    return $builder->produce('entity_load_by_uuid')
+      ->map('type', $builder->fromValue($arguments['type']))
+      ->map('access_operation', $builder->fromValue($arguments['operation'] ?? 'view'))
+      ->map('language', $builder->fromContext('document_language'))
+      ->map('uuid', $this->argumentResolver($arguments['uuid'], $builder));
+  }
+
+}
diff --git a/packages/schema/codegen.directives.ts b/packages/schema/codegen.directives.ts
index 59c66dca4..6a46dd8ff 100644
--- a/packages/schema/codegen.directives.ts
+++ b/packages/schema/codegen.directives.ts
@@ -4,6 +4,7 @@ const config: CodegenConfig = {
   schema: [
     'node_modules/@amazeelabs/*/directives.graphql',
     '../../apps/cms/web/modules/contrib/*/directives.graphql',
+    '../../apps/cms/web/modules/custom/*/directives.graphql',
   ],
   generates: {
     'src/directives.graphql': {
diff --git a/packages/schema/src/fragments/Page.gql b/packages/schema/src/fragments/Page.gql
index 28f7127f2..cf93afb11 100644
--- a/packages/schema/src/fragments/Page.gql
+++ b/packages/schema/src/fragments/Page.gql
@@ -38,6 +38,7 @@ fragment Page on Page {
     ...BlockHorizontalSeparator
     ...BlockAccordion
     ...BlockInfoGrid
+    ...BlockTeaserList
   }
   metaTags {
     tag
diff --git a/packages/schema/src/fragments/PageContent/BlockTeaserList.gql b/packages/schema/src/fragments/PageContent/BlockTeaserList.gql
new file mode 100644
index 000000000..f0a3e17e6
--- /dev/null
+++ b/packages/schema/src/fragments/PageContent/BlockTeaserList.gql
@@ -0,0 +1,22 @@
+fragment BlockTeaserList on BlockTeaserList {
+  layout
+  buttonText
+  staticContent {
+    ...BlockTeaserListItem
+  }
+}
+
+fragment BlockTeaserListItem on BlockTeaserItem {
+  __typename
+  content {
+    title
+    hero {
+      lead
+      headline
+    }
+    teaserImage {
+      alt
+      source(width: 400, height: 300)
+    }
+  }
+}
diff --git a/packages/schema/src/schema.graphql b/packages/schema/src/schema.graphql
index 9eb61f226..5794a3bc6 100644
--- a/packages/schema/src/schema.graphql
+++ b/packages/schema/src/schema.graphql
@@ -332,7 +332,7 @@ type BlockTeaserList @type(id: "custom/teaser-list") {
 type BlockTeaserItem @type(id: "custom/teaser-item") {
   content: BlockTeaserItemContent
     @resolveEditorBlockAttribute(key: "uuid")
-    @loadEntity(type: "node", uuid: "$")
+    @loadByUUID(type: "node", uuid: "$")
 }
 
 enum BlockTeaserListLayout @default @value(string: "GRID") {
diff --git a/packages/ui/src/components/Organisms/PageContent/BlockTeaserList.tsx b/packages/ui/src/components/Organisms/PageContent/BlockTeaserList.tsx
new file mode 100644
index 000000000..f61d15ba4
--- /dev/null
+++ b/packages/ui/src/components/Organisms/PageContent/BlockTeaserList.tsx
@@ -0,0 +1,28 @@
+import { BlockTeaserListFragment } from '@custom/schema';
+import React from 'react';
+
+export function BlockTeaserList(props: BlockTeaserListFragment) {
+  console.log(props);
+  return (
+    <div>
+      {props.staticContent?.map((teaserItem) => {
+        return (
+          <BlockTeaserItemContent
+            key={teaserItem?.content?.title}
+            {...teaserItem?.content}
+          />
+        );
+      })}
+    </div>
+  );
+}
+
+export function BlockTeaserItemContent({ title, hero }: any) {
+  return (
+    <>
+      <h2>{title}</h2>
+      <h3>{hero?.headline}</h3>
+      <div>{hero?.lead}</div>
+    </>
+  );
+}
diff --git a/packages/ui/src/components/Organisms/PageDisplay.tsx b/packages/ui/src/components/Organisms/PageDisplay.tsx
index c5999faf9..0f0f450b9 100644
--- a/packages/ui/src/components/Organisms/PageDisplay.tsx
+++ b/packages/ui/src/components/Organisms/PageDisplay.tsx
@@ -16,6 +16,7 @@ import { BlockInfoGrid } from './PageContent/BlockInfoGrid';
 import { BlockMarkup } from './PageContent/BlockMarkup';
 import { BlockMedia } from './PageContent/BlockMedia';
 import { BlockQuote } from './PageContent/BlockQuote';
+import { BlockTeaserList } from './PageContent/BlockTeaserList';
 import { PageHero } from './PageHero';
 
 export function PageDisplay(page: PageFragment) {
@@ -46,6 +47,8 @@ export function PageDisplay(page: PageFragment) {
               return <BlockAccordion key={index} {...block} />;
             case 'BlockInfoGrid':
               return <BlockInfoGrid key={index} {...block} />;
+            case 'BlockTeaserList':
+              return <BlockTeaserList key={index} {...block} />;
             default:
               throw new UnreachableCaseError(block);
           }

From 4edc29ad5d41b4ee2a72d10675ff4de01e2ca60f Mon Sep 17 00:00:00 2001
From: Vasile Chindris <vasile.chindris@amazee.com>
Date: Wed, 24 Jul 2024 12:24:08 +0300
Subject: [PATCH 074/100] chore(SLB-454): dynamic teaser list content, wip

---
 packages/drupal/custom/directives.graphql     |  8 +++++
 .../Plugin/GraphQL/Directive/ParentValue.php  | 21 +++++++++++
 .../fragments/PageContent/BlockTeaserList.gql | 29 ++++++++++-----
 packages/schema/src/operations/TeaserList.gql |  7 ++++
 packages/schema/src/schema.graphql            | 12 +++++--
 .../Organisms/PageContent/BlockTeaserList.tsx | 36 ++++++++++++++++++-
 6 files changed, 101 insertions(+), 12 deletions(-)
 create mode 100644 packages/drupal/custom/src/Plugin/GraphQL/Directive/ParentValue.php
 create mode 100644 packages/schema/src/operations/TeaserList.gql

diff --git a/packages/drupal/custom/directives.graphql b/packages/drupal/custom/directives.graphql
index f7c7b5a7d..c80242397 100644
--- a/packages/drupal/custom/directives.graphql
+++ b/packages/drupal/custom/directives.graphql
@@ -9,3 +9,11 @@ directive @loadByUUID(
   uuid: String
   operation: String
 ) repeatable on FIELD_DEFINITION | SCALAR | UNION | ENUM | INTERFACE | OBJECT
+
+"""
+Resolves the parent value
+
+Provided by the "custom" module.
+Implemented in "Drupal\custom\Plugin\GraphQL\Directive\ParentValue".
+"""
+directive @resolveParent repeatable on FIELD_DEFINITION | SCALAR | UNION | ENUM | INTERFACE | OBJECT
diff --git a/packages/drupal/custom/src/Plugin/GraphQL/Directive/ParentValue.php b/packages/drupal/custom/src/Plugin/GraphQL/Directive/ParentValue.php
new file mode 100644
index 000000000..b0734ccb0
--- /dev/null
+++ b/packages/drupal/custom/src/Plugin/GraphQL/Directive/ParentValue.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Drupal\custom\Plugin\GraphQL\Directive;
+
+use Drupal\Core\Plugin\PluginBase;
+use Drupal\graphql\GraphQL\Resolver\ResolverInterface;
+use Drupal\graphql\GraphQL\ResolverBuilder;
+use Drupal\graphql_directives\DirectiveInterface;
+
+/**
+ * @Directive(
+ *   id = "resolveParent"
+ * )
+ */
+class ParentValue extends PluginBase implements DirectiveInterface {
+
+  public function buildResolver(ResolverBuilder $builder, array $arguments): ResolverInterface {
+    return $builder->fromParent();
+  }
+
+}
diff --git a/packages/schema/src/fragments/PageContent/BlockTeaserList.gql b/packages/schema/src/fragments/PageContent/BlockTeaserList.gql
index f0a3e17e6..21af2178d 100644
--- a/packages/schema/src/fragments/PageContent/BlockTeaserList.gql
+++ b/packages/schema/src/fragments/PageContent/BlockTeaserList.gql
@@ -4,19 +4,30 @@ fragment BlockTeaserList on BlockTeaserList {
   staticContent {
     ...BlockTeaserListItem
   }
+  contentHubEnabled
+  filters {
+    title
+    limit
+  }
 }
 
 fragment BlockTeaserListItem on BlockTeaserItem {
   __typename
   content {
-    title
-    hero {
-      lead
-      headline
-    }
-    teaserImage {
-      alt
-      source(width: 400, height: 300)
-    }
+    ...BlockTeaserItemContent
+  }
+}
+
+fragment BlockTeaserItemContent on BlockTeaserItemContent {
+  id
+  path
+  title
+  hero {
+    lead
+    headline
+  }
+  teaserImage {
+    alt
+    source(width: 400, height: 300)
   }
 }
diff --git a/packages/schema/src/operations/TeaserList.gql b/packages/schema/src/operations/TeaserList.gql
new file mode 100644
index 000000000..a0e20dbf6
--- /dev/null
+++ b/packages/schema/src/operations/TeaserList.gql
@@ -0,0 +1,7 @@
+query TeaserList($locale: Locale!, $args: String) {
+  teaserList(locale: $locale, args: $args) {
+    items {
+      ...BlockTeaserItemContent
+    }
+  }
+}
diff --git a/packages/schema/src/schema.graphql b/packages/schema/src/schema.graphql
index 5794a3bc6..dcf0fd153 100644
--- a/packages/schema/src/schema.graphql
+++ b/packages/schema/src/schema.graphql
@@ -92,6 +92,10 @@ type ContentHubResult @default @value(json: "{\"total\": 0, \"items\": []}") {
   items: [ContentHubResultItem]! @prop(key: "rows")
 }
 
+type TeaserListResult @default @value(json: "{\"total\": 0, \"items\": []}") {
+  items: [BlockTeaserItemContent]! @prop(key: "rows")
+}
+
 type WebsiteSettings
   @entity(type: "config_pages", bundle: "website_settings", access: false) {
   homePage: Page @resolveEntityReference(field: "field_home_page") @seek(pos: 0)
@@ -326,7 +330,7 @@ type BlockTeaserList @type(id: "custom/teaser-list") {
   staticContent: [BlockTeaserItem] @resolveEditorBlockChildren
   contentHubEnabled: Boolean
     @resolveEditorBlockAttribute(key: "contentHubEnabled")
-  filters: BlockTeaserListFilters
+  filters: BlockTeaserListFilters @resolveParent
 }
 
 type BlockTeaserItem @type(id: "custom/teaser-item") {
@@ -342,13 +346,14 @@ enum BlockTeaserListLayout @default @value(string: "GRID") {
 
 type BlockTeaserListFilters {
   title: String @resolveEditorBlockAttribute(key: "titleFilter")
-  limit: Int @resolveEditorBlockAttribute(key: "limit")
+  limit: String @resolveEditorBlockAttribute(key: "limit")
 }
 
 """
 Inteface for anything that can appear in the teaser list.
 """
 interface BlockTeaserItemContent @resolveEntityBundle {
+  id: ID!
   path: Url!
   title: String!
   hero: Hero
@@ -380,6 +385,9 @@ type Query {
   contentHub(locale: Locale!, args: String): ContentHubResult!
     @lang(code: "$locale")
     @drupalView(id: "content_hub:default", args: "$args")
+  teaserList(locale: Locale!, args: String): TeaserListResult!
+    @lang(code: "$locale")
+    @drupalView(id: "content_hub:default", args: "$args")
 
   stringTranslations: [TranslatableString!]
     @gatsbyNodes(type: "TranslatableString")
diff --git a/packages/ui/src/components/Organisms/PageContent/BlockTeaserList.tsx b/packages/ui/src/components/Organisms/PageContent/BlockTeaserList.tsx
index f61d15ba4..a6c3d4ecf 100644
--- a/packages/ui/src/components/Organisms/PageContent/BlockTeaserList.tsx
+++ b/packages/ui/src/components/Organisms/PageContent/BlockTeaserList.tsx
@@ -1,6 +1,19 @@
-import { BlockTeaserListFragment } from '@custom/schema';
+import { useIntl } from '@amazeelabs/react-intl';
+import {
+  BlockTeaserListFragment,
+  Locale,
+  TeaserListQuery,
+} from '@custom/schema';
+import queryString from 'query-string';
 import React from 'react';
 
+import { useOperation } from '../../../utils/operation';
+
+export type TeaserListQueryArgs = {
+  title: string | undefined;
+  pageSize: string | undefined;
+};
+
 export function BlockTeaserList(props: BlockTeaserListFragment) {
   console.log(props);
   return (
@@ -13,10 +26,31 @@ export function BlockTeaserList(props: BlockTeaserListFragment) {
           />
         );
       })}
+      {props.contentHubEnabled && <BlockDynamicTeaserList {...props} />}
     </div>
   );
 }
 
+export function BlockDynamicTeaserList(props: BlockTeaserListFragment) {
+  const intl = useIntl();
+  const { data, isLoading, error } = useOperation(TeaserListQuery, {
+    locale: intl.locale as Locale,
+    args: queryString.stringify(
+      {
+        title: props.filters?.title,
+        pageSize: (props.filters?.limit || '0') as string,
+      } satisfies TeaserListQueryArgs,
+      { arrayFormat: 'bracket' },
+    ),
+  });
+  console.log({
+    data,
+    isLoading,
+    error,
+  });
+  return <>Placeholder for dynamic content!</>;
+}
+
 export function BlockTeaserItemContent({ title, hero }: any) {
   return (
     <>

From 2822d6e8035aebc6eb1e31f71db457c101e838f2 Mon Sep 17 00:00:00 2001
From: Vasile Chindris <vasile.chindris@amazee.com>
Date: Tue, 30 Jul 2024 13:51:18 +0300
Subject: [PATCH 075/100] chore(SLB-454): exclude static ids from the dynamic
 content list

---
 .../linkit.linkit_profile.teaser_list.yml     | 21 ++++++
 .../config/sync/views.view.content_hub.yml    | 49 +++++++++++++
 packages/drupal/custom/custom.module          |  6 ++
 .../fragments/PageContent/BlockTeaserList.gql |  4 +-
 packages/schema/src/operations/TeaserList.gql |  2 +-
 packages/schema/src/schema.graphql            | 12 ++--
 .../src/components/Molecules/TeaserItem.tsx   | 15 ++++
 .../Organisms/PageContent/BlockTeaserList.tsx | 69 ++++++++++++-------
 8 files changed, 146 insertions(+), 32 deletions(-)
 create mode 100644 apps/cms/config/sync/linkit.linkit_profile.teaser_list.yml
 create mode 100644 packages/ui/src/components/Molecules/TeaserItem.tsx

diff --git a/apps/cms/config/sync/linkit.linkit_profile.teaser_list.yml b/apps/cms/config/sync/linkit.linkit_profile.teaser_list.yml
new file mode 100644
index 000000000..ac46e9edf
--- /dev/null
+++ b/apps/cms/config/sync/linkit.linkit_profile.teaser_list.yml
@@ -0,0 +1,21 @@
+uuid: a50edb79-f43d-4388-9606-59750a92d720
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+label: 'Teaser list'
+id: teaser_list
+description: 'Used to search items to be displayed in a teaser list, in the Gutenberg editor.'
+matchers:
+  c42abd9a-5bed-4578-84f7-a4778a062699:
+    id: 'silverback:entity:node'
+    uuid: c42abd9a-5bed-4578-84f7-a4778a062699
+    settings:
+      include_unpublished: 0
+      metadata: ''
+      bundles: {  }
+      group_by_bundle: 0
+      substitution_type: canonical
+      limit: '100'
+    weight: 0
diff --git a/apps/cms/config/sync/views.view.content_hub.yml b/apps/cms/config/sync/views.view.content_hub.yml
index 5ea530f9e..25709b7ce 100644
--- a/apps/cms/config/sync/views.view.content_hub.yml
+++ b/apps/cms/config/sync/views.view.content_hub.yml
@@ -232,6 +232,55 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
+        uuid:
+          id: uuid
+          table: node
+          field: uuid
+          relationship: none
+          group_type: group
+          admin_label: 'Exclude UUIDs'
+          entity_type: node
+          entity_field: uuid
+          plugin_id: string
+          operator: not_regular_expression
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: uuid_op
+            label: 'Exclude UUIDs'
+            description: ''
+            use_operator: false
+            operator: uuid_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: excludeIds
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              super_admin: '0'
+              administrator: '0'
+              gatsby_build: '0'
+              editor: '0'
+            placeholder: ''
+          is_grouped: false
+          group_info:
+            label: UUID
+            description: null
+            identifier: uuid
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items:
+              1: {  }
+              2: {  }
+              3: {  }
       filter_groups:
         operator: AND
         groups:
diff --git a/packages/drupal/custom/custom.module b/packages/drupal/custom/custom.module
index 07ac7bc44..da253538f 100644
--- a/packages/drupal/custom/custom.module
+++ b/packages/drupal/custom/custom.module
@@ -225,6 +225,12 @@ function custom_form_views_exposed_form_alter(&$form, FormStateInterface $form_s
     // Not applicable
     $form['langcode']['#options']['zxx'],
   );
+  // The excludeIds filter contains a list off UUIDs, and this might exceed the
+  // 128 characters limit of the field. To avoid this, we increase the maxlength
+  // of the exposed filter to 2048.
+  if (!empty($form['excludeIds'])) {
+    $form['excludeIds']['#maxlength'] = 2048;
+  }
 }
 
 /**
diff --git a/packages/schema/src/fragments/PageContent/BlockTeaserList.gql b/packages/schema/src/fragments/PageContent/BlockTeaserList.gql
index 21af2178d..672894a04 100644
--- a/packages/schema/src/fragments/PageContent/BlockTeaserList.gql
+++ b/packages/schema/src/fragments/PageContent/BlockTeaserList.gql
@@ -14,11 +14,11 @@ fragment BlockTeaserList on BlockTeaserList {
 fragment BlockTeaserListItem on BlockTeaserItem {
   __typename
   content {
-    ...BlockTeaserItemContent
+    ...TeaserItem
   }
 }
 
-fragment BlockTeaserItemContent on BlockTeaserItemContent {
+fragment TeaserItem on TeaserItem {
   id
   path
   title
diff --git a/packages/schema/src/operations/TeaserList.gql b/packages/schema/src/operations/TeaserList.gql
index a0e20dbf6..5db796c09 100644
--- a/packages/schema/src/operations/TeaserList.gql
+++ b/packages/schema/src/operations/TeaserList.gql
@@ -1,7 +1,7 @@
 query TeaserList($locale: Locale!, $args: String) {
   teaserList(locale: $locale, args: $args) {
     items {
-      ...BlockTeaserItemContent
+      ...TeaserItem
     }
   }
 }
diff --git a/packages/schema/src/schema.graphql b/packages/schema/src/schema.graphql
index dcf0fd153..6312433f9 100644
--- a/packages/schema/src/schema.graphql
+++ b/packages/schema/src/schema.graphql
@@ -93,7 +93,7 @@ type ContentHubResult @default @value(json: "{\"total\": 0, \"items\": []}") {
 }
 
 type TeaserListResult @default @value(json: "{\"total\": 0, \"items\": []}") {
-  items: [BlockTeaserItemContent]! @prop(key: "rows")
+  items: [TeaserItem]! @prop(key: "rows")
 }
 
 type WebsiteSettings
@@ -132,7 +132,7 @@ type FooterNavigation implements Navigation @menu(menu_id: "footer") {
   items: [NavigationItem]! @lang @resolveMenuItems
 }
 
-interface Page implements ContentHubResultItem & BlockTeaserItemContent
+interface Page implements ContentHubResultItem & TeaserItem
   @resolveEntityBundle {
   id: ID!
   translations: [Page]
@@ -145,7 +145,7 @@ interface Page implements ContentHubResultItem & BlockTeaserItemContent
   metaTags: [MetaTag]
 }
 
-type DecapPage implements ContentHubResultItem & Page & BlockTeaserItemContent
+type DecapPage implements ContentHubResultItem & Page & TeaserItem
   @sourceFrom(fn: "getPages") {
   id: ID!
   translations: [Page] @decapPageTranslations
@@ -161,7 +161,7 @@ type DecapPage implements ContentHubResultItem & Page & BlockTeaserItemContent
 """
 A generic page.
 """
-type DrupalPage implements ContentHubResultItem & Page & BlockTeaserItemContent
+type DrupalPage implements ContentHubResultItem & Page & TeaserItem
   @entity(type: "node", bundle: "page")
   @type(id: "page") {
   id: ID! @resolveEntityUuid
@@ -334,7 +334,7 @@ type BlockTeaserList @type(id: "custom/teaser-list") {
 }
 
 type BlockTeaserItem @type(id: "custom/teaser-item") {
-  content: BlockTeaserItemContent
+  content: TeaserItem
     @resolveEditorBlockAttribute(key: "uuid")
     @loadByUUID(type: "node", uuid: "$")
 }
@@ -352,7 +352,7 @@ type BlockTeaserListFilters {
 """
 Inteface for anything that can appear in the teaser list.
 """
-interface BlockTeaserItemContent @resolveEntityBundle {
+interface TeaserItem @resolveEntityBundle {
   id: ID!
   path: Url!
   title: String!
diff --git a/packages/ui/src/components/Molecules/TeaserItem.tsx b/packages/ui/src/components/Molecules/TeaserItem.tsx
new file mode 100644
index 000000000..7a37c0c06
--- /dev/null
+++ b/packages/ui/src/components/Molecules/TeaserItem.tsx
@@ -0,0 +1,15 @@
+import { TeaserItemFragment } from '@custom/schema';
+import React from 'react';
+
+export function TeaserItem({
+  title,
+  hero,
+}: TeaserItemFragment & { readMoreText?: string }) {
+  return (
+    <div>
+      <h2>{title}</h2>
+      <h3>{hero?.headline}</h3>
+      <div>{hero?.lead}</div>
+    </div>
+  );
+}
diff --git a/packages/ui/src/components/Organisms/PageContent/BlockTeaserList.tsx b/packages/ui/src/components/Organisms/PageContent/BlockTeaserList.tsx
index a6c3d4ecf..5e38c49c0 100644
--- a/packages/ui/src/components/Organisms/PageContent/BlockTeaserList.tsx
+++ b/packages/ui/src/components/Organisms/PageContent/BlockTeaserList.tsx
@@ -8,55 +8,78 @@ import queryString from 'query-string';
 import React from 'react';
 
 import { useOperation } from '../../../utils/operation';
+import { TeaserItem } from '../../Molecules/TeaserItem';
 
 export type TeaserListQueryArgs = {
   title: string | undefined;
   pageSize: string | undefined;
+  excludeIds: string | undefined;
 };
 
+function getUUIDFromId(id: string) {
+  const words = id.split(':');
+  if (words.length === 1) {
+    return id;
+  }
+  return words[1];
+}
+
 export function BlockTeaserList(props: BlockTeaserListFragment) {
-  console.log(props);
+  const staticIds: Array<string | undefined> = [];
   return (
     <div>
       {props.staticContent?.map((teaserItem) => {
-        return (
-          <BlockTeaserItemContent
+        staticIds.push(getUUIDFromId(teaserItem?.content?.id || ''));
+        return teaserItem?.content ? (
+          <TeaserItem
             key={teaserItem?.content?.title}
+            readMoreText={props.buttonText}
             {...teaserItem?.content}
           />
-        );
+        ) : null;
       })}
-      {props.contentHubEnabled && <BlockDynamicTeaserList {...props} />}
+      {props.contentHubEnabled && (
+        <DynamicTeaserList excludeIds={staticIds} {...props} />
+      )}
     </div>
   );
 }
 
-export function BlockDynamicTeaserList(props: BlockTeaserListFragment) {
+export function DynamicTeaserList(
+  props: BlockTeaserListFragment & { excludeIds: Array<string | undefined> },
+) {
   const intl = useIntl();
-  const { data, isLoading, error } = useOperation(TeaserListQuery, {
+  const { data, isLoading } = useOperation(TeaserListQuery, {
     locale: intl.locale as Locale,
     args: queryString.stringify(
       {
         title: props.filters?.title,
         pageSize: (props.filters?.limit || '0') as string,
+        // The excludeIds field should contain a regular expreession value, so
+        // the final value would be something like: (^id1$|^id2$|^id3$), meaning
+        // that the results with the id1, id2 and id3 should be excluded, as
+        // they were already present in the static content.
+        excludeIds: props.excludeIds
+          ? `(^${props.excludeIds.join('$|^')}$)`
+          : '',
       } satisfies TeaserListQueryArgs,
       { arrayFormat: 'bracket' },
     ),
   });
-  console.log({
-    data,
-    isLoading,
-    error,
-  });
-  return <>Placeholder for dynamic content!</>;
-}
-
-export function BlockTeaserItemContent({ title, hero }: any) {
-  return (
-    <>
-      <h2>{title}</h2>
-      <h3>{hero?.headline}</h3>
-      <div>{hero?.lead}</div>
-    </>
-  );
+  if (!isLoading && data?.teaserList.items) {
+    return (
+      <>
+        {data.teaserList.items.map((teaserItem) => {
+          return teaserItem ? (
+            <TeaserItem
+              key={teaserItem.id}
+              readMoreText={props.buttonText}
+              {...teaserItem}
+            />
+          ) : null;
+        })}
+      </>
+    );
+  }
+  return null;
 }

From 9fcc6874577fbd735812b6914eaf10afe154b093 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Wed, 14 Aug 2024 10:54:53 +0200
Subject: [PATCH 076/100] feat(SLB-458): branded preview qr

---
 apps/cms/composer.json                          |  2 +-
 apps/cms/composer.lock                          | 14 +++++++-------
 packages/drupal/gutenberg_blocks/src/preview.ts |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/cms/composer.json b/apps/cms/composer.json
index ecf5e846c..b9d8820be 100644
--- a/apps/cms/composer.json
+++ b/apps/cms/composer.json
@@ -44,7 +44,7 @@
     "amazeelabs/silverback_gutenberg": "^2.4.8",
     "amazeelabs/silverback_iframe": "^1.3.5",
     "amazeelabs/silverback_iframe_theme": "^1.3.0",
-    "amazeelabs/silverback_preview_link": "^1.5",
+    "amazeelabs/silverback_preview_link": "^1.6",
     "amazeelabs/silverback_publisher_monitor": "^2.3.2",
     "amazeelabs/silverback_translations": "^1.0.4",
     "composer/installers": "^2.2",
diff --git a/apps/cms/composer.lock b/apps/cms/composer.lock
index 78d679f9f..ea940cd48 100644
--- a/apps/cms/composer.lock
+++ b/apps/cms/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "afb8e971f9cae5e9e79bac11c25290a2",
+    "content-hash": "8fa136f788cce1474b561f9f2f6d29af",
     "packages": [
         {
             "name": "amazeeio/drupal_integrations",
@@ -605,16 +605,16 @@
         },
         {
             "name": "amazeelabs/silverback_preview_link",
-            "version": "1.5.0",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/AmazeeLabs/silverback_preview_link.git",
-                "reference": "ed2063f95ae948dfe39ed31565d0ef5ac82c2281"
+                "reference": "61cd90cef2e0b15466524dcf2a8809ff6fefe19d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/AmazeeLabs/silverback_preview_link/zipball/ed2063f95ae948dfe39ed31565d0ef5ac82c2281",
-                "reference": "ed2063f95ae948dfe39ed31565d0ef5ac82c2281",
+                "url": "https://api.github.com/repos/AmazeeLabs/silverback_preview_link/zipball/61cd90cef2e0b15466524dcf2a8809ff6fefe19d",
+                "reference": "61cd90cef2e0b15466524dcf2a8809ff6fefe19d",
                 "shasum": ""
             },
             "require": {
@@ -631,9 +631,9 @@
             "homepage": "https://github.com/AmazeeLabs/silverback-mono/tree/development/packages/composer/amazeelabs/silverback_preview_link#readme",
             "support": {
                 "issues": "https://github.com/AmazeeLabs/silverback_preview_link/issues",
-                "source": "https://github.com/AmazeeLabs/silverback_preview_link/tree/1.5.0"
+                "source": "https://github.com/AmazeeLabs/silverback_preview_link/tree/1.6.0"
             },
-            "time": "2024-07-27T14:16:34+00:00"
+            "time": "2024-08-14T08:04:12+00:00"
         },
         {
             "name": "amazeelabs/silverback_publisher_monitor",
diff --git a/packages/drupal/gutenberg_blocks/src/preview.ts b/packages/drupal/gutenberg_blocks/src/preview.ts
index 35e800c54..8bcf97b4c 100644
--- a/packages/drupal/gutenberg_blocks/src/preview.ts
+++ b/packages/drupal/gutenberg_blocks/src/preview.ts
@@ -52,7 +52,7 @@
               class="components-external-link components-button share-preview use-ajax" 
               href="${drupalSettings.preview.previewTokenUrl}"
               data-dialog-type="modal"
-              data-dialog-options="{&quot;width&quot;:550,&quot;height&quot;:800}" 
+              data-dialog-options="{&quot;width&quot;:550,&quot;height&quot;:820}" 
               rel="external noreferrer noopener">
                 ${Drupal.t('Share preview')}<span class="components-visually-hidden">${Drupal.t('(opens in a new tab)')}</span>
                 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="components-external-link__icon css-6wogo1-StyledIcon etxm6pv0" role="img" aria-hidden="true" focusable="false">

From da9fbb433fd5e9dd3f3b30dd3d9e15ae83511fa8 Mon Sep 17 00:00:00 2001
From: Vasile Chindris <vasile.chindris@amazee.com>
Date: Wed, 14 Aug 2024 13:16:19 +0300
Subject: [PATCH 077/100] chore(SLB-454): integrate the card design into the
 block teaser list

---
 .../{ContentHubItem.gql => Card.gql}          |  9 ++-
 .../fragments/PageContent/BlockTeaserList.gql | 16 +----
 packages/schema/src/operations/ContentHub.gql |  2 +-
 packages/schema/src/operations/TeaserList.gql |  2 +-
 packages/schema/src/schema.graphql            | 27 +++-----
 .../src/components/Molecules/TeaserItem.tsx   | 15 ----
 packages/ui/src/components/Organisms/Card.tsx | 65 ++++++++++++++++++
 .../Organisms/ContentHub.stories.tsx          |  7 +-
 .../src/components/Organisms/ContentHub.tsx   | 68 ++-----------------
 .../Organisms/PageContent/BlockTeaserList.tsx | 43 ++++++------
 10 files changed, 115 insertions(+), 139 deletions(-)
 rename packages/schema/src/fragments/{ContentHubItem.gql => Card.gql} (52%)
 delete mode 100644 packages/ui/src/components/Molecules/TeaserItem.tsx
 create mode 100644 packages/ui/src/components/Organisms/Card.tsx

diff --git a/packages/schema/src/fragments/ContentHubItem.gql b/packages/schema/src/fragments/Card.gql
similarity index 52%
rename from packages/schema/src/fragments/ContentHubItem.gql
rename to packages/schema/src/fragments/Card.gql
index da98b1034..be7c9ee1f 100644
--- a/packages/schema/src/fragments/ContentHubItem.gql
+++ b/packages/schema/src/fragments/Card.gql
@@ -1,6 +1,11 @@
-fragment ContentHubResultItem on ContentHubResultItem {
-  title
+fragment CardItem on CardItem {
+  id
   path
+  title
+  hero {
+    lead
+    headline
+  }
   teaserImage {
     alt
     source(width: 400, height: 300)
diff --git a/packages/schema/src/fragments/PageContent/BlockTeaserList.gql b/packages/schema/src/fragments/PageContent/BlockTeaserList.gql
index 672894a04..225e247f8 100644
--- a/packages/schema/src/fragments/PageContent/BlockTeaserList.gql
+++ b/packages/schema/src/fragments/PageContent/BlockTeaserList.gql
@@ -14,20 +14,6 @@ fragment BlockTeaserList on BlockTeaserList {
 fragment BlockTeaserListItem on BlockTeaserItem {
   __typename
   content {
-    ...TeaserItem
-  }
-}
-
-fragment TeaserItem on TeaserItem {
-  id
-  path
-  title
-  hero {
-    lead
-    headline
-  }
-  teaserImage {
-    alt
-    source(width: 400, height: 300)
+    ...CardItem
   }
 }
diff --git a/packages/schema/src/operations/ContentHub.gql b/packages/schema/src/operations/ContentHub.gql
index 0a76302d3..6f5bf3c67 100644
--- a/packages/schema/src/operations/ContentHub.gql
+++ b/packages/schema/src/operations/ContentHub.gql
@@ -2,7 +2,7 @@ query ContentHub($locale: Locale!, $args: String) {
   contentHub(locale: $locale, args: $args) {
     total
     items {
-      ...ContentHubResultItem
+      ...CardItem
     }
   }
 }
diff --git a/packages/schema/src/operations/TeaserList.gql b/packages/schema/src/operations/TeaserList.gql
index 5db796c09..f015d3819 100644
--- a/packages/schema/src/operations/TeaserList.gql
+++ b/packages/schema/src/operations/TeaserList.gql
@@ -1,7 +1,7 @@
 query TeaserList($locale: Locale!, $args: String) {
   teaserList(locale: $locale, args: $args) {
     items {
-      ...TeaserItem
+      ...CardItem
     }
   }
 }
diff --git a/packages/schema/src/schema.graphql b/packages/schema/src/schema.graphql
index 6312433f9..a115a94fc 100644
--- a/packages/schema/src/schema.graphql
+++ b/packages/schema/src/schema.graphql
@@ -78,22 +78,13 @@ enum Locale @default @value(string: "en") {
   de
 }
 
-"""
-Inteface for anything that can appear in the content hub.
-"""
-interface ContentHubResultItem @resolveEntityBundle {
-  path: Url!
-  title: String!
-  teaserImage: MediaImage
-}
-
 type ContentHubResult @default @value(json: "{\"total\": 0, \"items\": []}") {
   total: Int!
-  items: [ContentHubResultItem]! @prop(key: "rows")
+  items: [CardItem]! @prop(key: "rows")
 }
 
 type TeaserListResult @default @value(json: "{\"total\": 0, \"items\": []}") {
-  items: [TeaserItem]! @prop(key: "rows")
+  items: [CardItem]! @prop(key: "rows")
 }
 
 type WebsiteSettings
@@ -132,8 +123,7 @@ type FooterNavigation implements Navigation @menu(menu_id: "footer") {
   items: [NavigationItem]! @lang @resolveMenuItems
 }
 
-interface Page implements ContentHubResultItem & TeaserItem
-  @resolveEntityBundle {
+interface Page implements CardItem @resolveEntityBundle {
   id: ID!
   translations: [Page]
   locale: Locale!
@@ -145,8 +135,7 @@ interface Page implements ContentHubResultItem & TeaserItem
   metaTags: [MetaTag]
 }
 
-type DecapPage implements ContentHubResultItem & Page & TeaserItem
-  @sourceFrom(fn: "getPages") {
+type DecapPage implements Page & CardItem @sourceFrom(fn: "getPages") {
   id: ID!
   translations: [Page] @decapPageTranslations
   locale: Locale!
@@ -161,7 +150,7 @@ type DecapPage implements ContentHubResultItem & Page & TeaserItem
 """
 A generic page.
 """
-type DrupalPage implements ContentHubResultItem & Page & TeaserItem
+type DrupalPage implements Page & CardItem
   @entity(type: "node", bundle: "page")
   @type(id: "page") {
   id: ID! @resolveEntityUuid
@@ -334,7 +323,7 @@ type BlockTeaserList @type(id: "custom/teaser-list") {
 }
 
 type BlockTeaserItem @type(id: "custom/teaser-item") {
-  content: TeaserItem
+  content: CardItem
     @resolveEditorBlockAttribute(key: "uuid")
     @loadByUUID(type: "node", uuid: "$")
 }
@@ -350,9 +339,9 @@ type BlockTeaserListFilters {
 }
 
 """
-Inteface for anything that can appear in the teaser list.
+Inteface for anything that can appear as a card (teaser) item
 """
-interface TeaserItem @resolveEntityBundle {
+interface CardItem @resolveEntityBundle {
   id: ID!
   path: Url!
   title: String!
diff --git a/packages/ui/src/components/Molecules/TeaserItem.tsx b/packages/ui/src/components/Molecules/TeaserItem.tsx
deleted file mode 100644
index 7a37c0c06..000000000
--- a/packages/ui/src/components/Molecules/TeaserItem.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { TeaserItemFragment } from '@custom/schema';
-import React from 'react';
-
-export function TeaserItem({
-  title,
-  hero,
-}: TeaserItemFragment & { readMoreText?: string }) {
-  return (
-    <div>
-      <h2>{title}</h2>
-      <h3>{hero?.headline}</h3>
-      <div>{hero?.lead}</div>
-    </div>
-  );
-}
diff --git a/packages/ui/src/components/Organisms/Card.tsx b/packages/ui/src/components/Organisms/Card.tsx
new file mode 100644
index 000000000..ec4bad862
--- /dev/null
+++ b/packages/ui/src/components/Organisms/Card.tsx
@@ -0,0 +1,65 @@
+import { useIntl } from '@amazeelabs/react-intl';
+import { CardItemFragment, Image, Link } from '@custom/schema';
+import React from 'react';
+
+export const CardItem = ({
+  id,
+  title,
+  hero,
+  path,
+  teaserImage,
+  readMoreText,
+}: CardItemFragment & { readMoreText?: string }) => {
+  const formattedID = 'heading-' + id;
+  const intl = useIntl();
+
+  return (
+    <article
+      aria-labelledby={formattedID}
+      className="focus-within:outline focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-indigo-600 relative max-w-sm bg-white rounded-lg hover:shadow overflow-hidden flex flex-col-reverse"
+    >
+      <div className="p-5">
+        <h5
+          id={formattedID}
+          className="mb-2 text-2xl font-bold tracking-tight text-gray-900"
+        >
+          {title}
+        </h5>
+        {hero?.headline ? <div>{hero?.headline}</div> : null}
+        <Link
+          href={path}
+          className="inline-flex items-center px-3 py-2 text-sm font-medium text-center text-blue-700 border border-blue-700 rounded-lg hover:bg-blue-800 hover:text-white focus:outline-offset-4 after:content-[''] after:absolute after:inset-0"
+        >
+          <span className="sr-only w-0 h-0 overflow-hidden">{title}</span>
+          {readMoreText ||
+            intl.formatMessage({
+              defaultMessage: 'Read more',
+              id: 'S++WdB',
+            })}
+          <svg
+            className="rtl:rotate-180 w-3.5 h-3.5 ms-2"
+            aria-hidden="true"
+            xmlns="http://www.w3.org/2000/svg"
+            fill="none"
+            viewBox="0 0 14 10"
+          >
+            <path
+              stroke="currentColor"
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              strokeWidth="2"
+              d="M1 5h12m0 0L9 1m4 4L9 9"
+            />
+          </svg>
+        </Link>
+      </div>
+      <div className="rounded-t-lg">
+        {teaserImage ? (
+          <Image {...teaserImage} className="w-full" />
+        ) : (
+          <div className="aspect-[4/3] bg-indigo-200" />
+        )}
+      </div>
+    </article>
+  );
+};
diff --git a/packages/ui/src/components/Organisms/ContentHub.stories.tsx b/packages/ui/src/components/Organisms/ContentHub.stories.tsx
index ee15a86c4..588467845 100644
--- a/packages/ui/src/components/Organisms/ContentHub.stories.tsx
+++ b/packages/ui/src/components/Organisms/ContentHub.stories.tsx
@@ -1,6 +1,6 @@
 import {
+  CardItemFragment,
   ContentHubQuery,
-  ContentHubResultItemFragment,
   OperationExecutorsProvider,
   OperationResult,
   OperationVariables,
@@ -66,8 +66,11 @@ export const WithResults: ContentHubStory = {
       const items = [...Array(82).keys()].map(
         (i) =>
           ({
+            id: `${i}`,
             path: `/item/${i + 1}` as Url,
             title: `${i % 3 === 2 ? 'Article' : 'Story'} #${i + 1}`,
+            hero:
+              i % 2 === 0 ? { headline: `Lead text for #${i + 1}` } : undefined,
             teaserImage:
               i % 3 === 1
                 ? undefined
@@ -78,7 +81,7 @@ export const WithResults: ContentHubStory = {
                       height: 300,
                     }),
                   },
-          }) satisfies ContentHubResultItemFragment,
+          }) satisfies CardItemFragment,
       );
       const args = qs.parse(vars.args || '') as ContentHubQueryArgs;
       const filtered = items.filter(
diff --git a/packages/ui/src/components/Organisms/ContentHub.tsx b/packages/ui/src/components/Organisms/ContentHub.tsx
index e7947048d..ca3b325c9 100644
--- a/packages/ui/src/components/Organisms/ContentHub.tsx
+++ b/packages/ui/src/components/Organisms/ContentHub.tsx
@@ -1,11 +1,5 @@
 import { useIntl } from '@amazeelabs/react-intl';
-import {
-  ContentHubQuery,
-  ContentHubResultItemFragment,
-  Image,
-  Link,
-  Locale,
-} from '@custom/schema';
+import { ContentHubQuery, Locale } from '@custom/schema';
 import qs from 'query-string';
 import React from 'react';
 
@@ -14,6 +8,7 @@ import { useOperation } from '../../utils/operation';
 import { Pagination, useCurrentPage } from '../Molecules/Pagination';
 import { SearchForm, useSearchParameters } from '../Molecules/SearchForm';
 import { Loading } from '../Routes/Loading';
+import { CardItem } from './Card';
 
 export type ContentHubQueryArgs = {
   title: string | undefined;
@@ -56,10 +51,10 @@ export function ContentHub({ pageSize = 10 }: { pageSize: number }) {
         {data?.contentHub.total ? (
           <>
             <ul className="my-8 grid md:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8">
-              {data?.contentHub.items.filter(isTruthy).map((item, index) => {
+              {data?.contentHub.items.filter(isTruthy).map((item) => {
                 return (
                   <li key={item.path}>
-                    <Card item={item} id={index} />
+                    <CardItem {...item} />
                   </li>
                 );
               })}
@@ -71,58 +66,3 @@ export function ContentHub({ pageSize = 10 }: { pageSize: number }) {
     </div>
   );
 }
-
-const Card = ({
-  item,
-  id,
-}: {
-  item: ContentHubResultItemFragment;
-  id: number;
-}) => {
-  const formattedID = 'heading-' + id;
-
-  return (
-    <article
-      aria-labelledby={formattedID}
-      className="focus-within:outline focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-indigo-600 relative max-w-sm bg-white rounded-lg hover:shadow overflow-hidden flex flex-col-reverse"
-    >
-      <div className="p-5">
-        <h5
-          id={formattedID}
-          className="mb-2 text-2xl font-bold tracking-tight text-gray-900"
-        >
-          {item.title}
-        </h5>
-        <Link
-          href={item.path}
-          className="inline-flex items-center px-3 py-2 text-sm font-medium text-center text-blue-700 border border-blue-700 rounded-lg hover:bg-blue-800 hover:text-white focus:outline-offset-4 after:content-[''] after:absolute after:inset-0"
-        >
-          <span className="sr-only w-0 h-0 overflow-hidden">{item.title}</span>
-          Read more
-          <svg
-            className="rtl:rotate-180 w-3.5 h-3.5 ms-2"
-            aria-hidden="true"
-            xmlns="http://www.w3.org/2000/svg"
-            fill="none"
-            viewBox="0 0 14 10"
-          >
-            <path
-              stroke="currentColor"
-              strokeLinecap="round"
-              strokeLinejoin="round"
-              strokeWidth="2"
-              d="M1 5h12m0 0L9 1m4 4L9 9"
-            />
-          </svg>
-        </Link>
-      </div>
-      <div className="rounded-t-lg">
-        {item.teaserImage ? (
-          <Image {...item.teaserImage} className="w-full" />
-        ) : (
-          <div className="aspect-[4/3] bg-indigo-200" />
-        )}
-      </div>
-    </article>
-  );
-};
diff --git a/packages/ui/src/components/Organisms/PageContent/BlockTeaserList.tsx b/packages/ui/src/components/Organisms/PageContent/BlockTeaserList.tsx
index 5e38c49c0..b0096da92 100644
--- a/packages/ui/src/components/Organisms/PageContent/BlockTeaserList.tsx
+++ b/packages/ui/src/components/Organisms/PageContent/BlockTeaserList.tsx
@@ -8,7 +8,7 @@ import queryString from 'query-string';
 import React from 'react';
 
 import { useOperation } from '../../../utils/operation';
-import { TeaserItem } from '../../Molecules/TeaserItem';
+import { CardItem } from '../Card';
 
 export type TeaserListQueryArgs = {
   title: string | undefined;
@@ -27,20 +27,25 @@ function getUUIDFromId(id: string) {
 export function BlockTeaserList(props: BlockTeaserListFragment) {
   const staticIds: Array<string | undefined> = [];
   return (
-    <div>
-      {props.staticContent?.map((teaserItem) => {
-        staticIds.push(getUUIDFromId(teaserItem?.content?.id || ''));
-        return teaserItem?.content ? (
-          <TeaserItem
-            key={teaserItem?.content?.title}
-            readMoreText={props.buttonText}
-            {...teaserItem?.content}
-          />
-        ) : null;
-      })}
-      {props.contentHubEnabled && (
-        <DynamicTeaserList excludeIds={staticIds} {...props} />
-      )}
+    <div className="bg-white py-12 px-6 lg:px-8">
+      <div className="mx-auto max-w-6xl">
+        <ul className="my-8 grid md:grid-cols-2 lg:grid-cols-3 gap-4 lg:gap-8">
+          {props.staticContent?.map((teaserItem) => {
+            staticIds.push(getUUIDFromId(teaserItem?.content?.id || ''));
+            return teaserItem?.content ? (
+              <li key={teaserItem?.content?.id}>
+                <CardItem
+                  readMoreText={props.buttonText}
+                  {...teaserItem?.content}
+                />
+              </li>
+            ) : null;
+          })}
+          {props.contentHubEnabled && (
+            <DynamicTeaserList excludeIds={staticIds} {...props} />
+          )}
+        </ul>
+      </div>
     </div>
   );
 }
@@ -71,11 +76,9 @@ export function DynamicTeaserList(
       <>
         {data.teaserList.items.map((teaserItem) => {
           return teaserItem ? (
-            <TeaserItem
-              key={teaserItem.id}
-              readMoreText={props.buttonText}
-              {...teaserItem}
-            />
+            <li key={teaserItem.id}>
+              <CardItem readMoreText={props.buttonText} {...teaserItem} />
+            </li>
           ) : null;
         })}
       </>

From 9ba6d1a088359ef01c83b04d2e651e31f3565356 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Wed, 14 Aug 2024 13:13:35 +0200
Subject: [PATCH 078/100] fix(SLB-458): preview qr logo size, expired state

---
 apps/cms/composer.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/cms/composer.lock b/apps/cms/composer.lock
index ea940cd48..07ddcb942 100644
--- a/apps/cms/composer.lock
+++ b/apps/cms/composer.lock
@@ -605,16 +605,16 @@
         },
         {
             "name": "amazeelabs/silverback_preview_link",
-            "version": "1.6.0",
+            "version": "1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/AmazeeLabs/silverback_preview_link.git",
-                "reference": "61cd90cef2e0b15466524dcf2a8809ff6fefe19d"
+                "reference": "d821c19779555add742fd57cf71bac2b34060e02"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/AmazeeLabs/silverback_preview_link/zipball/61cd90cef2e0b15466524dcf2a8809ff6fefe19d",
-                "reference": "61cd90cef2e0b15466524dcf2a8809ff6fefe19d",
+                "url": "https://api.github.com/repos/AmazeeLabs/silverback_preview_link/zipball/d821c19779555add742fd57cf71bac2b34060e02",
+                "reference": "d821c19779555add742fd57cf71bac2b34060e02",
                 "shasum": ""
             },
             "require": {
@@ -631,9 +631,9 @@
             "homepage": "https://github.com/AmazeeLabs/silverback-mono/tree/development/packages/composer/amazeelabs/silverback_preview_link#readme",
             "support": {
                 "issues": "https://github.com/AmazeeLabs/silverback_preview_link/issues",
-                "source": "https://github.com/AmazeeLabs/silverback_preview_link/tree/1.6.0"
+                "source": "https://github.com/AmazeeLabs/silverback_preview_link/tree/1.6.1"
             },
-            "time": "2024-08-14T08:04:12+00:00"
+            "time": "2024-08-14T11:11:46+00:00"
         },
         {
             "name": "amazeelabs/silverback_publisher_monitor",

From 7710ab3580ace745e3a90efd21585dfe26a9e3c4 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Wed, 14 Aug 2024 16:26:54 +0200
Subject: [PATCH 079/100] refactor(SLB-458): preview link expired state

---
 apps/cms/composer.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/cms/composer.lock b/apps/cms/composer.lock
index 07ddcb942..e1f9c49e9 100644
--- a/apps/cms/composer.lock
+++ b/apps/cms/composer.lock
@@ -605,16 +605,16 @@
         },
         {
             "name": "amazeelabs/silverback_preview_link",
-            "version": "1.6.1",
+            "version": "1.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/AmazeeLabs/silverback_preview_link.git",
-                "reference": "d821c19779555add742fd57cf71bac2b34060e02"
+                "reference": "f7761584fdf3ffabd71ec9cd1a6398afe26a7217"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/AmazeeLabs/silverback_preview_link/zipball/d821c19779555add742fd57cf71bac2b34060e02",
-                "reference": "d821c19779555add742fd57cf71bac2b34060e02",
+                "url": "https://api.github.com/repos/AmazeeLabs/silverback_preview_link/zipball/f7761584fdf3ffabd71ec9cd1a6398afe26a7217",
+                "reference": "f7761584fdf3ffabd71ec9cd1a6398afe26a7217",
                 "shasum": ""
             },
             "require": {
@@ -631,9 +631,9 @@
             "homepage": "https://github.com/AmazeeLabs/silverback-mono/tree/development/packages/composer/amazeelabs/silverback_preview_link#readme",
             "support": {
                 "issues": "https://github.com/AmazeeLabs/silverback_preview_link/issues",
-                "source": "https://github.com/AmazeeLabs/silverback_preview_link/tree/1.6.1"
+                "source": "https://github.com/AmazeeLabs/silverback_preview_link/tree/1.6.2"
             },
-            "time": "2024-08-14T11:11:46+00:00"
+            "time": "2024-08-14T14:21:34+00:00"
         },
         {
             "name": "amazeelabs/silverback_publisher_monitor",

From 976a75b1395d33c80867d0d8d7c487559ad8cd89 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Thu, 15 Aug 2024 12:53:23 +0200
Subject: [PATCH 080/100] refactor(SLB-458): consolidate qr generation

---
 apps/cms/composer.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/cms/composer.lock b/apps/cms/composer.lock
index e1f9c49e9..f380e2824 100644
--- a/apps/cms/composer.lock
+++ b/apps/cms/composer.lock
@@ -605,16 +605,16 @@
         },
         {
             "name": "amazeelabs/silverback_preview_link",
-            "version": "1.6.2",
+            "version": "1.6.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/AmazeeLabs/silverback_preview_link.git",
-                "reference": "f7761584fdf3ffabd71ec9cd1a6398afe26a7217"
+                "reference": "193b5ea07485bf825aed856577c9caeb451bcde9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/AmazeeLabs/silverback_preview_link/zipball/f7761584fdf3ffabd71ec9cd1a6398afe26a7217",
-                "reference": "f7761584fdf3ffabd71ec9cd1a6398afe26a7217",
+                "url": "https://api.github.com/repos/AmazeeLabs/silverback_preview_link/zipball/193b5ea07485bf825aed856577c9caeb451bcde9",
+                "reference": "193b5ea07485bf825aed856577c9caeb451bcde9",
                 "shasum": ""
             },
             "require": {
@@ -631,9 +631,9 @@
             "homepage": "https://github.com/AmazeeLabs/silverback-mono/tree/development/packages/composer/amazeelabs/silverback_preview_link#readme",
             "support": {
                 "issues": "https://github.com/AmazeeLabs/silverback_preview_link/issues",
-                "source": "https://github.com/AmazeeLabs/silverback_preview_link/tree/1.6.2"
+                "source": "https://github.com/AmazeeLabs/silverback_preview_link/tree/1.6.3"
             },
-            "time": "2024-08-14T14:21:34+00:00"
+            "time": "2024-08-15T10:50:30+00:00"
         },
         {
             "name": "amazeelabs/silverback_publisher_monitor",

From 942a9323fe8853f0189c66939cf18c0d488837fb Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Thu, 15 Aug 2024 18:16:42 +0200
Subject: [PATCH 081/100] chore(SLB-451): set active conditional blocks to be
 open by default

---
 packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx b/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
index 47cdc9794..258940373 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
@@ -220,6 +220,7 @@ const CollapsibleContainer = ({
         className={clsx('border border-gray-200', {
           'bg-gray-100': !isActive,
         })}
+        open={isActive}
       >
         <summary role="button" className="grid grid-cols-[34px,1fr] p-0">
           <span

From 398b10ec9ecc53bbc0efbd9575a89e1ec72b607a Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Fri, 16 Aug 2024 14:17:13 +0200
Subject: [PATCH 082/100] fix(conditional-block): remove trim on purpose field

---
 .../GutenbergValidator/AccordionItemTextValidator.php           | 1 +
 .../Plugin/Validation/GutenbergValidator/AccordionValidator.php | 1 +
 .../src/Plugin/Validation/GutenbergValidator/QuoteValidator.php | 1 +
 packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx     | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/drupal/gutenberg_blocks/src/Plugin/Validation/GutenbergValidator/AccordionItemTextValidator.php b/packages/drupal/gutenberg_blocks/src/Plugin/Validation/GutenbergValidator/AccordionItemTextValidator.php
index 4ab6b31ab..383cea393 100644
--- a/packages/drupal/gutenberg_blocks/src/Plugin/Validation/GutenbergValidator/AccordionItemTextValidator.php
+++ b/packages/drupal/gutenberg_blocks/src/Plugin/Validation/GutenbergValidator/AccordionItemTextValidator.php
@@ -3,6 +3,7 @@
 namespace Drupal\gutenberg_blocks\Plugin\Validation\GutenbergValidator;
 
 use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\silverback_gutenberg\Annotation\GutenbergValidator;
 use Drupal\silverback_gutenberg\GutenbergValidation\GutenbergCardinalityValidatorInterface;
 use Drupal\silverback_gutenberg\GutenbergValidation\GutenbergCardinalityValidatorTrait;
 use Drupal\silverback_gutenberg\GutenbergValidation\GutenbergValidatorBase;
diff --git a/packages/drupal/gutenberg_blocks/src/Plugin/Validation/GutenbergValidator/AccordionValidator.php b/packages/drupal/gutenberg_blocks/src/Plugin/Validation/GutenbergValidator/AccordionValidator.php
index d0bae38b0..60df47906 100644
--- a/packages/drupal/gutenberg_blocks/src/Plugin/Validation/GutenbergValidator/AccordionValidator.php
+++ b/packages/drupal/gutenberg_blocks/src/Plugin/Validation/GutenbergValidator/AccordionValidator.php
@@ -3,6 +3,7 @@
 namespace Drupal\gutenberg_blocks\Plugin\Validation\GutenbergValidator;
 
 use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\silverback_gutenberg\Annotation\GutenbergValidator;
 use Drupal\silverback_gutenberg\GutenbergValidation\GutenbergCardinalityValidatorInterface;
 use Drupal\silverback_gutenberg\GutenbergValidation\GutenbergCardinalityValidatorTrait;
 use Drupal\silverback_gutenberg\GutenbergValidation\GutenbergValidatorBase;
diff --git a/packages/drupal/gutenberg_blocks/src/Plugin/Validation/GutenbergValidator/QuoteValidator.php b/packages/drupal/gutenberg_blocks/src/Plugin/Validation/GutenbergValidator/QuoteValidator.php
index 53df53041..d285369f4 100644
--- a/packages/drupal/gutenberg_blocks/src/Plugin/Validation/GutenbergValidator/QuoteValidator.php
+++ b/packages/drupal/gutenberg_blocks/src/Plugin/Validation/GutenbergValidator/QuoteValidator.php
@@ -3,6 +3,7 @@
 namespace Drupal\gutenberg_blocks\Plugin\Validation\GutenbergValidator;
 
 use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\silverback_gutenberg\Annotation\GutenbergValidator;
 use Drupal\silverback_gutenberg\GutenbergValidation\GutenbergValidatorBase;
 
 /**
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx b/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
index 258940373..c282591df 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
@@ -46,7 +46,7 @@ registerBlockType(`custom/conditional`, {
 
     const displayFrom = attributes.displayFrom as string | undefined;
     const displayTo = attributes.displayTo as string | undefined;
-    const purpose = ((attributes.purpose as string) || '').trim();
+    const purpose = (attributes.purpose as string) || '';
 
     // Same logic as in BlockConditional.tsx
     const active = {

From 6aa6893dfb21002199a0627b7ba3fa9859ecd9fb Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 16 Aug 2024 19:42:47 +0200
Subject: [PATCH 083/100] fix(SLB-458): remove modal height

---
 packages/drupal/gutenberg_blocks/src/preview.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/drupal/gutenberg_blocks/src/preview.ts b/packages/drupal/gutenberg_blocks/src/preview.ts
index 8bcf97b4c..f372e9c77 100644
--- a/packages/drupal/gutenberg_blocks/src/preview.ts
+++ b/packages/drupal/gutenberg_blocks/src/preview.ts
@@ -52,7 +52,7 @@
               class="components-external-link components-button share-preview use-ajax" 
               href="${drupalSettings.preview.previewTokenUrl}"
               data-dialog-type="modal"
-              data-dialog-options="{&quot;width&quot;:550,&quot;height&quot;:820}" 
+              data-dialog-options="{&quot;width&quot;:550}" 
               rel="external noreferrer noopener">
                 ${Drupal.t('Share preview')}<span class="components-visually-hidden">${Drupal.t('(opens in a new tab)')}</span>
                 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" class="components-external-link__icon css-6wogo1-StyledIcon etxm6pv0" role="img" aria-hidden="true" focusable="false">

From f0d3842b0ad3c4e20fa7aa5d0369c0d5e66b46d9 Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Mon, 19 Aug 2024 21:42:59 +0200
Subject: [PATCH 084/100] fix: grammar

---
 packages/drupal/custom/custom.module | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/drupal/custom/custom.module b/packages/drupal/custom/custom.module
index da253538f..baac13c42 100644
--- a/packages/drupal/custom/custom.module
+++ b/packages/drupal/custom/custom.module
@@ -225,7 +225,7 @@ function custom_form_views_exposed_form_alter(&$form, FormStateInterface $form_s
     // Not applicable
     $form['langcode']['#options']['zxx'],
   );
-  // The excludeIds filter contains a list off UUIDs, and this might exceed the
+  // The `excludeIds` filter contains a list of UUIDs, and this might exceed the
   // 128 characters limit of the field. To avoid this, we increase the maxlength
   // of the exposed filter to 2048.
   if (!empty($form['excludeIds'])) {

From 09153221893bf295d5eaa470b4c461805846d699 Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Mon, 19 Aug 2024 21:51:57 +0200
Subject: [PATCH 085/100] fix: typo

---
 .../ui/src/components/Organisms/PageContent/BlockTeaserList.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui/src/components/Organisms/PageContent/BlockTeaserList.tsx b/packages/ui/src/components/Organisms/PageContent/BlockTeaserList.tsx
index b0096da92..640d0d558 100644
--- a/packages/ui/src/components/Organisms/PageContent/BlockTeaserList.tsx
+++ b/packages/ui/src/components/Organisms/PageContent/BlockTeaserList.tsx
@@ -60,7 +60,7 @@ export function DynamicTeaserList(
       {
         title: props.filters?.title,
         pageSize: (props.filters?.limit || '0') as string,
-        // The excludeIds field should contain a regular expreession value, so
+        // The excludeIds field should contain a regular expression value, so
         // the final value would be something like: (^id1$|^id2$|^id3$), meaning
         // that the results with the id1, id2 and id3 should be excluded, as
         // they were already present in the static content.

From 2074c4293982d5dcca711f825bc18ddef1fa37fe Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Mon, 19 Aug 2024 21:59:05 +0200
Subject: [PATCH 086/100] Update
 packages/drupal/gutenberg_blocks/src/blocks/teaser-list.tsx

---
 packages/drupal/gutenberg_blocks/src/blocks/teaser-list.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/drupal/gutenberg_blocks/src/blocks/teaser-list.tsx b/packages/drupal/gutenberg_blocks/src/blocks/teaser-list.tsx
index ef586649b..46c64ff90 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/teaser-list.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/teaser-list.tsx
@@ -7,9 +7,6 @@ import {
   ToggleControl,
 } from 'wordpress__components';
 
-// @ts-ignore
-const { t: __ } = Drupal;
-
 // @ts-ignore
 const { setPlainTextAttribute } = silverbackGutenbergUtils;
 

From 175d581ae9175b15685623e795dbfbfcd29c0d14 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Tue, 20 Aug 2024 22:08:33 +0200
Subject: [PATCH 087/100] refactor(SLB-458): optimize modal display for smaller
 screens

---
 apps/cms/composer.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/cms/composer.lock b/apps/cms/composer.lock
index f380e2824..b1de8150a 100644
--- a/apps/cms/composer.lock
+++ b/apps/cms/composer.lock
@@ -605,16 +605,16 @@
         },
         {
             "name": "amazeelabs/silverback_preview_link",
-            "version": "1.6.3",
+            "version": "1.6.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/AmazeeLabs/silverback_preview_link.git",
-                "reference": "193b5ea07485bf825aed856577c9caeb451bcde9"
+                "reference": "0087294dd4764a2cbb027f5a5a89008d53cf600d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/AmazeeLabs/silverback_preview_link/zipball/193b5ea07485bf825aed856577c9caeb451bcde9",
-                "reference": "193b5ea07485bf825aed856577c9caeb451bcde9",
+                "url": "https://api.github.com/repos/AmazeeLabs/silverback_preview_link/zipball/0087294dd4764a2cbb027f5a5a89008d53cf600d",
+                "reference": "0087294dd4764a2cbb027f5a5a89008d53cf600d",
                 "shasum": ""
             },
             "require": {
@@ -631,9 +631,9 @@
             "homepage": "https://github.com/AmazeeLabs/silverback-mono/tree/development/packages/composer/amazeelabs/silverback_preview_link#readme",
             "support": {
                 "issues": "https://github.com/AmazeeLabs/silverback_preview_link/issues",
-                "source": "https://github.com/AmazeeLabs/silverback_preview_link/tree/1.6.3"
+                "source": "https://github.com/AmazeeLabs/silverback_preview_link/tree/1.6.4"
             },
-            "time": "2024-08-15T10:50:30+00:00"
+            "time": "2024-08-20T20:05:58+00:00"
         },
         {
             "name": "amazeelabs/silverback_publisher_monitor",

From b665f0661e097b5f72858167d8bcf358dcdbe3df Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Tue, 9 Jul 2024 10:10:14 +0200
Subject: [PATCH 088/100] feat(SLB-450): add auth dependencies

---
 apps/preview/package.json | 10 +++++++-
 pnpm-lock.yaml            | 51 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/apps/preview/package.json b/apps/preview/package.json
index e5ec902c5..8a7f1401a 100644
--- a/apps/preview/package.json
+++ b/apps/preview/package.json
@@ -14,20 +14,28 @@
   "dependencies": {
     "@custom/schema": "workspace:*",
     "@custom/ui": "workspace:*",
+    "cookie-parser": "^1.4.6",
     "express": "^4.19.2",
+    "express-session": "^1.18.0",
     "express-ws": "^5.0.2",
+    "memorystore": "^1.6.7",
+    "node-fetch": "^3.3.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "rxjs": "^7.8.1"
+    "rxjs": "^7.8.1",
+    "simple-oauth2": "^5.1.0"
   },
   "devDependencies": {
     "@swc/cli": "^0.1.63",
     "@swc/core": "^1.3.102",
+    "@types/cookie-parser": "^1.4.7",
     "@types/express": "^4.17.21",
+    "@types/express-session": "^1.18.0",
     "@types/express-ws": "^3.0.4",
     "@types/node": "^20.11.17",
     "@types/react": "^18.2.46",
     "@types/react-dom": "^18.2.18",
+    "@types/simple-oauth2": "^5.0.7",
     "@typescript-eslint/eslint-plugin": "^7.2.0",
     "@typescript-eslint/parser": "^7.2.0",
     "@vitejs/plugin-react-swc": "^3.5.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d0dea0ed0..626191563 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -195,12 +195,24 @@ importers:
       '@custom/ui':
         specifier: workspace:*
         version: link:../../packages/ui
+      cookie-parser:
+        specifier: ^1.4.6
+        version: 1.4.6
       express:
         specifier: ^4.19.2
         version: 4.19.2
+      express-session:
+        specifier: ^1.18.0
+        version: 1.18.0
       express-ws:
         specifier: ^5.0.2
         version: 5.0.2(express@4.19.2)
+      memorystore:
+        specifier: ^1.6.7
+        version: 1.6.7
+      node-fetch:
+        specifier: ^3.3.2
+        version: 3.3.2
       react:
         specifier: ^18.2.0
         version: 18.2.0
@@ -210,6 +222,9 @@ importers:
       rxjs:
         specifier: ^7.8.1
         version: 7.8.1
+      simple-oauth2:
+        specifier: ^5.1.0
+        version: 5.1.0
     devDependencies:
       '@swc/cli':
         specifier: ^0.1.63
@@ -217,9 +232,15 @@ importers:
       '@swc/core':
         specifier: ^1.3.102
         version: 1.3.102
+      '@types/cookie-parser':
+        specifier: ^1.4.7
+        version: 1.4.7
       '@types/express':
         specifier: ^4.17.21
         version: 4.17.21
+      '@types/express-session':
+        specifier: ^1.18.0
+        version: 1.18.0
       '@types/express-ws':
         specifier: ^3.0.4
         version: 3.0.4
@@ -232,6 +253,9 @@ importers:
       '@types/react-dom':
         specifier: ^18.2.18
         version: 18.2.18
+      '@types/simple-oauth2':
+        specifier: ^5.0.7
+        version: 5.0.7
       '@typescript-eslint/eslint-plugin':
         specifier: ^7.2.0
         version: 7.2.0(@typescript-eslint/parser@7.2.0)(eslint@7.0.0)(typescript@5.3.3)
@@ -9786,6 +9810,12 @@ packages:
       '@types/node': 18.15.13
     dev: true
 
+  /@types/cookie-parser@1.4.7:
+    resolution: {integrity: sha512-Fvuyi354Z+uayxzIGCwYTayFKocfV7TuDYZClCdIP9ckhvAu/ixDtCB6qx2TT0FKjPLf1f3P/J1rgf6lPs64mw==}
+    dependencies:
+      '@types/express': 4.17.21
+    dev: true
+
   /@types/cookie@0.4.1:
     resolution: {integrity: sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==}
 
@@ -9875,6 +9905,12 @@ packages:
       '@types/send': 0.17.4
     dev: true
 
+  /@types/express-session@1.18.0:
+    resolution: {integrity: sha512-27JdDRgor6PoYlURY+Y5kCakqp5ulC0kmf7y+QwaY+hv9jEFuQOThgkjyA53RP3jmKuBsH5GR6qEfFmvb8mwOA==}
+    dependencies:
+      '@types/express': 4.17.21
+    dev: true
+
   /@types/express-ws@3.0.4:
     resolution: {integrity: sha512-Yjj18CaivG5KndgcvzttWe8mPFinPCHJC2wvyQqVzA7hqeufM8EtWMj6mpp5omg3s8XALUexhOu8aXAyi/DyJQ==}
     dependencies:
@@ -10224,6 +10260,10 @@ packages:
       '@types/send': 0.17.4
     dev: true
 
+  /@types/simple-oauth2@5.0.7:
+    resolution: {integrity: sha512-8JbWVJbiTSBQP/7eiyGKyXWAqp3dKQZpaA+pdW16FCi32ujkzRMG8JfjoAzdWt6W8U591ZNdHcPtP2D7ILTKuA==}
+    dev: true
+
   /@types/stack-utils@2.0.3:
     resolution: {integrity: sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==}
     dev: true
@@ -30126,6 +30166,17 @@ packages:
       - supports-color
     dev: false
 
+  /simple-oauth2@5.1.0:
+    resolution: {integrity: sha512-gWDa38Ccm4MwlG5U7AlcJxPv3lvr80dU7ARJWrGdgvOKyzSj1gr3GBPN1rABTedAYvC/LsGYoFuFxwDBPtGEbw==}
+    dependencies:
+      '@hapi/hoek': 11.0.4
+      '@hapi/wreck': 18.0.1
+      debug: 4.3.4
+      joi: 17.12.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /simple-swizzle@0.2.2:
     resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==}
     requiresBuild: true

From 37236f60998b67c4d0b214022771ca57e92e76b5 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Tue, 9 Jul 2024 12:16:03 +0200
Subject: [PATCH 089/100] feat(SLB-450): port publisher auth to preview

---
 apps/preview/package.json                     |   2 +-
 apps/preview/server/index.ts                  | 119 +++++-
 apps/preview/server/utils/authentication.ts   |  68 +++
 apps/preview/server/utils/config.ts           |  68 +++
 apps/preview/server/utils/oAuth2.ts           | 395 ++++++++++++++++++
 apps/preview/server/utils/oAuth2GrantTypes.ts |   4 +
 6 files changed, 654 insertions(+), 2 deletions(-)
 create mode 100644 apps/preview/server/utils/authentication.ts
 create mode 100644 apps/preview/server/utils/config.ts
 create mode 100644 apps/preview/server/utils/oAuth2.ts
 create mode 100644 apps/preview/server/utils/oAuth2GrantTypes.ts

diff --git a/apps/preview/package.json b/apps/preview/package.json
index 8a7f1401a..f8c8bc972 100644
--- a/apps/preview/package.json
+++ b/apps/preview/package.json
@@ -8,7 +8,7 @@
     "dev:app": "vite",
     "dev:server": "tsx watch server/index.ts",
     "prep:app": "vite build",
-    "prep:server": "swc ./server -d ./build",
+    "prep:server": "swc ./server ./server/utils -d ./build",
     "start": "node build/index.js"
   },
   "dependencies": {
diff --git a/apps/preview/server/index.ts b/apps/preview/server/index.ts
index 333df04a0..45e154a9a 100644
--- a/apps/preview/server/index.ts
+++ b/apps/preview/server/index.ts
@@ -1,6 +1,21 @@
 import express from 'express';
 import expressWs from 'express-ws';
 import { Subject } from 'rxjs';
+import {
+  getAuthenticationMiddleware,
+  isSessionRequired,
+} from './utils/authentication';
+import {
+  getOAuth2AuthorizeUrl,
+  getPersistedAccessToken,
+  hasPublisherAccess,
+  initializeSession,
+  isAuthenticated,
+  oAuth2AuthorizationCodeClient,
+  persistAccessToken,
+  stateMatches,
+} from './utils/oAuth2';
+import { getConfig } from './utils/config';
 
 const expressServer = express();
 const expressWsInstance = expressWs(expressServer);
@@ -9,6 +24,13 @@ const { app } = expressWsInstance;
 const updates$ = new Subject();
 app.use(express.json());
 
+// A session is only needed for OAuth2 Authorization Code grant type.
+if (isSessionRequired()) {
+  initializeSession(expressServer);
+}
+// Authentication middleware based on the configuration.
+const authMiddleware = getAuthenticationMiddleware(getConfig());
+
 app.get('/endpoint.js', (_, res) => {
   res.send(
     `window.GRAPHQL_ENDPOINT = "${
@@ -17,7 +39,6 @@ app.get('/endpoint.js', (_, res) => {
   );
 });
 
-// TODO: Protect endpoints and preview with Drupal authentication.
 app.post('/__preview', (req, res) => {
   updates$.next(req.body || {});
   res.json(true);
@@ -36,6 +57,102 @@ app.get('/__preview/*', (req, _, next) => {
   next();
 });
 
+// ---------------------------------------------------------------------------
+// OAuth2 routes
+// ---------------------------------------------------------------------------
+
+// Fallback route for login. Is used if there is no origin cookie.
+app.get('/oauth/login', async (req, res) => {
+  if (await isAuthenticated(req)) {
+    const accessPublisher = await hasPublisherAccess(req);
+    if (accessPublisher) {
+      res.send(
+        'Preview access is granted. <a href="/___status/">View status</a>',
+      );
+    } else {
+      res.send(
+        'Preview access is not granted. Contact your site administrator. <a href="/oauth/logout">Log out</a>',
+      );
+    }
+  } else {
+    res.cookie('origin', req.path).send('<a href="/oauth">Log in</a>');
+  }
+});
+
+// Redirects to authentication provider.
+app.get('/oauth', (req, res) => {
+  const client = oAuth2AuthorizationCodeClient();
+  if (!client) {
+    throw new Error('Missing OAuth2 client.');
+  }
+  const authorizationUri = getOAuth2AuthorizeUrl(client, req);
+  res.redirect(authorizationUri);
+});
+
+// Callback from authentication provider.
+app.get('/oauth/callback', async (req, res) => {
+  const oAuth2Config = getConfig().oAuth2;
+  if (!oAuth2Config) {
+    throw new Error('Missing OAuth2 configuration.');
+  }
+
+  const client = oAuth2AuthorizationCodeClient();
+  if (!client) {
+    throw new Error('Missing OAuth2 client.');
+  }
+
+  // Check if the state matches.
+  if (!stateMatches(req)) {
+    return res.status(500).json('State does not match.');
+  }
+
+  const { code } = req.query;
+  const options = {
+    code,
+    scope: oAuth2Config.scope,
+    // Do not include redirect_uri, makes Drupal simple_oauth fail.
+    // Returns 400 Bad Request.
+    //redirect_uri: 'http://127.0.0.1:7777/callback',
+  };
+
+  try {
+    // @ts-ignore options due to missing redirect_uri.
+    const accessToken = await client.getToken(options);
+    console.log('/oauth/callback accessToken', accessToken);
+    persistAccessToken(accessToken, req);
+
+    if (req.cookies.origin) {
+      res.redirect(req.cookies.origin);
+    } else {
+      res.redirect('/oauth/login');
+    }
+  } catch (error) {
+    console.error(error);
+    return (
+      res
+        .status(500)
+        // @ts-ignore
+        .json(`Authentication failed with error: ${error.message}`)
+    );
+  }
+});
+
+// Removes the session.
+app.get('/oauth/logout', async (req, res) => {
+  const accessToken = getPersistedAccessToken(req);
+  if (!accessToken) {
+    return res.status(401).send('No token found.');
+  }
+
+  // Requires this Drupal patch
+  // https://www.drupal.org/project/simple_oauth/issues/2945273
+  // await accessToken.revokeAll();
+  req.session.destroy(function (err) {
+    console.log('Remove session', err);
+  });
+  res.redirect('/oauth/login');
+});
+
 app.use(express.static('./dist'));
 
 const isLagoon = !!process.env.LAGOON;
diff --git a/apps/preview/server/utils/authentication.ts b/apps/preview/server/utils/authentication.ts
new file mode 100644
index 000000000..7dfefd417
--- /dev/null
+++ b/apps/preview/server/utils/authentication.ts
@@ -0,0 +1,68 @@
+import { NextFunction, Request, RequestHandler, Response } from 'express';
+import basicAuth from 'express-basic-auth';
+
+import { getConfig, PreviewConfig } from './config';
+import {
+  oAuth2AuthCodeMiddleware,
+  oAuth2ResourceOwnerPasswordMiddleware,
+} from './oAuth2';
+import { OAuth2GrantTypes } from './oAuth2GrantTypes';
+
+/**
+ * Returns the Express authentication middleware based on the configuration.
+ *
+ * Favours OAuth2, then Basic Auth, then falling back to no auth
+ * if not configured (= grant access).
+ */
+export const getAuthenticationMiddleware = (
+  config: PreviewConfig,
+): RequestHandler =>
+  ((): RequestHandler => {
+    const skipAuthentication =
+      process.env.PUBLISHER_SKIP_AUTHENTICATION === 'true';
+    if (skipAuthentication) {
+      return (req: Request, res: Response, next: NextFunction): void => next();
+    }
+
+    const oAuth2Config = config.oAuth2;
+    if (oAuth2Config) {
+      if (oAuth2Config.grantType === OAuth2GrantTypes.AuthorizationCode) {
+        return oAuth2AuthCodeMiddleware;
+      } else if (
+        oAuth2Config.grantType === OAuth2GrantTypes.ResourceOwnerPassword
+      ) {
+        return oAuth2ResourceOwnerPasswordMiddleware;
+      } else {
+        console.error(
+          'Only the AuthorizationCode and ResourceOwnerPassword grant types are currently supported.',
+        );
+      }
+    }
+
+    const basicAuthConfig = getConfig().basicAuth;
+    if (basicAuthConfig) {
+      return basicAuth({
+        users: { [basicAuthConfig.username]: basicAuthConfig.password },
+        challenge: true,
+      });
+    }
+
+    return (req: Request, res: Response, next: NextFunction): void => next();
+  })();
+
+/**
+ * Checks if a session is required based on the configuration.
+ */
+export const isSessionRequired = (): boolean => {
+  let result = false;
+  if (getConfig().oAuth2) {
+    const oAuth2Config = getConfig().oAuth2;
+    if (!oAuth2Config) {
+      throw new Error('Missing OAuth2 configuration.');
+    }
+    if (oAuth2Config.grantType === OAuth2GrantTypes.AuthorizationCode) {
+      result = true;
+    }
+  }
+  return result;
+};
diff --git a/apps/preview/server/utils/config.ts b/apps/preview/server/utils/config.ts
new file mode 100644
index 000000000..fa07230ac
--- /dev/null
+++ b/apps/preview/server/utils/config.ts
@@ -0,0 +1,68 @@
+import { OAuth2GrantTypes } from './oAuth2GrantTypes';
+
+export type PreviewConfig = {
+  /**
+   * Enables basic auth.
+   */
+  basicAuth?: {
+    username: string;
+    password: string;
+  };
+  /**
+   * Enables OAuth2.
+   */
+  oAuth2?: {
+    clientId: string;
+    clientSecret: string;
+    scope: string;
+    tokenHost: string;
+    tokenPath: string;
+    grantType: OAuth2GrantTypes;
+    // Use for Authorization Code grant type only.
+    authorizePath?: string;
+    sessionSecret?: string;
+    environmentType?: string; // 'development' | 'production';
+  };
+};
+
+export const getConfig = (): PreviewConfig => {
+  return {
+    basicAuth: {
+      username: 'test',
+      password: 'test',
+    },
+    // When several authentication methods are configured,
+    // oAuth2 takes precedence.
+    // oAuth2: {
+    //   clientId: process.env.OAUTH2_CLIENT_ID || 'preview',
+    //   clientSecret: process.env.OAUTH2_CLIENT_ID || 'preview',
+    //   // Applies for ResourceOwnerPassword only.
+    //   scope: process.env.OAUTH2_SCOPE || 'preview',
+    //   tokenHost: process.env.OAUTH2_TOKEN_HOST || 'http://127.0.0.1:8888',
+    //   tokenPath: process.env.OAUTH2_TOKEN_PATH || '/oauth/token',
+    //   authorizePath:
+    //     process.env.OAUTH2_AUTHORIZE_PATH ||
+    //     '/oauth/authorize?response_type=code',
+    //   sessionSecret: process.env.OAUTH2_SESSION_SECRET || 'banana',
+    //   environmentType: process.env.OAUTH2_ENVIRONMENT_TYPE || 'development',
+    //   grantType: 0, // AuthorizationCode
+    // },
+  };
+};
+
+// let _config: PreviewConfig | null = null;
+
+// export const getConfig = (): PreviewConfig => {
+//   if (!_config) {
+//     throw new Error('Config is not set');
+//   }
+//   return _config;
+// };
+//
+// export const setConfig = (config: PreviewConfig): void => {
+//   _config = config;
+// };
+//
+// export const clearConfig = (): void => {
+//   _config = null;
+// };
diff --git a/apps/preview/server/utils/oAuth2.ts b/apps/preview/server/utils/oAuth2.ts
new file mode 100644
index 000000000..4acfc700f
--- /dev/null
+++ b/apps/preview/server/utils/oAuth2.ts
@@ -0,0 +1,395 @@
+import cookieParser from 'cookie-parser';
+import crypto from 'crypto';
+import {
+  Express,
+  NextFunction,
+  Request,
+  RequestHandler,
+  Response,
+} from 'express';
+import session from 'express-session';
+import createMemoryStore from 'memorystore';
+import fetch from 'node-fetch';
+import {
+  AccessToken,
+  AuthorizationCode,
+  ModuleOptions,
+  ResourceOwnerPassword,
+} from 'simple-oauth2';
+
+import { getConfig } from './config';
+
+declare module 'express-session' {
+  interface SessionData {
+    tokenString: string;
+    state: string;
+  }
+}
+
+// In seconds
+export const SESSION_MAX_AGE = 300;
+export const ACCESS_TOKEN_EXPIRATION_TIME = 300;
+
+const ENCRYPTION_KEY =
+  process.env.ENCRYPTION_KEY || crypto.randomBytes(32).toString('hex');
+
+/**
+ * Returns the Authorization Code middleware.
+ *
+ * This should be favoured in most cases when using OAuth2.
+ */
+export const oAuth2AuthCodeMiddleware: RequestHandler = ((): RequestHandler => {
+  return async (req: Request, res: Response, next: NextFunction) => {
+    if (await isAuthenticated(req)) {
+      const accessPublisher = await hasPublisherAccess(req);
+      if (accessPublisher) {
+        return next();
+      } else {
+        res
+          .status(403)
+          .send(
+            'Your user account does not have Publisher access. You might contact your site administrator.',
+          );
+      }
+    } else {
+      res.cookie('origin', req.originalUrl).redirect('/oauth');
+    }
+  };
+})();
+
+/**
+ * Returns the Resource Owner Password middleware.
+ *
+ * This can be used as a minimal implementation of OAuth2 if the challenge
+ * is to be exposed in the client / the backend is only accessible
+ * from the client and not the end user.
+ *
+ * Refresh tokens are not implemented.
+ */
+export const oAuth2ResourceOwnerPasswordMiddleware: RequestHandler =
+  ((): RequestHandler => {
+    return async (req: Request, res: Response, next: NextFunction) => {
+      const oAuth2Config = getConfig().oAuth2;
+      if (!oAuth2Config) {
+        throw new Error('OAuth2 configuration is missing.');
+      }
+
+      // As an MVP, we are using the www-authenticate header to send the challenge.
+      // This allows to have a lightweight implementation of the UI, and we
+      // don't need to handle any session.
+      const base64Auth = (req.headers.authorization || '').split(' ')[1] || '';
+      const [wwwLogin, wwwPassword] = Buffer.from(base64Auth, 'base64')
+        .toString()
+        .split(':');
+
+      const oAuth2ModuleOptions: ModuleOptions = {
+        client: {
+          id: oAuth2Config.clientId,
+          secret: oAuth2Config.clientSecret,
+        },
+        auth: {
+          tokenHost: oAuth2Config.tokenHost,
+          tokenPath: oAuth2Config.tokenPath,
+        },
+      };
+      const oAuth2Client = new ResourceOwnerPassword(oAuth2ModuleOptions);
+      let errorMessage: string | null = null;
+
+      if (wwwLogin && wwwPassword) {
+        const tokenParams = {
+          username: wwwLogin,
+          password: wwwPassword,
+          scope: oAuth2Config.scope,
+        };
+
+        try {
+          const accessToken = await oAuth2Client.getToken(tokenParams);
+          if (accessToken) {
+            const publisherAuthentication = await fetch(
+              `${oAuth2ModuleOptions.auth.tokenHost}/publisher/access`,
+              {
+                method: 'POST',
+                headers: {
+                  'Content-Type': 'application/json',
+                  Authorization: `Bearer ${accessToken.token.access_token}`,
+                },
+              },
+            );
+
+            if (publisherAuthentication.status === 200) {
+              return next();
+            } else if (
+              publisherAuthentication.status === 403 ||
+              publisherAuthentication.status === 401
+            ) {
+              errorMessage = 'Publisher authentication failed.';
+            } else if (publisherAuthentication.status === 500) {
+              errorMessage = 'Internal server error.';
+            } else {
+              errorMessage = 'Unknown error.';
+            }
+          }
+        } catch (data) {
+          errorMessage = 'OAuth2 authentication failed.';
+        }
+      }
+
+      // In case of failure, just send a 401 with the www-authenticate header.
+      res.set('WWW-Authenticate', 'Basic realm="401"');
+      if (errorMessage) {
+        console.error(errorMessage);
+        res.status(401).send(errorMessage);
+      } else {
+        res.status(401).send('Authentication required.');
+      }
+    };
+  })();
+
+export const initializeSession = (server: Express): void => {
+  const oAuth2Config = getConfig().oAuth2;
+  if (!oAuth2Config) {
+    throw new Error('Missing OAuth2 configuration.');
+  }
+  server.use(cookieParser());
+
+  const sessionMaxAgeInMilliseconds = SESSION_MAX_AGE * 1000;
+  const MemoryStore = createMemoryStore(session);
+
+  const config = {
+    secret:
+      oAuth2Config.sessionSecret || crypto.randomBytes(64).toString('hex'),
+    resave: true, // seems to be needed for MemoryStore
+    saveUninitialized: false,
+    cookie: { maxAge: sessionMaxAgeInMilliseconds },
+    // Keep it simple, use production safe memory store,
+    // not the one provided by express-session.
+    // Other available stores
+    // https://expressjs.com/en/resources/middleware/session.html#compatible-session-stores
+    store: new MemoryStore({
+      checkPeriod: sessionMaxAgeInMilliseconds, // prune expired entries
+    }),
+  };
+
+  if (oAuth2Config.environmentType === 'production') {
+    server.set('trust proxy', 1); // trust first proxy
+    // @ts-ignore
+    config.cookie.secure = true; // serve secure cookies
+  }
+
+  server.use(session(config));
+};
+
+export const oAuth2AuthorizationCodeClient = (): AuthorizationCode | null => {
+  const oAuth2Config = getConfig().oAuth2;
+  if (!oAuth2Config) {
+    return null;
+  }
+  return new AuthorizationCode({
+    client: {
+      id: oAuth2Config.clientId,
+      secret: oAuth2Config.clientSecret,
+    },
+    auth: {
+      tokenHost: oAuth2Config.tokenHost,
+      tokenPath: oAuth2Config.tokenPath,
+      authorizePath: oAuth2Config.authorizePath,
+    },
+  });
+};
+
+export const persistAccessToken = (token: AccessToken, req: Request): void => {
+  req.session.tokenString = encrypt(JSON.stringify(token));
+};
+
+export const getPersistedAccessToken = (req: Request): AccessToken | null => {
+  const client = oAuth2AuthorizationCodeClient();
+  if (!client) {
+    throw new Error('Missing OAuth2 client.');
+  }
+  if (req.session.tokenString) {
+    const decryptedToken = decrypt(req.session.tokenString);
+    if (!decryptedToken) {
+      throw new Error('Failed to decrypt token.');
+    }
+    return client.createToken(JSON.parse(decryptedToken));
+  } else {
+    return null;
+  }
+};
+
+const encrypt = (text: string): string => {
+  if (!ENCRYPTION_KEY) {
+    throw new Error('Missing encryption key.');
+  }
+
+  const oAuth2Config = getConfig().oAuth2;
+  if (!oAuth2Config) {
+    throw new Error('Missing OAuth2 configuration.');
+  }
+
+  try {
+    const iv = crypto.randomBytes(16);
+    const key = crypto
+      .createHash('sha256')
+      .update(ENCRYPTION_KEY)
+      .digest('base64')
+      .substring(0, 32);
+    const cipher = crypto.createCipheriv('aes-256-cbc', key, iv);
+    let encrypted = cipher.update(text);
+    encrypted = Buffer.concat([encrypted, cipher.final()]);
+    return iv.toString('hex') + ':' + encrypted.toString('hex');
+  } catch (error) {
+    throw new Error('Encryption failed.');
+  }
+};
+
+const decrypt = (encryptedText: string): string => {
+  if (!ENCRYPTION_KEY) {
+    throw new Error('Missing encryption key.');
+  }
+
+  try {
+    const textParts = encryptedText.split(':');
+    // @ts-ignore
+    const iv = Buffer.from(textParts.shift(), 'hex');
+
+    const encryptedData = Buffer.from(textParts.join(':'), 'hex');
+    const key = crypto
+      .createHash('sha256')
+      .update(ENCRYPTION_KEY)
+      .digest('base64')
+      .substring(0, 32);
+    const decipher = crypto.createDecipheriv('aes-256-cbc', key, iv);
+
+    const decrypted = decipher.update(encryptedData);
+    const decryptedText = Buffer.concat([decrypted, decipher.final()]);
+    return decryptedText.toString();
+  } catch (error) {
+    throw new Error('Decryption failed.');
+  }
+};
+
+export const getOAuth2AuthorizeUrl = (
+  client: AuthorizationCode,
+  req: Request,
+): string => {
+  const oAuth2Config = getConfig().oAuth2;
+  if (!oAuth2Config) {
+    throw new Error('Missing OAuth2 configuration.');
+  }
+
+  const state = crypto.randomBytes(32).toString('hex');
+  persistState(state, req);
+  const encodedState = Buffer.from(state).toString('base64');
+  return client.authorizeURL({
+    // Set on the OAuth2 provider.
+    //redirect_uri: callbackUrl,
+    // https://auth0.com/docs/secure/attack-protection/state-parameters
+    state: encodedState,
+  });
+};
+
+export const persistState = (state: string, req: Request): void => {
+  req.session.state = state;
+};
+
+export const stateMatches = (req: Request): boolean => {
+  const persistedState = req.session.state;
+  if (persistedState === undefined) {
+    return false;
+  }
+  const encodedState = req.query.state as string;
+  if (encodedState === undefined) {
+    return false;
+  }
+  const decodedState = Buffer.from(encodedState, 'base64').toString('ascii');
+  return persistedState === decodedState;
+};
+
+export const isAuthenticated = async (req: Request): Promise<boolean> => {
+  const oAuth2Config = getConfig().oAuth2;
+  if (!oAuth2Config) {
+    throw new Error('Missing OAuth2 configuration.');
+  }
+
+  let result = false;
+  let accessToken = getPersistedAccessToken(req);
+  if (accessToken) {
+    if (!accessToken.expired(ACCESS_TOKEN_EXPIRATION_TIME)) {
+      result = true;
+    } else {
+      try {
+        accessToken = await accessToken.refresh();
+        persistAccessToken(accessToken, req);
+        result = true;
+      } catch (error) {
+        console.error('Error refreshing access token: ', error);
+      }
+    }
+  } else {
+    console.log('No access token.');
+  }
+
+  return result;
+};
+
+export const hasPublisherAccess = async (req: Request): Promise<boolean> => {
+  const oAuth2Config = getConfig().oAuth2;
+  if (!oAuth2Config) {
+    throw new Error('Missing OAuth2 configuration.');
+  }
+
+  const accessToken = getPersistedAccessToken(req);
+  if (!accessToken) {
+    throw new Error('Missing access token.');
+  }
+
+  const publisherAccess = await fetch(
+    `${oAuth2Config.tokenHost}/publisher/access`,
+    {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        Authorization: `Bearer ${accessToken.token.access_token}`,
+      },
+    },
+  );
+
+  const status = await publisherAccess.status;
+  return status === 200;
+};
+
+/**
+ * User info.
+ *
+ * Can be used for debugging purposes.
+ */
+export const getUserInfo = async (req: Request): Promise<boolean> => {
+  const accessToken = getPersistedAccessToken(req);
+  if (!accessToken) {
+    throw new Error('Missing access token.');
+  }
+  try {
+    const userInfoResponse = await fetch(
+      'http://127.0.0.1:8888/oauth/userinfo',
+      {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          Authorization: `Bearer ${accessToken.token.access_token}`,
+        },
+      },
+    );
+    const status = await userInfoResponse.status;
+    console.debug('User info status', status);
+    if (status === 200) {
+      const json = await userInfoResponse.json();
+      console.debug('User info', json);
+    }
+    return status === 200;
+  } catch (error) {
+    console.error('Error fetching user info', error);
+  }
+
+  return false;
+};
diff --git a/apps/preview/server/utils/oAuth2GrantTypes.ts b/apps/preview/server/utils/oAuth2GrantTypes.ts
new file mode 100644
index 000000000..1807555ab
--- /dev/null
+++ b/apps/preview/server/utils/oAuth2GrantTypes.ts
@@ -0,0 +1,4 @@
+export enum OAuth2GrantTypes {
+  AuthorizationCode,
+  ResourceOwnerPassword,
+}

From 19c833a622c81d071c0427ad07e6c6f51e19cb85 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Tue, 9 Jul 2024 17:16:24 +0200
Subject: [PATCH 090/100] feat(SLB-450): create preview consumer on deploy

---
 apps/cms/.lagoon.env                     |  1 +
 packages/drupal/custom/custom.deploy.php | 99 ++++++++++++++++++------
 2 files changed, 77 insertions(+), 23 deletions(-)

diff --git a/apps/cms/.lagoon.env b/apps/cms/.lagoon.env
index 911f7c798..3939d749c 100644
--- a/apps/cms/.lagoon.env
+++ b/apps/cms/.lagoon.env
@@ -5,3 +5,4 @@ PREVIEW_URL="https://preview.${LAGOON_ENVIRONMENT}.${LAGOON_PROJECT}.ch4.amazee.
 
 # Used to set the original client secret.
 PUBLISHER_OAUTH2_CLIENT_SECRET=REPLACE_ME
+PREVIEW_OAUTH2_CLIENT_SECRET=REPLACE_ME
diff --git a/packages/drupal/custom/custom.deploy.php b/packages/drupal/custom/custom.deploy.php
index 29177aad4..c9cd3390c 100644
--- a/packages/drupal/custom/custom.deploy.php
+++ b/packages/drupal/custom/custom.deploy.php
@@ -1,58 +1,111 @@
 <?php
 
+use Drupal\Core\StringTranslation\TranslatableMarkup;
+
+/**
+ * Create the Publisher OAuth Consumer.
+ */
+function custom_deploy_create_publisher_consumer(array &$sandbox): string {
+  return _custom_deploy_create_consumer(
+    'Publisher',
+    'publisher',
+    'PUBLISHER_OAUTH2_CLIENT_SECRET',
+    'PUBLISHER_URL'
+  );
+}
+
+/**
+ * Create the Preview OAuth Consumer.
+ */
+function custom_deploy_create_preview_consumer(array &$sandbox): string {
+  return _custom_deploy_create_consumer(
+    'Preview',
+    'preview',
+    'PREVIEW_OAUTH2_CLIENT_SECRET',
+    'PREVIEW_URL'
+  );
+}
+
 /**
- * Set up the Publisher OAuth Consumer and delete the Default one.
+ * Helper function to create an OAuth Consumer if it does not exist.
+ *
+ * @param string $label
+ * @param string $client_id
+ * @param string $client_secret_env_var
+ * @param string $redirect_base_url_env_var
+ *
+ * @return string|\Drupal\Core\StringTranslation\TranslatableMarkup
+ * @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
+ * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
+ * @throws \Drupal\Core\Entity\EntityStorageException
  */
-function custom_deploy_set_consumers(array &$sandbox): string {
+function _custom_deploy_create_consumer(
+  string $label,
+  string $client_id,
+  string $client_secret_env_var,
+  string $redirect_base_url_env_var
+): string|TranslatableMarkup {
   // Skip for Silverback environments.
   // It might be used for OAuth development purpose only in Silverback
-  // and can be set manually for this case.
-  // Matches the default Publisher behavior
-  // that disables Publisher OAuth for non Lagoon environments.
+  // and can be created manually for this case.
+  // Matches the default behaviour that disables it for non Lagoon environments.
   if (getenv('SB_ENVIRONMENT')) {
-    return t('Skipping for Silverback environment.');
+    return t('Skip for Silverback environment.');
   }
 
   // Check requirements.
   $entityTypeManager = \Drupal::entityTypeManager();
 
-  $publisherUrl = getenv('PUBLISHER_URL');
-  if (!$publisherUrl) {
-    throw new \Exception('PUBLISHER_URL environment variable is not set. It is required to setup the Publisher OAuth Consumer.');
+  $redirectBaseUrl = getenv($redirect_base_url_env_var);
+  if (!$redirectBaseUrl) {
+    throw new \Exception(
+      t('@ENV_VAR environment variable is not set. It is required to create the OAuth Consumer.',
+        [
+          '@ENV_VAR' => $redirect_base_url_env_var,
+        ]
+      )
+    );
   }
 
-  $clientSecret = getenv('PUBLISHER_OAUTH2_CLIENT_SECRET');
+  $clientSecret = getenv($client_secret_env_var);
   if (!$clientSecret) {
-    throw new \Exception('PUBLISHER_OAUTH2_CLIENT_SECRET environment variable is not set. It is required to setup the Publisher OAuth Consumer.');
+    throw new \Exception(
+      t('@ENV_VAR environment variable is not set. It is required to create the OAuth Consumer.',
+        [
+          '@ENV_VAR' => $client_secret_env_var,
+        ]
+      )
+    );
   }
 
   $consumersStorage = $entityTypeManager->getStorage('consumer');
   $existingConsumers = $consumersStorage->loadMultiple();
-  $hasPublisherConsumer = FALSE;
+  $consumerExists = FALSE;
   /** @var \Drupal\consumers\Entity\ConsumerInterface $consumer */
-  foreach($existingConsumers as $consumer) {
+  foreach ($existingConsumers as $consumer) {
     // As a side effect, delete the default consumer.
     // It is installed by the Consumers module.
+    // We don't use in the template.
     if ($consumer->getClientId() === 'default_consumer') {
       $consumer->delete();
     }
-    if ($consumer->getClientId() === 'publisher') {
-      $hasPublisherConsumer = TRUE;
+    if ($consumer->getClientId() === $client_id) {
+      $consumerExists = TRUE;
     }
   }
 
-  // Create the Publisher Consumer if it does not exist.
-  if (!$hasPublisherConsumer) {
-    $oAuthCallback = $publisherUrl . '/oauth/callback';
+  // Create the Consumer if it does not exist.
+  if (!$consumerExists) {
+    $oAuthCallback = $redirectBaseUrl . '/oauth/callback';
     $consumersStorage->create([
-      'label' => 'Publisher',
-      'client_id' => 'publisher',
-      'is_default' => TRUE,
+      'label' => $label,
+      'client_id' => $client_id,
+      'is_default' => FALSE,
       'secret' => $clientSecret,
       'redirect' => $oAuthCallback,
     ])->save();
-    return t('Created Publisher OAuth Consumer.');
+    return t('Created @consumer OAuth Consumer.', ['@consumer' => $label]);
   }
 
-  return t('Publisher OAuth Consumer already exists.');
+  return t('@consumer OAuth Consumer already exists.', ['@consumer' => $label]);
 }

From 448569a3874db99a5b94296b8b859005d6432fbe Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Tue, 9 Jul 2024 18:08:03 +0200
Subject: [PATCH 091/100] feat(SLB-450): enable auth middleware, remove
 resource owner type

---
 apps/preview/.lagoon.env                      |  13 ++
 apps/preview/.lagoon.env.prod                 |   1 +
 apps/preview/package.json                     |   3 +-
 apps/preview/server/index.ts                  |  14 +--
 apps/preview/server/utils/authentication.ts   |  57 ++++-----
 apps/preview/server/utils/config.ts           |  63 ++++------
 apps/preview/server/utils/oAuth2.ts           | 111 ++----------------
 apps/preview/server/utils/oAuth2GrantTypes.ts |   4 -
 pnpm-lock.yaml                                |   3 +
 9 files changed, 81 insertions(+), 188 deletions(-)
 delete mode 100644 apps/preview/server/utils/oAuth2GrantTypes.ts

diff --git a/apps/preview/.lagoon.env b/apps/preview/.lagoon.env
index ecef2dae1..997d2001d 100644
--- a/apps/preview/.lagoon.env
+++ b/apps/preview/.lagoon.env
@@ -1,2 +1,15 @@
 PROJECT_NAME=example
 DRUPAL_URL="https://nginx.${LAGOON_ENVIRONMENT}.${LAGOON_PROJECT}.ch4.amazee.io"
+
+# Authentication with OAuth2
+AUTHENTICATION_TYPE=oauth2
+OAUTH2_CLIENT_SECRET=REPLACE_ME
+OAUTH2_SESSION_SECRET=REPLACE_ME
+
+# Authentication with Basic Auth
+#AUTHENTICATION_TYPE=basic
+#BASIC_AUTH_USER=preview
+#BASIC_AUTH_PASSWORD=preview
+
+# To skip authentication
+#SKIP_AUTHENTICATION=true
diff --git a/apps/preview/.lagoon.env.prod b/apps/preview/.lagoon.env.prod
index 364cf1a4d..453e60079 100644
--- a/apps/preview/.lagoon.env.prod
+++ b/apps/preview/.lagoon.env.prod
@@ -1 +1,2 @@
 DRUPAL_URL="https://example.cms.amazeelabs.dev"
+OAUTH2_ENVIRONMENT_TYPE=production
diff --git a/apps/preview/package.json b/apps/preview/package.json
index f8c8bc972..e35eb8f31 100644
--- a/apps/preview/package.json
+++ b/apps/preview/package.json
@@ -8,7 +8,7 @@
     "dev:app": "vite",
     "dev:server": "tsx watch server/index.ts",
     "prep:app": "vite build",
-    "prep:server": "swc ./server ./server/utils -d ./build",
+    "prep:server": "swc ./server -d ./build",
     "start": "node build/index.js"
   },
   "dependencies": {
@@ -16,6 +16,7 @@
     "@custom/ui": "workspace:*",
     "cookie-parser": "^1.4.6",
     "express": "^4.19.2",
+    "express-basic-auth": "^1.2.1",
     "express-session": "^1.18.0",
     "express-ws": "^5.0.2",
     "memorystore": "^1.6.7",
diff --git a/apps/preview/server/index.ts b/apps/preview/server/index.ts
index 45e154a9a..ac388770b 100644
--- a/apps/preview/server/index.ts
+++ b/apps/preview/server/index.ts
@@ -8,7 +8,7 @@ import {
 import {
   getOAuth2AuthorizeUrl,
   getPersistedAccessToken,
-  hasPublisherAccess,
+  hasPreviewAccess,
   initializeSession,
   isAuthenticated,
   oAuth2AuthorizationCodeClient,
@@ -24,7 +24,7 @@ const { app } = expressWsInstance;
 const updates$ = new Subject();
 app.use(express.json());
 
-// A session is only needed for OAuth2 Authorization Code grant type.
+// A session is only needed for OAuth2.
 if (isSessionRequired()) {
   initializeSession(expressServer);
 }
@@ -52,7 +52,7 @@ app.ws('/__preview', (ws) => {
   ws.on('close', sub.unsubscribe);
 });
 
-app.get('/__preview/*', (req, _, next) => {
+app.get('/__preview/*', authMiddleware, (req, _, next) => {
   req.url = '/';
   next();
 });
@@ -64,11 +64,9 @@ app.get('/__preview/*', (req, _, next) => {
 // Fallback route for login. Is used if there is no origin cookie.
 app.get('/oauth/login', async (req, res) => {
   if (await isAuthenticated(req)) {
-    const accessPublisher = await hasPublisherAccess(req);
-    if (accessPublisher) {
-      res.send(
-        'Preview access is granted. <a href="/___status/">View status</a>',
-      );
+    const accessPreview = await hasPreviewAccess(req);
+    if (accessPreview) {
+      res.send('Preview access is granted.');
     } else {
       res.send(
         'Preview access is not granted. Contact your site administrator. <a href="/oauth/logout">Log out</a>',
diff --git a/apps/preview/server/utils/authentication.ts b/apps/preview/server/utils/authentication.ts
index 7dfefd417..3c565fca8 100644
--- a/apps/preview/server/utils/authentication.ts
+++ b/apps/preview/server/utils/authentication.ts
@@ -2,11 +2,7 @@ import { NextFunction, Request, RequestHandler, Response } from 'express';
 import basicAuth from 'express-basic-auth';
 
 import { getConfig, PreviewConfig } from './config';
-import {
-  oAuth2AuthCodeMiddleware,
-  oAuth2ResourceOwnerPasswordMiddleware,
-} from './oAuth2';
-import { OAuth2GrantTypes } from './oAuth2GrantTypes';
+import { oAuth2AuthCodeMiddleware } from './oAuth2';
 
 /**
  * Returns the Express authentication middleware based on the configuration.
@@ -18,33 +14,34 @@ export const getAuthenticationMiddleware = (
   config: PreviewConfig,
 ): RequestHandler =>
   ((): RequestHandler => {
-    const skipAuthentication =
-      process.env.PUBLISHER_SKIP_AUTHENTICATION === 'true';
+    const skipAuthentication = process.env.SKIP_AUTHENTICATION === 'true';
     if (skipAuthentication) {
       return (req: Request, res: Response, next: NextFunction): void => next();
     }
 
-    const oAuth2Config = config.oAuth2;
-    if (oAuth2Config) {
-      if (oAuth2Config.grantType === OAuth2GrantTypes.AuthorizationCode) {
-        return oAuth2AuthCodeMiddleware;
-      } else if (
-        oAuth2Config.grantType === OAuth2GrantTypes.ResourceOwnerPassword
-      ) {
-        return oAuth2ResourceOwnerPasswordMiddleware;
-      } else {
-        console.error(
-          'Only the AuthorizationCode and ResourceOwnerPassword grant types are currently supported.',
-        );
-      }
-    }
-
-    const basicAuthConfig = getConfig().basicAuth;
-    if (basicAuthConfig) {
-      return basicAuth({
-        users: { [basicAuthConfig.username]: basicAuthConfig.password },
-        challenge: true,
-      });
+    switch (config.authenticationType) {
+      case 'oauth2':
+        const oAuth2Config = config.oAuth2;
+        if (oAuth2Config) {
+          return oAuth2AuthCodeMiddleware;
+        } else {
+          console.error('Missing OAuth2 configuration.');
+        }
+        break;
+      case 'basic':
+        const basicAuthConfig = getConfig().basicAuth;
+        if (basicAuthConfig) {
+          return basicAuth({
+            users: { [basicAuthConfig.username]: basicAuthConfig.password },
+            challenge: true,
+          });
+        } else {
+          console.error('Missing basic auth configuration.');
+        }
+        break;
+      default:
+        console.error('Unknown authentication type.');
+        break;
     }
 
     return (req: Request, res: Response, next: NextFunction): void => next();
@@ -60,9 +57,7 @@ export const isSessionRequired = (): boolean => {
     if (!oAuth2Config) {
       throw new Error('Missing OAuth2 configuration.');
     }
-    if (oAuth2Config.grantType === OAuth2GrantTypes.AuthorizationCode) {
-      result = true;
-    }
+    result = true;
   }
   return result;
 };
diff --git a/apps/preview/server/utils/config.ts b/apps/preview/server/utils/config.ts
index fa07230ac..207a7de47 100644
--- a/apps/preview/server/utils/config.ts
+++ b/apps/preview/server/utils/config.ts
@@ -1,15 +1,14 @@
-import { OAuth2GrantTypes } from './oAuth2GrantTypes';
-
 export type PreviewConfig = {
+  authenticationType: string; // 'oauth2' | 'basic';
   /**
-   * Enables basic auth.
+   * Basic auth.
    */
   basicAuth?: {
     username: string;
     password: string;
   };
   /**
-   * Enables OAuth2.
+   * OAuth2.
    */
   oAuth2?: {
     clientId: string;
@@ -17,52 +16,30 @@ export type PreviewConfig = {
     scope: string;
     tokenHost: string;
     tokenPath: string;
-    grantType: OAuth2GrantTypes;
-    // Use for Authorization Code grant type only.
-    authorizePath?: string;
-    sessionSecret?: string;
+    authorizePath: string;
+    sessionSecret: string;
     environmentType?: string; // 'development' | 'production';
   };
 };
 
 export const getConfig = (): PreviewConfig => {
   return {
+    authenticationType: process.env.AUTHENTICATION_TYPE || 'oauth2',
     basicAuth: {
-      username: 'test',
-      password: 'test',
+      username: process.env.BASIC_AUTH_USER || 'test',
+      password: process.env.BASIC_AUTH_PASSWORD || 'test',
+    },
+    oAuth2: {
+      clientId: process.env.OAUTH2_CLIENT_ID || 'preview',
+      clientSecret: process.env.OAUTH2_CLIENT_SECRET || 'preview',
+      scope: process.env.OAUTH2_SCOPE || 'preview',
+      tokenHost: process.env.DRUPAL_URL || 'http://127.0.0.1:8888',
+      tokenPath: process.env.OAUTH2_TOKEN_PATH || '/oauth/token',
+      authorizePath:
+        process.env.OAUTH2_AUTHORIZE_PATH ||
+        '/oauth/authorize?response_type=code',
+      sessionSecret: process.env.OAUTH2_SESSION_SECRET || 'banana',
+      environmentType: process.env.OAUTH2_ENVIRONMENT_TYPE || 'development',
     },
-    // When several authentication methods are configured,
-    // oAuth2 takes precedence.
-    // oAuth2: {
-    //   clientId: process.env.OAUTH2_CLIENT_ID || 'preview',
-    //   clientSecret: process.env.OAUTH2_CLIENT_ID || 'preview',
-    //   // Applies for ResourceOwnerPassword only.
-    //   scope: process.env.OAUTH2_SCOPE || 'preview',
-    //   tokenHost: process.env.OAUTH2_TOKEN_HOST || 'http://127.0.0.1:8888',
-    //   tokenPath: process.env.OAUTH2_TOKEN_PATH || '/oauth/token',
-    //   authorizePath:
-    //     process.env.OAUTH2_AUTHORIZE_PATH ||
-    //     '/oauth/authorize?response_type=code',
-    //   sessionSecret: process.env.OAUTH2_SESSION_SECRET || 'banana',
-    //   environmentType: process.env.OAUTH2_ENVIRONMENT_TYPE || 'development',
-    //   grantType: 0, // AuthorizationCode
-    // },
   };
 };
-
-// let _config: PreviewConfig | null = null;
-
-// export const getConfig = (): PreviewConfig => {
-//   if (!_config) {
-//     throw new Error('Config is not set');
-//   }
-//   return _config;
-// };
-//
-// export const setConfig = (config: PreviewConfig): void => {
-//   _config = config;
-// };
-//
-// export const clearConfig = (): void => {
-//   _config = null;
-// };
diff --git a/apps/preview/server/utils/oAuth2.ts b/apps/preview/server/utils/oAuth2.ts
index 4acfc700f..c2ac94f15 100644
--- a/apps/preview/server/utils/oAuth2.ts
+++ b/apps/preview/server/utils/oAuth2.ts
@@ -10,12 +10,7 @@ import {
 import session from 'express-session';
 import createMemoryStore from 'memorystore';
 import fetch from 'node-fetch';
-import {
-  AccessToken,
-  AuthorizationCode,
-  ModuleOptions,
-  ResourceOwnerPassword,
-} from 'simple-oauth2';
+import { AccessToken, AuthorizationCode } from 'simple-oauth2';
 
 import { getConfig } from './config';
 
@@ -41,14 +36,14 @@ const ENCRYPTION_KEY =
 export const oAuth2AuthCodeMiddleware: RequestHandler = ((): RequestHandler => {
   return async (req: Request, res: Response, next: NextFunction) => {
     if (await isAuthenticated(req)) {
-      const accessPublisher = await hasPublisherAccess(req);
-      if (accessPublisher) {
+      const accessPreview = await hasPreviewAccess(req);
+      if (accessPreview) {
         return next();
       } else {
         res
           .status(403)
           .send(
-            'Your user account does not have Publisher access. You might contact your site administrator.',
+            'Your user account does not have Preview access. You might contact your site administrator.',
           );
       }
     } else {
@@ -57,94 +52,6 @@ export const oAuth2AuthCodeMiddleware: RequestHandler = ((): RequestHandler => {
   };
 })();
 
-/**
- * Returns the Resource Owner Password middleware.
- *
- * This can be used as a minimal implementation of OAuth2 if the challenge
- * is to be exposed in the client / the backend is only accessible
- * from the client and not the end user.
- *
- * Refresh tokens are not implemented.
- */
-export const oAuth2ResourceOwnerPasswordMiddleware: RequestHandler =
-  ((): RequestHandler => {
-    return async (req: Request, res: Response, next: NextFunction) => {
-      const oAuth2Config = getConfig().oAuth2;
-      if (!oAuth2Config) {
-        throw new Error('OAuth2 configuration is missing.');
-      }
-
-      // As an MVP, we are using the www-authenticate header to send the challenge.
-      // This allows to have a lightweight implementation of the UI, and we
-      // don't need to handle any session.
-      const base64Auth = (req.headers.authorization || '').split(' ')[1] || '';
-      const [wwwLogin, wwwPassword] = Buffer.from(base64Auth, 'base64')
-        .toString()
-        .split(':');
-
-      const oAuth2ModuleOptions: ModuleOptions = {
-        client: {
-          id: oAuth2Config.clientId,
-          secret: oAuth2Config.clientSecret,
-        },
-        auth: {
-          tokenHost: oAuth2Config.tokenHost,
-          tokenPath: oAuth2Config.tokenPath,
-        },
-      };
-      const oAuth2Client = new ResourceOwnerPassword(oAuth2ModuleOptions);
-      let errorMessage: string | null = null;
-
-      if (wwwLogin && wwwPassword) {
-        const tokenParams = {
-          username: wwwLogin,
-          password: wwwPassword,
-          scope: oAuth2Config.scope,
-        };
-
-        try {
-          const accessToken = await oAuth2Client.getToken(tokenParams);
-          if (accessToken) {
-            const publisherAuthentication = await fetch(
-              `${oAuth2ModuleOptions.auth.tokenHost}/publisher/access`,
-              {
-                method: 'POST',
-                headers: {
-                  'Content-Type': 'application/json',
-                  Authorization: `Bearer ${accessToken.token.access_token}`,
-                },
-              },
-            );
-
-            if (publisherAuthentication.status === 200) {
-              return next();
-            } else if (
-              publisherAuthentication.status === 403 ||
-              publisherAuthentication.status === 401
-            ) {
-              errorMessage = 'Publisher authentication failed.';
-            } else if (publisherAuthentication.status === 500) {
-              errorMessage = 'Internal server error.';
-            } else {
-              errorMessage = 'Unknown error.';
-            }
-          }
-        } catch (data) {
-          errorMessage = 'OAuth2 authentication failed.';
-        }
-      }
-
-      // In case of failure, just send a 401 with the www-authenticate header.
-      res.set('WWW-Authenticate', 'Basic realm="401"');
-      if (errorMessage) {
-        console.error(errorMessage);
-        res.status(401).send(errorMessage);
-      } else {
-        res.status(401).send('Authentication required.');
-      }
-    };
-  })();
-
 export const initializeSession = (server: Express): void => {
   const oAuth2Config = getConfig().oAuth2;
   if (!oAuth2Config) {
@@ -333,7 +240,7 @@ export const isAuthenticated = async (req: Request): Promise<boolean> => {
   return result;
 };
 
-export const hasPublisherAccess = async (req: Request): Promise<boolean> => {
+export const hasPreviewAccess = async (req: Request): Promise<boolean> => {
   const oAuth2Config = getConfig().oAuth2;
   if (!oAuth2Config) {
     throw new Error('Missing OAuth2 configuration.');
@@ -344,8 +251,9 @@ export const hasPublisherAccess = async (req: Request): Promise<boolean> => {
     throw new Error('Missing access token.');
   }
 
-  const publisherAccess = await fetch(
-    `${oAuth2Config.tokenHost}/publisher/access`,
+  // @todo add the preview token if it exists to skip authentication.
+  const previewAccess = await fetch(
+    `${oAuth2Config.tokenHost}/preview/access`,
     {
       method: 'POST',
       headers: {
@@ -354,8 +262,9 @@ export const hasPublisherAccess = async (req: Request): Promise<boolean> => {
       },
     },
   );
+  console.log('Preview access', previewAccess);
 
-  const status = await publisherAccess.status;
+  const status = await previewAccess.status;
   return status === 200;
 };
 
diff --git a/apps/preview/server/utils/oAuth2GrantTypes.ts b/apps/preview/server/utils/oAuth2GrantTypes.ts
deleted file mode 100644
index 1807555ab..000000000
--- a/apps/preview/server/utils/oAuth2GrantTypes.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum OAuth2GrantTypes {
-  AuthorizationCode,
-  ResourceOwnerPassword,
-}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 626191563..a13bd3622 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -201,6 +201,9 @@ importers:
       express:
         specifier: ^4.19.2
         version: 4.19.2
+      express-basic-auth:
+        specifier: ^1.2.1
+        version: 1.2.1
       express-session:
         specifier: ^1.18.0
         version: 1.18.0

From 128a440d4ae3508b34bc9c11489dfc2f9351368c Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Wed, 10 Jul 2024 11:22:24 +0200
Subject: [PATCH 092/100] feat(SLB-450): skip OAuth with a valid preview link
 token

---
 apps/preview/server/index.ts                |  2 +-
 apps/preview/server/utils/authentication.ts |  7 +++--
 apps/preview/server/utils/config.ts         |  2 ++
 apps/preview/server/utils/oAuth2.ts         | 30 +++++++++++++++++++--
 4 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/apps/preview/server/index.ts b/apps/preview/server/index.ts
index ac388770b..0ec7086a7 100644
--- a/apps/preview/server/index.ts
+++ b/apps/preview/server/index.ts
@@ -29,7 +29,7 @@ if (isSessionRequired()) {
   initializeSession(expressServer);
 }
 // Authentication middleware based on the configuration.
-const authMiddleware = getAuthenticationMiddleware(getConfig());
+const authMiddleware = getAuthenticationMiddleware();
 
 app.get('/endpoint.js', (_, res) => {
   res.send(
diff --git a/apps/preview/server/utils/authentication.ts b/apps/preview/server/utils/authentication.ts
index 3c565fca8..b65eb75a4 100644
--- a/apps/preview/server/utils/authentication.ts
+++ b/apps/preview/server/utils/authentication.ts
@@ -1,7 +1,7 @@
 import { NextFunction, Request, RequestHandler, Response } from 'express';
 import basicAuth from 'express-basic-auth';
 
-import { getConfig, PreviewConfig } from './config';
+import { getConfig } from './config';
 import { oAuth2AuthCodeMiddleware } from './oAuth2';
 
 /**
@@ -10,15 +10,14 @@ import { oAuth2AuthCodeMiddleware } from './oAuth2';
  * Favours OAuth2, then Basic Auth, then falling back to no auth
  * if not configured (= grant access).
  */
-export const getAuthenticationMiddleware = (
-  config: PreviewConfig,
-): RequestHandler =>
+export const getAuthenticationMiddleware = (): RequestHandler =>
   ((): RequestHandler => {
     const skipAuthentication = process.env.SKIP_AUTHENTICATION === 'true';
     if (skipAuthentication) {
       return (req: Request, res: Response, next: NextFunction): void => next();
     }
 
+    const config = getConfig();
     switch (config.authenticationType) {
       case 'oauth2':
         const oAuth2Config = config.oAuth2;
diff --git a/apps/preview/server/utils/config.ts b/apps/preview/server/utils/config.ts
index 207a7de47..4921c3b82 100644
--- a/apps/preview/server/utils/config.ts
+++ b/apps/preview/server/utils/config.ts
@@ -1,5 +1,6 @@
 export type PreviewConfig = {
   authenticationType: string; // 'oauth2' | 'basic';
+  drupalHost: string;
   /**
    * Basic auth.
    */
@@ -25,6 +26,7 @@ export type PreviewConfig = {
 export const getConfig = (): PreviewConfig => {
   return {
     authenticationType: process.env.AUTHENTICATION_TYPE || 'oauth2',
+    drupalHost: process.env.DRUPAL_URL || 'http://127.0.0.1:8888',
     basicAuth: {
       username: process.env.BASIC_AUTH_USER || 'test',
       password: process.env.BASIC_AUTH_PASSWORD || 'test',
diff --git a/apps/preview/server/utils/oAuth2.ts b/apps/preview/server/utils/oAuth2.ts
index c2ac94f15..6a4e05316 100644
--- a/apps/preview/server/utils/oAuth2.ts
+++ b/apps/preview/server/utils/oAuth2.ts
@@ -35,6 +35,34 @@ const ENCRYPTION_KEY =
  */
 export const oAuth2AuthCodeMiddleware: RequestHandler = ((): RequestHandler => {
   return async (req: Request, res: Response, next: NextFunction) => {
+    // Drupal's OAuth can be skipped if there is
+    // a valid preview link token for the entity.
+    const { preview_access_token, nid, entity_type_id, lang } = req.query;
+    if (preview_access_token && nid) {
+      const config = getConfig();
+      const previewAccess = await fetch(
+        `${config.drupalHost}/preview/link-access`,
+        {
+          method: 'POST',
+          body: JSON.stringify({
+            entity_id: nid,
+            // @todo we need to pass the entity type ID for other entity types.
+            //   But then also need to change the nid parameter to entity_id.
+            entity_type_id: entity_type_id || 'node',
+            langcode: lang || 'en',
+            preview_access_token: preview_access_token,
+          }),
+          headers: {
+            'Content-Type': 'application/json',
+          },
+        },
+      );
+      // Skip, otherwise continue with OAuth.
+      if (previewAccess.status === 200) {
+        return next();
+      }
+    }
+
     if (await isAuthenticated(req)) {
       const accessPreview = await hasPreviewAccess(req);
       if (accessPreview) {
@@ -251,7 +279,6 @@ export const hasPreviewAccess = async (req: Request): Promise<boolean> => {
     throw new Error('Missing access token.');
   }
 
-  // @todo add the preview token if it exists to skip authentication.
   const previewAccess = await fetch(
     `${oAuth2Config.tokenHost}/preview/access`,
     {
@@ -262,7 +289,6 @@ export const hasPreviewAccess = async (req: Request): Promise<boolean> => {
       },
     },
   );
-  console.log('Preview access', previewAccess);
 
   const status = await previewAccess.status;
   return status === 200;

From 82bd74efef7f478364d597e2adaee61885da8768 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Wed, 10 Jul 2024 11:31:23 +0200
Subject: [PATCH 093/100] chore(SLB-450): lintfix

---
 apps/preview/server/index.ts                | 3 ++-
 apps/preview/server/utils/authentication.ts | 8 +++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/preview/server/index.ts b/apps/preview/server/index.ts
index 0ec7086a7..f78743663 100644
--- a/apps/preview/server/index.ts
+++ b/apps/preview/server/index.ts
@@ -1,10 +1,12 @@
 import express from 'express';
 import expressWs from 'express-ws';
 import { Subject } from 'rxjs';
+
 import {
   getAuthenticationMiddleware,
   isSessionRequired,
 } from './utils/authentication';
+import { getConfig } from './utils/config';
 import {
   getOAuth2AuthorizeUrl,
   getPersistedAccessToken,
@@ -15,7 +17,6 @@ import {
   persistAccessToken,
   stateMatches,
 } from './utils/oAuth2';
-import { getConfig } from './utils/config';
 
 const expressServer = express();
 const expressWsInstance = expressWs(expressServer);
diff --git a/apps/preview/server/utils/authentication.ts b/apps/preview/server/utils/authentication.ts
index b65eb75a4..6f996c736 100644
--- a/apps/preview/server/utils/authentication.ts
+++ b/apps/preview/server/utils/authentication.ts
@@ -20,18 +20,16 @@ export const getAuthenticationMiddleware = (): RequestHandler =>
     const config = getConfig();
     switch (config.authenticationType) {
       case 'oauth2':
-        const oAuth2Config = config.oAuth2;
-        if (oAuth2Config) {
+        if (config.oAuth2) {
           return oAuth2AuthCodeMiddleware;
         } else {
           console.error('Missing OAuth2 configuration.');
         }
         break;
       case 'basic':
-        const basicAuthConfig = getConfig().basicAuth;
-        if (basicAuthConfig) {
+        if (config.basicAuth) {
           return basicAuth({
-            users: { [basicAuthConfig.username]: basicAuthConfig.password },
+            users: { [config.basicAuth.username]: config.basicAuth.password },
             challenge: true,
           });
         } else {

From d447089d66f29c2d4047cd2fce63164fc92c3750 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Wed, 10 Jul 2024 11:43:09 +0200
Subject: [PATCH 094/100] chore(SLB-450): set client and session secret on init

---
 INIT.md | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/INIT.md b/INIT.md
index 886ba6cfb..3cfc2e1e2 100644
--- a/INIT.md
+++ b/INIT.md
@@ -74,17 +74,34 @@ replace(
   'PROJECT_NAME=example',
   'PROJECT_NAME=' + process.env.PROJECT_NAME_MACHINE,
 );
-const clientSecret = randomString(32);
+const publisherClientSecret = randomString(32);
 replace(
   ['apps/cms/.lagoon.env', 'apps/website/.lagoon.env'],
   'PUBLISHER_OAUTH2_CLIENT_SECRET=REPLACE_ME',
-  'PUBLISHER_OAUTH2_CLIENT_SECRET=' + clientSecret,
+  'PUBLISHER_OAUTH2_CLIENT_SECRET=' + publisherClientSecret,
 );
-const sessionSecret = randomString(32);
+const publisherSessionSecret = randomString(32);
 replace(
   ['apps/website/.lagoon.env'],
   'PUBLISHER_OAUTH2_SESSION_SECRET=REPLACE_ME',
-  'PUBLISHER_OAUTH2_SESSION_SECRET=' + sessionSecret,
+  'PUBLISHER_OAUTH2_SESSION_SECRET=' + publisherSessionSecret,
+);
+const previewClientSecret = randomString(32);
+replace(
+  ['apps/cms/.lagoon.env'],
+  'PREVIEW_OAUTH2_CLIENT_SECRET=REPLACE_ME',
+  'PREVIEW_OAUTH2_CLIENT_SECRET=' + previewClientSecret,
+);
+replace(
+  ['apps/preview/.lagoon.env'],
+  'OAUTH2_CLIENT_SECRET=REPLACE_ME',
+  'OAUTH2_CLIENT_SECRET=' + previewClientSecret,
+);
+const previewSessionSecret = randomString(32);
+replace(
+  ['apps/preview/.lagoon.env'],
+  'OAUTH2_SESSION_SECRET=REPLACE_ME',
+  'OAUTH2_SESSION_SECRET=' + previewSessionSecret,
 );
 // Template's prod domain is special.
 replace(

From e702b9d8b91f1007f0fecdc5973103bfeb5d9d03 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Wed, 10 Jul 2024 13:06:19 +0200
Subject: [PATCH 095/100] chore(SLB-450): use js extension to prevent
 ERR_MODULE_NOT_FOUND

---
 apps/preview/server/index.ts                | 6 +++---
 apps/preview/server/utils/authentication.ts | 4 ++--
 apps/preview/server/utils/oAuth2.ts         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/preview/server/index.ts b/apps/preview/server/index.ts
index f78743663..189c77c9d 100644
--- a/apps/preview/server/index.ts
+++ b/apps/preview/server/index.ts
@@ -5,8 +5,8 @@ import { Subject } from 'rxjs';
 import {
   getAuthenticationMiddleware,
   isSessionRequired,
-} from './utils/authentication';
-import { getConfig } from './utils/config';
+} from './utils/authentication.js';
+import { getConfig } from './utils/config.js';
 import {
   getOAuth2AuthorizeUrl,
   getPersistedAccessToken,
@@ -16,7 +16,7 @@ import {
   oAuth2AuthorizationCodeClient,
   persistAccessToken,
   stateMatches,
-} from './utils/oAuth2';
+} from './utils/oAuth2.js';
 
 const expressServer = express();
 const expressWsInstance = expressWs(expressServer);
diff --git a/apps/preview/server/utils/authentication.ts b/apps/preview/server/utils/authentication.ts
index 6f996c736..c6f3cae56 100644
--- a/apps/preview/server/utils/authentication.ts
+++ b/apps/preview/server/utils/authentication.ts
@@ -1,8 +1,8 @@
 import { NextFunction, Request, RequestHandler, Response } from 'express';
 import basicAuth from 'express-basic-auth';
 
-import { getConfig } from './config';
-import { oAuth2AuthCodeMiddleware } from './oAuth2';
+import { getConfig } from './config.js';
+import { oAuth2AuthCodeMiddleware } from './oAuth2.js';
 
 /**
  * Returns the Express authentication middleware based on the configuration.
diff --git a/apps/preview/server/utils/oAuth2.ts b/apps/preview/server/utils/oAuth2.ts
index 6a4e05316..6fcc238df 100644
--- a/apps/preview/server/utils/oAuth2.ts
+++ b/apps/preview/server/utils/oAuth2.ts
@@ -12,7 +12,7 @@ import createMemoryStore from 'memorystore';
 import fetch from 'node-fetch';
 import { AccessToken, AuthorizationCode } from 'simple-oauth2';
 
-import { getConfig } from './config';
+import { getConfig } from './config.js';
 
 declare module 'express-session' {
   interface SessionData {

From 679d9349bb0456ecfcdf9f5ab9d0edc66ab2f998 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Fri, 12 Jul 2024 18:45:06 +0200
Subject: [PATCH 096/100] chore(SLB-450): skip authentication if not explicitly
 set

Allows to run in the CI / in local without authentication as we don't create consumers in this case.
---
 apps/preview/.lagoon.env                    | 3 ---
 apps/preview/server/utils/authentication.ts | 7 ++-----
 apps/preview/server/utils/config.ts         | 4 ++--
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/apps/preview/.lagoon.env b/apps/preview/.lagoon.env
index 997d2001d..4d5c19085 100644
--- a/apps/preview/.lagoon.env
+++ b/apps/preview/.lagoon.env
@@ -10,6 +10,3 @@ OAUTH2_SESSION_SECRET=REPLACE_ME
 #AUTHENTICATION_TYPE=basic
 #BASIC_AUTH_USER=preview
 #BASIC_AUTH_PASSWORD=preview
-
-# To skip authentication
-#SKIP_AUTHENTICATION=true
diff --git a/apps/preview/server/utils/authentication.ts b/apps/preview/server/utils/authentication.ts
index c6f3cae56..c3d3cf537 100644
--- a/apps/preview/server/utils/authentication.ts
+++ b/apps/preview/server/utils/authentication.ts
@@ -12,11 +12,6 @@ import { oAuth2AuthCodeMiddleware } from './oAuth2.js';
  */
 export const getAuthenticationMiddleware = (): RequestHandler =>
   ((): RequestHandler => {
-    const skipAuthentication = process.env.SKIP_AUTHENTICATION === 'true';
-    if (skipAuthentication) {
-      return (req: Request, res: Response, next: NextFunction): void => next();
-    }
-
     const config = getConfig();
     switch (config.authenticationType) {
       case 'oauth2':
@@ -36,6 +31,8 @@ export const getAuthenticationMiddleware = (): RequestHandler =>
           console.error('Missing basic auth configuration.');
         }
         break;
+      case 'noauth':
+        break;
       default:
         console.error('Unknown authentication type.');
         break;
diff --git a/apps/preview/server/utils/config.ts b/apps/preview/server/utils/config.ts
index 4921c3b82..3d23b3bde 100644
--- a/apps/preview/server/utils/config.ts
+++ b/apps/preview/server/utils/config.ts
@@ -1,5 +1,5 @@
 export type PreviewConfig = {
-  authenticationType: string; // 'oauth2' | 'basic';
+  authenticationType: string; // 'oauth2' | 'basic' | 'noauth';
   drupalHost: string;
   /**
    * Basic auth.
@@ -25,7 +25,7 @@ export type PreviewConfig = {
 
 export const getConfig = (): PreviewConfig => {
   return {
-    authenticationType: process.env.AUTHENTICATION_TYPE || 'oauth2',
+    authenticationType: process.env.AUTHENTICATION_TYPE || 'noauth',
     drupalHost: process.env.DRUPAL_URL || 'http://127.0.0.1:8888',
     basicAuth: {
       username: process.env.BASIC_AUTH_USER || 'test',

From 1f0d4827c9f9d5f93e20c62af31c998165f4ad6b Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Thu, 22 Aug 2024 07:52:17 +0200
Subject: [PATCH 097/100] chore(SLB-455): fix add missing deps

---
 .../src/blocks/teaser-item.tsx                | 26 +++++++---
 .../src/blocks/teaser-list.tsx                | 50 ++++++++++++-------
 packages/drupal/gutenberg_blocks/src/index.ts |  5 ++
 .../src/utils/drupal-media.tsx                |  2 +-
 4 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/packages/drupal/gutenberg_blocks/src/blocks/teaser-item.tsx b/packages/drupal/gutenberg_blocks/src/blocks/teaser-item.tsx
index 8d4365773..f39be1b75 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/teaser-item.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/teaser-item.tsx
@@ -4,7 +4,6 @@ import {
 } from 'wordpress__block-editor';
 import { registerBlockType } from 'wordpress__blocks';
 
-// @ts-ignore
 registerBlockType('custom/teaser-item', {
   title: 'Teaser item',
   icon: 'slides',
@@ -23,13 +22,27 @@ registerBlockType('custom/teaser-item', {
       type: 'string',
     },
   },
-  // @ts-ignore
-  edit: (props) => {
+
+  edit: ({
+    attributes: { url },
+    setAttributes,
+  }: {
+    attributes: {
+      url: string;
+      uuid: string;
+      entityType: string;
+    };
+    setAttributes: (attributes: {
+      url?: string;
+      uuid?: string;
+      entityType?: string;
+    }) => void;
+  }) => {
     return (
       <div>
         <LinkControl
           value={{
-            url: props.attributes.url,
+            url: url,
           }}
           settings={{}}
           suggestionsQuery={{
@@ -37,9 +50,8 @@ registerBlockType('custom/teaser-item', {
             // Use the teaser_list linkit profile to fetch suggestions.
             subtype: 'teaser_list',
           }}
-          // @ts-ignore
-          onChange={(link) => {
-            props.setAttributes({
+          onChange={(link: { url: string; id: string; type: string }) => {
+            setAttributes({
               url: link.url,
               uuid: link.id,
               // At the moment, the teaser_list link autocomplete only
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/teaser-list.tsx b/packages/drupal/gutenberg_blocks/src/blocks/teaser-list.tsx
index 46c64ff90..331ca2dce 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/teaser-list.tsx
+++ b/packages/drupal/gutenberg_blocks/src/blocks/teaser-list.tsx
@@ -7,10 +7,9 @@ import {
   ToggleControl,
 } from 'wordpress__components';
 
-// @ts-ignore
+const { t: __ } = Drupal;
 const { setPlainTextAttribute } = silverbackGutenbergUtils;
 
-// @ts-ignore
 registerBlockType('custom/teaser-list', {
   title: __('Teaser list'),
   icon: 'slides',
@@ -30,10 +29,29 @@ registerBlockType('custom/teaser-list', {
       type: 'string',
     },
     titleFilter: {
-      typ: 'string',
+      type: 'string',
     },
   },
-  edit: (props) => {
+  edit: (props: {
+    attributes: {
+      layout: string;
+      buttonText: string;
+      contentHubEnabled: boolean;
+      limit: string;
+      titleFilter: string;
+    };
+    setAttributes: (attributes: {
+      layout?: string;
+      buttonText?: string;
+      contentHubEnabled?: boolean;
+      limit?: string;
+      titleFilter?: string;
+    }) => void;
+  }) => {
+    const { attributes, setAttributes } = props;
+    const { layout, buttonText, contentHubEnabled, limit, titleFilter } =
+      attributes;
+
     return (
       <div className={'container-wrapper'}>
         <div className={'container-label'}>{__('Teaser list')}</div>
@@ -41,19 +59,19 @@ registerBlockType('custom/teaser-list', {
           <PanelBody>
             <SelectControl
               label={__('Layout')}
-              value={props.attributes.layout as string}
+              value={layout}
               options={[
                 { label: __('Grid'), value: 'GRID' },
                 { label: __('Carousel'), value: 'CAROUSEL' },
               ]}
               onChange={(layout) => {
-                props.setAttributes({
+                setAttributes({
                   layout,
                 });
               }}
             />
             <TextControl
-              value={props.attributes.buttonText as string}
+              value={buttonText}
               label={__('Button text')}
               onChange={(buttonText: string) => {
                 setPlainTextAttribute(props, 'buttonText', buttonText);
@@ -65,39 +83,37 @@ registerBlockType('custom/teaser-list', {
             <ToggleControl
               label={__('Enable content hub')}
               help={__('Enable pulling dynamic content from the content hub.')}
-              checked={props.attributes.contentHubEnabled as boolean}
+              checked={contentHubEnabled}
               onChange={(contentHubEnabled) => {
-                props.setAttributes({
+                setAttributes({
                   contentHubEnabled,
                 });
               }}
             />
-            {typeof props.attributes.contentHubEnabled !== 'undefined' &&
-            props.attributes.contentHubEnabled ? (
+            {typeof contentHubEnabled !== 'undefined' && contentHubEnabled ? (
               <TextControl
                 label={__('Filter: Title')}
                 help={__('Filter results by title / label.')}
                 onChange={(titleFilter) => {
-                  props.setAttributes({
+                  setAttributes({
                     titleFilter,
                   });
                 }}
-                value={props.attributes.titleFilter as string}
+                value={titleFilter}
               />
             ) : null}
-            {typeof props.attributes.contentHubEnabled !== 'undefined' &&
-            props.attributes.contentHubEnabled ? (
+            {typeof contentHubEnabled !== 'undefined' && contentHubEnabled ? (
               <TextControl
                 label={__('Limit')}
                 help={__(
                   'Set a maximum number of results to show from the content hub.',
                 )}
                 onChange={(limit) => {
-                  props.setAttributes({
+                  setAttributes({
                     limit,
                   });
                 }}
-                value={props.attributes.limit as string}
+                value={limit}
               />
             ) : null}
           </PanelBody>
diff --git a/packages/drupal/gutenberg_blocks/src/index.ts b/packages/drupal/gutenberg_blocks/src/index.ts
index 15bb42a9e..2b7ff6e39 100644
--- a/packages/drupal/gutenberg_blocks/src/index.ts
+++ b/packages/drupal/gutenberg_blocks/src/index.ts
@@ -25,6 +25,11 @@ declare global {
     t: (s: string, t?: object) => string;
   };
 
+  const silverbackGutenbergUtils: {
+    sanitizeText: (text: string) => string;
+    setPlainTextAttribute: (props: any, name: string, text: string) => void;
+  };
+
   const drupalSettings: {
     preview: any;
     path: {
diff --git a/packages/drupal/gutenberg_blocks/src/utils/drupal-media.tsx b/packages/drupal/gutenberg_blocks/src/utils/drupal-media.tsx
index b8452cad2..50d02f878 100644
--- a/packages/drupal/gutenberg_blocks/src/utils/drupal-media.tsx
+++ b/packages/drupal/gutenberg_blocks/src/utils/drupal-media.tsx
@@ -10,7 +10,7 @@ type DrupalMediaComponent = React.FC<{
     allowedTypes?: [string];
   };
   setAttributes: (attributes: object) => void;
-  onError: (error: string | [string]) => void;
+  onError: (error: string | [string] | string[]) => void;
 }>;
 
 // @ts-ignore

From 86c9c7a450037752b94d07368fe172d6a09b0363 Mon Sep 17 00:00:00 2001
From: Christophe Jossart <christophe.jossart@amazeelabs.com>
Date: Thu, 22 Aug 2024 17:07:02 +0200
Subject: [PATCH 098/100] chore: entity usage access for editor and admin roles

---
 apps/cms/config/sync/user.role.administrator.yml | 2 ++
 apps/cms/config/sync/user.role.editor.yml        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/apps/cms/config/sync/user.role.administrator.yml b/apps/cms/config/sync/user.role.administrator.yml
index 4660fb037..421eb824a 100644
--- a/apps/cms/config/sync/user.role.administrator.yml
+++ b/apps/cms/config/sync/user.role.administrator.yml
@@ -10,6 +10,7 @@ dependencies:
     - content_moderation
     - content_translation
     - dropzonejs
+    - entity_usage
     - environment_indicator
     - file
     - filter
@@ -38,6 +39,7 @@ is_admin: null
 permissions:
   - 'access administration pages'
   - 'access content overview'
+  - 'access entity usage statistics'
   - 'access environment indicator'
   - 'access media overview'
   - 'access publisher'
diff --git a/apps/cms/config/sync/user.role.editor.yml b/apps/cms/config/sync/user.role.editor.yml
index 2914cb680..e3292f397 100644
--- a/apps/cms/config/sync/user.role.editor.yml
+++ b/apps/cms/config/sync/user.role.editor.yml
@@ -10,6 +10,7 @@ dependencies:
     - content_moderation
     - content_translation
     - dropzonejs
+    - entity_usage
     - environment_indicator
     - file
     - filter
@@ -33,6 +34,7 @@ is_admin: null
 permissions:
   - 'access administration pages'
   - 'access content overview'
+  - 'access entity usage statistics'
   - 'access environment indicator'
   - 'access media overview'
   - 'access shortcuts'

From fefc9e6ea57975940c17c54beb16aedbc61992d5 Mon Sep 17 00:00:00 2001
From: Dan Lemon <daniel.lemon@amazeelabs.com>
Date: Sun, 25 Aug 2024 21:35:05 +0200
Subject: [PATCH 099/100] chore: move js for gutenberg blocks into own folder

---
 packages/drupal/gutenberg_blocks/.eslintignore         |  2 +-
 packages/drupal/gutenberg_blocks/.gitignore            |  4 ++--
 packages/drupal/gutenberg_blocks/README.md             |  9 ++++-----
 .../gutenberg_blocks/gutenberg_blocks.libraries.yml    |  2 +-
 .../{src => js}/blocks/accordion-item-text.tsx         |  0
 .../gutenberg_blocks/{src => js}/blocks/accordion.tsx  |  0
 .../{src => js}/blocks/conditional.tsx                 |  0
 .../gutenberg_blocks/{src => js}/blocks/content.tsx    |  0
 .../drupal/gutenberg_blocks/{src => js}/blocks/cta.tsx |  2 --
 .../gutenberg_blocks/{src => js}/blocks/demo-block.tsx |  0
 .../gutenberg_blocks/{src => js}/blocks/form.tsx       |  0
 .../gutenberg_blocks/{src => js}/blocks/heading.tsx    |  2 --
 .../gutenberg_blocks/{src => js}/blocks/hero.tsx       |  2 --
 .../{src => js}/blocks/horizontal-separator.tsx        |  0
 .../{src => js}/blocks/image-teaser.tsx                |  2 --
 .../{src => js}/blocks/image-teasers.tsx               |  0
 .../{src => js}/blocks/image-with-text.tsx             |  0
 .../{src => js}/blocks/info-grid-item.tsx              |  0
 .../gutenberg_blocks/{src => js}/blocks/info-grid.tsx  |  1 -
 .../gutenberg_blocks/{src => js}/blocks/quote.tsx      |  2 --
 .../{src => js}/blocks/teaser-item.tsx                 |  0
 .../{src => js}/blocks/teaser-list.tsx                 |  0
 .../gutenberg_blocks/{src => js}/customisations.ts     |  0
 .../gutenberg_blocks/{src => js}/filters/list.tsx      |  3 +--
 packages/drupal/gutenberg_blocks/{src => js}/index.ts  |  0
 .../drupal/gutenberg_blocks/{src => js}/preview.ts     |  0
 .../{src => js}/utils/clean-up-text.ts                 |  0
 .../{src => js}/utils/drupal-media.tsx                 |  0
 .../gutenberg_blocks/{src => js}/utils/icon-list.ts    |  1 -
 .../scripts/generate-gutenberg-block.js                | 10 +++-------
 packages/drupal/gutenberg_blocks/tsconfig.json         |  2 +-
 packages/drupal/gutenberg_blocks/turbo.json            |  6 +++---
 packages/drupal/gutenberg_blocks/vite.config.ts        |  4 ++--
 33 files changed, 18 insertions(+), 36 deletions(-)
 rename packages/drupal/gutenberg_blocks/{src => js}/blocks/accordion-item-text.tsx (100%)
 rename packages/drupal/gutenberg_blocks/{src => js}/blocks/accordion.tsx (100%)
 rename packages/drupal/gutenberg_blocks/{src => js}/blocks/conditional.tsx (100%)
 rename packages/drupal/gutenberg_blocks/{src => js}/blocks/content.tsx (100%)
 rename packages/drupal/gutenberg_blocks/{src => js}/blocks/cta.tsx (99%)
 rename packages/drupal/gutenberg_blocks/{src => js}/blocks/demo-block.tsx (100%)
 rename packages/drupal/gutenberg_blocks/{src => js}/blocks/form.tsx (100%)
 rename packages/drupal/gutenberg_blocks/{src => js}/blocks/heading.tsx (99%)
 rename packages/drupal/gutenberg_blocks/{src => js}/blocks/hero.tsx (99%)
 rename packages/drupal/gutenberg_blocks/{src => js}/blocks/horizontal-separator.tsx (100%)
 rename packages/drupal/gutenberg_blocks/{src => js}/blocks/image-teaser.tsx (99%)
 rename packages/drupal/gutenberg_blocks/{src => js}/blocks/image-teasers.tsx (100%)
 rename packages/drupal/gutenberg_blocks/{src => js}/blocks/image-with-text.tsx (100%)
 rename packages/drupal/gutenberg_blocks/{src => js}/blocks/info-grid-item.tsx (100%)
 rename packages/drupal/gutenberg_blocks/{src => js}/blocks/info-grid.tsx (99%)
 rename packages/drupal/gutenberg_blocks/{src => js}/blocks/quote.tsx (99%)
 rename packages/drupal/gutenberg_blocks/{src => js}/blocks/teaser-item.tsx (100%)
 rename packages/drupal/gutenberg_blocks/{src => js}/blocks/teaser-list.tsx (100%)
 rename packages/drupal/gutenberg_blocks/{src => js}/customisations.ts (100%)
 rename packages/drupal/gutenberg_blocks/{src => js}/filters/list.tsx (98%)
 rename packages/drupal/gutenberg_blocks/{src => js}/index.ts (100%)
 rename packages/drupal/gutenberg_blocks/{src => js}/preview.ts (100%)
 rename packages/drupal/gutenberg_blocks/{src => js}/utils/clean-up-text.ts (100%)
 rename packages/drupal/gutenberg_blocks/{src => js}/utils/drupal-media.tsx (100%)
 rename packages/drupal/gutenberg_blocks/{src => js}/utils/icon-list.ts (99%)

diff --git a/packages/drupal/gutenberg_blocks/.eslintignore b/packages/drupal/gutenberg_blocks/.eslintignore
index f20cdcff6..44de66f72 100644
--- a/packages/drupal/gutenberg_blocks/.eslintignore
+++ b/packages/drupal/gutenberg_blocks/.eslintignore
@@ -1,3 +1,3 @@
 .turbo
-js
+dist
 node_modules
diff --git a/packages/drupal/gutenberg_blocks/.gitignore b/packages/drupal/gutenberg_blocks/.gitignore
index 4f754a126..f5cbc0c2b 100644
--- a/packages/drupal/gutenberg_blocks/.gitignore
+++ b/packages/drupal/gutenberg_blocks/.gitignore
@@ -1,3 +1,3 @@
 node_modules
-js/gutenberg_blocks.mjs
-js/gutenberg_blocks.umd.js
+dist/gutenberg_blocks.mjs
+dist/gutenberg_blocks.umd.js
diff --git a/packages/drupal/gutenberg_blocks/README.md b/packages/drupal/gutenberg_blocks/README.md
index 713856e00..4cced52ab 100644
--- a/packages/drupal/gutenberg_blocks/README.md
+++ b/packages/drupal/gutenberg_blocks/README.md
@@ -4,9 +4,9 @@
 
 To create a custom Gutenberg you must:
 
-1. Create a `.tsx` file in `src/blocks`, using one of the existing examples as a
+1. Create a `.tsx` file in `js/blocks`, using one of the existing examples as a
    starting point.
-2. Include the file within `src/index.ts` - this file is used to generate the
+2. Include the file within `js/index.ts` - this file is used to generate the
    javascript file included by the Drupal module.
 3. Clear the cache if necessary and you should be able to add your new block
    within the Gutenberg editor.
@@ -20,9 +20,9 @@ create a new block based on a GraphQL type.
 pnpm gutenberg:generate <GraphQLType>
 ```
 
-This will create a new block in the `src/blocks` directory, with the necessary
+This will create a new block in the `js/blocks` directory, with the necessary
 fields and attributes already defined. You will still need to add the block to
-`src/index.ts` and clear the cache to see the new block in the Gutenberg editor
+`js/index.ts` and clear the cache to see the new block in the Gutenberg editor
 after running this command.
 
 ### Icons
@@ -178,7 +178,6 @@ import { registerBlockType } from 'wordpress__blocks';
 import { InnerBlocks } from 'wordpress__block-editor';
 import { useSelect } from 'wordpress__data';
 
-// @ts-ignore
 const __ = Drupal.t;
 
 const MAX_BLOCKS: number = 1;
diff --git a/packages/drupal/gutenberg_blocks/gutenberg_blocks.libraries.yml b/packages/drupal/gutenberg_blocks/gutenberg_blocks.libraries.yml
index 87a7ad6d9..8ddc4bb6c 100644
--- a/packages/drupal/gutenberg_blocks/gutenberg_blocks.libraries.yml
+++ b/packages/drupal/gutenberg_blocks/gutenberg_blocks.libraries.yml
@@ -1,6 +1,6 @@
 edit:
   js:
-    js/gutenberg_blocks.umd.js: {}
+    dist/gutenberg_blocks.umd.js: {}
   css:
     theme:
       css/edit.css: {}
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/accordion-item-text.tsx b/packages/drupal/gutenberg_blocks/js/blocks/accordion-item-text.tsx
similarity index 100%
rename from packages/drupal/gutenberg_blocks/src/blocks/accordion-item-text.tsx
rename to packages/drupal/gutenberg_blocks/js/blocks/accordion-item-text.tsx
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/accordion.tsx b/packages/drupal/gutenberg_blocks/js/blocks/accordion.tsx
similarity index 100%
rename from packages/drupal/gutenberg_blocks/src/blocks/accordion.tsx
rename to packages/drupal/gutenberg_blocks/js/blocks/accordion.tsx
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx b/packages/drupal/gutenberg_blocks/js/blocks/conditional.tsx
similarity index 100%
rename from packages/drupal/gutenberg_blocks/src/blocks/conditional.tsx
rename to packages/drupal/gutenberg_blocks/js/blocks/conditional.tsx
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/content.tsx b/packages/drupal/gutenberg_blocks/js/blocks/content.tsx
similarity index 100%
rename from packages/drupal/gutenberg_blocks/src/blocks/content.tsx
rename to packages/drupal/gutenberg_blocks/js/blocks/content.tsx
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/cta.tsx b/packages/drupal/gutenberg_blocks/js/blocks/cta.tsx
similarity index 99%
rename from packages/drupal/gutenberg_blocks/src/blocks/cta.tsx
rename to packages/drupal/gutenberg_blocks/js/blocks/cta.tsx
index e5a3efe3f..b2f11af6b 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/cta.tsx
+++ b/packages/drupal/gutenberg_blocks/js/blocks/cta.tsx
@@ -10,8 +10,6 @@ import { PanelBody, SelectControl, ToggleControl } from 'wordpress__components';
 import { compose, withState } from 'wordpress__compose';
 
 const { t: __ } = Drupal;
-
-// @ts-ignore
 const { setPlainTextAttribute } = silverbackGutenbergUtils;
 
 const ArrowRightIcon = () => (
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/demo-block.tsx b/packages/drupal/gutenberg_blocks/js/blocks/demo-block.tsx
similarity index 100%
rename from packages/drupal/gutenberg_blocks/src/blocks/demo-block.tsx
rename to packages/drupal/gutenberg_blocks/js/blocks/demo-block.tsx
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/form.tsx b/packages/drupal/gutenberg_blocks/js/blocks/form.tsx
similarity index 100%
rename from packages/drupal/gutenberg_blocks/src/blocks/form.tsx
rename to packages/drupal/gutenberg_blocks/js/blocks/form.tsx
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/heading.tsx b/packages/drupal/gutenberg_blocks/js/blocks/heading.tsx
similarity index 99%
rename from packages/drupal/gutenberg_blocks/src/blocks/heading.tsx
rename to packages/drupal/gutenberg_blocks/js/blocks/heading.tsx
index 480173c7c..d4ee9e75a 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/heading.tsx
+++ b/packages/drupal/gutenberg_blocks/js/blocks/heading.tsx
@@ -6,8 +6,6 @@ import { compose, withState } from 'wordpress__compose';
 import { cleanUpText } from '../utils/clean-up-text';
 
 const { t: __ } = Drupal;
-
-// @ts-ignore
 const { sanitizeText } = silverbackGutenbergUtils;
 
 // There is no way to remove formatting options (bold, italic, etc.) from the
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/hero.tsx b/packages/drupal/gutenberg_blocks/js/blocks/hero.tsx
similarity index 99%
rename from packages/drupal/gutenberg_blocks/src/blocks/hero.tsx
rename to packages/drupal/gutenberg_blocks/js/blocks/hero.tsx
index 5630dc8c3..3bc5a52d3 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/hero.tsx
+++ b/packages/drupal/gutenberg_blocks/js/blocks/hero.tsx
@@ -13,8 +13,6 @@ import { dispatch } from 'wordpress__data';
 import { DrupalMediaEntity } from '../utils/drupal-media';
 
 const { t: __ } = Drupal;
-
-// @ts-ignore
 const { setPlainTextAttribute } = silverbackGutenbergUtils;
 
 registerBlockType('custom/hero', {
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/horizontal-separator.tsx b/packages/drupal/gutenberg_blocks/js/blocks/horizontal-separator.tsx
similarity index 100%
rename from packages/drupal/gutenberg_blocks/src/blocks/horizontal-separator.tsx
rename to packages/drupal/gutenberg_blocks/js/blocks/horizontal-separator.tsx
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/image-teaser.tsx b/packages/drupal/gutenberg_blocks/js/blocks/image-teaser.tsx
similarity index 99%
rename from packages/drupal/gutenberg_blocks/src/blocks/image-teaser.tsx
rename to packages/drupal/gutenberg_blocks/js/blocks/image-teaser.tsx
index c590a367d..85892badb 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/image-teaser.tsx
+++ b/packages/drupal/gutenberg_blocks/js/blocks/image-teaser.tsx
@@ -12,8 +12,6 @@ import { dispatch } from 'wordpress__data';
 import { DrupalMediaEntity } from '../utils/drupal-media';
 
 const { t: __ } = Drupal;
-
-// @ts-ignore
 const { setPlainTextAttribute } = silverbackGutenbergUtils;
 
 registerBlockType('custom/image-teaser', {
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/image-teasers.tsx b/packages/drupal/gutenberg_blocks/js/blocks/image-teasers.tsx
similarity index 100%
rename from packages/drupal/gutenberg_blocks/src/blocks/image-teasers.tsx
rename to packages/drupal/gutenberg_blocks/js/blocks/image-teasers.tsx
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/image-with-text.tsx b/packages/drupal/gutenberg_blocks/js/blocks/image-with-text.tsx
similarity index 100%
rename from packages/drupal/gutenberg_blocks/src/blocks/image-with-text.tsx
rename to packages/drupal/gutenberg_blocks/js/blocks/image-with-text.tsx
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/info-grid-item.tsx b/packages/drupal/gutenberg_blocks/js/blocks/info-grid-item.tsx
similarity index 100%
rename from packages/drupal/gutenberg_blocks/src/blocks/info-grid-item.tsx
rename to packages/drupal/gutenberg_blocks/js/blocks/info-grid-item.tsx
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/info-grid.tsx b/packages/drupal/gutenberg_blocks/js/blocks/info-grid.tsx
similarity index 99%
rename from packages/drupal/gutenberg_blocks/src/blocks/info-grid.tsx
rename to packages/drupal/gutenberg_blocks/js/blocks/info-grid.tsx
index 394c61662..a38af2b97 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/info-grid.tsx
+++ b/packages/drupal/gutenberg_blocks/js/blocks/info-grid.tsx
@@ -3,7 +3,6 @@ import { registerBlockType } from 'wordpress__blocks';
 import { useSelect } from 'wordpress__data';
 
 const { t: __ } = Drupal;
-
 const MAX_BLOCKS: number = 3;
 
 registerBlockType('custom/info-grid', {
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/quote.tsx b/packages/drupal/gutenberg_blocks/js/blocks/quote.tsx
similarity index 99%
rename from packages/drupal/gutenberg_blocks/src/blocks/quote.tsx
rename to packages/drupal/gutenberg_blocks/js/blocks/quote.tsx
index 4158a77b7..01d5c0d15 100644
--- a/packages/drupal/gutenberg_blocks/src/blocks/quote.tsx
+++ b/packages/drupal/gutenberg_blocks/js/blocks/quote.tsx
@@ -7,8 +7,6 @@ import { cleanUpText } from '../utils/clean-up-text';
 import { DrupalMediaEntity } from '../utils/drupal-media';
 
 const { t: __ } = Drupal;
-
-// @ts-ignore
 const { setPlainTextAttribute } = silverbackGutenbergUtils;
 
 // @ts-ignore
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/teaser-item.tsx b/packages/drupal/gutenberg_blocks/js/blocks/teaser-item.tsx
similarity index 100%
rename from packages/drupal/gutenberg_blocks/src/blocks/teaser-item.tsx
rename to packages/drupal/gutenberg_blocks/js/blocks/teaser-item.tsx
diff --git a/packages/drupal/gutenberg_blocks/src/blocks/teaser-list.tsx b/packages/drupal/gutenberg_blocks/js/blocks/teaser-list.tsx
similarity index 100%
rename from packages/drupal/gutenberg_blocks/src/blocks/teaser-list.tsx
rename to packages/drupal/gutenberg_blocks/js/blocks/teaser-list.tsx
diff --git a/packages/drupal/gutenberg_blocks/src/customisations.ts b/packages/drupal/gutenberg_blocks/js/customisations.ts
similarity index 100%
rename from packages/drupal/gutenberg_blocks/src/customisations.ts
rename to packages/drupal/gutenberg_blocks/js/customisations.ts
diff --git a/packages/drupal/gutenberg_blocks/src/filters/list.tsx b/packages/drupal/gutenberg_blocks/js/filters/list.tsx
similarity index 98%
rename from packages/drupal/gutenberg_blocks/src/filters/list.tsx
rename to packages/drupal/gutenberg_blocks/js/filters/list.tsx
index 707e7aa61..10a3ab023 100644
--- a/packages/drupal/gutenberg_blocks/src/filters/list.tsx
+++ b/packages/drupal/gutenberg_blocks/js/filters/list.tsx
@@ -4,8 +4,7 @@ import { PanelBody, SelectControl } from 'wordpress__components';
 import { createHigherOrderComponent } from 'wordpress__compose';
 import { addFilter } from 'wordpress__hooks';
 
-// @ts-ignore
-const __ = Drupal.t;
+const { t: __ } = Drupal;
 
 addFilter(
   'blocks.registerBlockType',
diff --git a/packages/drupal/gutenberg_blocks/src/index.ts b/packages/drupal/gutenberg_blocks/js/index.ts
similarity index 100%
rename from packages/drupal/gutenberg_blocks/src/index.ts
rename to packages/drupal/gutenberg_blocks/js/index.ts
diff --git a/packages/drupal/gutenberg_blocks/src/preview.ts b/packages/drupal/gutenberg_blocks/js/preview.ts
similarity index 100%
rename from packages/drupal/gutenberg_blocks/src/preview.ts
rename to packages/drupal/gutenberg_blocks/js/preview.ts
diff --git a/packages/drupal/gutenberg_blocks/src/utils/clean-up-text.ts b/packages/drupal/gutenberg_blocks/js/utils/clean-up-text.ts
similarity index 100%
rename from packages/drupal/gutenberg_blocks/src/utils/clean-up-text.ts
rename to packages/drupal/gutenberg_blocks/js/utils/clean-up-text.ts
diff --git a/packages/drupal/gutenberg_blocks/src/utils/drupal-media.tsx b/packages/drupal/gutenberg_blocks/js/utils/drupal-media.tsx
similarity index 100%
rename from packages/drupal/gutenberg_blocks/src/utils/drupal-media.tsx
rename to packages/drupal/gutenberg_blocks/js/utils/drupal-media.tsx
diff --git a/packages/drupal/gutenberg_blocks/src/utils/icon-list.ts b/packages/drupal/gutenberg_blocks/js/utils/icon-list.ts
similarity index 99%
rename from packages/drupal/gutenberg_blocks/src/utils/icon-list.ts
rename to packages/drupal/gutenberg_blocks/js/utils/icon-list.ts
index ce1c361c6..42a5a32e9 100644
--- a/packages/drupal/gutenberg_blocks/src/utils/icon-list.ts
+++ b/packages/drupal/gutenberg_blocks/js/utils/icon-list.ts
@@ -1,4 +1,3 @@
-// @ts-ignore
 const { t: __ } = Drupal;
 
 // HOW TO ADD A NEW ICON.
diff --git a/packages/drupal/gutenberg_blocks/scripts/generate-gutenberg-block.js b/packages/drupal/gutenberg_blocks/scripts/generate-gutenberg-block.js
index 6cef6880b..f2a090746 100644
--- a/packages/drupal/gutenberg_blocks/scripts/generate-gutenberg-block.js
+++ b/packages/drupal/gutenberg_blocks/scripts/generate-gutenberg-block.js
@@ -42,7 +42,7 @@ function generateGutenbergBlockCode(typeName) {
       );
 
       // Write the generated code to a file.
-      const filePath = `./src/blocks/${gutenbergBlockMachineName}.tsx`; // Output file path
+      const filePath = `./js/blocks/${gutenbergBlockMachineName}.tsx`; // Output file path
       fs.writeFileSync(filePath, blockCode);
 
       console.log(`Generated Gutenberg block for ${blockName} in ${filePath}`);
@@ -75,9 +75,8 @@ ${
 import { DrupalMediaEntity } from '../utils/drupal-media';`
 }
 
-// @ts-ignore
 const { t: __ } = Drupal;
- // @ts-ignore
+
 registerBlockType('custom/${blockName}', {
   title: '${titleCaseTitle}',
   icon: 'text',
@@ -92,8 +91,7 @@ registerBlockType('custom/${blockName}', {
     }`,
       )
       .join(',\n\t\t')}
-  }, 
-  // @ts-ignore
+  },
   edit: compose(withState())((props) => {
     const { attributes, setAttributes } = props;
     
@@ -123,7 +121,6 @@ registerBlockType('custom/${blockName}', {
       </Fragment>
     );
   }),
-
   save() {
     return null;
     // or uncomment this if you import and use InnerBlocks from wordpress__block-editor
@@ -160,7 +157,6 @@ function getGutenbergFieldBlock(attribute) {
             setAttributes={props.setAttributes}
             isMediaLibraryEnabled={true}
             onError={(error) => {
-              // @ts-ignore
               error = typeof error === 'string' ? error : error[2];
               dispatch('core/notices').createWarningNotice(error);
             }}
diff --git a/packages/drupal/gutenberg_blocks/tsconfig.json b/packages/drupal/gutenberg_blocks/tsconfig.json
index 3d0a51a86..0f8a54a06 100644
--- a/packages/drupal/gutenberg_blocks/tsconfig.json
+++ b/packages/drupal/gutenberg_blocks/tsconfig.json
@@ -16,6 +16,6 @@
     "noEmit": true,
     "jsx": "react-jsx"
   },
-  "include": ["src"],
+  "include": ["js"],
   "references": [{ "path": "./tsconfig.node.json" }]
 }
diff --git a/packages/drupal/gutenberg_blocks/turbo.json b/packages/drupal/gutenberg_blocks/turbo.json
index bedaee983..ff5f97a17 100644
--- a/packages/drupal/gutenberg_blocks/turbo.json
+++ b/packages/drupal/gutenberg_blocks/turbo.json
@@ -2,11 +2,11 @@
   "extends": ["//"],
   "tasks": {
     "test:static": {
-      "inputs": ["src/**"]
+      "inputs": ["js/**"]
     },
     "prep": {
-      "inputs": ["src/**"],
-      "outputs": ["js/**"]
+      "inputs": ["js/**"],
+      "outputs": ["dist/**"]
     }
   }
 }
diff --git a/packages/drupal/gutenberg_blocks/vite.config.ts b/packages/drupal/gutenberg_blocks/vite.config.ts
index 07a4dfe53..baacebb67 100644
--- a/packages/drupal/gutenberg_blocks/vite.config.ts
+++ b/packages/drupal/gutenberg_blocks/vite.config.ts
@@ -5,7 +5,7 @@ import { defineConfig } from 'vite';
 export default defineConfig({
   build: {
     lib: {
-      entry: resolve(__dirname, 'src/index.ts'),
+      entry: resolve(__dirname, 'js/index.ts'),
       name: 'gutenberg_blocks',
       fileName: 'gutenberg_blocks',
     },
@@ -38,7 +38,7 @@ export default defineConfig({
         },
       },
     },
-    outDir: resolve(__dirname, './js'),
+    outDir: resolve(__dirname, './dist'),
   },
   plugins: [
     react({

From 5019542f64fd924fe905da5a69157e1e4e5d8ea8 Mon Sep 17 00:00:00 2001
From: Alex Tkachev <alex.leksat@gmail.com>
Date: Mon, 2 Sep 2024 12:29:13 +0400
Subject: [PATCH 100/100] chore: some change in phpstorm config

---
 .idea/dataSources.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index 49a276bee..3e0c21ea6 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
     <data-source source="LOCAL" name=".sqlite driver - .sqlite" uuid="7e531972-e128-4d8d-8ede-b563564b887a">
-      <driver-ref>d3b8aa80-75a4-4431-a24d-d6e0c8fd1e7c</driver-ref>
+      <driver-ref>sqlite.xerial</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
       <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/apps/cms/web/sites/default/files/.sqlite</jdbc-url>