@gisce/react-ooui 1.1.34 → 1.1.35-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.1.34",
+  "version": "1.1.35-rc.0",
   "files": [
     "dist",
     "src",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@ant-design/plots": "^1.0.9",
-    "@gisce/ooui": "^0.17.13",
+    "@gisce/ooui": "^0.17.14-rc.0",
     "@gisce/react-formiga-table": "^0.5.0",
     "@monaco-editor/react": "^4.4.5",
     "@tabler/icons-react": "^2.11.0",

package/src/actionbar/FormActionBar.tsx

@@ -343,13 +343,9 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
           if (!action) {
             return;
           }
+          const savedSucceed = await onFormSave?.();
 
-          const result = await saveNewDocumentIfNeeded({
-            onFormSave,
-            currentId,
-          });
-
-          if (!result.succeed) {
+          if (!savedSucceed) {
             return;
           }
 
@@ -365,21 +361,15 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
           if (!report) {
             return;
           }
-          const result = await saveNewDocumentIfNeeded({
-            onFormSave,
-            currentId,
-          });
+          const savedSucceed = await onFormSave?.();
 
-          if (!result.succeed) {
+          if (!savedSucceed) {
             return;
           }
 
           runAction({
             ...report,
-            datas: {
-              ...(report.datas || {}),
-              ids: [result.currentId as number],
-            },
+            datas: { ...(report.datas || {}), ids: [currentId as number] },
           });
         }}
       />
@@ -393,12 +383,9 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
             return;
           }
 
-          const result = await saveNewDocumentIfNeeded({
-            onFormSave,
-            currentId,
-          });
+          const savedSucceed = await onFormSave?.();
 
-          if (!result.succeed) {
+          if (!savedSucceed) {
             return;
           }
 
@@ -415,16 +402,13 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
         disabled={mustDisableButtons}
         attachments={attachments}
         onAddNewAttachment={async () => {
-          const result = await saveNewDocumentIfNeeded({
-            onFormSave,
-            currentId,
-          });
+          const savedSucceed = await onFormSave?.();
 
-          if (!result.succeed) {
+          if (!savedSucceed) {
             return;
           }
 
-          const res_id = result.currentId as number;
+          const res_id = currentId as number;
           const res_model = currentModel as string;
           openDefaultActionForModel({
             model: "ir.attachment",
@@ -439,16 +423,13 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
           });
         }}
         onListAllAttachments={async () => {
-          const result = await saveNewDocumentIfNeeded({
-            onFormSave,
-            currentId,
-          });
+          const savedSucceed = await onFormSave?.();
 
-          if (!result.succeed) {
+          if (!savedSucceed) {
             return;
           }
 
-          const res_id = result.currentId as number;
+          const res_id = currentId as number;
           const res_model = currentModel as string;
           openDefaultActionForModel({
             model: "ir.attachment",
@@ -460,12 +441,9 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
           });
         }}
         onViewAttachmentDetails={async (attachment: Attachment) => {
-          const result = await saveNewDocumentIfNeeded({
-            onFormSave,
-            currentId,
-          });
+          const savedSucceed = await onFormSave?.();
 
-          if (!result.succeed) {
+          if (!savedSucceed) {
             return;
           }
 
@@ -484,23 +462,4 @@ 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;

package/src/context/ActionViewContext.tsx

@@ -11,7 +11,7 @@ export type ActionViewContextType = {
   setFormIsSaving?: (value: boolean) => void;
   formHasChanges?: boolean;
   setFormHasChanges?: (value: boolean) => void;
-  onFormSave?: () => Promise<{ succeed: boolean; id: number }>;
+  onFormSave?: () => Promise<void>;
   formRef?: any;
   searchTreeRef?: any;
   onNewClicked: () => void;

package/src/context/FormContext.tsx

@@ -22,7 +22,7 @@ export type FormContextType = {
   domain: any[];
   submitForm?: (options?: {
     callOnSubmitSucceed?: boolean;
-  }) => Promise<{ succeed: boolean; id: number }>;
+  }) => Promise<boolean>;
   fetchValues?: () => void;
   formHasChanges?: () => boolean;
   elementHasLostFocus?: () => void;

package/src/widgets/views/Form.tsx

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