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

package/dist/widgets/modals/ExportModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExportModal.d.ts","sourceRoot":"","sources":["ExportModal.tsx"],"names":[],"mappings":";AAWA,oBAAY,gBAAgB,GAAG;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,yBAAyB,CAAC,EAAE,GAAG,EAAE,CAAC;IAClC,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,eAAO,MAAM,WAAW,UAAW,gBAAgB,gBAsHlD,CAAC"}
+{"version":3,"file":"ExportModal.d.ts","sourceRoot":"","sources":["ExportModal.tsx"],"names":[],"mappings":";AAQA,oBAAY,gBAAgB,GAAG;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,yBAAyB,CAAC,EAAE,GAAG,EAAE,CAAC;IAClC,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,eAAO,MAAM,WAAW,UAAW,gBAAgB,gBAqDlD,CAAC"}

package/dist/widgets/views/Graph/GraphChart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GraphChart.d.ts","sourceRoot":"","sources":["GraphChart.tsx"],"names":[],"mappings":";AAaA,oBAAY,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,UAAU,UAAW,eAAe,gBAiDhD,CAAC"}
+{"version":3,"file":"GraphChart.d.ts","sourceRoot":"","sources":["GraphChart.tsx"],"names":[],"mappings":";AAaA,oBAAY,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,UAAU,UAAW,eAAe,gBAsDhD,CAAC"}

package/dist/widgets/views/Graph/GraphDefaults.d.ts

@@ -4,6 +4,11 @@ declare const DefaultGraphOptions: {
         xAxis: {
             tickCount: number;
         };
+        yAxis: {
+            label: {
+                formatter: (value: number) => string;
+            };
+        };
         legend: {
             maxWidthRatio: number;
             maxItemWidth: number;
@@ -53,6 +58,11 @@ declare const DefaultGraphOptions: {
                 value: any;
             };
         };
+        yAxis: {
+            label: {
+                formatter: (value: number) => string;
+            };
+        };
         label: {
             position: string;
             layout: {

package/dist/widgets/views/Graph/GraphDefaults.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GraphDefaults.d.ts","sourceRoot":"","sources":["GraphDefaults.ts"],"names":[],"mappings":"AAUA,QAAA,MAAM,mBAAmB;;;;;;;;;;;gCATP,GAAG;;;;;;;;;;;;mCA6BQ,GAAG;;;;;;;;;;;gCA7Bd,GAAG;;;;;;;;;;;;;;;;gCAAH,GAAG;;;;;;;;;;;;CAwEpB,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"GraphDefaults.d.ts","sourceRoot":"","sources":["GraphDefaults.ts"],"names":[],"mappings":"AAUA,QAAA,MAAM,mBAAmB;;;;;;;;mCAQE,MAAM;;;;;;;;gCAjBf,GAAG;;;;;;;;;;;;mCAsCQ,GAAG;;;;;;;;;;;gCAtCd,GAAG;;;;;;;;;;;;;;;;gCAAH,GAAG;;;;;;;mCAoEM,MAAM;;;;;;;;;;CAsBhC,CAAC;AAEF,eAAe,mBAAmB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.2.0-rc.45",
+  "version": "1.2.0-rc.46",
   "files": [
     "dist",
     "src",

package/src/hooks/useExport.ts

@@ -0,0 +1,348 @@
+import {
+  ExportField,
+  ExportOptions,
+  PredefinedExport,
+  PredefinedExportField,
+} from "@/../../react-formiga-components/dist/components/other/ExportModal/ExportModal.types";
+import { useCallback, useRef } from "react";
+import { ConnectionProvider } from "..";
+import showInfo from "@/ui/InfoDialog";
+import { tForLang } from "@/context/LocaleContext";
+import { getMimeType, openBase64InNewTab } from "@/helpers/filesHelper";
+
+export const useExport = ({
+  model,
+  context,
+  locale,
+  selectedRegistersToExport,
+  domain,
+  limit,
+  onClose,
+}: {
+  model: string;
+  context: any;
+  locale: string;
+  selectedRegistersToExport?: any[];
+  domain: any[];
+  limit?: number;
+  onClose: () => void;
+}) => {
+  const fields = useRef<any>({});
+
+  const onExport = 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: addIdToRelationFields({
+          keys: options.selectedKeys,
+          fields: fields.current,
+        }),
+        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 convertToExportFields({ fields: viewData });
+  }, [model, context, fields]);
+
+  const onGetFieldChilds = useCallback(
+    async (key: string) => {
+      const fieldDefinition = getFieldDefinition(key, fields.current);
+      const optsForField = fieldDefinition[getChildKey(key)];
+      const relation = optsForField.relation;
+      const viewData = await ConnectionProvider.getHandler().getFields({
+        model: relation,
+        context,
+        fields: [],
+      });
+
+      // We must iterate over each key of viewData in order to replace the string value
+      for (const [key, value] of Object.entries(viewData)) {
+        viewData[key].string = getTitle({
+          parentTitle: optsForField.string,
+          title: (value as any).string,
+        });
+      }
+
+      fields.current[key] = viewData;
+
+      return convertToExportFields({
+        fields: viewData,
+        parentKey: key,
+      });
+    },
+    [fields.current, model, context]
+  );
+
+  const onGetPredefinedExports = useCallback(async () => {
+    const predefinedExports = await listPredefinedExports({ model, context });
+
+    const keysWithChilds = await retrieveKeyFieldsForPredefinedExports({
+      predefinedExports,
+      fields: fields.current,
+      onGetFieldChilds,
+    });
+
+    // Then we reformat predefined exports to get the title
+    const predefinedExportsAdjusted = predefinedExports.map((pExport) => {
+      return {
+        ...pExport,
+        fields: pExport.fields.map((field: PredefinedExportField) => {
+          const childKey = getChildKey(field.key);
+          const fieldDefinition = getFieldDefinition(field.key, fields.current);
+          const optsForField = fieldDefinition[childKey];
+          return {
+            key: field.key,
+            title: optsForField.string,
+          };
+        }),
+      };
+    });
+
+    return {
+      predefinedExports: predefinedExportsAdjusted,
+      keysWithChilds,
+    };
+  }, [fields.current]);
+
+  const onSavePredefinedExport = useCallback(
+    async (pExport: PredefinedExport) => {
+      return {};
+    },
+    []
+  );
+
+  const onRemovePredefinedExport = useCallback(
+    async (pExport: PredefinedExport) => {},
+    []
+  );
+
+  return {
+    onGetFields,
+    onGetFieldChilds,
+    onExport,
+    onGetPredefinedExports,
+    onSavePredefinedExport,
+    onRemovePredefinedExport,
+  };
+};
+
+const convertToExportFields = ({
+  fields,
+  parentKey,
+}: {
+  fields: any;
+  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 = isRelationField(valuesForField);
+
+    exportFields.push({
+      key: compoundId({ key, parentKey }),
+      title: valuesForField.string,
+      tooltip: valuesForField.help,
+      required: valuesForField.required,
+      isLeaf: !relationField,
+    });
+  }
+  return exportFields;
+};
+
+const isRelationField = (fieldDefinition: any) => {
+  return (
+    fieldDefinition.type === "many2one" ||
+    fieldDefinition.type === "one2many" ||
+    fieldDefinition.type === "many2many"
+  );
+};
+
+const compoundId = ({
+  parentKey,
+  key,
+}: {
+  parentKey?: string;
+  key: string;
+}) => {
+  return `${parentKey ? parentKey + "/" : ""}${key}`;
+};
+
+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];
+};
+
+const getFieldDefinition = (key: string, fields: any) => {
+  if (key.indexOf("/") === -1) {
+    return fields["/"];
+  } else {
+    return fields[getParentKey(key)];
+  }
+};
+
+const getTitle = ({
+  title,
+  parentTitle,
+}: {
+  title: string;
+  parentTitle?: string;
+}) => {
+  return `${parentTitle ? parentTitle + " → " : ""}${title}`;
+};
+
+const listPredefinedExports = async ({
+  model,
+  context,
+}: {
+  model: string;
+  context: any;
+}) => {
+  const pExports = await ConnectionProvider.getHandler().search({
+    model: "ir.exports",
+    params: [["resource", "=", model]],
+    context,
+  });
+
+  const exportLinesIds = pExports.flatMap((exp: any) => exp.export_fields);
+
+  // Now we must read each id of the export lines
+  const exportLinesObjects = await ConnectionProvider.getHandler().readObjects({
+    model: "ir.exports.line",
+    ids: exportLinesIds,
+    context,
+  });
+
+  return pExports.map((pExport) => ({
+    id: pExport.id,
+    name: pExport.name,
+    fields: pExport.export_fields.map((id: number) => {
+      const exportLine = exportLinesObjects.find((e: any) => e.id === id);
+      return {
+        key: exportLine.name,
+      };
+    }),
+  }));
+};
+
+const getKeysWithoutChildsInFields = ({
+  fields,
+  keys,
+}: {
+  fields: any;
+  keys: string[];
+}) => {
+  return [
+    ...new Set(
+      keys
+        .filter((key) => {
+          if (key.indexOf("/") === -1) {
+            return !fields["/"][key];
+          } else {
+            return !fields[getParentKey(key)];
+          }
+        })
+        .map((key) => getParentKey(key))
+        .sort((a, b) => {
+          return a.split("/").length - b.split("/").length;
+        })
+    ),
+  ];
+};
+
+const retrieveKeyFieldsForPredefinedExports = async ({
+  predefinedExports,
+  fields,
+  onGetFieldChilds,
+}: {
+  predefinedExports: PredefinedExport[];
+  fields: any;
+  onGetFieldChilds: (key: string) => Promise<ExportField[]>;
+}) => {
+  const allPredefinedExportKeys = predefinedExports.flatMap(
+    (exp: PredefinedExport) => exp.fields.map((field) => field.key)
+  );
+
+  const keysWithoutChildsInFields = getKeysWithoutChildsInFields({
+    fields,
+    keys: allPredefinedExportKeys,
+  });
+
+  const keysWithChilds = [];
+
+  // We must load the fields info for each key if not loaded yet in fields and store them in an array to pass them to the formiga component
+  for (const key of keysWithoutChildsInFields) {
+    keysWithChilds.push({ key, childs: await onGetFieldChilds(key) });
+  }
+
+  return keysWithChilds;
+};
+
+const addIdToRelationFields = ({
+  keys,
+  fields,
+}: {
+  keys: string[];
+  fields: any;
+}) =>
+  keys.map((key) => {
+    const childKey = getChildKey(key);
+    const fieldDefinition = getFieldDefinition(key, fields);
+    const optsForField = fieldDefinition[childKey];
+    const relationField = isRelationField(optsForField);
+    return relationField ? `${key}/id` : key;
+  });

package/src/ui/FavouriteButton.tsx

@@ -55,7 +55,7 @@ const FavouriteButton = (props: Props) => {
   const [shortcuts, setShortcuts] = useState<ShortcutApi[]>([]);
   const [loading, setLoading] = useState(true);
   const [currentShortcutId, setCurrentShortcutId] = useState<number>();
-  const { t } = useContext(LocaleContext) as LocaleContextType;
+  const { t } = (useContext(LocaleContext) as LocaleContextType) || {};
 
   const tabManagerContext = useContext(
     TabManagerContext
@@ -150,10 +150,10 @@ const FavouriteButton = (props: Props) => {
     <Menu onClick={handleMenuClick}>
       <div style={{ width: 300, padding: 5, display: "flex" }}>
         <div style={{ paddingLeft: 15, color: "#ccc" }}>
-          {t("favorites").toUpperCase()}
+          {t?.("favorites").toUpperCase()}
         </div>
         <div style={{ flexGrow: 1, paddingLeft: 10 }}>
-          <Tooltip title={t("edit_favorites")}>
+          <Tooltip title={t?.("edit_favorites")}>
             <EditOutlined
               style={{ color: "#1890FF", cursor: "pointer" }}
               onClick={editFavourites}
@@ -177,7 +177,7 @@ const FavouriteButton = (props: Props) => {
         </>
       ) : (
         <div style={{ width: 300, padding: 5, paddingLeft: 15 }}>
-          {t("no_favorites")}
+          {t?.("no_favorites")}
         </div>
       )}
     </Menu>

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: [