@gisce/react-ooui 1.2.0-rc.9 → 1.2.0-rc.91

package/src/widgets/modals/FormModal.tsx

@@ -96,12 +96,12 @@ export const FormModal = (props: FormModalProps) => {
   }
 
   return (
-    <FormModalProvider setTitle={setFormTitle}>
+    (<FormModalProvider setTitle={setFormTitle}>
       <Modal
         title={isMenuAction ? header() : formTitle}
         centered
         width={modalWidth}
-        visible={visible}
+        open={visible}
         footer={null}
         destroyOnClose
         onCancel={onCancel}
@@ -115,6 +115,6 @@ export const FormModal = (props: FormModalProps) => {
           {...rest}
         />
       </Modal>
-    </FormModalProvider>
+    </FormModalProvider>)
   );
 };

package/src/widgets/modals/SearchModal.tsx

@@ -98,35 +98,33 @@ export const SearchModal = (props: SearchSelectionProps) => {
     );
   };
 
-  return (
-    <>
-      <Modal
-        title={t("search")}
-        centered
-        width={modalWidth}
-        visible={visible && !showCreateModal}
-        closable={true}
-        onCancel={onCloseModal}
-        footer={null}
-        destroyOnClose
-        maskClosable={false}
-      >
-        {content()}
-      </Modal>
-      <FormModal
-        model={model}
-        visible={showCreateModal}
-        parentContext={context}
-        onSubmitSucceed={(id?: number) => {
-          setShowCreateModal(false);
-          onCloseModal();
-          onSelectValues([id!]);
-        }}
-        onCancel={() => {
-          setShowCreateModal(false);
-          onCloseModal();
-        }}
-      />
-    </>
-  );
+  return (<>
+    <Modal
+      title={t("search")}
+      centered
+      width={modalWidth}
+      open={visible && !showCreateModal}
+      closable={true}
+      onCancel={onCloseModal}
+      footer={null}
+      destroyOnClose
+      maskClosable={false}
+    >
+      {content()}
+    </Modal>
+    <FormModal
+      model={model}
+      visible={showCreateModal}
+      parentContext={context}
+      onSubmitSucceed={(id?: number) => {
+        setShowCreateModal(false);
+        onCloseModal();
+        onSelectValues([id!]);
+      }}
+      onCancel={() => {
+        setShowCreateModal(false);
+        onCloseModal();
+      }}
+    />
+  </>);
 };

package/src/widgets/modals/TranslationModal.tsx

@@ -185,11 +185,11 @@ export const TranslationModal = (props: TranslationModalProps) => {
   }
 
   return (
-    <Modal
+    (<Modal
       title={t("translate")}
       centered
       width={modalWidth}
-      visible={visible}
+      open={visible}
       closable={true}
       onCancel={onCloseModal}
       footer={null}
@@ -197,6 +197,6 @@ export const TranslationModal = (props: TranslationModalProps) => {
       maskClosable={false}
     >
       {content()}
-    </Modal>
+    </Modal>)
   );
 };

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/DashboardGrid/DashboardGridItem.tsx

@@ -1,17 +1,18 @@
 import React from "react";
 import { DashboardGridItemProps } from "./DashboardGridItem.types";
 import { ExportOutlined } from "@ant-design/icons";
-import { Row, Col } from "antd";
-import { Typography } from "antd";
+import { Row, Col, Typography, theme } from "antd";
+const { useToken } = theme;
 
 const { Text } = Typography;
 
 export const DashboardGridItem = (props: DashboardGridItemProps) => {
-  const { id, title, children, action, openAction } = props;
+  const { title, children, action, openAction } = props;
+  const { token } = useToken();
 
   return (
     <div
-      className={"shadow-md rounded"}
+      className={"shadow-md"}
       style={{
         height: "100%",
         display: "flex",
@@ -19,12 +20,15 @@ export const DashboardGridItem = (props: DashboardGridItemProps) => {
         overflow: "hidden",
         border: "1px solid #eee",
         backgroundColor: "white",
+        borderRadius: token.borderRadius,
       }}
     >
       <Row
-        className="bg-blueGray-100"
         align="middle"
-        style={{ borderBottom: "1px solid #ddd" }}
+        style={{
+          borderBottom: "1px solid #ddd",
+          backgroundColor: token.colorPrimaryBg,
+        }}
         wrap={false}
       >
         <Col

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,8 @@ import {
   ContentRootContextType,
 } from "@/context/ContentRootContext";
 import { LocaleContext, LocaleContextType } from "@/context/LocaleContext";
+import { convertToPlain2ManyValues } from "@/helpers/one2manyHelper";
+import { ErrorAlert } from "@/ui/ErrorAlert";
 
 export type FormProps = {
   model: string;
@@ -105,7 +108,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 +129,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 +141,8 @@ function Form(props: FormProps, ref: any) {
     setCurrentId = undefined,
     setFormIsLoading = undefined,
     setAttachments = undefined,
+    title = undefined,
+    setTitle = undefined,
   } = (rootForm ? actionViewContext : {}) || {};
 
   const contentRootContext = useContext(
@@ -342,6 +348,7 @@ function Form(props: FormProps, ref: any) {
       await antForm.validateFields();
       return false;
     } catch (verror) {
+      message.error(t("fillRequiredFields"));
       return true;
     }
   }
@@ -398,13 +405,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 +433,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 +455,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 +607,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);
@@ -635,11 +633,13 @@ function Form(props: FormProps, ref: any) {
 
       await fetchValues();
       submitSucceed = true;
+      message.success(t("savedRegisters"));
     } catch (err) {
       formSubmitting.current = false;
       setIsSubmitting(false);
       setFormIsSaving?.(false);
       onSubmitError?.(err);
+      message.error(t("errorWhileSavingForm"));
       setError(err?.message ? err.message : err);
     } finally {
       formSubmitting.current = false;
@@ -647,7 +647,7 @@ function Form(props: FormProps, ref: any) {
       setIsSubmitting(false);
     }
 
-    return submitSucceed;
+    return { succeed: submitSucceed, id: getCurrentId()! };
   };
 
   const parseForm = ({
@@ -663,13 +663,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 +702,7 @@ function Form(props: FormProps, ref: any) {
       if (
         checkFieldsType({
           changedFields,
-          fields,
+          formOoui: formOoui!,
           types: [
             "text",
             "codeeditor",
@@ -756,6 +763,7 @@ function Form(props: FormProps, ref: any) {
           ...formOoui?.context,
         },
       },
+      parentValues: getParentPlainValues?.(),
       onChangeFieldActionArgs: onChangeFieldAction.args,
     });
 
@@ -943,7 +951,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 +993,6 @@ function Form(props: FormProps, ref: any) {
           getFieldValue={getFieldValue}
           executeButtonAction={executeButtonAction}
           getContext={getContext}
-          setOriginalValue={setOriginalValue}
           submitForm={submitForm}
           fetchValues={fetchValues}
           formHasChanges={formHasChanges}
@@ -1053,14 +1062,7 @@ function Form(props: FormProps, ref: any) {
     >
       {({ measureRef }) => (
         <div className="pb-2" ref={measureRef}>
-          {error && (
-            <Alert
-              className="mt-10 mb-20"
-              message={JSON.stringify(error)}
-              type="error"
-              banner
-            />
-          )}
+          {error && <ErrorAlert className="mt-5 mb-10" error={error} />}
           {content()}
           {showFooter && footer()}
         </div>

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 dayjs from "dayjs";
+
+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 dayjs(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 = dayjs(
+      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,
@@ -382,10 +396,8 @@ function PercentageIndicator({
     >
       <Row align={"middle"}>
         {IconElement && (
-          <Col>
-            <IconElement
-              style={{ fontSize: fontSize * 1, color, paddingRight: "10px" }}
-            />
+          <Col style={{ fontSize: fontSize * 1, color, paddingRight: "10px" }}>
+            <IconElement />
           </Col>
         )}
         <Col>

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