[Backport c027-2024-10-24] - #10622: Not possible to remove widget fr…

…om Map - JavaScript error (#10623) (#10630) * #10622: Not possible to remove widget from Map - JavaScript error (#10623) Description: - fix the issue of not remove widget from map in case of existing other widgets has dependenciesMap prop = empty object - add unit test * tentative fix for the test --------- Co-authored-by: MV88 <[email protected]>
geosolutions-it · Nov 6, 2024 · d609157 · d609157
1 parent 4bd43bf
commit d609157
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/...ient/components/geostory/common/enhancers/__tests__/withMediaVisibilityContainer-test.jsx b/...ient/components/geostory/common/enhancers/__tests__/withMediaVisibilityContainer-test.jsx
@@ -67,8 +67,8 @@ describe('withMediaVisibilityContainer HOC', () => {
         ReactDOM.render(
             <div
                 id="scroll-container"
-                style={{ width: 512, height: 512, overflow: 'scroll' }}>
-                <div style={{ height: 1024 }}></div>
+                style={{ width: 10, height: 10, overflow: 'scroll' }}>
+                <div style={{ height: 20 }}></div>
                 <Media mediaViewer={withMediaVisibilityContainer(() => <div className="test-component"></div>)} debounceTime={DEBOUNCE_TIME}/>
             </div>,
             document.getElementById("container"));
@@ -89,7 +89,7 @@ describe('withMediaVisibilityContainer HOC', () => {
                     done(e);
                 }
                 done();
-            }, 50);
+            }, 100);
         } catch (e) {
             done(e);
         }

diff --git a/web/client/reducers/__tests__/widgets-test.js b/web/client/reducers/__tests__/widgets-test.js
@@ -218,6 +218,34 @@ describe('Test the widgets reducer', () => {
         expect(uWidgets[0].dependenciesMap).toBeFalsy();
         expect(uWidgets[0].id).toBe("2");
     });
+    it('test deleteWidget if the some other widgets [not deleted] has dependenciesMap = {}', () => {
+        const state = {
+            containers: {
+                [DEFAULT_TARGET]: {
+                    widgets: [{
+                        id: "1",
+                        maps: [{mapId: 1, layers: [1, 2]}]
+                    }, {
+                        id: "2",
+                        mapSync: true,
+                        dependenciesMap: {
+                            layers: "widgets[1].maps[1].layers"
+                        }
+                    }, {
+                        id: "3",
+                        mapSync: true,
+                        dependenciesMap: {}
+                    }]
+                }
+            }
+        };
+        const newState = widgets(state, deleteWidget({id: "1"}));
+        const uWidgets = newState.containers[DEFAULT_TARGET].widgets;
+        expect(uWidgets.length).toBe(2);
+        expect(uWidgets[0].mapSync).toBeFalsy();
+        expect(uWidgets[0].dependenciesMap).toBeFalsy();
+        expect(uWidgets[0].id).toBe("2");
+    });
     it('init', () => {
         const defaults = {initialSize: {
             w: 4,

diff --git a/web/client/reducers/widgets.js b/web/client/reducers/widgets.js
@@ -182,7 +182,7 @@ function widgetsReducer(state = emptyState, action) {
         const allWidgets = get(updatedState, path, []);
         return set(path, allWidgets.map(m => {
             if (m.dependenciesMap) {
-                const [, dependentWidgetId] = WIDGETS_REGEX.exec((Object.values(m.dependenciesMap) || [])[0]);
+                const [, dependentWidgetId] = WIDGETS_REGEX.exec((Object.values(m.dependenciesMap) || [])[0]) || [];
                 if (dependentWidgetId) {
                     if (action.widget.id === dependentWidgetId) {
                         return {...omit(m, "dependenciesMap"), mapSync: false};