@gisce/react-ooui 1.1.65-rc.0 → 1.1.66

package/dist/ui/ActionErrorDialog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ActionErrorDialog.d.ts","sourceRoot":"","sources":["ActionErrorDialog.tsx"],"names":[],"mappings":"AAOA,QAAA,MAAM,UAAU,QAAS,MAAM,SAc9B,CAAC;AAEF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"ActionErrorDialog.d.ts","sourceRoot":"","sources":["ActionErrorDialog.tsx"],"names":[],"mappings":"AAMA,QAAA,MAAM,UAAU,QAAS,MAAM,SAgC9B,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/dist/widgets/custom/ButtonGroup.d.ts

@@ -3,6 +3,6 @@ import { ButtonGroup as ButtonGroupOoui } from "@gisce/ooui";
 declare type ButtonGroupProps = {
     ooui: ButtonGroupOoui;
 };
-export declare const ButtonGroup: (props: ButtonGroupProps) => JSX.Element;
+export declare const ButtonGroup: (props: ButtonGroupProps) => JSX.Element | null | undefined;
 export {};
 //# sourceMappingURL=ButtonGroup.d.ts.map

package/dist/widgets/custom/ButtonGroup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ButtonGroup.d.ts","sourceRoot":"","sources":["ButtonGroup.tsx"],"names":[],"mappings":";AAIA,OAAO,EACL,WAAW,IAAI,eAAe,EAG/B,MAAM,aAAa,CAAC;AAQrB,aAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,eAAe,CAAC;CACvB,CAAC;AAMF,eAAO,MAAM,WAAW,UAAW,gBAAgB,gBAoElD,CAAC"}
+{"version":3,"file":"ButtonGroup.d.ts","sourceRoot":"","sources":["ButtonGroup.tsx"],"names":[],"mappings":";AAKA,OAAO,EACL,WAAW,IAAI,eAAe,EAG/B,MAAM,aAAa,CAAC;AAQrB,aAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,eAAe,CAAC;CACvB,CAAC;AAQF,eAAO,MAAM,WAAW,UAAW,gBAAgB,mCA2ElD,CAAC"}

package/dist/widgets/views/Form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Form.d.ts","sourceRoot":"","sources":["Form.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAkCf,OAAO,EAAE,QAAQ,EAAgB,MAAM,SAAS,CAAC;AAkBjD,oBAAY,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,UAAU,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC;IAC9B,eAAe,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IACxE,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IACrC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;IACvC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,YAAY,CAAC,EAAE,GAAG,CAAC;CACpB,CAAC;;AAk+BF,wBAAgC"}
+{"version":3,"file":"Form.d.ts","sourceRoot":"","sources":["Form.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAkCf,OAAO,EAAE,QAAQ,EAAgB,MAAM,SAAS,CAAC;AAiBjD,oBAAY,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,UAAU,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC;IAC9B,eAAe,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IACxE,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IACrC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;IACvC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,YAAY,CAAC,EAAE,GAAG,CAAC;CACpB,CAAC;;AAo+BF,wBAAgC"}

package/package.json

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

package/src/actionbar/FormActionBar.tsx

@@ -78,6 +78,15 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
     TabManagerContext
   ) as TabManagerContextType;
   const { openRelate, openDefaultActionForModel } = tabManagerContext || {};
+  const prevFormIsSavingRef = useRef<boolean>(false);
+
+  useEffect(() => {
+    if (!formIsSaving && prevFormIsSavingRef.current) {
+      message.success(t("savedRegisters"));
+    }
+
+    prevFormIsSavingRef.current = formIsSaving || false;
+  }, [formIsSaving]);
 
   function tryRefresh(callback: any) {
     if (formHasChanges) {

package/src/ui/ActionErrorDialog.tsx

@@ -1,21 +1,38 @@
 import React from "react";
 import { Modal } from "antd";
 import { ExclamationCircleOutlined, WarningOutlined } from "@ant-design/icons";
-import { parseError } from "@/helpers/errorHelper";
 
 const { error, warning } = Modal;
 
 const showDialog = (err: string) => {
-  const { message, type, title } = parseError(err);
+  let message;
+  let type;
+  let title;
 
-  const iconComponent =
+  if (
+    typeof err === "string" &&
+    err.indexOf(" -- ") !== -1 &&
+    err.indexOf("\n\n") !== -1
+  ) {
+    const splitted = err.split("\n\n");
+    message = splitted[1];
+    const args = splitted[0].split(" -- ");
+    type = args[0];
+    title = args[1];
+  } else {
+    message = err;
+    type = "error";
+    title = "Error";
+  }
+
+  const icon =
     type === "error" ? <ExclamationCircleOutlined /> : <WarningOutlined />;
 
   const modalType = type === "error" ? error : warning;
 
   modalType({
     title,
-    icon: iconComponent,
+    icon,
     centered: true,
     content: message,
   });

package/src/widgets/custom/ButtonGroup.tsx

@@ -2,6 +2,7 @@ import React, { useContext, useState } from "react";
 import Field from "@/common/Field";
 import { DownOutlined } from "@ant-design/icons";
 import { Dropdown, Menu } from "antd";
+import { Button } from "@/widgets/base/Button";
 import {
   ButtonGroup as ButtonGroupOoui,
   Button as ButtonOoui,
@@ -20,6 +21,8 @@ type ButtonGroupProps = {
 
 type ItemsProps = {
   ooui: ButtonOoui[];
+  executeButtonAction: any,
+  lang: string
 };
 
 export const ButtonGroup = (props: ButtonGroupProps) => {
@@ -73,27 +76,37 @@ export const ButtonGroup = (props: ButtonGroupProps) => {
 
     onClick_confirm();
   }
-
-  return (
-    <Field ooui={new FieldOoui({ ...{ ooui } })}>
-      <Dropdown.Button
-        disabled={!activated || readOnly}
-        onClick={onClick}
-        icon={<DownOutlined />}
-        type={primary ? "primary" : undefined}
-        //danger={danger ? true : undefined} This works but typescript
-        // doesn't accept
-        overlay={Items({ooui: secondaryButtons})}
-      >
-        {getButtonIcon()}
-        {caption}
-      </Dropdown.Button>
-    </Field>
-  );
+  if (ooui.buttons.length === 0) {
+    return null;
+  } else if (ooui.buttons.length > 1) {
+    return (
+      <Field ooui={new FieldOoui({ ...{ ooui } })}>
+        <Dropdown.Button
+          disabled={!activated || readOnly}
+          onClick={onClick}
+          icon={<DownOutlined />}
+          type={primary ? "primary" : undefined}
+          //danger={danger ? true : undefined} This works but typescript
+          // doesn't accept
+          overlay={<Items ooui={secondaryButtons} executeButtonAction={executeButtonAction} lang={lang} /> }
+        >
+          {getButtonIcon()}
+          {caption}
+        </Dropdown.Button>
+      </Field>
+    );
+  }  else if (defaultButton) {
+    return (
+      <Button ooui={defaultButton} />
+    )
+  }
 };
 
 const Items = (props: ItemsProps) => {
-  const { ooui } = props;
+  const { ooui, executeButtonAction, lang } = props;
+  if (!ooui) {
+    return null;
+  }
   const items = ooui.map((button) => {
     const {
       id,
@@ -106,10 +119,7 @@ const Items = (props: ItemsProps) => {
       readOnly,
       danger,
     } = button;
-    const formContext = useContext(FormContext) as FormContextType;
-    const { executeButtonAction } = formContext || {};
     const [isRunning, setIsRunning] = useState<boolean>(false);
-    const { lang } = useContext(LocaleContext) as LocaleContextType;
 
     async function onClick_confirm() {
       setIsRunning(true);

package/src/widgets/views/Form.tsx

@@ -55,7 +55,6 @@ import {
   ContentRootContextType,
 } from "@/context/ContentRootContext";
 import { LocaleContext, LocaleContextType } from "@/context/LocaleContext";
-import { ErrorAlert } from "@/ui/ErrorAlert";
 
 export type FormProps = {
   model: string;
@@ -636,7 +635,6 @@ function Form(props: FormProps, ref: any) {
 
       await fetchValues();
       submitSucceed = true;
-      message.success(t("savedRegisters"));
     } catch (err) {
       formSubmitting.current = false;
       setIsSubmitting(false);
@@ -871,10 +869,6 @@ function Form(props: FormProps, ref: any) {
       model,
       action,
       payload: getCurrentId()!,
-      context: {
-        ...parentContext,
-        ...formOoui?.context,
-      },
     });
 
     if (response.type && response.type === "ir.actions.act_window_close") {
@@ -1064,7 +1058,14 @@ function Form(props: FormProps, ref: any) {
     >
       {({ measureRef }) => (
         <div className="pb-2" ref={measureRef}>
-          {error && <ErrorAlert className="mt-10 mb-20" error={error} />}
+          {error && (
+            <Alert
+              className="mt-10 mb-20"
+              message={JSON.stringify(error)}
+              type="error"
+              banner
+            />
+          )}
           {content()}
           {showFooter && footer()}
         </div>

package/dist/helpers/errorHelper.d.ts

@@ -1,6 +0,0 @@
-export declare const parseError: (errorResponse: string) => {
-    type: string;
-    message: string;
-    title: string;
-};
-//# sourceMappingURL=errorHelper.d.ts.map

package/dist/helpers/errorHelper.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"errorHelper.d.ts","sourceRoot":"","sources":["errorHelper.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU,kBAAmB,MAAM;;;;CA0B/C,CAAC"}

package/dist/ui/ErrorAlert.d.ts

@@ -1,6 +0,0 @@
-/// <reference types="react" />
-export declare const ErrorAlert: ({ error, className, }: {
-    error: any;
-    className: string;
-}) => JSX.Element;
-//# sourceMappingURL=ErrorAlert.d.ts.map

package/dist/ui/ErrorAlert.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ErrorAlert.d.ts","sourceRoot":"","sources":["ErrorAlert.tsx"],"names":[],"mappings":";AAKA,eAAO,MAAM,UAAU;WAId,GAAG;eACC,MAAM;iBA0BlB,CAAC"}

package/src/helpers/errorHelper.ts

@@ -1,27 +0,0 @@
-export const parseError = (errorResponse: string) => {
-  let message;
-  let type;
-  let title;
-
-  if (
-    typeof errorResponse === "string" &&
-    errorResponse.indexOf(" -- ") !== -1 &&
-    errorResponse.indexOf("\n\n") !== -1
-  ) {
-    const splitted = errorResponse.split("\n\n");
-    message = splitted[1].replace(/\n/g, "<br />");
-    const args = splitted[0].split(" -- ");
-    type = args[0];
-    title = args[1];
-  } else {
-    message = errorResponse;
-    type = "error";
-    title = "Error";
-  }
-
-  return {
-    type,
-    message,
-    title,
-  };
-};

package/src/ui/ErrorAlert.tsx

@@ -1,37 +0,0 @@
-import { parseError } from "@/helpers/errorHelper";
-import { Alert } from "antd";
-import React from "react";
-import { Interweave } from "interweave";
-
-export const ErrorAlert = ({
-  error,
-  className,
-}: {
-  error: any;
-  className: string;
-}) => {
-  let messageContent;
-  let messageType = "error";
-
-  if (
-    typeof error === "string" &&
-    error.indexOf(" -- ") !== -1 &&
-    error.indexOf("\n\n") !== -1
-  ) {
-    const { message, type, title } = parseError(error);
-    messageContent = <Interweave content={`${title}<br />${message}`} />;
-    messageType = type;
-  } else {
-    messageContent = error.message
-      ? JSON.stringify(error.message)
-      : JSON.stringify(error);
-  }
-  return (
-    <Alert
-      className={className}
-      message={messageContent}
-      type={messageType as any}
-      banner
-    />
-  );
-};