fix: layerFilter structure (#11914)

Author: rowheat02

web/client/epics/__tests__/interactions-test.js

@@ -11,6 +11,7 @@ import { testEpic } from './epicTestUtils';
 import { applyFilterWidgetInteractionsEpic, cleanupAndReapplyFilterWidgetInteractionsEpic } from '../interactions';
 import { applyFilterWidgetInteractions } from '../../actions/interactions';
 import { UPDATE_PROPERTY, DELETE } from '../../actions/widgets';
+import { CHANGE_LAYER_PROPERTIES } from '../../actions/layers';
 
 const FILTER_ID = 'filter-1';
 const FILTER_WIDGET_ID = 'filter-widget-1';
@@ -67,15 +68,21 @@ const makeTableWidget = (overrides = {}) => ({
     ...overrides
 });
 
-const makeState = (widgets) => ({
-    widgets: {
-        containers: {
-            floating: {
-                widgets
+const makeState = (widgets, layersState = null) => {
+    const state = {
+        widgets: {
+            containers: {
+                floating: {
+                    widgets
+                }
             }
         }
+    };
+    if (layersState) {
+        state.layers = layersState;
     }
-});
+    return state;
+};
 
 describe('interactions epics', () => {
     describe('applyFilterWidgetInteractionsEpic', () => {
@@ -109,6 +116,43 @@ describe('interactions epics', () => {
             );
         });
 
+        it('dispatches changeLayerProperties with full default layerFilter when layer has null layerFilter (map layer target)', (done) => {
+            const LAYER_ID = 'layer-1';
+            const filterWidget = makeFilterWidget({
+                interactions: [{
+                    id: 'int-map-layer',
+                    plugged: true,
+                    targetType: 'applyFilter',
+                    source: { nodePath: `widgets[${FILTER_WIDGET_ID}].filters[${FILTER_ID}]` },
+                    target: { nodePath: `map.layers[${LAYER_ID}]` }
+                }]
+            });
+            const layersState = { flat: [{ id: LAYER_ID, name: 'test:layer' }] };
+            const state = makeState([filterWidget], layersState);
+
+            testEpic(
+                applyFilterWidgetInteractionsEpic,
+                1,
+                [applyFilterWidgetInteractions(FILTER_WIDGET_ID, 'floating', FILTER_ID)],
+                (actions) => {
+                    expect(actions.length).toBe(1);
+                    expect(actions[0].type).toBe(CHANGE_LAYER_PROPERTIES);
+                    expect(actions[0].layer).toBe(LAYER_ID);
+                    const layerFilter = actions[0].newProperties?.layerFilter;
+                    expect(layerFilter).toBeTruthy();
+                    expect(Array.isArray(layerFilter.groupFields)).toBe(true);
+                    expect(layerFilter.groupFields.length).toBeGreaterThan(0);
+                    expect(Array.isArray(layerFilter.filterFields)).toBe(true);
+                    expect(layerFilter.attributePanelExpanded).toBe(true);
+                    expect(layerFilter.spatialField).toBeTruthy();
+                    expect(Array.isArray(layerFilter.filters)).toBe(true);
+                    expect(layerFilter.filters.length).toBeGreaterThan(0);
+                },
+                state,
+                done
+            );
+        });
+
         it('dispatches updateWidgetProperty with interactionFilters for table target', (done) => {
             const filterWidget = makeFilterWidget({
                 interactions: [{

web/client/epics/interactions.js

@@ -13,6 +13,7 @@ import { extractTraceFromWidgetByNodePath, TARGET_TYPES } from '../utils/Interac
 import { updateWidgetProperty, INSERT, UPDATE, DELETE } from '../actions/widgets';
 import { getLayerFromId, layersSelector } from '../selectors/layers';
 import { changeLayerProperties } from '../actions/layers';
+import { defaultLayerFilter } from '../utils/FilterUtils';
 import { processFilterToCQL, buildDefaultCQLFilter } from '../utils/FilterEventUtils';
 import { APPLY_FILTER_WIDGET_INTERACTIONS, applyFilterWidgetInteractions } from '../actions/interactions';
 
@@ -73,16 +74,21 @@ function extractLayerIdFromNodePath(nodePath) {
 // ============================================================================
 
 /**
- * Ensures layerFilter structure exists on a layer object
+ * Ensures layerFilter structure exists on a layer object.
+ * When layerFilter is null/undefined, uses full default (groupFields, filterFields, etc.).
+ * When it exists but is partial, merges with default and normalizes .filters.
  * @param {object} layer - The layer object to ensure structure on
  * @returns {object} The layer with ensured layerFilter structure
  */
 function ensureLayerFilterStructure(layer) {
     if (!layer.layerFilter) {
-        layer.layerFilter = {};
-    }
-    if (!layer.layerFilter.filters) {
-        layer.layerFilter.filters = [];
+        layer.layerFilter = { ...defaultLayerFilter, filters: [] };
+    } else {
+        layer.layerFilter = {
+            ...defaultLayerFilter,
+            ...layer.layerFilter,
+            filters: Array.isArray(layer.layerFilter.filters) ? layer.layerFilter.filters : []
+        };
     }
     return layer;
 }

web/client/utils/FilterUtils.js

@@ -1334,29 +1334,30 @@ export const mergeFiltersToOGC = (opts = {}, ...filters) =>  {
     return filterString;
 };
 
-export const updateLayerLegendFilter = (layerFilterObj, legendFilter) => {
-    const defaultLayerFilter = {
-        groupFields: [
-            {
-                id: 1,
-                logic: 'OR',
-                index: 0
-            }
-        ],
-        filterFields: [],
-        attributePanelExpanded: true,
-        spatialPanelExpanded: true,
-        crossLayerExpanded: true,
-        crossLayerFilter: {
-            attribute: 'the_geom'
-        },
-        spatialField: {
-            method: null,
-            operation: 'INTERSECTS',
-            geometry: null,
-            attribute: 'the_geom'
+export const defaultLayerFilter = {
+    groupFields: [
+        {
+            id: 1,
+            logic: 'OR',
+            index: 0
         }
-    };
+    ],
+    filterFields: [],
+    attributePanelExpanded: true,
+    spatialPanelExpanded: true,
+    crossLayerExpanded: true,
+    crossLayerFilter: {
+        attribute: 'the_geom'
+    },
+    spatialField: {
+        method: null,
+        operation: 'INTERSECTS',
+        geometry: null,
+        attribute: 'the_geom'
+    }
+};
+
+export const updateLayerLegendFilter = (layerFilterObj, legendFilter) => {
     let filterObj = {...defaultLayerFilter, ...layerFilterObj};
     const isLegendFilterExist = filterObj?.filters?.find(f => f.id === INTERACTIVE_LEGEND_ID);
     if (!legendFilter) {
@@ -1410,28 +1411,6 @@ export const updateLayerLegendFilter = (layerFilterObj, legendFilter) => {
  * @return {object} layerFilterObj updated the layer filter object
  */
 export const updateLayerWFSVectorLegendFilter = (layerFilterObj, legendGeostylerFilter) => {
-    const defaultLayerFilter = {
-        groupFields: [
-            {
-                id: 1,
-                logic: 'OR',
-                index: 0
-            }
-        ],
-        filterFields: [],
-        attributePanelExpanded: true,
-        spatialPanelExpanded: true,
-        crossLayerExpanded: true,
-        crossLayerFilter: {
-            attribute: 'the_geom'
-        },
-        spatialField: {
-            method: null,
-            operation: 'INTERSECTS',
-            geometry: null,
-            attribute: 'the_geom'
-        }
-    };
     let filterObj = {...defaultLayerFilter, ...layerFilterObj};
     const isLegendFilterExist = filterObj?.filters?.find(f => f.id === INTERACTIVE_LEGEND_ID);
     if (!legendGeostylerFilter) {