fix: check mapSync dependencyMap for standard map also

geosolutions-it · Dec 4, 2024 · 26525e1 · 26525e1
1 parent f15603b
commit 26525e1
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 1 deletion.
diff --git a/web/client/components/widgets/enhancers/__tests__/wpsCounter-test.js b/web/client/components/widgets/enhancers/__tests__/wpsCounter-test.js
@@ -101,4 +101,31 @@ describe('wpsChart enhancer', () => {
         };
         ReactDOM.render(<Sink {...props} />, document.getElementById("container"));
     });
+    it('wpsCounter with mapSync standard Map', (done) => {
+        const Sink = wpsCounter(createSink( ({data, loading} = {}) => {
+            if (!loading) {
+                expect(data).toExist();
+                done();
+            }
+        }));
+        const props = {
+            mapSync: true,
+            dependencies: {
+                viewport: "..."
+            },
+            dependenciesMap: {
+                mapSync: 'map.mapSync'
+            },
+            layer: {
+                name: "test",
+                url: 'base/web/client/test-resources/widgetbuilder/aggregate',
+                wpsUrl: 'base/web/client/test-resources/widgetbuilder/aggregate',
+                search: {url: 'base/web/client/test-resources/widgetbuilder/aggregate'}},
+            options: {
+                aggregateFunction: "Count",
+                aggregationAttribute: "test"
+            }
+        };
+        ReactDOM.render(<Sink {...props} />, document.getElementById("container"));
+    });
 });
diff --git a/web/client/components/widgets/enhancers/wfsTable/__tests__/triggerFetch-test.js b/web/client/components/widgets/enhancers/wfsTable/__tests__/triggerFetch-test.js
@@ -91,5 +91,33 @@ describe('triggerFetch stream', () => {
                 }
             );
     });
+    it('triggerFetch with mapSync with Standard Map and dependencies.viewport', (done) => {
+        const base = {
+            layer: { name: "TEST" },
+            mapSync: true,
+            widgets: [
+            ],
+            dependenciesMap: {
+                mapSync: 'map.mapSync'
+            }
+        };
+        const propsChanges = [
+            base, // does not trigger fetch
+            {...base, dependencies: { viewport: true }}, // triggers fetch (p1)
+            {...base, dependencies: { viewport: false }}, // does not trigger fetch
+            {...base, mapSync: false, filter: "changed"} // triggers fetch (p2) (the filter changes due to the viewport)
+        ];
+        triggerFetch(Rx.Observable.from(propsChanges))
+            .bufferCount(4)
+            .subscribe(
+                ([p1, p2, p3, p4]) => {
+                    expect(p1?.dependencies?.viewport).toBe(true);
+                    expect(p2).toExist();
+                    expect(p3).toNotExist();
+                    expect(p4).toNotExist();
+                    done();
+                }
+            );
+    });
 
 });
diff --git a/web/client/utils/WidgetsUtils.js b/web/client/utils/WidgetsUtils.js
@@ -994,7 +994,7 @@ export const canTableWidgetBeDependency = (widget, dependencyTableWidget) => {
 };
 
 function findWidgetById(widgets, widgetId) {
-    return widgets.find(widget => widget.id === widgetId);
+    return widgets?.find(widget => widget.id === widgetId);
 }
 
 /**
@@ -1014,6 +1014,9 @@ export function checkMapSyncWithWidgetOfMapType(widgets, dependenciesMap) {
     if (!mapSyncDependencies) {
         return false;
     }
+    if (mapSyncDependencies.includes("map.mapSync")) {
+        return true;
+    }
     // Extract widget ID
     const widgetId = mapSyncDependencies.match?.(/\[([^\]]+)\]/)?.[1];
     if (!widgetId) {