geosolutions-it#9697: fix spatial filter and widget connection issues

Description: - Resolve review comments
mahmoudadel54 · Dec 13, 2023 · 1ab004d · 1ab004d
1 parent d5ec524
commit 1ab004d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/web/client/epics/widgetsbuilder.js b/web/client/epics/widgetsbuilder.js
@@ -70,7 +70,6 @@ export const initEditorOnNewChart = (action$, {getState = () => {}} = {}) => act
                 charts: [
                     {
                         chartId,
-                        layer,
                         legend: false,
                         cartesian: true,
                         traces: [

diff --git a/web/client/reducers/__tests__/widgets-test.js b/web/client/reducers/__tests__/widgets-test.js
@@ -176,7 +176,7 @@ describe('Test the widgets reducer', () => {
         expect(widgetObjects[1].layer).toEqual(newTargetLayer);
         expect(widgetObjects[2].layer).toEqual(state.containers[DEFAULT_TARGET].widgets[2].layer);
         expect(widgetObjects[3].layer).toEqual(newTargetLayer);
-        expect(widgetObjects[4].charts[0].layer).toEqual(newTargetLayer);
+        expect(widgetObjects[4].charts[0].layer.id).toEqual(newTargetLayer.id);
         expect(widgetObjects[4].charts[1].layer).toEqual(state.containers[DEFAULT_TARGET].widgets[4].charts[1].layer);
         expect(widgetObjects[4].charts[2].layer).toEqual(state.containers[DEFAULT_TARGET].widgets[4].charts[1].layer);
         expect(widgetObjects[4].charts[2].traces[0].layer).toEqual(state.containers[DEFAULT_TARGET].widgets[4].charts[2].traces[0].layer);

diff --git a/web/client/reducers/widgets.js b/web/client/reducers/widgets.js
@@ -161,7 +161,6 @@ function widgetsReducer(state = emptyState, action) {
                             let chartsCopy = w?.charts?.length ? [...w.charts] : [];
                             chartsCopy = chartsCopy.map(chart=>{
                                 let chartItem = {...chart};
-                                chartItem = get(chart, "layer.id") === action.layer.id ? set("layer", action.layer, chart) : chart;
                                 chartItem.traces = chartItem?.traces?.map(trace=>
                                     get(trace, "layer.id") === action.layer.id ? set("layer", action.layer, trace) : trace
                                 );