@gisce/react-ooui 1.1.2-rc.2 → 1.1.2-rc.4

package/src/widgets/custom/MultiCheckbox.tsx

@@ -4,8 +4,9 @@ import Field from "@/common/Field";
 import { One2manyItem, One2manyValue } from "../base/one2many/One2manyInput";
 import useDeepCompareEffect from "use-deep-compare-effect";
 import { FormContext, FormContextType } from "@/context/FormContext";
-import { Alert, Checkbox, Spin, Col, Row, Button, Space  } from "antd";
+import { Alert, Checkbox, Spin, Col, Row, Button, Space } from "antd";
 import ConnectionProvider from "@/ConnectionProvider";
+import { transformPlainMany2Ones } from "@/helpers/formHelper";
 
 type MultiCheckboxProps = {
   ooui: MultiCheckboxOoui;
@@ -21,7 +22,7 @@ export const MultiCheckbox = (props: MultiCheckboxProps) => {
 
   return (
     <Field type={"array"} {...props}>
-      <MultiCheckboxInput ooui={ooui}  />
+      <MultiCheckboxInput ooui={ooui} />
     </Field>
   );
 };
@@ -29,16 +30,15 @@ export const MultiCheckbox = (props: MultiCheckboxProps) => {
 export const MultiCheckboxInput = (props: MultiCheckboxInputProps) => {
   const { value, ooui, onChange } = props;
   const { items = [] } = value || {};
-  const itemsToShow = items.filter(
-    (item) => item.operation !== "pendingRemove"
-  ).map((item) => item.id) as number[];
+  const itemsToShow = items
+    .filter((item) => item.operation !== "pendingRemove")
+    .map((item) => item.id) as number[];
 
   const [options, setOptions] = useState<any[]>([]);
   const [error, setError] = useState<string>();
   const [isLoadingOptions, setIsLoadingOptions] = useState<boolean>(false);
   const { relation, context, readOnly, field, columns } = ooui;
 
-
   const formContext = useContext(FormContext) as FormContextType;
   const { getContext } = formContext || {};
 
@@ -56,13 +56,14 @@ export const MultiCheckboxInput = (props: MultiCheckboxInputProps) => {
     setIsLoadingOptions(true);
     let params: any = [];
     if (ooui.domain) {
-      const evaluatedDomain = await ConnectionProvider.getHandler().evalDomain(
-        {
-          domain: ooui.domain,
+      const evaluatedDomain = await ConnectionProvider.getHandler().evalDomain({
+        domain: ooui.domain,
+        values: transformPlainMany2Ones({
+          fields: formContext?.getFields(),
           values: formContext.getPlainValues(),
-          context: formContext.getContext(),
-        }
-      );
+        }),
+        context: formContext.getContext(),
+      });
       params = [...params, ...evaluatedDomain];
     }
     try {
@@ -72,35 +73,32 @@ export const MultiCheckboxInput = (props: MultiCheckboxInputProps) => {
         fields: [field],
         context: { ...getContext?.(), ...context },
       });
-      const options = optionsRead.map((item:any) => {
+      const options = optionsRead.map((item: any) => {
         const value = item[field];
         let formattedValue = value;
         if (Array.isArray(value)) {
           formattedValue = value[1];
         }
-        return {label: formattedValue, value: item.id}
+        return { label: formattedValue, value: item.id };
       });
       setOptions(options);
-      
     } catch (err) {
-      setError(err as any)
+      setError(err as any);
     } finally {
       setIsLoadingOptions(false);
     }
     if (error) {
       return <Alert className="mt-10" message={error} type="error" banner />;
     }
-
-
-  };
+  }
 
   const checkAll = () => {
-    onChangeSelected(options.map(option => option.value));
-  }
+    onChangeSelected(options.map((option) => option.value));
+  };
 
   const uncheckAll = () => {
     onChangeSelected([]);
-  }
+  };
 
   const onChangeSelected = (ids: any[]) => {
     const newItems: One2manyItem[] = items.map((item) => {
@@ -108,46 +106,59 @@ export const MultiCheckboxInput = (props: MultiCheckboxInputProps) => {
         if (item.operation == "pendingRemove") {
           return {
             ...item,
-            operation: "original"
-          }
+            operation: "original",
+          };
         } else {
-          return item
+          return item;
         }
       } else {
-        return {id: item.id, operation: 'pendingRemove'}
+        return { id: item.id, operation: "pendingRemove" };
       }
-    })
-    const currentIds = newItems.map(item => item.id)
-    ids.filter(id => !currentIds.includes(id)).map((id) => {
-      newItems.push({id, operation: 'pendingLink'});
     });
+    const currentIds = newItems.map((item) => item.id);
+    ids
+      .filter((id) => !currentIds.includes(id))
+      .map((id) => {
+        newItems.push({ id, operation: "pendingLink" });
+      });
     triggerChange(newItems);
   };
 
   if (isLoadingOptions && options.length === 0) {
-    return <Spin />
+    return <Spin />;
   }
-  
+
   return (
     <>
       <div className="flex flex-row">
-        <Checkbox.Group value={options.length ? itemsToShow : []} disabled={readOnly} onChange={onChangeSelected} style={{width: '100%'}}>
+        <Checkbox.Group
+          value={options.length ? itemsToShow : []}
+          disabled={readOnly}
+          onChange={onChangeSelected}
+          style={{ width: "100%" }}
+        >
           <Row>
-          {options.map((option) => (
-            <Col span={Math.floor(24 / columns)}>
-              <Checkbox value={option.value}>{option.label}</Checkbox>
-            </Col>
-          ))}
+            {options.map((option) => (
+              <Col span={Math.floor(24 / columns)}>
+                <Checkbox value={option.value}>{option.label}</Checkbox>
+              </Col>
+            ))}
           </Row>
         </Checkbox.Group>
-        {!readOnly &&
+        {!readOnly && (
           <Space>
-            <Button onClick={checkAll} disabled={itemsToShow.length == options.length}>Check all</Button>
-            <Button onClick={uncheckAll} disabled={itemsToShow.length === 0}>Uncheck all</Button>
+            <Button
+              onClick={checkAll}
+              disabled={itemsToShow.length == options.length}
+            >
+              Check all
+            </Button>
+            <Button onClick={uncheckAll} disabled={itemsToShow.length === 0}>
+              Uncheck all
+            </Button>
           </Space>
-        }
+        )}
       </div>
     </>
   );
-  
 };

package/src/widgets/custom/Tags.tsx

@@ -6,7 +6,7 @@ import { One2manyItem, One2manyValue } from "../base/one2many/One2manyInput";
 import useDeepCompareEffect from "use-deep-compare-effect";
 import { FormContext, FormContextType } from "@/context/FormContext";
 import { Alert, Tag as AntTag, Select } from "antd";
-import { colorFromString } from "@/helpers/formHelper";
+import { colorFromString, transformPlainMany2Ones } from "@/helpers/formHelper";
 import ConnectionProvider from "@/ConnectionProvider";
 
 type TagsProps = WidgetProps & {
@@ -65,8 +65,11 @@ export const TagsInput = (props: TagsInputProps) => {
         const evaluatedDomain = await ConnectionProvider.getHandler().evalDomain(
           {
             domain: ooui.domain,
-            values: formContext.getPlainValues(),
-            context: formContext.getContext(),
+            values: transformPlainMany2Ones({
+              fields: formContext?.getFields(),
+              values: formContext.getPlainValues(),
+            }),
+                context: formContext.getContext(),
           }
         );
         params = [...params, ...evaluatedDomain];
@@ -87,7 +90,7 @@ export const TagsInput = (props: TagsInputProps) => {
         return {label: formattedValue, value: item.id}
       });
       setOptions(options);
-      
+
     } catch (err) {
       setError(err as any)
     } finally {
@@ -156,5 +159,5 @@ export const TagsInput = (props: TagsInputProps) => {
       </div>
     </>
   );
-  
+
 };

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

@@ -6,6 +6,7 @@ import { FormView, TreeView } from "@/types/index";
 import ConnectionProvider from "@/ConnectionProvider";
 
 import { getColorMap, getTree, sortResults } from "@/helpers/treeHelper";
+import { mergeParams } from "@/helpers/searchHelper";
 
 const DEFAULT_SEARCH_LIMIT = 80;
 
@@ -67,33 +68,6 @@ function DashboardTree(props: Props) {
     setOffset((page - 1) * limitRef.current!);
   };
 
-  const getUniqueFieldsForParams = (params: any[]) => {
-    const uniqueFields: any = {};
-
-    params.forEach((param) => {
-      if (Array.isArray(param) && param[0]) {
-        uniqueFields[param[0]] = true;
-      }
-    });
-
-    return Object.keys(uniqueFields);
-  };
-
-  const mergeParams = (searchParams: any[], domainParams: any[]) => {
-    const finalParams = searchParams;
-    const uniqueParams = getUniqueFieldsForParams(searchParams);
-
-    domainParams.forEach((element) => {
-      if (Array.isArray(element) && element[0]) {
-        if (!uniqueParams.includes(element[0])) {
-          finalParams.push(element);
-        }
-      }
-    });
-
-    return finalParams;
-  };
-
   const searchResults = async () => {
     const domainParams =
       actionDomain.current.length > 0 ? actionDomain.current : domain;

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

@@ -23,7 +23,7 @@ export const GraphChart = (props: GraphChartProps) => {
   const { model, domain, context, xml, limit } = props;
   const { t } = useContext(LocaleContext) as LocaleContextType;
 
-  const { error, loading, values, type } = useGraphData({
+  const { error, loading, values, type, evaluatedEntries } = useGraphData({
     model,
     xml,
     limit,
@@ -54,6 +54,9 @@ export const GraphChart = (props: GraphChartProps) => {
 
   return (
     <div style={{ padding: "1rem" }}>
+      <p style={{ textAlign: "right" }}>
+        {`${t("totalRegisters")} ${evaluatedEntries?.length}`}
+      </p>
       <Chart
         {...getGraphProps({
           type,

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

@@ -36,6 +36,7 @@ export const useGraphData = (opts: GraphDataOpts) => {
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<any>();
   const [processedValues, setProcessedValues] = useState<any>();
+  const [evaluatedEntries, setEvaluatedEntries] = useState<any[]>();
   const [type, setType] = useState<GraphType>("line");
 
   useDeepCompareEffect(() => {
@@ -74,6 +75,7 @@ export const useGraphData = (opts: GraphDataOpts) => {
           return;
         }
 
+        setEvaluatedEntries(values);
         const _processedValues = processGraphData({
           ooui,
           values,
@@ -93,7 +95,13 @@ export const useGraphData = (opts: GraphDataOpts) => {
     })();
   }, [xml, model, limit, context, domain]);
 
-  return { loading, error, type, values: processedValues };
+  return {
+    loading,
+    error,
+    type,
+    values: processedValues,
+    evaluatedEntries,
+  };
 };
 
 async function getFieldsForModel({

package/src/widgets/views/searchFilter/SearchFilter.tsx

@@ -29,6 +29,7 @@ type Props = {
   setSearchFilterHeight?: (height: number) => void;
   searchError?: string;
   searchValues?: any;
+  showLimitOptions?: boolean;
 };
 
 function SearchFilter(props: Props) {
@@ -45,6 +46,7 @@ function SearchFilter(props: Props) {
     setSearchFilterHeight,
     searchError,
     searchValues,
+    showLimitOptions = true,
   } = props;
 
   const [simpleSearchFields, setSimpleSearchFields] = useState<Container>();
@@ -116,7 +118,9 @@ function SearchFilter(props: Props) {
               initialValues={{ offset, limit }}
             >
               {rows}
-              {advancedFilter && <SearchParams onLimitChange={onLimitChange} />}
+              {advancedFilter && showLimitOptions && (
+                <SearchParams onLimitChange={onLimitChange} />
+              )}
               <SearchBottomBar
                 advancedFilter={advancedFilter}
                 onAdvancedFilterToggle={() => {