@sapui5/sap.suite.ui.generic.template 1.138.0 → 1.139.0

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/Actions.fragment.xml

@@ -1,4 +1,4 @@
-<core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:uxap="sap.uxap"
+<core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:uxap="sap.uxap" xmlns:dt="sap.ui.dt"
 	xmlns:fesr="http://schemas.sap.com/sapui5/extension/sap.ui.core.FESR/1"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
 	template:require="{
@@ -130,6 +130,7 @@
 		ariaHasPopup="Dialog"
 		fesr:press="fe:sum:summarize"
 		type="Ghost"
+		dt:designtime="not-adaptable"
 		visible="{_templPrivGlobal>/generic/fioriAI/isSummarizationEnabled}" />
 
 	<template:if test="{parameter>/settings/showRelatedApps}">

package/src/sap/suite/ui/generic/template/QuickCreate/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.138.0"
+			"version": "1.139.0"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickView/manifest.json

@@ -6,7 +6,7 @@
 	"type": "component",
 	"i18n": "i18n/i18n.properties",
 	"applicationVersion": {
-		"version": "1.138.0"
+		"version": "1.139.0"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/genericUtilities/controlHelper.js

@@ -44,8 +44,10 @@ sap.ui.define([
 			oCurrentFocus = getControlWithFocus();
 			var oTest = oCurrentFocus;
 			var bIsTargetSmartField = oControlHelper.isSmartField(oControl);
-			while (bIsTargetSmartField && oTest && oTest !== oControl && !oControlHelper.isSmartField(oTest)){
-				oTest = oTest.getParent();
+			if (bIsTargetSmartField) {
+				while (oTest && oTest !== oControl && !oControlHelper.isSmartField(oTest)) {
+					oTest = oTest.getParent();
+				}
 			}
 			if (oTest !== oControl){
 				oLogger.warning(oCurrentFocus ? ("Focus is now on control with id " + oCurrentFocus.getId()) : "There is no focus now");

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartTableChartCommon.js

@@ -54,7 +54,10 @@ sap.ui.define([
                     // don't create UiState (managed object) from scratch, but fetch it from control and only apply known properties from state - thus, if any other properties would be added, we don't
                     // interfere with them
                     var oUiState = oControl.getUiState();
-                    if (!oUiState.getProperty("variantName")){
+                    if (
+                        oUiState.getProperty("variantName") === "" || 
+                        oControl.getVariantManagement().getModified() && oControl.getVariantManagement().getStandardVariantKey() === oUiState.getProperty("variantName")
+                    ){
                         oUiState.setPresentationVariant(oState.oUiState.oPresentationVariant);
                         oUiState.setSelectionVariant(oState.oUiState.oSelectionVariant);
                         oUiState.setTableSettings(oState.oUiState.oTableSettings);

package/src/sap/suite/ui/generic/template/js/AnnotationHelper.js

@@ -478,9 +478,9 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			var oModel = oInterface.getInterface(1).getModel();
 			// p13nData for Semantically Connected Columns
 			var sLeadingPropertyForSCColumn = "";
-			var aNavigationPropertiesForSCColumn = [];
-			var aAdditionalPropertiesForSCColumn = [];
-			var aAdditionalSortPropertiesForSCColumn = [];
+			var oNavigationPropertiesSet = new Set();
+			var oAdditionalPropertiesSet = new Set();
+			var oAdditionalSortPropertiesSet = new Set();
 			var sActionButton = "false";
 			oConnectedDataFields = oConnectedDataFields && oConnectedDataFields.Data;
 			for (var i = 0; i < oConnectedDataFields.length; i++) {
@@ -533,16 +533,26 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 				if (!sLeadingPropertyForSCColumn && oP13N.leadingProperty) {
 					sLeadingPropertyForSCColumn = oP13N.leadingProperty;
 				} else {
-					oP13N.leadingProperty && (aAdditionalPropertiesForSCColumn.indexOf(oP13N.leadingProperty) === -1) ? aAdditionalPropertiesForSCColumn.push(oP13N.leadingProperty) : Function.prototype;
-					oP13N.leadingProperty && (aAdditionalSortPropertiesForSCColumn.indexOf(oP13N.leadingProperty) === -1) ? aAdditionalSortPropertiesForSCColumn.push(oP13N.leadingProperty) : Function.prototype;
+					if (oP13N.leadingProperty) {
+						oAdditionalPropertiesSet.add(oP13N.leadingProperty);
+						oAdditionalSortPropertiesSet.add(oP13N.leadingProperty);
+					}
 				}
 
-				oP13N.navigationProperty && (aNavigationPropertiesForSCColumn.indexOf(oP13N.navigationProperty) === -1) ? aNavigationPropertiesForSCColumn.push(oP13N.navigationProperty) : Function.prototype;
+				if (oP13N.navigationProperty) {
+					oNavigationPropertiesSet.add(oP13N.navigationProperty);
+				}
 				// Add "additionalProperty" of current data field to the "additionalProperty" of current column's p13n
-				oP13N.additionalProperty && (aAdditionalPropertiesForSCColumn.indexOf(oP13N.additionalProperty) === -1) ? aAdditionalPropertiesForSCColumn.push(oP13N.additionalProperty) : Function.prototype;
+				if (oP13N.additionalProperty) {
+					oAdditionalPropertiesSet.add(oP13N.additionalProperty);
+				}
 				// Add "description" & "unit" of current data field to the "additionalSortProperty" of current column's p13n
-				oP13N.description && (!aAdditionalSortPropertiesForSCColumn.includes(oP13N.description)) ? aAdditionalSortPropertiesForSCColumn.push(oP13N.description) : Function.prototype;
-				oP13N.unit && (!aAdditionalSortPropertiesForSCColumn.includes(oP13N.unit)) ? aAdditionalSortPropertiesForSCColumn.push(oP13N.unit) : Function.prototype;
+				if (oP13N.description) {
+					oAdditionalSortPropertiesSet.add(oP13N.description);
+				}
+				if (oP13N.unit) {
+					oAdditionalSortPropertiesSet.add(oP13N.unit);
+				}
 				if (sActionButton === "false") {
 					sActionButton = oP13N.actionButton;
 				}
@@ -565,14 +575,14 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 				sP13N += '", "sortProperty":"' + sLeadingPropertyForSCColumn;
 			}
 
-			if (aNavigationPropertiesForSCColumn.length > 0) {
-				sP13N += '", "navigationProperty":"' + aNavigationPropertiesForSCColumn.join();
+			if (oNavigationPropertiesSet.size > 0) {
+				sP13N += '", "navigationProperty":"' + Array.from(oNavigationPropertiesSet).join();
 			}
-			if (aAdditionalPropertiesForSCColumn.length > 0) {
-				sP13N += '", "additionalProperty":"' + aAdditionalPropertiesForSCColumn.join();
+			if (oAdditionalPropertiesSet.size > 0) {
+				sP13N += '", "additionalProperty":"' + Array.from(oAdditionalPropertiesSet).join();
 			}
-			if (aAdditionalSortPropertiesForSCColumn.length > 0) {
-				sP13N += '", "additionalSortProperty":"' + aAdditionalSortPropertiesForSCColumn.join();
+			if (oAdditionalSortPropertiesSet.size > 0) {
+				sP13N += '", "additionalSortProperty":"' + Array.from(oAdditionalSortPropertiesSet).join();
 			}
 
 			sP13N += '", "actionButton":"' + sActionButton + '"';

package/src/sap/suite/ui/generic/template/lib/AdaptiveCardHelper.js

@@ -511,7 +511,7 @@ sap.ui.define([
 						}
 					}
 				],
-				"$schema": "http://adaptivecards.io/schemas/adaptive-card.json"
+				"$schema": "https://adaptivecards.io/schemas/adaptive-card.json"
 			}
 		};
 
@@ -574,7 +574,7 @@ sap.ui.define([
 					]
 				}
 			],
-			"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
+			"$schema": "https://adaptivecards.io/schemas/adaptive-card.json",
 			"version": "1.4"
 		};
 

package/src/sap/suite/ui/generic/template/lib/AppComponent.js

@@ -944,7 +944,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.138.0
+	 * @version 1.139.0
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {

package/src/sap/suite/ui/generic/template/lib/Application.js

@@ -856,7 +856,7 @@ sap.ui.define(["sap/ui/base/Object",
 						oLogger.info("Show message toast");
 						MessageToast.show.apply(MessageToast, myArguments);
 					};
-					Promise.all([getOperationEndedPromise(true), oTemplateContract.oBusyHelper.getUnbusy()]).then(fnMessageToast);
+					Promise.all([getOperationEndedPromise(), oTemplateContract.oBusyHelper.getUnbusy()]).then(fnMessageToast);
 				},
 				showMessageBox: function() {
 					var myArguments = arguments;
@@ -864,7 +864,7 @@ sap.ui.define(["sap/ui/base/Object",
 						oLogger.info("Show message box");
 						MessageBox.show.apply(MessageBox, myArguments);
 					};
-					Promise.all([getOperationEndedPromise(true), oTemplateContract.oBusyHelper.getUnbusy()]).then(fnMessageBox);
+					Promise.all([getOperationEndedPromise(), oTemplateContract.oBusyHelper.getUnbusy()]).then(fnMessageBox);
 				},
 				registerStateChanger: fnRegisterStateChanger,
 				createDraftSiblingPromise: oContextBookkeeping.createDraftSiblingPromise,

package/src/sap/suite/ui/generic/template/lib/CRUDManager.js

@@ -400,7 +400,7 @@ sap.ui.define(["sap/ui/base/Object",
 							oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oSettings.smartTable).refresh("Changes");
 						}
 						var fnHandleResponse = function(aDeleteResults){
-							var oParsedDeleteResult = fnParseResponse(aPath, aDeleteResults, bWithWarningDialog, oSettings.onlyOneDraftPlusActive);
+							var oParsedDeleteResult = fnParseResponse(aPath, aDeleteResults, bWithWarningDialog);
 							mFailed = extend(mFailed, oParsedDeleteResult.mFailed);
 							mSuccess = extend(mSuccess, oParsedDeleteResult.mSuccess);
 							mWarning = oParsedDeleteResult.mWarning;

package/src/sap/suite/ui/generic/template/lib/CommonEventHandlers.js

@@ -28,7 +28,8 @@ sap.ui.define(["sap/ui/base/Object",
 	"sap/ui/core/CustomData",
 	"sap/m/VBox",
 	"sap/suite/ui/generic/template/genericUtilities/utils",
-	"sap/ui/core/Element"
+	"sap/ui/core/Element",
+	"sap/ui/generic/app/util/ModelUtil"
 ], function(
 	BaseObject,
 	Event,
@@ -60,7 +61,8 @@ sap.ui.define(["sap/ui/base/Object",
 	CustomData,
 	VBox,
 	genericUtils,
-	Element
+	Element,
+	ModelUtil
 ) {
 	"use strict";
 
@@ -1094,7 +1096,11 @@ sap.ui.define(["sap/ui/base/Object",
 					// and text, using the formatutil and the textarrangement, title should
 					// be passed on the smartlink
 					if (oControl.getFieldName) {
-						var oEntityType = oMetaModel.getODataEntityType(oEntitySet.entityType);
+						// The value "sEntitySet" holds the entity set of an object page or a table.
+						//
+						// Sometimes, the SmartLink is located on a field group which belongs to the child entity set of object page.
+						// So, we have to always derive the entity type from the smart link's binding context.
+						var oEntityType = ModelUtil.getEntityTypeFromContext(oControl.getBindingContext());
 						var oField = oEntityType.property.find(function (oProperty) { return oProperty.name === sSourceClickedField; });
 						var sTextArrangement = "descriptionAndId";
 						if (oField) { // TODO: Need to provide the correct field Object using the entityType and corresponding association (should be handled by a BLI)
@@ -1103,7 +1109,7 @@ sap.ui.define(["sap/ui/base/Object",
 						var vValue = oControl.getBinding("text").getValue();	// could be array or string
 						if (Array.isArray(vValue)){
 							var oTexts = FormatUtil.getTextsFromDisplayBehaviour(sTextArrangement, vValue[0], vValue[1]);
-							if (oMainNavigation) {
+							if (!oField["sap:unit"] && oMainNavigation) {
 								oMainNavigation.setDescription(oTexts.secondText);
 							}
 							sTitle = oTexts.firstText;
@@ -1662,7 +1668,7 @@ sap.ui.define(["sap/ui/base/Object",
 				var sTableEntitySet = oTable.getEntitySet();
 				oCommonUtils.setExternalChevronRefreshBehaviour(sTableEntitySet);
 
-				fnNavigateIntentManifest(oEventSource, oBindingContext, oState.oSmartFilterbar, Object.create(null), true);
+				fnNavigateIntentManifest(oEventSource, oBindingContext, oState.oSmartFilterbar, true);
 				return;
 			}
 
@@ -2346,7 +2352,7 @@ sap.ui.define(["sap/ui/base/Object",
 			if (oEventSource.data("CrossNavigation")) {
 				oServices.oViewDependencyHelper.setMeToDirty(oComponent, sEntitySet, true);
 
-				fnNavigateIntentManifest(oEventSource, oEventSource.getBindingContext(), oSmartFilterBar, Object.create(null), true);
+				fnNavigateIntentManifest(oEventSource, oEventSource.getBindingContext(), oSmartFilterBar, true);
 				return Promise.resolve();
 			}
 			var oNonDraftCreatePromise = oComponentUtils.getNonDraftCreatePromise(sEntitySet, oPredefinedValues);
@@ -2562,12 +2568,10 @@ sap.ui.define(["sap/ui/base/Object",
 			var  sPath = oContext.getPath();
 			var  oContactData = oModel.getContext(sPath);
 			var oContactAnnotation = JSON.parse(oSourceControl.data("contactDetails"));
-			var sEmail;
-			if (oContactAnnotation.email[0].address && oContactAnnotation.email[0].address.Path) {
-				sEmail = oContactData.getProperty(oContactAnnotation.email[0].address.Path);
-			} else {
-				sEmail = (oContactAnnotation.email[0].address && oContactAnnotation.email[0].address.String);
-			}
+			var emailObj = oContactAnnotation?.email?.[0]?.address;
+			var sEmail = emailObj?.Path
+				? oContactData.getProperty(emailObj.Path)
+				: emailObj?.String;
 
 
 			fnFetchContactStatus(sEmail).then(function (oContactStatus) {

package/src/sap/suite/ui/generic/template/lib/CommonUtils.js

@@ -1354,8 +1354,7 @@ sap.ui.define(["sap/ui/base/Object",
 						return fnExecute2();
 					});
 				} else {
-					oRet = (mParameters.dataloss.popup ? fnProcessDataLossOrDraftDiscardConfirmation(fnExecute2, fnReject,
-					null, (mParameters.dataloss.navigation ? "LeavePage" : "Proceed"), true) : fnExecute2());
+					oRet = (mParameters.dataloss.popup ? fnProcessDataLossOrDraftDiscardConfirmation(fnExecute2, fnReject, (mParameters.dataloss.navigation ? "LeavePage" : "Proceed"), true) : fnExecute2());
 				}
 
 				if (oRet instanceof Promise) {

package/src/sap/suite/ui/generic/template/lib/ContactCardDetailHelper.js

@@ -34,7 +34,7 @@ sap.ui.define([
         var renderContactDetailsFragment = function() {
             oCommonUtils.getDialogFragmentAsync("sap.suite.ui.generic.template.fragments.ContactDetails", {
                 formatUri: function (sValue) {
-                    var mailregex = /^\w+[\w-+\.]*\@\w+([-\.]\w+)*\.[a-zA-Z]{2,}$/;
+                    var mailregex = /^[a-zA-Z0-9._%+-]+@([a-zA-Z0-9]+(-[a-zA-Z0-9]+)*\.)+[a-zA-Z]{2,}$/;
                     if (mailregex.test(sValue)) {
                         return "mailto:" + sValue;
                     } else {

package/src/sap/suite/ui/generic/template/lib/ContextBookkeeping.js

@@ -753,12 +753,9 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/each", "sap/base/util/extend
 
 					//swap, if oContextData1 either doesn't hold a value or doesn't have oContext and oContextData2 is available and is an active object
 					if ((!oContextData1 || !oContextData1.oContext) && (oContextData2 && !oContextData2.oContextInfo.bIsDraft)) {
-						// a = fnSwap(b, b = a);this function is used to swap the values of variables a and b
-						var fnSwap = function (vSwapWith) {return vSwapWith; };
-
-						oContextData1 = fnSwap(oContextData2, oContextData2 = oContextData1);
-						sCanonicalPath1 = fnSwap(sCanonicalPath2, sCanonicalPath2 = sCanonicalPath1);
-						oHistoricIdentity = fnSwap(oNewIdentity, oNewIdentity = oHistoricIdentity);
+						[oContextData1, oContextData2] = [oContextData2, oContextData1];
+						[sCanonicalPath1, sCanonicalPath2] = [sCanonicalPath2, sCanonicalPath1];
+						[oHistoricIdentity, oNewIdentity] = [oNewIdentity, oHistoricIdentity];
 					}
 					function fnTestEquivalence (oContextData1, oContextData2) {
 						if (!oContextData1 || !oContextData2) {

package/src/sap/suite/ui/generic/template/lib/ContextMenuHandler.js

@@ -245,7 +245,17 @@ sap.ui.define([
 			return false;
 		}
 
-		// Adds the menu button to context menu and creates a sub-menu for the child entries 
+		/**
+		 * 
+		 * Evaluates the menu items in a menu button and adds them to the context menu based on the following rules:
+		 * 
+		 * 1. If multiple menu items are eligible for the context menu, 
+		 * 	- A main menu entry is added to the context menu with the same text as menu button.
+		 *  - The eligible menu items are added as sub-menu entries under this main entry.
+		 * 
+		 * 2. If only one menu item is eligible,
+		 *  - It's directly added as a top-level entry in the context menu
+		 */
 		function fnAddMenuButtonToContextMenu(sPathToItems, oFocusInfo, oToolbarControlsData, aItems, oMenuButton, bStartsNewSection) {
 			var aMenuItems = oMenuButton.getMenu().getItems();
 
@@ -255,7 +265,11 @@ sap.ui.define([
 				fnAddToolbarButtonToContextMenu(sItemsPath, oFocusInfo, oToolbarControlsData, aChildContextMenuEntries, oMenuItem, bStartsSectionOnSubMenu);
 			});
 
-			if (aChildContextMenuEntries.length > 0) {
+			if (aChildContextMenuEntries.length === 1) {
+				var oChildContextMenuEntry = aChildContextMenuEntries[0];
+				fnAddMenuItem(sPathToItems, aItems, oChildContextMenuEntry.text, oChildContextMenuEntry.icon, oChildContextMenuEntry.startsSection, oChildContextMenuEntry.handlerPromise);
+				return true;
+			} else if (aChildContextMenuEntries.length > 1) {
 				fnAddMenuItem(sPathToItems, aItems, oMenuButton.getText(), oMenuButton.getIcon(), bStartsNewSection, null, aChildContextMenuEntries);				
 				return true;
 			}

package/src/sap/suite/ui/generic/template/lib/FlexibleColumnLayoutHandler.js

@@ -163,7 +163,8 @@ sap.ui.define([
 				}
 				var oRet = {};
 				var bPerformAnalysis = true;
-				for (var oTreeNode = oCurrentIdentity.treeNode; bPerformAnalysis; oTreeNode = oTemplateContract.mRoutingTree[oTreeNode.parentRoute]){
+				var oTreeNode = oCurrentIdentity.treeNode;
+				while (bPerformAnalysis) {
 					var iFCLLevel = oTreeNode.fCLLevel;
 					var sPar = getColumnForFCLLevel(iFCLLevel);
 					oRet[sPar] = {
@@ -173,6 +174,7 @@ sap.ui.define([
 					};
 					bPerformAnalysis = iFCLLevel === 1 || iFCLLevel === 2;
 					bIsNonDraftCreate = false; // only last column can be the create column
+					oTreeNode = oTemplateContract.mRoutingTree[oTreeNode.parentRoute];
 				}
 				return oRet;
 			}

package/src/sap/suite/ui/generic/template/lib/SideEffectUtil.js

@@ -34,14 +34,13 @@ sap.ui.define(["sap/suite/ui/generic/template/js/AnnotationHelper",
 		return oSmartField._calculateFieldGroupIDs(oClonedMetaData);
 	}
 	function fnComputeFieldGroupAndTriggerSideEffect(oSmartField, sSideEffectSourcePropertyType) {
-		var aFieldGroupIds;
-		var fnTriggerValidateFieldGroupEvent = function() {
+		var fnTriggerValidateFieldGroupEvent = function(aFieldGroupIds) {
 			if (aFieldGroupIds) {
 				oSmartField.triggerValidateFieldGroup(aFieldGroupIds);
 			}
 		};
-		var fnCallTriggerValidateFieldGroup = function(sSideEffectSourcePropertyType, oComputedMetaData) {	
-
+		var fnCallTriggerValidateFieldGroup = function(sSideEffectSourcePropertyType, oComputedMetaData) {
+			var aFieldGroupIds;
 			switch (sSideEffectSourcePropertyType) {
 				case SideEffectSourcePropertyType.SINGLE_SOURCE_ONLY:
 					var aInnerControls = oSmartField.getInnerControls();

package/src/sap/suite/ui/generic/template/lib/StatePreserver.js

@@ -446,7 +446,7 @@ sap.ui.define(["sap/ui/base/Object",
 		function isStateChange(mAppStates){
 			sAppStateKeyInUrl = mAppStates[oSettings.appStateName] || "";
 			if (Array.isArray(sAppStateKeyInUrl)){
-				sAppStateKeyInUrl = sAppStateKeyInUrl.sort()[0] || "";
+				sAppStateKeyInUrl = sAppStateKeyInUrl.sort((a, b) => a.localeCompare(b))[0] || "";
 			}
 			if (oStoringInformation){
 				if (oStoringInformation.appStateKey !== sAppStateKeyInUrl){

package/src/sap/suite/ui/generic/template/lib/ViewDependencyHelper.js

@@ -25,13 +25,18 @@ sap.ui.define(["sap/ui/base/Object", "sap/suite/ui/generic/template/js/Annotatio
 			var sMyId = oComponent.getId();
 			var oComponentRegistryEntry = oTemplateContract.componentRegistry[sMyId];
 			var oTreeNode = oTemplateContract.mRoutingTree[oComponentRegistryEntry.route];
-			for (var i = 0; (!iLevel || i < iLevel) && oTreeNode.level > 0; i++){
-				var oParentNode = oTemplateContract.mRoutingTree[oTreeNode.parentRoute];  
+			var i = 0;
+			while (oTreeNode.level > 0) {
+				if (iLevel && i >= iLevel) {
+					break;
+				}
+				var oParentNode = oTemplateContract.mRoutingTree[oTreeNode.parentRoute];
 				if (oParentNode.componentId){
 					var oParentComponent = oTemplateContract.componentRegistry[oParentNode.componentId].oComponent;
 					setMeToDirty(oParentComponent, sEntitySet);
 				}
 				oTreeNode = oParentNode;
+				i++;
 			}
 		}
 

package/src/sap/suite/ui/generic/template/lib/ai/EasyFilterBarHandler.js

@@ -423,12 +423,14 @@ sap.ui.define([
 		 */
 		function fnShowValueHelp(oEvent) {
 			var oSmartFilterbar = oState.oSmartFilterbar;
+            var sKey = oEvent.getParameter("key");
             fnValueHelpPromiseResolve = oEvent.getParameter("resolve");
 			oSmartFilterbar.associateValueLists();
             try {
-                oSmartFilterbar.openValueHelpRequestForFilterItem(oEvent.getParameter("key"));
+                oSmartFilterbar.ensureLoadedValueHelp(sKey);
+                oSmartFilterbar.openValueHelpRequestForFilterItem(sKey);
             } catch (error) {
-                oLogger.error("Value help cannot be triggered for the field " + oEvent.getParameter("key"));
+                oLogger.error("Value help cannot be triggered for the field " + sKey);
             }
 		}
 
@@ -517,11 +519,11 @@ sap.ui.define([
                             value2: result.selectedValues[1]
                         }));
                     } else {
-                        for (var i = 0;i < result.selectedValues.length;++i) {
+                        for (var j = 0; j < result.selectedValues.length; ++j) {
                             aFilters.push(new Filter({
                                 path: key,
                                 operator: result.operator,
-                                value1: result.selectedValues[i]
+                                value1: result.selectedValues[j]
                             }));
                         }
                     }
@@ -534,6 +536,7 @@ sap.ui.define([
 
             var aFinalResponse = [];
             var oOwnerFilterControl = oState.oSmartFilterbar;
+            var sKey = key;
             var sEntitySet = oController.getOwnerComponent().getEntitySet();
             var oEntityType = oTemplateUtils.oCommonUtils.getMetaModelEntityType(sEntitySet);
             var oSFBModel = oOwnerFilterControl.getModel();
@@ -638,6 +641,12 @@ sap.ui.define([
                 oVHPromise.then((oValueList)=>{
                 var oValueListDefaultBinding = oValueList[""];
                 var sValueListEntity = oValueListDefaultBinding.CollectionPath.String;
+                if (Array.isArray(oValueListDefaultBinding.Parameters)) {
+                    var oParameter = oValueListDefaultBinding.Parameters.find(oParam => (oParam.RecordType === "com.sap.vocabularies.Common.v1.ValueListParameterInOut" && oParam.LocalDataProperty.PropertyPath === sKey));
+                if (oParameter) {    
+                    key = oParameter.ValueListProperty.String; 
+                    }
+                }
                     //Get All Records using $search
                     aFilters.forEach((oFilter)=>{
                         oSFBModel.read("/" + sValueListEntity, {

package/src/sap/suite/ui/generic/template/lib/filterHelper.js

@@ -12,7 +12,7 @@ sap.ui.define([
      * Remove extra information from variant object keep only SelectionOptions and Parameters
      *
      * @param {object} oValue Variant value
-     * @returns {object} Updated value of selection variant after removinig the extra info
+     * @returns {object} Updated value of selection variant after removing the extra info
      */
     function removeExtraInfoVariant(oValue) {
         if (oValue) {
@@ -28,7 +28,7 @@ sap.ui.define([
             delete oValue.ParameterContextUrl;
             return oValue;
         }
-        return oValue;
+        return null;
     }
 
     /**
@@ -271,11 +271,9 @@ sap.ui.define([
         var sRangeText = "";
 
         if (Array.isArray(aFilterLabel)) {
-            aFilterLabel.filter(function(sText) {
-                if (sText && sText.includes(oRange.Low)) {
-                    sRangeText = sText;
-                }
-            });
+            sRangeText = aFilterLabel.find(function(sText) {
+                return sText && sText.includes(oRange.Low);
+            }) || "";
         } else if (typeof aFilterLabel === "string") {
             sRangeText = aFilterLabel;
         }