@gisce/react-ooui 1.1.46 → 1.1.47

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,CAmnB/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,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,CA8nB/C,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC"}

package/dist/widgets/custom/Timeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Timeline.d.ts","sourceRoot":"","sources":["Timeline.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAgB,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE7E,OAAO,EAAE,KAAK,EAAY,MAAM,SAAS,CAAC;AAO1C,aAAK,aAAa,GAAG;IACnB,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,aAAK,kBAAkB,GAAG,aAAa,GAAG;IACxC,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC1C,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,eAAO,MAAM,QAAQ,UAAW,aAAa,gBAsD5C,CAAC;AAEF,eAAO,MAAM,aAAa,UAAW,kBAAkB,gBAgHtD,CAAC"}
+{"version":3,"file":"Timeline.d.ts","sourceRoot":"","sources":["Timeline.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAgB,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE7E,OAAO,EAAE,KAAK,EAAY,MAAM,SAAS,CAAC;AAO1C,aAAK,aAAa,GAAG;IACnB,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,aAAK,kBAAkB,GAAG,aAAa,GAAG;IACxC,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC1C,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,eAAO,MAAM,QAAQ,UAAW,aAAa,gBAsD5C,CAAC;AAEF,eAAO,MAAM,aAAa,UAAW,kBAAkB,gBAqHtD,CAAC"}

package/dist/widgets/views/Dashboard/Dashboard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Dashboard.d.ts","sourceRoot":"","sources":["Dashboard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAGf,OAAO,gCAAgC,CAAC;AACxC,OAAO,kCAAkC,CAAC;AAI1C,OAAO,EAAE,cAAc,EAAY,MAAM,SAAS,CAAC;;AAwWnD,wBAAqC"}
+{"version":3,"file":"Dashboard.d.ts","sourceRoot":"","sources":["Dashboard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAGf,OAAO,gCAAgC,CAAC;AACxC,OAAO,kCAAkC,CAAC;AAI1C,OAAO,EAAE,cAAc,EAAY,MAAM,SAAS,CAAC;;AA6WnD,wBAAqC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.1.46",
+  "version": "1.1.47",
   "files": [
     "dist",
     "src",

package/src/helpers/one2manyHelper.ts

@@ -1,24 +1,30 @@
 import { One2manyItem } from "@/widgets/base/one2many/One2manyInput";
 import ConnectionProvider from "@/ConnectionProvider";
-import { ViewType } from "@/types";
+import { TreeView, View, ViewType } from "@/types";
+import { getColorMap, getTree } from "./treeHelper";
 
 type ReadObjectValuesOptions = {
   items: One2manyItem[];
   model: string;
-  treeFields: any;
-  formFields: any;
   context?: any;
   currentView: ViewType;
+  formView: {
+    fields: any;
+  };
+  treeView: {
+    arch?: string;
+    fields: any;
+  };
 };
 
 const readObjectValues = async (
   options: ReadObjectValuesOptions
-): Promise<One2manyItem[]> => {
+): Promise<[One2manyItem[], any]> => {
   const {
     items,
     model,
-    formFields,
-    treeFields,
+    formView,
+    treeView,
     context,
     currentView = {},
   } = options;
@@ -33,16 +39,34 @@ const readObjectValues = async (
     .map((item) => item.id) as number[];
 
   const fieldsToRetrieve: { [key: string]: any } = {
-    form: formFields,
-    tree: treeFields,
+    form: formView.fields,
+    tree: treeView.fields,
   };
 
-  const values = await ConnectionProvider.getHandler().readObjects({
-    model,
-    ids: idsToFetch,
-    fields: fieldsToRetrieve[currentView as string],
-    context,
-  });
+  let values = [],
+    evaluatedColorsForTree;
+
+  if (currentView === "tree" && treeView?.arch) {
+    const results = await ConnectionProvider.getHandler().readEvalUiObjects({
+      model,
+      ids: idsToFetch,
+      arch: treeView?.arch!,
+      fields: treeView!.fields,
+      context,
+      attrs: {
+        colors: getTree(treeView as TreeView)?.colors,
+      },
+    });
+    values = results[0];
+    evaluatedColorsForTree = getColorMap(results[1]);
+  } else {
+    values = await ConnectionProvider.getHandler().readObjects({
+      model,
+      ids: idsToFetch,
+      fields: fieldsToRetrieve[currentView as string],
+      context,
+    });
+  }
 
   const filteredValues = values.map((result: any) => {
     const resultFormValues: any = {};
@@ -75,7 +99,10 @@ const readObjectValues = async (
     return itemWithFetchedValues;
   });
 
-  return originalItemsWithFetchedValues.concat(temporalItems);
+  return [
+    originalItemsWithFetchedValues.concat(temporalItems),
+    evaluatedColorsForTree,
+  ];
 };
 
 type RemoveItemOptions = {

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

@@ -31,7 +31,7 @@ import { One2manyTopBar } from "@/widgets/base/one2many/One2manyTopBar";
 import { readObjectValues, getNextPendingId } from "@/helpers/one2manyHelper";
 import { SearchModal } from "@/widgets/modals/SearchModal";
 import { LocaleContext, LocaleContextType } from "@/context/LocaleContext";
-import { sortResults } from "@/helpers/treeHelper";
+import { getColorMap, getTree, sortResults } from "@/helpers/treeHelper";
 import { transformPlainMany2Ones } from "@/helpers/formHelper";
 
 type One2manyValue = {
@@ -101,6 +101,7 @@ const One2manyInput: React.FC<One2manyInputProps> = (
   const transformedDomain = useRef<any[]>([]);
   const [sorter, setSorter] = useState<any>();
   const originalSortItemIds = useRef<number[]>();
+  const [colorsForResults, setColorsForResults] = useState<any>(undefined);
 
   const {
     readOnly,
@@ -161,9 +162,14 @@ const One2manyInput: React.FC<One2manyInputProps> = (
     setError(undefined);
 
     try {
-      const itemsWithValues = await readObjectValues({
-        treeFields: views.get("tree").fields,
-        formFields: views.get("form")?.fields || {},
+      const [itemsWithValues, evaluatedColorsForTree] = await readObjectValues({
+        treeView: {
+          arch: views.get("tree")?.arch,
+          fields: views.get("tree")?.fields,
+        },
+        formView: {
+          fields: views.get("form")?.fields || {},
+        },
         model: relation,
         items,
         context: { ...getContext?.(), ...context },
@@ -174,6 +180,10 @@ const One2manyInput: React.FC<One2manyInputProps> = (
         originalSortItemIds.current = itemsWithValues.map((item) => item.id!);
       }
 
+      if ((currentView || mode) === "tree" && evaluatedColorsForTree) {
+        setColorsForResults(evaluatedColorsForTree);
+      }
+
       triggerChange(itemsWithValues);
       return itemsWithValues;
     } catch (err) {
@@ -618,6 +628,7 @@ const One2manyInput: React.FC<One2manyInputProps> = (
           sorter={sorter}
           onChangeSort={setSorter}
           context={{ ...getContext?.(), ...context }}
+          colorsForResults={colorsForResults}
         />
       );
     }

package/src/widgets/custom/Timeline.tsx

@@ -105,9 +105,14 @@ export const TimelineInput = (props: TimelineInputProps) => {
     setError(undefined);
 
     try {
-      const itemsWithValues = await readObjectValues({
-        treeFields: views.get("tree").fields,
-        formFields: views.get("form").fields,
+      const [itemsWithValues] = await readObjectValues({
+        treeView: {
+          fields: views.get("tree").fields,
+          arch: views.get("tree").arch
+        },
+        formView: {
+          fields: views.get("form").fields,
+        },
         model: relation,
         items,
         context: { ...getContext?.(), ...context },

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

@@ -105,14 +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) {