@openui5/sap.ui.mdc 1.99.0 → 1.100.0

package/src/sap/ui/mdc/Link.js

@@ -38,14 +38,14 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 *
 	 * @class
-	 * A <code>Link</code> control can be used to handle navigation scenarios with one or more targets through direct navigation or by opening a {@link sap.ui.mdc.link.Panel}.<br>
-	 * It can also be used to display additional content, such as {@link sap.ui.mdc.link.ContactDetails} on the {@link sap.ui.mdc.link.Panel}.
+	 * A <code>Link</code> control can be used to handle navigation scenarios with one or more targets through direct navigation or by opening a <code>Panel</code>.<br>
+	 * It can also be used to display additional content, such as <code>ContactDetails</code> on the <code>Panel</code>.
 	 * <b>Note:</b> Navigation targets are determined by the implementation of a {@link sap.ui.mdc.LinkDelegate}.
 	 *
 	 * @extends sap.ui.mdc.field.FieldInfoBase
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.Link

package/src/sap/ui/mdc/MultiValueField.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.mdc.MultiValueField
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @since 1.93.0
 	 *
 	 * @private
@@ -318,6 +318,16 @@ sap.ui.define([
 
 	};
 
+	Field.prototype._checkCreateInternalContent = function() {
+
+		if (!this.bIsDestroyed && this._oContentFactory.getDataType() && !this._isPropertyInitial("editMode")) {
+			// If DataType is provided via Binding and EditMode is set the internal control can be created
+			// TODO: no control needed if just template for cloning
+			FieldBase.prototype._checkCreateInternalContent.apply(this, arguments);
+		}
+
+	};
+
 	/**
 	 * Sets conditions to the property <code>conditions</code>.
 	 *

package/src/sap/ui/mdc/Table.js

@@ -40,7 +40,10 @@ sap.ui.define([
 	"sap/m/ColumnPopoverSelectListItem",
 	"sap/m/ColumnPopoverActionItem",
 	"sap/ui/mdc/p13n/subcontroller/ColumnWidthController",
-	"sap/ui/mdc/actiontoolbar/ActionToolbarAction"
+	"sap/ui/mdc/actiontoolbar/ActionToolbarAction",
+	"sap/ui/mdc/table/RowActionItem",
+	"sap/ui/base/ManagedObjectMetadata",
+	"sap/ui/mdc/table/RowSettings"
 ], function(
 	Control,
 	ActionToolbar,
@@ -77,7 +80,10 @@ sap.ui.define([
 	ColumnPopoverSelectListItem,
 	ColumnPopoverActionItem,
 	ColumnWidthController,
-	ActionToolbarAction
+	ActionToolbarAction,
+	RowActionItem,
+	ManagedObjectMetadata,
+	RowSettings
 ) {
 	"use strict";
 
@@ -160,6 +166,7 @@ sap.ui.define([
 				 * Actions available for a table row.
 				 *
 				 * @since 1.60
+				 * @deprecated as of version 1.98, use row settings instead.
 				 */
 				rowAction: {
 					type: "sap.ui.mdc.RowAction[]",
@@ -665,6 +672,7 @@ sap.ui.define([
 	 * @inheritDoc
 	 */
 	Table.prototype.applySettings = function() {
+		this._setPropertyHelperClass(PropertyHelper);
 		Control.prototype.applySettings.apply(this, arguments);
 		this.initControlDelegate();
 	};
@@ -869,14 +877,20 @@ sap.ui.define([
 	// ----End Type----
 
 	Table.prototype.setRowSettings = function(oRowSettings) {
+		if (this._oTableRowAction) {
+			if (oRowSettings.getRowActions().length == 0) {
+				oRowSettings.addRowAction(this._oTableRowAction);
+			}
+		}
 		this.setAggregation("rowSettings", oRowSettings, true);
 
 		if (this._oTable) {
 			// Apply the new setting to the existing table
+			this._oRowActions = {};
 			if (this._isOfType(TableType.ResponsiveTable)) {
-				ResponsiveTableType.updateRowSettings(this._oTemplate, oRowSettings);
+				ResponsiveTableType.updateRowSettings(this, oRowSettings, this._onResponsiveRowActionPress);
 			} else {
-				GridTableType.updateRowSettings(this._oTable, oRowSettings);
+				GridTableType.updateRowSettings(this._oTable, oRowSettings, [this._onRowActionPress, this]);
 			}
 
 			this._bForceRebind = true;
@@ -942,14 +956,20 @@ sap.ui.define([
 		return this;
 	};
 
+	// TODO: Temporary solution until apps adapted changes. Remove this, as this is replaced by rowSettings
 	Table.prototype.setRowAction = function(aActions) {
-		var aOldActions = this.getRowAction();
-
 		this.setProperty("rowAction", aActions, true);
 
-		if (!deepEqual(aOldActions.sort(), this.getRowAction().sort())) {
-			this._updateRowAction();
+		var oRowSettings = this.getRowSettings() || new RowSettings();
+
+		oRowSettings.destroyRowActions();
+		if (this.getRowAction().indexOf(RowAction.Navigation) > -1) {
+			this._oTableRowAction = new RowActionItem({
+				type: RowAction.Navigation
+			});
+			oRowSettings.addRowAction(this._oTableRowAction);
 		}
+		this.setRowSettings(oRowSettings);
 
 		return this;
 	};
@@ -977,21 +997,20 @@ sap.ui.define([
 	};
 
 	Table.prototype._onModifications = function() {
-		if (!this._oTable) {
-			return;
-		}
-		var oColumnWidth = this.getCurrentState().xConfig;
-		var oColumnWidthContent = oColumnWidth.aggregations && oColumnWidth.aggregations.columns;
-
-		this.getColumns().forEach(function(oColumn, iIndex) {
-			var sWidth = oColumnWidthContent && oColumnWidthContent[oColumn.getDataProperty()] && oColumnWidthContent[oColumn.getDataProperty()].width;
-			var oInnerColumn = this._oTable.getColumns()[iIndex];
-			if (!sWidth && oInnerColumn.getWidth() !== oColumn.getWidth()) {
-				oInnerColumn.setWidth(oColumn.getWidth());
-			} else if (sWidth && sWidth !== oInnerColumn.getWidth()) {
-				oInnerColumn.setWidth(sWidth);
-			}
-		}, this);
+		var oMDCTable = this;
+		this.initialized().then(function() {
+			var oColumnWidth = oMDCTable.getCurrentState().xConfig;
+			var oColumnWidthContent = oColumnWidth.aggregations && oColumnWidth.aggregations.columns;
+			oMDCTable.getColumns().forEach(function(oColumn, iIndex) {
+				var sWidth = oColumnWidthContent && oColumnWidthContent[oColumn.getDataProperty()] && oColumnWidthContent[oColumn.getDataProperty()].width;
+				var oInnerColumn = oMDCTable._oTable.getColumns()[iIndex];
+				if (!sWidth && oInnerColumn.getWidth() !== oColumn.getWidth()) {
+					oInnerColumn.setWidth(oColumn.getWidth());
+				} else if (sWidth && sWidth !== oInnerColumn.getWidth()) {
+					oInnerColumn.setWidth(sWidth);
+				}
+			});
+		});
 	};
 
 	Table.prototype.setP13nMode = function(aMode) {
@@ -1290,10 +1309,9 @@ sap.ui.define([
 		if (!this._oTable) {
 			return;
 		}
-		var bNavigation = this.getRowAction().indexOf(RowAction.Navigation) > -1;
 		var oType = this._bMobileTable ? ResponsiveTableType : GridTableType;
 		// For ResponsiveTable itemPress event is registered during creation
-		oType.updateRowAction(this, bNavigation, this._bMobileTable ? undefined : this._onRowActionPress);
+		oType.updateRowActions(this, this.getRowSettings(), this._bMobileTable ? this._onResponsiveRowActionPress : this._onRowActionPress);
 	};
 
 	Table.prototype._initializeContent = function() {
@@ -1366,7 +1384,10 @@ sap.ui.define([
 		this._onAfterTableCreated(true); // Resolve any pending promise if table exists
 
 		var pTableInit = this.initialized().then(function() {
-			this.initPropertyHelper(PropertyHelper);
+			this.initPropertyHelper();
+
+			//Make sure that in case of default xConfig appliance the state is initially read once
+			this._onModifications();
 
 			// add this to the micro task execution queue to enable consumers to handle this correctly
 			var oCreationRow = this.getCreationRow();
@@ -1737,7 +1758,7 @@ sap.ui.define([
 					context: {title: that.getHeader()}
 				},
 				dataSource: oRowBinding,
-				fileType: mCustomConfig.selectedFileType == "pdf" ? "PDF" : "XLSX",
+				fileType: mCustomConfig.selectedFileType,
 				fileName: mCustomConfig ? mCustomConfig.fileName : this.getHeader()
 			};
 
@@ -1813,7 +1834,7 @@ sap.ui.define([
 		this._loadExportLibrary().then(function() {
 			sap.ui.require(['sap/ui/export/ExportUtils'], function(ExportUtils) {
 				that.getControlDelegate().fetchExportCapabilities().then(function(oExportCapabilities) {
-					ExportUtils.getExportSettingsViaDialog(that._cachedExportSettings, that, undefined, oExportCapabilities).then(function(oUserInput) {
+					ExportUtils.getExportSettingsViaDialog(that._cachedExportSettings, oExportCapabilities, that).then(function(oUserInput) {
 						that._cachedExportSettings = oUserInput;
 						that._onExport(oUserInput);
 					});
@@ -2273,8 +2294,10 @@ sap.ui.define([
 			oColumn = this._oTable.removeColumn(oMDCColumn.getId() + "-innerColumn");
 			this._oTable.insertColumn(oColumn, iIndex);
 
-			// update template for ResponsiveTable
 			if (this._bMobileTable) {
+				// responsive table requires the column order to be updated.
+				this._setMobileColumnOrder();
+				// update template for ResponisveTable
 				this._updateColumnTemplate(oMDCColumn, iIndex);
 			}
 		}
@@ -2335,6 +2358,25 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Sets the column order for the responsive table. The order is set according to the index of the mdc columns.
+	 * Updating the responsive table's column order and invalidating avoid rebinds.
+	 * @private
+	 */
+	 Table.prototype._setMobileColumnOrder = function() {
+		this.getColumns().forEach(function(oMDCColumn) {
+			var oColumn = Core.byId(oMDCColumn.getId() + "-innerColumn");
+			if (!oColumn) {
+				return;
+			}
+			// since we ensure correct index of the mdcColumn control we can set the same order to the inner responsive table columns
+			oColumn.setOrder(this.indexOfColumn(oMDCColumn));
+		}, this);
+
+		// invalidate the inner table to apply the correct order on the UI. See sap.m.Column#setOrder
+		this._oTable.invalidate();
+	};
+
 	Table._removeItemCell = function(oItem, iRemoveIndex, iInsertIndex) {
 		// remove cell from index
 		var oCell = oItem.removeCell(iRemoveIndex);
@@ -2352,6 +2394,7 @@ sap.ui.define([
 		this.fireRowPress({
 			bindingContext: oEvent.getParameter("listItem").getBindingContext()
 		});
+		ResponsiveTableType._onRowActionPress.apply(this, [oEvent]);
 	};
 
 	Table.prototype._onSelectionChange = function(oEvent) {
@@ -2391,13 +2434,6 @@ sap.ui.define([
 		});
 	};
 
-	Table.prototype._onRowActionPress = function(oEvent) {
-		var oRow = oEvent.getParameter("row");
-		this.fireRowPress({
-			bindingContext: oRow.getBindingContext()
-		});
-	};
-
 	Table.prototype._onRowSelectionChange = function(oEvent) {
 		if (!this._bSelectionChangedByAPI) { // TODO Table / Plugin needs to ensure that events are only fired when "relevant" for the app.
 			this.fireSelectionChange({
@@ -2639,8 +2675,7 @@ sap.ui.define([
 		var iRowCount;
 		if (!bConsiderTotal) {
 			iRowCount = oRowBinding.getLength();
-		} else {
-			if (typeof oRowBinding.getCount === 'function') {
+		} else if (typeof oRowBinding.getCount === 'function') {
 				iRowCount = oRowBinding.getCount();
 			} else if (oRowBinding.isLengthFinal()) {
 				// This branch is only fallback and for TreeBindings (TreeBindings should be excluded when MDCTable will support TreeBinding,
@@ -2648,7 +2683,6 @@ sap.ui.define([
 				// ListBindings should in general get a getCount function in nearer future (5341464)
 				iRowCount = oRowBinding.getLength();
 			}
-		}
 
 		if (iRowCount < 0 || iRowCount === "0") {
 			iRowCount = 0;

package/src/sap/ui/mdc/TableDelegate.js

@@ -113,7 +113,33 @@ sap.ui.define([
 			 */
 			addItem: function(sPropertyName, oTable) {
 				return Promise.resolve(null);
-			}
+			},
+
+			/**
+			 * 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.Control} oControl - the instance of the mdc control
+			 * @param {Object} mPropertyBag Instance of property bag from Flex change API
+			 * @returns {Promise} Promise that resolves once the properyInfo property was updated
+			 */
+			addCondition: function(sPropertyName, oControl, mPropertyBag) {
+				return Promise.resolve();
+		    },
+
+			/**
+			 * 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.Control} oControl - the instance of the mdc control
+			 * @param {Object} mPropertyBag Instance of property bag from Flex change API
+			 * @returns {Promise} Promise that resolves once the properyInfo property was updated
+			 */
+		    removeCondition: function(sPropertyName, oControl, mPropertyBag) {
+				return Promise.resolve();
+		    }
 		};
 	};
 
@@ -144,5 +170,6 @@ sap.ui.define([
 		return Promise.resolve(oExportCapabilities);
 	};
 
+
 	return TableDelegate;
 });

package/src/sap/ui/mdc/ValueHelp.js

@@ -41,7 +41,8 @@ sap.ui.define([
 	'sap/ui/model/base/ManagedObjectModel',
 	'sap/ui/base/ManagedObjectObserver',
 	'sap/base/util/merge',
-	'sap/base/util/deepEqual'
+	'sap/base/util/deepEqual',
+	'sap/ui/mdc/enum/PersistenceMode'
 ], function(
 	Element,
 	PromiseMixin,
@@ -57,7 +58,8 @@ sap.ui.define([
 	ManagedObjectModel,
 	ManagedObjectObserver,
 	merge,
-	deepEqual
+	deepEqual,
+	PersistenceMode
 ) {
 	"use strict";
 
@@ -69,7 +71,7 @@ sap.ui.define([
 	 * @class Element for the <code>FieldHelp</code> association in the <code>FieldBase</code> controls.
 	 * @extends sap.ui.mdc.Element
 	 * @implements sap.ui.core.PopupInterface
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @constructor
 	 * @abstract
 	 * @private
@@ -286,6 +288,7 @@ sap.ui.define([
 	ValueHelp.prototype.init = function() {
 
 		Element.prototype.init.apply(this, arguments);
+		this.getEngine().defaultProviderRegistry.attach(this, PersistenceMode.Transient);
 
 		this._oObserver = new ManagedObjectObserver(_observeChanges.bind(this));
 
@@ -302,6 +305,8 @@ sap.ui.define([
 
 	ValueHelp.prototype.exit = function() {
 
+		this.getEngine().defaultProviderRegistry.detach(this);
+
 		if (this._oManagedObjectModel) {
 			this._oManagedObjectModel.destroy();
 			delete this._oManagedObjectModel;

package/src/sap/ui/mdc/ValueHelpDelegate.js

@@ -54,12 +54,13 @@ sap.ui.define([
 	 * Checks if a <code>ListBinding</code> supports $Search.
 	 *
 	 * @param {object} oPayload Payload for delegate
+	 * @param {sap.ui.mdc.valuehelp.base.Content} oContent Content element
 	 * @param {sap.ui.model.ListBinding} oListBinding ListBinding
 	 * @returns {boolean} true if $search is supported
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.ValueHelp
 	 */
-	ValueHelpDelegate.isSearchSupported = function(oPayload, oListBinding) {
+	ValueHelpDelegate.isSearchSupported = function(oPayload, oContent, oListBinding) {
 		return false;
 	};
 

package/src/sap/ui/mdc/actiontoolbar/ActionToolbarAction.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @class The action for an {@link sap.ui.mdc.ActionToolbar ActionToolbar}) control
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @constructor
 	 * @private
 	 * @since 1.58

package/src/sap/ui/mdc/actiontoolbar/ActionToolbarActionRenderer.js

@@ -19,7 +19,7 @@ sap.ui.define([], function() {
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} rm the RenderManager that can be used for writing to the Render-Output-Buffer
-	 * @param {sap.ui.mdc.Form} oForm an object representation of the control that should be rendered
+	 * @param {sap.ui.mdc.actiontoolbar.ActionToolbarAction} oActionToolbarAction an object representation of the control that should be rendered
 	 */
     ActionToolbarActionRenderer.render = function(rm, oActionToolbarAction) {
         var mAriaProps = { role: "form" };

package/src/sap/ui/mdc/chart/ChartSelectionDetails.js

@@ -33,7 +33,7 @@ sap.ui.define([
          * @class The ChartSelectionDetails control creates a sap.m.SelectionDetails popover based on metadata and the configuration specified.
          * @extends sap.m.SelectionDetails
          * @author SAP SE
-         * @version 1.99.0
+         * @version 1.100.0
          * @constructor
          * @experimental As of version ...
          * @private

package/src/sap/ui/mdc/chart/ChartToolbar.js

@@ -35,17 +35,16 @@ sap.ui.define([
         "use strict";
 
         /**
-         /**
          * Constructor for a new ChartToolbar.
          *
          * @param {string} [sId] id for the new control, generated automatically if no id is given
          * @param {object} [mSettings] initial settings for the new control
-         * @class The ChartToolbar control creates a sap.m.OverflowToolbar based on metadata and the configuration specified.
-         * @extends sap.m.OverflowToolbar
+         * @class The ChartToolbar control is a sap.m.OverflowToolbar based on metadata and the configuration specified.
+         * @extends sap.ui.mdc.ActionToolbar
          * @author SAP SE
-         * @version 1.99.0
+         * @version 1.100.0
          * @constructor
-         * @experimental As of version ...
+         * @experimental As of version 1.88
          * @private
          * @since 1.88
          * @alias sap.ui.mdc.chart.ChartToolbar
@@ -164,7 +163,15 @@ sap.ui.define([
 					text: MDCRb.getText('chart.PERSONALIZATION_DIALOG_TITLE'),
                     enabled: false,
                     press: function (oEvent) {
-                        oMDCChart.getEngine().uimanager.show(oMDCChart, oMDCChart.getP13nMode());
+
+                        //TODO: Move this to p13n functionality?
+                        if (oMDCChart.isPropertyHelperFinal()){
+                            oMDCChart.getEngine().uimanager.show(oMDCChart, oMDCChart.getP13nMode());
+                        } else {
+                            oMDCChart.finalizePropertyHelper().then(function(){
+                                oMDCChart.getEngine().uimanager.show(oMDCChart, oMDCChart.getP13nMode());
+                            });
+                        }
                     }
                 });
                 this.addEnd(this._oSettingsBtn);

package/src/sap/ui/mdc/chart/DrillBreadcrumbs.js

@@ -30,9 +30,9 @@ sap.ui.define([
 
 
     /**
-	 * Updates the breadcrumps shown on the MDC Chart
+	 * Updates the breadcrumbs shown on the MDC Chart
 	 *
-	 * @param {sap.ui.mdc.Chart} oChart the MDC Chart to update the breadcrumps on
+	 * @param {sap.ui.mdc.Chart} oMDCChart the MDC Chart to update the breadcrumbs on
 	 * @param {*} oDrillableItems the drillable items
 	 *
 	 * @experimental
@@ -54,7 +54,7 @@ sap.ui.define([
                 oDrillableItems.forEach(function(dim, index, array) {
 
                     // show breadcrumbs
-                    //If Breadcrumps were set invisible for no drill stack, they need to be set visible again
+                    //If Breadcrumbs were set invisible for no drill stack, they need to be set visible again
                     this.setVisible(true);
 
                     // use the last entry of each drill-stack entry to built
@@ -121,11 +121,11 @@ sap.ui.define([
 	};
 
     /**
-	 * Creates a breadcrump with given settings
-	 * @param oChart the chart the breadcrump is for
-	 * @param oCrumbSettings settings for the breadcrump
+	 * Creates a breadcrumb with given settings
+	 * @param oMDCChart the chart the breadcrumb is for
+	 * @param oCrumbSettings settings for the breadcrumb
 	 *
-	 * @returns the created breadcrump
+	 * @returns {sap.m.Link} the created breadcrumb
 	 *
 	 * @experimental
 	 * @private

package/src/sap/ui/mdc/chart/DrillStackHandler.js

@@ -53,7 +53,7 @@ sap.ui.define([
 
 	/**
 	 * Handles all drill-stack operations on a mdc.Chart instance
-	 * inlcuding drill-downs, drill-ups and updating of depending controls
+	 * including drill-downs, drill-ups and updating of depending controls
 	 * @constructor
 	 */
 	var DrillStackHandler = function() {
@@ -62,7 +62,7 @@ sap.ui.define([
 
 	/**
 	 * Creates a drill down popover
-	 * @param oChart
+	 * @param oMDCChart
 	 * @returns the popover object
 	 *
 	 * @private
@@ -90,7 +90,7 @@ sap.ui.define([
 						control: oMDCChart,
 						key: "Item",
 						state: [{
-							name: oListItem.data("dim").name,
+							name: oListItem.data("dim").dim.name,
 							position: oMDCChart.getItems().length
 						}]
 					});
@@ -135,8 +135,8 @@ sap.ui.define([
 
 	/**
 	 * Shows the drill-down popover on the toolbar button of an mdc.Chart instance
-	 * @param {sap.ui.mdc.Chart} oChart
-     * @param {sap.m.Button}
+	 * @param {sap.ui.mdc.Chart} oMDCChart
+     * @param {sap.m.Button} oDrillBtn
 	 *
 	 * @experimental
 	 * @private
@@ -181,7 +181,7 @@ sap.ui.define([
 					type: ListType.Active
 				});
 
-				oListItem.data("dim", oDimension);
+				oListItem.data("dim", {dim: oDimension});
 
 				/*sTooltip = this._getFieldTooltip(oDimension.name);
 				if (sTooltip) {

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @private
 	 * @experimental

package/src/sap/ui/mdc/condition/Condition.js

@@ -29,7 +29,7 @@ sap.ui.define([
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.0
 		 * @since 1.61.0
 		 * @alias sap.ui.mdc.condition.Condition
 		 *

package/src/sap/ui/mdc/condition/ConditionConverter.js

@@ -32,7 +32,7 @@ sap.ui.define([
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.0
 		 * @private
 		 * @ui5-restricted sap.ui.mdc
 		 * @experimental As of version 1.74

package/src/sap/ui/mdc/condition/ConditionModel.js

@@ -35,7 +35,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.json.JSONModel
 		 *
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.0
 		 * @since 1.48.0
 		 * @alias sap.ui.mdc.condition.ConditionModel
 		 *

package/src/sap/ui/mdc/condition/FilterConverter.js

@@ -24,7 +24,7 @@ function(
 	 *
 	 * @namespace
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @since 1.78.0
 	 * @alias sap.ui.mdc.condition.FilterConverter
 	 *
@@ -139,11 +139,13 @@ function(
 
 					var oDataType;
 					var bCaseSensitiveType = true;
+					var sBaseType;
 
 					if (oConditionTypes) {
 						if (oConditionTypes[sFieldPath]) {
 							oDataType = oConditionTypes[sFieldPath].type;
 							bCaseSensitiveType = oConditionTypes[sFieldPath].caseSensitive;
+							sBaseType = oConditionTypes[sFieldPath].baseType;
 
 							if (!oDataType) {
 								// We only shown a warning, because the oDataType might not be required for creating the Filter.
@@ -161,7 +163,7 @@ function(
 						}
 
 						try {
-							oFilter = oOperator.getModelFilter(oCondition, sFieldPath, oDataType, bCaseSensitiveType);
+							oFilter = oOperator.getModelFilter(oCondition, sFieldPath, oDataType, bCaseSensitiveType, sBaseType);
 						} catch (error) {
 							// in case the getModelFilter fails - because the oDataType is missing - we show a console error.
 							Log.error("FilterConverter", "Not able to convert the condition for path '" + sFieldPath + "' into a filter! The type is missing!");