@gisce/react-ooui 1.2.0-rc.7 → 1.2.0-rc.71

package/src/widgets/modals/ExportModal.tsx

@@ -3,22 +3,20 @@ 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;
   locale: string;
   onClose: () => void;
-  selectedRegistersToExport?: number;
+  selectedRegistersToExport?: any[];
   totalRegisters: number;
   model: string;
   domain: any[];
   limit?: number;
   context?: any;
+  visibleRegisters: number;
 };
 
 export const ExportModal = (props: ExportModalProps) => {
@@ -32,145 +30,46 @@ export const ExportModal = (props: ExportModalProps) => {
     totalRegisters,
     domain,
     limit,
+    visibleRegisters,
   } = 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]
-  );
+  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}
+      selectedRegistersToExport={
+        selectedRegistersToExport &&
+        selectedRegistersToExport.length &&
+        selectedRegistersToExport.length > 0
+          ? selectedRegistersToExport.length
+          : undefined
+      }
       totalRegisters={totalRegisters}
       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/Dashboard/Dashboard.tsx

@@ -105,13 +105,19 @@ function Dashboard(props: DashboardProps, ref: any) {
       })) as FormView
     ).fields;
 
-    return await readObjectValues({
-      treeFields: itemsFields.current,
-      formFields: itemsFields.current,
+    const [results] = await readObjectValues({
+      treeView: {
+        fields: itemsFields.current,
+      },
+      formView: {
+        fields: itemsFields.current,
+      },
       model,
       items,
       context,
+      currentView: "form",
     });
+    return results;
   }
 
   async function fetchValues(view: FormView) {
@@ -214,6 +220,7 @@ function Dashboard(props: DashboardProps, ref: any) {
   }
 
   if (error) {
+    console.log(error);
     return (
       <Alert className="mt-10 mb-20" message={error} type="error" banner />
     );
@@ -308,6 +315,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 +330,7 @@ function Dashboard(props: DashboardProps, ref: any) {
               context={context}
               domain={domain}
               setCanWeClose={() => {}}
-              initialView={initialView}
+              initialView={formattedInitialView}
               limit={limit}
             />
           );

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

@@ -219,6 +219,7 @@ function DashboardTree(props: Props) {
             });
             setResults(sortedResults);
           }}
+          context={parentContext}
         />
       </div>
     );

package/src/widgets/views/Form.tsx

@@ -15,6 +15,7 @@ import {
   Row,
   Alert,
   Spin,
+  message,
 } from "antd";
 import Measure from "react-measure";
 import { CheckOutlined, CloseOutlined } from "@ant-design/icons";
@@ -54,6 +55,7 @@ import {
   ContentRootContextType,
 } from "@/context/ContentRootContext";
 import { LocaleContext, LocaleContextType } from "@/context/LocaleContext";
+import { convertToPlain2ManyValues } from "@/helpers/one2manyHelper";
 
 export type FormProps = {
   model: string;
@@ -105,7 +107,7 @@ function Form(props: FormProps, ref: any) {
     defaultValues,
     forcedValues = {},
   } = props;
-  const { lang } = useContext(LocaleContext) as LocaleContextType;
+  const { t, lang } = useContext(LocaleContext) as LocaleContextType;
 
   const [isSubmitting, setIsSubmitting] = useState<boolean>(false);
   const [error, setError] = useState<string>();
@@ -126,7 +128,8 @@ function Form(props: FormProps, ref: any) {
   const responsiveBehaviour = containerWidth < WIDTH_BREAKPOINT;
 
   const formContext = useContext(FormContext) as FormContextType;
-  const { activeId: parentId } = formContext || {};
+  const { activeId: parentId, getPlainValues: getParentPlainValues } =
+    formContext || {};
 
   const actionViewContext = useContext(
     ActionViewContext
@@ -137,6 +140,8 @@ function Form(props: FormProps, ref: any) {
     setCurrentId = undefined,
     setFormIsLoading = undefined,
     setAttachments = undefined,
+    title = undefined,
+    setTitle = undefined,
   } = (rootForm ? actionViewContext : {}) || {};
 
   const contentRootContext = useContext(
@@ -342,6 +347,7 @@ function Form(props: FormProps, ref: any) {
       await antForm.validateFields();
       return false;
     } catch (verror) {
+      message.error(t("fillRequiredFields"));
       return true;
     }
   }
@@ -398,13 +404,11 @@ function Form(props: FormProps, ref: any) {
     if (valuesProps) {
       values = valuesProps;
     } else {
-      ({
-        values,
-        defaultGetCalled: hasDefaultGetCalled,
-      } = await fetchValuesFromApi({
-        fields: _fields,
-        arch: _arch!,
-      }));
+      ({ values, defaultGetCalled: hasDefaultGetCalled } =
+        await fetchValuesFromApi({
+          fields: _fields,
+          arch: _arch!,
+        }));
     }
 
     if (actionDomain) {
@@ -428,11 +432,6 @@ function Form(props: FormProps, ref: any) {
     }
   };
 
-  function setOriginalValue(field: string, value: any) {
-    originalFormValues.current[field] = value;
-    setFormHasChanges?.(formHasChanges());
-  }
-
   const cancelUnsavedChanges = async () => {
     return new Promise(async (resolve) => {
       if (formHasChanges()) {
@@ -455,15 +454,13 @@ function Form(props: FormProps, ref: any) {
 
   const getFormView = async (): Promise<FormView> => {
     if (getDataFromAction) {
-      const action = await ConnectionProvider.getHandler().getActionStringForModel(
-        model
-      );
-      const viewsForAction = await ConnectionProvider.getHandler().getViewsForAction(
-        {
+      const action =
+        await ConnectionProvider.getHandler().getActionStringForModel(model);
+      const viewsForAction =
+        await ConnectionProvider.getHandler().getViewsForAction({
           action,
           context: parentContext,
-        }
-      );
+        });
       return viewsForAction.views.get("form");
     }
 
@@ -609,13 +606,13 @@ function Form(props: FormProps, ref: any) {
       formSubmitting.current = false;
       setFormHasChanges?.(false);
       onCancel?.();
-      return true;
+      return { succeed: true, id: getCurrentId()! };
     }
 
     if (await checkIfFormHasErrors()) {
       formSubmitting.current = false;
       formErrorsDialog(lang);
-      return false;
+      return { succeed: false, id: getCurrentId()! };
     }
 
     setIsSubmitting(true);
@@ -640,6 +637,7 @@ function Form(props: FormProps, ref: any) {
       setIsSubmitting(false);
       setFormIsSaving?.(false);
       onSubmitError?.(err);
+      message.error(t("errorWhileSavingForm"));
       setError(err?.message ? err.message : err);
     } finally {
       formSubmitting.current = false;
@@ -647,7 +645,7 @@ function Form(props: FormProps, ref: any) {
       setIsSubmitting(false);
     }
 
-    return submitSucceed;
+    return { succeed: submitSucceed, id: getCurrentId()! };
   };
 
   const parseForm = ({
@@ -663,13 +661,20 @@ function Form(props: FormProps, ref: any) {
     // TODO: Here we must inject `values` to the ooui parser in order to evaluate arch+values and get the new form container
     ooui.parse(arch, {
       readOnly,
-      values: {
-        ...values,
-        ...getAdditionalValues(),
-      },
+      values: convertToPlain2ManyValues(
+        {
+          ...values,
+          ...getAdditionalValues(),
+        },
+        fields
+      ),
     });
     setFormOoui(ooui);
 
+    if (ooui.string && ooui.string !== title) {
+      setTitle?.(ooui.string);
+    }
+
     if (formModalContext && ooui.string)
       formModalContext.setTitle?.(ooui.string);
   };
@@ -695,7 +700,7 @@ function Form(props: FormProps, ref: any) {
       if (
         checkFieldsType({
           changedFields,
-          fields,
+          formOoui: formOoui!,
           types: [
             "text",
             "codeeditor",
@@ -756,6 +761,7 @@ function Form(props: FormProps, ref: any) {
           ...formOoui?.context,
         },
       },
+      parentValues: getParentPlainValues?.(),
       onChangeFieldActionArgs: onChangeFieldAction.args,
     });
 
@@ -943,7 +949,9 @@ function Form(props: FormProps, ref: any) {
     }
 
     try {
-      await submitForm({ callOnSubmitSucceed: false });
+      if (formHasChanges() || getCurrentId() === undefined) {
+        await submitForm({ callOnSubmitSucceed: false });
+      }
 
       if (type === "object") {
         await runObjectButton({ action, context });
@@ -983,7 +991,6 @@ function Form(props: FormProps, ref: any) {
           getFieldValue={getFieldValue}
           executeButtonAction={executeButtonAction}
           getContext={getContext}
-          setOriginalValue={setOriginalValue}
           submitForm={submitForm}
           fetchValues={fetchValues}
           formHasChanges={formHasChanges}

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

@@ -1,13 +1,67 @@
+import moment from "moment";
+
+const formatter = (graphType: "pie" | "default" | "barGrouped") => {
+  return (object: any) => {
+    const formattedValue = object.value.toLocaleString("es-ES", {
+      useGrouping: true,
+    });
+    const name = graphType === "pie" ? object.x : object.type;
+    return { name, value: formattedValue };
+  };
+};
+
+const axisFormatter = (value: any) => {
+  if (typeof value === "string" && stringIsValidNumeric(value)) {
+    return parseFloat(value).toLocaleString("es-ES", {
+      useGrouping: true,
+    });
+  } else if (isNumber(value)) {
+    return value.toLocaleString("es-ES", {
+      useGrouping: true,
+    });
+  } else if (isValidDateString(value)) {
+    const dateType = getDateType(value);
+    if (dateType === null) {
+      return value;
+    }
+    return moment(value, (dateFormats.input as any)[dateType]).format(
+      (dateFormats.output as any)[dateType]
+    );
+  } else {
+    return value;
+  }
+};
+
+const stringIsValidNumeric = (value: string) => {
+  const regex = /^[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?$/;
+  return regex.test(value);
+};
+
+const isNumber = (value: any) => {
+  return typeof value === "number" && !isNaN(value);
+};
+
 const DefaultGraphOptions = {
   default: {
     padding: "auto",
     xAxis: {
       tickCount: 5,
+      label: {
+        formatter: axisFormatter,
+      },
+    },
+    yAxis: {
+      label: {
+        formatter: axisFormatter,
+      },
     },
     legend: {
       maxWidthRatio: 0.5,
       maxItemWidth: 1000,
     },
+    tooltip: {
+      formatter: formatter("default"),
+    },
   },
   pie: {
     appendPadding: 10,
@@ -25,6 +79,9 @@ const DefaultGraphOptions = {
       maxWidthRatio: 0.5,
       maxItemWidth: 1000,
     },
+    tooltip: {
+      formatter: formatter("pie"),
+    },
     interactions: [
       {
         type: "element-active",
@@ -37,6 +94,19 @@ const DefaultGraphOptions = {
       maxWidthRatio: 0.5,
       maxItemWidth: 1000,
     },
+    tooltip: {
+      formatter: formatter("barGrouped"),
+    },
+    xAxis: {
+      label: {
+        formatter: axisFormatter,
+      },
+    },
+    yAxis: {
+      label: {
+        formatter: axisFormatter,
+      },
+    },
     label: {
       position: "middle",
       layout: [
@@ -54,4 +124,47 @@ const DefaultGraphOptions = {
   },
 };
 
+function isValidDateString(variable: any): boolean {
+  // Check if the variable is defined and is a string
+  if (typeof variable !== "string" || variable === undefined) {
+    return false;
+  }
+
+  // Check if the string is a valid date
+  const date = new Date(variable);
+  return date.toString() !== "Invalid Date";
+}
+
+const dateFormats = {
+  input: {
+    hours: "YYYY-MM-DD HH:mm",
+    days: "YYYY-MM-DD",
+    weeks: "YYYY-[W]WW",
+    months: "YYYY-MM",
+    years: "YYYY",
+  },
+  output: {
+    hours: "DD/MM/YYYY HH:mm",
+    days: "DD/MM/YYYY",
+    weeks: "[W]WW/YYYY",
+    months: "MM/YYYY",
+    years: "YYYY",
+  },
+};
+
+function getDateType(dateString: string): string | null {
+  for (const format in dateFormats.input) {
+    const isValidFormat = moment(
+      dateString,
+      (dateFormats.input as any)[format],
+      true
+    ).isValid();
+    if (isValidFormat) {
+      return format;
+    }
+  }
+
+  return null;
+}
+
 export default DefaultGraphOptions;

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

@@ -273,7 +273,11 @@ function CommonIndicator({
       ? minFontSize
       : height * fontGrowFactor;
 
-  let finalValue = total ? `${value}/${total}` : `${value}`;
+  const localeValue = value?.toLocaleString("es-ES", {
+    useGrouping: true,
+  });
+
+  let finalValue = total ? `${localeValue}/${total}` : `${localeValue}`;
 
   if (suffix) {
     finalValue += " " + suffix;
@@ -342,13 +346,23 @@ function PercentageIndicator({
       ? minFontSize
       : twoLinesHeight * fontGrowFactor;
 
-  let finalValue = total ? `${value}/${total}` : `${value}`;
+  const localeValue = value?.toLocaleString("es-ES", {
+    useGrouping: true,
+  });
+
+  let finalValue = total
+    ? `${localeValue}/${total?.toLocaleString("es-ES", {
+        useGrouping: true,
+      })}`
+    : `${localeValue}`;
 
   if (suffix) {
     finalValue += " " + suffix;
   }
 
-  const percentValue = `${percent}%`;
+  const percentValue = `${percent?.toLocaleString("es-ES", {
+    useGrouping: true,
+  })}%`;
 
   let tw = getTextWidth(
     percentValue,

package/src/widgets/views/SearchTree.tsx

@@ -295,6 +295,7 @@ function SearchTree(props: Props, ref: any) {
             formView.search_fields,
             treeView.search_fields,
           ])}
+          formXml={formView.arch}
           onClear={clear}
           limit={limit}
           offset={offset}
@@ -307,6 +308,7 @@ function SearchTree(props: Props, ref: any) {
           searchValues={searchValues}
         />
         <Tree
+          context={parentContext}
           total={totalItems}
           limit={limit}
           page={page}
@@ -327,6 +329,7 @@ function SearchTree(props: Props, ref: any) {
             treeView.isExpandable ? fetchChildrenForRecord : undefined
           }
           childField={treeView.field_parent}
+          rootTree={rootTree}
         />
       </>
     );