@openui5/sap.ui.mdc 1.98.0 → 1.101.0

package/src/sap/ui/mdc/mixin/PropertyHelperMixin.js

@@ -0,0 +1,354 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define(["sap/base/util/Deferred", "sap/ui/mdc/util/loadModules", "sap/base/Log"], function (Deferred, loadModules, Log) {
+	"use strict";
+
+	/**
+	 * Enhances a given control prototype with consolidated asynchronous handling for providing a PropertyHelper
+	 *
+	 * The following methods are available:
+	 *
+	 * <ul>
+ 	 * <li><code>initPropertyHelper</code> - Loads and initializes the property helper related to the enhanced control.</li>
+	 * <li><code>awaitPropertyHelper</code> - Provides access to the property helper initialization <code>Promise</code>.</li>
+	 * <li><code>finalizePropertyHelper</code> - Finalizes the propertyHelper fetching all available propertyInfo via a given control delegate.</li>
+	 * <li><code>isPropertyHelperFinal</code> - Indicates if the propertyHelper for this control allready contains all available propertyInfo.</li>
+	 * <li><code>getPropertyHelper</code> - Returns the property helper instance, if available.</li>
+	 * </ul>
+	 *
+	 * Additionally, the following methods are wrapped:
+	 *
+	 * <ul>
+	 * <li><code>applySettings</code></li>
+	 * <li><code>exit</code></li>
+	 * <li><code>init</code></li>
+	 * </ul>
+	 *
+	 * @author SAP SE
+	 * @version 1.101.0
+	 * @alias sap.ui.mdc.mixin.PropertyHelperMixin
+	 * @namespace
+	 * @since 1.100.0
+	 * @private
+	 * @experimental
+	 * @ui5-restricted sap.ui.mdc
+	*/
+	var PropertyHelperMixin = {};
+
+	PropertyHelperMixin.init = function (fnInit) {
+		return function () {
+
+			this._oPropertyHelper = null;
+			this._oPropertyHelperDeferred = new Deferred();
+			this._oApplySettingsDeferred = new Deferred();
+
+			this._bPropertyHelperFinal = false;
+			this._bPropertyHelperInitializing = false;
+			this._sPropertyInfoStore = null;
+
+			if (fnInit) {
+				fnInit.apply(this, arguments);
+			}
+
+		};
+	};
+
+	PropertyHelperMixin.applySettings = function (fnApplySettings) {
+		return function () {
+			if (fnApplySettings) {
+				fnApplySettings.apply(this, arguments);
+			}
+
+			// initialize propertyHelper also, when store is initially empty
+			if (this._sPropertyInfoStore && (!arguments[0] || !arguments[0].hasOwnProperty(this._sPropertyInfoStore))) {
+				_createOrUpdatePropertyHelper.call(this, [], false);
+			}
+
+			this._oApplySettingsDeferred.resolve(this);	// We want to make sure all other initial properties are set before initializing propertyHelper (e.g. delegate)
+			return this;
+		};
+	};
+
+	/**
+	 * Loads and initializes the property helper related to the enhanced control.
+	 *
+	 * @protected
+	 * @param {sap.ui.mdc.util.PropertyHelper} [PropertyHelperClass] Custom property helper class
+	 * @param {object[]} [aProperties] optional set of initial properties
+	 * @param {object[]} [bFinal] flag for mark the propertyHelper as final
+	 * @returns {Promise<sap.ui.mdc.util.PropertyHelper>} Returns a <code>Promise</code> that resolves with the property helper
+	 */
+	PropertyHelperMixin.initPropertyHelper = function(PropertyHelperClass, aProperties, bFinal) {
+		if (PropertyHelperClass) {
+			this._setPropertyHelperClass(PropertyHelperClass);
+		}
+
+		return _createOrUpdatePropertyHelper.call(this, aProperties, bFinal);
+	};
+
+	/**
+	 * Provide a new set of properties for the propertyHelper.
+	 *
+	 * @protected
+	 * @param {object[]} [aProperties] optional set of initial properties
+	 * @param {object[]} [bFinal] flag for mark the propertyHelper as final
+	 * @returns {Promise<sap.ui.mdc.util.PropertyHelper>} Returns a <code>Promise</code> that resolves with the property helper
+	 * @throws exception if propertyHelper is already marked as final
+	 */
+	PropertyHelperMixin.updatePropertyHelper = function(aProperties, bFinal) {
+		return _createOrUpdatePropertyHelper.call(this, aProperties, bFinal);
+	};
+
+	/**
+	 * Finalize the propertyHelper using the control's delegate.
+	 *
+	 * @protected
+	 * @param {object[]} [aProperties] optional set of initial properties
+	 * @param {object[]} [bFinal] flag for mark the propertyHelper as final
+	 * @returns {Promise<sap.ui.mdc.util.PropertyHelper>} Returns a <code>Promise</code> that resolves with the property helper
+	 */
+	PropertyHelperMixin.finalizePropertyHelper = function() {
+		this._pHelperFinalizationPromise = this._pHelperFinalizationPromise || _getDelegateProperties(this).then(function (aResult) {
+			return _createOrUpdatePropertyHelper.call(this, aResult, true);
+		}.bind(this));
+		return this._pHelperFinalizationPromise;
+	};
+
+	/**
+	 * Indicates if the control's propertyHelper already contains all available properties
+	 *
+	 * @protected
+	 * @returns {boolean} Returns a <code>boolean</code> indicating the propertyHelper's final state
+	 */
+	 PropertyHelperMixin.isPropertyHelperFinal = function() {
+		return this._bPropertyHelperFinal;
+	};
+
+	/**
+	 * Provides access to the property helper initialization <code>Promise</code>.
+	 *
+	 * @protected
+	 * @returns {Promise<sap.ui.mdc.util.PropertyHelper>} Returns a <code>Promise</code> that resolves with the property helper
+	 */
+	 PropertyHelperMixin.awaitPropertyHelper = function() {
+		return this._oPropertyHelperDeferred.promise;
+	};
+
+	/**
+	 * Returns the property helper instance, if available.
+	 *
+	 * @protected
+	 * @returns {sap.ui.mdc.util.PropertyHelper} The property helper
+	 */
+	PropertyHelperMixin.getPropertyHelper = function() {
+		return this._oPropertyHelper;
+	};
+
+	PropertyHelperMixin.exit = function (fnExit) {
+		return function () {
+			this._oPropertyHelper = null;
+			this._oPropertyHelperDeferred = null;
+			this._oApplySettingsDeferred = null;
+			this._bPropertyHelperFinal = null;
+			this._bPropertyHelperInitializing = null;
+			this._pHelperFinalizationPromise = null;
+			this._oPropertyHelperClass = null;
+			this._sPropertyInfoStore = null;
+
+			if (this._oPropertyInfoStoreMutatorOverride) {
+				this[this._oPropertyInfoStoreMutatorOverride.key] = this._oPropertyInfoStoreMutatorOverride.mutator;
+				this._oPropertyInfoStoreMutatorOverride = null;
+			}
+
+			if (fnExit) {
+				fnExit.apply(this, arguments);
+			}
+		};
+	};
+
+	/**
+	 * Controls may provide a property identifier representing a propertyInfo store for this control.
+	 * This should be called as early as possible as the given property's mutator is overriden.
+	 * @private
+	 * @param {string} sPropertyName Name of the property containing propertyInfo for this control
+	 *
+	 */
+	PropertyHelperMixin._setupPropertyInfoStore = function(sPropertyName) {
+		var oProperties = this.getMetadata().getAllProperties();
+		var oPropertyInfoProperty = oProperties && oProperties[sPropertyName];
+		if (!oPropertyInfoProperty) {
+			throw new Error("PropertyHelperMixin: Property '" + sPropertyName + "' not found.");
+		}
+		var oJSONKeys = this.getMetadata().getJSONKeys()[sPropertyName];
+		this._oPropertyInfoStoreMutatorOverride = {key: oJSONKeys._sMutator, mutator: this[oJSONKeys._sMutator]};
+
+		this[oJSONKeys._sMutator] = function () {
+			this._oPropertyInfoStoreMutatorOverride.mutator.apply(this, arguments);
+			if (!this._bPropertyHelperFinal) {
+				_createOrUpdatePropertyHelper.call(this, this[oJSONKeys._sGetter](), false);
+			}
+			return this;
+		};
+		this._sPropertyInfoStore = sPropertyName;
+	};
+
+	// Should ideally be called already during init for controls featuring a propertyInfo property (auto-initalization of PH after applySettings).
+	PropertyHelperMixin._setPropertyHelperClass = function (PropertyHelperClass) {
+		if (this._oPropertyHelper || this._bPropertyHelperInitializing) {
+			throw new Error("PropertyHelper already initializing/ed.");
+		}
+
+		if (PropertyHelperClass && (!PropertyHelperClass.getMetadata || !PropertyHelperClass.getMetadata().isA("sap.ui.mdc.util.PropertyHelper"))) {
+			throw new Error("The custom property helper class must be sap.ui.mdc.util.PropertyHelper or a subclass of it.");
+		}
+		this._oPropertyHelperClass = PropertyHelperClass;
+	};
+
+	PropertyHelperMixin._getPropertyByName = function(sName) {
+		return this._oPropertyHelper && this._oPropertyHelper.getProperty(sName);
+	};
+
+	PropertyHelperMixin._getPropertyByNameAsync = function(sName) {
+		var oProperty = this._oPropertyHelper && this._oPropertyHelper.getProperty(sName);
+
+		if (!oProperty) {
+			return this.finalizePropertyHelper().then(function (oPropertyHelper) {
+				return oPropertyHelper.getProperty(sName);
+			});
+		}
+		return Promise.resolve(oProperty);
+	};
+
+	function _createOrUpdatePropertyHelper(aProperties, bFinal) {
+		if (!this.bIsDestroyed) {
+			if (this._bPropertyHelperInitializing && typeof aProperties !== "undefined") {
+				return this._oPropertyHelperDeferred.promise.then(function () {
+					return _updatePropertyHelper.call(this, aProperties, bFinal);
+				}.bind(this));
+			}
+
+			if (this._oPropertyHelper && typeof aProperties !== "undefined") {
+				_updatePropertyHelper.call(this, aProperties, bFinal);
+			}
+			if (!this._oPropertyHelper) {
+				_createPropertyHelper.call(this, aProperties, bFinal);
+			}
+		}
+		return this._oPropertyHelperDeferred && this._oPropertyHelperDeferred.promise;
+	}
+
+	function _createPropertyHelper (aProperties, bFinal) {
+		this._bPropertyHelperInitializing = true;
+
+		if (bFinal || !aProperties) { // also fall back to delegate if no initial properties given
+			bFinal = true;
+			this._pHelperFinalizationPromise = this._oPropertyHelperDeferred.promise;
+		}
+
+		var oDelegate;
+
+		// we need to initialize the delegate for extensions or ph overrides first
+		return this._oApplySettingsDeferred.promise.then(function () {
+			return this.initControlDelegate();
+		}.bind(this)).then(function (oControlDelegate) {
+			oDelegate = oControlDelegate;
+			return bFinal ? _getDelegateProperties(this) : aProperties;
+		}.bind(this)).then(function(aProperties) {
+			if (this.bIsDestroyed) {
+				return [];
+			}
+			var aResult = [aProperties];
+			if (oDelegate && typeof oDelegate.fetchPropertyExtensions === "function") {
+				return oDelegate.fetchPropertyExtensions(this, aProperties).then(function(mExtensions) {
+					return aResult.concat(mExtensions);
+				});
+			}
+			return aResult.concat(undefined);
+		}.bind(this)).then(function(aResult) {
+			if (this.bIsDestroyed) {
+				return [];
+			}
+			return fetchPropertyHelperClass(this, oDelegate, aResult[0], aResult[1]).then(function(PropertyHelper) {
+				return aResult.concat(PropertyHelper);
+			});
+		}.bind(this)).then(function(aResult) {
+			if (this.bIsDestroyed) {
+				return undefined;
+			}
+
+			var aProperties = aResult[0];
+			var mExtensions = aResult[1];
+			var PropertyHelper = aResult[2];
+			this._oPropertyHelper = new PropertyHelper(aProperties, mExtensions, this, undefined, undefined);
+			this._bPropertyHelperInitializing = false;
+			if (bFinal) {
+				this._bPropertyHelperFinal = true;
+			}
+			return this._oPropertyHelperDeferred.resolve(this._oPropertyHelper);
+		}.bind(this)).catch(function (oError) {
+			return this._oPropertyHelperDeferred && this._oPropertyHelperDeferred.reject(oError);
+		}.bind(this));
+	}
+
+	function _updatePropertyHelper(aProperties, bFinal) {
+		if (this._bPropertyHelperFinal) {
+			throw new Error("This property helper is already final and cannot be updated further.");
+		}
+		this._oPropertyHelper.setProperties(aProperties);
+		this._bPropertyHelperFinal = bFinal || this._bPropertyHelperFinal;
+		return this._oPropertyHelper;
+	}
+
+	// use delegate for final properties
+	function _getDelegateProperties (oControl) {
+		return oControl.initControlDelegate().then(function () {
+			return oControl.getControlDelegate(oControl).fetchProperties(oControl); // not using arg as some unit tests override "getControlDelegate"
+
+
+		});
+	}
+
+	function fetchPropertyHelperClass(oControl, oDelegate, aProperties) {
+		if (oDelegate && typeof oDelegate.getPropertyHelperClass === "function") {
+			var oDelegatePropertyHelperClass = oDelegate.getPropertyHelperClass();
+			var sBaseClass = oControl._oPropertyHelperClass ? oControl._oPropertyHelperClass.getMetadata().getName() : "sap.ui.mdc.util.PropertyHelper";
+
+			if (!oDelegatePropertyHelperClass || !oDelegatePropertyHelperClass.getMetadata || !oDelegatePropertyHelperClass.getMetadata().isA(sBaseClass)) {
+				throw new Error("The property helper class must be " + sBaseClass + " or a subclass of it.");
+			}
+			return Promise.resolve(oDelegatePropertyHelperClass);
+		}
+
+		if (oControl._oPropertyHelperClass) {
+			return Promise.resolve(oControl._oPropertyHelperClass);
+		}
+
+		return loadModules("sap/ui/mdc/util/PropertyHelper").then(function(aResult) {
+			return aResult[0];
+		});
+	}
+
+	return function () {
+		this.init = PropertyHelperMixin.init(this.init);
+		this.exit = PropertyHelperMixin.exit(this.exit);
+		this.applySettings = PropertyHelperMixin.applySettings(this.applySettings);
+
+
+		this.initPropertyHelper = PropertyHelperMixin.initPropertyHelper;
+		this.awaitPropertyHelper = PropertyHelperMixin.awaitPropertyHelper;
+		this.getPropertyHelper = PropertyHelperMixin.getPropertyHelper;
+
+		this.finalizePropertyHelper = PropertyHelperMixin.finalizePropertyHelper;
+		this.isPropertyHelperFinal = PropertyHelperMixin.isPropertyHelperFinal;
+
+		this._getPropertyByName = PropertyHelperMixin._getPropertyByName;
+		this._getPropertyByNameAsync = PropertyHelperMixin._getPropertyByNameAsync;
+		this._setPropertyHelperClass = PropertyHelperMixin._setPropertyHelperClass;
+		this._setupPropertyInfoStore = PropertyHelperMixin._setupPropertyInfoStore;
+
+	};
+});

package/src/sap/ui/mdc/odata/TypeUtil.js

@@ -29,7 +29,7 @@ sap.ui.define([
 		*
 		* Falls back to 'object' if type cannot be found.
 		*
-		* @param {string} sType Given model specific type
+		* @param {string} sDataType Given model specific type
 		* @returns {string} primitive type name
 		*/
 		getPrimitiveType: function (sDataType) {

package/src/sap/ui/mdc/odata/v4/ChartPropertyHelper.js

@@ -5,9 +5,11 @@
  */
 
 sap.ui.define([
-	"sap/ui/mdc/chart/PropertyHelper"
+	"sap/ui/mdc/chart/PropertyHelper",
+	"sap/ui/mdc/library"
 ], function(
-	PropertyHelperBase
+	PropertyHelperBase,
+	MDCLib
 ) {
 	"use strict";
 
@@ -25,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.chart.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @private
 	 * @experimental
@@ -35,5 +37,70 @@ sap.ui.define([
 	 */
     var PropertyHelper = PropertyHelperBase.extend("sap.ui.mdc.odata.v4.ChartPropertyHelper");
 
+
+	/**
+	 * Applies defaults and resolves property references.
+	 *
+	 * @param {object} oProperty The property to prepare
+	 * @protected
+	 */
+	PropertyHelper.prototype.prepareProperty = function(oProperty) {
+
+		if (oProperty.groupable) {
+			oProperty.availableRoles = this._getLayoutOptionsForType("groupable");
+			oProperty.kind = "Groupable";
+		} else if (oProperty.aggregatable) {
+			oProperty.availableRoles = this._getLayoutOptionsForType("aggregatable");
+			oProperty.kind = "Aggregatable";
+		}
+
+		if (!oProperty.typeConfig && oProperty.dataType){
+			var oFormatOptions = oProperty.formatOptions ? oProperty.formatOptions : null;
+			var oConstraints = oProperty.constraints ? oProperty.constraints : {};
+
+			oProperty.typeConfig = this.getParent().getControlDelegate().getTypeUtil().getTypeConfig(oProperty.dataType, oFormatOptions, oConstraints);
+		}
+
+		PropertyHelperBase.prototype.prepareProperty.apply(this, arguments);
+
+	};
+
+	/**
+     * This returns the layout options for a specific type of Item (measure/dimension,groupable/aggregatable)
+     * It is used by p13n to determine which layout options to show in the p13n panel
+     * @param {string} sType the type for which the layout options are requested
+     */
+	PropertyHelper.prototype._getLayoutOptionsForType = function(sType){
+	var MDCRb = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
+	var oAvailableRoles = {
+		groupable: [
+			{
+				key: MDCLib.ChartItemRoleType.category,
+				text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_CHARTROLE_CATEGORY')
+			}, {
+				key: MDCLib.ChartItemRoleType.category2,
+				text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_CHARTROLE_CATEGORY2')
+			}, {
+				key: MDCLib.ChartItemRoleType.series,
+				text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_CHARTROLE_SERIES')
+			}
+		],
+		aggregatable: [
+			{
+				key: MDCLib.ChartItemRoleType.axis1,
+				text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_CHARTROLE_AXIS1')
+			}, {
+				key: MDCLib.ChartItemRoleType.axis2,
+				text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_CHARTROLE_AXIS2')
+			}, {
+				key: MDCLib.ChartItemRoleType.axis3,
+				text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_CHARTROLE_AXIS3')
+			}
+		]
+	};
+	return oAvailableRoles[sType];
+};
+
+
     return PropertyHelper;
 });

package/src/sap/ui/mdc/odata/v4/FieldBaseDelegate.js

@@ -19,17 +19,19 @@ sap.ui.define([
 	"use strict";
 
 	/**
-	 * @class Delegate class for sap.ui.mdc.field.FieldBase.<br>
+	 * Delegate for {@link sap.ui.mdc.field.FieldBase FieldBase}.<br>
 	 * <h3><b>Note:</b></h3>
 	 * The class is experimental and the API/behaviour is not finalized and hence this should not be used for productive usage.
 	 *
+	 * @namespace
 	 * @author SAP SE
 	 * @private
 	 * @ui5-restricted sap.fe
 	 * @MDC_PUBLIC_CANDIDATE
 	 * @experimental As of version 1.74
 	 * @since 1.74.0
-	 * @alias sap.ui.mdc.odata.v4.FieldBaseDelegate
+	 * @extends module:sap/ui/mdc/field/FieldBaseDelegate
+	 * @alias module:sap/ui/mdc/odata/v4/FieldBaseDelegate
 	 */
 	var ODataFieldBaseDelegate = Object.assign({}, FieldBaseDelegate);
 
@@ -93,11 +95,11 @@ sap.ui.define([
 
 	};
 
-	ODataFieldBaseDelegate.enhanceValueForUnit = function(oPayload, aValue, oTypeInitialization) {
+	ODataFieldBaseDelegate.enhanceValueForUnit = function(oPayload, aValues, oTypeInitialization) {
 
-		if (oTypeInitialization && oTypeInitialization.bTypeInitialized && aValue.length === 2) {
-			aValue.push(oTypeInitialization.mCustomUnits);
-			return aValue;
+		if (oTypeInitialization && oTypeInitialization.bTypeInitialized && aValues.length === 2) {
+			aValues.push(oTypeInitialization.mCustomUnits);
+			return aValues;
 		}
 
 	};

package/src/sap/ui/mdc/odata/v4/FilterBarDelegate.js

@@ -44,9 +44,7 @@ sap.ui.define([
 		"Edm.Time": "TimeOfDay"
 	};
 
-	var mMainEntitySet = {};
-
-
+	var InstanceCache = new Map();
 
 	ODataFilterBarDelegate._fetchPropertiesByMetadata = function(oControl, mPropertyBag) {
 
@@ -92,7 +90,7 @@ sap.ui.define([
 						}
 				};
 
-				return mPropertyBag ? this.fetchProperties(oObj) : oControl.getControlDelegate().fetchProperties(oControl);
+				return mPropertyBag ? this.fetchProperties(oObj) : Promise.resolve(oControl.getPropertyHelper().getProperties());
 			}.bind(this));
 	};
 
@@ -246,6 +244,109 @@ sap.ui.define([
 		return Promise.resolve(this._createFilter(sPropertyName, oFilterBar, mPropertyBag));
 	};
 
+
+	ODataFilterBarDelegate._getInstanceCacheEntry = function(oControl, sKey) {
+		var sId = oControl.getId && oControl.getId() || oControl.id;
+		var oCacheEntry = InstanceCache.get(sId);
+		return oCacheEntry && oCacheEntry[sKey];
+	};
+	ODataFilterBarDelegate._setInstanceCacheEntry = function(oControl, sKey, oValue) {
+		var sId = oControl.getId && oControl.getId() || oControl.id;
+		var oCacheEntry = InstanceCache.get(sId) || {};
+		oCacheEntry[sKey] = oValue;
+		InstanceCache.set(sId, oCacheEntry);
+	};
+
+	ODataFilterBarDelegate._addPropertyInfoEntry = function(oControl, sPropertyName, aPropertyInfo, aFetchedProperties, oModifier) {
+
+		if (aFetchedProperties) {
+			var nIdx = aFetchedProperties.findIndex(function(oEntry) {
+				return oEntry.name === sPropertyName;
+			});
+
+			if (nIdx >= 0) {
+				aPropertyInfo.push({
+					name: sPropertyName,
+					dataType: aFetchedProperties[nIdx].typeConfig.className,
+					maxConditions: aFetchedProperties[nIdx].maxConditions,
+					constraints: aFetchedProperties[nIdx].constraints,
+					formatOption: aFetchedProperties[nIdx].formatOptions,
+					required: aFetchedProperties[nIdx].required,
+					caseSensitive: aFetchedProperties[nIdx].caseSensitive,
+					display: aFetchedProperties[nIdx].display,
+					label: aFetchedProperties[nIdx].label,
+					hiddenFilter: aFetchedProperties[nIdx].hiddenFilter
+				});
+				oModifier.setProperty(oControl, "propertyInfo", aPropertyInfo);
+			} else {
+				Log.error("ConditionFlex-ChangeHandler: no type info for property '" + sPropertyName + "'");
+			}
+		}
+	};
+
+
+	ODataFilterBarDelegate._updatePropertyInfo = function(sPropertyName, oFilterBar, mPropertyBag) {
+
+		if (oFilterBar.isA && oFilterBar.isA("sap.ui.mdc.FilterBar")) {
+			return Promise.resolve();
+		}
+
+		var oModifier = mPropertyBag.modifier;
+
+		return oModifier.getProperty(oFilterBar, "propertyInfo")
+		.then(function(aPropertyInfo) {
+			if (!aPropertyInfo) {
+				return Promise.resolve();
+			}
+			var nIdx = aPropertyInfo.findIndex(function(oEntry) {
+				return oEntry.name === sPropertyName;
+			});
+
+			if (nIdx < 0) {
+
+				var aFetchedProperties = ODataFilterBarDelegate._getInstanceCacheEntry(oFilterBar, "fetchedProperties");
+				if (aFetchedProperties) {
+					ODataFilterBarDelegate._addPropertyInfoEntry(oFilterBar, sPropertyName, aPropertyInfo, aFetchedProperties, oModifier);
+				} else {
+					//fetch
+					return ODataFilterBarDelegate.fetchProperties(oFilterBar, mPropertyBag)
+					.then(function(aProperties) {
+						ODataFilterBarDelegate._setInstanceCacheEntry(oFilterBar, "fetchedProperties", aProperties);
+						ODataFilterBarDelegate._addPropertyInfoEntry(oFilterBar, sPropertyName, aPropertyInfo, aProperties, oModifier);
+					});
+				}
+			}
+		});
+	};
+
+
+	/**
+	 * This methods is called during the appliance of the add condition change.
+	 * This intention is to update the propertyInfo property.
+	 *
+	 * @param {string} sPropertyName The name of a property.
+	 * @param {sap.ui.mdc.FilterBar} oFilterBar - the instance of filter bar
+	 * @param {Object} mPropertyBag Instance of property bag from Flex change API
+	 * @returns {Promise} Promise that resolves once the properyInfo property was updated
+	 */
+	ODataFilterBarDelegate.addCondition = function(sPropertyName, oFilterBar, mPropertyBag) {
+		return ODataFilterBarDelegate._updatePropertyInfo(sPropertyName, oFilterBar, mPropertyBag);
+	};
+
+	/**
+	 * This methods is called during the appliance of the remove condition change.
+	 * This intention is to update the propertyInfo property.
+	 *
+	 * @param {string} sPropertyName The name of a property.
+	 * @param {sap.ui.mdc.FilterBar} oFilterBar - the instance of filter bar
+	 * @param {Object} mPropertyBag Instance of property bag from Flex change API
+	 * @returns {Promise} Promise that resolves once the properyInfo property was updated
+	 */
+	ODataFilterBarDelegate.removeCondition = function(sPropertyName, oFilterBar, mPropertyBag) {
+		return ODataFilterBarDelegate._updatePropertyInfo(sPropertyName, oFilterBar, mPropertyBag);
+	};
+
+
 	/**
 	 * Can be used to trigger any necessary follow-up steps on removal of filter items. The returned boolean value inside the Promise can be used to
 	 * prevent default follow-up behaviour of Flex.
@@ -560,7 +661,11 @@ sap.ui.define([
 	 * @param {object} oFilterBar - the instance of filter bar
 	 * @returns {Promise} once resolved an array of property info is returned
 	 */
-	ODataFilterBarDelegate.fetchProperties = function (oFilterBar) {
+	ODataFilterBarDelegate.fetchProperties = function (oFilterBar, mPropertyBag) {
+
+		if (!(oFilterBar.isA && oFilterBar.isA("sap.ui.mdc.FilterBar")) && mPropertyBag) {
+			return ODataFilterBarDelegate._fetchPropertiesByMetadata(oFilterBar, mPropertyBag);
+		}
 
 		var sModelName = oFilterBar.getDelegate().payload.modelName;
 		var sEntitySet = oFilterBar.getDelegate().payload.collectionName;
@@ -569,9 +674,9 @@ sap.ui.define([
 
 				var oMetaModel;
 
-				var sCachKey = oFilterBar.getId() + '->' + sEntitySet;
-				if (mMainEntitySet[sCachKey]) {
-					resolve(mMainEntitySet[sCachKey]);
+				var oCachedEntitySet = ODataFilterBarDelegate._getInstanceCacheEntry(oFilterBar, "fetchedProperties");
+				if (oCachedEntitySet) {
+					resolve(oCachedEntitySet);
 					return;
 				}
 
@@ -594,7 +699,7 @@ sap.ui.define([
 						ODataFilterBarDelegate._fetchEntitySet(oMetaModel, '/' + sEntitySet, aVisitedEntityTypes, null, oParamInfo).then(function(aProperties) {
 
 							if (oParamInfo.parameterNavigationName && (oParamInfo.parameters.length > 0)) {
-								window[oFilterBar.getId() + '->' + sEntitySet + "-Parameters"] = oParamInfo;
+								ODataFilterBarDelegate._setInstanceCacheEntry(oFilterBar, sEntitySet + "-Parameters", oParamInfo);
 
 								//parameters are initially at the top of the result
 								aProperties.sort(function(p1, p2) {
@@ -622,7 +727,7 @@ sap.ui.define([
 								return mProperties[sName];
 							});
 
-							mMainEntitySet[sCachKey] = aProperties;
+							ODataFilterBarDelegate._setInstanceCacheEntry(oFilterBar, "fetchedProperties", aProperties);
 							resolve(aProperties);
 						});
 					}
@@ -633,17 +738,8 @@ sap.ui.define([
 		}.bind(this));
 	};
 
-
 	ODataFilterBarDelegate.cleanup = function (oFilterBar) {
-		var sFilterBarId = oFilterBar.getId() + "->";
-
-		Object.keys(mMainEntitySet).forEach(function(sKey){
-			if (sKey.indexOf(sFilterBarId) === 0) {
-
-				delete window[sFilterBarId + sKey + "-Parameters"];
-				delete mMainEntitySet[sKey];
-			}
-		});
+		InstanceCache.delete(oFilterBar.getId());
 	};
 
 	ODataFilterBarDelegate.getTypeUtil = function (oPayload) {