@openui5/sap.ui.mdc 1.112.2 → 1.114.0

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

@@ -13,7 +13,10 @@ sap.ui.define([
 	"sap/m/library",
 	"sap/ui/Device",
 	"sap/base/Log",
-	"sap/m/IllustratedMessage"
+	"sap/m/IllustratedMessage",
+	"sap/m/SearchField",
+	"sap/ui/model/json/JSONModel",
+	"sap/ui/model/Filter"
 ], function(
 	Core,
 	ResponsivePopover,
@@ -24,16 +27,16 @@ sap.ui.define([
 	MLibrary,
 	Device,
 	Log,
-	IllustratedMessage
+	IllustratedMessage,
+	SearchField,
+	JSONModel,
+	Filter
 ) {
 	"use strict";
 
 	// shortcut for sap.m.PlacementType
 	var PlacementType = MLibrary.PlacementType;
 
-	// shortcut for sap.m.ListType
-	var ListType = MLibrary.ListType;
-
 	// shortcut for sap.m.ListMode
 	var ListMode = MLibrary.ListMode;
 
@@ -65,36 +68,67 @@ sap.ui.define([
 	/**
 	 * Creates a drill down popover
 	 * @param oMDCChart
-	 * @returns the popover object
+	 * @returns {sap.ui.ResponsivePopover} the popover object
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 */
 	DrillStackHandler.createDrillDownPopover = function(oMDCChart) {
+		var oList;
+		var oRb = Core.getLibraryResourceBundle("sap.ui.mdc");
+
+		var oSearchField = new SearchField({
+			placeholder: oRb.getText("chart.CHART_DRILLDOWN_SEARCH"),
+			liveChange: function(oEvent) {
+
+				if (!oList) {
+					return;
+				}
+
+				var sSearchValue = oEvent.getParameter("newValue");
+				var oSearchFilter = [];
+				if (sSearchValue) {
+					oSearchFilter = new Filter("text", "Contains", sSearchValue);
+				}
+				oList.getBinding("items").filter(oSearchFilter);
+			}
+		});
 
-		//var oSubHeader = new Bar();
-		var MDCRb = sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc");
 		var oPopover = new ResponsivePopover({
 			id: oMDCChart.getId() + "-drilldownPopover",
 			contentWidth: "25rem",
 			contentHeight: "20rem",
-			placement: PlacementType.Bottom
-			//subHeader: oSubHeader
+			placement: PlacementType.VerticalPreferredBottom,
+			subHeader: oSearchField,
+			afterClose: function(){
+				oPopover.destroy();
+			}
+		});
+
+		var oItemTemplate = new StandardListItem({
+			title: "{$ChartDrilldown>text}"
 		});
-		var oList = new List({
-			noData: new IllustratedMessage({enableVerticalResponsiveness: true, title: MDCRb.getText("chart.NO_DRILLABLE_DIMENSION"), description: MDCRb.getText("chart.NO_DRILLABLE_DIMENSION_DESC"), illustrationType: MLibrary.IllustratedMessageType.NoDimensionsSet}),
+
+		oList = new List({
+			noData: new IllustratedMessage({enableVerticalResponsiveness: true, title: oRb.getText("chart.NO_DRILLABLE_DIMENSION"), description: oRb.getText("chart.NO_DRILLABLE_DIMENSION_DESC"), illustrationType: MLibrary.IllustratedMessageType.NoDimensionsSet}),
 			mode: ListMode.SingleSelectMaster,
+			items: {
+				path: "$ChartDrilldown>/items",
+				template: oItemTemplate
+			},
 			selectionChange: function(oControlEvent) {
 				var oListItem = oControlEvent.getParameter("listItem");
 
 				if (oListItem) {
-					//Call flex to capture current state before adding an item to the chart aggregation
+					var oContext = oListItem.getBindingContext("$ChartDrilldown");
+					var sDimensionName = oContext.getObject().id;
 
+					//Call flex to capture current state before adding an item to the chart aggregation
 					oMDCChart.getEngine().createChanges({
 						control: oMDCChart,
 						key: "Item",
 						state: [{
-							name: oListItem.data("dim").dim.name,
+							name: sDimensionName,
 							position: oMDCChart.getItems().length
 						}]
 					});
@@ -104,21 +138,6 @@ sap.ui.define([
 			}
 		});
 
-		oPopover.attachAfterClose(function(){
-			oPopover.destroy();
-		});
-
-		//TODO add search field
-		//var oSearchField = new SearchField({
-		//placeholder: this._oRb.getText("CHART_DRILLDOWN_SEARCH")
-		//});
-		//oSearchField.attachLiveChange(function(oEvent) {
-		//this._triggerSearchInDrillDownPopover(oEvent, oList);
-		//}.bind(this));
-
-
-		var oRb = Core.getLibraryResourceBundle("sap.ui.mdc");
-
 		//Show header only in mobile scenarios
 		//still support screen reader while on desktops.
 		if (Device.system.desktop) {
@@ -139,8 +158,9 @@ sap.ui.define([
 
 	/**
 	 * Shows the drill-down popover on the toolbar button of an mdc.Chart instance
-	 * @param {sap.ui.mdc.Chart} oMDCChart
-     * @param {sap.m.Button} oDrillBtn
+	 * @param {sap.ui.mdc.Chart} oMDCChart chart instance
+     * @param {sap.m.Button} oDrillBtn button which opens the popover
+	 * @returns {Promise} promise
 	 *
 	 * @experimental
 	 * @private
@@ -150,50 +170,21 @@ sap.ui.define([
         //TODO: Rename "Measure" and "Dimensions"?
 		var pSortedDimensionsPromise = oMDCChart.getControlDelegate().getSortedDimensions(oMDCChart);
 		return pSortedDimensionsPromise.then(function(aSortedDimensions) {
-			//Remove all prior items from drill-down list
 			var oDrillDownPopover = oMDCChart._oDrillDownPopover;
-			var aIgnoreDimensions, oDimension, oListItem;
-
-			var aFilteredList = oDrillDownPopover.getContent().filter(function(oEntry){return oEntry.getMetadata().getClass() == List;});
-			var oDrillDownList = aFilteredList.length > 0 ? aFilteredList[0] : null;
-
-			if (!oDrillDownList){
-				Log.error("MDC Chart: Could not determine list to show drilldown. This should not happen. Did the application modify the drill-down popover?");
-				return;
-			}
-
-			oDrillDownList.destroyItems();
+			var aIgnoreDimensions;
 
 			// Ignore currently applied dimensions from drill-stack for selection
 			aIgnoreDimensions = _getDrillStackDimensions(oMDCChart);
+			aSortedDimensions = aSortedDimensions.filter(function(oDimension){ return aIgnoreDimensions.indexOf(oDimension.name) < 0; });
 
-			for (var i = 0; i < aSortedDimensions.length; i++) {
-				oDimension = aSortedDimensions[i];
-
-				if (aIgnoreDimensions.indexOf(oDimension.name) > -1) {
-					continue;
-				}
-
-				//TODO: Check if still valid
-				// If dimension is not filterable and datapoints are selected then skip
-				/*if (!oViewField.filterable && this._oChart.getSelectedDataPoints().count > 0) {
-					    continue;
-				}*/
-
-				oListItem = new StandardListItem({
-					title: oDimension.label,
-					type: ListType.Active
-				});
-
-				oListItem.data("dim", {dim: oDimension});
-
-				/*sTooltip = this._getFieldTooltip(oDimension.name);
-				if (sTooltip) {
-					  oListItem.setTooltip(sTooltip);
-				}*/
+			var oData = { items : [] };
+			aSortedDimensions.forEach(function(oDimension) {
+				oData.items.push({ text: oDimension.label, id: oDimension.name });
+			});
+			oDrillDownPopover.setModel(new JSONModel(oData), "$ChartDrilldown");
 
-				//Add item to list within popover
-				oDrillDownList.addItem(oListItem);
+			if (oData.items.length < 7) {
+				oDrillDownPopover.getSubHeader().setVisible(false);
 			}
 
 			return new Promise(function(resolve, reject) {

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

@@ -6,23 +6,20 @@
 sap.ui.define([
     "sap/ui/core/Element",
     "sap/base/Log"
-], function(Element, Log) {
+], function (Element, Log) {
     "use strict";
 
-    // Provides the Item class.
     /**
-     * Constructor for a new Item.
+     * Constructor for a new <code>Item</code>.
      *
      * @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 <code>Item</code> control for the field/property metadata used within MDC controls. An instance can be created to override the default/metadata.
-     *        behavior.
+     * @class The <code>Item</code> control for the chart/property metadata used within MDC Chart. An instance can be created to override the default/metadata behavior.
      * @extends sap.ui.core.Element
      * @author SAP SE
      * @private
      * @ui5-restricted sap.fe
      * @MDC_PUBLIC_CANDIDATE
-     * @experimental
      * @since 1.88
      * @alias sap.ui.mdc.chart.Item
      */
@@ -44,19 +41,22 @@ sap.ui.define([
                     label: {
                         type: "string"
                     },
-                    //TODO: Create a proper type map for groupable and aggregateable
+                    /**
+                     * Specifies the type of the item for the chart (groupable and aggregateable).
+                     * This is specific for the used chart library.
+                     */
                     type: {
-                        type:"string",
-                        defaultValue:""
+                        type: "string",
+                        defaultValue: ""
                     },
                     /**
-                     * Specifies the role of the item for the chart.
+                     * Specifies the role of the item for the chart (category, axis1...).
                      * This is specific for the used chart library.
-                     *  <b>NOTE: </b> This property must not be changed after initialization.
+                     * <b>NOTE:</b> This property must not be changed after initialization.
                      */
                     role: {
-						type: "string"
-					}
+                        type: "string"
+                    }
                 }
 
             }

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.114.0
 	 *
 	 * @private
 	 * @experimental
@@ -101,12 +101,12 @@ sap.ui.define([
 		};
 	};
 
-		/**
-		 * 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){
+	/**
+	 * 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: [

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

@@ -5,37 +5,46 @@
  */
 sap.ui.define([
 	"sap/ui/core/Element"
-], function(Element) {
+], function (Element) {
 	"use strict";
 
-	// The aggregation to feed details actions for datapoint selection in the mdc chart
 	/**
-     * Constructor for a new SelectionDetailsActions.
-     *
-     * @param {string} [sId] ID for the new control, generated automatically if no ID is given
-     * @param {object} [mSettings] Initial settings for the new control
-     * @extends sap.ui.core.Element
-     * @author SAP SE
-     * @class The SelectionDetailsActions are used to provide additional functionality to the Details popover.
-     * @ui5-restricted sap.fe
-     * @MDC_PUBLIC_CANDIDATE
-     * @experimental
-     * @since 1.88
-     * @alias sap.ui.mdc.chart.SelectionDetailsActions
-     */
+	 * Constructor for a new SelectionDetailsActions.
+	 *
+	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
+	 * @param {object} [mSettings] Initial settings for the new control
+	 *
+	 * @extends sap.ui.core.Element
+	 * @author SAP SE
+	 * @class The SelectionDetailsActions are used to provide additional functionality to the Details popover.
+	 *
+	 * @ui5-restricted sap.fe
+	 * @MDC_PUBLIC_CANDIDATE
+	 * @since 1.88
+	 * @alias sap.ui.mdc.chart.SelectionDetailsActions
+	 */
 	var SelectionDetailsActions = Element.extend("sap.ui.mdc.chart.SelectionDetailsActions", {
 
 		metadata: {
 			library: "sap.ui.mdc",
 			aggregations: {
+				/**
+				 * Action <code>item</code> shown in the Items area of the details.
+				 */
 				detailsItemActions: {
 					type: "sap.ui.core.Item",
 					multiple: true
 				},
+				/**
+				 * Action <code>item</code> shown in the Details area of the details.
+				 */
 				detailsActions: {
 					type: "sap.ui.core.Item",
 					multiple: true
 				},
+				/**
+				 * Action <code>item</code> shown in the Groups area of the details.
+				 */
 				actionGroups: {
 					type: "sap.ui.core.Item",
 					multiple: true

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

@@ -13,6 +13,12 @@ sap.ui.define([
 	) {
 		"use strict";
 
+		var fnSerializeCondition = function (oCondition) {
+			return JSON.stringify(Object.assign({}, oCondition, {isEmpty: undefined}), function (sKey, vValue) {
+				return vValue === undefined ? '[undefined]' : vValue;
+			});
+		};
+
 		/**
 		 * @namespace
 		 * @name sap.ui.mdc.condition
@@ -20,6 +26,7 @@ sap.ui.define([
 		 * @private
 		 * @experimental As of version 1.61
 		 * @ui5-restricted sap.fe
+		 * @MDC_PUBLIC_CANDIDATE
 		 */
 
 		/**
@@ -28,7 +35,7 @@ sap.ui.define([
 		 *
 		 * @namespace
 		 * @author SAP SE
-		 * @version 1.112.2
+		 * @version 1.114.0
 		 * @since 1.61.0
 		 * @alias sap.ui.mdc.condition.Condition
 		 *
@@ -46,11 +53,11 @@ sap.ui.define([
 				 * @constant
 				 * @typedef {object} sap.ui.mdc.condition.ConditionObject
 				 * @property {string} operator Operator of the condition
-				 * @property {any[]} values Array of values of the condition. Depending on the <code>operator</code>, this contains one or more entries
-				 * @property {object} [inParameters] In parameters of the condition. For each field path, a value is stored
-				 * @property {object} [outParameters] Out parameters of the condition. For each field path, a value is stored
-				 * @property {boolean} [isEmpty] If set, the condition is empty (used as dummy condition in {@link sap.ui.mdc.field.DefineConditionPanel DefineConditionPanel})
-				 * @property {sap.ui.mdc.enum.ConditionValidated} validated If set to <code>ConditionValidated.Validated</code>, the condition is validated (by the field help) and not shown in the {@link sap.ui.mdc.field.DefineConditionPanel DefineConditionPanel} control
+				 * @property {any[]} values Array of values of the condition. Depending on the <code>operator</code>, this contains one or more entries. The entries are sored in internal format regarding the used data type.
+				 * @property {object} [inParameters] In parameters of the condition. For each field path, a value is stored. (It is obsolete and only filled for conditions stored on old user-variants.)
+				 * @property {object} [outParameters] Out parameters of the condition. For each field path, a value is stored. (It is obsolete and only filled for conditions stored on old user-variants.)
+				 * @property {boolean} [isEmpty] If set, the condition is empty (used as dummy condition in {@link sap.ui.mdc.valuehelp.base.DefineConditionPanel DefineConditionPanel})
+				 * @property {sap.ui.mdc.enum.ConditionValidated} validated If set to <code>ConditionValidated.Validated</code>, the condition is validated (by the value help) and not shown in the {@link sap.ui.mdc.valuehelp.base.DefineConditionPanel DefineConditionPanel} control
 				 * @property {object} [payload] Payload of the condition. Set by application. Data needs to be stringified. (as stored and loaded in variants)
 				 * @private
 				 * @ui5-restricted sap.fe
@@ -58,15 +65,15 @@ sap.ui.define([
 				 */
 
 				/**
-				 * Creates a condition instance for a condition representing a item chosen from the field help.
+				 * Creates a condition instance for a condition representing a item chosen from the value help.
 				 *
 				 * This is a "equal to" (EQ) condition with key and description. It is used for entries selected in the field help
 				 * and for everything entered in the {@link sap.ui.mdc.Field Field} control.
 				 *
 				 * @param {string} sKey Operator for the condition
 				 * @param {string} sDescription Description of the operator
-				 * @param {object} [oInParameters] In parameters of the condition
-				 * @param {object} [oOutParameters] Out parameters of the condition
+				 * @param {object} [oInParameters] In parameters of the condition. (Do not use it for new conditions, use payload instead.)
+				 * @param {object} [oOutParameters] Out parameters of the condition. (Do not use it for new conditions, use payload instead.)
 				 * @param {object} [oPayload] Payload of the condition
 				 * @returns {sap.ui.mdc.condition.ConditionObject} The new condition object with the EQ operator along with <code>sKey</code> and <code>sDescription</code> as <code>aValues</code>
 				 * @private
@@ -90,8 +97,8 @@ sap.ui.define([
 				 *
 				 * @param {string} sOperator Operator for the condition
 				 * @param {any[]} aValues Array of values for the condition
-				 * @param {object} [oInParameters] In parameters of the condition
-				 * @param {object} [oOutParameters] Out parameters of the condition
+				 * @param {object} [oInParameters] In parameters of the condition. (Do not use it for new conditions, use payload instead.)
+				 * @param {object} [oOutParameters] Out parameters of the condition. (Do not use it for new conditions, use payload instead.)
 				 * @param {sap.ui.mdc.enum.ConditionValidated} sValidated If set to <code>ConditionValidated.Validated</code>, the condition is validated (by the field help) and not shown in the <code>DefineConditionPanel</code> control
 				 * @param {object} [oPayload] Payload of the condition
 				 * @returns {sap.ui.mdc.condition.ConditionObject} The new condition object with the given operator and values
@@ -117,7 +124,7 @@ sap.ui.define([
 				/**
 				 * Compares two conditions in detail
 				 *
-				 * Opposed to <code>FilterOperatorUtil.compareConditions</code> this comparison checks the whole condition object for equality except the <code>DefineConditionPanel</code> specific <code>isEmpty</code> flag.
+				 * Opposed to <code>FilterOperatorUtil.compareConditions</code> this comparison checks the whole condition object for equality except the {@link sap.ui.mdc.valuehelp.base.DefineConditionPanel DefineConditionPanel} specific <code>isEmpty</code> flag.
 				 *
 				 * @param {undefined|sap.ui.mdc.condition.ConditionObject} oCondition1 Condition to check
 				 * @param {undefined|sap.ui.mdc.condition.ConditionObject} oCondition2 Condition to check
@@ -126,9 +133,8 @@ sap.ui.define([
 				 * @ui5-restricted sap.ui.mdc
 				 */
 				compareConditions: function(oCondition1, oCondition2) {
-					var oIgnoredKeys = {isEmpty: undefined};
-					var sCheckValue1 = JSON.stringify(Object.assign({}, oCondition1, oIgnoredKeys));
-					var sCheckValue2 = JSON.stringify(Object.assign({}, oCondition2, oIgnoredKeys));
+					var sCheckValue1 = fnSerializeCondition(oCondition1);
+					var sCheckValue2 = fnSerializeCondition(oCondition2);
 					return sCheckValue1 === sCheckValue2;
 
 				},

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

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

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

@@ -13,7 +13,8 @@ sap.ui.define([
 		'sap/base/util/deepEqual',
 		'sap/base/Log',
 		'sap/ui/mdc/condition/Condition',
-		"sap/ui/mdc/condition/FilterConverter"
+		"sap/ui/mdc/condition/FilterConverter",
+		'sap/ui/core/date/UI5Date'
 	],
 	function (
 		ConditionModelPropertyBinding,
@@ -25,7 +26,8 @@ sap.ui.define([
 		deepEqual,
 		Log,
 		Condition,
-		FilterConverter
+		FilterConverter,
+		UI5Date
 	) {
 		"use strict";
 
@@ -35,7 +37,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.json.JSONModel
 		 *
 		 * @author SAP SE
-		 * @version 1.112.2
+		 * @version 1.114.0
 		 * @since 1.48.0
 		 * @alias sap.ui.mdc.condition.ConditionModel
 		 *
@@ -501,154 +503,9 @@ sap.ui.define([
 			return oFieldPath[sEscapedFieldPath];
 		};
 
-		// ConditionModel.prototype._prettyPrintFilters = function (oFilter) {
-		// 	var sRes;
-		// 	if (!oFilter) {
-		// 		return "";
-		// 	}
-		// 	if (oFilter._bMultiFilter) {
-		// 		sRes = "";
-		// 		var bAnd = oFilter.bAnd;
-		// 		oFilter.aFilters.forEach(function (oFilter, index, aFilters) {
-		// 			sRes += this._prettyPrintFilters(oFilter);
-		// 			if (aFilters.length - 1 != index) {
-		// 				sRes += bAnd ? " and " : " or ";
-		// 			}
-		// 		}, this);
-		// 		return "(" + sRes + ")";
-		// 	} else {
-		// 		sRes = oFilter.sPath + " " + oFilter.sOperator + " '" + oFilter.oValue1 + "'";
-		// 		if (oFilter.sOperator === "BT") {
-		// 			sRes += "...'" + oFilter.oValue2 + "'";
-		// 		}
-		// 		return sRes;
-		// 	}
-		// };
-
 		ConditionModel.prototype.getFilters = function (sFieldPath) {
 			Log.error("ConditionModel", "usage or deprecated getFilters() function! Please use the FilterConverter.createFilters() function instead.");
 			return FilterConverter.createFilters( this.getAllConditions(), {});
-
-			// var i, aLocalFilters, aLocalNEFilters, aOverallFilters = [],
-			// 	oConditions,
-			// 	oToAnyFilterParam, aSections, sNavPath, sPropertyPath;
-
-			// if (sFieldPath === undefined) {
-			// 	oConditions = this.getAllConditions();
-			// } else if (typeof sFieldPath === "string") {
-			// 	oConditions = {};
-			// 	oConditions[sFieldPath] = this.getConditions(sFieldPath);
-			// } else {
-			// 	oConditions = {};
-			// }
-
-			// var oOperator, oFilter;
-
-			// // OR-combine filters for each property
-			// for (var sMyFieldPath in oConditions) {
-			// 	aLocalFilters = [];
-			// 	aLocalNEFilters = [];
-			// 	oToAnyFilterParam = null;
-			// 	var aConditions = oConditions[sMyFieldPath];
-			// 	var oFieldPath = this.getProperty("/fieldPath");
-			// 	var oFildPathInfo = oFieldPath[sMyFieldPath]; // to get unescaped fieldPath
-			// 	var sFilterPath = oFildPathInfo ? oFildPathInfo.fieldPath : sMyFieldPath;
-
-			// 	for (i = 0; i < aConditions.length; i++) {
-			// 		// only collect conditions for fieldPath and operator != NE
-			// 		oOperator = FilterOperatorUtil.getOperator(aConditions[i].operator);
-
-			//		if (!oOperator) {
-			//			continue; // ignore unknown operators
-			//		}
-
-			// 		oFilter = oOperator.getModelFilter(aConditions[i], sFilterPath);
-
-			// 		if (!oOperator.exclude) {
-
-			// 			if (oFilter.sPath === "$search") {
-			// 				//ignore the $search conditions
-			// 				continue;
-			// 			}
-
-			// 			// basic search condition handling split the oFilter with sPath == "*xxx,yyy*" into multiple filter
-			// 			// e.g. fieldPath "*title,year*" - such fieldPath onlyworks with type  string and an operation with a single value (e.g. contains)
-			// 			//TODO this should be removed. Only $search will be supported as sPath. This mapping of a *fieldPath1,FieldPath2* is currently only used on the mockServer
-			// 			var $searchfilters = /^\*(.+)\*$/.exec(oFilter.sPath);
-			// 			if ($searchfilters) {
-			// 				// $search mapping
-			// 				var aFieldPath = $searchfilters[1].split(',');
-			// 				for (var j = 0; j < aFieldPath.length; j++) {
-			// 					aLocalFilters.push(new Filter(aFieldPath[j], oFilter.sOperator, oFilter.oValue1));
-			// 				}
-			// 				continue;
-			// 			}
-
-			// 			// ANY condition handling e.g. fieldPath "navPath*/propertyPath"
-			// 			if (oFilter.sPath && oFilter.sPath.indexOf('*/') > -1) {
-			// 				aSections = oFilter.sPath.split('*/');
-			// 				if (aSections.length === 2) {
-			// 					sNavPath = aSections[0];
-			// 					sPropertyPath = aSections[1];
-			// 					oFilter.sPath = 'L1/' + sPropertyPath;
-
-			// 					if (!oToAnyFilterParam) {
-			// 						oToAnyFilterParam = {
-			// 							path: sNavPath,
-			// 							operator: 'Any',
-			// 							variable: 'L1'
-			// 						};
-			// 					}
-			// 					aLocalFilters.push(oFilter);
-			// 				} else {
-			// 					throw new Error("Not Implemented");
-			// 				}
-			// 			} else {
-			// 				aLocalFilters.push(oFilter);
-			// 			}
-			// 		} else {
-			// 			//collect all exclude (NE) conditions as AND fieldPath != "value"
-			// 			aLocalNEFilters.push(oFilter);
-			// 		}
-			// 	}
-
-			// 	if (oToAnyFilterParam) {
-			// 		if (aLocalFilters.length === 1) {
-			// 			oToAnyFilterParam.condition = aLocalFilters[0];
-			// 		} else if (aLocalFilters.length > 1) {
-			// 			oToAnyFilterParam.condition = new Filter({ filters: aLocalFilters, and: false });
-			// 		}
-			// 		aLocalFilters = [new Filter(oToAnyFilterParam)];
-			// 	}
-
-			// 	// take the single Filter or combine all with OR
-			// 	oFilter = undefined;
-			// 	if (aLocalFilters.length === 1) {
-			// 		oFilter = aLocalFilters[0]; // could omit this and have an OR-ed array with only one filter, but it's nice this way.
-			// 	} else if (aLocalFilters.length > 1) {
-			// 		oFilter = new Filter({ filters: aLocalFilters, and: false });
-			// 	}
-
-			// 	// merge Include-filter and all NE-filter into the Overallfilter, they will be AND added to the result
-			// 	if (oFilter) {
-			// 		aLocalNEFilters.unshift(oFilter); // add in-filters to the beginning (better to read)
-			// 	}
-
-			// 	if (aLocalNEFilters.length === 1) {
-			// 		aOverallFilters.push(aLocalNEFilters[0]);
-			// 	} else if (aLocalNEFilters.length > 1) {
-			// 		aOverallFilters.push(new Filter({ filters: aLocalNEFilters, and: true })); // to have all filters for one path grouped
-			// 	}
-			// }
-
-			// // AND-combine filters for different properties and apply filters
-			// if (aOverallFilters.length === 1) {
-			// 	return aOverallFilters[0]; // could omit this and have an ORed array with only one filter, but it's nice this way.
-			// } else if (aOverallFilters.length > 1) {
-			// 	return new Filter({ filters: aOverallFilters, and: true });
-			// } else { // no filters
-			// 	return null;
-			// }
 		};
 
 		ConditionModel.prototype.serialize = function () {
@@ -674,7 +531,7 @@ sap.ui.define([
 				if (!isNaN(parseInt(key)) && (typeof value === 'string')) {
 					a = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}).(\d{3})Z$/.exec(value);
 					if (a) {
-						return new Date(value);
+						return UI5Date.getInstance(value);
 					}
 				}
 				return value;

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

@@ -9,13 +9,15 @@ sap.ui.define([
 	'sap/ui/model/ChangeReason',
 	'sap/ui/model/json/JSONPropertyBinding',
 	'sap/base/util/merge',
-	'sap/base/util/deepEqual'
+	'sap/base/util/deepEqual',
+	'sap/ui/core/date/UI5Date'
 ],
 	function(
 			ChangeReason,
 			JSONPropertyBinding,
 			merge,
-			deepEqual
+			deepEqual,
+			UI5Date
 		) {
 	"use strict";
 
@@ -89,7 +91,7 @@ sap.ui.define([
 		} else if (Array.isArray(oValue)) {
 			oCopy = merge([], oValue);
 		} else if (oValue instanceof Date) {
-			oCopy = new Date(oValue);
+			oCopy = UI5Date.getInstance(oValue);
 		} else if (typeof oValue === "object") {
 			oCopy = merge({}, oValue);
 		} else {