@gisce/react-ooui 1.1.60 → 1.1.61-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/custom/Markdown.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Markdown.d.ts","sourceRoot":"","sources":["Markdown.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AAEpC,eAAQ,MAAM,QAAQ,UAAW,WAAW,gBAM3C,CAAC;AAEF,eAAO,MAAM,aAAa,UAAW,GAAG,gBAKvC,CAAA"}
+{"version":3,"file":"Markdown.d.ts","sourceRoot":"","sources":["Markdown.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AAEpC,eAAQ,MAAM,QAAQ,UAAW,WAAW,gBAM3C,CAAC;AAEF,eAAO,MAAM,aAAa,UAAW,GAAG,gBAQvC,CAAA"}

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.60",
+  "version": "1.1.61-rc.0",
   "files": [
     "dist",
     "src",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@ant-design/plots": "^1.0.9",
-    "@gisce/ooui": "^0.19.3",
+    "@gisce/ooui": "^0.19.4",
     "@gisce/react-formiga-table": "^0.5.0",
     "@monaco-editor/react": "^4.4.5",
     "@tabler/icons-react": "^2.11.0",

package/src/actionbar/ChangeViewButton.tsx

@@ -57,9 +57,7 @@ function ChangeViewButton(props: Props) {
               {getIconForView(view)}
             </Col>
             <Col flex="auto" style={{ paddingRight: 20 }}>
-              {view.type === "graph"
-                ? (view as GraphView).name
-                : view.type.charAt(0).toUpperCase() + view.type.slice(1)}
+              {view.type.charAt(0).toUpperCase() + view.type.slice(1)}
             </Col>
             <Col flex="none">
               <CheckOutlined

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

@@ -1,4 +1,4 @@
-import { FormView, GenerateReportOptions } from "@/types";
+import { FormView, GenerateReportOptions, ViewType } from "@/types";
 import React, {
   useContext,
   useRef,
@@ -261,33 +261,12 @@ const ContentRootProvider = (
 
       return {};
     } else {
-      let initialView;
-      const viewTypes = actionData.view_mode.split(",");
-      const views = [];
-
-      for (const viewType of viewTypes) {
-        const viewData = await ConnectionProvider.getHandler().getView({
-          model: actionData.res_model,
-          type: viewType,
-          context: mergedContext,
-        });
-        views.push([viewData.view_id, viewType]);
-      }
-
-      if (!actionData.view_id) {
-        const type = actionData.view_mode.split(",")[0];
-
-        const [retrievedViewId] = views.find(
-          ([_, viewType]) => viewType === type
-        )!;
-
-        initialView = { id: retrievedViewId, type };
-      } else {
-        initialView = {
-          id: actionData.view_id,
-          type: actionData.view_mode.split(",")[0],
-        };
-      }
+      const { initialView, views } = await getViewsAndInitialView({
+        model: actionData.res_model,
+        context: mergedContext,
+        view_mode: actionData.view_mode,
+        views: actionData.views,
+      });
 
       openAction?.({
         target: "current",
@@ -415,4 +394,61 @@ const ContentRootProvider = (
   );
 };
 
+async function getViewsAndInitialView({
+  views,
+  view_mode,
+  model,
+  context,
+  view_id,
+}: {
+  views: any[];
+  view_mode: string;
+  model: string;
+  context: any;
+  view_id?: number;
+}) {
+  const retriedViewData = [];
+  let initialView;
+
+  if (views) {
+    for (const view of views) {
+      const viewData = await ConnectionProvider.getHandler().getView({
+        model,
+        type: view[1],
+        id: view[0],
+        context,
+      });
+      retriedViewData.push([viewData.view_id, view[1]]);
+    }
+  } else {
+    const viewTypes = view_mode.split(",");
+    for (const viewType of viewTypes) {
+      const viewData = await ConnectionProvider.getHandler().getView({
+        model,
+        type: viewType as ViewType,
+        context,
+      });
+      retriedViewData.push([viewData.view_id, viewType]);
+    }
+  }
+  if (views && views.length > 0) {
+    const [id, type] = views[0];
+    initialView = {
+      id,
+      type,
+    };
+  } else if (!view_id) {
+    const type = view_mode.split(",")[0];
+    const [retrievedViewId] = views.find(([_, viewType]) => viewType === type)!;
+    initialView = { id: retrievedViewId, type };
+  } else {
+    initialView = {
+      id: view_id,
+      type: view_mode.split(",")[0],
+    };
+  }
+
+  return { views: retriedViewData, initialView };
+}
+
 export default forwardRef(ContentRootProvider);

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/stories/Label.stories.tsx

@@ -77,7 +77,7 @@ export const LabelH1 = (): React.ReactElement => {
   const ooui = new LabelOoui({
     name: "field",
     string: "Lorem ipsum",
-    widget_props: "{'label_size': 'h1'}",
+    widget_props: "{'label_size': 1}",
   });
   return (
     <LocaleProvider lang="en_US">
@@ -90,7 +90,7 @@ export const LabelH2Warning = (): React.ReactElement => {
   const ooui = new LabelOoui({
     name: "field",
     string: "Lorem ipsum",
-    widget_props: "{'label_size': 'h1', 'label_type': 'warning'}",
+    widget_props: "{'label_size': 2, 'label_type': 'warning'}",
   });
   return (
     <LocaleProvider lang="en_US">

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/base/Label.tsx

@@ -26,7 +26,7 @@ const Label = (props: Props) => {
   const responsiveAlign = responsiveBehaviour ? "left" : "right";
   const labelAlgin = align ? align : fieldForLabel ? responsiveAlign : "left";
 
-  const TextType = labelSize === "text" ? Text : Title;
+  const TextType = labelSize === undefined ? Text : Title;
 
   return (
     <div
@@ -39,7 +39,7 @@ const Label = (props: Props) => {
       )}
       <span className="pr-2">
         <TextType
-          level={labelSize !== "text" ? (labelSize as string as any) : null}
+          level={labelSize}
           type={labelType as any}
         >
           <Interweave content={labelText} />

package/src/widgets/custom/Markdown.tsx

@@ -12,8 +12,11 @@ export  const Markdown = (props: WidgetProps) => {
 };
 
 export const MarkdownInput = (props: any) => {
-  const {value} = props;
+  const {value, ooui} = props;
   return (
-    <ReactMarkdown children={value}/>
+    <div style={{height: ooui.height ? ooui.height + 'px' : '100%'}}>
+      <ReactMarkdown children={value} className="ant-typography"/>
+    </div>
+
   )
-}
+}

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>