@gisce/react-ooui 1.2.0-rc.45 → 1.2.0-rc.47

package/src/widgets/modals/ExportModal.tsx

@@ -3,11 +3,8 @@ import {
   ExportModal as ExportModalFmg,
   Locale,
 } from "@gisce/react-formiga-components";
-import { ExportOptions } from "@gisce/react-formiga-components/dist/components/other/ExportModal/ExportModal.types";
-import React, { useCallback, useRef } from "react";
-import showInfo from "@/ui/InfoDialog";
-import { tForLang } from "@/context/LocaleContext";
-import { getMimeType, openBase64InNewTab } from "@/helpers/filesHelper";
+import React from "react";
+import { useExport } from "@/hooks/useExport";
 
 export type ExportModalProps = {
   visible: boolean;
@@ -35,97 +32,29 @@ export const ExportModal = (props: ExportModalProps) => {
     limit,
     visibleRegisters,
   } = props;
-  const fields = useRef<any>({});
 
-  const onSucceed = useCallback(
-    async (options: ExportOptions) => {
-      if (
-        options.selectedKeys === undefined ||
-        options.selectedKeys.length === 0
-      ) {
-        showInfo(tForLang("selectAtLeastOneField", locale));
-        return;
-      }
-
-      let exportDomain = domain;
-
-      if (
-        options.registersAmount === "selected" &&
-        selectedRegistersToExport?.length !== 0
-      ) {
-        exportDomain = [
-          ["id", "in", selectedRegistersToExport?.map((r) => r.id)],
-        ];
-      }
-
-      const { datas } = await ConnectionProvider.getHandler().exportData({
-        model,
-        fields: options.selectedKeys,
-        domain: exportDomain,
-        limit: options.registersAmount === "all" ? 0 : 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]
-  );
+  const {
+    onExport,
+    onGetFieldChilds,
+    onGetFields,
+    onGetPredefinedExports,
+    onSavePredefinedExport,
+    onRemovePredefinedExport,
+  } = useExport({
+    model,
+    context,
+    domain,
+    limit,
+    selectedRegistersToExport,
+    onClose,
+    locale,
+  });
 
   return (
     <ExportModalFmg
       visible={visible}
       locale={locale as Locale}
-      onSucceed={onSucceed}
+      onSucceed={onExport}
       onCancel={onClose}
       selectedRegistersToExport={
         selectedRegistersToExport &&
@@ -138,64 +67,9 @@ export const ExportModal = (props: ExportModalProps) => {
       onGetFieldChilds={onGetFieldChilds}
       onGetFields={onGetFields}
       visibleRegisters={visibleRegisters}
+      onGetPredefinedExports={onGetPredefinedExports}
+      onSavePredefinedExport={onSavePredefinedExport}
+      onRemovePredefinedExport={onRemovePredefinedExport}
     />
   );
 };
-
-const convertToExportField = ({
-  fields,
-  parentKey,
-  parentTitle,
-}: {
-  fields: any;
-  parentTitle?: string;
-  parentKey?: string;
-}) => {
-  const exportFields = [];
-
-  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: newKey,
-      title: `${parentTitle ? parentTitle + " → " : ""}${
-        valuesForField.string
-      }`,
-      tooltip: valuesForField.help,
-      required: valuesForField.required,
-      isLeaf: !relationField,
-    });
-  }
-  return exportFields;
-};
-
-const getParentKey = (key: string) => {
-  if (key.indexOf("/") === -1) {
-    return key;
-  }
-  const items = key.split("/");
-  return items.slice(0, -1).join("/");
-};
-
-const getChildKey = (key: string) => {
-  if (key.indexOf("/") === -1) {
-    return key;
-  }
-  const items = key.split("/");
-  return items[items.length - 1];
-};

package/src/widgets/views/Graph/GraphChart.tsx

@@ -57,7 +57,12 @@ export const GraphChart = (props: GraphChartProps) => {
   return (
     <div style={{ padding: "1rem" }}>
       <p style={{ textAlign: "right" }}>
-        {`${t("totalRegisters")} ${evaluatedEntries?.length}`}
+        {`${t("totalRegisters")} ${evaluatedEntries?.length?.toLocaleString(
+          "es-ES",
+          {
+            useGrouping: true,
+          }
+        )}`}
       </p>
       <Chart
         {...getGraphProps({

package/src/widgets/views/Graph/GraphDefaults.ts

@@ -14,6 +14,15 @@ const DefaultGraphOptions = {
     xAxis: {
       tickCount: 5,
     },
+    yAxis: {
+      label: {
+        formatter: (value: number) => {
+          return value.toLocaleString("es-ES", {
+            useGrouping: true,
+          });
+        },
+      },
+    },
     legend: {
       maxWidthRatio: 0.5,
       maxItemWidth: 1000,
@@ -56,6 +65,15 @@ const DefaultGraphOptions = {
     tooltip: {
       formatter: formatter("barGrouped"),
     },
+    yAxis: {
+      label: {
+        formatter: (value: number) => {
+          return value.toLocaleString("es-ES", {
+            useGrouping: true,
+          });
+        },
+      },
+    },
     label: {
       position: "middle",
       layout: [