@openui5/sap.ui.integration 1.120.7 → 1.121.0

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

@@ -5,26 +5,28 @@
  */
 sap.ui.define([
 	"sap/ui/base/ManagedObject",
+	"sap/ui/core/Lib",
 	"sap/ui/core/library",
-	"sap/ui/core/Core",
 	"sap/base/Log",
 	"sap/base/util/deepExtend",
 	"./Validators",
 	"./BindingHelper",
 	"./BindingResolver",
 	"./DateRangeHelper",
-	"./Duration"
+	"./Duration",
+	"./ComboBoxHelper"
 ], function (
 	ManagedObject,
+	Library,
 	coreLibrary,
-	Core,
 	Log,
 	deepExtend,
 	Validators,
 	BindingHelper,
 	BindingResolver,
 	DateRangeHelper,
-	Duration
+	Duration,
+	ComboBoxHelper
 ) {
 	"use strict";
 
@@ -34,7 +36,7 @@ sap.ui.define([
 	 * Utility class for handling forms in the cards.
 	 *
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @private
 	 * @ui5-restricted
@@ -151,7 +153,7 @@ sap.ui.define([
 			vValue = oFormControlData.value;
 
 		if (oControl.isA("sap.m.ComboBox")) {
-			this._setComboBoxValue(oControl, oFormControlData);
+			ComboBoxHelper.setValueAndKey(oControl, oFormControlData.key, oFormControlData.value);
 		} else if (vValue) {
 			if (oControl.isA("sap.m.DatePicker") || oControl.isA("sap.m.DynamicDateRange")) {
 				DateRangeHelper.setValue(oControl, vValue, this._oCard);
@@ -169,33 +171,6 @@ sap.ui.define([
 		this._mControls.forEach(this._updateModel.bind(this));
 	};
 
-	Form.prototype._setComboBoxValue = function (oComboBox, oControlData) {
-		var oSelectedItem;
-
-		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)) {
-			oSelectedItem = oComboBox.getItems().find(function (oItem) {
-				return oItem.getText() === oControlData.value;
-			});
-
-			if (oSelectedItem) {
-				oComboBox.setSelectedItem(oSelectedItem);
-			} else {
-				oComboBox.setSelectedKey(""); // now entering unknown value, reset selectedKey to keep it in sync
-				oComboBox.setValue(oControlData.value);
-			}
-		}
-	};
-
 	Form.prototype._isValidControlId = function (sId) {
 		if (!sId) {
 			Log.error("Each input control must have an ID.", "sap.ui.integration.widgets.Card");
@@ -367,7 +342,7 @@ sap.ui.define([
 		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"),
+				message: Library.getResourceBundleFor("sap.ui.core").getText("VALUE_STATE_ERROR"),
 				bindingPath: "/" + oItem.id
 			});
 

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

@@ -4,10 +4,10 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/core/Core",
 	"./BaseFactory",
 	"sap/base/Log",
 	"sap/base/util/isEmptyObject",
+	"sap/ui/core/Lib",
 	"sap/ui/integration/cards/actions/CardActions",
 	"sap/ui/integration/library",
 	"sap/m/library",
@@ -16,10 +16,10 @@ sap.ui.define([
 	"sap/ui/integration/util/Utils",
 	"sap/m/Button"
 ], function (
-	Core,
 	BaseFactory,
 	Log,
 	isEmptyObject,
+	Library,
 	CardActions,
 	library,
 	mLibrary,
@@ -36,7 +36,7 @@ sap.ui.define([
 
 	var CardDisplayVariant = library.CardDisplayVariant;
 
-	var oResourceBundle = Core.getLibraryResourceBundle("sap.ui.integration");
+	var oResourceBundle = Library.getResourceBundleFor("sap.ui.integration");
 
 	/**
 	 * Constructor for a new <code>HeaderFactory</code>.
@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.BaseFactory
 	 *
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @private
@@ -116,6 +116,8 @@ sap.ui.define([
 		if (bIsInDialog) {
 			// if card is in dialog - header shouldn't be focusable
 			oHeader.setProperty("focusable", false);
+			//if card is in a dialog - aria-level of the header should be 1
+			oHeader.setProperty("headingLevel", "1");
 		}
 
 		return oHeader;

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.120.7
+	 * @version 1.121.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.integration, shell-toolkit

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -13,6 +13,7 @@ sap.ui.define([
 	"sap/base/util/each",
 	"sap/base/util/isPlainObject",
 	"sap/base/util/isEmptyObject",
+	"sap/base/util/merge",
 	"sap/base/Log",
 	"./ParameterMap",
 	"sap/ui/integration/util/CardMerger"
@@ -25,6 +26,7 @@ sap.ui.define([
 	each,
 	isPlainObject,
 	isEmptyObject,
+	merge,
 	Log,
 	ParameterMap,
 	CardMerger
@@ -66,7 +68,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @private
@@ -123,12 +125,25 @@ sap.ui.define([
 	};
 
 	/**
-	 * @returns {Object} A copy of the Manifest JSON.
+	 * @returns {object} A copy of the manifest JSON.
 	 */
 	Manifest.prototype.getJson = function () {
 		return this._unfreeze(this.oJson);
 	};
 
+	/**
+	 * @returns {object} JSON, from which any unprocessable parts have been erased.
+	 */
+	Manifest.prototype.getProcessableJson = function () {
+		const oValue = deepExtend({}, this._oManifest.getRawJson());
+
+		if (oValue["sap.card"]?.type === "AdaptiveCard") {
+			delete oValue["sap.card"].content;
+		}
+
+		return this._unfreeze(oValue);
+	};
+
 	/**
 	 * @ui5-restricted
 	 * @private
@@ -274,7 +289,7 @@ sap.ui.define([
 		// the manifest which should be processed
 		var bHasTranslatable = false;
 
-		CoreManifest.processObject(this._oManifest.getJson(), function (oObject, sKey, vValue) {
+		CoreManifest.processObject(this.getProcessableJson(), function (oObject, sKey, vValue) {
 			if (!bHasTranslatable && vValue.match(REGEXP_TRANSLATABLE)) {
 				bHasTranslatable = true;
 			}
@@ -303,12 +318,12 @@ sap.ui.define([
 	Manifest.prototype.processManifest = function () {
 		var iCurrentLevel = 0,
 			iMaxLevel = 15,
-			//Always need the unprocessed manifest
-			oUnprocessedJson = deepExtend({}, this._oManifest.getRawJson()),
+			oValue = this.getProcessableJson(),
 			oDataSources = this.get(APP_DATA_SOURCES);
 
-		process(oUnprocessedJson, this.oResourceBundle, iCurrentLevel, iMaxLevel, this._oCombinedParams, oDataSources, this._oCombinedFilters);
-		this.setJson(oUnprocessedJson);
+		process(oValue, this.oResourceBundle, iCurrentLevel, iMaxLevel, this._oCombinedParams, oDataSources, this._oCombinedFilters);
+
+		this.setJson(merge(this.getJson(), oValue));
 	};
 
 	/**

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

@@ -4,7 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/core/Core",
+	"sap/ui/core/Lib",
 	"sap/ui/integration/util/BindingHelper",
 	"sap/ui/integration/util/BindingResolver",
 	"sap/ui/integration/util/Utils",
@@ -12,7 +12,7 @@ sap.ui.define([
 	"sap/m/IllustratedMessageSize",
 	"sap/base/Log"
 ], function (
-	Core,
+	Library,
 	BindingHelper,
 	BindingResolver,
 	Utils,
@@ -153,7 +153,7 @@ sap.ui.define([
 	 */
 	ManifestResolver._handleCardSevereError = function (oCard, oError) {
 		var oManifest = oCard.getManifestEntry("/"),
-			oResourceBundle = Core.getLibraryResourceBundle("sap.ui.integration");
+			oResourceBundle = Library.getResourceBundleFor("sap.ui.integration");
 
 		Log.error(oError, "sap.ui.integration.util.ManifestResolver");
 

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

@@ -5,10 +5,12 @@
  */
 
 sap.ui.define([
-	'sap/ui/core/Core',
+	"sap/base/i18n/Localization",
+	"sap/ui/core/Locale",
 	'sap/ui/core/date/UI5Date'
 ], function(
-	Core,
+	Localization,
+	Locale,
 	UI5Date
 ) {
 	"use strict";
@@ -54,7 +56,7 @@ sap.ui.define([
 	 */
 	function getLocale() {
 
-		return Core.getConfiguration().getLocale().toString();
+		return new Locale(Localization.getLanguageTag()).toString();
 	}
 
 	/**

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

@@ -4,19 +4,17 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
+	"sap/ui/core/Element",
 	"sap/ui/integration/util/DataProvider",
 	"sap/base/Log",
 	"sap/ui/model/odata/v4/ODataUtils",
-	"sap/ui/core/Core",
-	"sap/ui/core/Configuration",
 	"sap/base/util/fetch",
 	"sap/base/util/deepClone"
 ], function (
+	Element,
 	DataProvider,
 	Log,
 	ODataUtils,
-	Core,
-	Configuration,
 	fetch,
 	deepClone
 ) {
@@ -74,7 +72,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.DataProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @private
@@ -107,6 +105,12 @@ sap.ui.define([
 		}
 	});
 
+	RequestDataProvider.prototype.init = function () {
+		DataProvider.prototype.init.apply(this, arguments);
+
+		this._retryDueExpiredToken = false;
+	};
+
 	RequestDataProvider.prototype.destroy = function () {
 		if (this._iRetryAfterTimeout) {
 			clearTimeout(this._iRetryAfterTimeout);
@@ -121,9 +125,6 @@ sap.ui.define([
 
 	/**
 	 * @override
-	 * @private
-	 * @ui5-restricted sap.ui.integration, shell-toolkit
-	 * @returns {Promise} A promise resolved when the data is available and rejected in case of an error.
 	 */
 	RequestDataProvider.prototype.getData = function () {
 		var oRequestConfig = this.getSettings().request,
@@ -134,9 +135,7 @@ sap.ui.define([
 		}
 
 		if (this._oCsrfTokenHandler) {
-			pRequestChain = pRequestChain.then(function (oRequest) {
-				return this._oCsrfTokenHandler.resolveToken(oRequest);
-			}.bind(this));
+			pRequestChain = pRequestChain.then(this._oCsrfTokenHandler.replacePlaceholders.bind(this._oCsrfTokenHandler));
 		}
 
 		pRequestChain = pRequestChain.then(this._fetch.bind(this));
@@ -149,16 +148,22 @@ sap.ui.define([
 	};
 
 	RequestDataProvider.prototype._handleExpiredToken = function (oError) {
-		if (this._oCsrfTokenHandler.isExpiredToken(this.getLastResponse())) {
-			// csrf token has expired, reset the token and retry this whole request
-			this._oCsrfTokenHandler.resetTokenByRequest(this.getSettings().request);
+		if (!this._oCsrfTokenHandler.isExpiredToken(this.getLastResponse())) {
+			throw oError;
+		}
 
-			return this.getData().catch(function (oError) {
-				throw oError;
-			});
+		// csrf token has expired, reset the token and retry this whole request
+		this._oCsrfTokenHandler.setExpiredTokenByRequest(this.getConfiguration().request);
+
+		if (this._retryDueExpiredToken) {
+			this._retryDueExpiredToken = false;
+			throw oError;
 		}
 
-		throw oError;
+		this._retryDueExpiredToken = true;
+		this._bActive = false; // prevents another triggerDataUpdate()
+
+		return this._waitDependencies().then(this.getData.bind(this));
 	};
 
 	RequestDataProvider.prototype._fetch = function (oRequestConfig) {
@@ -354,9 +359,9 @@ sap.ui.define([
 	 * @returns {Function} The function to use for HTTP fetch.
 	 */
 	RequestDataProvider.prototype._getFetchMethod = function (oRequestSettings) {
-		var oCard = Core.byId(this.getCard()),
+		var oCard = Element.getElementById(this.getCard()),
 			oExtension = oCard && oCard.getAggregation("_extension"),
-			oHost = Core.byId(this.getHost());
+			oHost = Element.getElementById(this.getHost());
 
 		if (oExtension) {
 			return function (sResource, mOptions) {
@@ -485,8 +490,8 @@ sap.ui.define([
 	 * @returns {object} The modified request
 	 */
 	RequestDataProvider.prototype._modifyRequestBeforeSent = function (oRequest, oSettings) {
-		var oCard = Core.byId(this.getCard()),
-			oHost = Core.byId(this.getHost());
+		var oCard = Element.getElementById(this.getCard()),
+			oHost = Element.getElementById(this.getHost());
 
 		if (!oHost) {
 			return oRequest;

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.120.7
+	 * @version 1.121.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.120.7
+	 * @version 1.121.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.120.7
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * Utility class helping with JSON strings and formatters.
 	 *
 	 * @author SAP SE
-	 * @version 1.120.7
+	 * @version 1.121.0
 	 *
 	 * @private
 	 * @alias sap.ui.integration.util.Utils

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.120.7
+	 * @version 1.121.0
 	 *
 	 * @private
 	 * @alias sap.ui.integration.util.Validators