WIP

AmazeeLabs · Dec 25, 2023 · 746b776 · 746b776
1 parent 19e2937
commit 746b776
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 426 deletions.
diff --git a/apps/decap/src/main.tsx b/apps/decap/src/main.tsx
@@ -1,4 +1,4 @@
-import { PreviewDecapPageQuery } from '@custom/schema';
+import { PreviewDecapPageQuery, ViewPageQuery } from '@custom/schema';
 import { registerExecutor } from '@custom/ui';
 import { Page } from '@custom/ui/routes/Page';
 import CMS from 'decap-cms-app';
@@ -67,7 +67,7 @@ CMS.registerPreviewTemplate(
     PreviewDecapPageQuery,
     pageSchema,
     (data) => {
-      registerExecutor(PreviewDecapPageQuery, data);
+      registerExecutor(ViewPageQuery, { page: data.preview });
       return <Page id="preview" locale="en" />;
     },
     'previewDecapPage',

diff --git a/apps/website/src/preview/page.tsx b/apps/website/src/preview/page.tsx
@@ -8,28 +8,21 @@ import { usePreviewParameters } from '../utils/preview';
 
 const previewExecutor = drupalExecutor(
   `${process.env.GATSBY_DRUPAL_URL}/graphql`,
+  false,
 );
 
 export default function PagePreview() {
   const { nid, rid, lang } = usePreviewParameters();
-
-  registerExecutor(ViewPageQuery, () => {
-    return new Promise<ViewPageQuery>((resolve, reject) => {
-      if (nid && rid && lang) {
-        previewExecutor(PreviewDrupalPageQuery, {
-          id: nid,
-          locale: lang,
-          rid,
-        })
-          .then((result) => {
-            if (result.preview) {
-              resolve({ page: result.preview });
-            }
-            return;
-          })
-          .catch((error) => reject(error));
-      }
+  if (nid && rid && lang) {
+    registerExecutor(ViewPageQuery, async () => {
+      const data = await previewExecutor(PreviewDrupalPageQuery, {
+        id: nid,
+        locale: lang,
+        rid,
+      });
+      return { page: data.preview };
     });
-  });
-  return <Page id="preview" locale="en" />;
+    return <Page id="preview" locale="en" />;
+  }
+  return null;
 }
diff --git a/apps/website/src/utils/drupal-executor.ts b/apps/website/src/utils/drupal-executor.ts
@@ -17,9 +17,8 @@ export type OperationVariables<TQueryID extends OperationId<any, any>> =
 
 /**
  * Create an executor that operates against a Drupal endpoint.
- * TODO: Fix typing after moving Operation types into executors package.
  */
-export function drupalExecutor(endpoint: string) {
+export function drupalExecutor(endpoint: string, forward: boolean = true) {
   return async function <OperationId extends AnyOperationId>(
     id: OperationId,
     variables?: OperationVariables<OperationId>,
@@ -30,11 +29,13 @@ export function drupalExecutor(endpoint: string) {
     const { data, errors } = await (
       await fetch(url, {
         credentials: 'include',
-        headers: {
-          'SLB-Forwarded-Proto': window.location.protocol.slice(0, -1),
-          'SLB-Forwarded-Host': window.location.hostname,
-          'SLB-Forwarded-Port': window.location.port,
-        },
+        headers: forward
+          ? {
+              'SLB-Forwarded-Proto': window.location.protocol.slice(0, -1),
+              'SLB-Forwarded-Host': window.location.hostname,
+              'SLB-Forwarded-Port': window.location.port,
+            }
+          : {},
       })
     ).json();
     if (errors) {

diff --git a/packages/schema/src/schema.graphql b/packages/schema/src/schema.graphql
@@ -165,8 +165,9 @@ input PaginationInput {
 }
 
 type Query {
-  previewDecapPage: Page
-  previewDrupalPage(id: ID!, rid: ID, locale: String!): Page
+  previewDecapPage: DecapPage
+  previewDrupalPage(id: ID!, rid: ID, locale: String!): DrupalPage
+    @fetchEntity(type: "node", id: "$id", rid: "$rid", language: "$locale")
   mainNavigations: [MainNavigation] @gatsbyNodes(type: "MainNavigation")
   footerNavigations: [FooterNavigation] @gatsbyNodes(type: "FooterNavigation")