Merge pull request #278 from gisce/hotfix/bug_webclient#436

Save form before running an export
gisce · Apr 11, 2023 · eb1e043 · eb1e043
2 parents 3bd10b1 + 3579612
commit eb1e043
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 11 deletions.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.1.32",
+  "version": "1.1.33",
   "files": [
     "dist",
     "src",

diff --git a/src/actionbar/FormActionBar.tsx b/src/actionbar/FormActionBar.tsx
@@ -339,10 +339,15 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
         disabled={mustDisableButtons}
         tooltip={t("actions")}
         items={toolbar?.action}
-        onItemClick={(action: any) => {
+        onItemClick={async (action: any) => {
           if (!action) {
             return;
           }
+          const savedSucceed = await onFormSave?.();
+
+          if (!savedSucceed) {
+            return;
+          }
 
           runAction(action);
         }}
@@ -352,10 +357,15 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
         disabled={mustDisableButtons}
         tooltip={t("reports")}
         items={toolbar?.print}
-        onItemClick={(report: any) => {
+        onItemClick={async (report: any) => {
           if (!report) {
             return;
           }
+          const savedSucceed = await onFormSave?.();
+
+          if (!savedSucceed) {
+            return;
+          }
 
           runAction({
             ...report,
@@ -373,6 +383,12 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
             return;
           }
 
+          const savedSucceed = await onFormSave?.();
+
+          if (!savedSucceed) {
+            return;
+          }
+
           openRelate({
             relateData: relate,
             values: (formRef.current as any).getValues(),
@@ -385,7 +401,13 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
       <AttachmentsButton
         disabled={mustDisableButtons}
         attachments={attachments}
-        onAddNewAttachment={() => {
+        onAddNewAttachment={async () => {
+          const savedSucceed = await onFormSave?.();
+
+          if (!savedSucceed) {
+            return;
+          }
+
           const res_id = currentId as number;
           const res_model = currentModel as string;
           openDefaultActionForModel({
@@ -400,7 +422,13 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
             initialViewType: "form",
           });
         }}
-        onListAllAttachments={() => {
+        onListAllAttachments={async () => {
+          const savedSucceed = await onFormSave?.();
+
+          if (!savedSucceed) {
+            return;
+          }
+
           const res_id = currentId as number;
           const res_model = currentModel as string;
           openDefaultActionForModel({
@@ -412,7 +440,13 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
             initialViewType: "tree",
           });
         }}
-        onViewAttachmentDetails={(attachment: Attachment) => {
+        onViewAttachmentDetails={async (attachment: Attachment) => {
+          const savedSucceed = await onFormSave?.();
+
+          if (!savedSucceed) {
+            return;
+          }
+
           openDefaultActionForModel({
             model: "ir.attachment",
             res_id: attachment.id,

diff --git a/src/context/ActionViewContext.tsx b/src/context/ActionViewContext.tsx
@@ -11,7 +11,7 @@ export type ActionViewContextType = {
   setFormIsSaving?: (value: boolean) => void;
   formHasChanges?: boolean;
   setFormHasChanges?: (value: boolean) => void;
-  onFormSave?: () => void;
+  onFormSave?: () => Promise<void>;
   formRef?: any;
   searchTreeRef?: any;
   onNewClicked: () => void;
@@ -141,8 +141,8 @@ const ActionViewProvider = (props: ActionViewProviderProps): any => {
     }
   }, [currentView]);
 
-  const callOnFormSave = () => {
-    (formRef.current as any)?.submitForm();
+  const callOnFormSave = async () => {
+    await (formRef.current as any)?.submitForm();
   };
 
   return (