Merge branch 'feat/sse-open-actions' into alpha

gisce · Jan 21, 2025 · 964d3a3 · 964d3a3
2 parents 640f748 + 91dc69f
commit 964d3a3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/context/ContentRootContext.tsx b/src/context/ContentRootContext.tsx
@@ -1,9 +1,4 @@
-import {
-  FormView,
-  GenerateReportOptions,
-  ViewType,
-  ActionRawData,
-} from "@/types";
+import { FormView, GenerateReportOptions, ViewType } from "@/types";
 import React, {
   useContext,
   useRef,
@@ -79,6 +74,7 @@ const ContentRootProvider = (
 
   useImperativeHandle(ref, () => ({
     openActionModal,
+    processAction,
   }));
 
   // Action modal state
@@ -177,7 +173,9 @@ const ContentRootProvider = (
     onRefreshParentValues?: any;
   }) {
     const { type } = actionData;
-    onRefreshParentValues.current.push(onRefreshParentValuesFn);
+    if (onRefreshParentValuesFn) {
+      onRefreshParentValues.current.push(onRefreshParentValuesFn);
+    }
 
     if (type === "ir.actions.report.xml") {
       return await generateReport({
@@ -222,15 +220,15 @@ const ContentRootProvider = (
       )[0];
     }
 
-    const rawContext = actionData.context;
+    const rawContext = actionData?.context;
     const responseContext =
       typeof actionData?.context === "string"
         ? parseContext({
             context: actionData.context,
             fields,
             values: { ...values, ...globalValues },
           })
-        : actionData.context;
+        : actionData?.context || {};
 
     const mergedContext = {
       ...context,
@@ -296,6 +294,7 @@ const ContentRootProvider = (
           fields,
           values,
         },
+        res_id: actionData.res_id,
       });
 
       return { closeParent: true };

diff --git a/src/views/RootView.tsx b/src/views/RootView.tsx
@@ -46,6 +46,7 @@ function RootView(props: RootViewProps, ref: any) {
     openShortcut,
     handleOpenActionUrl,
     handleOpenActionResourceUrl,
+    processAction: (contentRootProvider.current as any).processAction,
   }));
 
   function remove(key: string) {