fix: fix report search and infinite scroll limit

zimmerman-team · Oct 24, 2023 · 60fd6de · 60fd6de
1 parent df0097a
commit 60fd6de
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/src/app/modules/home-module/components/Charts/chartsGrid.tsx b/src/app/modules/home-module/components/Charts/chartsGrid.tsx
@@ -43,7 +43,7 @@ export default function ChartsGrid(props: Props) {
   const loadChartsCount = useStoreActions(
     (actions) => actions.charts.ChartsCount.fetch
   );
-  const ChartsCount = useStoreState(
+  const chartsCount = useStoreState(
     (state) => get(state, "charts.ChartsCount.data.count", 0) as number
   );
 
@@ -72,16 +72,13 @@ export default function ChartsGrid(props: Props) {
   };
 
   const loadData = async () => {
-    //refrain from loading data if all the data is loaded
-    // if (loadedCharts.length !== ChartsCount) {
     if (token) {
       await loadCharts({
         token,
         storeInCrudData: true,
         filterString: getFilterString(),
       });
     }
-    // }
   };
 
   const reloadData = async () => {
@@ -103,10 +100,12 @@ export default function ChartsGrid(props: Props) {
 
   React.useEffect(() => {
     //load data if intersection observer is triggered
-    if (isObserved) {
-      if (loadedCharts.length !== ChartsCount) {
-        //update the offset value for the next load
-        setOffset(offset + limit);
+    if (chartsCount > limit) {
+      if (isObserved) {
+        if (loadedCharts.length !== chartsCount) {
+          //update the offset value for the next load
+          setOffset(offset + limit);
+        }
       }
     }
   }, [isObserved]);

diff --git a/src/app/modules/home-module/components/Datasets/datasetsGrid.tsx b/src/app/modules/home-module/components/Datasets/datasetsGrid.tsx
@@ -97,11 +97,13 @@ export default function DatasetsGrid(props: Props) {
 
   React.useEffect(() => {
     //load data if intersection observer is triggered
-    if (isObserved) {
-      console.log(loadedDatasets.length, datasetCount);
-      if (loadedDatasets.length !== datasetCount) {
-        //update the offset value for the next load
-        setOffset(offset + limit);
+    if (datasetCount > limit) {
+      if (isObserved) {
+        console.log(loadedDatasets.length, datasetCount);
+        if (loadedDatasets.length !== datasetCount) {
+          //update the offset value for the next load
+          setOffset(offset + limit);
+        }
       }
     }
   }, [isObserved]);

diff --git a/src/app/modules/home-module/components/Reports/reportsGrid.tsx b/src/app/modules/home-module/components/Reports/reportsGrid.tsx
@@ -68,7 +68,7 @@ export default function ReportsGrid(props: Props) {
 
   const loadData = async () => {
     //refrain from loading data if all the data is loaded
-    if (loadedReports.length !== reportsCount && token) {
+    if (token) {
       await loadReports({
         token,
         storeInCrudData: true,
@@ -88,10 +88,12 @@ export default function ReportsGrid(props: Props) {
 
   React.useEffect(() => {
     //load data if intersection observer is triggered
-    if (isObserved) {
-      if (loadedReports.length !== reportsCount) {
-        //update the offset value for the next load
-        setOffset(offset + limit);
+    if (reportsCount > limit) {
+      if (isObserved) {
+        if (loadedReports.length !== reportsCount) {
+          //update the offset value for the next load
+          setOffset(offset + limit);
+        }
       }
     }
   }, [isObserved]);