@openui5/sap.ui.integration 1.113.0 → 1.115.0

package/src/sap/ui/integration/util/Form.js

@@ -6,11 +6,24 @@
 sap.ui.define([
 	"sap/ui/base/ManagedObject",
 	"sap/ui/core/library",
+	"sap/ui/core/Core",
 	"sap/base/Log",
 	"sap/base/util/deepExtend",
 	"./Validators",
-	"./BindingResolver"
-], function (ManagedObject, coreLibrary, Log, deepExtend, Validators, BindingResolver) {
+	"./BindingHelper",
+	"./BindingResolver",
+	"./DateRangeHelper"
+], function (
+	ManagedObject,
+	coreLibrary,
+	Core,
+	Log,
+	deepExtend,
+	Validators,
+	BindingHelper,
+	BindingResolver,
+	DateRangeHelper
+) {
 	"use strict";
 
 	var ValueState = coreLibrary.ValueState;
@@ -19,7 +32,7 @@ sap.ui.define([
 	 * Utility class for handling forms in the cards.
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 *
 	 * @private
 	 * @ui5-restricted
@@ -91,7 +104,7 @@ sap.ui.define([
 	 */
 	Form.prototype.resolveControl = function (oItem) {
 		var oResolved = {},
-			vValue,
+			vValue = this.getModel("form").getProperty("/" + oItem.id),
 			aValidations = this.getModel("messages").getProperty("/records"),
 			oValueState = aValidations.find(function (oValidation) {
 				return oValidation.bindingPath === "/" + oItem.id;
@@ -102,12 +115,17 @@ sap.ui.define([
 			oResolved.valueState = { message: oValueState.message, type: oValueState.type };
 		}
 
-		if (oItem.type === "ComboBox") {
-			vValue = this.getModel("form").getProperty("/" + oItem.id);
-			oResolved.selectedKey = vValue.key;
-			vValue = vValue.value;
-		} else {
-			vValue = this.getModel("form").getProperty("/" + oItem.id);
+		switch (oItem.type) {
+			case "ComboBox":
+				oResolved.selectedKey = vValue.key;
+				vValue = vValue.value;
+				break;
+			case "DateRange":
+				vValue = vValue.value;
+				break;
+			default:
+				// do nothing
+				break;
 		}
 
 		oResolved.value = vValue;
@@ -127,14 +145,17 @@ sap.ui.define([
 		}
 
 		var sId = oFormControlData.id,
-			oControl = this._mControls.get(sId);
+			oControl = this._mControls.get(sId),
+			vValue = oFormControlData.value;
 
 		if (oControl.isA("sap.m.ComboBox")) {
 			this._setComboBoxValue(oControl, oFormControlData);
-		}
-
-		if ("value" in oFormControlData && oControl.isA(["sap.m.TextArea", "sap.m.Input"])) {
-			oControl.setValue(oFormControlData.value);
+		} else if (vValue) {
+			if (oControl.isA("sap.m.DatePicker") || oControl.isA("sap.m.DynamicDateRange")) {
+				DateRangeHelper.setValue(oControl, vValue, this._oCard);
+			} else {
+				oControl.setValue(vValue);
+			}
 		}
 
 		this._validateAndUpdate(oControl);
@@ -149,6 +170,12 @@ sap.ui.define([
 
 		if ("key" in oControlData) {
 			oComboBox.setSelectedKey(oControlData.key);
+
+			oSelectedItem = oComboBox.getItems().find(function (oItem) {
+				return oItem.getKey() === oControlData.key;
+			});
+
+			oComboBox.setValue(oSelectedItem ? oSelectedItem.getText() : "");
 		}
 
 		if ("value" in oControlData && !("key" in oControlData)) {
@@ -183,7 +210,7 @@ sap.ui.define([
 		this._prepareValidationForControl(oControl, oItem, sPath);
 		oControl.attachEvent(sEventType, this._validateAndUpdate, this);
 
-		if (oItem.value && !BindingResolver.isBindingInfo(oItem.value)) {
+		if (oItem.value && !BindingHelper.isBindingInfo(oItem.value)) {
 			this._updateModel(oControl);
 		}
 
@@ -270,15 +297,18 @@ sap.ui.define([
 
 		this._removeMessageFromControl(oControl);
 
-		if (!oItem || !oItem.validations) {
+		if (!oItem) {
 			return bHasErrorSet;
 		}
 
-		aResolvedValidations = BindingResolver.resolveValue(oItem.validations, oControl, sBindingPath);
+		bHasErrorSet = !this._checkBuiltInValidations(oControl, oItem, bShowValueState);
 
-		bHasErrorSet = !aResolvedValidations.every(function (mValidationConfig) {
-			return this._checkValidationItem(mValidationConfig, oControl, oItem, bShowValueState, oExtension);
-		}.bind(this));
+		if (!bHasErrorSet && oItem.validations) {
+			aResolvedValidations = BindingResolver.resolveValue(oItem.validations, oControl, sBindingPath);
+			bHasErrorSet = !aResolvedValidations.every(function (mValidationConfig) {
+				return this._checkValidationItem(mValidationConfig, oControl, oItem, bShowValueState, oExtension);
+			}.bind(this));
+		}
 
 		this._updateMessageModel();
 
@@ -327,6 +357,22 @@ sap.ui.define([
 		return bValidationPassed;
 	};
 
+	Form.prototype._checkBuiltInValidations = function (oControl, oItem, bShowValueState) {
+		var bValidationPassed = true;
+
+		if (oControl.isA("sap.m.DatePicker") && !oControl.isValidValue()) {
+			this._addMessageToControl(oControl, bShowValueState, {
+				type: ValueState.Error,
+				message: Core.getLibraryResourceBundle("sap.ui.core").getText("VALUE_STATE_ERROR"),
+				bindingPath: "/" + oItem.id
+			});
+
+			bValidationPassed = false;
+		}
+
+		return bValidationPassed;
+	};
+
 	Form.prototype._addMessageToControl = function (oControl, bShowValueState, oMessage) {
 		var oMessagesModel = this.getModel("messages"),
 			oModelData = oMessagesModel.getData();
@@ -424,6 +470,8 @@ sap.ui.define([
 		switch (oItem.type) {
 			case "ComboBox":
 				return "keyValuePair";
+			case "DateRange":
+				return "dateRange";
 			default:
 				return "string";
 		}
@@ -436,6 +484,8 @@ sap.ui.define([
 				key: oControl.getSelectedKey(),
 				value: oControl.getValue()
 			};
+		} else if (oControl.isA("sap.m.DynamicDateRange") || oControl.isA("sap.m.DatePicker")) {
+			return DateRangeHelper.getValueForModel(oControl);
 		} else {
 			return oControl.getValue();
 		}

package/src/sap/ui/integration/util/HeaderFactory.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.BaseFactory
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/util/JSONBindingHelper.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * Helper class for working with bindings for json objects.
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.integration, shell-toolkit

package/src/sap/ui/integration/util/LoadingProvider.js

@@ -4,31 +4,9 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"../cards/ListContentRenderer",
-	"sap/ui/core/Element",
-	"sap/f/cards/loading/GenericPlaceholder",
-	"sap/f/cards/loading/ListPlaceholder",
-	"sap/f/cards/loading/CalendarPlaceholder",
-	"sap/f/cards/loading/ObjectPlaceholder",
-	"sap/f/cards/loading/TablePlaceholder",
-	"sap/f/cards/loading/TimelinePlaceholder",
-	"sap/f/cards/loading/AnalyticalPlaceholder",
-	"../cards/TableContentRenderer",
-	"../cards/TimelineContentRenderer",
-	"../cards/AnalyticalContentRenderer"
+	"sap/ui/core/Element"
 ], function (
-	ListContentRenderer,
-	Element,
-	GenericPlaceholder,
-	ListPlaceholder,
-	CalendarPlaceholder,
-	ObjectPlaceholder,
-	TablePlaceholder,
-	TimelinePlaceholder,
-	AnalyticalPlaceholder,
-	TableContentRenderer,
-	TimelineContentRenderer,
-	AnalyticalContentRenderer
+	Element
 ) {
 	"use strict";
 
@@ -43,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @private
@@ -70,69 +48,6 @@ sap.ui.define([
 		return this.setProperty("loading", bLoading);
 	};
 
-	LoadingProvider.prototype.createContentPlaceholder = function (oConfiguration, sType, oCard) {
-		var iContentMinItems;
-		var oContentPlaceholder;
-
-		switch (sType) {
-			case "List":
-				iContentMinItems = oCard.getContentMinItems(oConfiguration);
-
-				oContentPlaceholder = new ListPlaceholder({
-					minItems: iContentMinItems !== null ? iContentMinItems : 2,
-					item: oConfiguration.item,
-					itemHeight: ListContentRenderer.getItemMinHeight(oConfiguration, oCard || this) + "rem"
-				});
-				break;
-
-			case "Calendar":
-				iContentMinItems = oCard.getContentMinItems(oConfiguration);
-
-				oContentPlaceholder = new CalendarPlaceholder({
-					minItems: iContentMinItems !== null ? iContentMinItems : 2,
-					maxLegendItems: oConfiguration.maxLegendItems ? parseInt(oConfiguration.maxLegendItems) : 2,
-					item: oConfiguration.item ? oConfiguration.item.template : {},
-					legendItem: oConfiguration.legendItem ? oConfiguration.legendItem.template : {}
-				});
-				break;
-			case "Object":
-				oContentPlaceholder = new ObjectPlaceholder();
-				break;
-
-			case "Table":
-				iContentMinItems = oCard.getContentMinItems(oConfiguration);
-
-				oContentPlaceholder = new TablePlaceholder({
-					minItems: iContentMinItems !== null ? iContentMinItems : 2,
-					itemHeight: TableContentRenderer.getItemMinHeight(oConfiguration, oCard || this) + "rem",
-					columns: oConfiguration.row ? oConfiguration.row.columns.length || 2 : 2
-				});
-				break;
-
-			case "Timeline":
-				iContentMinItems = oCard.getContentMinItems(oConfiguration);
-
-				oContentPlaceholder = new TimelinePlaceholder({
-					minItems: iContentMinItems !== null ? iContentMinItems : 2,
-					item: oConfiguration.item,
-					itemHeight: TimelineContentRenderer.getItemMinHeight(oConfiguration, oCard || this) + "rem"
-				});
-				break;
-
-			case "Analytical":
-				oContentPlaceholder = new AnalyticalPlaceholder({
-					chartType: oConfiguration.chartType,
-					minHeight: AnalyticalContentRenderer.getMinHeight(oConfiguration)
-				});
-				break;
-
-			default:
-				oContentPlaceholder = new GenericPlaceholder();
-		}
-
-		return oContentPlaceholder;
-	};
-
 	/**
 	 * Set to <code>true</code> if the loading should wait for a pagination animation.
 	 * @private

package/src/sap/ui/integration/util/Manifest.js

@@ -64,7 +64,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/util/ParameterMap.js

@@ -5,9 +5,11 @@
  */
 
 sap.ui.define([
-	'sap/ui/core/Core'
+	'sap/ui/core/Core',
+	'sap/ui/core/date/UI5Date'
 ], function(
-	Core
+	Core,
+	UI5Date
 ) {
 	"use strict";
 
@@ -32,7 +34,7 @@ sap.ui.define([
 	 */
 	function getTimeIso() {
 
-		return new Date().toISOString();
+		return UI5Date.getInstance().toISOString();
 	}
 
 	/**
@@ -42,7 +44,7 @@ sap.ui.define([
 	 */
 	function getDateIso () {
 
-		return new Date().toISOString().slice(0, 10);
+		return UI5Date.getInstance().toISOString().slice(0, 10);
 	}
 
 	/**

package/src/sap/ui/integration/util/RequestDataProvider.js

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.DataProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/util/ServiceDataProvider.js

@@ -17,7 +17,7 @@ sap.ui.define(["sap/ui/integration/util/DataProvider"], function (DataProvider)
 	 * @extends sap.ui.integration.util.DataProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/util/ServiceManager.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.EventProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @param {Object} mServiceFactoryReferences A map with service descriptions.

package/src/sap/ui/integration/util/SkeletonCard.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.widgets.Card
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/util/Utils.js

@@ -9,13 +9,15 @@ sap.ui.define([
 	"sap/ui/core/Locale",
 	"sap/base/strings/formatMessage",
 	'sap/base/util/isPlainObject',
-	"sap/base/Log"
+	"sap/base/Log",
+	"sap/ui/core/date/UI5Date"
 ], function (
 	Core,
 	Locale,
 	formatMessage,
 	isPlainObject,
-	Log
+	Log,
+	UI5Date
 ) {
 	"use strict";
 
@@ -23,7 +25,7 @@ sap.ui.define([
 	 * Utility class helping with JSON strings and formatters.
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 *
 	 * @private
 	 * @alias sap.ui.integration.util.Utils
@@ -83,7 +85,7 @@ sap.ui.define([
 
 		if (aJSONDateParts) {
 			// 0 - complete results; 1 - ticks; 2 - sign; 3 - minutes
-			var oResult = new Date(parseInt(aJSONDateParts[JSON_DATE_TICKS]));
+			var oResult = UI5Date.getInstance(parseInt(aJSONDateParts[JSON_DATE_TICKS]));
 			if (aJSONDateParts[JSON_DATE_SIGN]) {
 				var iMins = parseInt(aJSONDateParts[JSON_DATE_MINUTES]);
 				if (aJSONDateParts[JSON_DATE_SIGN] === "-") {

package/src/sap/ui/integration/util/Validators.js

@@ -11,7 +11,7 @@ sap.ui.define([], function () {
 	 * Utility class helping with input validations.
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 *
 	 * @private
 	 * @alias sap.ui.integration.util.Validators
@@ -118,6 +118,12 @@ sap.ui.define([], function () {
 				return (b && !v.value && !v.key) || (b && !!v.key);
 			},
 			restrictToPredefinedOptionsTxt: "EDITOR_ONLY_LISTED_VALUES_ALLOWED"
+		},
+		dateRange: {
+			required: function (v, b) {
+				return !b || !!v.value;
+			},
+			requiredTxt: "EDITOR_VAL_FIELDREQ"
 		}
 	};