Counter widget sends double requests, the first one has viewport as undefined #10674

web/client/components/widgets/enhancers/wpsCounter.js

@@ -21,6 +21,7 @@ const sameOptions = (o1 = {}, o2 = {}) =>
     && o1.aggregationAttribute === o2.aggregationAttribute
     && o1.viewParams === o2.viewParams;
 import { getWpsUrl } from '../../../utils/LayersUtils';
+import { validXMLFilter } from '../../../utils/XMLUtils';
 
 /**
  * Stream of props -> props to retrieve data from WPS aggregate process on params changes.
@@ -30,7 +31,7 @@ import { getWpsUrl } from '../../../utils/LayersUtils';
  */
 const dataStreamFactory = ($props) =>
     $props
-        .filter(({layer = {}, options}) => layer.name && getWpsUrl(layer) && options && options.aggregateFunction && options.aggregationAttribute)
+        .filter(({layer = {}, options, filter}) => layer.name && getWpsUrl(layer) && options && options.aggregateFunction && options.aggregationAttribute && validXMLFilter(filter))
         .distinctUntilChanged(
             ({layer = {}, options = {}, filter}, newProps) =>
                 (newProps.layer && layer.name === newProps.layer.name && layer.loadingError === newProps.layer.loadingError)

web/client/utils/XMLUtils.js

@@ -166,3 +166,33 @@ export const objectToAttributes = (obj = {}, xmlns) => keys(obj).filter(key => o
 }));
 
 export const assignNamespace = (nodes, xmlns) => nodes.filter(node => !!node).map(node => ({...node, xmlns}));
+
+
+/**
+ * Checks if any <ogc:And> element in the XML string contains the text "undefined".
+ *
+ * @param {string} xmlString - The XML string to check.
+ * @returns {boolean} - Returns `false` if any <ogc:And> contains "undefined", otherwise `true`.
+ *
+ * @example
+ * validFilter('<ogc:Filter><ogc:And>undefined</ogc:And></ogc:Filter>'); // false
+ * validFilter('<ogc:Filter><ogc:And>valid</ogc:And></ogc:Filter>');    // true
+ */
+export function validXMLFilter(xmlString) {
+    const parser = new DOMParser();
+    const xmlDoc = parser.parseFromString(xmlString, "application/xml");
+
+    // Find all <ogc:And> elements (you can have multiple <ogc:And> elements)
+    const andElements = xmlDoc.getElementsByTagName("ogc:And");
+
+    // Iterate through the <ogc:And> elements and check for "undefined"
+    for (let i = 0; i < andElements.length; i++) {
+        const andElement = andElements[i];
+
+        // If we find an <ogc:And> element with text "undefined", return false
+        if (andElement.textContent === "undefined") {
+            return false;
+        }
+    }
+    return true;
+}

web/client/utils/__tests__/XMLUtils-test.js

@@ -14,7 +14,8 @@ import {
     escapeText,
     escapeAttributeValue,
     removeEmptyNodes,
-    writeXML
+    writeXML,
+    validXMLFilter
 } from '../XMLUtils';
 
 const namespaces = {
@@ -155,4 +156,11 @@ describe('XMLUtils tests', () => {
 </Root>`;
         expect(writeXML(removeEmptyNodes(tree), values(namespaces))).toBe(xml);
     });
+
+    it('Check valid XML filter', () => {
+        const xmlFilter = '<ogc:Filter><ogc:And>filters</ogc:And></ogc:Filter>';
+        expect(validXMLFilter(xmlFilter)).toBe(true);
+        const invalidXMLFilter = '<ogc:Filter><ogc:And>undefined</ogc:And></ogc:Filter>';
+        expect(validXMLFilter(invalidXMLFilter)).toBe(false);
+    });
 });