@openui5/sap.ui.mdc 1.93.3 → 1.96.1

package/src/sap/ui/mdc/filterbar/FilterBarBase.js

@@ -4,8 +4,51 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	'sap/ui/mdc/p13n/subcontroller/FilterController', 'sap/ui/core/library', 'sap/ui/mdc/p13n/FlexUtil', 'sap/ui/Device', 'sap/ui/mdc/Control', 'sap/base/util/merge', 'sap/base/util/deepEqual', 'sap/ui/model/base/ManagedObjectModel', 'sap/ui/base/ManagedObjectObserver', 'sap/base/Log', 'sap/ui/mdc/condition/ConditionModel', 'sap/ui/mdc/condition/Condition', 'sap/ui/mdc/util/IdentifierUtil', 'sap/ui/mdc/condition/ConditionConverter', 'sap/m/MessageBox', "sap/ui/fl/write/api/ControlPersonalizationWriteAPI", "sap/ui/mdc/p13n/StateUtil", "sap/ui/mdc/condition/FilterConverter", "sap/ui/fl/apply/api/ControlVariantApplyAPI", "sap/ui/mdc/util/FilterUtil", "sap/m/Button", "sap/m/library", "sap/ui/core/ShortcutHintsMixin"
-], function(FilterController, coreLibrary, FlexUtil, Device, Control, merge, deepEqual, ManagedObjectModel, ManagedObjectObserver, Log, ConditionModel, Condition, IdentifierUtil, ConditionConverter, MessageBox, ControlPersonalizationWriteAPI, StateUtil, FilterConverter, ControlVariantApplyAPI, FilterUtil, Button, mLibrary, ShortcutHintsMixin) {
+	'sap/ui/mdc/p13n/subcontroller/FilterController',
+	'sap/ui/core/library',
+	'sap/ui/mdc/p13n/FlexUtil',
+	'sap/ui/Device',
+	'sap/ui/mdc/Control',
+	'sap/base/Log',
+	'sap/base/util/merge',
+	'sap/ui/model/base/ManagedObjectModel',
+	'sap/ui/base/ManagedObjectObserver',
+	'sap/ui/mdc/condition/ConditionModel',
+	'sap/ui/mdc/condition/Condition',
+	'sap/ui/mdc/util/IdentifierUtil',
+	'sap/ui/mdc/condition/ConditionConverter',
+	"sap/ui/mdc/p13n/StateUtil",
+	"sap/ui/mdc/condition/FilterConverter",
+	"sap/ui/mdc/util/FilterUtil",
+	"sap/ui/mdc/filterbar/PropertyHelper",
+	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
+	"sap/m/library",
+	"sap/m/Button",
+	'sap/m/MessageBox',
+	"sap/ui/core/ShortcutHintsMixin"],
+	function(
+		FilterController,
+		coreLibrary,
+		FlexUtil,
+		Device,
+		Control,
+		Log,
+		merge,
+		ManagedObjectModel,
+		ManagedObjectObserver,
+		ConditionModel,
+		Condition,
+		IdentifierUtil,
+		ConditionConverter,
+		StateUtil,
+		FilterConverter,
+		FilterUtil,
+		PropertyHelper,
+		ControlVariantApplyAPI,
+		mLibrary,
+		Button,
+		MessageBox,
+		ShortcutHintsMixin) {
 	"use strict";
 
 	var ValueState = coreLibrary.ValueState;
@@ -17,7 +60,7 @@ sap.ui.define([
 	 * @class The <code>FilterBarBase</code> control is used as a faceless base class for common functionality of any MDC FilterBar derivation.
 	 * @extends sap.ui.mdc.Control
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -29,6 +72,7 @@ sap.ui.define([
 	{
 		metadata: {
 			library: "sap.ui.mdc",
+			designtime: "sap/ui/mdc/designtime/filterbar/FilterBarBase.designtime",
 			defaultAggregation: "filterItems",
 			interfaces : [
 				"sap.ui.mdc.IFilter",
@@ -234,8 +278,6 @@ sap.ui.define([
 
 		this._bPersistValues = false;
 
-		this._aProperties = null;
-
 		this._fResolveInitialFiltersApplied = undefined;
 		this._oInitialFiltersAppliedPromise = new Promise(function(resolve) {
 			this._fResolveInitialFiltersApplied  = resolve;
@@ -574,7 +616,7 @@ sap.ui.define([
 
 				if (this._bPersistValues && this._isPersistenceSupported()) {
 					var mOrigConditions = {};
-					mOrigConditions[sFieldPath] = this._stringifyConditions(sFieldPath, oEvent.getParameter("value"));
+					mOrigConditions[sFieldPath] = this._stringifyConditions(sFieldPath, merge([], oEvent.getParameter("value")));
 					this._cleanupConditions(mOrigConditions[sFieldPath]);
 
 					var oChangePromise = this.getEngine().createChanges({
@@ -672,7 +714,6 @@ sap.ui.define([
 		return oResultCondition;
 	};
 
-
 	FilterBarBase.prototype._stringifyConditions = function(sFieldPath, aConditions) {
 		var oProperty = this._getPropertyByName(sFieldPath);
 		var aResultConditions = aConditions;
@@ -720,8 +761,16 @@ sap.ui.define([
 	FilterBarBase.prototype.onReset = function(oEvent) {
 		this._getConditionModel().oConditionModel.removeAllConditions();
 	};
+
 	FilterBarBase.prototype.onSearch = function(oEvent) {
-		this.triggerSearch();
+		if (!this._bSearchPressed) {
+			this._bSearchPressed = true;
+			this.triggerSearch().then(function() {
+				this._bSearchPressed = false;
+			}.bind(this), function(){
+				this._bSearchPressed = false;
+			}.bind(this));
+		}
 	};
 
 	/**
@@ -735,7 +784,7 @@ sap.ui.define([
 			this._bSearchTriggered = true;
 			return Promise.resolve();
 		}
-		return this.valid().then(function(){
+		return this.validate().then(function(){
 			this.fireSearch();
 		}.bind(this));
 	};
@@ -750,24 +799,24 @@ sap.ui.define([
 	 * @returns {Promise} Returns a Promise which resolves after the validation of erroneous fields has been propagated.
 	 *
 	 */
-	FilterBarBase.prototype.valid = function() {
+	FilterBarBase.prototype.validate = function() {
 
 		return this.initialized().then(function() {
-			if (!this._oSearchPromise) {
+			if (!this._oValidationPromise) {
 
-				this._oSearchPromise = new Promise(function(resolve, reject) {
+				this._oValidationPromise = new Promise(function(resolve, reject) {
 					this._fResolvedSearchPromise = resolve;
 					this._fRejectedSearchPromise = reject;
 				}.bind(this));
 
 				var fDelayedFunction = function() {
 					this._validate();
-					this._oSearchPromise = null;
+					this._oValidationPromise = null;
 				};
 				setTimeout(fDelayedFunction.bind(this), 0);
 			}
 
-			return this._oSearchPromise;
+			return this._oValidationPromise;
 
 		}.bind(this));
 	};
@@ -844,8 +893,17 @@ sap.ui.define([
 		var oPromise = oEvent.getParameter("promise");
 		if (oPromise) {
 			oPromise.then(function() {
-				this.triggerSearch();
-			}.bind(this));
+				if (this._aCollectedChangePromises && this._aCollectedChangePromises.length > 0) {
+					var aChangePromises = this._aCollectedChangePromises.slice();
+					Promise.all(aChangePromises).then(function() {
+						this.triggerSearch();
+					}.bind(this));
+				} else {
+					this.triggerSearch();
+				}
+			}.bind(this)).catch(function(oEx) {
+				Log.error(oEx);
+			});
 		}
 	};
 
@@ -969,8 +1027,15 @@ sap.ui.define([
 		}
 
 		if (vRetErrorState === ErrorState.NoError) {
-			this._fResolvedSearchPromise();
-			fnCleanup();
+			if (this._isChangeApplying()) {
+				this._oFlexPromise.then(function() {
+				 this._fResolvedSearchPromise();
+				 fnCleanup();
+				}.bind(this));
+			} else {
+				this._fResolvedSearchPromise();
+				fnCleanup();
+			}
 		} else {
 			if (vRetErrorState === ErrorState.RequiredHasNoValue) {
 				sErrorMessage = this._oRb.getText("filterbar.REQUIRED_CONDITION_MISSING");
@@ -997,8 +1062,9 @@ sap.ui.define([
 
 	/**
 	 * Assigns conditions to the inner condition model.
-	 * This method is only called for filling the in parameters for value help scenarios.
-	 * @protected
+	 * <br><b>Note:</b>This method is only called for filling the in parameters for value help scenarios.
+	 * @private
+	 * @ui5-restricted sap.ui.mdc
 	 * @param {map} mConditions A map containing the conditions
 	 */
 	FilterBarBase.prototype.setInternalConditions = function(mConditions) {
@@ -1009,9 +1075,9 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns the conditions of the inner condition model.<br>
-	 * <b>Note:</b>This method must only be used for value help scenarios.
-	 * @protected
+	 * Returns the conditions of the inner condition model.
+	 * @private
+	 * @ui5-restricted sap.ui.mdc
 	 * @returns {map} A map containing the conditions
 	 */
 	FilterBarBase.prototype.getInternalConditions = function() {
@@ -1041,10 +1107,10 @@ sap.ui.define([
 	FilterBarBase.prototype._getModelConditions = function(oModel, bDoNotExternalize, bKeepAllValues) {
 		var mConditions = {};
 		if (oModel) {
-			var aAllConditions = oModel.getAllConditions();
+			var aAllConditions = merge({}, oModel.getAllConditions());
 			for (var sFieldPath in aAllConditions) {
 				if (aAllConditions[sFieldPath] && (bKeepAllValues || aAllConditions[sFieldPath].length > 0)) {
-					mConditions[sFieldPath] = merge([], aAllConditions[sFieldPath]);
+					mConditions[sFieldPath] = aAllConditions[sFieldPath];
 					if (!bDoNotExternalize) {
 						this._cleanupConditions(mConditions[sFieldPath]);
 						var aFieldConditions = this._stringifyConditions(sFieldPath, mConditions[sFieldPath]);
@@ -1324,7 +1390,6 @@ sap.ui.define([
 		return oFilterField;
 	};
 
-
 	FilterBarBase.prototype._retrieveMetadata = function() {
 
 		if (this._oMetadataAppliedPromise) {
@@ -1340,26 +1405,16 @@ sap.ui.define([
 		this.initControlDelegate().then(function() {
 			if (!this._bIsBeingDestroyed) {
 
-				this._aProperties = [];
-
 				var fnResolveMetadata = function() {
 					this._fResolveMetadataApplied();
 					this._fResolveMetadataApplied = null;
 				}.bind(this);
 
 				if (this.bDelegateInitialized && this.getControlDelegate().fetchProperties) {
-					try {
-						this.getControlDelegate().fetchProperties(this).then(function(aProperties) {
-							this._aProperties = aProperties;
-							fnResolveMetadata();
-						}.bind(this), function(sMsg) {
-							Log.error(sMsg);
-							fnResolveMetadata();
-						});
-					} catch (ex) {
-						Log.error("Exception during fetchProperties occured: " + ex.message);
+					this.initPropertyHelper(PropertyHelper).then(function(oPropertyHelper) {
+						//this._oPropertyHelper = oPropertyHelper;
 						fnResolveMetadata();
-					}
+					});
 				} else {
 					Log.error("Provided delegate '" + this.getDelegate().path + "' not valid.");
 					fnResolveMetadata();
@@ -1390,7 +1445,12 @@ sap.ui.define([
 
 
 	FilterBarBase.prototype.getPropertyInfoSet = function() {
-		return this._aProperties || [];
+		try {
+			var oPropertyHelper = this.getPropertyHelper();
+			return oPropertyHelper ? oPropertyHelper.getProperties() : [];
+		} catch (ex) {
+			return [];
+		}
 	};
 
 	FilterBarBase.prototype._getNonHiddenPropertyInfoSet = function() {
@@ -1454,7 +1514,7 @@ sap.ui.define([
 
 	FilterBarBase.prototype._cleanUpFilterFieldInErrorState = function(oFilterField) {
 
-		if (oFilterField.getRequired() && (oFilterField.getValueState() !== ValueState.None)) {
+		if (oFilterField && (oFilterField.getValueState() !== ValueState.None)) {
 			oFilterField.setValueState(ValueState.None);
 		}
 
@@ -1605,7 +1665,9 @@ sap.ui.define([
 
 	FilterBarBase.prototype._changesApplied = function() {
 
-		this._bIgnoreChanges = false;
+		if (!this._isChangeApplying()) {
+			this._bIgnoreChanges = false;
+		}
 
 		this._reportModelChange(this._bExecuteOnSelect, this._bDoNotTriggerFiltersChangeEventBasedOnVariantSwitch);
 		this._bExecuteOnSelect = undefined;
@@ -1687,7 +1749,6 @@ sap.ui.define([
 		this._bPersistValues = null;
 
 		this._oDelegate = null;
-		this._aProperties = null;
 
 		this._oFlexPromise = null;
 
@@ -1696,7 +1757,7 @@ sap.ui.define([
 
 		this._oInitialFiltersAppliedPromise = null;
 
-		this._oSearchPromise = null;
+		this._oValidationPromise = null;
 
 		this._aBindings = null;
 

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

@@ -0,0 +1,52 @@
+/*
+ * ! OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+*/
+
+sap.ui.define([
+	"../util/PropertyHelper"
+], function(
+	PropertyHelperBase
+) {
+	"use strict";
+
+	/**
+	 * Constructor for a new filter bar property helper.
+	 *
+	 * @param {object[]} aProperties
+	 *     The properties to process in this helper
+	 * @param {object<string, object>} [mExtensions]
+	 *     Key-value map, where the key is the name of the property and the value is the extension containing mode-specific information.
+	 *     The extension of a property is stored in a reserved <code>extension</code> attribute and its attributes must be specified with
+	 *     <code>mExtensionAttributeMetadata</code>.
+	 * @param {sap.ui.base.ManagedObject} [oParent]
+	 *     A reference to an instance that will act as the parent of this helper
+	 * @param {object} [mExtensionAttributeMetadata]
+	 *     The attribute metadata for the model-specific property extension
+	 *
+	 * @class
+	 * Filter bar property helpers give a consistent and standardized view on properties and their attributes.
+	 * Validates the given properties, sets defaults, and provides utilities to work with these properties.
+	 * The utilities can only be used for properties that are known to the helper. Known properties are all those that are passed to the constructor.
+	 *
+	 * @extends sap.ui.mdc.util.PropertyHelper
+	 *
+	 * @author SAP SE
+	 * @version 1.96.1
+	 *
+	 * @private
+	 * @experimental
+	 * @since 1.95
+	 * @alias sap.ui.mdc.filterbar.PropertyHelper
+	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
+	 */
+	var PropertyHelper = PropertyHelperBase.extend("sap.ui.mdc.filterbar.PropertyHelper", {
+		constructor: function(aProperties, mExtensions, oParent, mExtensionAttributeMetadata) {
+			var aAllowedAttributes = ["required", "hiddenFilter"];
+			PropertyHelperBase.call(this, aProperties, mExtensions, oParent, aAllowedAttributes, mExtensionAttributeMetadata);
+		}
+	});
+
+	return PropertyHelper;
+});

package/src/sap/ui/mdc/filterbar/p13n/AdaptationFilterBar.js

@@ -4,8 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/mdc/filterbar/p13n/GroupContainer", "sap/ui/mdc/filterbar/p13n/FilterGroupLayout","sap/ui/mdc/filterbar/p13n/TableContainer", "sap/ui/mdc/filterbar/p13n/FilterColumnLayout", "sap/ui/mdc/filterbar/FilterBarBase", "sap/ui/mdc/filterbar/FilterBarBaseRenderer", 'sap/base/Log'
-], function( GroupContainer, FilterGroupLayout, TableContainer, FilterColumnLayout, FilterBarBase, FilterBarBaseRenderer, Log) {
+	"sap/ui/mdc/filterbar/p13n/GroupContainer", "sap/ui/mdc/filterbar/p13n/FilterGroupLayout","sap/ui/mdc/filterbar/p13n/TableContainer", "sap/ui/mdc/filterbar/p13n/FilterColumnLayout", "sap/ui/mdc/filterbar/FilterBarBase", "sap/ui/mdc/filterbar/FilterBarBaseRenderer"
+], function( GroupContainer, FilterGroupLayout, TableContainer, FilterColumnLayout, FilterBarBase, FilterBarBaseRenderer) {
 	"use strict";
 
 	/**
@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.mdc.filterbar.FilterBarBase
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 * @constructor
 	 * @private
 	 * @since 1.80.0
@@ -129,6 +129,13 @@ sap.ui.define([
 		this.triggerSearch();
 	};
 
+
+	AdaptationFilterBar.prototype.initPropertyHelper = function(){
+		return this.getAdaptationControl().awaitPropertyHelper().then(function(oPropertyHelper) {
+			this._oPropertyHelper = oPropertyHelper;
+		}.bind(this));
+	};
+
 	/**
 	 * Method which will initialize the <code>AdaptationFilterBar</code> and create the required FilterFields
 	 *
@@ -307,54 +314,6 @@ sap.ui.define([
 		this.oAdaptationModel = null;
 	};
 
-	AdaptationFilterBar.prototype._retrieveMetadata = function() {
-
-		if (this._oMetadataAppliedPromise) {
-			return this._oMetadataAppliedPromise;
-		}
-
-		this._fResolveMetadataApplied = undefined;
-		this._oMetadataAppliedPromise = new Promise(function(resolve) {
-			this._fResolveMetadataApplied = resolve;
-		}.bind(this));
-
-		var oAdaptationControl = this.getAdaptationControl();
-
-		Promise.all([oAdaptationControl && oAdaptationControl.awaitControlDelegate && oAdaptationControl.awaitControlDelegate(), this.initControlDelegate()]).then(function() {
-			if (!this._bIsBeingDestroyed) {
-
-				this._aProperties = [];
-
-				var fnResolveMetadata = function() {
-					this._fResolveMetadataApplied();
-					this._fResolveMetadataApplied = null;
-				}.bind(this);
-
-				var oParentDelegate = oAdaptationControl.getControlDelegate();
-
-				if (oParentDelegate && oParentDelegate.fetchProperties) {
-					try {
-						oParentDelegate.fetchProperties(oAdaptationControl).then(function(aProperties) {
-							this._aProperties = aProperties;
-							fnResolveMetadata();
-						}.bind(this), function(sMsg) {
-							Log.error(sMsg);
-							fnResolveMetadata();
-						});
-					} catch (ex) {
-						Log.error("Exception during fetchProperties occured: " + ex.message);
-						fnResolveMetadata();
-					}
-				} else {
-					Log.error("Provided delegate '" + this.getDelegate().path + "' not valid.");
-					fnResolveMetadata();
-				}
-			}
-		}.bind(this));
-
-		return this._oMetadataAppliedPromise;
-	};
-
 	return AdaptationFilterBar;
 
 });

package/src/sap/ui/mdc/filterbar/vh/FilterBar.js

@@ -33,7 +33,7 @@ sap.ui.define(
 		 * The metadata information is provided via the {@link sap.ui.mdc.FilterBarDelegate FilterBarDelegate} implementation. This implementation has to be provided by the application.
 		 * @extends sap.ui.mdc.filterbar.FilterBarBase
 		 * @author SAP SE
-		 * @version 1.93.3
+		 * @version 1.96.1
 		 * @constructor
 		 * @private
 		 * @since 1.84.0

package/src/sap/ui/mdc/flexibility/ActionToolbar.flexibility.js

@@ -0,0 +1,22 @@
+/*
+ * ! OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	'./ItemBaseFlex'
+], function(ItemBaseFlex) {
+	"use strict";
+
+    var oActionFlex = Object.assign({}, ItemBaseFlex);
+    oActionFlex.findItem = function(oModifier, aActions, sName) {
+		return sap.ui.getCore().byId(sName);
+	};
+
+	return {
+        "moveControls": "default",
+        moveAction: oActionFlex.createMoveChangeHandler()
+	};
+
+});

package/src/sap/ui/mdc/flexibility/ActionToolbarAction.flexibility.js

@@ -0,0 +1,19 @@
+/*
+ * ! OpenUI5
+ * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([], function() {
+	"use strict";
+
+	return {
+		unhideControl: {
+			changeHandler: "default"
+		},
+		hideControl: {
+			changeHandler: "default"
+		}
+	};
+
+});

package/src/sap/ui/mdc/flexibility/Chart.flexibility.js

@@ -12,7 +12,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.mdc.flexibility.Chart
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 */
 	return {
 		addItem: ChartItemFlex.addItem,

package/src/sap/ui/mdc/flexibility/ConditionFlex.js

@@ -8,6 +8,28 @@ sap.ui.define([
 ], function(merge, FilterOperatorUtil) {
 	"use strict";
 
+	/*
+	* NOTE: As the ConditionFlex is the central changehandler for filter condition
+	* processing, it might happen that the in/out handling of the ConditionModel
+	* might cause multiple condition changes to be applied in parallel. Due to the
+	* asynchronous modifier handling, we need to make sure to queue these changes in their
+	* incoming order as parallel processing might falsely overwrite the 'filterConditions'
+	* property causing the changehandler to break the controls housekeeping and the last
+	* parallel filter change would always win.
+	*/
+	var fnQueueChange = function(oControl, fTask) {
+		var fCleanupPromiseQueue = function(pOriginalPromise) {
+			if (oControl._pQueue === pOriginalPromise){
+				delete oControl._pQueue;
+			}
+		};
+
+		oControl._pQueue = oControl._pQueue instanceof Promise ? oControl._pQueue.then(fTask) : fTask();
+		oControl._pQueue.then(fCleanupPromiseQueue.bind(null, oControl._pQueue));
+
+		return oControl._pQueue;
+	};
+
 	var fDetermineFilterControl = function(oControl) {
 		var oController = oControl && oControl.getEngine ? oControl.getEngine().getController(oControl, "Filter") : null;
 		return oController ? oController.getFilterControl() : null;
@@ -21,54 +43,48 @@ sap.ui.define([
 			oFilterControl.applyConditionsAfterChangesApplied();
 		}
 
-		return new Promise(function(resolve, reject) {
-
+		return fnQueueChange(oControl, function(){
 			var mConditionsData, aConditions = null, oModifier = mPropertyBag.modifier;
 
-			Promise.resolve()
-				.then(oModifier.getProperty.bind(oModifier, oControl, "filterConditions"))
-				.then(function(mFilterConditions) {
-					// 'filterConditions' property needs to be updated for change selector
-					mConditionsData = merge({}, mFilterConditions);
-					if (mConditionsData) {
-						for (var sFieldPath in mConditionsData) {
-							if (sFieldPath === oChangeContent.name) {
-								aConditions = mConditionsData[sFieldPath];
-								break;
-							}
+			return oModifier.getProperty(oControl, "filterConditions")
+			.then(function(mFilterConditions) {
+				// 'filterConditions' property needs to be updated for change selector
+				mConditionsData = merge({}, mFilterConditions);
+				if (mConditionsData) {
+					for (var sFieldPath in mConditionsData) {
+						if (sFieldPath === oChangeContent.name) {
+							aConditions = mConditionsData[sFieldPath];
+							break;
 						}
 					}
+				}
 
-					if (!aConditions) {
-						mConditionsData[oChangeContent.name] = [];
-						aConditions = mConditionsData[oChangeContent.name];
-					}
-
-					var nConditionIdx = FilterOperatorUtil.indexOfCondition(oChangeContent.condition, aConditions);
-					if (nConditionIdx < 0) {
-						aConditions.push(oChangeContent.condition);
+				if (!aConditions) {
+					mConditionsData[oChangeContent.name] = [];
+					aConditions = mConditionsData[oChangeContent.name];
+				}
 
-						// 'filterConditions' property needs to be updated for change selector
-						oModifier.setProperty(oControl, "filterConditions", mConditionsData);
+				var nConditionIdx = FilterOperatorUtil.indexOfCondition(oChangeContent.condition, aConditions);
+				if (nConditionIdx < 0) {
+					aConditions.push(oChangeContent.condition);
 
-						if (!bIsRevert) {
-							// Set revert data on the change
-							oChange.setRevertData({
-								name: oChangeContent.name,
-								condition: oChangeContent.condition
-							});
-						}
+					// 'filterConditions' property needs to be updated for change selector
+					oModifier.setProperty(oControl, "filterConditions", mConditionsData);
+
+					if (!bIsRevert) {
+						// Set revert data on the change
+						oChange.setRevertData({
+							name: oChangeContent.name,
+							condition: oChangeContent.condition
+						});
+					}
 
-						// the control providing the filter functionality needs to be used to update the ConditionModel
-						if (oFilterControl && oFilterControl.addCondition) {
-							return oFilterControl.addCondition(oChangeContent.name, oChangeContent.condition);
-						}
+					// the control providing the filter functionality needs to be used to update the ConditionModel
+					if (oFilterControl && oFilterControl.addCondition) {
+						return oFilterControl.addCondition(oChangeContent.name, oChangeContent.condition);
 					}
-				})
-				.then(resolve)
-				.catch(function(oError) {
-					reject(oError);
-				});
+				}
+			});
 		});
 	};
 
@@ -80,11 +96,10 @@ sap.ui.define([
 			oFilterControl.applyConditionsAfterChangesApplied();
 		}
 
-		return new Promise(function(resolve, reject) {
+		return fnQueueChange(oControl, function(){
 			var mConditionsData, aConditions, nDelIndex = -1, oModifier = mPropertyBag.modifier;
 
-			Promise.resolve()
-				.then(oModifier.getProperty.bind(oModifier, oControl, "filterConditions"))
+			return oModifier.getProperty(oControl, "filterConditions")
 				.then(function(mFilterConditions) {
 					// 'filterConditions' property needs to be updated for change selector
 					mConditionsData = merge({}, mFilterConditions);
@@ -123,10 +138,6 @@ sap.ui.define([
 							}
 						}
 					}
-				})
-				.then(resolve)
-				.catch(function(oError) {
-					reject(oError);
 				});
 		});
 	};

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

@@ -12,7 +12,7 @@ sap.ui.define(['./FilterItemFlex', './ConditionFlex'], function(FilterItemFlex,
 	 *
 	 * @alias sap.ui.mdc.flexibility.FilterBar
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 */
 
 	return {

package/src/sap/ui/mdc/flexibility/FilterItemFlex.js

@@ -12,7 +12,7 @@ sap.ui.define(['./ItemBaseFlex'], function(ItemBaseFlex) {
 	 *
 	 * @alias sap.ui.mdc.flexibility.FilterBar
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.1
 	 */
 
 	var oFilterItemFlex = Object.assign({}, ItemBaseFlex);