@openui5/sap.ui.mdc 1.93.0 → 1.93.4

package/src/sap/ui/mdc/field/FieldValueHelp.js

@@ -74,7 +74,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldHelp</code> association of controls based on {@link sap.ui.mdc.field.FieldBase FieldBase} that shows a value help dialog.
 	 * @extends sap.ui.mdc.field.FieldHelpBase
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe
@@ -432,7 +432,7 @@ sap.ui.define([
 				return;
 			}
 
-			var oFilterBar = _getFilterBar.call(this);
+			var oFilterBar = this._getFilterBar();
 			if ((oDialog && oOrigin === oDialog) ||
 					(oFilterBar && oOrigin === oFilterBar)) {
 				if (oOrigin.bOutput && !this._bIsBeingDestroyed) {
@@ -759,7 +759,7 @@ sap.ui.define([
 	function _cleanupFilters() { // TODO: really needed or better use single requests if needed by getText or description?
 
 		// remove filters: update table only if filter exist
-		var oFilterBar = _getFilterBar.call(this);
+		var oFilterBar = this._getFilterBar();
 		var oConditions;
 
 		if (oFilterBar) {
@@ -1889,7 +1889,7 @@ sap.ui.define([
 			}
 			if (bFilters) {
 				// return filters for filtering
-				var oConditionTypes = _getTypesForConditions.call(this, oHelpParameters);
+				var oConditionTypes = this._getTypesForConditions(oHelpParameters);
 				var oFilter = FilterConverter.createFilters(oHelpParameters, oConditionTypes);
 				oHelpParameters = oFilter;
 			}
@@ -1946,7 +1946,7 @@ sap.ui.define([
 
 		var oWrapper = _getWrapper.call(this, bSuggestion);
 		if (oWrapper) {
-			var oFilterBar = _getFilterBar.call(this);
+			var oFilterBar = this._getFilterBar();
 			var oConditions;
 
 			if (oFilterBar) {
@@ -1956,7 +1956,7 @@ sap.ui.define([
 				oConditions = this._oConditions;
 			}
 
-			var oConditionTypes = _getTypesForConditions.call(this, oConditions);
+			var oConditionTypes = this._getTypesForConditions(oConditions);
 			var oFilter = FilterConverter.createFilters( oConditions, oConditionTypes, undefined, this.getCaseSensitive());
 			var aFilters = [];
 			var aSearchConditions = oConditions["$search"];
@@ -1975,7 +1975,14 @@ sap.ui.define([
 
 	}
 
-	function _getTypesForConditions(oConditions) {
+	/**
+	 * Returns a condition type map for the valuehelp filterbar
+	 *
+	 * @returns {object} condition types map
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.field.FieldValueHelpContentWrapperBase
+	 */
+	FieldValueHelp.prototype._getTypesForConditions = function (oConditions) {
 
 		var oFilterBar = this.getFilterBar();
 		var aInParameters = this.getInParameters();
@@ -2007,7 +2014,8 @@ sap.ui.define([
 
 		return oConditionTypes;
 
-	}
+	};
+
 
 	FieldValueHelp.prototype.getMaxConditions = function() {
 
@@ -2094,6 +2102,26 @@ sap.ui.define([
 
 	};
 
+
+	/**
+	 * Returns the relevant filterbar of this valuehelp.
+	 *
+	 * @returns {sap.ui.mdc.FilterBar} relevant filterbar
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.field.FieldValueHelpContentWrapperBase
+	 */
+	 FieldValueHelp.prototype._getFilterBar = function() {
+
+		var oFilterBar = this.getFilterBar();
+
+		if (!oFilterBar) {
+			oFilterBar = this.getAggregation("_filterBar");
+		}
+
+		return oFilterBar;
+
+	};
+
 	FieldValueHelp.prototype.clone = function(sIdSuffix, aLocalIds) {
 
 		// detach event handler before cloning to not have it twice on the clone
@@ -2253,7 +2281,7 @@ sap.ui.define([
 	function _createValueHelpPanel() {
 
 		var oWrapper = _getWrapper.call(this, false);
-		var oFilterBar = _getFilterBar.call(this);
+		var oFilterBar = this._getFilterBar();
 
 		var oValueHelpPanel = new ValueHelpPanel(this.getId() + "-VHP", {
 			height: "100%",
@@ -2448,7 +2476,7 @@ sap.ui.define([
 
 	function _updateFiltersFromFilterBar(oEvent) {
 
-		var oFilterBar = _getFilterBar.call(this);
+		var oFilterBar = this._getFilterBar();
 
 		if (oFilterBar) {
 			// update FilterValue from SearchField
@@ -2473,7 +2501,7 @@ sap.ui.define([
 
 	function _initializeFilters() {
 
-		var oFilterBar = _getFilterBar.call(this);
+		var oFilterBar = this._getFilterBar();
 		if (oFilterBar) {
 			// remove old conditions
 			oFilterBar.setInternalConditions({});
@@ -2485,21 +2513,9 @@ sap.ui.define([
 
 	}
 
-	function _getFilterBar() {
-
-		var oFilterBar = this.getFilterBar();
-
-		if (!oFilterBar) {
-			oFilterBar = this.getAggregation("_filterBar");
-		}
-
-		return oFilterBar;
-
-	}
-
 	function _getConditions(sFieldPath) {
 
-		var oFilterBar = _getFilterBar.call(this);
+		var oFilterBar = this._getFilterBar();
 		var oConditions;
 
 		if (oFilterBar) {
@@ -2514,7 +2530,7 @@ sap.ui.define([
 
 	function _addCondition(sFieldPath, oCondition) {
 
-		var oFilterBar = _getFilterBar.call(this);
+		var oFilterBar = this._getFilterBar();
 		var oConditions;
 
 		if (oFilterBar) {
@@ -2536,7 +2552,7 @@ sap.ui.define([
 
 	function _removeConditions(sFieldPath) {
 
-		var oFilterBar = _getFilterBar.call(this);
+		var oFilterBar = this._getFilterBar();
 		var oConditions;
 
 		if (oFilterBar) {
@@ -2578,7 +2594,7 @@ sap.ui.define([
 		var oWrapper = _getWrapper.call(this, false); // without content it makes no sense to have a SearchField
 
 		if (sFilterFields && oWrapper) {
-			var oFilterBar = _getFilterBar.call(this);
+			var oFilterBar = this._getFilterBar();
 
 			if (!oFilterBar) {
 				oFilterBar = new FilterBar(this.getId() + "-FB", {
@@ -2767,7 +2783,7 @@ sap.ui.define([
 	function _assignCollectiveSearch(bInitializeKey) {
 
 		var oDialog = this.getAggregation("_dialog");
-		var oFilterBar = _getFilterBar.call(this);
+		var oFilterBar = this._getFilterBar();
 		if (oDialog && oFilterBar) {
 			var aCollectiveSearchItems = this.getCollectiveSearchItems();
 			if (aCollectiveSearchItems.length <= 1) {

package/src/sap/ui/mdc/field/FieldValueHelpContentWrapperBase.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Base type for <code>FieldValueHelp</code> content control wrapper.
 	 * @extends sap.ui.core.Element
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/FieldValueHelpMTableWrapper.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Wrapper to use a <code>sap.m.Table</code> control as content of a <code>FieldValueHelp</code> element
 	 * @extends sap.ui.mdc.field.FieldValueHelpTableWrapperBase
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

package/src/sap/ui/mdc/field/FieldValueHelpMdcTableWrapper.js

@@ -10,14 +10,16 @@ sap.ui.define([
 	"sap/base/util/deepEqual",
 	"sap/ui/mdc/library",
 	"sap/ui/mdc/enum/PersistenceMode",
-	"sap/ui/mdc/p13n/Engine"
+	"sap/ui/mdc/p13n/Engine",
+	'sap/ui/mdc/condition/FilterConverter'
 	], function(
 		FieldValueHelpTableWrapperBase,
 		loadModules,
 		deepEqual,
 		library,
 		PersistenceMode,
-		Engine
+		Engine,
+		FilterConverter
 	) {
 	"use strict";
 
@@ -38,7 +40,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Wrapper to use a <code>sap.m.Table</code> control as content of a <code>FieldValueHelp</code> element
 	 * @extends sap.ui.mdc.field.FieldValueHelpTableWrapperBase
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe
@@ -96,7 +98,6 @@ sap.ui.define([
 
 	FieldValueHelpMdcTableWrapper.prototype.fieldHelpOpen = function(bSuggestion) {
 		var oTable = this.getTable();
-
 		if (oTable) {
 			if (this.OInnerWrapperClass) {
 				return this.OInnerWrapperClass.prototype.fieldHelpOpen.call(this, bSuggestion);
@@ -119,7 +120,7 @@ sap.ui.define([
 			this._sInnerWrapperType = sTableType;
 
 			if (this.OInnerWrapperClass) {
-				this.OInnerWrapperClass.dispose.apply(this);
+				this.OInnerWrapperClass.prototype.dispose.apply(this);
 				this.OInnerWrapperClass = null;
 			}
 
@@ -144,6 +145,14 @@ sap.ui.define([
 			if (oParent) {
 				oTable.setHeight("100%");
 				oTable.setSelectionMode(this._getMaxConditions() === 1 ? SelectionMode.Single : SelectionMode.Multi);
+
+				var oFieldHelp = this._getFieldHelp();
+				var oFilterBar = oFieldHelp._getFilterBar();
+				var bFilterChange = oFilterBar && oTable.getFilter() !== oFilterBar.getId();
+				if (bFilterChange) {
+					oTable.setFilter(oFilterBar);
+				}
+
 			}
 
 			if (this.OInnerWrapperClass) {
@@ -165,14 +174,22 @@ sap.ui.define([
 			this._oInnerWrapperClassPromise = null;
 		}
 		if (this.OInnerWrapperClass) {
+			this.OInnerWrapperClass.prototype.dispose.apply(this);
 			this.OInnerWrapperClass = null;
 		}
 
 		this._sInnerWrapperType = null;
+		this._bSearchTriggered = null;
 
 		FieldValueHelpTableWrapperBase.prototype.exit.apply(this, arguments);
 	};
 
+	FieldValueHelpMdcTableWrapper.prototype.isSuspended = function() {
+		var oTable = this.getTable();
+		var oListBinding = this.getListBinding();
+		return oListBinding ? oListBinding.isSuspended() : oTable && !oTable.getAutoBindOnInit();
+	};
+
 	FieldValueHelpMdcTableWrapper.prototype.getListBinding = function() {
 		var oTable = this.getTable();
 		return oTable && oTable.getRowBinding();
@@ -256,34 +273,42 @@ sap.ui.define([
 		var oTable = this.getTable();
 
 		if (oTable && oFilterBar) {
-			if (oTable.getFilter() !== oFilterBar.getId()) {
-				oTable.setFilter(oFilterBar);
+			var oListBinding = this.getListBinding();
+			var bListBindingSuspended = oListBinding && oListBinding.isSuspended();
+			var oFieldHelp = this._getFieldHelp();
+
+			if (oListBinding && !bListBindingSuspended && !this._bSearchTriggered) {
+				var sFBSearch = oFilterBar.getSearch() || "";
+				var sBindingSearch = oListBinding.mParameters.$search || "";
+				var oCurrentFilterBarConditions = oFilterBar.getConditions();
+				var oConditionTypes = oFieldHelp._getTypesForConditions(oCurrentFilterBarConditions);
+				var oCreatedFBFilters = oCurrentFilterBarConditions && oConditionTypes && FilterConverter.createFilters(oCurrentFilterBarConditions, oConditionTypes, undefined, oFieldHelp.getCaseSensitive());
+				var aFBFilters = oCreatedFBFilters ? [].concat(oCreatedFBFilters) : [];
+				var aBindingFilters = oListBinding.aApplicationFilters.reduce(function (aResult, oFilter) {
+					return aResult.concat(oFilter._bMultiFilter ? oFilter.aFilters : oFilter);
+				}, []);
+				var bFiltersChanged = !deepEqual(aFBFilters, aBindingFilters);
+				var bSearchChanged = sFBSearch !== sBindingSearch;
+				var bTableHasOverlay = oTable._oTable && oTable._oTable.getShowOverlay && oTable._oTable.getShowOverlay();
+
+
+				if (bFiltersChanged || bSearchChanged || bTableHasOverlay) {
+					this._handleScrolling();
+					oFilterBar.triggerSearch();
+					this._bSearchTriggered = true;
+				}
 			}
 
-			this._oCurrentConditions = this._oCurrentConditions || {};
-
-			var oCurrentConditions = oFilterBar.getConditions();
-			if (!deepEqual(this._oCurrentConditions, oCurrentConditions) || (oTable._oTable && oTable._oTable.getShowOverlay())) {
-				oTable.initialized().then(function() {
-					this._oCurrentConditions = oCurrentConditions;
-					this._handleScrolling(); // reset scrolling to prevent skip parameters being added
-					oFilterBar.valid().then(function(){
-						oFilterBar.fireSearch();
-					});
-				}.bind(this));
+			if (bListBindingSuspended) {
+				oListBinding.resume();
 			}
 
-			var oListBinding = this.getListBinding();
-			if (oListBinding && oListBinding.isSuspended()) {
-				oListBinding.resume();
-			} else if (!oListBinding) {
-				this._oTablePromise.then(function(oTable) {
+			if (!oListBinding && oTable.getAutoBindOnInit()) {
+				this._oTablePromise.then(function () {
 					if (!this._bIsBeingDestroyed) {
 						this.applyFilters(aFilters, sSearch, oFilterBar);
 					}
 				}.bind(this));
-
-				this.restoreBinding();
 			}
 		}
 	};
@@ -302,6 +327,7 @@ sap.ui.define([
 	};
 
 	FieldValueHelpMdcTableWrapper.prototype._handleUpdateFinished = function (oEvent) {
+		this._bSearchTriggered = false;
 		return this.OInnerWrapperClass.prototype._handleUpdateFinished.apply(this, arguments);
 	};
 
@@ -317,7 +343,7 @@ sap.ui.define([
 
 	FieldValueHelpMdcTableWrapper.prototype._handleSelectionChange = function (oEvent) {
 		var bIsTableReady = this._isTableReady();
-		return this._bIsModifyingTableSelection || !bIsTableReady ? undefined : this._fireSelectionChange.call(this, false);
+		return this._bIsModifyingTableSelection || !bIsTableReady || this._bBusy ? undefined : this._fireSelectionChange.call(this, false);
 	};
 
 	FieldValueHelpMdcTableWrapper.prototype._getTableItems = function (bSelectedOnly, bNoVirtual) {
@@ -372,13 +398,5 @@ sap.ui.define([
 		return this.getTable();
 	};
 
-
-	FieldValueHelpMdcTableWrapper.prototype.restoreBinding = function() {
-		var oTable = this.getTable();
-		if (oTable) {
-			oTable.checkAndRebind();
-		}
-	};
-
 	return FieldValueHelpMdcTableWrapper;
 });

package/src/sap/ui/mdc/field/FieldValueHelpTableWrapperBase.js

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Wrapper to use a table control as content of a <code>FieldValueHelp</code> element
 	 * @extends sap.ui.mdc.field.FieldValueHelpContentWrapperBase
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 * @constructor
 	 * @private
 	 * @experimental As of version 1.88
@@ -529,12 +529,9 @@ sap.ui.define([
 		if (!oListBinding) {
 			this._oTablePromise.then(function(oTable) {
 				if (!this._bIsBeingDestroyed) {
-					this.applyFilters(aFilters, sSearch);
+					this.applyFilters(aFilters, sSearch, oFilterBar);
 				}
 			}.bind(this));
-
-			this.restoreBinding();
-
 			return;
 		}
 
@@ -783,6 +780,11 @@ sap.ui.define([
 		}
 	};
 
+	FieldValueHelpTableWrapperBase.prototype._handleBusyStateChanged = function (oEvent) {
+        this._bBusy = oEvent.getParameter("busy");
+    };
+
+
 	FieldValueHelpTableWrapperBase.prototype._updateSelectedItems = function () {
 
 		if (this._bNoTableUpdate) {
@@ -967,9 +969,5 @@ sap.ui.define([
 		// Defaults to no-op.
 	};
 
-	FieldValueHelpTableWrapperBase.prototype.restoreBinding = function() {
-		// Defaults to no-op.
-	};
-
 	return FieldValueHelpTableWrapperBase;
 });

package/src/sap/ui/mdc/field/FieldValueHelpUITableWrapper.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Wrapper to use a <code>sap.m.Table</code> control as content of a <code>FieldValueHelp</code> element
 	 * @extends sap.ui.mdc.field.FieldValueHelpTableWrapperBase
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -141,6 +141,7 @@ sap.ui.define([
 			fnEventAction("cellClick", this._handleItemPress, this);
 			fnEventAction("rowSelectionChange", this._handleSelectionChange, this);
 			fnEventAction("rowsUpdated", this._handleUpdateFinished, this);
+			fnEventAction("busyStateChanged", this._handleBusyStateChanged, this);
 
 			var oRowBinding = this.getListBinding();
 			if (oRowBinding) {

package/src/sap/ui/mdc/field/InParameter.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>InParameter</code> element is used in the {@link sap.ui.mdc.field.FieldValueHelp FieldValueHelp} element.
 	 * @extends sap.ui.core.Element
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/ListFieldHelp.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class A field help used in the <code>FieldHelp</code> association of controls based on {@link sap.ui.mdc.field.FieldBase FieldBase} that shows a list of items.
 	 * @extends sap.ui.mdc.field.FieldHelpBase
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

package/src/sap/ui/mdc/field/ListFieldHelpItem.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.ListItem
 	 *
 	 * @author SAP SE
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 *
 	 * @private
 	 * @ui5-restricted sap.fe

package/src/sap/ui/mdc/field/MultiValueFieldItem.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Base type for <code>MultiValueFieldItem</code> control.
 	 * @extends sap.ui.core.Element
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/OutParameter.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class The <code>OutParameter</code> element is used in the {@link sap.ui.mdc.field.FieldValueHelp FieldValueHelp} element.
 	 * @extends sap.ui.mdc.field.InParameter
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 * @constructor
 	 * @abstract
 	 * @private

package/src/sap/ui/mdc/field/ValueHelpPanel.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.XMLComposite
 	 *
 	 * @author SAP SE
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.field.ValueHelpPanel

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

@@ -17,7 +17,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.0
+	 * @version 1.93.4
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -721,7 +721,14 @@ sap.ui.define([
 		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));
+		}
 	};
 
 	/**
@@ -844,7 +851,14 @@ sap.ui.define([
 		var oPromise = oEvent.getParameter("promise");
 		if (oPromise) {
 			oPromise.then(function() {
-				this.triggerSearch();
+				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));
 		}
 	};
@@ -969,8 +983,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");

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"
-], function( GroupContainer, FilterGroupLayout, TableContainer, FilterColumnLayout, FilterBarBase, FilterBarBaseRenderer) {
+	"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) {
 	"use strict";
 
 	/**
@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.mdc.filterbar.FilterBarBase
 	 * @author SAP SE
-	 * @version 1.93.0
+	 * @version 1.93.4
 	 * @constructor
 	 * @private
 	 * @since 1.80.0
@@ -129,29 +129,6 @@ sap.ui.define([
 		this.triggerSearch();
 	};
 
-	/**
-	 * Method which will initialize the <code>AdaptationFilterBar</code> to retrieve the propertyinfo based on its parent
-	 *
-	 * @returns {Promise} A Promise which resolves once the propertyinfo has been propagated
-	 */
-	AdaptationFilterBar.prototype.initialized = function(){
-
-		var oParentPropertyInfoPromise = this.getAdaptationControl().awaitControlDelegate().then(function(oParentControl) {
-			return oParentControl.fetchProperties(this.getAdaptationControl()).then(function(aPropertyInfo){
-				return aPropertyInfo;
-			});
-		}.bind(this));
-
-		return Promise.all([
-			oParentPropertyInfoPromise,
-			FilterBarBase.prototype.initialized.apply(this, arguments)
-		]).then(function(aResolvedValues){
-			var aPropertyInfo = aResolvedValues[0];
-			this._aProperties = aPropertyInfo;
-		}.bind(this));
-
-	};
-
 	/**
 	 * Method which will initialize the <code>AdaptationFilterBar</code> and create the required FilterFields
 	 *
@@ -330,6 +307,54 @@ 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.0
+		 * @version 1.93.4
 		 * @constructor
 		 * @private
 		 * @since 1.84.0

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.0
+	 * @version 1.93.4
 	 */
 	return {
 		addItem: ChartItemFlex.addItem,