@gisce/react-ooui 1.1.2-rc.3 → 1.1.2-rc.5

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

@@ -24,6 +24,7 @@ export type GraphInidicatorProps = {
   suffix?: string;
   field?: string;
   operator?: Operator;
+  manualIds?: number[];
 };
 
 export const GraphIndicator = (props: GraphInidicatorProps) => {
@@ -38,6 +39,7 @@ export const GraphIndicator = (props: GraphInidicatorProps) => {
     suffix,
     field,
     operator,
+    manualIds,
   } = props;
   const [loading, setLoading] = useState(false);
   const [value, setValue] = useState<number>();
@@ -53,10 +55,52 @@ export const GraphIndicator = (props: GraphInidicatorProps) => {
     fetchData();
   }, [model, colorCondition]);
 
-  async function fetchTotalValue(queryDomain: any) {
+  async function fetchValue({
+    domain,
+    isTotal,
+  }: {
+    domain: any;
+    isTotal: boolean;
+  }) {
+    if (isTotal) {
+      return await fetchTotalValue({ domain });
+    }
+
+    if (field && operator) {
+      const resultIds =
+        manualIds ||
+        (await ConnectionProvider.getHandler().searchAllIds({
+          params: domain,
+          model,
+          context,
+        }));
+
+      const results = await ConnectionProvider.getHandler().readObjects({
+        model,
+        ids: resultIds,
+        fieldsToRetrieve: [field],
+        context,
+      });
+
+      return getValueForOperator({
+        values: results.map((r: any) => r[field]),
+        operator,
+      });
+    } else {
+      return manualIds
+        ? manualIds.length
+        : await ConnectionProvider.getHandler().searchCount({
+            model,
+            params: domain,
+            context,
+          });
+    }
+  }
+
+  async function fetchTotalValue({ domain }: { domain: any }) {
     if (field && operator) {
       const resultIds = await ConnectionProvider.getHandler().searchAllIds({
-        params: queryDomain,
+        params: domain,
         model,
         context,
       });
@@ -75,19 +119,18 @@ export const GraphIndicator = (props: GraphInidicatorProps) => {
     } else {
       return await ConnectionProvider.getHandler().searchCount({
         model,
-        params: queryDomain,
+        params: domain,
         context,
       });
     }
   }
-
   async function fetchData() {
     setLoading(true);
     let totalRetrievedValue;
     let percent;
 
     try {
-      const retrievedValue = await fetchTotalValue(domain);
+      const retrievedValue = await fetchValue({ domain, isTotal: false });
 
       setValue(retrievedValue);
 
@@ -97,7 +140,10 @@ export const GraphIndicator = (props: GraphInidicatorProps) => {
           values: {},
           context,
         });
-        totalRetrievedValue = await fetchTotalValue(parsedDomain);
+        totalRetrievedValue = await fetchValue({
+          domain: parsedDomain,
+          isTotal: true,
+        });
 
         setTotalValue(totalRetrievedValue);
       }

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

@@ -17,6 +17,7 @@ export type GraphDataQueryOpts = {
   domain?: any;
   context?: any;
   limit?: number;
+  manualIds?: number[];
 };
 
 export type GraphDataOpts = GraphDataQueryOpts & {
@@ -32,10 +33,12 @@ export const useGraphData = (opts: GraphDataOpts) => {
     xml,
     limit,
     uninformedString,
+    manualIds,
   } = opts;
   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(() => {
@@ -60,6 +63,7 @@ export const useGraphData = (opts: GraphDataOpts) => {
           limit,
           order: ooui.timerange ? ooui.x.name : null,
           fields: fieldsToRetrieve,
+          manualIds,
         }));
       } catch (e) {
         setError("Error fetching graph data values: " + JSON.stringify(e));
@@ -74,6 +78,7 @@ export const useGraphData = (opts: GraphDataOpts) => {
           return;
         }
 
+        setEvaluatedEntries(values);
         const _processedValues = processGraphData({
           ooui,
           values,
@@ -93,7 +98,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({
@@ -120,6 +131,7 @@ async function retrieveData({
   context,
   order,
   limit,
+  manualIds,
 }: {
   fields: string[];
   model: string;
@@ -127,7 +139,28 @@ async function retrieveData({
   context: any;
   order: string | null;
   limit?: number;
+  manualIds?: number[];
 }) {
+  const fieldsDefinition = await getFieldsForModel({ model, context, fields });
+
+  if (manualIds) {
+    let values: any[] = (await ConnectionProvider.getHandler().readObjects({
+      model,
+      ids: manualIds,
+      fieldsToRetrieve: fields,
+      context,
+    })) as any;
+
+    if (order) {
+      values = [...values].sort((a, b) => a[order] - b[order]);
+    }
+
+    return {
+      values,
+      fields: fieldsDefinition,
+    };
+  }
+
   const values: any[] = (await ConnectionProvider.getHandler().search({
     model,
     params: domain,
@@ -136,7 +169,6 @@ async function retrieveData({
     limit,
     order,
   })) as any;
-  const fieldsDefinition = await getFieldsForModel({ model, context, fields });
   return {
     values,
     fields: fieldsDefinition,

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={() => {