Fix the widget support for the WFS layer with no geom (#11379) (#11380)

subashtiwari1010 · web-flow · commit ad358ff06df2 · 2025-08-08T16:47:14.000+02:00
diff --git a/web/client/components/widgets/enhancers/__tests__/dependenciesToFilter-test.jsx b/web/client/components/widgets/enhancers/__tests__/dependenciesToFilter-test.jsx
@@ -28,7 +28,8 @@ import {
     resultQuickFiltersAndDependenciesQF,
     resultQuickFiltersAndDependenciesFilter,
     resultSpatialAndQuickFilters,
-    resultLayerFilter
+    resultLayerFilter,
+    resultFilterForEmptyGeom
 } from '../../../../test-resources/widgets/dependenciesToFiltersData';
 
 describe('widgets dependenciesToFilter enhancer', () => {
@@ -256,4 +257,25 @@ describe('widgets dependenciesToFilter enhancer', () => {
             }}  />, document.getElementById("container"));
 
     });
+
+    it('dependenciesToFilter with empty geomProp', (done) => {
+        const Sink = dependenciesToFilter(createSink(props => {
+            expect(props).toExist();
+            expect(props.filter).toBe(resultFilterForEmptyGeom);
+            done();
+        }));
+        ReactDOM.render(<Sink
+            mapSync
+            layer={{
+                name: "test",
+                id: "test"
+            }}
+            dependencies={{
+                layers: [{id: "test", params: {
+                    cql_filter: "prop = 'value'"
+                }}],
+                viewport: { "bounds": { "minx": "-1", "miny": "-1", "maxx": "1", "maxy": "1" }, "crs": "EPSG:4326", "rotation": 0 }
+            }} filter={inputFilterObjSpatial} />, document.getElementById("container"));
+
+    });
 });
diff --git a/web/client/components/widgets/enhancers/dependenciesToFilter.js b/web/client/components/widgets/enhancers/dependenciesToFilter.js
@@ -37,7 +37,7 @@ const shouldMapOrKeys = ({ mapSync, geomProp, dependencies = {}, layer, quickFil
         || getLayerFilter(layer) !== getLayerFilter(nextProps.layer);
 };
 
-const createFilterProps = ({ mapSync, geomProp = "the_geom", dependencies = {}, filter: filterObj, layer, quickFilters, options } = {}) => {
+const createFilterProps = ({ mapSync, geomProp, dependencies = {}, filter: filterObj, layer, quickFilters, options } = {}) => {
     const viewport = dependencies.viewport;
     const fb = filterBuilder({ gmlVersion: "3.1.1" });
     const toFilter = fromObject(fb);
@@ -80,7 +80,7 @@ const createFilterProps = ({ mapSync, geomProp = "the_geom", dependencies = {},
                 ...cqlFilterRules,
                 ...(layerFilter  && !layerFilter.disabled ? toOGCFilterParts(layerFilter, "1.1.0", "ogc") : []),
                 ...(newFilterObj ? toOGCFilterParts(newFilterObj, "1.1.0", "ogc") : []),
-                property(geomProp).intersects(geom)))
+                ...(geomProp ? [property(geomProp).intersects(geom)] : [])))
         };
     }
     // this will contain only an ogc filter based on current and other filters (cql excluded)
diff --git a/web/client/test-resources/widgets/dependenciesToFiltersData.js b/web/client/test-resources/widgets/dependenciesToFiltersData.js
@@ -199,4 +199,5 @@ export const resultSpatialFilterMultiple =
     + "</ogc:Intersects>"
     + "</ogc:Or></ogc:And></ogc:Filter>";
 
-export const resultLayerFilter = `<ogc:Filter><ogc:And><ogc:Or><ogc:PropertyIsEqualTo><ogc:PropertyName>STATE_NAME</ogc:PropertyName><ogc:Literal>Arizona</ogc:Literal></ogc:PropertyIsEqualTo></ogc:Or></ogc:And></ogc:Filter>`;
+export const resultLayerFilter = `<ogc:Filter><ogc:And><ogc:Or><ogc:PropertyIsEqualTo><ogc:PropertyName>STATE_NAME</ogc:PropertyName><ogc:Literal>Arizona</ogc:Literal></ogc:PropertyIsEqualTo></ogc:Or></ogc:And></ogc:Filter>`;
+export const resultFilterForEmptyGeom = `<ogc:Filter><ogc:And><ogc:PropertyIsEqualTo><ogc:PropertyName>prop</ogc:PropertyName><ogc:Literal>value</ogc:Literal></ogc:PropertyIsEqualTo><ogc:Intersects><ogc:PropertyName>geometry</ogc:PropertyName><gml:Polygon srsName="EPSG:4326"><gml:exterior><gml:LinearRing><gml:posList>1 1 1 2 2 2 2 1 1 1</gml:posList></gml:LinearRing></gml:exterior></gml:Polygon></ogc:Intersects></ogc:And></ogc:Filter>`
