@sapui5/sap.fe.macros 1.142.0 → 1.143.0

package/src/sap/fe/macros/valuehelp/ValueHelpDelegate.ts

@@ -436,12 +436,22 @@ export default Object.assign({}, ValueHelpDelegate, {
 					metaModel,
 					filterBarProperties
 				);
-				if (filterBarProperty && stateItems?.find((item) => item.name === filterBarProperty.name)) {
+				if (
+					filterBarProperty &&
+					stateItems?.find(
+						(item) =>
+							item.name === filterBarProperty.name &&
+							(filterBarProperty.maxConditions === undefined || filterBarProperty.maxConditions === 1)
+					)
+				) {
+					// if the target field is  single-value field, reset the existing conditions
+					// maxConditions is ensured to be 1 for single-value field
+					// maxConditions = -1 means multiple values allowed
 					/* Reset the conditions before create new conditions otherwise it gets not updated */
 					const conditionPath = filterBarProperty.conditionPath as string;
-					state.filter[conditionPath]?.forEach((condition) => {
-						condition.filtered = false;
-					});
+					if (state.filter[conditionPath]?.[0]) {
+						state.filter[conditionPath][0].filtered = false;
+					}
 				}
 			}
 			// Propagate OUT parameter for each conditions
@@ -468,11 +478,11 @@ export default Object.assign({}, ValueHelpDelegate, {
 							const conditionPath = filterBarProperty.conditionPath as string;
 							const conditionAlreadyExists = state.filter[conditionPath]?.find((testCondition) => {
 								delete testCondition.filtered;
-								if (this.checkConditionsEqual(testCondition, newCondition)) {
+								const { filtered: _filtered, ...conditionToCompare } = testCondition;
+								if (this.checkConditionsEqual(conditionToCompare, newCondition)) {
+									testCondition.filtered = true;
 									return true;
 								}
-								// reset filtered to false
-								testCondition.filtered = false;
 								return false;
 							});
 							if (!conditionAlreadyExists) {
@@ -830,7 +840,7 @@ This cannot happen in case of action parameter dialog, which can be identified b
 			// last part of localData is a property name, thus it cannot match. Otherwise matchCount could be -1 if everything matches
 			// (if we want to additionally secure against this situation, the most appropriate would be to set matchCount = localDataParts.length – 1)
 			return relativePathParts
-				.slice(0, -matchCount) // remove all matched parts (from the end)
+				.slice(0, -matchCount ? -matchCount : undefined) // remove all matched parts (from the end)
 				.map((part) => part.part)
 				.concat(localDataParts.slice(matchCount)) // remove the matched parts from localData (from the beginning)
 				.join("/"); // transfer back to string (but only once at the end ;) )
@@ -1040,8 +1050,13 @@ This cannot happen in case of action parameter dialog, which can be identified b
 				return context?.getObject(keyPath) === value;
 			} else {
 				const contextKeys = Object.keys(context.getObject());
+				const conditionSelectedRowKeys = Object.keys(conditionSelectedRow);
 				return vhKeys.every(function (vhKey) {
-					return !contextKeys.includes(vhKey) || context?.getObject(vhKey) === conditionSelectedRow[vhKey];
+					return (
+						!contextKeys.includes(vhKey) ||
+						!conditionSelectedRowKeys.includes(vhKey) ||
+						context?.getObject(vhKey) === conditionSelectedRow[vhKey]
+					);
 				});
 			}
 		};