@sapui5/sap.fe.macros 1.142.0 → 1.142.2

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

@@ -34,6 +34,7 @@ import type FilterBarBase from "sap/ui/mdc/filterbar/FilterBarBase";
 import TypeMap from "sap/ui/mdc/odata/v4/TypeMap";
 import StateUtil from "sap/ui/mdc/p13n/StateUtil";
 import type MDCPopover from "sap/ui/mdc/valuehelp/Popover";
+import RequestShowContainerDefault from "sap/ui/mdc/valuehelp/RequestShowContainerDefault";
 import type Container from "sap/ui/mdc/valuehelp/base/Container";
 import type Content from "sap/ui/mdc/valuehelp/base/Content";
 import type FilterableListContent from "sap/ui/mdc/valuehelp/base/FilterableListContent";
@@ -786,7 +787,9 @@ This cannot happen in case of action parameter dialog, which can be identified b
 				const condition = this._createInitialFilterCondition(values[i], inParameter.initialValueIsSignificant);
 
 				if (condition) {
-					inConditions[inParameter.helpPath] = [condition];
+					// Use conditionPath if available, otherwise fallback to helpPath for backward compatibility
+					const conditionKey = inParameter.conditionPath || inParameter.helpPath;
+					inConditions[conditionKey] = [condition];
 				}
 			}
 		}
@@ -830,7 +833,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 ;) )
@@ -858,7 +861,9 @@ This cannot happen in case of action parameter dialog, which can be identified b
 
 			const conditions = this._getConditionsFromInParameter(sourceField as string, state);
 			if (conditions) {
-				inConditions[inParameter.helpPath] = conditions;
+				// Use conditionPath if available, otherwise fallback to helpPath for backward compatibility
+				const conditionKey = inParameter.conditionPath || inParameter.helpPath;
+				inConditions[conditionKey] = conditions;
 			}
 		}
 		return inConditions;
@@ -941,7 +946,9 @@ This cannot happen in case of action parameter dialog, which can be identified b
 				isObjectPage ? inParameter.initialValueIsSignificant : false // no filter with "empty" on ListReport
 			);
 			if (condition) {
-				inConditions[inParameter.helpPath] = [condition];
+				// Use conditionPath if available, otherwise fallback to helpPath for backward compatibility
+				const conditionKey = inParameter.conditionPath || inParameter.helpPath;
+				inConditions[conditionKey] = [condition];
 			}
 		}
 
@@ -1183,16 +1190,26 @@ This cannot happen in case of action parameter dialog, which can be identified b
 		);
 
 		let recentValuesContextData: FieldDataType[] = [];
-		if (!payload.isValueListWithFixedValues) {
-			// no history for values lists with fixed values (they are usually short)
-			recentValuesContextData = await this._getHistoryData(payload, field);
-			recentValuesContextData = additionalValueHelper.getRelevantRecentValuesContextData(
-				othersValuesContextData,
-				recentValuesContextData,
-				valueHelpKeys,
-				(bindingInfo.parameters as BindingInfoParameters).$search?.replaceAll('"', ""),
-				bindingInfo
-			);
+		try {
+			if (!payload.isValueListWithFixedValues) {
+				// no history for values lists with fixed values (they are usually short)
+				recentValuesContextData = await this._getHistoryData(payload, field);
+				recentValuesContextData = additionalValueHelper.getRelevantRecentValuesContextData(
+					othersValuesContextData,
+					recentValuesContextData,
+					valueHelpKeys,
+					(bindingInfo.parameters as BindingInfoParameters).$search?.replaceAll('"', ""),
+					bindingInfo
+				);
+			}
+		} catch (error) {
+			// For recently used values we use a UI5 json model.
+			// We take the OData filter and apply it to the JSON model.
+			// This works in most cases but not in a 1:n scenario where OData uses a Lambda Syntax.
+			// To support this we would have to implement a converter which converters the Lambda filters into simple Javascript filters which can work on the JSON model.
+			// As this is a corner case hence we just log the error and continue without recently used values.
+			recentValuesContextData = [];
+			Log.warning("Could not determine recently used values");
 		}
 
 		othersValuesContextData = additionalValueHelper.getRelevantOthersValuesContextData(
@@ -1394,6 +1411,8 @@ This cannot happen in case of action parameter dialog, which can be identified b
 			return this.conditionForRequestShowContainer(valueHelp, container);
 		} else if ([RequestShowContainerReason.Typing, RequestShowContainerReason.Filter].includes(requestShowContainerReason)) {
 			return this.typeAheadForFilterableContent(valueHelp, container);
+		} else if ([RequestShowContainerReason.Navigate].includes(requestShowContainerReason)) {
+			return RequestShowContainerDefault.Navigate(valueHelp, container);
 		}
 		return RequestShowContainerReason.ValueHelpRequest === requestShowContainerReason;
 	}