@openui5/sap.ui.mdc 1.111.6 → 1.112.1

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

@@ -5,13 +5,13 @@
  */
 sap.ui.define([
 		'sap/ui/core/library',
-		'sap/ui/core/date/UniversalDate',
+		'sap/ui/core/date/UI5Date',
 		'sap/ui/mdc/enum/BaseType',
 		'sap/base/util/merge'
 	],
 	function(
 			coreLibrary,
-			UniversalDate,
+			UI5Date,
 			BaseType,
 			merge
 	) {
@@ -31,74 +31,6 @@ sap.ui.define([
 		 */
 		var DateUtil = {
 
-				/**
-				 * Converts a data type specific date to a UniversalDate.
-				 *
-				 * @param {any} vDate Date
-				 * @param {sap.ui.model.SimpleType} oType Data type
-				 * @param {sap.ui.mdc.enum.BaseType} [sBaseType] Basic type
-				 * @return {sap.ui.core.date.UniversalDate} UniversalDate
-				 * @private
-				 * @ui5-restricted sap.ui.mdc
-				 * @since 1.74.0
-				 */
-				typeToUniversalDate: function(vDate, oType, sBaseType) {
-
-					var sPattern;
-					if (sBaseType && sBaseType === BaseType.DateTime) {
-						sPattern = "yyyyMMdd-HHmmssSSS";
-					} else {
-						sPattern = "yyyyMMdd";
-					}
-					var sDate = this.typeToString(vDate, oType, sPattern);
-					var iYear = parseInt(sDate.slice(0,4));
-					var iMonth = parseInt(sDate.slice(4,6)) - 1;
-					var iDate = parseInt(sDate.slice(6,8));
-					var iHour = sBaseType === BaseType.DateTime ? parseInt(sDate.slice(9,11)) : 0;
-					var iMinute = sBaseType === BaseType.DateTime ? parseInt(sDate.slice(11,13)) : 0;
-					var iSecond = sBaseType === BaseType.DateTime ? parseInt(sDate.slice(13,15)) : 0;
-					var iMillisecond = sBaseType === BaseType.DateTime ? parseInt(sDate.slice(15,18)) : 0;
-					var oUniversalDate = new UniversalDate(UniversalDate.UTC(iYear, iMonth, iDate, iHour, iMinute, iSecond, iMillisecond));
-
-					return oUniversalDate;
-
-				},
-
-				/**
-				 * Converts a UniversalDate to data type specific date.
-				 *
-				 * @param {sap.ui.core.date.UniversalDate} oDate UniversalDate
-				 * @param {sap.ui.model.SimpleType} oType Data type
-				 * @param {sap.ui.mdc.enum.BaseType} [sBaseType] Basic type
-				 * @return {any} type specific date
-				 * @private
-				 * @ui5-restricted sap.ui.mdc
-				 * @since 1.74.0
-				 */
-				universalDateToType: function(oDate, oType, sBaseType) {
-
-					var iYear = oDate.getUTCFullYear();
-					var iMonth = oDate.getUTCMonth() + 1;
-					var iDate = oDate.getUTCDate();
-					var sYear = (iYear < 10 ? "0" : "") + (iYear < 100 ? "0" : "") + (iYear < 1000 ? "0" : "") + iYear.toString();
-					var sDate = sYear + ((iMonth < 10) ? "0" : "") + iMonth.toString() + ((iDate < 10) ? "0" : "") + iDate.toString();
-					var sPattern;
-					if (sBaseType && sBaseType === BaseType.DateTime) {
-						sPattern = "yyyyMMdd-HHmmssSSS";
-						var iHour = oDate.getUTCHours();
-						var iMinute = oDate.getUTCMinutes();
-						var iSecond = oDate.getUTCSeconds();
-						var iMillisecond = oDate.getUTCMilliseconds();
-						sDate = sDate + "-" + ((iHour < 10) ? "0" : "") + iHour.toString() + ((iMinute < 10) ? "0" : "") + iMinute.toString() + ((iSecond < 10) ? "0" : "") + iSecond.toString() + ((iMillisecond < 100) ? "0" : "") + ((iMillisecond < 10) ? "0" : "") + iMillisecond.toString();
-					} else {
-						sPattern = "yyyyMMdd";
-					}
-					var vDate = this.stringToType(sDate, oType, sPattern);
-
-					return vDate;
-
-				},
-
 				/**
 				 * "Clones" a given data type to use a given pattern.
 				 *
@@ -189,44 +121,101 @@ sap.ui.define([
 				},
 
 				/**
-				 * Convert time part of a JS Date object from local time to UTC
+				 * Converts a data type representation of a dateTime to a ISO-string.
 				 *
-				 * Returns a new date object, where the UTC time is set to the same value as
-				 * the local time on the original date object.
-				 *
-				 * If a date has a local time of to 14:00 GMT+0200, the resulting date will have
-				 * 14:00 UTC on the same day.
+				 * @param {any} vDate Date
+				 * @param {sap.ui.model.SimpleType} oType Data type
+				 * @param {sap.ui.mdc.enum.BaseType} [sBaseType] Basic type
+				 * @return {string} Date as ISOString
+				 * @private
+				 * @ui5-restricted sap.ui.mdc
+				 * @since 1.112.0
+				 */
+				typeToISO: function(vDate, oType, sBaseType) {
+
+					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()));
+					// }
+
+					return oDate.toISOString();
+
+				},
+
+				/**
+				 * Converts a ISO representation of a DateTime into the data-type representation.
 				 *
-				 * @param {Date} oDate the date to convert
-				 * @returns {Date} a new date object with converted time
+				 * @param {string} sISODate Date
+				 * @param {sap.ui.model.SimpleType} oType Data type
+				 * @param {sap.ui.mdc.enum.BaseType} [sBaseType] Basic type
+				 * @return {any} Date for type
 				 * @private
+				 * @ui5-restricted sap.ui.mdc
+				 * @since 1.112.0
 				 */
-				localToUtc: function(oDate) {
-					return new Date( Date.UTC(oDate.getFullYear(), oDate.getMonth(), oDate.getDate(),
-							oDate.getHours(), oDate.getMinutes(), oDate.getSeconds(), oDate.getMilliseconds())
-					);
+				ISOToType: function(sISODate, oType, sBaseType) {
+
+					var oDate = UI5Date.getInstance(sISODate); // can also interpret string with pattern "yyyy-MM-ddTHH:mm:ssZ"
+
+					if (oType.getFormatOptions().UTC) { // in UTC date we need to bring the UTC to local date
+						oDate = UI5Date.getInstance(oDate.getUTCFullYear(), oDate.getUTCMonth(), oDate.getUTCDate(), oDate.getUTCHours(), oDate.getUTCMinutes(), oDate.getUTCSeconds(), oDate.getUTCMilliseconds());
+					}
+
+					return this.dateToType(oDate, oType, sBaseType);
+
 				},
 
 				/**
-				 * Convert time part of a JS Date object from UTC to local time
+				 * Convert time part of a JS Date ino the type representation
 				 *
-				 * Returns a new date object, where the local time is set to the same value as
-				 * the UTC time on the original date object.
+				 * The incomming date is a local date, so for Date and Time the local value needs to be used, for DateTime it depends on the UTC configuration.
 				 *
-				 * If a date has a time of to 14:00 UTC, the resulting date will have
-				 * 14:00 GMT+0200 on the same day.
+				 * @param {Date} oDate the date to convert
+				 * @param {sap.ui.model.SimpleType} oType Data type
+				 * @param {sap.ui.mdc.enum.BaseType} [sBaseType] Basic type
+				 * @returns {any} date in type representation
+				 * @private
+				 */
+				dateToType: function(oDate, oType, sBaseType) {
+					var vDate;
+
+					if (oType.getModelValue) {
+						vDate = oType.getModelValue(oDate);
+					} else { // older types don't support the new getModelValue
+						var oModelFormat = oType.getModelFormat();
+						var oFormatOptions = oType.getFormatOptions();
+						var bUTC = sBaseType === BaseType.DateTime ? !!oFormatOptions.UTC : false;
+						vDate = oModelFormat.format(oDate, bUTC);
+					}
+
+					return vDate;
+				},
+
+				/**
+				 * Convert time part of a JS Date ino the type representation
 				 *
-				 * Please be aware that due to summer/winter time and changes in timezones,
-				 * not all times can be converted to local time.
+				 * The needed date is a local date, so for Date and Time the local value needs to be used, for DateTime it depends on the UTC configuration.
 				 *
-				 * @param {Date} oDate the date to convert
-				 * @returns {Date} a new date object with converted time
+				 * @param {any} vDate date in type representation
+				 * @param {sap.ui.model.SimpleType} oType Data type
+				 * @param {sap.ui.mdc.enum.BaseType} [sBaseType] Basic type
+				 * @returns {Date} JSDate (local)
 				 * @private
 				 */
-				utcToLocal: function(oDate) {
-					return new Date( oDate.getUTCFullYear(), oDate.getUTCMonth(), oDate.getUTCDate(),
-							oDate.getUTCHours(), oDate.getUTCMinutes(), oDate.getUTCSeconds(), oDate.getUTCMilliseconds()
-					);
+				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 {
+						var oModelFormat = oType.getModelFormat();
+						var oFormatOptions = oType.getFormatOptions();
+						var bUTC = sBaseType === BaseType.DateTime ? !!oFormatOptions.UTC : false;
+						oDate = oModelFormat.parse(vDate, bUTC);
+					}
+
+					return oDate;
 				}
 		};
 

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

@@ -5,82 +5,105 @@
  */
 sap.ui.define([
     'sap/ui/core/Control',
-	'sap/m/OverflowToolbar',
+    'sap/m/OverflowToolbar',
     "sap/ui/mdc/util/InfoBarRenderer",
     "sap/m/Text",
     "sap/ui/core/InvisibleText",
-    "sap/m/Label"
-], function(Control, Toolbar, InfoBarRenderer, Text, InvisibleText, Label) {
-	"use strict";
-
-	/**
-	 * Constructor for a new InfoBar.
-	 * @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>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.111.6
-	 * @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
-	 */
-	var InfoBar = Control.extend("sap.ui.mdc.util.InfoBar", {
-		metadata: {
-			properties: {
+    "sap/m/Label",
+    "sap/m/Button",
+    "sap/m/library",
+    "sap/m/ToolbarSpacer"
+], function (Control, Toolbar, InfoBarRenderer, Text, InvisibleText, Label, Button, mLibrary, ToolbarSpacer) {
+    "use strict";
+
+    /**
+     * Constructor for a new InfoBar.
+     * @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>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.112.1
+     * @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
+     */
+    var InfoBar = Control.extend("sap.ui.mdc.util.InfoBar", {
+        metadata: {
+            properties: {
                 infoText: {
                     type: "string"
                 }
-			},
+            },
             aggregations: {
-                _toolbar : {
+                _toolbar: {
                     type: "sap.m.Toolbar",
                     multiple: false,
                     visibility: "hidden"
                 }
             },
             events: {
-				/**
-				 * This event is fired when the user clicks on the infobar.
-				 */
-				press : {
-					parameters : {
-
-						/**
-						 * The toolbar item that was pressed
-						 */
-						srcControl : {type : "sap.ui.core.Control"}
-					}
-				}
+                /**
+                 * This event is fired when the user clicks on the infobar.
+                 */
+                press: {
+                    parameters: {
+
+                        /**
+                         * The toolbar item that was pressed
+                         */
+                        srcControl: { type: "sap.ui.core.Control" }
+                    }
+                },
+                /**
+                 * This event is fired when the user clicks on the RemoveAllfilters button.
+                 */
+                removeAllFilters: {
+                    parameters: {
+                    }
+                }
             }
-		},
+        },
         renderer: InfoBarRenderer
-	});
+    });
 
-    InfoBar.prototype.init = function() {
 
-        this.setVisible(!!this.getInfoText());
-        this.oText = new Text({
-            text: this.getInfoText(),
-            wrapping: false
+    InfoBar.prototype.applySettings = function () {
+        Control.prototype.applySettings.apply(this, arguments);
+
+        this.setInfoText(this.getInfoText());
+    };
+
+    InfoBar.prototype.init = function () {
+
+        this.setVisible(false);
+        this.oText = new Text({ wrapping: false });
+        this.oInvisibleText = new InvisibleText().toStatic();
+
+        this.oRemoveAllFiltersBtn = new Button(this.getId() + "-RemoveAllFilters", {
+            press: function (oEvent) {
+                this.fireRemoveAllFilters();
+                // TODO this.oInvisibleMessage.announce(oMessageBundle.getText("valuehelp.REMOVEALLTOKEN_ANNOUNCE"), InvisibleMessageMode.Polite);
+            }.bind(this),
+            icon: "sap-icon://decline",
+            tooltip: sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc").getText("infobar.REMOVEALLFILTERS")
         });
-        this.oInvisibleText = new InvisibleText({text: this.getInfoText()}).toStatic();
 
-        var oToolbar = new Toolbar(this.getId() + "--bar", { design: "Info", active: true, content: [this.oText]});
-        oToolbar.attachPress(function(oSrc){
+        var oToolbar = new Toolbar(this.getId() + "--bar", { design: "Info", active: true, content: [this.oText, new ToolbarSpacer(), this.oRemoveAllFiltersBtn] });
+        oToolbar.attachPress(function (oSrc) {
             this.firePress({
-				srcControl : oSrc
-			});
+                srcControl: oSrc
+            });
         }.bind(this));
         this.setAggregation("_toolbar", oToolbar);
 
     };
 
-    InfoBar.prototype.setInfoText = function(sText){
+    InfoBar.prototype.setInfoText = function (sText) {
         this.setProperty("infoText", sText);
         this.setVisible(!!sText);
 
@@ -96,23 +119,28 @@ sap.ui.define([
      * Provides the ID of the invisible text created by the <code>InfoBar</code>. Can be used to set ARIA labels correctly.
      * @returns {string} ID of the invisible text control
      */
-    InfoBar.prototype.getACCTextId = function() {
+    InfoBar.prototype.getACCTextId = function () {
         return this.oInvisibleText.getId();
     };
 
-    InfoBar.prototype.exit = function() {
+    InfoBar.prototype.exit = function () {
         if (this.oInvisibleText) {
-			this.oInvisibleText.destroy();
-			this.oInvisibleText = null;
-		}
+            this.oInvisibleText.destroy();
+            this.oInvisibleText = null;
+        }
 
         if (this.oText) {
-			this.oText.destroy();
-			this.oText = null;
-		}
+            this.oText.destroy();
+            this.oText = null;
+        }
+
+        if (this.oRemoveAllFiltersBtn) {
+            this.oRemoveAllFiltersBtn.destroy();
+            this.oRemoveAllFiltersBtn = null;
+        }
     };
 
 
-	return InfoBar;
+    return 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.111.6
+		 * @version 1.112.1
 		 * @alias sap.ui.mdc.util.PromiseCache
 		 * @since 1.85.0
 		 * @private

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

@@ -274,6 +274,10 @@ sap.ui.define([
 	function reportInvalidProperty(sMessage, oAdditionalInfo) {
 		// TODO: warning is logged momentarily so that consumers can adapt to have valid property definitions
 		//  valid use case would be to throw an error
+		if (Log.getLevel() < Log.WARNING) {
+			return; // Avoid stringification overhead if logging is not required.
+		}
+
 		var sAdditionalInfo = stringifyPlainObject(oAdditionalInfo);
 		Log.warning("Invalid property definition: " + sMessage + (sAdditionalInfo ? "\n" + sAdditionalInfo : ""));
 	}
@@ -527,7 +531,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.111.6
+	 * @version 1.112.1
 	 *
 	 * @private
 	 * @experimental

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

@@ -14,7 +14,7 @@ sap.ui.define([
 ], function(BaseType, ObjectPath, isEmptyObject, merge, SimpleType, DateUtil) {
 	"use strict";
 
-	var sDateTimePattern = "yyyy-MM-ddTHH:mm:ssZ"; // milliseconds missing
+	// var sDateTimePattern = "yyyy-MM-ddTHH:mm:ssZ"; // milliseconds missing
 	var sDatePattern = "yyyy-MM-dd";
 	var sTimePattern = "HH:mm:ss";
 
@@ -194,9 +194,12 @@ sap.ui.define([
 			var sBaseType = this.getBaseTypeForType(oTypeInstance);
 			switch (sBaseType) {
 				case BaseType.DateTime:
-					return DateUtil.stringToType(sValue, oTypeInstance, sDateTimePattern);
+					return DateUtil.ISOToType(sValue, oTypeInstance, sBaseType);
 
 				case BaseType.Date:
+					if (sValue.indexOf("T") >= 0) { // old variant with DateTime for DateValues
+						sValue = sValue.substr(0, sValue.indexOf("T")); // just take the date part
+					}
 					return DateUtil.stringToType(sValue, oTypeInstance, sDatePattern);
 
 				case BaseType.Time:
@@ -235,7 +238,7 @@ sap.ui.define([
 			var sBaseType = this.getBaseTypeForType(oTypeInstance);
 			switch (sBaseType) {
 				case BaseType.DateTime:
-					return DateUtil.typeToString(vValue, oTypeInstance, sDateTimePattern);
+					return DateUtil.typeToISO(vValue, oTypeInstance, sBaseType);
 
 				case BaseType.Date:
 					return DateUtil.typeToString(vValue, oTypeInstance, sDatePattern);