@gisce/react-ooui 1.1.40-rc.2 → 1.1.40

package/dist/widgets/base/Reference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Reference.d.ts","sourceRoot":"","sources":["Reference.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAEnD,OAAO,EACL,SAAS,IAAI,aAAa,EAG3B,MAAM,aAAa,CAAC;AAKrB,aAAK,KAAK,GAAG;IACX,IAAI,EAAE,aAAa,CAAC;IACpB,iBAAiB,CAAC,EACd,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,KAAK,IAAI,CAAC,GAC5D,SAAS,CAAC;IACd,aAAa,CAAC,EACV,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,KAAK,IAAI,CAAC,GAC5D,SAAS,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,SAAS,UAAW,KAAK,gBASrC,CAAC;AAEF,UAAU,mBAAmB;IAC3B,IAAI,EAAE,aAAa,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;CAChD;AAED,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CA0ExD,CAAC"}
+{"version":3,"file":"Reference.d.ts","sourceRoot":"","sources":["Reference.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAEnD,OAAO,EACL,SAAS,IAAI,aAAa,EAG3B,MAAM,aAAa,CAAC;AAKrB,aAAK,KAAK,GAAG;IACX,IAAI,EAAE,aAAa,CAAC;IACpB,iBAAiB,CAAC,EACd,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,KAAK,IAAI,CAAC,GAC5D,SAAS,CAAC;IACd,aAAa,CAAC,EACV,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,KAAK,IAAI,CAAC,GAC5D,SAAS,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,SAAS,UAAW,KAAK,gBASrC,CAAC;AAEF,UAAU,mBAAmB;IAC3B,IAAI,EAAE,aAAa,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;CAChD;AAED,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAkExD,CAAC"}

package/dist/widgets/base/one2many/One2manyInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"One2manyInput.d.ts","sourceRoot":"","sources":["One2manyInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAMN,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,aAAa,CAAC;AAWvD,OAAO,EAAE,KAAK,EAAY,MAAM,SAAS,CAAC;AAkB1C,aAAK,aAAa,GAAG;IACnB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;CAC5B,CAAC;AAQF,aAAK,YAAY,GAAG;IAClB,SAAS,CAAC,EACN,UAAU,GACV,eAAe,GACf,eAAe,GACf,eAAe,GACf,aAAa,CAAC;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,aAAa,CAAC,EAAE,GAAG,CAAC;CACrB,CAAC;AAEF,UAAU,kBAAkB;IAC1B,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC1C,KAAK,EAAE,KAAK,CAAC;CACd;AAWD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CA+mB/C,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"One2manyInput.d.ts","sourceRoot":"","sources":["One2manyInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAC;AACvE,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,aAAa,CAAC;AAWvD,OAAO,EAAE,KAAK,EAAY,MAAM,SAAS,CAAC;AAkB1C,aAAK,aAAa,GAAG;IACnB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;CAC5B,CAAC;AAQF,aAAK,YAAY,GAAG;IAClB,SAAS,CAAC,EACN,UAAU,GACV,eAAe,GACf,eAAe,GACf,eAAe,GACf,aAAa,CAAC;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,aAAa,CAAC,EAAE,GAAG,CAAC;CACrB,CAAC;AAEF,UAAU,kBAAkB;IAC1B,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC1C,KAAK,EAAE,KAAK,CAAC;CACd;AAWD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CA8kB/C,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.1.40-rc.2",
+  "version": "1.1.40",
   "files": [
     "dist",
     "src",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@ant-design/plots": "^1.0.9",
-    "@gisce/ooui": "^0.17.14-rc.1",
+    "@gisce/ooui": "^0.18.0",
     "@gisce/react-formiga-table": "^0.5.0",
     "@monaco-editor/react": "^4.4.5",
     "@tabler/icons-react": "^2.11.0",

package/src/helpers/one2manyHelper.ts

@@ -1,6 +1,5 @@
 import { One2manyItem } from "@/widgets/base/one2many/One2manyInput";
 import ConnectionProvider from "@/ConnectionProvider";
-import { ViewType } from "@/types";
 
 type ReadObjectValuesOptions = {
   items: One2manyItem[];
@@ -8,20 +7,12 @@ type ReadObjectValuesOptions = {
   treeFields: any;
   formFields: any;
   context?: any;
-  currentView: ViewType;
 };
 
 const readObjectValues = async (
   options: ReadObjectValuesOptions
 ): Promise<One2manyItem[]> => {
-  const {
-    items,
-    model,
-    formFields,
-    treeFields,
-    context,
-    currentView = {},
-  } = options;
+  const { items, model, formFields, treeFields, context = {} } = options;
 
   const temporalItems: One2manyItem = items.filter(
     (item) => item.operation !== "original"
@@ -32,47 +23,47 @@ const readObjectValues = async (
     .filter((item) => item.operation === "original")
     .map((item) => item.id) as number[];
 
-  const fieldsToRetrieve: { [key: string]: any } = {
-    form: formFields,
-    tree: treeFields,
-  };
-
   const values = await ConnectionProvider.getHandler().readObjects({
     model,
     ids: idsToFetch,
-    fields: fieldsToRetrieve[currentView as string],
+    fields: { ...formFields, ...treeFields },
     context,
   });
 
-  const filteredValues = values.map((result: any) => {
+  const formValues = values.map((result: any) => {
     const resultFormValues: any = {};
     Object.keys(result).forEach((key) => {
-      if (
-        fieldsToRetrieve[currentView as string].hasOwnProperty(key) ||
-        key === "id"
-      ) {
+      if (formFields.hasOwnProperty(key) || key === "id") {
         resultFormValues[key] = result[key];
       }
     });
     return resultFormValues;
   });
 
+  const treeValues = values.map((result: any) => {
+    const resultTreeValues: any = {};
+    Object.keys(result).forEach((key) => {
+      if (treeFields.hasOwnProperty(key) || key === "id") {
+        resultTreeValues[key] = result[key];
+      }
+    });
+    return resultTreeValues;
+  });
+
   // We fill the values property of the One2manyItem with the retrieved values from the API
   const originalItemsWithFetchedValues: One2manyItem[] = items.map((item) => {
-    const fetchedItemValues = filteredValues.find(
+    const fetchedFormItemValues = formValues.find(
+      (itemValues: any) => itemValues.id === item.id
+    );
+    const fetchedTreeItemValues = treeValues.find(
       (itemValues: any) => itemValues.id === item.id
     );
 
-    const itemWithFetchedValues = {
+    return {
       ...item,
+      values: fetchedFormItemValues,
+      treeValues: fetchedTreeItemValues,
     };
-
-    if (currentView === "form") {
-      itemWithFetchedValues["values"] = fetchedItemValues;
-    } else if (currentView === "tree") {
-      itemWithFetchedValues["treeValues"] = fetchedItemValues;
-    }
-    return itemWithFetchedValues;
   });
 
   return originalItemsWithFetchedValues.concat(temporalItems);
@@ -88,8 +79,14 @@ type RemoveItemOptions = {
 };
 
 const removeItems = async (options: RemoveItemOptions) => {
-  const { model, activeId, fieldName, idsToRemove, fields, isMany2many } =
-    options;
+  const {
+    model,
+    activeId,
+    fieldName,
+    idsToRemove,
+    fields,
+    isMany2many,
+  } = options;
 
   const values: any = {};
   values[fieldName] = [];

package/src/widgets/base/Reference.tsx

@@ -73,16 +73,8 @@ export const ReferenceInput: React.FC<ReferenceInputProps> = (
           }
           onChange={(changedValue: string) => {
             setSelectionValue(changedValue);
-            let m2oValue = many2oneValue[0] || 0;
-            if (changedValue !== selectionValue) {
-              setMany2oneValue([]);
-              m2oValue = 0;
-            }
-            const referenceValue = `${changedValue},${m2oValue}`;
-            if (referenceValue === value) {
-              return;
-            }
-            onChange?.(referenceValue);
+            setMany2oneValue([]);
+            onChange?.(undefined);
           }}
           value={selectionValue}
         />
@@ -100,7 +92,7 @@ export const ReferenceInput: React.FC<ReferenceInputProps> = (
           value={many2oneValue}
           onChange={(changedValue: any[]) => {
             setMany2oneValue(changedValue);
-            const referenceValue = `${selectionValue},${changedValue[0] || 0}`;
+            const referenceValue = `${selectionValue},${changedValue[0]}`;
             if (referenceValue === value) {
               return;
             }

package/src/widgets/base/one2many/One2manyInput.tsx

@@ -1,10 +1,4 @@
-import React, {
-  useState,
-  useRef,
-  useContext,
-  useEffect,
-  useCallback,
-} from "react";
+import React, { useState, useRef, useContext, useEffect } from "react";
 import { One2many as One2manyOoui } from "@gisce/ooui";
 import { Alert, Spin } from "antd";
 import { Form } from "@/index";
@@ -89,6 +83,7 @@ const One2manyInput: React.FC<One2manyInputProps> = (
     formContext || {};
   const { lang, t } = useContext(LocaleContext) as LocaleContextType;
 
+  const formRef = useRef();
   const [formHasChanges, setFormHasChanges] = useState<boolean>(false);
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const [error, setError] = useState<string>();
@@ -111,31 +106,14 @@ const One2manyInput: React.FC<One2manyInputProps> = (
   const isMany2many = ooui.type === "many2many";
   const { id: fieldName } = ooui;
   const itemsToShow = items.filter(
-    (item) =>
-      (item.values || item.treeValues) && item.operation !== "pendingRemove"
+    (item) => item.values && item.operation !== "pendingRemove"
   );
-  const previousCurrentView = useRef<ViewType>();
 
   useEffect(() => {
-    if (previousCurrentView.current !== currentView) {
-      previousCurrentView.current = currentView;
-      fetchDataIfNeeded();
-      return;
-    }
-
-    fetchDataIfNeeded();
-  }, [items, currentView]);
-
-  const fetchDataIfNeeded = useCallback(() => {
-    if (currentView === "form" && items.some((item) => !item.values)) {
-      fetchData();
-    } else if (
-      currentView === "tree" &&
-      items.some((item) => !item.treeValues)
-    ) {
+    if (items.some((item) => !item.values)) {
       fetchData();
     }
-  }, [items, currentView]);
+  }, [items]);
 
   useEffect(() => {
     parseDomain();
@@ -155,7 +133,7 @@ const One2manyInput: React.FC<One2manyInputProps> = (
     }
   };
 
-  const fetchOriginalItemsFromApi = async (mode?: ViewType) => {
+  const fetchOriginalItemsFromApi = async () => {
     setIsLoading(true);
     setFormHasChanges(false);
     setError(undefined);
@@ -167,7 +145,6 @@ const One2manyInput: React.FC<One2manyInputProps> = (
         model: relation,
         items,
         context: { ...getContext?.(), ...context },
-        currentView: mode || currentView,
       });
 
       if (!originalSortItemIds.current) {
@@ -175,7 +152,6 @@ const One2manyInput: React.FC<One2manyInputProps> = (
       }
 
       triggerChange(itemsWithValues);
-      return itemsWithValues;
     } catch (err) {
       setError(err as any);
     } finally {
@@ -462,19 +438,10 @@ const One2manyInput: React.FC<One2manyInputProps> = (
     }
   };
 
-  const onTreeRowClicked = async (record: any) => {
+  const onTreeRowClicked = (record: any) => {
     const { id: itemId } = record;
-
-    let itemsToLoadFrom: One2manyItem[] | undefined = items;
-
-    // We should fetch the form data if needed in order to get the form values
-    const modalItem = items.find((item) => item.id === itemId);
-    if (modalItem?.values === undefined) {
-      itemsToLoadFrom = await fetchOriginalItemsFromApi("form");
-    }
-
     // We show the detail for the clicked item in a Form modal
-    setModalItem(itemsToLoadFrom!.find((item) => item.id === itemId));
+    setModalItem(items.find((item) => item.id === itemId));
     setContinuousEntryMode(false);
     setShowFormModal(true);
   };
@@ -540,18 +507,12 @@ const One2manyInput: React.FC<One2manyInputProps> = (
         return t("noCurrentEntries");
       }
 
-      if (
-        currentView !== previousCurrentView.current &&
-        items.some((item) => !item.values)
-      ) {
-        return <Spin />;
-      }
-
       return (
         <Form
           formView={views.get("form")}
           values={itemsToShow[itemIndex]?.values}
           parentContext={{ ...getContext?.(), ...context }}
+          ref={formRef}
           model={relation}
           id={itemsToShow[itemIndex]?.id}
           submitMode={"values"}