WIP

AmazeeLabs · Dec 9, 2023 · 9415570 · 9415570
1 parent 9f881ba
commit 9415570
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 38 deletions.
diff --git a/apps/decap/src/collections/page.tsx b/apps/decap/src/collections/page.tsx
@@ -1,4 +1,4 @@
-import { ImageSource, PreviewPageQuery, Url } from '@custom/schema';
+import { ImageSource, Url, ViewPageQuery } from '@custom/schema';
 import {
   BlockMarkupSource,
   BlockMediaSource,
@@ -220,6 +220,7 @@ export function PagePreview({
   const previewSourceData = parsed.success
     ? parsed.data
     : ({
+        id: '',
         __typename: 'Page',
         title: '[Missing title]',
         path: '/preview' as Url,
@@ -230,10 +231,10 @@ export function PagePreview({
   // data into the exact shape of the query result expected by the
   // route.
   const data = useQuery(
-    PreviewPageQuery,
+    ViewPageQuery,
     {
-      previewPage: previewSourceData,
-    } satisfies PreviewPageQuery,
+      page: previewSourceData,
+    } satisfies ViewPageQuery,
     {
       id: '',
       rid: '',
@@ -243,8 +244,6 @@ export function PagePreview({
   );
 
   return (
-    <PreviewFrame>
-      {data?.previewPage ? <Page page={data.previewPage} /> : null}
-    </PreviewFrame>
+    <PreviewFrame>{data?.page ? <Page page={data.page} /> : null}</PreviewFrame>
   );
 }
diff --git a/apps/decap/src/helpers/frame.tsx b/apps/decap/src/helpers/frame.tsx
@@ -1,4 +1,4 @@
-import { FrameQuery, registerOperator, Url } from '@custom/schema';
+import { FrameQuery, Locale, registerOperator, Url } from '@custom/schema';
 import { NavigationItemSource } from '@custom/schema/source';
 import { IntlProvider } from '@custom/ui/intl';
 import { Frame } from '@custom/ui/routes/Frame';
@@ -18,12 +18,18 @@ const menuItems = (amount: number) =>
 export function PreviewFrame({ children }: PropsWithChildren) {
   registerOperator(
     () => ({
-      mainNavigation: {
-        items: menuItems(4),
-      },
-      footerNavigation: {
-        items: menuItems(4),
-      },
+      mainNavigation: [
+        {
+          locale: Locale.En,
+          items: menuItems(4),
+        },
+      ],
+      footerNavigation: [
+        {
+          locale: Locale.En,
+          items: menuItems(4),
+        },
+      ],
     }),
     FrameQuery,
   );

diff --git a/apps/website/src/preview/page.tsx b/apps/website/src/preview/page.tsx
@@ -2,31 +2,31 @@
 
 import {
   drupalOperator,
-  PreviewPageQuery,
   registerOperator,
-  useOperation,
+  ViewPageQuery,
 } from '@custom/schema';
 import { Loading } from '@custom/ui/routes/Loading';
-import { Page } from '@custom/ui/routes/Page';
+// import { Page } from '@custom/ui/routes/Page';
 import React from 'react';
 
-import { usePreviewParameters } from '../utils/preview';
+// import { usePreviewParameters } from '../utils/preview';
 
 export default function PagePreview() {
-  const { nid, rid, lang } = usePreviewParameters();
+  // const { nid, rid, lang } = usePreviewParameters();
   registerOperator(
     drupalOperator(`${process.env.GATSBY_DRUPAL_URL}/graphql`),
-    PreviewPageQuery,
+    ViewPageQuery,
   );
-  const data = useOperation(
-    PreviewPageQuery,
-    nid && rid && lang
-      ? {
-          id: nid,
-          rid: rid,
-          locale: lang,
-        }
-      : undefined,
-  );
-  return data?.previewPage ? <Page page={data.previewPage} /> : <Loading />;
+  return <Loading />;
+  // const data = useOperation(
+  //   PreviewPageQuery,
+  //   nid && rid && lang
+  //     ? {
+  //         id: nid,
+  //         rid: rid,
+  //         locale: lang,
+  //       }
+  //     : undefined,
+  // );
+  // return data?.previewPage ? <Page page={data.previewPage} /> : <Loading />;
 }
diff --git a/packages/schema/src/operations/ListPages.gql b/packages/schema/src/operations/ListPages.gql
@@ -0,0 +1,10 @@
+fragment PageListEntry on Page {
+  id
+  locale
+}
+
+query ListPages {
+  allPages {
+    ...PageListEntry
+  }
+}
diff --git a/packages/schema/src/schema.graphql b/packages/schema/src/schema.graphql
@@ -63,6 +63,7 @@ A generic page.
 type Page implements ContentHubResultItem
   @entity(type: "node", bundle: "page")
   @type(id: "page") {
+  id: ID! @resolveEntityId
   locale: Locale! @resolveEntityLanguage
   path: Url! @resolveEntityPath @isPath
   title: String! @resolveProperty(path: "title.value")
@@ -134,6 +135,8 @@ type Query {
 
   footerNavigation: [FooterNavigation] @gatsbyNodes(type: "FooterNavigation")
 
+  allPages: [Page] @gatsbyNodes(type: "Page")
+
   page(id: ID!, rid: ID, locale: String!): Page
     @fetchEntity(type: "node", id: "$id", rid: "$rid", language: "$locale")
 

diff --git a/packages/ui/src/components/Organisms/Header.stories.ts b/packages/ui/src/components/Organisms/Header.stories.ts
@@ -1,10 +1,4 @@
-import {
-  FrameQuery,
-  Locale,
-  Navigation,
-  NavigationItemFragment,
-  Url,
-} from '@custom/schema';
+import { FrameQuery, Locale, Navigation, Url } from '@custom/schema';
 import { Meta, StoryObj } from '@storybook/react';
 import { userEvent, within } from '@storybook/testing-library';