[FIX] xConfig: Use property-type specific comparison for removal

When removing entries from xConfig properties, filter conditions
require a different comparison than sort/group conditions:

- filterConditions: Multiple conditions can exist for the same key,
  so we compare key AND condition content to find the correct entry
- sortConditions/groupConditions: Key is unique, so key-only
  comparison is sufficient

The previous fix (commit df947a9) used deepEqual on the entire
entry, which broke sort/group reset because the payload index
(restore position) differs from the stored index (original position).

This fix addresses both issues by using targeted comparison logic
based on the property type.

Fixes: #4277
SNOW: DINC0728376
SNOW: DINC0490163
Change-Id: I6b040d5aa8c5f62b55425acb19532a40cd933a0f

Author: DonkeyCo

src/sap.m/src/sap/m/p13n/modules/xConfigAPI.js

@@ -3,8 +3,9 @@
  */
 sap.ui.define([
 	"sap/base/util/merge",
+	"sap/base/util/deepEqual",
 	"sap/ui/core/util/reflection/JsControlTreeModifier"
-], (merge, JsControlTreeModifier) => {
+], (merge, deepEqual, JsControlTreeModifier) => {
 	"use strict";
 
 	/**
@@ -449,6 +450,16 @@ sap.ui.define([
 		const sOperation = oModificationPayload.operation;
 
 		const oItem = oConfig.properties[sAffectedProperty].find((oEntry) => {
+			// DINC0728376 / DINC0490163: Property-type specific comparison
+			// For filterConditions: multiple conditions can exist for the same key,
+			// so we need to compare the condition content to find the correct one.
+			// For sortConditions/groupConditions: key is unique, so key comparison is sufficient.
+			// We cannot use deepEqual on the entire entry because the index in the payload
+			// (restore position) differs from the stored index (original position).
+			if (sAffectedProperty === "filterConditions") {
+				return oEntry.key === oModificationPayload.key &&
+					deepEqual(oEntry.condition, oModificationPayload.value.condition);
+			}
 			return oEntry.key === oModificationPayload.key;
 		});
 

src/sap.m/test/sap/m/qunit/p13n/xConfigAPI.qunit.js

@@ -520,4 +520,134 @@ sap.ui.define([
 		});
 	});
 
+	// DINC0728376: Test that sort conditions can be removed even when payload index differs from stored index
+	// This test verifies that sort removal works correctly - it should pass with key-only comparison
+	// but would fail if we used deepEqual (because index differs)
+	QUnit.test("Check that sort condition is removed correctly when payload index differs from stored index (DINC0728376)", function(assert) {
+		// Step 1: Add a sort condition at index 0
+		const oAddPayload = {
+			key: "sort_field_1",
+			property: "sortConditions",
+			operation: "add",
+			value: {
+				key: "sort_field_1",
+				descending: false,
+				index: 0
+			}
+		};
+
+		return xConfigAPI.enhanceConfig(this.oControl, oAddPayload)
+		.then(() => {
+			const oCustomData = this.oControl.getCustomData()[0];
+			const oConfig = JSON.parse(oCustomData.getValue().replace(/\\/g, ''));
+
+			assert.deepEqual(oConfig, {
+				"properties": {
+					"sortConditions": [
+						{
+							"key": "sort_field_1",
+							"descending": false,
+							"index": 0
+						}
+					]
+				}
+			}, "Sort condition was added correctly");
+
+			// Step 2: Remove the sort condition with a DIFFERENT index in payload
+			// This simulates what happens during revert - the payload index is the "restore to" position,
+			// not the current position in the array
+			const oRemovePayload = {
+				key: "sort_field_1",
+				property: "sortConditions",
+				operation: "remove",
+				value: {
+					key: "sort_field_1",
+					descending: false,
+					index: 5  // Different index than stored (0) - this is the revert scenario
+				}
+			};
+
+			return xConfigAPI.enhanceConfig(this.oControl, oRemovePayload);
+		})
+		.then(() => {
+			const oCustomData = this.oControl.getCustomData()[0];
+			const oConfig = JSON.parse(oCustomData.getValue().replace(/\\/g, ''));
+
+			// The sort condition should be removed, leaving an empty array
+			assert.deepEqual(oConfig, {
+				"properties": {
+					"sortConditions": []
+				}
+			}, "Sort condition was removed correctly even though payload index differed from stored index");
+		});
+	});
+
+	// DINC0728376: Test that the correct filter condition is removed when multiple exist for same key
+	QUnit.test("Check that correct filter condition is removed when multiple conditions exist for same key (DINC0490163)", function(assert) {
+		// Step 1: Add first filter condition
+		const oAddPayload1 = {
+			key: "filter_field",
+			property: "filterConditions",
+			operation: "add",
+			value: {
+				key: "filter_field",
+				condition: {
+					operator: "EQ",
+					values: ["Maria"]
+				}
+			}
+		};
+
+		return xConfigAPI.enhanceConfig(this.oControl, oAddPayload1)
+		.then(() => {
+			// Step 2: Add second filter condition for same key
+			const oAddPayload2 = {
+				key: "filter_field",
+				property: "filterConditions",
+				operation: "add",
+				value: {
+					key: "filter_field",
+					condition: {
+						operator: "EQ",
+						values: ["John"]
+					}
+				}
+			};
+			return xConfigAPI.enhanceConfig(this.oControl, oAddPayload2);
+		})
+		.then(() => {
+			const oCustomData = this.oControl.getCustomData()[0];
+			const oConfig = JSON.parse(oCustomData.getValue().replace(/\\/g, ''));
+
+			assert.equal(oConfig.properties.filterConditions.length, 2, "Two filter conditions exist");
+
+			// Step 3: Remove the "Maria" condition specifically
+			const oRemovePayload = {
+				key: "filter_field",
+				property: "filterConditions",
+				operation: "remove",
+				value: {
+					key: "filter_field",
+					condition: {
+						operator: "EQ",
+						values: ["Maria"]
+					}
+				}
+			};
+
+			return xConfigAPI.enhanceConfig(this.oControl, oRemovePayload);
+		})
+		.then(() => {
+			const oCustomData = this.oControl.getCustomData()[0];
+			const oConfig = JSON.parse(oCustomData.getValue().replace(/\\/g, ''));
+
+			// Only "John" should remain
+			assert.equal(oConfig.properties.filterConditions.length, 1, "One filter condition remains");
+			assert.deepEqual(oConfig.properties.filterConditions[0].condition, {
+				operator: "EQ",
+				values: ["John"]
+			}, "The correct filter condition (John) remains - Maria was removed");
+		});
+	});
+
 });