Added support for action callbacks in ensemble.invokeAPI

apps/kitchen-sink/src/ensemble/screens/home.yaml

@@ -12,12 +12,10 @@ View:
         console.log('>>> secret variable >>>', ensemble.secrets.dummyOauthSecret)
         ensemble.storage.set('products', []);
         ensemble.invokeAPI('getDummyProducts').then((res) => ensemble.storage.set('products', (res?.body?.users || []).map((i) => ({ ...i, name: i.firstName + ' ' + i.lastName }))));
-        const res = await ensemble.invokeAPI('getDummyNumbers')
-        await new Promise((resolve) => setTimeout(resolve, 5000))
-        return res
+        ensemble.invokeAPI('getDummyNumbers')
       onComplete:
         executeCode: |
-          console.log('API triggered', result)
+          console.log('API triggered')
 
   header:
     title:

packages/framework/src/api/data.ts

@@ -50,31 +50,38 @@ export const invokeAPI = async (
   const useMockResponse =
     has(api, "mockResponse") && isUsingMockResponse(screenContext.app?.id);
 
-  const response = await queryClient.fetchQuery({
-    queryKey: [hash],
-    queryFn: () =>
-      DataFetcher.fetch(
-        api,
-        { ...apiInputs, ...context },
-        {
-          mockResponse: mockResponse(
-            evaluatedMockResponse ?? api.mockResponse,
+  try {
+    const response = await queryClient.fetchQuery({
+      queryKey: [hash],
+      queryFn: () =>
+        DataFetcher.fetch(
+          api,
+          { ...apiInputs, ...context },
+          {
+            mockResponse: mockResponse(
+              evaluatedMockResponse ?? api.mockResponse,
+              useMockResponse,
+            ),
             useMockResponse,
-          ),
-          useMockResponse,
-        },
-      ),
-    staleTime:
-      api.cacheExpirySeconds && !options?.bypassCache
-        ? api.cacheExpirySeconds * 1000
-        : 0,
-  });
+          },
+        ),
+      staleTime:
+        api.cacheExpirySeconds && !options?.bypassCache
+          ? api.cacheExpirySeconds * 1000
+          : 0,
+    });
 
-  if (setter) {
-    set(update, api.name, response);
-    setter(screenDataAtom, { ...update });
+    if (setter) {
+      set(update, api.name, response);
+      setter(screenDataAtom, { ...update });
+    }
+
+    api.onResponseAction?.callback({ ...context, response });
+
+    return response;
+  } catch (err) {
+    api.onErrorAction?.callback({ ...context, error: err });
   }
-  return response;
 };
 
 export const handleConnectSocket = (

packages/framework/src/shared/models.ts

@@ -1,5 +1,5 @@
 import type { CSSProperties } from "react";
-import type { EnsembleAction } from "./actions";
+import type { EnsembleAction, EnsembleActionHookResult } from "./actions";
 import type { EnsembleConfigYAML } from "./dto";
 
 /**
@@ -74,6 +74,8 @@ export interface EnsembleAPIModel {
   body?: string | object;
   onResponse?: EnsembleAction;
   onError?: EnsembleAction;
+  onResponseAction?: EnsembleActionHookResult;
+  onErrorAction?: EnsembleActionHookResult;
   mockResponse?: EnsembleMockResponse | string;
 }
 

packages/runtime/src/runtime/hooks/__tests__/useExecuteCode.test.tsx

@@ -146,7 +146,7 @@ test("call ensemble.invokeAPI with bypassCache", async () => {
 
   expect(withoutForceInitialResult).toBe(withoutForceResult);
   expect(withForceResult).not.toBe(withoutForceResult);
-});
+}, 10000);
 
 test.todo("populates application invokables");