@gisce/react-ooui 1.1.63 → 1.1.64-rc.0

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

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

package/dist/ui/ErrorAlert.d.ts

@@ -0,0 +1,6 @@
+/// <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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.1.63",
+  "version": "1.1.64-rc.0",
   "files": [
     "dist",
     "src",

package/src/actionbar/AttachmentsButtonWrapper.tsx

@@ -8,7 +8,11 @@ import {
   TableOutlined,
 } from "@ant-design/icons";
 import { Popover, Button, Row, Col, Tooltip, Spin } from "antd";
-import { LocaleContext, LocaleContextType } from "@/context/LocaleContext";
+import {
+  LocaleContext,
+  LocaleContextType,
+  tForLang,
+} from "@/context/LocaleContext";
 
 export type Attachment = {
   id: number;
@@ -32,7 +36,7 @@ export const AttachmentsButtonWrapper = (
   props: AttachmentsButtonWrapperProps
 ) => {
   const { numberOfAttachments, disabled } = props;
-  const { t } = useContext(LocaleContext) as LocaleContextType;
+  const { t, lang } = useContext(LocaleContext) as LocaleContextType;
   const [popoverVisible, setPopoverVisible] = useState<boolean>(false);
 
   const button = (
@@ -52,7 +56,7 @@ export const AttachmentsButtonWrapper = (
       onVisibleChange={(visible: boolean) => setPopoverVisible(visible)}
       visible={popoverVisible}
       placement="bottom"
-      content={Content(props, setPopoverVisible)}
+      content={Content(props, setPopoverVisible, lang)}
       title={t("attachments")}
       arrowContent={null}
     >
@@ -63,7 +67,8 @@ export const AttachmentsButtonWrapper = (
 
 const Content = (
   props: AttachmentsButtonWrapperProps,
-  setPopoverVisible: (visible: boolean) => void
+  setPopoverVisible: (visible: boolean) => void,
+  locale: string
 ) => {
   const {
     attachments = [],
@@ -73,8 +78,6 @@ const Content = (
     onOpenAttachmentDetail,
     onListAllAttachments,
   } = props;
-  const { t } = useContext(LocaleContext) as LocaleContextType;
-
   if (loading) {
     return <Spin style={{ padding: 20 }} />;
   }
@@ -89,7 +92,7 @@ const Content = (
           onListAllAttachments();
         }}
       >
-        <TableOutlined /> {t("listAllAttachments")}
+        <TableOutlined /> {tForLang("listAllAttachments", locale)}
       </a>
       <a
         style={{ display: "block" }}
@@ -99,11 +102,11 @@ const Content = (
           onAddNewAttachment();
         }}
       >
-        <FileAddOutlined /> {t("addNewAttachment")}
+        <FileAddOutlined /> {tForLang("addNewAttachment", locale)}
       </a>
       {attachments.length > 0 && (
         <>
-          <li className=" ant-dropdown-menu-item-divider"></li>
+          <li className="ant-dropdown-menu-item-divider"></li>
           {attachments.map((attachment: any) => {
             const Icon = attachment.link ? LinkOutlined : DownloadOutlined;
             return (
@@ -119,8 +122,8 @@ const Content = (
                     <Tooltip
                       title={
                         attachment.link
-                          ? t("openAttachmentLink")
-                          : t("download")
+                          ? tForLang("openAttachmentLink", locale)
+                          : tForLang("download", locale)
                       }
                     >
                       <Icon
@@ -134,7 +137,7 @@ const Content = (
                   )}
                 </Col>
                 <Col flex="25px" style={{ textAlign: "center" }}>
-                  <Tooltip title={t("openAttachment")}>
+                  <Tooltip title={tForLang("openAttachment", locale)}>
                     <FormOutlined
                       style={{ cursor: "pointer" }}
                       onClick={() => {

package/src/actionbar/FormActionBar.tsx

@@ -78,15 +78,6 @@ 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/context/ContentRootContext.tsx

@@ -439,7 +439,7 @@ async function getViewsAndInitialView({
     };
   } else if (!view_id) {
     const type = view_mode.split(",")[0];
-    const [retrievedViewId] = views.find(([_, viewType]) => viewType === type)!;
+    const [retrievedViewId] = retriedViewData.find(([_, viewType]) => viewType === type)!;
     initialView = { id: retrievedViewId, type };
   } else {
     initialView = {

package/src/helpers/errorHelper.ts

@@ -0,0 +1,27 @@
+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/ActionErrorDialog.tsx

@@ -1,38 +1,21 @@
 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) => {
-  let message;
-  let type;
-  let title;
+  const { message, type, title } = parseError(err);
 
-  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 =
+  const iconComponent =
     type === "error" ? <ExclamationCircleOutlined /> : <WarningOutlined />;
 
   const modalType = type === "error" ? error : warning;
 
   modalType({
     title,
-    icon,
+    icon: iconComponent,
     centered: true,
     content: message,
   });

package/src/ui/ErrorAlert.tsx

@@ -0,0 +1,37 @@
+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
+    />
+  );
+};

package/src/widgets/views/Form.tsx

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