@gisce/react-ooui 1.2.0-rc.74 → 1.2.0-rc.76

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.2.0-rc.74",
+  "version": "1.2.0-rc.76",
   "files": [
     "dist",
     "src",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@ant-design/plots": "^1.0.9",
-    "@gisce/ooui": "^0.19.2-rc.1",
+    "@gisce/ooui": "^0.19.4",
     "@gisce/react-formiga-components": "^1.0.9-rc.20",
     "@gisce/react-formiga-table": "^0.5.0",
     "@monaco-editor/react": "^4.4.5",

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/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/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/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>
+
   )
-}
+}