Use action API identifier instead

gadget-inc · Sep 13, 2024 · 6ae2673 · 6ae2673
1 parent 43326e3
commit 6ae2673
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/packages/api-client-core/src/GadgetFunctions.ts b/packages/api-client-core/src/GadgetFunctions.ts
@@ -143,6 +143,7 @@ export interface StubbedActionFunctionMetadata {
   functionName: string;
   operationName?: string;
   errorMessage: string;
+  actionApiIdentifier: string;
   modelApiIdentifier?: string;
   variables: VariablesOptions;
   reason: StubbedActionReason;

diff --git a/packages/react/src/useAction.ts b/packages/react/src/useAction.ts
@@ -72,7 +72,7 @@ export const useAction = <
   useEffect(() => {
     if (action.type === ("stubbedAction" as string)) {
       const stubbedAction = action as unknown as StubbedActionFunction<GivenOptions>;
-      if (!("reason" in stubbedAction) || !("dataPath" in stubbedAction)) {
+      if (!("reason" in stubbedAction) || !("dataPath" in stubbedAction) || !("actionApiIdentifier" in stubbedAction)) {
         // Don't dispatch an event if the generated client has not yet been updated with the updated parameters
         return;
       }
@@ -81,7 +81,8 @@ export const useAction = <
         detail: {
           reason: stubbedAction.reason,
           action: {
-            actionApiIdentifier: stubbedAction.functionName,
+            functionName: stubbedAction.functionName,
+            actionApiIdentifier: stubbedAction.actionApiIdentifier,
             modelApiIdentifier: stubbedAction.modelApiIdentifier,
             dataPath: stubbedAction.dataPath,
           },

diff --git a/packages/react/src/useBulkAction.ts b/packages/react/src/useBulkAction.ts
@@ -67,7 +67,7 @@ export const useBulkAction = <
   useEffect(() => {
     if (action.type === ("stubbedAction" as string)) {
       const stubbedAction = action as unknown as StubbedActionFunction<GivenOptions>;
-      if (!("reason" in stubbedAction) || !("dataPath" in stubbedAction)) {
+      if (!("reason" in stubbedAction) || !("dataPath" in stubbedAction) || !("actionApiIdentifier" in stubbedAction)) {
         // Don't dispatch an event if the generated client has not yet been updated with the updated parameters
         return;
       }
@@ -76,7 +76,8 @@ export const useBulkAction = <
         detail: {
           reason: stubbedAction.reason,
           action: {
-            actionApiIdentifier: stubbedAction.functionName,
+            functionName: stubbedAction.functionName,
+            actionApiIdentifier: stubbedAction.actionApiIdentifier,
             modelApiIdentifier: stubbedAction.modelApiIdentifier,
             dataPath: stubbedAction.dataPath,
           },