@sapui5/sap.fe.macros 1.142.1 → 1.142.2

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

@@ -1,4 +1,4 @@
-import type { ConvertedMetadata,Property } from "@sap-ux/vocabularies-types";
+import type { ConvertedMetadata, Property } from "@sap-ux/vocabularies-types";
 import Log from "sap/base/Log";
 import ObjectPath from "sap/base/util/ObjectPath";
 import CommonUtils from "sap/fe/core/CommonUtils";
@@ -6,10 +6,10 @@ import { Activity } from "sap/fe/core/controllerextensions/collaboration/Collabo
 import { convertTypes } from "sap/fe/core/converters/MetaModelConverter";
 import type { PropertyInfo } from "sap/fe/core/converters/controls/ListReport/FilterBar";
 import { isPathAnnotationExpression } from "sap/fe/core/helpers/TypeGuards";
-import type { FieldDataType,ValueHelpHistoryService } from "sap/fe/core/services/ValueHelpHistoryServiceFactory";
+import type { FieldDataType, ValueHelpHistoryService } from "sap/fe/core/services/ValueHelpHistoryServiceFactory";
 import type { IFilterControl } from "sap/fe/macros/filter/FilterUtils";
 import FilterUtils from "sap/fe/macros/filter/FilterUtils";
-import type { InOutParameter,SorterType,ValueHelpPayload } from "sap/fe/macros/internal/valuehelp/ValueListHelper";
+import type { InOutParameter, SorterType, ValueHelpPayload } from "sap/fe/macros/internal/valuehelp/ValueListHelper";
 import ValueListHelper from "sap/fe/macros/internal/valuehelp/ValueListHelper";
 import type Dialog from "sap/m/Dialog";
 import type Table from "sap/m/Table";
@@ -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";
@@ -48,7 +49,6 @@ import type ODataModel from "sap/ui/model/odata/v4/ODataModel";
 import type { Value } from "../field/FieldBaseDelegate";
 import type { AdditionalValueType, BindingInfoParameters } from "../internal/valuehelp/AdditionalValueHelper";
 import { AdditionalValueGroupKey, additionalValueHelper } from "../internal/valuehelp/AdditionalValueHelper";
-import RequestShowContainerDefault from "sap/ui/mdc/valuehelp/RequestShowContainerDefault"
 
 const FeCoreControlsFilterBar = "sap.fe.macros.controls.FilterBar";
 const AnnotationIsDigitSequence = "@com.sap.vocabularies.Common.v1.IsDigitSequence";
@@ -787,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];
 				}
 			}
 		}
@@ -859,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;
@@ -942,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];
 			}
 		}
 
@@ -1184,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(