WIP

AmazeeLabs · Nov 24, 2023 · 02bcd82 · 02bcd82
1 parent 81a6d4f
commit 02bcd82
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/apps/website/gatsby-browser.ts b/apps/website/gatsby-browser.ts
@@ -1,7 +1,12 @@
 import './styles.css';
 
+import { drupalOperator, registerOperator } from '@custom/schema';
 import { GatsbyBrowser } from 'gatsby';
 
+export const onClientEntry: GatsbyBrowser['onClientEntry'] = async () => {
+  registerOperator(drupalOperator(`/graphql`));
+};
+
 export const shouldUpdateScroll: GatsbyBrowser['shouldUpdateScroll'] = (
   args,
 ) => {

diff --git a/apps/website/gatsby-ssr.ts b/apps/website/gatsby-ssr.ts
@@ -1,12 +1,13 @@
 import './styles.css';
 
-import { Locale } from '@custom/schema';
+import { drupalOperator, Locale, registerOperator } from '@custom/schema';
 import { GatsbySSR } from 'gatsby';
 
 export const onRenderBody: GatsbySSR['onRenderBody'] = ({
   setHtmlAttributes,
   pathname,
 }) => {
+  registerOperator(drupalOperator(`/graphql`));
   const locales = Object.values(Locale);
   if (locales.length === 1) {
     // Single-language project.

diff --git a/apps/website/src/pages/content-hub.tsx b/apps/website/src/pages/content-hub.tsx
@@ -1,8 +1,3 @@
-import {
-  ContentHubQuery,
-  drupalOperator,
-  registerOperator,
-} from '@custom/schema';
 import { ContentHub } from '@custom/ui/routes/ContentHub';
 import React from 'react';
 
@@ -12,6 +7,5 @@ export function Head() {
 }
 
 export default function ContentHubPage() {
-  registerOperator(drupalOperator(`/graphql`), ContentHubQuery);
   return <ContentHub pageSize={6} />;
 }
diff --git a/packages/schema/src/index.ts b/packages/schema/src/index.ts
@@ -23,5 +23,5 @@ export function useOperation<TOperation extends AnyOperationId>(
       suspense: false,
     },
   );
-  return result.data?.data;
+  return result.data;
 }
diff --git a/packages/ui/.storybook/preview.tsx b/packages/ui/.storybook/preview.tsx
@@ -2,7 +2,11 @@ import '../tailwind.css';
 
 import { Decorator } from '@storybook/react';
 import { IntlProvider } from '../src/utils/intl';
-import { LocationProvider } from '@custom/schema';
+import {
+  LocationProvider,
+  drupalOperator,
+  registerOperator,
+} from '@custom/schema';
 import React from 'react';
 import { initialize, mswLoader } from 'msw-storybook-addon';
 
@@ -13,6 +17,8 @@ const IntlDecorator: Decorator = (Story) => (
   </IntlProvider>
 );
 
+registerOperator(drupalOperator('/graphql'));
+
 const LocationDecorator: Decorator = (Story, ctx) => {
   return (
     <LocationProvider currentLocation={ctx.parameters.location}>