@openui5/sap.ui.mdc 1.124.2 → 1.126.0

package/src/sap/ui/mdc/ushell/LinkDelegate.js

@@ -66,9 +66,27 @@ sap.ui.define([
 	 * In case oLinkType.type is 2 the Link will get rendered as a Link and will open a Popover (default)
 	 */
 	LinkDelegate.fetchLinkType = function(oLink) {
+		const oPayload = oLink.getPayload();
+
+		if (oPayload && oPayload.semanticObjects) {
+			return LinkDelegate.hasDistinctSemanticObjects(oPayload.semanticObjects).then((bHasDisctinctSemanticObject) => {
+				return Promise.resolve({
+					type: bHasDisctinctSemanticObject ? LinkType.Popover : LinkType.Text,
+					directLink: undefined
+				});
+			});
+		} else {
+			throw new Error("no payload or semanticObjects found");
+		}
+	};
+
+	/**
+	 * @param {string[]} aSemanticObjects Names of the SemanticObjects to check
+	 * @returns {Promise<boolean>} Promise resolving to true if atleast one SemanticObject exists
+	 */
+	LinkDelegate.hasDistinctSemanticObjects = (aSemanticObjects) => {
 		const mSemanticObjects = {};
 		let oPromise = null;
-		const oPayload = oLink.getPayload();
 
 		const fnHaveBeenRetrievedAllSemanticObjects = function(aSemanticObjects) {
 			return aSemanticObjects.filter((sSemanticObject) => {
@@ -104,25 +122,13 @@ sap.ui.define([
 			}
 			return oPromise;
 		};
-		const fnHasDistinctSemanticObject = function(aSemanticObjects) {
-			if (fnHaveBeenRetrievedAllSemanticObjects(aSemanticObjects)) {
-				return Promise.resolve(fnAtLeastOneExistsSemanticObject(aSemanticObjects));
-			}
-			return fnRetrieveDistinctSemanticObjects().then(() => {
-				return fnAtLeastOneExistsSemanticObject(aSemanticObjects);
-			});
-		};
 
-		if (oPayload && oPayload.semanticObjects) {
-			return fnHasDistinctSemanticObject(oPayload.semanticObjects).then((bHasDisctinctSemanticObject) => {
-				return Promise.resolve({
-					type: bHasDisctinctSemanticObject ? LinkType.Popover : LinkType.Text,
-					directLink: undefined
-				});
-			});
-		} else {
-			throw new Error("no payload or semanticObjects found");
+		if (fnHaveBeenRetrievedAllSemanticObjects(aSemanticObjects)) {
+			return Promise.resolve(fnAtLeastOneExistsSemanticObject(aSemanticObjects));
 		}
+		return fnRetrieveDistinctSemanticObjects().then(() => {
+			return fnAtLeastOneExistsSemanticObject(aSemanticObjects);
+		});
 	};
 
 	/**
@@ -234,7 +240,7 @@ sap.ui.define([
 			ownNavigation: undefined,
 			availableActions: []
 		};
-		return Library.load({name: 'sap.ui.fl'}).then(() => {
+		return Library.load({ name: 'sap.ui.fl' }).then(() => {
 
 			const Utils = sap.ui.require('sap/ui/fl/Utils');
 			if (!Utils) {

package/src/sap/ui/mdc/ushell/SemanticObjectMapping.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for...
 	 * @extends sap.ui.core.Element
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @private
 	 * @since 1.120

package/src/sap/ui/mdc/ushell/SemanticObjectMappingItem.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for...
 	 * @extends sap.ui.core.Element
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @private
 	 * @since 1.120

package/src/sap/ui/mdc/ushell/SemanticObjectUnavailableAction.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class Type for...
 	 * @extends sap.ui.core.Element
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @private
 	 * @since 1.120

package/src/sap/ui/mdc/util/InfoBar.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @class The <code>InfoBar</code> control provides an easy way of displaying filter information inside an <code>sap.ui.mdc.Chart</code> and an <code>sap.ui.mdc.Table</code>.
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc

package/src/sap/ui/mdc/util/PromiseCache.js

@@ -45,7 +45,7 @@ sap.ui.define(
 		 * Destroying the cache will cancel all registered promises and delete references. Convenience methods for promise creation, wrapping and replacement are offered.
 		 *
 		 * @author SAP SE
-		 * @version 1.124.2
+		 * @version 1.126.0
 		 * @alias sap.ui.mdc.util.PromiseCache
 		 * @since 1.85.0
 		 * @private

package/src/sap/ui/mdc/util/PropertyHelper.js

@@ -592,7 +592,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 *
 	 * @private
 	 * @since 1.83

package/src/sap/ui/mdc/valuehelp/Dialog.js

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Container for the {@link sap.ui.mdc.ValueHelp ValueHelp} element showing a dialog.
 	 * @extends sap.ui.mdc.valuehelp.base.Container
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @public
 	 * @since 1.95.0
@@ -755,7 +755,7 @@ sap.ui.define([
 					const oFilter = new Filter({ path: 'isEmpty', operator: 'NE', value1: true });
 					this._oConditionType.setFormatOptions(_getConditionFormatOptions.call(this)); // as config might be changed
 					const oTokenTemplate = new Token(this.getId() + "-Token", { text: { path: '$valueHelp>', type: this._oConditionType } });
-					this.oTokenMultiInput.bindAggregation("tokens", { path: '/conditions', model: "$valueHelp", templateShareable: false, template: oTokenTemplate, filters: oFilter });
+					this.oTokenMultiInput.bindAggregation("tokens", { path: '/conditions', model: "$valueHelp", templateShareable: false, template: oTokenTemplate, filters: oFilter, length: 50, startIndex: -50 });
 				}
 			} else if (oBindingInfo) { // remove binding if dialog is closed to prevent updated on tokens if conditions are updated. (Suspend would not be enough, as every single binding on token would need to be suspended too.)
 				this.oTokenMultiInput.unbindAggregation("tokens");

package/src/sap/ui/mdc/valuehelp/FilterBar.js

@@ -43,7 +43,7 @@ sap.ui.define(
 		 * <b>Note:</b> The <code>FilterBar</code> can only be used for a {@link sap.ui.mdc.valuehelp.Dialog Dialog} and not on its own.
 		 * @extends sap.ui.mdc.filterbar.FilterBarBase
 		 * @author SAP SE
-		 * @version 1.124.2
+		 * @version 1.126.0
 		 * @constructor
 		 * @public
 		 * @since 1.124.0

package/src/sap/ui/mdc/valuehelp/Popover.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Container for the {@link sap.ui.mdc.ValueHelp ValueHelp} element showing a popover.
 	 * @extends sap.ui.mdc.valuehelp.base.Container
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @public
 	 * @since 1.95.0
@@ -215,8 +215,6 @@ sap.ui.define([
 			this._oInvisibleText = new InvisibleText({ text: Library.getResourceBundleFor("sap.ui.mdc").getText("valuehelp.POPOVER_AVALIABLE_VALUES") }).toStatic();
 			oPopover.addAriaLabelledBy(this._oInvisibleText);
 
-			oPopover.setFollowOf(false);
-
 			if (oValueStateHeader) {
 				oValueStateHeader.setPopup(oPopover);
 			}
@@ -633,10 +631,25 @@ sap.ui.define([
 		const bSingleSelect = this.isSingleSelect();
 		const bClose = oEvent.getParameter("close");
 		if (!Device.system.phone || bSingleSelect || bClose) {
+			if (!bClose) {
+				this._disableFollowOfTemporarily();
+			}
 			this.fireConfirm({ close: bClose || bSingleSelect });
 		}
 	};
 
+	// Workaround to prevent the popup from closing unexpectedly should formatting lead to field size adjustments
+	Popover.prototype._disableFollowOfTemporarily = function () {
+		if (this._followOfTimer) {
+			clearTimeout(this._followOfTimer);
+		}
+		const oPopover = this.getAggregation("_container");
+		oPopover.setFollowOf(false);
+		this._followOfTimer = setTimeout(() => {
+			oPopover.setFollowOf(true);
+		}, 300);
+	};
+
 	Popover.prototype.handleCanceled = function(oEvent) {
 		if (!Device.system.phone) { // on phone don't cancel if filterValue cleared
 			Container.prototype.handleCanceled.apply(this, arguments);
@@ -797,6 +810,11 @@ sap.ui.define([
 			this._oTokenConditionType = undefined;
 		}
 
+		if (this._followOfTimer) {
+			clearTimeout(this._followOfTimer);
+			this._followOfTimer = null;
+		}
+
 		Container.prototype.exit.apply(this, arguments);
 	};
 

package/src/sap/ui/mdc/valuehelp/base/Container.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Container for the {@link sap.ui.mdc.ValueHelp ValueHelp} element.
 	 * @extends sap.ui.core.Element
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @abstract
 	 * @public
@@ -76,6 +76,9 @@ sap.ui.define([
 			events: {
 				/**
 				 * This event is fired if the selected condition has changed.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.ValueHelp
 				 */
 				select: {
 					parameters: {
@@ -93,6 +96,9 @@ sap.ui.define([
 				},
 				/**
 				 * This event is fired if a change of the value help is confirmed.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.ValueHelp
 				 */
 				confirm: {
 					parameters: {
@@ -104,6 +110,9 @@ sap.ui.define([
 				},
 				/**
 				 * This event is fired if the value help is opened.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.ValueHelp
 				 */
 				opened: {
 					parameters: {
@@ -115,14 +124,23 @@ sap.ui.define([
 				},
 				/**
 				 * This event is fired if the value help is closed.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.ValueHelp
 				 */
 				closed: {},
 				/**
 				 * This event is fired if the change is cancelled.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.ValueHelp
 				 */
 				cancel: {},
 				/**
 				 * This event is fired if the container requests the delegate content.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.ValueHelp
 				 */
 				requestDelegateContent: {
 					parameters: {
@@ -134,10 +152,16 @@ sap.ui.define([
 				},
 				/**
 				 * This event is fired if the value help should switch to dialog mode.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.ValueHelp
 				 */
 				requestSwitchToDialog: {},
 				/**
 				 * This event is fired if a navigation has been executed in the content of the container.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.ValueHelp
 				 */
 				navigated: {
 					parameters: {
@@ -159,6 +183,9 @@ sap.ui.define([
 				},
 				/**
 				 * This event is fired after a suggested item has been found for a type-ahead.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.ValueHelp
 				 * @since 1.120.0
 				 */
 				typeaheadSuggested: {

package/src/sap/ui/mdc/valuehelp/base/Content.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element.
 	 * @extends sap.ui.core.Element
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @abstract
 	 * @public
@@ -132,6 +132,9 @@ sap.ui.define([
 			events: {
 				/**
 				 * This event is fired if the selected condition has changed.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.valuehelp.base.Container
 				 */
 				select: {
 					parameters: {
@@ -149,6 +152,9 @@ sap.ui.define([
 				},
 				/**
 				 * This event is fired if a change of the content is confirmed.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.valuehelp.base.Container
 				 */
 				confirm: {
 					parameters: {
@@ -160,15 +166,24 @@ sap.ui.define([
 				},
 				/**
 				 * This event is fired if the change is cancelled.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.valuehelp.base.Container
 				 */
 				cancel: {},
 
 				/**
 				 * This event is fired if the value help should switch to dialog mode.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.valuehelp.base.Container
 				 */
 				requestSwitchToDialog: {},
 				/**
 				 * This event is fired if a navigation has been executed in the content.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.valuehelp.base.Container
 				 */
 				navigated: {
 					parameters: {
@@ -190,6 +205,9 @@ sap.ui.define([
 				},
 				/**
 				 * This event is fired after a suggested item has been found for a type-ahead.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.valuehelp.base.Container
 				 * @since 1.120.0
 				 */
 				typeaheadSuggested: {

package/src/sap/ui/mdc/valuehelp/base/DefineConditionPanel.js

@@ -121,7 +121,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.valuehelp.base.DefineConditionPanel

package/src/sap/ui/mdc/valuehelp/base/DialogTab.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Content for the <code>sap.ui.mdc.valuehelp.content.Dialog</code> element.
 	 * @extends sap.ui.core.Control
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc

package/src/sap/ui/mdc/valuehelp/base/FilterableListContent.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element.
 	 * @extends sap.ui.mdc.valuehelp.base.ListContent
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @abstract
 	 * @public

package/src/sap/ui/mdc/valuehelp/base/ListContent.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element.
 	 * @extends sap.ui.mdc.valuehelp.base.Content
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @abstract
 	 * @public

package/src/sap/ui/mdc/valuehelp/content/Bool.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element to provide a value help for boolean fields.
 	 * @extends sap.ui.mdc.valuehelp.content.FixedList
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc

package/src/sap/ui/mdc/valuehelp/content/Conditions.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element showing a condition panel.
 	 * @extends sap.ui.mdc.valuehelp.base.Content
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @public
 	 * @since 1.95.0

package/src/sap/ui/mdc/valuehelp/content/FixedList.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element showing a list with fixed values.
 	 * @extends sap.ui.mdc.valuehelp.base.ListContent
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @public
 	 * @since 1.95.0

package/src/sap/ui/mdc/valuehelp/content/FixedListItem.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.ListItem
 	 *
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 *
 	 * @public
 	 * @since 1.114.0

package/src/sap/ui/mdc/valuehelp/content/MDCTable.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element using a {@link sap.ui.mdc.Table}.
 	 * @extends sap.ui.mdc.valuehelp.base.FilterableListContent
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @public
 	 * @since 1.95.0

package/src/sap/ui/mdc/valuehelp/content/MTable.js

@@ -51,7 +51,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element using a {@link sap.m.Table}.
 	 * @extends sap.ui.mdc.valuehelp.base.FilterableListContent
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @public
 	 * @since 1.95.0
@@ -290,22 +290,38 @@ sap.ui.define([
 		return this._oTable;
 	};
 
+	/*
+	 * For non-typeahead multi-select content, 'SingleSelectMaster', 'SingleSelectLeft' and 'MultiSelect' are considered valid.
+	 * For typeahead content, 'SingleSelectLeft' is considered invalid.
+	 * For single-select content, 'MultiSelect' mode is considered invalid.
+	 */
+	function _getValidTableSelectModes(bTypeahead, bEnforceSingleSelect) {
+		return [
+			ListMode.SingleSelectMaster,
+			...bTypeahead ? [] : [ListMode.SingleSelectLeft],
+			...bEnforceSingleSelect ? [] : [ListMode.MultiSelect]
+		];
+	}
+
 	MTable.prototype.onShow = function(bInitial) {
 		const oTable = this._getTable();
 		if (oTable) {
 			if (!oTable.hasStyleClass("sapMComboBoxList")) { // TODO: only in typeahead case?
 				oTable.addStyleClass("sapMComboBoxList"); // to allow focus outline in navigation
 			}
-			// check if selection mode is fine
-			let sSelectionMode = this.isTypeahead() ? ListMode.SingleSelectMaster : ListMode.SingleSelectLeft;
-			if (!FilterableListContent.prototype.isSingleSelect.apply(this) && oTable.getMode() !== sSelectionMode) { // if in multi-select mode only single-selection on table is allowed this is also OK
-				sSelectionMode = ListMode.MultiSelect;
-			}
-			if (oTable.getMode() === ListMode.None) { // only set automatically if not provided from outside (and do it only once)
-				oTable.setMode(sSelectionMode);
-			}
-			if (oTable.getMode() !== sSelectionMode) {
-				throw new Error("Table selection mode needs to be " + sSelectionMode);
+
+			const bTypeahead = this.isTypeahead();
+			const bEnforceSingleSelect = FilterableListContent.prototype.isSingleSelect.apply(this);
+			const sTableSelectMode = oTable.getMode();
+
+			if (sTableSelectMode === ListMode.None) { // set selection mode, if none is given
+				const sPreferredSingleSelectMode = bTypeahead ? ListMode.SingleSelectMaster : ListMode.SingleSelectLeft;
+				oTable.setMode(bEnforceSingleSelect ? sPreferredSingleSelectMode : ListMode.MultiSelect);
+			} else { // check if selection mode is fine
+				const aValidSelectModes = _getValidTableSelectModes(bTypeahead, bEnforceSingleSelect);
+				if (!aValidSelectModes.includes(sTableSelectMode)) {
+					throw new Error(`Table selection mode needs to be '${aValidSelectModes.join("' or '")}'`);
+				}
 			}
 		}
 
@@ -423,9 +439,18 @@ sap.ui.define([
 
 	MTable.prototype.getItemForValue = function(oConfig) {
 
-		if (!oConfig.checkKey && oConfig.parsedValue && !oConfig.checkDescription) {
+		if (!oConfig.checkKey && !oConfig.checkDescription) {
 			return null;
 		}
+
+		if (oConfig.checkKey && !oConfig.hasOwnProperty("parsedValue")) {
+			throw new Error("MTable: Cannot check key without a given parsedValue! " + this.getId());
+		}
+
+		if (oConfig.checkDescription && !oConfig.hasOwnProperty("parsedDescription")) {
+			throw new Error("MTable: Cannot check description without a given parsedDescription! " + this.getId());
+		}
+
 		if (oConfig.checkKey && !this.getKeyPath()) {
 			throw new Error("MTable: KeyPath missing! " + this.getId());
 		}
@@ -519,7 +544,7 @@ sap.ui.define([
 
 		let oFilter = aFilters.length > 1 ? new Filter({ filters: aFilters, and: false }) : aFilters[0];
 
-		if (oConditions) {
+		if (oFilter && oConditions) {
 			const oConditionTypes = this._getTypesForConditions(oConditions);
 			const oConditionsFilter = FilterConverter.createFilters(oConditions, oConditionTypes, undefined, this.getCaseSensitive());
 			if (oConditionsFilter) {
@@ -561,10 +586,6 @@ sap.ui.define([
 			return null;
 		}
 
-		/*  steps:
-			TODO: 1. wait for table binding
-			2. consider existing inparameters
-		*/
 		const sKeyPath = this.getKeyPath();
 		const sDescriptionPath = this.getDescriptionPath();
 		const bUseFirstMatch = this.getUseFirstMatch();
@@ -576,35 +597,26 @@ sap.ui.define([
 		const oDelegate = this.getValueHelpDelegate();
 		const oValueHelp = this.getValueHelpInstance();
 
-		const sPromiseKey = "loadItemForValue:" + JSON.stringify([sPath,
-			sKeyPath,
-			oConfig.parsedValue || oConfig.value,
-			oConfig.context,
-			oConfig.bindingContext && oConfig.bindingContext.getPath(),
-			oConditions
-		]);
+		const oFilter = _createItemFilters.call(this, oConfig, oConditions);
+		const oFilterListBinding = oListBinding.getModel().bindList(sPath, oListBinding.getContext(), undefined, oFilter);
+		oFilterListBinding.initialize();
 
-		return this._retrievePromise(sPromiseKey, () => {
-			const oFilter = _createItemFilters.call(this, oConfig, oConditions);
-			const oFilterListBinding = oListBinding.getModel().bindList(sPath, oListBinding.getContext(), undefined, oFilter);
-			oFilterListBinding.initialize();
-			return oDelegate.executeFilter(oValueHelp, oFilterListBinding, 2).then((oBinding) => {
-				const aContexts = oBinding.getContexts();
-
-				setTimeout(() => { // as Binding might process other steps after event was fired - destroy it lazy
-					oFilterListBinding.destroy();
-				}, 0);
-
-				if (aContexts.length && (aContexts.length < 2 || bUseFirstMatch)) {
-					return this.getItemFromContext(aContexts[0], { keyPath: sKeyPath, descriptionPath: sDescriptionPath, inParameters: undefined });
-				} else if (oConfig.checkKey && oConfig.parsedValue === "" && aContexts.length === 0) {
-					// nothing found for empty key -> this is not an error
-					return null;
-				} else {
-					const oException = _createException.call(this, oConfig.exception, aContexts.length > 1, oConfig.value);
-					throw oException;
-				}
-			});
+		return oDelegate.executeFilter(oValueHelp, oFilterListBinding, 2).then((oBinding) => {
+			const aContexts = oBinding.getContexts();
+
+			setTimeout(() => { // as Binding might process other steps after event was fired - destroy it lazy
+				oFilterListBinding.destroy();
+			}, 0);
+
+			if (aContexts.length && (aContexts.length < 2 || bUseFirstMatch)) {
+				return this.getItemFromContext(aContexts[0], { keyPath: sKeyPath, descriptionPath: sDescriptionPath, inParameters: undefined });
+			} else if (oConfig.checkKey && oConfig.parsedValue === "" && aContexts.length === 0) {
+				// nothing found for empty key -> this is not an error
+				return null;
+			} else {
+				const oException = _createException.call(this, oConfig.exception, aContexts.length > 1, oConfig.value);
+				throw oException;
+			}
 		});
 	};