[Backport 2024.02.xx] - #10648: Issue editing multiple fields in MapS…

…tore Attribute Table (#10651) (#10653)

* #10648: Issue editing multiple fields in MapStore Attribute Table (#10651)

* #10648: Issue editing multiple fields in MapStore Attribute Table
Description:
- edit in update wfs-t xml payload in case of multi-edit in each sigle row
- add unit test for 'savePendingFeatureGridChanges'

* #10648: move 'createChangesTransaction' util function from epics/featuregrid to FeatureGridUtils file and a unit test is added for it.

* #10648: handle unit test for 'savePendingFeatureGridChanges'

* #10648: edit jsdoc for util 'createChangesTransaction'

* #10648: fix FE test failure for - Issue editing multiple fields in MapStore Attribute Table (#10654)

* #10648: fix FE tests failure for savePendingFeatureGridChanges

* #10648: remove unit test of  'savePendingFeatureGridChanges'

web/client/epics/featuregrid.js

@@ -11,8 +11,7 @@ import {get, head, isEmpty, find, castArray, includes, reduce} from 'lodash';
 import { LOCATION_CHANGE } from 'connected-react-router';
 import axios from '../libs/ajax';
 import bbox from '@turf/bbox';
-import { fidFilter } from '../utils/ogc/Filter/filter';
-import { getDefaultFeatureProjection, getPagesToLoad, gridUpdateToQueryUpdate, updatePages  } from '../utils/FeatureGridUtils';
+import { createChangesTransaction, getDefaultFeatureProjection, getPagesToLoad, gridUpdateToQueryUpdate, updatePages  } from '../utils/FeatureGridUtils';
 
 import assign from 'object-assign';
 import {
@@ -232,15 +231,6 @@ const addPagination = (filterObj, pagination) => ({
     pagination
 });
 
-const createChangesTransaction = (changes, newFeatures, {insert, update, propertyChange, getPropertyName, transaction})=>
-    transaction(
-        newFeatures.map(f => insert(f)),
-        Object.keys(changes).map( id =>
-            Object.keys(changes[id]).map(name =>
-                update([propertyChange(getPropertyName(name), changes[id][name]), fidFilter("ogc", id)])
-            )
-        )
-    );
 const createDeleteTransaction = (features, {transaction, deleteFeature}) => transaction(
     features.map(deleteFeature)
 );

web/client/utils/FeatureGridUtils.js

@@ -18,6 +18,7 @@ import {
 } from './ogc/WFS/base';
 
 import { applyDefaultToLocalizedString } from '../components/I18N/LocalizedString';
+import { fidFilter } from './ogc/Filter/filter';
 
 const getGeometryName = (describe) => get(findGeometryProperty(describe), "name");
 const getPropertyName = (name, describe) => name === "geometry" ? getGeometryName(describe) : name;
@@ -392,3 +393,17 @@ export const supportsFeatureEditing = (layer) => includes(supportedEditLayerType
  * @returns {boolean} flag
  */
 export const areLayerFeaturesEditable = (layer) =>  !layer?.disableFeaturesEditing && supportsFeatureEditing(layer);
+/**
+ * Create wfs-t xml payload for insert/edit features in featuregrid
+ * @param {object} changes object that contains updates e.g: {LAYER_NAME.id: {"FIELD1": 55, "FIELD2":"edit 02"}}
+ * @param {object[]} newFeatures array of new inserted features
+ * @param {object} wfsutils object of wfs utils that includes insert/update/propertyChange/getPropertyName/transaction
+ * @returns {string} wfs-transaction xml payload
+ */
+export const createChangesTransaction = (changes, newFeatures, {insert, update, propertyChange, getPropertyName: getPropertyNameFunc, transaction})=>
+    transaction(
+        newFeatures.map(f => insert(f)),
+        Object.keys(changes).map( id =>{
+            return update(Object.keys(changes[id]).map(prop => propertyChange(getPropertyNameFunc(prop), changes[id][prop])), fidFilter("ogc", id));
+        })
+    );

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

@@ -16,8 +16,10 @@ import {
     getAttributesNames,
     featureTypeToGridColumns,
     supportsFeatureEditing,
-    areLayerFeaturesEditable
+    areLayerFeaturesEditable,
+    createChangesTransaction
 } from '../FeatureGridUtils';
+import requestBuilder from "../ogc/WFST/RequestBuilder";
 
 
 describe('FeatureGridUtils', () => {
@@ -447,4 +449,57 @@ describe('FeatureGridUtils', () => {
             expect(areLayerFeaturesEditable({type: "wmts"})).toBeFalsy();
         });
     });
+    describe('test featuregrid transactions utils', ()=>{
+        const describeFeatureType = {
+            "elementFormDefault": "qualified",
+            "targetNamespace": "http://localhost:8080/geoserver/mapstore",
+            "targetPrefix": "mapstore",
+            "featureTypes": [
+                {
+                    "typeName": "TEST_LAYER",
+                    "properties": [
+                        {
+                            "name": "Integer",
+                            "maxOccurs": 1,
+                            "minOccurs": 0,
+                            "nillable": true,
+                            "type": "xsd:int",
+                            "localType": "int"
+                        },
+                        {
+                            "name": "Long",
+                            "maxOccurs": 1,
+                            "minOccurs": 0,
+                            "nillable": true,
+                            "type": "xsd:int",
+                            "localType": "int"
+                        },
+                        {
+                            "name": "Point",
+                            "maxOccurs": 1,
+                            "minOccurs": 0,
+                            "nillable": true,
+                            "type": "gml:Point",
+                            "localType": "Point"
+                        }
+                    ]
+                }
+            ]
+
+        };
+        it('test createChangesTransaction for single edit', (done) => {
+            const singleChanges =  {"TEST_LAYER.13": { "Integer": 50}};
+            const transactionPayload = createChangesTransaction(singleChanges, [], requestBuilder(describeFeatureType));
+            const samplePayload = `<wfs:Transaction service="WFS" version="1.1.0" xmlns:wfs="http://www.opengis.net/wfs" xmlns:gml="http://www.opengis.net/gml" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs" xmlns:mapstore="http://localhost:8080/geoserver/mapstore"><wfs:Update typeName="mapstore:TEST_LAYER"><wfs:Property><wfs:Name>Integer</wfs:Name><wfs:Value>50</wfs:Value></wfs:Property><ogc:Filter><ogc:FeatureId fid="TEST_LAYER.13"/></ogc:Filter></wfs:Update></wfs:Transaction>`;
+            expect(transactionPayload).toEqual(samplePayload);
+            done();
+        });
+        it('test createChangesTransaction for multi-edit', (done) => {
+            const multiChanges =  {"TEST_LAYER.13": { "Integer": 50, "Long": 55 }};
+            const transactionPayload = createChangesTransaction(multiChanges, [], requestBuilder(describeFeatureType));
+            const multieditPayload = `<wfs:Transaction service="WFS" version="1.1.0" xmlns:wfs="http://www.opengis.net/wfs" xmlns:gml="http://www.opengis.net/gml" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/wfs" xmlns:mapstore="http://localhost:8080/geoserver/mapstore"><wfs:Update typeName="mapstore:TEST_LAYER"><wfs:Property><wfs:Name>Integer</wfs:Name><wfs:Value>50</wfs:Value></wfs:Property>,<wfs:Property><wfs:Name>Long</wfs:Name><wfs:Value>55</wfs:Value></wfs:Property><ogc:Filter><ogc:FeatureId fid="TEST_LAYER.13"/></ogc:Filter></wfs:Update></wfs:Transaction>`;
+            expect(transactionPayload).toEqual(multieditPayload);
+            done();
+        });
+    });
 });