@openui5/sap.ui.mdc 1.97.1 → 1.100.0

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

@@ -6,7 +6,6 @@
 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/Log',
@@ -17,8 +16,6 @@ sap.ui.define([
 	'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",
@@ -29,7 +26,6 @@ sap.ui.define([
 	function(
 		FilterController,
 		coreLibrary,
-		FlexUtil,
 		Device,
 		Control,
 		Log,
@@ -40,8 +36,6 @@ sap.ui.define([
 		Condition,
 		IdentifierUtil,
 		ConditionConverter,
-		StateUtil,
-		FilterConverter,
 		FilterUtil,
 		PropertyHelper,
 		ControlVariantApplyAPI,
@@ -60,7 +54,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.97.1
+	 * @version 1.100.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -149,6 +143,18 @@ sap.ui.define([
 					defaultValue: {}
 				},
 
+				/**
+				 * Specifies the filter metadata.<br>
+				 * <b>Note</b>: This property must not be bound.<br>
+				 * <b>Note</b>: This property is used exclusively for SAPUI5 flexibility/ Fiori Elements. Do not use it otherwise.
+				 *
+				 * @since 1.97
+				 */
+				propertyInfo: {
+					type: "object",
+					defaultValue: []
+				},
+
 				/**
 				 * If set to <code>true</code>, all search requests are ignored. Once it has been set to <code>false</code>,
 				 * a search is triggered immediately if one or more search requests have been triggered in the meantime
@@ -363,14 +369,35 @@ sap.ui.define([
 	};
 
 	FilterBarBase.prototype.applySettings = function(mSettings, oScope) {
+		this._setPropertyHelperClass(PropertyHelper);
+		this._setupPropertyInfoStore("propertyInfo");
+		this._applySettings(mSettings, oScope);
+		//this._initControlDelegate();
+		Promise.all([this.awaitPropertyHelper()]).then(function() {
+			if (!this._bIsBeingDestroyed) {
+				this._applyInitialFilterConditions();
+			}
+		}.bind(this));
+	};
+
+	FilterBarBase.prototype._applySettings = function(mSettings, oScope) {
 		Control.prototype.applySettings.apply(this, arguments);
 
 		this._createConditionModel();
 
 		this._oConditionModel.attachPropertyChange(this._handleConditionModelPropertyChange, this);
+	};
+
+//	FilterBarBase.prototype._initControlDelegate = function() {
+//		Promise.all([this.awaitPropertyHelper()]).then(function() {
+//			if (!this._bIsBeingDestroyed) {
+//				this._applyInitialFilterConditions();
+//			}
+//		}.bind(this));
+//	};
 
-		//this._retrieveMetadata();
-		this._retrieveMetadata().then(function() {
+	FilterBarBase.prototype._waitForMetadata = function() {
+		return this._retrieveMetadata().then(function() {
 			this._applyInitialFilterConditions();
 		}.bind(this));
 	};
@@ -431,38 +458,31 @@ sap.ui.define([
 	 * @returns {object} object containing the current status of the FilterBarBase
 	 */
 	FilterBarBase.prototype.getCurrentState = function() {
-		//return this.initialized().then(function() {
-
-			var oState = {};
-
-			if (this._bPersistValues) {
-				var aIgnoreFieldNames = [];
-				var mConditions = merge({}, this.getFilterConditions());
-				for (var sKey in mConditions) {
-					if (!this._getPropertyByName(sKey)) {
-						aIgnoreFieldNames.push(sKey);
-					}
+		var mFilters = {};
+		var oState = {};
+
+		if (this._bPersistValues) {
+			var mConditions = merge({}, this.getFilterConditions());
+			for (var sKey in mConditions) {
+				if (this._getPropertyByName(sKey)) {
+					mFilters[sKey] = mConditions[sKey];
+					//mMetadata[sKey] = mConditions[sKey].metadata;
 				}
-
-				aIgnoreFieldNames.forEach(function(sKey) {
-					delete mConditions[sKey];
-				});
-
-				oState.filter = mConditions;
 			}
+			oState.filter = mFilters;
+		}
 
-			var aFilterItems = this.getFilterItems();
-			var aItems = [];
-			aFilterItems.forEach(function(oFilterField, iIndex){
-				aItems.push({
-					name: oFilterField.getFieldPath()
-				});
+		var aFilterItems = this.getFilterItems();
+		var aItems = [];
+		aFilterItems.forEach(function(oFilterField, iIndex){
+			aItems.push({
+				name: oFilterField.getFieldPath()
 			});
+		});
 
-			oState.items = aItems;
+		oState.items = aItems;
 
-			return oState;
-		//}.bind(this));
+		return oState;
 	};
 
 	/**
@@ -605,8 +625,42 @@ sap.ui.define([
 		return this.getEngine().isModificationSupported(this);
 	};
 
+	FilterBarBase.prototype.getPropertyInfoSet = function() {
+		return this.getPropertyHelper() ? this.getPropertyHelper().getProperties() : [];
+	};
+
+
+	FilterBarBase.prototype._addConditionChange = function(mOrigConditions, sFieldPath) {
+
+		this.getEngine().createChanges({
+			control: this,
+			key: "Filter",
+			state: mOrigConditions
+		});
+	};
+
+	FilterBarBase.prototype._registerOnEngineOnModificationEnd = function() {
+		this._oConditionChangeStartedPromise = new Promise(function(resolve) {
+			this._fConditionChangeStartedPromiseResolve = resolve;
+		}.bind(this));
+	};
+
+	FilterBarBase.prototype._onChangeAppliance = function() {
+		if (this._fConditionChangeStartedPromiseResolve) {
+			this._fConditionChangeStartedPromiseResolve();
+			this._fConditionChangeStartedPromiseResolve = null;
+		}
+	};
+
 	FilterBarBase.prototype._handleConditionModelPropertyChange = function(oEvent) {
 
+		var fAddConditionChange = function(sFieldPath, aConditions) {
+			var mOrigConditions = {};
+			mOrigConditions[sFieldPath] = this._stringifyConditions(sFieldPath, merge([], aConditions));
+			this._cleanupConditions(mOrigConditions[sFieldPath]);
+			this._addConditionChange(mOrigConditions, sFieldPath);
+		}.bind(this);
+
 		if (!this._bIgnoreChanges) {
 
 			var sPath = oEvent.getParameter("path");
@@ -615,21 +669,18 @@ sap.ui.define([
 				var sFieldPath = sPath.substring("/conditions/".length);
 
 				if (this._bPersistValues && this._isPersistenceSupported()) {
-					var mOrigConditions = {};
-					mOrigConditions[sFieldPath] = this._stringifyConditions(sFieldPath, merge([], oEvent.getParameter("value")));
-					this._cleanupConditions(mOrigConditions[sFieldPath]);
-
-					var oChangePromise = this.getEngine().createChanges({
-						control: this,
-						key: "Filter",
-						state: mOrigConditions
-					});
 
-					if (!this._aCollectedChangePromises) {
-						this._aCollectedChangePromises = [];
-					}
+					this._registerOnEngineOnModificationEnd();
 
-					this._aCollectedChangePromises.push(oChangePromise);
+					var aConditions = oEvent.getParameter("value");
+
+					if (this._getPropertyByName(sFieldPath)) {
+						fAddConditionChange(sFieldPath, aConditions);
+					} else {
+						this._retrieveMetadata().then(function() {
+							fAddConditionChange(sFieldPath, aConditions);
+						});
+					}
 
 				} else {
 					this._reportModelChange(false);
@@ -730,32 +781,26 @@ sap.ui.define([
 	};
 
 	FilterBarBase.prototype._handleAssignedFilterNames = function(bFiltersAggregationChanged, bDoNotTriggerFiltersChangeEventBasedOnVariantSwitch) {
-		if (!this._oMetadataAppliedPromise) {
-			return;  // may occure when filterItems are added during pre processing.
+		if (this._bIsBeingDestroyed) {
+			return;
 		}
 
-		this._oMetadataAppliedPromise.then(function() {
-
-			if (this._bIsBeingDestroyed) {
-				return;
-			}
-
-			if (!bFiltersAggregationChanged) {
-				if (this._btnAdapt) {
-					var aFilterNames = this.getAssignedFilterNames();
-					this.setProperty("_filterCount", this._oRb.getText(aFilterNames.length ? "filterbar.ADAPT_NONZERO" : "filterbar.ADAPT", aFilterNames.length), false);
-				}
+		if (!bFiltersAggregationChanged) {
+			if (this._btnAdapt) {
+				var aFilterNames = this.getAssignedFilterNames();
+				this.setProperty("_filterCount", this._oRb.getText(aFilterNames.length ? "filterbar.ADAPT_NONZERO" : "filterbar.ADAPT", aFilterNames.length), false);
 			}
+		}
 
-			var mTexts = this._getAssignedFiltersText();
-			var oObj = {
+		var mTexts = this._getAssignedFiltersText();
+		var oObj = {
 				conditionsBased: (!bFiltersAggregationChanged && !bDoNotTriggerFiltersChangeEventBasedOnVariantSwitch),
 				filtersText: mTexts.filtersText,
 				filtersTextExpanded: mTexts.filtersTextExpanded
-			};
+		};
+
+		this.fireFiltersChanged(oObj);
 
-			this.fireFiltersChanged(oObj);
-		}.bind(this));
 	};
 
 	FilterBarBase.prototype.onReset = function(oEvent) {
@@ -801,7 +846,7 @@ sap.ui.define([
 
 		var bFireSearch = !bSuppressSearch;
 
-		return this.initialized().then(function() {
+		var fValidateFc = function() {
 			if (!this._oValidationPromise) {
 
 				this._oValidationPromise = new Promise(function(resolve, reject) {
@@ -817,7 +862,16 @@ sap.ui.define([
 			}
 
 			return this._oValidationPromise;
+		}.bind(this);
 
+		return this.initialized().then(function() {
+			if (!this.isPropertyHelperFinal()) {
+				return this._retrieveMetadata().then(function() {
+					return fValidateFc();
+				});
+			} else {
+				return fValidateFc();
+			}
 		}.bind(this));
 	};
 
@@ -828,7 +882,6 @@ sap.ui.define([
 		}
 	};
 
-
 	FilterBarBase.prototype._getRequiredFieldsWithoutValues = function() {
 		var aReqFiltersWithoutValue = [];
 		this._getRequiredPropertyNames().forEach(function(sName) {
@@ -893,14 +946,7 @@ sap.ui.define([
 		var oPromise = oEvent.getParameter("promise");
 		if (oPromise) {
 			oPromise.then(function() {
-				if (this._aCollectedChangePromises && this._aCollectedChangePromises.length > 0) {
-					var aChangePromises = this._aCollectedChangePromises.slice();
-					Promise.all(aChangePromises).then(function() {
-						this.triggerSearch();
-					}.bind(this));
-				} else {
-					this.triggerSearch();
-				}
+				this.triggerSearch();
 			}.bind(this)).catch(function(oEx) {
 				Log.error(oEx);
 			});
@@ -984,18 +1030,6 @@ sap.ui.define([
 		}
 	};
 
-	FilterBarBase.prototype._waitForChangeAppliance = function(bFireSearch) {
-
-		var aChangePromises = this._aCollectedChangePromises.slice();
-		this._aCollectedChangePromises = null;
-
-		Promise.all(aChangePromises).then(function(aConditionsArray) {
-			this._validate(bFireSearch);
-		}.bind(this), function(aConditionsArray) {
-			this._validate(bFireSearch);
-		}.bind(this));
-	};
-
 	/**
 	 * Executes the search.
 	 * @private
@@ -1014,6 +1048,12 @@ sap.ui.define([
 			this._fResolvedSearchPromise = null;
 		}.bind(this);
 
+		var fnValidationSucceeds = function() {
+			fnCheckAndFireSearch();
+			this._fResolvedSearchPromise();
+			fnCleanup();
+		}.bind(this);
+
 		if (this.bIsDestroyed) {
 			fnCleanup();
 			return;
@@ -1027,22 +1067,13 @@ sap.ui.define([
 			return;
 		}
 
-		if (this._aCollectedChangePromises && (this._aCollectedChangePromises.length > 0)) {
-			this._waitForChangeAppliance(bFireSearch);
-			return;
-		}
-
 		if (vRetErrorState === ErrorState.NoError) {
-			if (this._isChangeApplying()) {
-				this._oFlexPromise.then(function() {
-					fnCheckAndFireSearch();
-					this._fResolvedSearchPromise();
-					fnCleanup();
-				}.bind(this));
+			if (this._oConditionChangeStartedPromise) {
+				this._oConditionChangeStartedPromise.then(function() {
+					fnValidationSucceeds();
+				});
 			} else {
-				fnCheckAndFireSearch();
-				this._fResolvedSearchPromise();
-				fnCleanup();
+				fnValidationSucceeds();
 			}
 		} else {
 			if (vRetErrorState === ErrorState.RequiredHasNoValue) {
@@ -1100,7 +1131,15 @@ sap.ui.define([
 		return Promise.all([this._oInitialFiltersAppliedPromise, this._oMetadataAppliedPromise]);
 	};
 
+	FilterBarBase.prototype._initialized = function() {
+		return this.waitForInitialization();
+	};
+
 	FilterBarBase.prototype.initialized = function() {
+
+		if (!this._oMetadataAppliedPromise) {
+			this._retrieveMetadata();
+		}
 		return this.waitForInitialization();
 	};
 
@@ -1140,75 +1179,155 @@ sap.ui.define([
 		}.bind(this) : undefined;
 	};
 
+	FilterBarBase.prototype._isPathKnownAsync = function(sFieldPath, oXCondition) {
+		var sName, sKey, aPromises = [];
+
+		aPromises.push(this._getPropertyByNameAsync(sFieldPath));
+		for (sKey in oXCondition["inParameters"]) {
+			sName = sKey.startsWith("conditions/") ? sKey.slice(11) : sKey; // just use field name
+			aPromises.push(this._getPropertyByNameAsync(sName));
+		}
+
+		for (sKey in oXCondition["outParameters"]) {
+			sName = sKey.startsWith("conditions/") ? sKey.slice(11) : sKey; // just use field name
+			aPromises.push(this._getPropertyByNameAsync(sName));
+		}
+
+		return Promise.all(aPromises);
+	};
+
+	FilterBarBase.prototype._isPathKnown = function(sFieldPath, oXCondition) {
+		var sKey, sName;
+
+		if (!this._getPropertyByName(sFieldPath)) {
+			return false;
+		}
+
+		for (sKey in oXCondition["inParameters"]) {
+			sName = sKey.startsWith("conditions/") ? sKey.slice(11) : sKey; // just use field name
+			if (!this._getPropertyByName(sName)) {
+				return false;
+			}
+		}
+		for (sKey in oXCondition["outParameters"]) {
+			sName = sKey.startsWith("conditions/") ? sKey.slice(11) : sKey; // just use field name
+			if (!this._getPropertyByName(sName)) {
+				return false;
+			}
+		}
+
+		return true;
+	};
+
+	FilterBarBase.prototype._removeCondition = function(sFieldPath, oXCondition, oCM) {
+		var oProperty = this._getPropertyByName(sFieldPath);
+		if (oProperty) {
+			var oCondition = this._toInternal(oProperty, oXCondition);
+			if (oCM.indexOf(sFieldPath, oCondition, _fnNormalizeCondition.call(this, oProperty)) >= 0) {
+				oCM.removeCondition(sFieldPath, oCondition);
+			}
+		}
+	};
+
 	FilterBarBase.prototype.removeCondition = function(sFieldPath, oXCondition) {
-		return this.initialized().then(function() {
+		return this._initialized().then(function() {
 			var oCM = this._getConditionModel();
 			if (oCM) {
-				var oProperty = this._getPropertyByName(sFieldPath);
-				if (oProperty) {
-					var oCondition = this._toInternal(oProperty, oXCondition);
-					if (oCM.indexOf(sFieldPath, oCondition, _fnNormalizeCondition.call(this, oProperty)) >= 0) {
-						oCM.removeCondition(sFieldPath, oCondition);
-					}
-				}
+				this._isPathKnownAsync(sFieldPath, oXCondition).then(function() {
+					this._removeCondition(sFieldPath, oXCondition, oCM);
+				}.bind(this));
 			}
 		}.bind(this));
 	};
 
+	FilterBarBase.prototype._addCondition = function(sFieldPath, oXCondition, oCM) {
+		var oProperty = this._getPropertyByName(sFieldPath);
+		if (oProperty) {
+			var oCondition = this._toInternal(oProperty, oXCondition);
+			if (oCM.indexOf(sFieldPath, oCondition, _fnNormalizeCondition.call(this, oProperty)) < 0) {
+				var mCondition = {};
+				mCondition[sFieldPath] = [oCondition];
+				FilterController.checkConditionOperatorSanity(mCondition); //check if the single condition's operator is valid
+				var aConditions = mCondition[sFieldPath];
+				if (aConditions && aConditions.length > 0){
+					this._cleanUpFilterFieldInErrorStateByName(sFieldPath);
+					oCM.addCondition(sFieldPath, oCondition);
+				}
+			}
+		}
+	};
+
 	FilterBarBase.prototype.addCondition = function(sFieldPath, oXCondition) {
-		return this.initialized().then(function() {
+		return this._initialized().then(function() {
 			var oCM = this._getConditionModel();
 			if (oCM) {
-				var oProperty = this._getPropertyByName(sFieldPath);
-				if (oProperty) {
-					var oCondition = this._toInternal(oProperty, oXCondition);
-					if (oCM.indexOf(sFieldPath, oCondition, _fnNormalizeCondition.call(this, oProperty)) < 0) {
-						var mCondition = {};
-						mCondition[sFieldPath] = [oCondition];
-						FilterController.checkConditionOperatorSanity(mCondition); //check if the single condition's operator is valid
-						var aConditions = mCondition[sFieldPath];
-						if (aConditions && aConditions.length > 0){
-							this._cleanUpFilterFieldInErrorStateByName(sFieldPath);
-							oCM.addCondition(sFieldPath, oCondition);
-						}
-					}
-				}
+				this._isPathKnownAsync(sFieldPath, oXCondition).then(function() {
+					this._addCondition(sFieldPath, oXCondition, oCM);
+				}.bind(this));
 			}
 		}.bind(this));
 
 	};
 
-	FilterBarBase.prototype._setXConditions = function(aConditionsData, bRemoveBeforeApplying) {
-		var oProperty, aConditions, oConditionModel = this._getConditionModel();
+	FilterBarBase.prototype._setXConditions = function(mConditionsData, bRemoveBeforeApplying) {
+		var sFieldPath, oProperty, aConditions, oConditionModel = this._getConditionModel();
 
-		if (bRemoveBeforeApplying) {
-			oConditionModel.removeAllConditions();
-		}
-
-		if (aConditionsData) {
-			for ( var sFieldPath in aConditionsData) {
-				aConditions = aConditionsData[sFieldPath];
+		var fPromiseResolve = null;
+		var oPromise = new Promise(function(resolve, reject) {
+			fPromiseResolve = resolve;
+		});
 
+		var fApplyConditions = function(mConditionsData) {
+			for ( sFieldPath in mConditionsData) {
+				aConditions = mConditionsData[sFieldPath];
 				oProperty = this._getPropertyByName(sFieldPath);
 				if (oProperty) {
 
 					if (aConditions.length === 0) {
 						oConditionModel.removeAllConditions(sFieldPath);
 					} else {
+						if (oProperty.maxConditions !== -1) {
+							oConditionModel.removeAllConditions(sFieldPath);
+						}
+
 						/* eslint-disable no-loop-func */
 						aConditions.forEach(function(oCondition) {
-							if (oProperty.maxConditions !== -1) {
-								oConditionModel.removeAllConditions(sFieldPath);
-							}
-
-							var oNewCondition = this._toInternal(oProperty, oCondition);
-							oConditionModel.addCondition(sFieldPath, oNewCondition);
+							this._addCondition(sFieldPath, oCondition, oConditionModel);
 						}.bind(this));
 						/* eslint-enabled no-loop-func */
 					}
 				}
 			}
+
+			fPromiseResolve();
+		}.bind(this);
+
+		if (bRemoveBeforeApplying) {
+			oConditionModel.removeAllConditions();
+		}
+
+		if (mConditionsData) {
+
+			var bAllPropertiesKnown = true;
+			for ( sFieldPath in mConditionsData) {
+				aConditions = mConditionsData[sFieldPath];
+
+				if (!this._isPathKnown(sFieldPath, aConditions)) {
+					bAllPropertiesKnown = false;
+					break;
+				}
+			}
+
+			if (!bAllPropertiesKnown) {
+				this._retrieveMetadata().then(function() {
+					fApplyConditions(mConditionsData);
+				});
+			} else {
+				fApplyConditions(mConditionsData);
+			}
 		}
+
+		return oPromise;
 	};
 
 	FilterBarBase.prototype._getXConditions = function () {
@@ -1405,27 +1524,28 @@ sap.ui.define([
 		}
 
 		this._fResolveMetadataApplied = undefined;
-		this._oMetadataAppliedPromise = new Promise(function(resolve) {
+		this._oMetadataAppliedPromise = new Promise(function(resolve, reject) {
 			this._fResolveMetadataApplied = resolve;
+			this._fRejectMetadataApplied = reject;
 		}.bind(this));
 
 
 		this.initControlDelegate().then(function() {
 			if (!this._bIsBeingDestroyed) {
 
-				var fnResolveMetadata = function() {
-					this._fResolveMetadataApplied();
+				var fnResolveMetadata = function(bFlag) {
+					bFlag ? this._fResolveMetadataApplied() : this._fRejectMetadataApplied();
 					this._fResolveMetadataApplied = null;
+					this._fRejectMetadataApplied = null;
 				}.bind(this);
 
-				if (this.bDelegateInitialized && this.getControlDelegate().fetchProperties) {
-					this.initPropertyHelper(PropertyHelper).then(function(oPropertyHelper) {
-						//this._oPropertyHelper = oPropertyHelper;
-						fnResolveMetadata();
+				if (this.bDelegateInitialized) {
+					this.finalizePropertyHelper().then(function() {
+						fnResolveMetadata(true);
 					});
 				} else {
-					Log.error("Provided delegate '" + this.getDelegate().path + "' not valid.");
-					fnResolveMetadata();
+					Log.error("Delegate not initialized.");
+					fnResolveMetadata(false);
 				}
 			}
 		}.bind(this));
@@ -1452,15 +1572,6 @@ sap.ui.define([
 	};
 
 
-	FilterBarBase.prototype.getPropertyInfoSet = function() {
-		try {
-			var oPropertyHelper = this.getPropertyHelper();
-			return oPropertyHelper ? oPropertyHelper.getProperties() : [];
-		} catch (ex) {
-			return [];
-		}
-	};
-
 	FilterBarBase.prototype._getNonHiddenPropertyInfoSet = function() {
 		var aVisibleProperties = [];
 		this.getPropertyInfoSet().every(function(oProperty) {
@@ -1491,9 +1602,6 @@ sap.ui.define([
 		return oProperty;
 	};
 
-	FilterBarBase.prototype._getPropertyByName = function(sName) {
-		return FilterUtil.getPropertyByKey(this.getPropertyInfoSet(), sName);
-	};
 
 	FilterBarBase.prototype._cleanUpFilterFieldInErrorStateByName = function(sFieldName) {
 		var oFilterField = null;
@@ -1547,40 +1655,6 @@ sap.ui.define([
 		}.bind(this));
 	};
 
-	FilterBarBase.prototype._getWaitForChangesPromise = function() {
-		return this.getEngine().waitForChanges(this);
-	};
-
-	FilterBarBase.prototype._suspendBinding = function(oFilterField) {
-
-		if (oFilterField) {
-			var oBinding = oFilterField.getBinding("conditions");
-			if (oBinding) {
-				if (!this._aBindings) {
-					this._aBindings = [];
-				}
-				oBinding.suspend();
-				this._aBindings.push(oFilterField);
-			}
-		}
-	};
-
-	FilterBarBase.prototype._resumeBindings = function() {
-		if (this._aBindings) {
-			this._aBindings.forEach(function(oFilterField) {
-				if (!oFilterField.bIsDestroyed) {
-					var oBinding = oFilterField.getBinding("conditions");
-					if (oBinding) {
-						oBinding.resume();
-					}
-				}
-			});
-
-			this._aBindings = null;
-		}
-	};
-
-
 	FilterBarBase.prototype._isChangeApplying = function() {
 		return  !!this._oFlexPromise;
 	};
@@ -1589,25 +1663,26 @@ sap.ui.define([
 
 		this._bIgnoreChanges = true;
 
-		this._applyFilterConditionsChanges();
-
-		this._changesApplied();
+		this._applyFilterConditionsChanges().then(function() {
 
-		this._bInitialFiltersApplied = true;
-		this._fResolveInitialFiltersApplied();
-		this._fResolveInitialFiltersApplied = null;
+			this._changesApplied();
+			this._bInitialFiltersApplied = true;
+			this._fResolveInitialFiltersApplied();
+			this._fResolveInitialFiltersApplied = null;
+		}.bind(this));
 	};
 
 	FilterBarBase.prototype._applyFilterConditionsChanges = function() {
 
-		var aConditionsData;
+		var mSettings, mConditionsData;
 
-		var mSettings = this.getProperty("filterConditions");
+		mSettings = this.getProperty("filterConditions");
 		if (Object.keys(mSettings).length > 0) {
-
-			aConditionsData = merge([], mSettings);
-			this._setXConditions(aConditionsData, true, true);
+			mConditionsData = merge({}, mSettings);
+			return this._setXConditions(mConditionsData, true);
 		}
+
+		return Promise.resolve();
 	};
 
 	FilterBarBase.prototype.setVariantBackreference = function(oVariant) {
@@ -1770,9 +1845,11 @@ sap.ui.define([
 		this._aBindings = null;
 
 		this._aFIChanges = null;
-		this._aCollectedChangePromises = null;
+
+		this._oConditionChangeStartedPromise = null;
+		this._fConditionChangeStartedPromiseResolve	= undefined;
 	};
 
 	return FilterBarBase;
 
-});
+});