@openui5/sap.ui.integration 1.121.1 → 1.122.0

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

@@ -10,14 +10,16 @@ sap.ui.define([
 	"sap/base/strings/formatMessage",
 	'sap/base/util/isPlainObject',
 	"sap/base/Log",
-	"sap/ui/core/date/UI5Date"
+	"sap/ui/core/date/UI5Date",
+	"sap/base/i18n/Localization"
 ], function (
 	getCompatibilityVersion,
 	Locale,
 	formatMessage,
 	isPlainObject,
 	Log,
-	UI5Date
+	UI5Date,
+	Localization
 ) {
 	"use strict";
 
@@ -25,13 +27,55 @@ sap.ui.define([
 	 * Utility class helping with JSON strings and formatters.
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 *
 	 * @private
 	 * @alias sap.ui.integration.util.Utils
 	 */
 	var Utils = { };
 
+	/**
+	 * Currently WZ language list does not match the one used by Card Editor
+	 * Need to mapping the different languages
+	 * key/value:  language_code_in_WZ/language_code_in_CE
+	 * NOTES: skip the languages which does not match between Card Editor and UI5, eg: cy-GB/cy, nb-NO/no, sr-RS/sh
+	 */
+	Utils.languageMapping = {
+		//"cy": "cy-GB",
+		"da-DK": "da",
+		"hi-IN": "hi",
+		"hu-HU": "hu",
+		"id-ID": "id",
+		"ms-MY": "ms",
+		"nl-NL": "nl",
+		//"no-NO": "nb-NO",
+		"pl-PL": "pl",
+		"ro-RO": "ro",
+		//"sh": "sr-RS",
+		"th-TH": "th"
+	};
+
+	/**
+	 * Get localization language
+	 * @returns {string} language code
+	 */
+	Utils.getLocalizationLanguage = function() {
+		var language = Localization.getLanguage().replaceAll('_', '-');
+		return Utils.languageMapping[language] || language;
+	};
+
+	Utils._language = Utils.getLocalizationLanguage();
+
+	/**
+	 * Refresh language
+	 */
+	Utils.refreshLocalizationLanguage = function() {
+		Utils._language = Utils.getLocalizationLanguage();
+	};
+
+	// listen to localizationChange event and update Utils._language
+	Localization.attachChange(Utils.refreshLocalizationLanguage);
+
 	/**
 	 * Check if given string is a JSON.
 	 * @param {string} sText The text to be tested.
@@ -211,6 +255,10 @@ sap.ui.define([
 		return vData;
 	};
 
+	/**
+	 * @deprecated As of version 1.119
+	 * @returns {boolean} Whether binding syntax is complex.
+	 */
 	Utils.isBindingSyntaxComplex = function () {
 		if (Utils._isBindingSyntaxComplex === undefined) {
 			Utils._isBindingSyntaxComplex = getCompatibilityVersion("sapCoreBindingSyntax").compareTo("1.26") >= 0;

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

package/src/sap/ui/integration/widgets/Card.js

@@ -176,7 +176,7 @@ sap.ui.define([
 	 * @extends sap.f.CardBase
 	 *
 	 * @author SAP SE
-	 * @version 1.121.1
+	 * @version 1.122.0
 	 * @public
 	 * @constructor
 	 * @see {@link topic:5b46b03f024542ba802d99d67bc1a3f4 Cards}
@@ -231,6 +231,7 @@ sap.ui.define([
 				/**
 				 * Defines the base URL of the card manifest. It should be used when manifest property is an object instead of a URL.
 				 * If both manifest URL and base URL are defined - the base URL will be used for loading dependencies.
+				 * If both manifest URL and base URL are not defined - relative resources might not be loaded correctly.
 				 * @experimental Since 1.70
 				 * @since 1.70
 				 */
@@ -544,7 +545,7 @@ sap.ui.define([
 		 * @experimental since 1.79
 		 * @public
 		 * @author SAP SE
-		 * @version 1.121.1
+		 * @version 1.122.0
 		 * @borrows sap.ui.integration.widgets.Card#getDomRef as getDomRef
 		 * @borrows sap.ui.integration.widgets.Card#setVisible as setVisible
 		 * @borrows sap.ui.integration.widgets.Card#getParameters as getParameters
@@ -716,13 +717,12 @@ sap.ui.define([
 	 * @private
 	 */
 	Card.prototype.onBeforeRendering = function () {
-
 		var oCardContent = this.getCardContent();
 		if (oCardContent && oCardContent.isA("sap.ui.integration.cards.BaseContent")) {
 			oCardContent.setDesign(this.getDesign());
 		}
 
-		if (this.getDataMode() !== CardDataMode.Active) {
+		if (this._getActualDataMode() !== CardDataMode.Active) {
 			return;
 		}
 
@@ -746,7 +746,7 @@ sap.ui.define([
 
 		var oCardDomRef = this.getDomRef();
 
-		if (this.getDataMode() === CardDataMode.Auto) {
+		if (this._getActualDataMode() === CardDataMode.Auto) {
 			this._oCardObserver.observe(oCardDomRef);
 		} else {
 			this._oCardObserver.unobserve(oCardDomRef);
@@ -761,6 +761,9 @@ sap.ui.define([
 	 * @ui5-restricted
 	 */
 	Card.prototype.startManifestProcessing = function () {
+		/**
+		 * @deprecated As of version 1.119
+		 */
 		if (!Utils.isBindingSyntaxComplex()) {
 			this._logSevereError(
 				"Cannot parse manifest. Complex binding syntax is not enabled - " +
@@ -1164,7 +1167,7 @@ sap.ui.define([
 	 * @experimental Since 1.65. The API might change.
 	 */
 	Card.prototype.refresh = function () {
-		if (this.getDataMode() === CardDataMode.Active) {
+		if (this._getActualDataMode() === CardDataMode.Active) {
 			this._bApplyManifest = true;
 			this.invalidate();
 		}
@@ -2070,7 +2073,7 @@ sap.ui.define([
 		this.destroyAggregation("_content");
 		this._ariaText.setText(sAriaText);
 
-		if (!oContentManifest || this.isTileDisplayVariant()) {
+		if (this._shouldIgnoreContent()) {
 			this.fireEvent("_contentReady");
 			return;
 		}
@@ -2113,6 +2116,33 @@ sap.ui.define([
 		return aTileVariants.indexOf(this.getDisplayVariant()) > -1;
 	};
 
+	/**
+	 * Checks if this is a Component Card. Manifest must be loaded for that check.
+	 * @private
+	 * @returns {boolean} True if this is a Component Card.
+	 */
+	Card.prototype._isComponentCard = function () {
+		const sCardType = this._oCardManifest.get(MANIFEST_PATHS.TYPE);
+
+		return sCardType?.toLowerCase() === "component";
+	};
+
+	/**
+	 * Checks if the content section should be ignored.
+	 * @private
+	 * @returns {boolean} True if the content section should be ignored.
+	 */
+	Card.prototype._shouldIgnoreContent = function () {
+		if (this._isComponentCard()) {
+			return false;
+		}
+
+		const bIsTile = this.isTileDisplayVariant();
+		const bHasNoContent = !this._oCardManifest.get(MANIFEST_PATHS.CONTENT);
+
+		return bIsTile || bHasNoContent;
+	};
+
 	Card.prototype.createHeader = function () {
 		var oManifestHeader = this._oCardManifest.get(MANIFEST_PATHS.HEADER),
 			oHeaderFactory = new HeaderFactory(this);
@@ -2144,7 +2174,7 @@ sap.ui.define([
 
 	Card.prototype.getContentManifest = function () {
 		var sCardType = this._oCardManifest.get(MANIFEST_PATHS.TYPE),
-			bIsComponent = sCardType && sCardType.toLowerCase() === "component",
+			bIsComponent = this._isComponentCard(),
 			oContentManifest = this._oCardManifest.get(MANIFEST_PATHS.CONTENT),
 			bHasContent = !!oContentManifest;
 
@@ -2203,8 +2233,6 @@ sap.ui.define([
 	 */
 	Card.prototype._handleError = function (mErrorInfo) {
 		var sLogMessage = mErrorInfo.requestErrorParams ? mErrorInfo.requestErrorParams.message : mErrorInfo.title,
-			oContentSection = this._oCardManifest.get(MANIFEST_PATHS.CONTENT),
-			bIsComponentCard = this._oCardManifest.get(MANIFEST_PATHS.TYPE) === "Component",
 			oContent = this.getCardContent(),
 			mMessageSettings;
 
@@ -2217,7 +2245,7 @@ sap.ui.define([
 			mMessageSettings = ErrorHandler.configureErrorInfo(mErrorInfo, this);
 		}
 
-		if (!this.isTileDisplayVariant() && (oContentSection || bIsComponentCard)) {
+		if (!this._shouldIgnoreContent()) {
 			if (oContent && oContent.isA("sap.ui.integration.cards.BaseContent")) {
 				this.showBlockingMessage(mMessageSettings);
 			} else { // case where error ocurred during content creation
@@ -2472,7 +2500,11 @@ sap.ui.define([
 		return this.processDestinations(oConfiguration).then((oResult) => {
 			return new Promise((resolve, reject) => {
 				this._oDataProviderFactory
-				.create({ request: oResult })
+				.create({ request: oResult },
+					undefined,
+					undefined,
+					undefined,
+					true)
 				.setAllowCustomDataType(true)
 				.attachDataChanged((e) => { resolve(e.getParameter("data")); })
 				.attachError((e) => { reject([e.getParameter("message"), e.getParameter("response"), e.getParameter("responseText"), e.getParameter("settings")]); })
@@ -2949,7 +2981,6 @@ sap.ui.define([
 			sBaseUrl = oParameters.baseUrl,
 			oData = oParameters.data,
 			oChildCard = this._createCard({
-				width: oParameters.width,
 				host: this.getHostInstance(),
 				parameters: oParameters.parameters,
 				referenceId: this.getReferenceId()
@@ -3025,5 +3056,15 @@ sap.ui.define([
 		}
 	};
 
+	Card.prototype._getActualDataMode = function () {
+		var sDataMode = this.getDataMode();
+
+		if (sDataMode === CardDataMode.Auto && this._oCardObserver.isIntersected()) {
+			return CardDataMode.Active;
+		}
+
+		return sDataMode;
+	};
+
 	return Card;
 });