Fix home stories

tgstation · Oct 21, 2024 · 781ccca · 781ccca
1 parent 97284db
commit 781ccca
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 16 deletions.
diff --git a/.storybook/MockRelayEnvironment.tsx b/.storybook/MockRelayEnvironment.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { makeDecorator } from "@storybook/preview-api";
 import { RelayEnvironmentProvider } from "react-relay";
-import { GraphQLTaggedNode, OperationType } from "relay-runtime";
+import { GraphQLTaggedNode, OperationType, VariablesOf } from "relay-runtime";
 import { createMockEnvironment, MockPayloadGenerator } from "relay-test-utils";
 import { OperationMockResolver } from "relay-test-utils/lib/RelayModernMockEnvironment";
 import { PartialDeep } from "type-fest";
@@ -45,7 +45,7 @@ export type WithRelayParameters<TQuery extends OperationType, TResolvers = objec
     /**
      * Optional. Variables to pass to the query.
      */
-    variables?: TQuery["variables"];
+    variables?: VariablesOf<TQuery>;
 
     /**
      * Optional. Mock resolver object pass to the relay-test-utils MockPayloadGenerator.generate function.

diff --git a/src/components/routed/Home/Home.stories.tsx b/src/components/routed/Home/Home.stories.tsx
@@ -1,32 +1,47 @@
 import { Meta, StoryObj } from "@storybook/react";
+import { Suspense } from "react";
+import { loadQuery, useRelayEnvironment } from "react-relay";
 
 import { HomeCardPermissionsQuery } from "./graphql/__generated__/HomeCardPermissionsQuery.graphql";
 import HomeCardPermissions from "./graphql/HomeCardPermissions";
 import Home from "./Home";
 
 import { WithRelayParameters } from "@/../.storybook/MockRelayEnvironment";
 import SessionContext from "@/context/session/SessionContext";
-import { DefaultUserPasswordCredentials, UserPasswordCredentials } from "@/lib/Credentials";
+import { UserPasswordCredentials } from "@/lib/Credentials";
 
 interface IArgs {
     defaultCredentials: boolean;
 }
 
+const variables = {
+    userID: "fdsa"
+};
+
 const TestComponent = (props: IArgs) => {
-    const session = {
-        currentSession: {
-            bearer: "asdf",
-            userID: "fdsa",
-            originalCredentials: props.defaultCredentials
-                ? new DefaultUserPasswordCredentials()
-                : new UserPasswordCredentials("asdf", "asdf")
-        },
-        setSession: () => {}
-    };
+    const queryRef = loadQuery<HomeCardPermissionsQuery>(
+        useRelayEnvironment(),
+        HomeCardPermissions,
+        variables
+    );
 
     return (
-        <SessionContext.Provider value={session}>
-            <Home />
+        <SessionContext.Provider
+            value={{
+                currentSession: {
+                    bearer: "asdf",
+                    userID: "fdsa",
+                    originalCredentials: new UserPasswordCredentials(
+                        "asdf",
+                        "asdf",
+                        props.defaultCredentials
+                    )
+                },
+                setSession: () => {}
+            }}>
+            <Suspense>
+                <Home queryRef={queryRef} />
+            </Suspense>
         </SessionContext.Provider>
     );
 };
@@ -48,7 +63,8 @@ const CreateRelay = (fieldsEnabled: boolean): WithRelayParameters<HomeCardPermis
                 canRead: fieldsEnabled
             }
         })
-    }
+    },
+    variables
 });
 
 const config: Meta<typeof TestComponent> = {