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

Fix for adjusting return value in submitForm for reports, actions, related and attachments
gisce · Apr 11, 2023 · fc43dc8 · fc43dc8
2 parents eb1e043 + d9675a4
commit fc43dc8
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 24 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.33",
+  "version": "1.1.34",
   "files": [
     "dist",
     "src",

diff --git a/src/actionbar/FormActionBar.tsx b/src/actionbar/FormActionBar.tsx
@@ -343,9 +343,13 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
           if (!action) {
             return;
           }
-          const savedSucceed = await onFormSave?.();
 
-          if (!savedSucceed) {
+          const result = await saveNewDocumentIfNeeded({
+            onFormSave,
+            currentId,
+          });
+
+          if (!result.succeed) {
             return;
           }
 
@@ -361,15 +365,21 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
           if (!report) {
             return;
           }
-          const savedSucceed = await onFormSave?.();
+          const result = await saveNewDocumentIfNeeded({
+            onFormSave,
+            currentId,
+          });
 
-          if (!savedSucceed) {
+          if (!result.succeed) {
             return;
           }
 
           runAction({
             ...report,
-            datas: { ...(report.datas || {}), ids: [currentId as number] },
+            datas: {
+              ...(report.datas || {}),
+              ids: [result.currentId as number],
+            },
           });
         }}
       />
@@ -383,9 +393,12 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
             return;
           }
 
-          const savedSucceed = await onFormSave?.();
+          const result = await saveNewDocumentIfNeeded({
+            onFormSave,
+            currentId,
+          });
 
-          if (!savedSucceed) {
+          if (!result.succeed) {
             return;
           }
 
@@ -402,13 +415,16 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
         disabled={mustDisableButtons}
         attachments={attachments}
         onAddNewAttachment={async () => {
-          const savedSucceed = await onFormSave?.();
+          const result = await saveNewDocumentIfNeeded({
+            onFormSave,
+            currentId,
+          });
 
-          if (!savedSucceed) {
+          if (!result.succeed) {
             return;
           }
 
-          const res_id = currentId as number;
+          const res_id = result.currentId as number;
           const res_model = currentModel as string;
           openDefaultActionForModel({
             model: "ir.attachment",
@@ -423,13 +439,16 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
           });
         }}
         onListAllAttachments={async () => {
-          const savedSucceed = await onFormSave?.();
+          const result = await saveNewDocumentIfNeeded({
+            onFormSave,
+            currentId,
+          });
 
-          if (!savedSucceed) {
+          if (!result.succeed) {
             return;
           }
 
-          const res_id = currentId as number;
+          const res_id = result.currentId as number;
           const res_model = currentModel as string;
           openDefaultActionForModel({
             model: "ir.attachment",
@@ -441,9 +460,12 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
           });
         }}
         onViewAttachmentDetails={async (attachment: Attachment) => {
-          const savedSucceed = await onFormSave?.();
+          const result = await saveNewDocumentIfNeeded({
+            onFormSave,
+            currentId,
+          });
 
-          if (!savedSucceed) {
+          if (!result.succeed) {
             return;
           }
 
@@ -462,4 +484,23 @@ function separator() {
   return <div className="inline-block w-2" />;
 }
 
+async function saveNewDocumentIfNeeded({
+  onFormSave,
+  currentId,
+}: {
+  onFormSave?: () => Promise<{ succeed: boolean; id: number }>;
+  currentId: number | undefined;
+}): Promise<{ succeed: boolean; currentId?: number }> {
+  if (currentId !== undefined) {
+    return { succeed: true, currentId: currentId };
+  }
+  const result = await onFormSave?.();
+
+  if (result?.succeed) {
+    return { succeed: true, currentId: result.id };
+  } else {
+    return { succeed: false, currentId: undefined };
+  }
+}
+
 export default FormActionBar;
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?: () => Promise<void>;
+  onFormSave?: () => Promise<{ succeed: boolean; id: number }>;
   formRef?: any;
   searchTreeRef?: any;
   onNewClicked: () => void;
@@ -142,7 +142,7 @@ const ActionViewProvider = (props: ActionViewProviderProps): any => {
   }, [currentView]);
 
   const callOnFormSave = async () => {
-    await (formRef.current as any)?.submitForm();
+    return await (formRef.current as any)?.submitForm();
   };
 
   return (

diff --git a/src/context/FormContext.tsx b/src/context/FormContext.tsx
@@ -22,7 +22,7 @@ export type FormContextType = {
   domain: any[];
   submitForm?: (options?: {
     callOnSubmitSucceed?: boolean;
-  }) => Promise<boolean>;
+  }) => Promise<{ succeed: boolean; id: number }>;
   fetchValues?: () => void;
   formHasChanges?: () => boolean;
   elementHasLostFocus?: () => void;

diff --git a/src/widgets/views/Form.tsx b/src/widgets/views/Form.tsx
@@ -614,13 +614,13 @@ function Form(props: FormProps, ref: any) {
       formSubmitting.current = false;
       setFormHasChanges?.(false);
       onCancel?.();
-      return true;
+      return { succeed: true, id: getCurrentId()! };
     }
 
     if (await checkIfFormHasErrors()) {
       formSubmitting.current = false;
       formErrorsDialog(lang);
-      return false;
+      return { succeed: false, id: getCurrentId()! };
     }
 
     setIsSubmitting(true);
@@ -653,7 +653,7 @@ function Form(props: FormProps, ref: any) {
       setIsSubmitting(false);
     }
 
-    return submitSucceed;
+    return { succeed: submitSucceed, id: getCurrentId()! };
   };
 
   const parseForm = ({