Merge pull request #267 from gadget-inc/fix_useAction_auth_fat_triggers

Fix for useAction incorrectly mapping non nested auth action inputs

Author: jcao49

package.json

@@ -24,7 +24,7 @@
     "@gadget-client/app-with-no-user-model": "^1.3.0",
     "@gadget-client/bulk-actions-test": "^1.102.0",
     "@gadget-client/related-products-example": "^1.848.0",
-    "@gadget-client/super-auth": "^1.17.0",
+    "@gadget-client/super-auth": "^1.27.0",
     "@gadgetinc/api-client-core": "workspace:*",
     "@gadgetinc/eslint-config": "^0.6.1",
     "@gadgetinc/prettier-config": "^0.4.0",

packages/react/spec/auth/useSession.spec.ts

@@ -29,23 +29,23 @@ describe("useSession", () => {
     expect(query).toMatchInlineSnapshot(`
       "query currentSession {
         currentSession {
-          id
           __typename
           createdAt
-          updatedAt
+          id
           roles {
             key
             name
           }
+          updatedAt
           user {
-            id
             __typename
             createdAt
-            updatedAt
-            lastName
-            firstName
             email
+            firstName
             googleImageUrl
+            id
+            lastName
+            updatedAt
           }
         }
         gadgetMeta {
@@ -69,23 +69,23 @@ describe("useSession", () => {
     expect(query).toMatchInlineSnapshot(`
       "query currentSession {
         currentSession {
-          id
           __typename
           createdAt
-          updatedAt
+          id
           roles {
             key
             name
           }
+          updatedAt
           user {
-            id
             __typename
             createdAt
-            updatedAt
-            lastName
-            firstName
             email
+            firstName
             googleImageUrl
+            id
+            lastName
+            updatedAt
           }
         }
         gadgetMeta {

packages/react/spec/auth/useUser.spec.ts

@@ -28,23 +28,23 @@ describe("useUser", () => {
     expect(query).toMatchInlineSnapshot(`
       "query currentSession {
         currentSession {
-          id
           __typename
           createdAt
-          updatedAt
+          id
           roles {
             key
             name
           }
+          updatedAt
           user {
-            id
             __typename
             createdAt
-            updatedAt
-            lastName
-            firstName
             email
+            firstName
             googleImageUrl
+            id
+            lastName
+            updatedAt
           }
         }
         gadgetMeta {
@@ -68,23 +68,23 @@ describe("useUser", () => {
     expect(query).toMatchInlineSnapshot(`
       "query currentSession {
         currentSession {
-          id
           __typename
           createdAt
-          updatedAt
+          id
           roles {
             key
             name
           }
+          updatedAt
           user {
-            id
             __typename
             createdAt
-            updatedAt
-            lastName
-            firstName
             email
+            firstName
             googleImageUrl
+            id
+            lastName
+            updatedAt
           }
         }
         gadgetMeta {
@@ -110,14 +110,14 @@ describe("useUser", () => {
     expect(query).toMatchInlineSnapshot(`
       "query currentSession {
         currentSession {
-          id
           __typename
           createdAt
-          updatedAt
+          id
           roles {
             key
             name
           }
+          updatedAt
           user {
             firstName
           }

packages/react/spec/useAction.spec.tsx

@@ -8,7 +8,7 @@ import type { AnyVariables } from "urql";
 import { Provider } from "../src/GadgetProvider.js";
 import { useAction } from "../src/index.js";
 import type { ErrorWrapper } from "../src/utils.js";
-import { relatedProductsApi } from "./apis.js";
+import { relatedProductsApi, superAuthApi } from "./apis.js";
 import { MockClientWrapper, createMockUrqlClient, mockUrqlClient } from "./testWrappers.js";
 
 describe("useAction", () => {
@@ -417,6 +417,54 @@ describe("useAction", () => {
     `);
   });
 
+  test("generates correct mutation and variables for trigger that contributes inputs", async () => {
+    let variables: AnyVariables;
+
+    const client = createMockUrqlClient({
+      mutationAssertions: (request) => {
+        variables = request.variables;
+      },
+    });
+
+    const wrapper = (props: { children: React.ReactNode }) => <Provider value={client}>{props.children}</Provider>;
+
+    const { result } = renderHook(() => useAction(superAuthApi.user.signUp), {
+      wrapper,
+    });
+
+    let mutationPromise: any;
+    act(() => {
+      mutationPromise = result.current[1]({ email: "[email protected]", password: "password123!" });
+    });
+
+    client.executeMutation.pushResponse("signUpUser", {
+      data: {
+        signUpUser: {
+          result: {
+            result: "ok",
+          },
+          success: true,
+        },
+      },
+      stale: false,
+      hasNext: false,
+    });
+
+    await act(async () => {
+      const promiseResult = await mutationPromise;
+      expect(promiseResult.data).toEqual({ result: "ok" });
+      expect(promiseResult.fetching).toBe(false);
+      expect(promiseResult.error).toBeFalsy();
+    });
+
+    expect(variables).toMatchInlineSnapshot(`
+      {
+        "email": "[email protected]",
+        "password": "password123!",
+      }
+    `);
+  });
+
   test("should throw if called without a model api identifier and there is an ambiguous field", async () => {
     let caughtError = null;
 

packages/react/src/utils.ts

@@ -327,9 +327,10 @@ export const disambiguateActionVariables = (
 
   if (action.acceptsModelInput || action.hasCreateOrUpdateEffect) {
     if (
-      action.modelApiIdentifier in variables &&
-      typeof variables[action.modelApiIdentifier] === "object" &&
-      variables[action.modelApiIdentifier] !== null
+      (action.modelApiIdentifier in variables &&
+        typeof variables[action.modelApiIdentifier] === "object" &&
+        variables[action.modelApiIdentifier] !== null) ||
+      !action.variables[action.modelApiIdentifier]
     ) {
       newVariables = variables;
     } else {