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

package/dist/views/actionViews/GraphActionView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GraphActionView.d.ts","sourceRoot":"","sources":["GraphActionView.tsx"],"names":[],"mappings":";AAQA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAO7C,oBAAY,oBAAoB,GAAG;IACjC,QAAQ,EAAE,GAAG,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,GAAG,CAAC;IACb,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,eAAe,UAAW,oBAAoB,uBA2H1D,CAAC"}
+{"version":3,"file":"GraphActionView.d.ts","sourceRoot":"","sources":["GraphActionView.tsx"],"names":[],"mappings":";AAQA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAO7C,oBAAY,oBAAoB,GAAG;IACjC,QAAQ,EAAE,GAAG,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,GAAG,CAAC;IACb,MAAM,EAAE,GAAG,CAAC;IACZ,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,eAAO,MAAM,eAAe,UAAW,oBAAoB,uBA8H1D,CAAC"}

package/dist/widgets/views/Graph/Graph.d.ts

@@ -5,6 +5,7 @@ export declare type GraphProps = {
     domain: any;
     context: any;
     limit?: number;
+    manualIds?: number[];
 };
 export declare const Graph: React.ForwardRefExoticComponent<GraphProps & React.RefAttributes<unknown>>;
 //# sourceMappingURL=Graph.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Graph.d.ts","sourceRoot":"","sources":["Graph.tsx"],"names":[],"mappings":"AAAA,OAAO,KAMN,MAAM,OAAO,CAAC;AAiBf,oBAAY,UAAU,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAgHF,eAAO,MAAM,KAAK,4EAAwB,CAAC"}
+{"version":3,"file":"Graph.d.ts","sourceRoot":"","sources":["Graph.tsx"],"names":[],"mappings":"AAAA,OAAO,KAMN,MAAM,OAAO,CAAC;AAiBf,oBAAY,UAAU,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAkHF,eAAO,MAAM,KAAK,4EAAwB,CAAC"}

package/dist/widgets/views/Graph/GraphChart.d.ts

@@ -5,6 +5,7 @@ export declare type GraphChartProps = {
     context: any;
     xml: string;
     limit?: number;
+    manualIds?: number[];
 };
 export declare const GraphChart: (props: GraphChartProps) => JSX.Element;
 //# sourceMappingURL=GraphChart.d.ts.map

package/dist/widgets/views/Graph/GraphChart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GraphChart.d.ts","sourceRoot":"","sources":["GraphChart.tsx"],"names":[],"mappings":";AAaA,oBAAY,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,UAAU,UAAW,eAAe,gBAgDhD,CAAC"}
+{"version":3,"file":"GraphChart.d.ts","sourceRoot":"","sources":["GraphChart.tsx"],"names":[],"mappings":";AAaA,oBAAY,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,UAAU,UAAW,eAAe,gBAiDhD,CAAC"}

package/dist/widgets/views/Graph/GraphIndicator.d.ts

@@ -11,6 +11,7 @@ export declare type GraphInidicatorProps = {
     suffix?: string;
     field?: string;
     operator?: Operator;
+    manualIds?: number[];
 };
 export declare const GraphIndicator: (props: GraphInidicatorProps) => JSX.Element;
 //# sourceMappingURL=GraphIndicator.d.ts.map

package/dist/widgets/views/Graph/GraphIndicator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GraphIndicator.d.ts","sourceRoot":"","sources":["GraphIndicator.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAQvC,oBAAY,oBAAoB,GAAG;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,cAAc,UAAW,oBAAoB,gBAuKzD,CAAC"}
+{"version":3,"file":"GraphIndicator.d.ts","sourceRoot":"","sources":["GraphIndicator.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAQvC,oBAAY,oBAAoB,GAAG;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,cAAc,UAAW,oBAAoB,gBAoNzD,CAAC"}

package/dist/widgets/views/Graph/useGraphData.d.ts

@@ -4,6 +4,7 @@ export declare type GraphDataQueryOpts = {
     domain?: any;
     context?: any;
     limit?: number;
+    manualIds?: number[];
 };
 export declare type GraphDataOpts = GraphDataQueryOpts & {
     xml: string;

package/dist/widgets/views/Graph/useGraphData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useGraphData.d.ts","sourceRoot":"","sources":["useGraphData.tsx"],"names":[],"mappings":"AACA,OAAO,EAKL,SAAS,EACV,MAAM,aAAa,CAAC;AAOrB,oBAAY,kBAAkB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,oBAAY,aAAa,GAAG,kBAAkB,GAAG;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,eAAO,MAAM,YAAY,SAAU,aAAa;;;;;;CA8E/C,CAAC"}
+{"version":3,"file":"useGraphData.d.ts","sourceRoot":"","sources":["useGraphData.tsx"],"names":[],"mappings":"AACA,OAAO,EAKL,SAAS,EACV,MAAM,aAAa,CAAC;AAOrB,oBAAY,kBAAkB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF,oBAAY,aAAa,GAAG,kBAAkB,GAAG;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,eAAO,MAAM,YAAY,SAAU,aAAa;;;;;;CAgF/C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.1.2-rc.4",
+  "version": "1.1.2-rc.5",
   "files": [
     "dist",
     "src",

package/src/views/actionViews/GraphActionView.tsx

@@ -142,6 +142,9 @@ export const GraphActionView = (props: GraphActionViewProps) => {
           context={context}
           domain={mergeParams(searchParams || [], domain)}
           limit={applyLimit ? limit : undefined}
+          manualIds={
+            applyLimit ? resultsActionView?.map((r) => r.id) : undefined
+          }
         />
       )}
     </>

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

@@ -27,10 +27,11 @@ export type GraphProps = {
   domain: any;
   context: any;
   limit?: number;
+  manualIds?: number[];
 };
 
 const GraphComp = (props: GraphProps, ref: any) => {
-  const { view_id, model, context, domain, limit } = props;
+  const { view_id, model, context, domain, limit, manualIds } = props;
   const [loading, setLoading] = useState(false);
   const [graphOoui, setGraphOoui] = useState<GraphOoui>();
   const [graphXml, setGraphXml] = useState<string>();
@@ -116,6 +117,7 @@ const GraphComp = (props: GraphProps, ref: any) => {
           domain={domain}
           icon={indicator.icon!}
           suffix={indicator.suffix!}
+          manualIds={manualIds}
           {...indicatorFieldopts}
         />
       );
@@ -130,6 +132,7 @@ const GraphComp = (props: GraphProps, ref: any) => {
           domain={domain}
           xml={graphXml!}
           limit={limit}
+          manualIds={manualIds}
         />
       );
     }

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

@@ -17,10 +17,11 @@ export type GraphChartProps = {
   context: any;
   xml: string;
   limit?: number;
+  manualIds?: number[];
 };
 
 export const GraphChart = (props: GraphChartProps) => {
-  const { model, domain, context, xml, limit } = props;
+  const { model, domain, context, xml, limit, manualIds } = props;
   const { t } = useContext(LocaleContext) as LocaleContextType;
 
   const { error, loading, values, type, evaluatedEntries } = useGraphData({
@@ -30,6 +31,7 @@ export const GraphChart = (props: GraphChartProps) => {
     domain,
     context,
     uninformedString: t("uninformed"),
+    manualIds,
   });
 
   if (error) {

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,6 +33,7 @@ export const useGraphData = (opts: GraphDataOpts) => {
     xml,
     limit,
     uninformedString,
+    manualIds,
   } = opts;
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<any>();
@@ -61,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));
@@ -128,6 +131,7 @@ async function retrieveData({
   context,
   order,
   limit,
+  manualIds,
 }: {
   fields: string[];
   model: string;
@@ -135,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,
@@ -144,7 +169,6 @@ async function retrieveData({
     limit,
     order,
   })) as any;
-  const fieldsDefinition = await getFieldsForModel({ model, context, fields });
   return {
     values,
     fields: fieldsDefinition,