@gisce/react-ooui 1.2.0-rc.1 → 1.2.0-rc.11

package/src/views/RootView.tsx

@@ -437,6 +437,10 @@ function RootView(props: RootViewProps, ref: any) {
         },
       });
     } else {
+      const formattedInitialView = initialView && Array.isArray(initialView.id)
+        ? { ...initialView, id: initialView.id[0] }
+        : initialView;
+
       addNewTab({
         title,
         action: {
@@ -454,7 +458,7 @@ function RootView(props: RootViewProps, ref: any) {
             context={{ ...rootContext, ...context }}
             domain={domain}
             setCanWeClose={registerViewCloseFn}
-            initialView={initialView}
+            initialView={formattedInitialView}
             res_id={res_id}
             formDefaultValues={values}
             formForcedValues={forced_values}

package/src/views/actionViews/TreeActionView.tsx

@@ -46,7 +46,7 @@ export const TreeActionView = (props: TreeActionViewProps) => {
     <>
       <TitleHeader>
         <TreeActionBar
-          toolbar={formView?.toolbar}
+          toolbar={treeView?.toolbar}
           parentContext={context}
           treeExpandable={treeView?.isExpandable || false}
         />

package/src/widgets/base/Integer.tsx

@@ -32,6 +32,7 @@ export const Integer = (props: IntegerProps) => {
         }}
         defaultValue={0}
         onBlur={elementHasLostFocus}
+        precision={0}
       />
     </Field>
   );

package/src/widgets/modals/ExportModal.tsx

@@ -4,9 +4,10 @@ import {
   Locale,
 } from "@gisce/react-formiga-components";
 import { ExportOptions } from "@gisce/react-formiga-components/dist/components/other/ExportModal/ExportModal.types";
-import React, { useRef } from "react";
+import React, { useCallback, useRef } from "react";
 import showInfo from "@/ui/InfoDialog";
 import { tForLang } from "@/context/LocaleContext";
+import { getMimeType, openBase64InNewTab } from "@/helpers/filesHelper";
 
 export type ExportModalProps = {
   visible: boolean;
@@ -17,7 +18,6 @@ export type ExportModalProps = {
   model: string;
   domain: any[];
   limit?: number;
-  treeFields?: any;
   context?: any;
 };
 
@@ -28,7 +28,6 @@ export const ExportModal = (props: ExportModalProps) => {
     onClose,
     model,
     context,
-    treeFields,
     selectedRegistersToExport,
     totalRegisters,
     domain,
@@ -36,55 +35,86 @@ export const ExportModal = (props: ExportModalProps) => {
   } = props;
   const fields = useRef<any>({});
 
+  const onSucceed = useCallback(
+    async (options: ExportOptions) => {
+      if (options.selectedKeys.length === 0) {
+        showInfo(tForLang("selectAtLeastOneField", locale));
+        return;
+      }
+
+      const { datas } = await ConnectionProvider.getHandler().exportData({
+        model,
+        fields: options.selectedKeys,
+        domain: options.registersAmount === "all" ? [] : domain,
+        limit: options.registersAmount === "all" ? undefined : limit,
+        context,
+        format: options.exportType,
+      });
+
+      onClose();
+
+      await new Promise((resolve) => setTimeout(resolve, 200));
+
+      const fileType: any = await getMimeType(datas);
+      openBase64InNewTab(datas, fileType.mime);
+    },
+    [locale, model, domain, limit, context, onClose]
+  );
+
+  const onGetFields = useCallback(async () => {
+    const viewData = await ConnectionProvider.getHandler().getFields({
+      model,
+      context,
+      fields: [],
+    });
+    fields.current["/"] = viewData;
+    return convertToExportField({ fields: viewData });
+  }, [model, context, fields]);
+
+  const onGetFieldChilds = useCallback(
+    async ({ key, title }: any) => {
+      let fieldDefinition;
+
+      const sanitizedKey =
+        key.split("/")[key.split("/").length - 1] === "id"
+          ? key.split("/").slice(0, -1).join("/")
+          : key;
+
+      if (sanitizedKey.indexOf("/") === -1) {
+        fieldDefinition = fields.current["/"];
+      } else {
+        fieldDefinition = fields.current[getParentKey(sanitizedKey)];
+      }
+
+      const optsForField = fieldDefinition[getChildKey(sanitizedKey)];
+      const relation = optsForField.relation;
+      const viewData = await ConnectionProvider.getHandler().getFields({
+        model: relation,
+        context,
+        fields: [],
+      });
+
+      fields.current[sanitizedKey] = viewData;
+
+      return convertToExportField({
+        fields: viewData,
+        parentTitle: title,
+        parentKey: sanitizedKey,
+      });
+    },
+    [fields, model, context]
+  );
+
   return (
     <ExportModalFmg
       visible={visible}
       locale={locale as Locale}
-      onSucceed={async (options: ExportOptions) => {
-        if (options.selectedKeys.length === 0) {
-          showInfo(tForLang("selectAtLeastOneField", locale));
-          return;
-        }
-        onClose();
-      }}
+      onSucceed={onSucceed}
       onCancel={onClose}
       selectedRegistersToExport={selectedRegistersToExport}
       totalRegisters={totalRegisters}
-      onGetFieldChilds={async ({ key, title }: any) => {
-        let fieldDefinition;
-
-        if (key.indexOf("/") === -1) {
-          fieldDefinition = fields.current["/"];
-        } else {
-          fieldDefinition = fields.current[getParentKey(key)];
-        }
-
-        const optsForField = fieldDefinition[getChildKey(key)];
-        const relation = optsForField.relation;
-        const viewData = await ConnectionProvider.getHandler().getFields({
-          model: relation,
-          context,
-          fields: [],
-        });
-
-        fields.current[key] = viewData;
-
-        return convertToExportField({
-          fields: viewData,
-          parentTitle: title,
-          parentKey: key,
-        });
-      }}
-      onGetFields={async () => {
-        const viewData = await ConnectionProvider.getHandler().getFields({
-          model,
-          context,
-          fields: [],
-        });
-        fields.current["/"] = viewData;
-        return convertToExportField({ fields: viewData });
-      }}
-      selectedKeys={treeFields ? Object.keys(treeFields) : undefined}
+      onGetFieldChilds={onGetFieldChilds}
+      onGetFields={onGetFields}
     />
   );
 };
@@ -102,15 +132,27 @@ const convertToExportField = ({
 
   for (const key of Object.keys(fields)) {
     const valuesForField = fields[key];
+
+    if (valuesForField.relation && valuesForField.is_function === true) {
+      continue;
+    }
+    
     const relationField =
       valuesForField.type === "many2one" ||
       valuesForField.type === "one2many" ||
       valuesForField.type === "many2many";
 
+    let newKey = `${parentKey ? parentKey + "/" : ""}${key}`;
+
+    if (relationField) {
+      newKey += "/id";
+    }
+
     exportFields.push({
-      key: `${parentKey ? parentKey + "/" : ""}${key}`,
+      key: newKey,
       title: `${parentTitle ? parentTitle + "/" : ""}${valuesForField.string}`,
       tooltip: valuesForField.help,
+      required: valuesForField.required,
       isLeaf: !relationField,
     });
   }

package/src/widgets/views/Dashboard/Dashboard.tsx

@@ -308,6 +308,10 @@ function Dashboard(props: DashboardProps, ref: any) {
             />
           );
         } else if (initialView !== undefined) {
+          const formattedInitialView =
+            initialView && Array.isArray(initialView.id)
+              ? { ...initialView, id: initialView.id[0] }
+              : initialView;
           childContent = (
             <ActionView
               action_id={actionId}
@@ -319,7 +323,7 @@ function Dashboard(props: DashboardProps, ref: any) {
               context={context}
               domain={domain}
               setCanWeClose={() => {}}
-              initialView={initialView}
+              initialView={formattedInitialView}
               limit={limit}
             />
           );