@openui5/sap.ui.mdc 1.113.0 → 1.115.0

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

@@ -4,18 +4,22 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Provides control sap.ui.mdc.filterbar.FilterItemLayout.
 sap.ui.define([
 	'sap/ui/core/Element'
 ], function(Element) {
 	"use strict";
 
+	/**
+	 * @class The <code>IFilterContainer</code> is the base container for the visualization of the filter items in the filter bar.
+	 * @public
+	 * @since 1.61.0
+	 * @alias sap.ui.mdc.filterbar.IFilterContainer
+	 */
 	var IFilterContainer = Element.extend("sap.ui.mdc.filterbar.IFilterContainer");
 
 	/**
-	 * Creates the inner layout for the IFilterContainer.
-	 * @protected
-	 * @ui5-restricted sap.ui.mdc, sap.fe
+	 * Creates the inner layout for the <code>IFilterContainer</code>.
+	 * @public
 	 */
 	IFilterContainer.prototype.init = function() {
 		Element.prototype.init.apply(this, arguments);
@@ -24,46 +28,45 @@ sap.ui.define([
 
 	/**
 	 * Getter for the inner layout item.
-	 * @returns {sap.ui.core.Control} Control instance of the inner layout item.
-	 * @protected
-	 * @ui5-restricted sap.ui.mdc, sap.fe
+	 * @returns {sap.ui.core.Control} Control instance of the inner layout item
+	 * @public
 	 */
 	IFilterContainer.prototype.getInner = function(){
 		return this.oLayout;
 	};
 
 	/**
-	 * Insert the inner content to the layout item.
-	 * @protected
+	 * Inserts the inner content into the layout item.
+	 * @public
+	 * @param {sap.ui.mdc.FilterItem} oControl to be inserted
+	 * @param {int} iIndex Position where the control is added
 	 */
 	IFilterContainer.prototype.insertFilterField = function(oControl, iIndex) {
 		//insert the content to the inner layout this.oLayout
 	};
 
 	/**
-	 * Remove the inner content from the layout item.
-	 * @protected
-	 * @ui5-restricted sap.ui.mdc, sap.fe
+	 * Removes the inner content from the layout item.
+	 * @public
+	 * @param {sap.ui.mdc.FilterItem} oControl Control that is removed
 	 */
 	IFilterContainer.prototype.removeFilterField = function(oControl) {
 		//remove the content from the inner layout this.oLayout
 	};
 
 	/**
-	 * Insert the inner content to the layout item.
-	 * @returns {Array} Array of all inner controls in the layout item.
-	 * @protected
-	 * @ui5-restricted sap.ui.mdc, sap.fe
+	 * Returns the inner controls of the layout item.
+	 * @returns {sap.ui.mdc.FilterItem[]} Array of all inner controls in the layout item
+	 * @public
 	 */
 	IFilterContainer.prototype.getFilterFields = function() {
 		//return the inner controls as array
 	};
 
 	/**
-	 * Overwrite the default 'exit' to cleanup the created layout properly
+	 * Overwrites the default exit to clean up the created layout properly.
 	 *
-	 * @protected
-	 * @ui5-restricted sap.ui.mdc, sap.fe
+	 * @public
 	 */
 	IFilterContainer.prototype.exit = function() {
 		Element.prototype.exit.apply(this, arguments);

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

@@ -20,17 +20,16 @@ sap.ui.define([
 	 *     A reference to an instance that will act as the parent of this helper
 	 *
 	 * @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.
+	 * Filter bar property helper provide a consistent and standardized view on properties and their attributes.
+	 * Validates the given properties, sets default values, 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.113.0
+	 * @version 1.115.0
 	 *
 	 * @private
-	 * @experimental
 	 * @since 1.95
 	 * @alias sap.ui.mdc.filterbar.PropertyHelper
 	 */
@@ -49,9 +48,9 @@ sap.ui.define([
 
 
 	/**
-	 * Applies defaults and resolves property references.
+	 * Applies default values and resolves property references.
 	 *
-	 * @param {object} oProperty The property to prepare
+	 * @param {object} oProperty The passed property
 	 * @protected
 	 */
 	PropertyHelper.prototype.prepareProperty = function(oProperty) {
@@ -60,7 +59,7 @@ sap.ui.define([
 
 			var oParent = this.getParent();
 			if (oParent && oParent._oDelegate) {
-				var oTypeUtil = oParent._oDelegate.getTypeUtil();
+				var oTypeUtil = oParent._oDelegate.getTypeMap(oParent);
 				try {
 					oProperty.typeConfig = oTypeUtil.getTypeConfig(oProperty.dataType, oProperty.formatOptions, oProperty.constraints);
 				} catch (ex) {

package/src/sap/ui/mdc/filterbar/aligned/FilterContainer.js

@@ -4,7 +4,6 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-// Provides control sap.ui.mdc.filterbar.aligned.FilterItemLayout.
 sap.ui.define([
 	'sap/ui/mdc/filterbar/IFilterContainer', 'sap/ui/layout/AlignedFlowLayout'
 ], function(IFilterContainer, AlignedFlowLayout) {
@@ -12,11 +11,10 @@ sap.ui.define([
 	/**
 	 * Constructor for a new filterBar/aligned/FilterContainer.
 	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
-	 * @class The FilterContainer is a IFilterContainer implementation for <code>AlignedFlowLayout</code>
+	 * @class The <code>FilterContainer</code> is an {@link sap.ui.layout.IFilterContainer IFilterContainer} implementation for {@link sap.ui.layout.AlignedFlowLayout AlignedFlowLayout}.
+	 * It is used by the {@link sap.ui.mdc.FilterBar FilterBar} to display the filter items.
 	 * @extends sap.ui.mdc.filterbar.IFilterContainer
 	 * @constructor
-	 * @private
-	 * @ui5-restricted sap.ui.mdc, sap.fe
 	 * @since 1.80.0
 	 * @alias sap.ui.mdc.filterbar.aligned.FilterContainer
 	 */

package/src/sap/ui/mdc/filterbar/aligned/FilterItemLayout.js

@@ -16,8 +16,6 @@ sap.ui.define(['sap/ui/layout/VerticalLayout', 'sap/ui/layout/VerticalLayoutRend
 	 * @class Represents a filter item on the UI.
 	 * @extends sap.ui.layout.VerticalLayout
 	 * @constructor
-	 * @private
-	 * @ui5-restricted sap.ui.mdc, sap.fe
 	 * @since 1.61.0
 	 * @alias sap.ui.mdc.filterbar.aligned.FilterItemLayout
 	 */
@@ -37,7 +35,7 @@ sap.ui.define(['sap/ui/layout/VerticalLayout', 'sap/ui/layout/VerticalLayoutRend
 
 		oFilterField.connectLabel(this._oLabel);
 
-		if (oFilterField.getFieldPath() === "$search") {
+		if (this._getFieldPath() === "$search") {
 			this._oLabel.setText("\u2008");
 		} else {
 			this._oLabel.addStyleClass("sapUiMdcFilterBarBaseLabel");
@@ -49,13 +47,12 @@ sap.ui.define(['sap/ui/layout/VerticalLayout', 'sap/ui/layout/VerticalLayoutRend
 	};
 
 	FilterItemLayout.prototype._getFieldPath = function () {
-		return this._sFieldPath;
+		return this._oFilterField ? this._oFilterField.getPropertyKey() : null;
 	};
 
 	FilterItemLayout.prototype.setFilterField = function (oFilterField) {
-		this._setLabel(oFilterField);
 		this._oFilterField = oFilterField;
-		this._sFieldPath = oFilterField.getFieldPath();
+		this._setLabel(oFilterField);
 	};
 
 	FilterItemLayout.prototype.getContent = function () {
@@ -68,7 +65,6 @@ sap.ui.define(['sap/ui/layout/VerticalLayout', 'sap/ui/layout/VerticalLayoutRend
 
 	FilterItemLayout.prototype.exit = function () {
 		this._oFilterField = null;
-		this._sFieldPath = null;
 
 		if (this._oLabel && !this._oLabel.bIsDestroyed) {
 			this._oLabel.destroy();

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

@@ -4,8 +4,20 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/core/library", "sap/ui/mdc/p13n/subcontroller/FilterController", "sap/ui/mdc/p13n/subcontroller/AdaptFiltersController", "sap/ui/mdc/filterbar/p13n/GroupContainer", "sap/ui/mdc/filterbar/p13n/FilterColumnLayout", "sap/ui/mdc/filterbar/p13n/FilterGroupLayout","sap/ui/mdc/filterbar/p13n/TableContainer", "sap/ui/mdc/filterbar/FilterBarBase", "sap/ui/mdc/filterbar/FilterBarBaseRenderer", "sap/base/util/merge", "sap/ui/core/Core", "sap/ui/mdc/enum/PersistenceMode"
-], function(coreLibrary, FilterController, AdaptFiltersController, GroupContainer, FilterColumnLayout, FilterGroupLayout, TableContainer, FilterBarBase, FilterBarBaseRenderer, merge, Core, PersistenceMode) {
+	"sap/ui/core/library",
+	"sap/ui/mdc/p13n/subcontroller/FilterController",
+	"sap/ui/mdc/p13n/subcontroller/AdaptFiltersController",
+	"sap/ui/mdc/filterbar/p13n/GroupContainer",
+	"sap/ui/mdc/filterbar/p13n/FilterColumnLayout",
+	"sap/ui/mdc/filterbar/p13n/FilterGroupLayout",
+	"sap/ui/mdc/filterbar/p13n/TableContainer",
+	"sap/ui/mdc/filterbar/FilterBarBase",
+	"sap/ui/mdc/filterbar/FilterBarBaseRenderer",
+	"sap/base/util/merge",
+	"sap/ui/core/Core",
+	"sap/ui/mdc/enums/PersistenceMode",
+	"sap/ui/mdc/util/mapVersions"
+], function(coreLibrary, FilterController, AdaptFiltersController, GroupContainer, FilterColumnLayout, FilterGroupLayout, TableContainer, FilterBarBase, FilterBarBaseRenderer, merge, Core, PersistenceMode, mapVersions) {
 	"use strict";
 
 	var ValueState = coreLibrary.ValueState;
@@ -20,7 +32,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.mdc.filterbar.FilterBarBase
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -68,7 +80,6 @@ sap.ui.define([
 	AdaptationFilterBar.prototype.init = function() {
 		FilterBarBase.prototype.init.apply(this,arguments);
 		this.addStyleClass("sapUIAdaptationFilterBar");
-		this._bPersistValues = true;
 
 		this.getEngine().defaultProviderRegistry.attach(this, PersistenceMode.Transient);
 		this._fnResolveAdaptationControlPromise = null;
@@ -79,7 +90,7 @@ sap.ui.define([
 
 	/**
 	 * This method will be called whenever the <code>AdaptationFilterBar</code> will be instantiated in a Dialog using the
-	 * <code>sap.m.p13n.UIManager</code>. This flag determines whether the control should be destroyed or kept alive once the p13n
+	 * {@link sap.m.p13n.UIManager}. This flag determines whether the control should be destroyed or kept alive once the p13n
 	 * dialog closes.
 	 *
 	 * @private
@@ -137,17 +148,15 @@ sap.ui.define([
 	// path in the model. Once the key reference between FilterFields, Columns and property info object has been aligned,
 	// the below fallback logic will become obsolete.
 	AdaptationFilterBar.prototype._getPropertyByName = function(sName) {
+
+		var oProperty = FilterBarBase.prototype._getPropertyByName.apply(this, arguments);
 		var oPropertyHelper = this.getPropertyHelper();
-		if (oPropertyHelper) {
-			var oProperty = oPropertyHelper.getProperties().find(function(oProp){
-				return oProp.path === sName;
+		if (!oProperty || (oProperty.filterable === false)) {
+			oProperty = oPropertyHelper.getProperties().find(function(oProp){
+				return oProp.path === sName && oProp.filterable;
 			});
-
-			if (!oProperty) {
-				oProperty = oPropertyHelper.getPropertyMap()[sName] || null;
-			}
-			return oProperty;
 		}
+		return oProperty;
 	};
 
 	AdaptationFilterBar.prototype._waitForAdaptControlAndPropertyHelper = function(){
@@ -160,7 +169,7 @@ sap.ui.define([
 
 	AdaptationFilterBar.prototype._initControlDelegate = function() {
 		return this.initControlDelegate().then(function() {
-			//this.getTypeUtil();
+			//this.getTypeMap();
 			if (!this._bIsBeingDestroyed) {
 				this._applyInitialFilterConditions();
 			}
@@ -196,11 +205,15 @@ sap.ui.define([
 	};
 
 	AdaptationFilterBar.prototype.getTypeUtil = function() {
+		return this.getTypeMap();
+	};
+
+	AdaptationFilterBar.prototype.getTypeMap = function() {
 		if (!this._getAdaptationControlInstance()) {
 			throw new Error("No adaptation control assigned yet.");
 		}
 
-		return this._getAdaptationControlInstance().getTypeUtil();
+		return this._getAdaptationControlInstance().getTypeMap();
 	};
 
 	AdaptationFilterBar.prototype.setMessageStrip = function(oStrip) {
@@ -247,26 +260,20 @@ sap.ui.define([
 	AdaptationFilterBar.prototype.createConditionChanges = function() {
 		return Promise.all([this._oAdaptationControlPromise, this.awaitControlDelegate()]).then(function() {
 			var mConditions = this._getModelConditions(this._getConditionModel(), false, true);
-			if (this._bPersistValues) {
-				//this._getAdaptationControlInstance(), "Filter", mConditions, true, true
-				return this.getEngine().createChanges({
-					control: this._getAdaptationControlInstance(),
-					applyAbsolute: true,
-					key: "Filter",
-					state: mConditions,
-					suppressAppliance: true
-				});
-			} else {
-				//TODO: currently only required once the parent FilterBar has p13nMode 'value' disabled.
-				this._getAdaptationControlInstance()._setXConditions(mConditions);
-				return Promise.resolve(null);
-			}
-			}.bind(this));
+
+			return this.getEngine().createChanges({
+				control: this._getAdaptationControlInstance(),
+				applyAbsolute: true,
+				key: "Filter",
+				state: mConditions,
+				suppressAppliance: true
+			});
+		}.bind(this));
 	};
 
 	/**
 	 *
-	 * Please note that the provided model should be created with sap.ui.mdc.p13n.P13nBuilder
+	 * Please note that the provided model should be created with {@link sap.ui.mdc.p13n.P13nBuilder}
 	 *
 	 * @param {object[]} aP13nData Necessary data to display and create <code>FilterColumnLayout</code> instances.
 	 *
@@ -283,7 +290,7 @@ sap.ui.define([
 		oP13nData.forEach(function(oP13nItem){
 			var oFilterField = this.mFilterFields && this.mFilterFields[oP13nItem.name];
 			if (oFilterField) {
-				var sKey = oFilterField.getFieldPath();
+				var sKey = oFilterField.getPropertyKey();
 				if (mConditions[sKey] && mConditions[sKey].length > 0) {
 					oP13nItem.active = true;
 				}
@@ -318,19 +325,22 @@ sap.ui.define([
 	 */
 	AdaptationFilterBar.prototype.createFilterFields = function(){
 		return this.initializedWithMetadata().then(function(){
-			var mConditions = this._bPersistValues ? this._getAdaptationControlInstance().getFilterConditions() : this._getAdaptationControlInstance()._getXConditions();
+			var mConditions = this._getAdaptationControlInstance().getFilterConditions();
 
 			this.setFilterConditions(mConditions);
-			this._setXConditions(mConditions);
+			var pConditions = this._setXConditions(mConditions);
 
 			if (this._bFilterFieldsCreated) {
-				this._oFilterBarLayout.setP13nData(this.getP13nData());
-				return this;
+				return pConditions.then(function(){
+					this._oFilterBarLayout.setP13nData(this.getP13nData());
+					return this;
+				}.bind(this));
 			}
 
 			var oAdaptationControl = this._getAdaptationControlInstance();
 			var oDelegate = oAdaptationControl.getControlDelegate();
 			var oFilterDelegate = this._checkAdvancedParent(oAdaptationControl) ? oDelegate : oDelegate.getFilterDelegate();
+			mapVersions(oFilterDelegate);
 
 			//used to store the originals
 			this._mOriginalsForClone = {};
@@ -354,7 +364,7 @@ sap.ui.define([
 					if (this._checkAdvancedParent(oAdaptationControl)) {
 						if (oFilterField._bTemporaryOriginal) {
 							delete oFilterFieldPromise._bTemporaryOriginal;
-							this._mOriginalsForClone[oFilterField.getFieldPath()] = oFilterField;
+							this._mOriginalsForClone[oFilterField.getPropertyKey()] = oFilterField;
 						}
 						oFieldForDialog = oFilterField.clone();
 
@@ -406,7 +416,7 @@ sap.ui.define([
 		var aExistingItems = this._checkAdvancedParent(oAdaptationControl) ? oAdaptationControl.getFilterItems() : [];
 
 		var mExistingFilterItems = aExistingItems.reduce(function(mMap, oField){
-			mMap[oField.getFieldPath()] = oField;
+			mMap[oField.getPropertyKey()] = oField;
 			return mMap;
 		},{});
 
@@ -414,7 +424,7 @@ sap.ui.define([
 			oFilterFieldPromise = Promise.resolve(mExistingFilterItems[oItem.name]);
 		} else  {
 
-			oFilterFieldPromise = oFilterDelegate.addItem(oItem.name, this._getAdaptationControlInstance());
+			oFilterFieldPromise = oFilterDelegate.addItem(this._getAdaptationControlInstance(), oItem.name);
 
 			oFilterFieldPromise = oFilterFieldPromise.then(function(oFilterField){
 
@@ -439,7 +449,7 @@ sap.ui.define([
 			var oDelegate = this._getAdaptationControlInstance().getControlDelegate();
 
 			if (aExistingItems.indexOf(sKey) < 0) {//Originals that have not been selected --> use continue similar to 'ItemBaseFlex'
-				var oRemovePromise = oDelegate.removeItem.call(oDelegate, sKey, this._getAdaptationControlInstance()).then(function(bContinue){
+				var oRemovePromise = oDelegate.removeItem.call(oDelegate, this._getAdaptationControlInstance(), sKey).then(function(bContinue){
 					if (bContinue && this._mOriginalsForClone[sKey]) {
 						// destroy the item
 						this._mOriginalsForClone[sKey].destroy();
@@ -466,6 +476,7 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.mdc.Control} oControl the mdc control instance
 	 * @param {boolean} bSuppressInvalidate suppress invalidation
+	 * @return {sap.ui.mdc.filterbar.p13n.AdaptationFilterBar} this
 	 */
 	AdaptationFilterBar.prototype.setAdaptationControl = function(oControl, bSuppressInvalidate) {
 
@@ -487,7 +498,7 @@ sap.ui.define([
 				if (oEvt.getParameter("reason") === "Remove") {
 					var oItem = oEvt.getParameter("item");
 					var mConditions = {};
-					mConditions[this.mFilterFields[oItem.name].getFieldPath()] = [];
+					mConditions[this.mFilterFields[oItem.name].getPropertyKey()] = [];
 
 					return this.getEngine().createChanges({
 						control: this,

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

@@ -30,13 +30,12 @@ sap.ui.define(['sap/m/ColumnListItem', 'sap/m/ColumnListItemRenderer', 'sap/m/La
 	});
 
 	FilterColumnLayout.prototype._getFieldPath = function () {
-		return this._sFieldPath;
+		return this._oFilterField ? this._oFilterField.getPropertyKey() : null;
 	};
 
 	FilterColumnLayout.prototype.setFilterField = function (oFilterField) {
-		this._sLabel = oFilterField.getLabel();
 		this._oFilterField = oFilterField;
-		this._sFieldPath = oFilterField.getFieldPath();
+		this._sLabel = oFilterField.getLabel();
 	};
 
 	FilterColumnLayout.prototype.getCells = function() {
@@ -58,7 +57,6 @@ sap.ui.define(['sap/m/ColumnListItem', 'sap/m/ColumnListItemRenderer', 'sap/m/La
 	FilterColumnLayout.prototype.exit = function () {
 		ColumnListItem.prototype.exit.apply(this, arguments);
 		this._oFilterField = null;
-		this._sFieldPath = null;
 	};
 
 	return FilterColumnLayout;

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

@@ -35,12 +35,11 @@ sap.ui.define(['sap/ui/core/Control'
 	});
 
 	FilterGroupLayout.prototype._getFieldPath = function () {
-		return this._sFieldPath;
+		return this._oFilterField ? this._oFilterField.getPropertyKey() : null;
 	};
 
 	FilterGroupLayout.prototype.setFilterField = function (oFilterField) {
 		this._oFilterField = oFilterField;
-		this._sFieldPath = oFilterField.getFieldPath();
 	};
 
 	FilterGroupLayout.prototype.getIdForLabel = function () {
@@ -62,7 +61,6 @@ sap.ui.define(['sap/ui/core/Control'
 	FilterGroupLayout.prototype.exit = function () {
 		Control.prototype.exit.apply(this, arguments);
 		this._oFilterField = null;
-		this._sFieldPath = null;
 	};
 
 	return FilterGroupLayout;

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

@@ -58,8 +58,10 @@ sap.ui.define([
 
 	TableContainer.prototype.insertFilterField = function(oControl, iIndex) {
 		var oFilterBar = oControl._oFilterField.getParent();
-		var sKey = oFilterBar._getPropertyByName(oControl._getFieldPath()).name;
-		this.mFilterItems[sKey] = oControl;
+		var oProperty = oFilterBar._getPropertyByName(oControl._getFieldPath());
+		if (oProperty) {
+			this.mFilterItems[oProperty.name] = oControl;
+		}
 	};
 
 	TableContainer.prototype.setP13nData = function(oAdaptationData) {

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

@@ -11,7 +11,7 @@ sap.ui.define(
 		"sap/ui/mdc/filterbar/aligned/FilterItemLayout",
 		"sap/ui/mdc/filterbar/vh/FilterContainer",
 		"sap/m/Button",
-		"sap/ui/mdc/enum/PersistenceMode"
+		"sap/ui/mdc/enums/PersistenceMode"
 	],
 	function (
 		mLibrary,
@@ -40,9 +40,7 @@ sap.ui.define(
 		 * @namespace
 		 * @name sap.ui.mdc.filterbar.vh
 		 * @since 1.84.0
-		 * @private
-		 * @experimental As of version 1.84
-		 * @ui5-restricted sap.ui.mdc
+		 * @public
 		 */
 
 		/**
@@ -56,11 +54,9 @@ 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.113.0
+		 * @version 1.115.0
 		 * @constructor
-		 * @private
-		 * @ui5-restricted sap.fe
-		 * @MDC_PUBLIC_CANDIDATE
+		 * @public
 		 * @since 1.84.0
 		 * @alias sap.ui.mdc.filterbar.vh.FilterBar
 		 */
@@ -70,6 +66,13 @@ sap.ui.define(
 				metadata: {
 					library: "sap.ui.mdc",
 					properties: {
+						/**
+						 * Path to the <code>Delegate</code> module that provides the required APIs to execute model-specific logic.<br>
+						 * <b>Note:</b> Ensure that the related file can be requested (any required library has to be loaded before that).<br>
+						 * Do not bind or modify the module. This property can only be configured during control initialization.
+						 *
+						 * @experimental
+						 */
 						delegate: {
 							type: "object",
 							defaultValue: {
@@ -156,29 +159,19 @@ sap.ui.define(
 
 			this._oFilterBarLayout.addControl(this._oBtnFilters);
 
-
 			this._oShowAllFiltersBtn = new Button(this.getId() + "-btnShowAllFilters", {
 				type: ButtonType.Transparent,
 				press: this._onShowAllFilters.bind(this),
-				text: this._oRb.getText("valuehelp.SHOWALLFILTERS")
+				text: this._oRb.getText("valuehelp.SHOWALLFILTERS"),
+				visible: false
 			});
-			this._oFilterBarLayout.addEndContent(this._oShowAllFiltersBtn);
-		};
 
-		FilterBar.prototype.applySettings = function(mSettings, oScope) {
-			this._applySettings(mSettings, oScope);
-			this._waitForMetadata();
-		};
-
-		FilterBar.prototype._handleConditionModelPropertyChange = function() {
-			FilterBarBase.prototype._handleConditionModelPropertyChange.apply(this, arguments);
-			this.fireFiltersChanged({conditionsBased: true});
+			this._oFilterBarLayout.addEndContent(this._oShowAllFiltersBtn);
 		};
 
 
 		FilterBar.prototype.init = function() {
 			FilterBarBase.prototype.init.apply(this, arguments);
-			this._bPersistValues = true;
 			this.getEngine().defaultProviderRegistry.attach(this, PersistenceMode.Transient);
 		};
 

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

@@ -16,7 +16,7 @@ sap.ui.define(["sap/ui/mdc/FilterBarDelegate"], function(FilterBarDelegate) {
 	ValueHelpFilterBarDelegate.fetchProperties = function(oFilterBar) {
 		return Promise.resolve([{
 			name: "$search",
-			typeConfig: FilterBarDelegate.getTypeUtil().getTypeConfig("String", null, null)
+			typeConfig: FilterBarDelegate.getTypeMap().getTypeConfig("String", null, null)
 		}]);
 	};
 

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

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

@@ -11,24 +11,8 @@ sap.ui.define([
 
 	var oChartItemFlex = Object.assign({}, ItemBaseFlex);
 
-	/* Disabled until clarified with flex
-	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;
-	};*/
-
-	oChartItemFlex.beforeAddItem = function(Delegate, sDataPropertyName, oControl, mPropertyBag, oChangeContent) {
-
-		return Delegate.addItem.call(Delegate, sDataPropertyName, oControl, mPropertyBag, oChangeContent.role);
-
+	oChartItemFlex.beforeAddItem = function(Delegate, sPropertyKey, oControl, mPropertyBag, oChangeContent) {
+		return Delegate.addItem.call(Delegate, oControl, sPropertyKey, mPropertyBag, oChangeContent.role);
 	};
 
 	oChartItemFlex.findItem = function(oModifier, aItems, sName) {
@@ -51,26 +35,6 @@ sap.ui.define([
 		}, Promise.resolve());
 	};
 
-	/* Disabled until clarified with flex
-	oChartItemFlex.createChangeHandler = function(fApply, fComplete, fRevert) {
-		return {
-			"changeHandler": {
-				applyChange: function(oChange, oControl, mPropertyBag) {
-					return fnQueueChange(oControl, function(){return fApply(oChange, oControl, mPropertyBag);});
-				},
-				completeChangeContent: function(oChange, mChangeSpecificInfo, mPropertyBag) {
-					fComplete(oChange, mChangeSpecificInfo, mPropertyBag);
-				},
-				revertChange: function(oChange, oControl, mPropertyBag) {
-					return fnQueueChange(fRevert(oChange, oControl, mPropertyBag, true));
-				}
-			},
-			"layers": {
-				"USER": true
-			}
-		};
-	};*/
-
 	oChartItemFlex.addItem = oChartItemFlex.createAddChangeHandler();
 	oChartItemFlex.removeItem = oChartItemFlex.createRemoveChangeHandler();
 	oChartItemFlex.moveItem = oChartItemFlex.createMoveChangeHandler();

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

@@ -17,9 +17,9 @@ sap.ui.define([
 				.then(function(oFoundColumn) {
 					if (!oFoundColumn) {
 						return Promise.resolve()
-							.then(oModifier.getProperty.bind(oModifier, oColumn, "dataProperty"))
-							.then(function(sDataProperty) {
-								if (sDataProperty === sName) {
+							.then(oModifier.getProperty.bind(oModifier, oColumn, "propertyKey"))
+							.then(function(sPropertyKey) {
+								if (sPropertyKey === sName) {
 									return oColumn;
 								}
 							});