WIP

AmazeeLabs · Nov 29, 2023 · 0c6dff0 · 0c6dff0
1 parent 616298d
commit 0c6dff0
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 6 deletions.
diff --git a/packages/schema/src/operators.ts b/packages/schema/src/operators.ts
@@ -118,7 +118,7 @@ class OperatorRegistryError<OperationId extends AnyOperationId> extends Error {
 export function createOperator<OperationId extends AnyOperationId>(
   id: OperationId,
   variables?: OperationVariables<OperationId>,
-): () => OperationResult<OperationId> | Promise<OperationResult<OperationId>> {
+) {
   const op = getCandidates(id)
     .filter((entry) => matchVariables(entry.variables, variables))
     .pop();

diff --git a/packages/ui/.storybook/preview.tsx b/packages/ui/.storybook/preview.tsx
@@ -30,8 +30,48 @@ const LocationDecorator: Decorator = (Story, ctx) => {
   );
 };
 
+declare global {
+  interface Window {
+    __STORYBOOK_PREVIEW__: {
+      currentRender: {
+        id: string;
+      };
+    };
+  }
+}
+
+const SWRCacheDecorator: Decorator = (Story) => {
+  const { cache } = useSWRConfig();
+  for (const key of cache.keys()) {
+    cache.delete(key);
+  }
+  return (
+    <SWRConfig
+      value={{
+        use: [
+          (useSWR) => (key, fetcher, config) => {
+            return useSWR(
+              // Make sure SWR caches are unique per story.
+              [key, window.__STORYBOOK_PREVIEW__.currentRender.id],
+              fetcher,
+              config,
+            );
+          },
+        ],
+      }}
+    >
+      <Story />
+    </SWRConfig>
+  );
+};
+
 export const parameters = {
   chromatic: { viewports: [320, 840, 1440] },
 };
 
-export const decorators = [LocationDecorator, IntlDecorator, OperatorDecorator];
+export const decorators = [
+  LocationDecorator,
+  IntlDecorator,
+  OperatorDecorator,
+  SWRCacheDecorator,
+];
diff --git a/packages/ui/src/components/Organisms/ContentHub.stories.ts b/packages/ui/src/components/Organisms/ContentHub.stories.ts
@@ -22,14 +22,12 @@ export const Empty = {
         contentHub: { total: 0, items: [] },
       })),
     ],
-    location: new URL('local:/content-hub?page=111'),
   },
 } satisfies StoryObj<typeof ContentHub>;
 
 export const Loading = {
   parameters: {
     operators: [buildOperator(ContentHubQuery, () => new Promise(() => {}))],
-    location: new URL('local:/content-hub?page=222'),
   },
 } satisfies StoryObj<typeof ContentHub>;
 
@@ -40,7 +38,6 @@ export const Error = {
         throw 'Error loading content hub.';
       }),
     ],
-    location: new URL('local:/content-hub?page=333'),
   },
 } satisfies StoryObj<typeof ContentHub>;
 

diff --git a/packages/ui/src/components/Organisms/ContentHub.tsx b/packages/ui/src/components/Organisms/ContentHub.tsx
@@ -19,6 +19,7 @@ export function ContentHub({ pageSize = 10 }: { pageSize: number }) {
       offset: currentPage * pageSize - pageSize,
     },
   });
+  console.log(error);
   return (
     <div className="mx-auto max-w-6xl">
       <SearchForm />

diff --git a/packages/ui/src/utils/operation.ts b/packages/ui/src/utils/operation.ts
@@ -12,7 +12,7 @@ export function useOperation<TOperation extends AnyOperationId>(
 ) {
   return useSwr<OperationResult<TOperation>>(
     [operation, variables],
-    variables ? createOperator(operation, variables) : null,
+    createOperator(operation, variables),
     {
       suspense: false,
     },