@openui5/sap.ui.mdc 1.113.0 → 1.115.0

package/src/sap/ui/mdc/table/TableSettings.js

@@ -11,9 +11,9 @@
 // ---------------------------------------------------------------------------------------
 // ---------------------------------------------------------------------------------------
 sap.ui.define([
-	"sap/m/OverflowToolbarButton", "sap/m/library", "sap/m/OverflowToolbarMenuButton", "sap/ui/core/library", 	"sap/ui/Device", "sap/ui/core/ShortcutHintsMixin", "sap/ui/core/theming/Parameters"
+	"sap/m/OverflowToolbarButton", "sap/m/library", "sap/m/OverflowToolbarMenuButton", "sap/m/Menu", "sap/m/MenuItem", "sap/ui/core/library", "sap/ui/Device", "sap/ui/core/ShortcutHintsMixin", "sap/ui/core/theming/Parameters", "sap/ui/performance/trace/FESRHelper"
 
-], function(OverflowToolbarButton, MLibrary, OverflowToolbarMenuButton, CoreLibrary, Device, ShortcutHintsMixin, ThemeParameters) {
+], function(OverflowToolbarButton, MLibrary, OverflowToolbarMenuButton, Menu, MenuItem, CoreLibrary, Device, ShortcutHintsMixin, ThemeParameters, FESRHelper) {
 	"use strict";
 
 	var HasPopup = CoreLibrary.aria.HasPopup;
@@ -44,6 +44,7 @@ sap.ui.define([
 				ariaHasPopup: HasPopup.Dialog
 			});
 
+			FESRHelper.setSemanticStepname(oBtn, "press", "mdc:tbl:p13n");
 
 			ShortcutHintsMixin.addConfig(oBtn, {
 					addAccessibilityLabel: true,
@@ -57,6 +58,8 @@ sap.ui.define([
 		createPasteButton: function (sIdPrefix) {
 			var oPasteButton = this._createButton(sIdPrefix + "-paste");
 
+			FESRHelper.setSemanticStepname(oPasteButton, "press", "mdc:tbl:paste");
+
 			sap.ui.require(["sap/m/plugins/PasteProvider"], function(PasteProvider) {
 				oPasteButton.addDependent(new PasteProvider({
 					pasteFor: sIdPrefix + "-innerTable"
@@ -80,24 +83,23 @@ sap.ui.define([
 				defaultAction: mEventInfo.default
 			});
 
-			// sap.m.Menu requires modules from the unified Lib - load it properly with preload
-			sap.ui.getCore().loadLibrary("sap.ui.unified", {async: true}).then(function() {
-				sap.ui.require(["sap/m/Menu", "sap/m/MenuItem"], function(Menu, MenuItem) {
-					var oMenu = new Menu({
-						items: [
-							new MenuItem({
-								text: oRb.getText("table.QUICK_EXPORT"),
-								press: mEventInfo.default
-							}),
-							new MenuItem({
-								text: oRb.getText("table.EXPORT_WITH_SETTINGS"),
-								press: mEventInfo.exportAs
-							})
-						]
-					});
-					oMenuButton.setMenu(oMenu);
-				});
+			var oMenu = new Menu({
+				items: [
+					new MenuItem({
+						text: oRb.getText("table.QUICK_EXPORT"),
+						press: mEventInfo.default
+					}),
+					new MenuItem({
+						text: oRb.getText("table.EXPORT_WITH_SETTINGS"),
+						press: mEventInfo.exportAs
+					})
+				]
 			});
+			oMenuButton.setMenu(oMenu);
+
+			FESRHelper.setSemanticStepname(oMenuButton, "defaultAction", "OI:QE");
+			FESRHelper.setSemanticStepname(oMenu.getItems()[0], "press", "OI:QE");
+			FESRHelper.setSemanticStepname(oMenu.getItems()[1], "press", "OI:EXP:SETTINGS");
 
 			ShortcutHintsMixin.addConfig(oMenuButton._getButtonControl(), {
 					addAccessibilityLabel: true,
@@ -123,6 +125,8 @@ sap.ui.define([
 				tooltip: sText
 			});
 
+			FESRHelper.setSemanticStepname(oButton, "press", "mdc:tbl:" + (bIsExpand ? "expandAll" : "collapseAll"));
+
 			return oButton;
 		},
 		_createButton: function(sId, mSettings) {

package/src/sap/ui/mdc/table/TableTypeBase.js

@@ -5,18 +5,18 @@
  */
 
 sap.ui.define([
-	"../library",
 	"sap/ui/core/Element",
-	"sap/ui/core/dnd/DragDropInfo"
+	"sap/ui/core/dnd/DragDropInfo",
+	"sap/ui/model/base/ManagedObjectModel",
+	"sap/ui/mdc/enums/TableP13nMode"
 ], function(
-	library,
 	Element,
-	DragDropInfo
+	DragDropInfo,
+	ManagedObjectModel,
+	TableP13nMode
 ) {
 	"use strict";
 
-	var P13nMode = library.TableP13nMode;
-
 	/**
 	 * Constructor for a new <code>TableTypeBase</code>.
 	 *
@@ -25,11 +25,8 @@ sap.ui.define([
 	 * @class The table type info base class for the metadata-driven table. Base class with no implementation.
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @private
-	 * @ui5-restricted sap.fe
-	 * @MDC_PUBLIC_CANDIDATE
+	 * @public
 	 * @abstract
-	 * @experimental
 	 * @since 1.65
 	 * @alias sap.ui.mdc.table.TableTypeBase
 	 */
@@ -40,8 +37,42 @@ sap.ui.define([
 		}
 	});
 
+	TableTypeBase.prototype.init = function() {
+		Element.prototype.init.apply(this, arguments);
+		this._oManagedObjectModel = new ManagedObjectModel(this);
+	};
+
+	TableTypeBase.prototype.exit = function() {
+		this._disconnectFromTable();
+		this._oManagedObjectModel.destroy();
+		delete this._oManagedObjectModel;
+		Element.prototype.exit.apply(this, arguments);
+	};
+
+	TableTypeBase.prototype.setParent = function() {
+		this._disconnectFromTable();
+		Element.prototype.setParent.apply(this, arguments);
+		this._connectToTable();
+	};
+
+	TableTypeBase.prototype._connectToTable = function() {
+		var oTable = this.getTable();
+
+		if (oTable) {
+			oTable.setModel(this._oManagedObjectModel, "$sap.ui.mdc.Table#type");
+		}
+	};
+
+	TableTypeBase.prototype._disconnectFromTable = function() {
+		var oTable = this.getTable();
+
+		if (oTable && !oTable.isDestroyStarted()) {
+			oTable.setModel(null, "$sap.ui.mdc.Table#type");
+		}
+	};
+
 	TableTypeBase.prototype.getSupportedP13nModes = function() {
-		return Object.keys(P13nMode);
+		return Object.keys(TableP13nMode);
 	};
 
 	TableTypeBase.prototype.callHook = function(sHookName, oObject, mPropertyBag) {
@@ -89,7 +120,7 @@ sap.ui.define([
 			sourceAggregation: "columns",
 			targetAggregation: "columns",
 			dropPosition: "Between",
-			enabled: oTable.getActiveP13nModes().includes(P13nMode.Column),
+			enabled: oTable.getActiveP13nModes().includes(TableP13nMode.Column),
 			drop: [this._onColumnMove, this]
 		});
 		oDragDropInfo.bIgnoreMetadataCheck = true;
@@ -165,15 +196,12 @@ sap.ui.define([
 	TableTypeBase.prototype.bindRows = function(oBindingInfo) {};
 	TableTypeBase.prototype.isTableBound = function() {};
 	TableTypeBase.prototype.createRowTemplate = function(sId) {};
-	TableTypeBase.prototype.updateSelectionSettings = function() {};
 	TableTypeBase.prototype.insertFilterInfoBar = function(oFilterInfoBar, sAriaLabelId) {};
 	TableTypeBase.prototype.enableColumnResize = function() {};
 	TableTypeBase.prototype.disableColumnResize = function() {};
 	TableTypeBase.prototype.createColumnResizeMenuItem = function() {};
 	TableTypeBase.prototype.updateRowActions = function() {};
 	TableTypeBase.prototype.updateSortIndicator = function(oColumn, sSortOrder) {};
-	TableTypeBase.prototype.getSelectedContexts = function() {};
-	TableTypeBase.prototype.clearSelection = function() {};
 
 	return TableTypeBase;
 });

package/src/sap/ui/mdc/table/TreeTableType.js

@@ -21,10 +21,7 @@ sap.ui.define([
 	 * @class The table type info class for the metadata-driven table.
 	 * @extends sap.ui.mdc.table.GridTableType
 	 * @author SAP SE
-	 * @private
-	 * @experimental
-	 * @ui5-restricted sap.fe
-	 * @MDC_PUBLIC_CANDIDATE
+	 * @public
 	 * @since 1.109
 	 * @alias sap.ui.mdc.table.TreeTableType
 	 */
@@ -40,21 +37,18 @@ sap.ui.define([
 			return Promise.resolve();
 		}
 
-		return Promise.all([
-			GridTableType.prototype.loadModules.apply(this, arguments),
-			this.loadUiTableLibrary().then(function() {
-				return new Promise(function(resolve, reject) {
-					sap.ui.require([
-						"sap/ui/table/TreeTable"
-					], function(TreeTable) {
-						InnerTable = TreeTable;
-						resolve();
-					}, function() {
-						reject("Failed to load some modules");
-					});
+		return GridTableType.prototype.loadModules.apply(this, arguments).then(function() {
+			return new Promise(function(resolve, reject) {
+				sap.ui.require([
+					"sap/ui/table/TreeTable"
+				], function(TreeTable) {
+					InnerTable = TreeTable;
+					resolve();
+				}, function() {
+					reject("Failed to load some modules");
 				});
-			})
-		]);
+			});
+		});
 	};
 
 	TreeTableType.prototype.createTable = function(sId) {
@@ -71,19 +65,5 @@ sap.ui.define([
 		return oTreeTable;
 	};
 
-	TreeTableType.prototype.getTableSettings = function() {
-		var oTable = this.getTable();
-		var bSelectionSupported = oTable ? oTable.bDelegateInitialized && oTable.getControlDelegate().getSupportedFeatures(oTable)["selection"] : false;
-		var mTableSettings = GridTableType.prototype.getTableSettings.apply(this, arguments);
-
-		if (!bSelectionSupported) {
-			mTableSettings.plugins[0].destroy();
-			delete mTableSettings.plugins;
-			mTableSettings.selectionMode = "None";
-		}
-
-		return mTableSettings;
-	};
-
 	return TreeTableType;
 });

package/src/sap/ui/mdc/table/V4AnalyticsPropertyHelper.js

@@ -62,10 +62,7 @@ sap.ui.define([
 	 * @property {string[]} [customAggregate.contextDefiningProperties]
 	 *   A list of related properties (by name) that are the context-defining properties of the <code>CustomAggregate</code>.
 	 *
-	 * @private
-	 * @experimental
-	 * @ui5-restricted sap.fe
-	 * @MDC_PUBLIC_CANDIDATE
+	 * @public
 	 */
 
 	/**
@@ -80,7 +77,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.table.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 *
 	 * @private
 	 * @experimental

package/src/sap/ui/mdc/table/menu/Item.js

@@ -31,7 +31,7 @@ sap.ui.define([
 		var oController = oEngine.getController(oTable, sKey);
 
 		if (sKey === "Filter") {
-			var aFilterableProperties = oTable.getPropertyHelper().getProperty(oColumn.getDataProperty()).getFilterableProperties();
+			var aFilterableProperties = oTable.getPropertyHelper().getProperty(oColumn.getPropertyKey()).getFilterableProperties();
 			var aPropertyNames = aFilterableProperties.map(function(oProperty) {
 				return oProperty.name;
 			});

package/src/sap/ui/mdc/table/menu/QuickActionContainer.js

@@ -53,7 +53,7 @@ sap.ui.define([
 		this.destroyQuickActions(); // TODO: More efficient update would be good
 
 		if (oTable.isSortingEnabled()) {
-			var aSortableProperties = oPropertyHelper.getProperty(oColumn.getDataProperty()).getSortableProperties();
+			var aSortableProperties = oPropertyHelper.getProperty(oColumn.getPropertyKey()).getSortableProperties();
 			var aSortedProperties = oTable._getSortedProperties();
 
 			if (aSortableProperties.length > 0) {
@@ -85,7 +85,7 @@ sap.ui.define([
 		}
 
 		if (oTable.isGroupingEnabled()) {
-			var aGroupableProperties = oPropertyHelper.getProperty(oColumn.getDataProperty()).getGroupableProperties();
+			var aGroupableProperties = oPropertyHelper.getProperty(oColumn.getPropertyKey()).getGroupableProperties();
 			var aGroupedProperties = oTable._getGroupedProperties();
 
 			if (aGroupableProperties.length > 0) {
@@ -111,7 +111,7 @@ sap.ui.define([
 		}
 
 		if (oTable.isAggregationEnabled()) {
-			var aPropertiesThatCanBeTotaled = oPropertyHelper.getProperty(oColumn.getDataProperty()).getAggregatableProperties().filter(function(oProperty) {
+			var aPropertiesThatCanBeTotaled = oPropertyHelper.getProperty(oColumn.getPropertyKey()).getAggregatableProperties().filter(function(oProperty) {
 				return oProperty.extension && oProperty.extension.customAggregate;
 			});
 			var mAggregatedProperties = oTable._getAggregatedProperties();

package/src/sap/ui/mdc/table/utils/Personalization.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * P13n utilities.
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 * @namespace
 	 * @alias sap.ui.mdc.table.utils.Personalization
 	 * @private
@@ -154,7 +154,7 @@ sap.ui.define([
 	 * @param {sap.ui.mdc.Table} oTable The table for which to create the change.
 	 * @param {object} mSettings The change details.
 	 * @param {Array} mSettings.conditions The filter conditions that should be applied to the table.
-	 * @param {sap.ui.mdc.enum.ProcessingStrategy|boolean} mSettings.strategy The processing strategy on how to apply the change.
+	 * @param {sap.ui.mdc.enums.ProcessingStrategy|boolean} mSettings.strategy The processing strategy on how to apply the change.
 	 */
 	PersonalizationUtils.createFilterChange = function(oTable, mSettings) {
 		oTable.getEngine().createChanges({
@@ -200,7 +200,7 @@ sap.ui.define([
 			control: oTable,
 			key: "ColumnWidth",
 			state: [{
-				name: mSettings.column.getDataProperty(),
+				name: mSettings.column.getPropertyKey(),
 				width: mSettings.width
 			}],
 			applyAbsolute: false
@@ -226,7 +226,7 @@ sap.ui.define([
 			control: oTable,
 			key: "Column",
 			state: [{
-				name: mSettings.column.getDataProperty(),
+				name: mSettings.column.getPropertyKey(),
 				position: mSettings.index
 			}]
 		});

package/src/sap/ui/mdc/themes/base/ValueHelpDialog.less

@@ -39,8 +39,13 @@
 }
 
 // make the toolbar height 3rem and add 2rem padding left/right
-.sapMdcValueHelpPanel .sapMTB {
+.sapMdcValueHelpPanel .sapMdcValueHelpPanelFilterbar .sapMTB {
+	margin-top: 0.5rem;
 	height: 3rem;
+}
+
+.sapMdcValueHelpPanel .sapMdcValueHelpPanelFilterbar .sapMTB,
+.sapMdcValueHelpPanel .sapUiMdcTable .sapMTB {
 	padding-left: 0;
 	padding-right: 1rem;
 }
@@ -108,7 +113,6 @@
 
 // hide the toolbar border and give some more top margin
 .sapMdcValueHelpPanel .sapMTBStandard {
-	margin-top: 0.5rem;
 	border-bottom: solid 1px transparent;
 }
 
@@ -161,10 +165,6 @@
 	height: 100%;
 }
 
-.sapMdcValueHelpPanelTableBox .sapUiMdcTable .sapMTBStandard {
-	margin-top: 0;
-}
-
 .sapMdcValueHelpPanel .sapUiFixFlexScrolling .sapMdcValueHelpPanelTableBox {
 	height: 200px !important;
 }

package/src/sap/ui/mdc/util/DateUtil.js

@@ -6,7 +6,7 @@
 sap.ui.define([
 		'sap/ui/core/library',
 		'sap/ui/core/date/UI5Date',
-		'sap/ui/mdc/enum/BaseType',
+		'sap/ui/mdc/enums/BaseType',
 		'sap/base/util/merge'
 	],
 	function(
@@ -125,7 +125,7 @@ sap.ui.define([
 				 *
 				 * @param {any} vDate Date
 				 * @param {sap.ui.model.SimpleType} oType Data type
-				 * @param {sap.ui.mdc.enum.BaseType} [sBaseType] Basic type
+				 * @param {sap.ui.mdc.enums.BaseType} [sBaseType] Basic type
 				 * @return {string} Date as ISOString
 				 * @private
 				 * @ui5-restricted sap.ui.mdc
@@ -135,9 +135,9 @@ sap.ui.define([
 
 					var oDate = this.typeToDate(vDate, oType, sBaseType);
 
-					// if (oType.getFormatOptions().UTC) { // in UTC date we need to bring the local date to UTC
-					// 	oDate = UI5Date.getInstance(Date.UTC(oDate.getFullYear(), oDate.getMonth(), oDate.getDate(), oDate.getHours(), oDate.getMinutes(), oDate.getSeconds(), oDate.getMilliseconds()));
-					// }
+					if (oType.getFormatOptions().UTC) { // in UTC date we need to bring the local date to UTC
+						oDate = UI5Date.getInstance(Date.UTC(oDate.getFullYear(), oDate.getMonth(), oDate.getDate(), oDate.getHours(), oDate.getMinutes(), oDate.getSeconds(), oDate.getMilliseconds()));
+					}
 
 					return oDate.toISOString();
 
@@ -148,7 +148,7 @@ sap.ui.define([
 				 *
 				 * @param {string} sISODate Date
 				 * @param {sap.ui.model.SimpleType} oType Data type
-				 * @param {sap.ui.mdc.enum.BaseType} [sBaseType] Basic type
+				 * @param {sap.ui.mdc.enums.BaseType} [sBaseType] Basic type
 				 * @return {any} Date for type
 				 * @private
 				 * @ui5-restricted sap.ui.mdc
@@ -173,7 +173,7 @@ sap.ui.define([
 				 *
 				 * @param {Date} oDate the date to convert
 				 * @param {sap.ui.model.SimpleType} oType Data type
-				 * @param {sap.ui.mdc.enum.BaseType} [sBaseType] Basic type
+				 * @param {sap.ui.mdc.enums.BaseType} [sBaseType] Basic type
 				 * @returns {any} date in type representation
 				 * @private
 				 */
@@ -182,6 +182,8 @@ sap.ui.define([
 
 					if (oType.getModelValue) {
 						vDate = oType.getModelValue(oDate);
+					} else if (oType.isA("sap.ui.model.type.DateTime") && oType.getFormatOptions().UTC) { // old DateTime don't support UTC on ModelFormat
+						vDate = UI5Date.getInstance(Date.UTC(oDate.getFullYear(), oDate.getMonth(), oDate.getDate(), oDate.getHours(), oDate.getMinutes(), oDate.getSeconds(), oDate.getMilliseconds()));
 					} else { // older types don't support the new getModelValue
 						var oModelFormat = oType.getModelFormat();
 						var oFormatOptions = oType.getFormatOptions();
@@ -199,16 +201,18 @@ sap.ui.define([
 				 *
 				 * @param {any} vDate date in type representation
 				 * @param {sap.ui.model.SimpleType} oType Data type
-				 * @param {sap.ui.mdc.enum.BaseType} [sBaseType] Basic type
+				 * @param {sap.ui.mdc.enums.BaseType} [sBaseType] Basic type
 				 * @returns {Date} JSDate (local)
 				 * @private
 				 */
 				typeToDate: function(vDate, oType, sBaseType) {
 					var oDate;
 
-					if (oType.isA("sap.ui.model.odata.type.DateTime") && oType.getConstraints().displayFormat === "Date") { // TODO: need some type-function to convert
-						oDate = UI5Date.getInstance(vDate.getUTCFullYear(), vDate.getUTCMonth(), vDate.getUTCDate());
-					} else {
+					if (oType.getDateValue) {
+						oDate = oType.getDateValue(vDate);
+					} else if (oType.isA("sap.ui.model.type.DateTime") && oType.getFormatOptions().UTC) { // old DateTime don't support UTC on ModelFormat
+						oDate = UI5Date.getInstance(vDate.getUTCFullYear(), vDate.getUTCMonth(), vDate.getUTCDate(), vDate.getUTCHours(), vDate.getUTCMinutes(), vDate.getUTCSeconds(), vDate.getUTCMilliseconds());
+					} else { // older types don't support the new getDateValue
 						var oModelFormat = oType.getModelFormat();
 						var oFormatOptions = oType.getFormatOptions();
 						var bUTC = sBaseType === BaseType.DateTime ? !!oFormatOptions.UTC : false;

package/src/sap/ui/mdc/util/FilterUtil.js

@@ -7,16 +7,30 @@
 // ------------------------------------------------------------------------------------------
 // Utility class used mdc table and chart
 // ------------------------------------------------------------------------------------------
-sap.ui.define(['sap/ui/mdc/util/IdentifierUtil', 'sap/ui/mdc/enum/ConditionValidated', "sap/ui/mdc/condition/ConditionConverter", 'sap/ui/mdc/condition/FilterConverter', 'sap/base/Log', 'sap/base/util/merge'],
+sap.ui.define(['sap/ui/mdc/util/IdentifierUtil', 'sap/ui/mdc/enums/ConditionValidated', "sap/ui/mdc/condition/ConditionConverter", 'sap/ui/mdc/condition/FilterConverter', 'sap/base/Log', 'sap/base/util/merge'],
 		function(IdentifierUtil, ConditionValidated, ConditionConverter, FilterConverter, Log, merge) {
 	"use strict";
 
+	// Added support for deprecated TypeUtil
+	var _getTypeMap = function (vTypeProvider) {
+
+		if (vTypeProvider && vTypeProvider.getTypeMap) {
+			return vTypeProvider.getTypeMap();
+		}
+
+		if (vTypeProvider && vTypeProvider.getTypeUtil) {
+			return vTypeProvider.getTypeUtil();
+		}
+
+		return vTypeProvider;
+	};
+
 	/**
 	 * Utility class used by mdc controls to create the filter statement
 	 *
 	 * @namespace
 	 * @private
-	 * @ui5-restricted sap.ui.mdc, sap.fe
+	 * @ui5-restricted sap.fe
 	 * @since 1.80.0
 	 * @alias sap.ui.mdc.util.FilterUtil
 	 */
@@ -28,8 +42,7 @@ sap.ui.define(['sap/ui/mdc/util/IdentifierUtil', 'sap/ui/mdc/enum/ConditionValid
 				 * @param {array} aPropertiesMetadata - array with all the property metadata
 				 * @param {string} sKey - name of the property
 				 * @returns {object}  PropertyInfo object for a given name, or <code>null</code>
-				 * @private
-				 * @ui5-restricted sap.ui.mdc, sap.fe
+				 * @public
 				 */
 				getPropertyByKey : function(aPropertiesMetadata, sKey) {
 					var oPropertyInfo = null;
@@ -67,9 +80,7 @@ sap.ui.define(['sap/ui/mdc/util/IdentifierUtil', 'sap/ui/mdc/enum/ConditionValid
 				 * @returns {array} mResultingConditions.["propertyName"] conditions addressed by the property name
 				 * @returns {string} mResultingConditions.["propertyName"].operator operator for a single condition
 				 * @returns {array} mResultingConditions.["propertyName"].values values for a single condition
-				 * @private
-				 * @ui5-restricted sap.ui.mdc, sap.fe
-				 * @MDC_PUBLIC_CANDIDATE
+				 * @public
 				 */
 				getConditionsMap : function(oFilterBar, aPropertyNames) {
 					var aPropertyConditions, oPropertyCondition, mResultingConditions = {};
@@ -108,17 +119,33 @@ sap.ui.define(['sap/ui/mdc/util/IdentifierUtil', 'sap/ui/mdc/enum/ConditionValid
 				/**
 				 * Creates the filter statements based on the externalize conditions.<br>
 				 *
-				 * @param {sap.ui.mdc.Control|sap.ui.mdc.util.TypeUtil} vTypeProvider the MDC control instance or TypeUtil
-				 * @param {map} mConditions - map with externalized conditions
+				 * @param {sap.ui.mdc.Control|sap.ui.mdc.util.TypeMap} vTypeProvider the MDC control instance or <code>TypeMap</code>
+				 * @param {map} mConditionsPerKey - map with externalized conditions
 				 * @param {array} aPropertiesMetadata - array with all the property metadata
 				 * @param {array} aIgnoreProperties - an array of property names which should be not considered for filtering
 				 * @returns {object} Object with filters
-				 * @private
-				 * @ui5-restricted sap.ui.mdc
+				 * @public
 				 */
-				getFilterInfo: function(vTypeProvider, mConditions, aPropertiesMetadata, aIgnoreProperties) {
+				getFilterInfo: function(vTypeProvider, mConditionsPerKey, aPropertiesMetadata, aIgnoreProperties) {
 
 					var oFilterInfo = {};
+					var mConditionsPerPath = {};
+
+					/* In case a Table is used for example, the condition key is not necessarily a valid property path in the model
+					* the later creation of filters in the FilterConverter is expecting the map to hold the valid paths to properties in the
+					* used model, therefore we need to ensure to properly map the keys to its path to create service understandable filters
+					*/
+					if (aPropertiesMetadata && aPropertiesMetadata.length > 0) {
+						Object.keys(mConditionsPerKey).forEach(function(sConditionKey){
+							var oAffectedProperty = aPropertiesMetadata.find(function(oProperty){
+								return oProperty.name === sConditionKey;
+							});
+							var sConditionPath = oAffectedProperty && oAffectedProperty.path ? oAffectedProperty.path : sConditionKey;
+							mConditionsPerPath[sConditionPath] = mConditionsPerKey[sConditionKey];
+						});
+					} else {
+						mConditionsPerPath = mConditionsPerKey;
+					}
 
 					aIgnoreProperties = aIgnoreProperties ? aIgnoreProperties : [];
 
@@ -126,7 +153,7 @@ sap.ui.define(['sap/ui/mdc/util/IdentifierUtil', 'sap/ui/mdc/enum/ConditionValid
 					var mFilterTypes = {};
 
 					if (aPropertiesMetadata && aPropertiesMetadata.length > 0) {
-						for (sFieldPath in mConditions) {
+						for (sFieldPath in mConditionsPerPath) {
 							if (aIgnoreProperties.indexOf(sFieldPath) < 0) {
 
 								var oProperty = FilterUtil.getPropertyByKey(aPropertiesMetadata, sFieldPath);
@@ -136,9 +163,9 @@ sap.ui.define(['sap/ui/mdc/util/IdentifierUtil', 'sap/ui/mdc/enum/ConditionValid
 									mInternalFilterConditions[sFieldPath] = [];
 
 									//convert from externalized to model-specific value representation
-									for (i = 0; i < mConditions[sFieldPath].length; i++) {
-										oConditionInternal = merge({}, mConditions[sFieldPath][i]);
-										mInternalFilterConditions[sFieldPath].push(ConditionConverter.toType(oConditionInternal, oProperty.typeConfig.typeInstance, vTypeProvider.getTypeUtil ? vTypeProvider.getTypeUtil() : vTypeProvider));
+									for (i = 0; i < mConditionsPerPath[sFieldPath].length; i++) {
+										oConditionInternal = merge({}, mConditionsPerPath[sFieldPath][i]);
+										mInternalFilterConditions[sFieldPath].push(ConditionConverter.toType(oConditionInternal, oProperty.typeConfig.typeInstance, _getTypeMap(vTypeProvider)));
 									}
 
 								} else {
@@ -162,9 +189,7 @@ sap.ui.define(['sap/ui/mdc/util/IdentifierUtil', 'sap/ui/mdc/enum/ConditionValid
 				 * @param {sap.ui.mdc.FilterBar} oFilterBar Instance of the filter bar
 				 * @returns {string[]} Array containing the required field names without a value
 				 * If there are no such fields, or all required filters are filled, an empty array is returned.
-				 * @private
-				 * @ui5-restricted sap.ui.mdc, sap.fe
-				 * @MDC_PUBLIC_CANDIDATE
+				 * @public
 				 */
 				getRequiredFieldNamesWithoutValues: function(oFilterBar) {
 					var aReqFiltersWithoutValue = [];

package/src/sap/ui/mdc/util/IdentifierUtil.js

@@ -15,7 +15,6 @@ sap.ui.define(['sap/ui/base/DataType'], function(DataType) {
 	 *
 	 * @namespace
 	 * @private
-	 * @experimental This module is only for internal/experimental use!
 	 * @since 1.61.0
 	 * @alias sap.ui.mdc.util.IdentifierUtil
 	 */

package/src/sap/ui/mdc/util/InfoBar.js

@@ -23,12 +23,11 @@ sap.ui.define([
      * @class The <code>InfoBar</code> control provides an easy way of displaying filter information inside an <code>sap.ui.mdc.Chart</code> and an <code>sap.ui.mdc.Table</code>.
      * @extends sap.ui.core.Control
      * @author SAP SE
-     * @version 1.113.0
+     * @version 1.115.0
      * @constructor
      * @experimental As of version 1.111
      * @private
      * @ui5-restricted sap.ui.mdc
-     * @MDC_PUBLIC_CANDIDATE
      * @since 1.111.0
      * @alias sap.ui.mdc.util.InfoBar
      */

package/src/sap/ui/mdc/util/PromiseCache.js

@@ -45,7 +45,7 @@ sap.ui.define(
 		 * Destroying the cache will cancel all registered promises and delete references. Convenience methods for promise creation, wrapping and replacement are offered.
 		 *
 		 * @author SAP SE
-		 * @version 1.113.0
+		 * @version 1.115.0
 		 * @alias sap.ui.mdc.util.PromiseCache
 		 * @since 1.85.0
 		 * @private