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

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,uBAiH1D,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,uBA2H1D,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"TreeActionView.d.ts","sourceRoot":"","sources":["TreeActionView.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAKnD,oBAAY,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,GAAG,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,mBAAmB,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,YAAY,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,cAAc,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACrC,cAAc,EAAE,IAAI,EAAE,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,cAAc,UAAW,mBAAmB,uBAuDxD,CAAC"}
+{"version":3,"file":"TreeActionView.d.ts","sourceRoot":"","sources":["TreeActionView.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAKnD,oBAAY,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,GAAG,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,mBAAmB,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9C,YAAY,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,cAAc,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACrC,cAAc,EAAE,IAAI,EAAE,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,cAAc,UAAW,mBAAmB,uBAsDxD,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"DashboardTree.d.ts","sourceRoot":"","sources":["DashboardTree.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAY,QAAQ,EAAE,MAAM,eAAe,CAAC;AAOnD,aAAK,gBAAgB,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,aAAK,KAAK,GAAG;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,CAAC,IAAI,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAC/C,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,GAAG,CAAC;CACrB,CAAC;AAEF,iBAAS,aAAa,CAAC,KAAK,EAAE,KAAK,sBAwOlC;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"DashboardTree.d.ts","sourceRoot":"","sources":["DashboardTree.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAY,QAAQ,EAAE,MAAM,eAAe,CAAC;AAQnD,aAAK,gBAAgB,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,aAAK,KAAK,GAAG;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,CAAC,IAAI,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAC/C,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,GAAG,CAAC;CACrB,CAAC;AAEF,iBAAS,aAAa,CAAC,KAAK,EAAE,KAAK,sBA6MlC;AAED,eAAe,aAAa,CAAC"}

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,gBA6ChD,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;CAChB,CAAC;AAEF,eAAO,MAAM,UAAU,UAAW,eAAe,gBAgDhD,CAAC"}

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

@@ -14,5 +14,6 @@ export declare const useGraphData: (opts: GraphDataOpts) => {
     error: any;
     type: GraphType;
     values: any;
+    evaluatedEntries: any[] | undefined;
 };
 //# sourceMappingURL=useGraphData.d.ts.map

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;;;;;CAsE/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;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"}

package/dist/widgets/views/searchFilter/SearchFilter.d.ts

@@ -13,6 +13,7 @@ declare type Props = {
     setSearchFilterHeight?: (height: number) => void;
     searchError?: string;
     searchValues?: any;
+    showLimitOptions?: boolean;
 };
 declare function SearchFilter(props: Props): JSX.Element;
 export default SearchFilter;

package/dist/widgets/views/searchFilter/SearchFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SearchFilter.d.ts","sourceRoot":"","sources":["SearchFilter.tsx"],"names":[],"mappings":";AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAMvC,aAAK,KAAK,GAAG;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;IAChC,WAAW,EAAE,OAAO,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,qBAAqB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,GAAG,CAAC;CACpB,CAAC;AAEF,iBAAS,YAAY,CAAC,KAAK,EAAE,KAAK,eAgHjC;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"SearchFilter.d.ts","sourceRoot":"","sources":["SearchFilter.tsx"],"names":[],"mappings":";AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAMvC,aAAK,KAAK,GAAG;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;IAChC,WAAW,EAAE,OAAO,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,qBAAqB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,iBAAS,YAAY,CAAC,KAAK,EAAE,KAAK,eAmHjC;AAED,eAAe,YAAY,CAAC"}

package/package.json

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

package/src/helpers/searchHelper.ts

@@ -175,7 +175,7 @@ export const getUniqueFieldsForParams = (params: any[]) => {
 };
 
 export const mergeParams = (searchParams: any[], domainParams: any[]) => {
-  const finalParams = searchParams;
+  const finalParams = [...searchParams];
   const uniqueParams = getUniqueFieldsForParams(searchParams);
 
   domainParams.forEach((element) => {

package/src/hooks/useSearch.ts

@@ -75,7 +75,6 @@ export const useSearch = (opts: UseSearchOpts) => {
   const internalLimit = useRef(limit || DEFAULT_SEARCH_LIMIT);
 
   const originalResults = useRef<any[]>([]);
-  const actionDomain = useRef<any>([]);
 
   const setResults = useCallback((results: any) => {
     setResultsActionView?.([...results]);
@@ -94,7 +93,7 @@ export const useSearch = (opts: UseSearchOpts) => {
       model,
       payload: nameSearch,
       limit: internalLimit.current,
-      attrs: actionDomain.current.length > 0 ? actionDomain.current : domain,
+      attrs: domain,
       context,
     });
 
@@ -163,117 +162,119 @@ export const useSearch = (opts: UseSearchOpts) => {
     sorter,
     setCurrentItemIndex,
     setActionViewTotalItems,
-    actionDomain,
   ]);
 
-  const searchResults = useCallback(async () => {
-    const domainParams =
-      actionDomain.current.length > 0 ? actionDomain.current : domain;
+  const searchResults = useCallback(
+    async (opts?: { params: any; newOffset: number }) => {
+      const { params, newOffset } = opts || {};
 
-    const mergedParams = mergeParams(searchParams, domainParams);
-    const { colors } = getTree(treeView!);
+      const mergedParams = mergeParams(params || searchParams, domain);
+      const { colors } = getTree(treeView!);
 
-    const { totalItems, results, attrsEvaluated } =
-      await ConnectionProvider.getHandler().searchForTree({
-        params: mergedParams,
-        limit: internalLimit.current,
-        offset,
-        model,
-        fields: treeView!.field_parent
-          ? { ...treeView!.fields, [treeView!.field_parent]: {} }
-          : treeView!.fields,
-        context,
-        attrs: colors && { colors },
-      });
-    setColorsForResults(getColorMap(attrsEvaluated));
+      const { totalItems, results, attrsEvaluated } =
+        await ConnectionProvider.getHandler().searchForTree({
+          params: mergedParams,
+          limit: internalLimit.current,
+          offset: newOffset || offset,
+          model,
+          fields: treeView!.field_parent
+            ? { ...treeView!.fields, [treeView!.field_parent]: {} }
+            : treeView!.fields,
+          context,
+          attrs: colors && { colors },
+        });
+      setColorsForResults(getColorMap(attrsEvaluated));
 
-    originalResults.current = [...results];
+      originalResults.current = [...results];
 
-    const resultsSorted =
-      sorter !== undefined
-        ? sortResults({
-            resultsToSort: results,
-            sorter: sorter,
-            fields: { ...treeView!.fields, ...formView!.fields },
-          })
-        : [...originalResults.current];
+      const resultsSorted =
+        sorter !== undefined
+          ? sortResults({
+              resultsToSort: results,
+              sorter: sorter,
+              fields: { ...treeView!.fields, ...formView!.fields },
+            })
+          : [...originalResults.current];
 
-    setResults(resultsSorted);
+      setResults(resultsSorted);
 
-    if (resultsActionView && resultsSorted.length > 0) {
-      const newCurrentItemIndex = resultsSorted.findIndex(
-        (item) => currentId === item.id
-      );
+      if (resultsActionView && resultsSorted.length > 0) {
+        const newCurrentItemIndex = resultsSorted.findIndex(
+          (item) => currentId === item.id
+        );
 
-      if (newCurrentItemIndex === -1) {
-        setCurrentItemIndex?.(0);
+        if (newCurrentItemIndex === -1) {
+          setCurrentItemIndex?.(0);
+        } else {
+          setCurrentItemIndex?.(newCurrentItemIndex);
+        }
       } else {
-        setCurrentItemIndex?.(newCurrentItemIndex);
+        setCurrentItemIndex?.(undefined);
       }
-    } else {
-      setCurrentItemIndex?.(undefined);
-    }
 
-    const totalItemsValue = await totalItems;
+      const totalItemsValue = await totalItems;
 
-    setTotalItems(totalItemsValue);
-    setActionViewTotalItems?.(totalItemsValue);
-  }, [
-    setCurrentItemIndex,
-    resultsActionView,
-    setResults,
-    currentId,
-    model,
-    context,
-    domain,
-    treeView,
-    formView,
-    sorter,
-    setActionViewTotalItems,
-    limit,
-    offset,
-    actionDomain,
-    searchParams,
-  ]);
+      setTotalItems(totalItemsValue);
+      setActionViewTotalItems?.(totalItemsValue);
+    },
+    [
+      setCurrentItemIndex,
+      resultsActionView,
+      setResults,
+      currentId,
+      model,
+      context,
+      domain,
+      treeView,
+      formView,
+      sorter,
+      setActionViewTotalItems,
+      limit,
+      offset,
+      searchParams,
+    ]
+  );
 
-  const fetchResults = useCallback(async () => {
-    try {
-      setTableRefreshing(true);
-      setTreeIsLoading?.(true);
-      if (nameSearch && !searchNameGetDoneRef.current) {
-        await searchByNameSearch();
-      } else {
-        await searchResults();
+  const fetchResults = useCallback(
+    async (opts?: { params: any; newOffset: number }) => {
+      try {
+        setTableRefreshing(true);
+        setTreeIsLoading?.(true);
+        if (nameSearch && !searchNameGetDoneRef.current) {
+          await searchByNameSearch();
+        } else {
+          await searchResults(opts);
+        }
+      } catch (error) {
+        setSearchError(error.message);
+      } finally {
+        setTableRefreshing(false);
+        setSearchFilterLoading(false);
+        setTreeIsLoading?.(false);
       }
-    } catch (error) {
-      setSearchError(error.message);
-    } finally {
-      setTableRefreshing(false);
-      setSearchFilterLoading(false);
-      setTreeIsLoading?.(false);
-    }
-  }, [
-    actionDomain,
-    context,
-    currentId,
-    domain,
-    formView,
-    limit,
-    model,
-    nameSearch,
-    offset,
-    resultsActionView,
-    searchNameGetDoneRef,
-    setActionViewTotalItems,
-    setCurrentItemIndex,
-    setResults,
-    setSearchError,
-    setSearchFilterLoading,
-    setTableRefreshing,
-    setTreeIsLoading,
-    sorter,
-    treeView,
-  ]);
+    },
+    [
+      context,
+      currentId,
+      domain,
+      formView,
+      limit,
+      model,
+      nameSearch,
+      offset,
+      resultsActionView,
+      searchNameGetDoneRef,
+      setActionViewTotalItems,
+      setCurrentItemIndex,
+      setResults,
+      setSearchError,
+      setSearchFilterLoading,
+      setTableRefreshing,
+      setTreeIsLoading,
+      sorter,
+      treeView,
+    ]
+  );
 
   const changeSort = useCallback(
     (newSorter: any) => {
@@ -292,22 +293,19 @@ export const useSearch = (opts: UseSearchOpts) => {
   );
 
   const submit = useCallback(
-    ({
-      params: newParams,
-      limit: newLimit,
-      offset: newOffset,
-      searchValues,
-    }: {
+    (opts: {
       params: any;
       limit: number;
       offset: number;
       searchValues: any;
     }) => {
+      const { params, searchValues, limit: newLimit, offset: newOffset } = opts;
+
       if (tableRefreshing) return;
       setSearchTreeNameSearch?.(undefined);
       setSelectedRowItems?.([]);
       setSearchValues?.(searchValues);
-      setSearchParams?.(newParams);
+      setSearchParams?.(params);
       setSearchVisible?.(false);
       setSearchFilterLoading(true);
       setSearchError(undefined);
@@ -315,7 +313,10 @@ export const useSearch = (opts: UseSearchOpts) => {
       internalLimit.current = newLimit;
       if (newLimit) setLimit?.(newLimit);
       if (newOffset) setOffset(newOffset);
-      fetchResults();
+      fetchResults({
+        params,
+        newOffset,
+      });
     },
     [
       tableRefreshing,

package/src/views/actionViews/GraphActionView.tsx

@@ -1,7 +1,7 @@
 import GraphActionBar from "@/actionbar/GraphActionBar";
 import TitleHeader from "@/ui/TitleHeader";
 import { Graph } from "@/widgets/views/Graph/Graph";
-import React, { useContext, useRef } from "react";
+import React, { useContext, useEffect, useRef, useState } from "react";
 import {
   ActionViewContext,
   ActionViewContextType,
@@ -11,7 +11,7 @@ import { mergeSearchFields } from "@/helpers/formHelper";
 import { useSearch } from "@/hooks/useSearch";
 import SearchFilter from "@/widgets/views/searchFilter/SearchFilter";
 import { Spin } from "antd";
-import { LocaleContext, LocaleContextType } from "@/context/LocaleContext";
+import { mergeParams } from "@/helpers/searchHelper";
 
 export type GraphActionViewProps = {
   viewData: any;
@@ -47,43 +47,48 @@ export const GraphActionView = (props: GraphActionViewProps) => {
     setTreeIsLoading = undefined,
     limit,
     setLimit,
+    searchParams,
+    searchValues,
+    setSearchValues,
+    currentView,
   } = actionViewContext || {};
 
-  const { searchParams, searchValues, setSearchValues } = useContext(
-    ActionViewContext
-  ) as ActionViewContextType;
-  const { t } = useContext(LocaleContext) as LocaleContextType;
+  const [applyLimit, setApplyLimit] = useState(true);
 
-  const {
-    submit,
-    clear,
-    searchFilterLoading,
-    searchError,
-    offset,
-    tableRefreshing,
-  } = useSearch({
-    model,
-    setSearchTreeNameSearch,
-    setSelectedRowItems,
-    searchParams,
-    setSearchValues,
-    setSearchParams,
-    setSearchVisible,
-    setTreeIsLoading,
-    context,
-    formView: formView!,
-    treeView: treeView!,
-    sorter,
-    setSorter,
-    setCurrentItemIndex,
-    setResultsActionView,
-    resultsActionView,
-    domain,
-    currentId,
-    setActionViewTotalItems,
-    limit,
-    setLimit,
-  });
+  useEffect(() => {
+    (graphRef.current as any)?.refresh();
+  }, [searchParams]);
+
+  useEffect(() => {
+    if (viewData.view_id !== currentView.view_id) {
+      setApplyLimit(true);
+    }
+  }, [currentView]);
+
+  const { clear, searchFilterLoading, searchError, offset, tableRefreshing } =
+    useSearch({
+      model,
+      setSearchTreeNameSearch,
+      setSelectedRowItems,
+      searchParams,
+      setSearchValues,
+      setSearchParams,
+      setSearchVisible,
+      setTreeIsLoading,
+      context,
+      formView: formView!,
+      treeView: treeView!,
+      sorter,
+      setSorter,
+      setCurrentItemIndex,
+      setResultsActionView,
+      resultsActionView,
+      domain,
+      currentId,
+      setActionViewTotalItems,
+      limit,
+      setLimit,
+    });
 
   if (!visible) {
     return null;
@@ -112,27 +117,32 @@ export const GraphActionView = (props: GraphActionViewProps) => {
         onClear={clear}
         offset={offset}
         isSearching={searchFilterLoading}
-        onSubmit={submit}
+        onSubmit={(opts: {
+          params: any;
+          limit: number;
+          offset: number;
+          searchValues: any;
+        }) => {
+          setApplyLimit(false);
+          setSearchParams?.(opts.params);
+          setSearchVisible?.(false);
+        }}
         searchError={searchError}
         searchVisible={searchVisible}
         searchValues={searchValues}
+        showLimitOptions={false}
       />
       {tableRefreshing ? (
         <Spin />
       ) : (
-        <>
-          <p style={{ textAlign: "right" }}>
-            {`${t("totalRegisters")} ${resultsActionView?.length}`}
-          </p>
-          <Graph
-            ref={graphRef}
-            view_id={viewData.view_id}
-            model={model}
-            context={context}
-            domain={searchParams || domain}
-            limit={limit}
-          />
-        </>
+        <Graph
+          ref={graphRef}
+          view_id={viewData.view_id}
+          model={model}
+          context={context}
+          domain={mergeParams(searchParams || [], domain)}
+          limit={applyLimit ? limit : undefined}
+        />
       )}
     </>
   );

package/src/views/actionViews/TreeActionView.tsx

@@ -36,7 +36,6 @@ export const TreeActionView = (props: TreeActionViewProps) => {
     setCurrentView,
     availableViews,
     searchTreeNameSearch,
-    limit,
   } = props;
 
   if (!visible) {

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