fix: filter event to call api if mapSync is on and viewport is null

geosolutions-it · Nov 26, 2024 · 1b98005 · 1b98005
1 parent e5ea162
commit 1b98005
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/web/client/components/widgets/enhancers/__tests__/wpsCounter-test.js b/web/client/components/widgets/enhancers/__tests__/wpsCounter-test.js
@@ -40,8 +40,7 @@ describe('wpsChart enhancer', () => {
             options: {
                 aggregateFunction: "Count",
                 aggregationAttribute: "test"
-            },
-            dependencies: { viewport: true}
+            }
         };
         ReactDOM.render(<Sink {...props} />, document.getElementById("container"));
     });
@@ -61,8 +60,7 @@ describe('wpsChart enhancer', () => {
             options: {
                 aggregateFunction: "Count",
                 aggregationAttribute: "test"
-            },
-            dependencies: { viewport: true}
+            }
         };
         ReactDOM.render(<Sink {...props} />, document.getElementById("container"));
     });

diff --git a/web/client/components/widgets/enhancers/wfsTable/triggerFetch.js b/web/client/components/widgets/enhancers/wfsTable/triggerFetch.js
@@ -22,7 +22,15 @@ const sameSortOptions = (o1 = {}, o2 = {}) =>
  * @return {Observable} Stream of props to trigger the data fetch
  */
 export default ($props) =>
-    $props.filter(({ layer = {} }) => layer.name )
+    $props.filter(({ layer = {}, mapSync, dependencies }) => {
+        // Check if mapSync is enabled (true) and dependencies.viewport is null or falsy
+        // If this condition is true, return false to filter out the event.
+        // This prevents an extra API call from being triggered when the viewport is not available.
+        if (mapSync && !dependencies.viewport) {
+            return false;
+        }
+        return layer.name;
+    } )
         .distinctUntilChanged(
             ({ layer = {}, options = {}, filter, sortOptions }, newProps) =>
             /* getSearchUrl(layer) === getSearchUrl(layer) && */

diff --git a/web/client/components/widgets/enhancers/wpsCounter.js b/web/client/components/widgets/enhancers/wpsCounter.js
@@ -30,7 +30,15 @@ import { getWpsUrl } from '../../../utils/LayersUtils';
  */
 const dataStreamFactory = ($props) =>
     $props
-        .filter(({layer = {}, options, dependencies}) => layer.name && getWpsUrl(layer) && options && options.aggregateFunction && options.aggregationAttribute && dependencies.viewport)
+        .filter(({layer = {}, options, dependencies, mapSync}) => {
+            // Check if mapSync is enabled (true) and dependencies.viewport is null or falsy
+            // If this condition is true, return false to filter out the event.
+            // This prevents an extra API call from being triggered when the viewport is not available.
+            if (mapSync && !dependencies.viewport) {
+                return false;
+            }
+            return layer.name && getWpsUrl(layer) && options && options.aggregateFunction && options.aggregationAttribute;
+        })
         .distinctUntilChanged(
             ({layer = {}, options = {}, filter}, newProps) =>
                 (newProps.layer && layer.name === newProps.layer.name && layer.loadingError === newProps.layer.loadingError)