@openui5/sap.ui.integration 1.112.2 → 1.113.0

package/THIRDPARTY.txt

@@ -478,7 +478,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
-Component: SAP Theming Base Content, version: 11.1.48
+Component: SAP Theming Base Content, version: 11.2.1
 Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.integration",
-  "version": "1.112.2",
+  "version": "1.113.0",
   "description": "OpenUI5 UI Library sap.ui.integration",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,10 +14,10 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.112.2",
-    "@openui5/sap.f": "1.112.2",
-    "@openui5/sap.m": "1.112.2",
-    "@openui5/sap.ui.unified": "1.112.2",
-    "@openui5/sap.ui.layout": "1.112.2"
+    "@openui5/sap.ui.core": "1.113.0",
+    "@openui5/sap.f": "1.113.0",
+    "@openui5/sap.m": "1.113.0",
+    "@openui5/sap.ui.unified": "1.113.0",
+    "@openui5/sap.ui.layout": "1.113.0"
   }
 }

package/src/sap/ui/integration/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.112.2</version>
+  <version>1.113.0</version>
 
   <documentation>SAPUI5 library with integration-related controls.</documentation>
 

package/src/sap/ui/integration/ActionDefinition.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/integration/Designtime.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/integration/Extension.js

@@ -6,10 +6,12 @@
 sap.ui.define([
 	"sap/ui/integration/library",
 	"sap/base/Log",
-	"sap/ui/base/ManagedObject"
+	"sap/ui/base/ManagedObject",
+	"sap/base/util/fetch"
 ], function (library,
 			 Log,
-			 ManagedObject) {
+			 ManagedObject,
+			 fetch) {
 	"use strict";
 
 	/**
@@ -24,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 *
 	 * @constructor
 	 * @public
@@ -194,6 +196,28 @@ sap.ui.define([
 		return this._oCardInterface;
 	};
 
+	/**
+	 * Starts the process of fetching a resource from the network, returning a promise that is fulfilled once the response is available.
+	 * Use this method to override the default behavior when fetching network resources.
+	 * Mimics the browser native Fetch API.
+	 * @public
+	 * @experimental Since 1.113. The API might change.
+	 * @param {string} sResource This defines the resource that you wish to fetch.
+	 * @param {object} mOptions An object containing any custom settings that you want to apply to the request.
+	 * @param {object} mRequestSettings The map of request settings defined in the card manifest. Use this only for reading, they can not be modified.
+	 * @returns {Promise<Response>} A <code>Promise</code> that resolves to a <code>Response</code> object.
+	 */
+	Extension.prototype.fetch = function (sResource, mOptions, mRequestSettings) {
+		var oCard = this._oCard,
+			oHost = this._oCard.getHostInstance();
+
+		if (oHost) {
+			return oHost.fetch(sResource, mOptions, mRequestSettings, oCard);
+		} else {
+			return fetch(sResource, mOptions);
+		}
+	};
+
 	/**
 	 * Sets the card.
 	 *

package/src/sap/ui/integration/Host.js

@@ -6,10 +6,14 @@
 sap.ui.define([
 	"sap/ui/integration/library",
 	"sap/ui/core/Element",
-	"sap/ui/core/Configuration"
+	"sap/ui/core/Configuration",
+	"sap/base/util/fetch",
+	"sap/base/Log"
 ], function (library,
 			 Element,
-			 Configuration) {
+			 Configuration,
+			 fetch,
+			 Log) {
 		"use strict";
 		/*global navigator, URL*/
 
@@ -27,7 +31,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.112.2
+		 * @version 1.113.0
 		 *
 		 * @constructor
 		 * @public
@@ -141,8 +145,8 @@ sap.ui.define([
 							 * Example:
 							 * <pre>
 							 *  {
-							 *  	"/sap.card/configuration/filters/shipper/value": "key3",
-							 *  	"/sap.card/configuration/filters/item/value": "key2"
+							 *     "/sap.card/configuration/filters/shipper/value": "key3",
+							 *     "/sap.card/configuration/filters/item/value": "key2"
 							 *  }
 							 * </pre>
 							 */
@@ -403,7 +407,7 @@ sap.ui.define([
 		 * @returns {map} Map of http headers.
 		 * @private
 		 * @ui5-restricted
-	 	 * @experimental Since 1.91. The API might change.
+	 	 * @deprecated Since 1.113 Use Host.prototype.fetch instead.
 		 */
 		Host.prototype.modifyRequestHeaders = function (mHeaders, mSettings, oCard) {
 			if (this.bUseExperimentalCaching) {
@@ -416,13 +420,15 @@ sap.ui.define([
 		/**
 		 * Modifies the card HTTP data request before sending.
 		 * Override if you need to change the default data request behavior.
-		 * @param {map} mRequest The current request. In format for jQuery.ajax function.
+		 * @param {map} mRequest The current request.
+		 * @param {string} mRequest.url The request url.
+		 * @param {object} mRequest.options The request options in the same format as for the native Request object.
 		 * @param {map} mSettings The map of request settings defined in the card manifest.
 		 * @param {sap.ui.integration.widgets.Card} [oCard] Optional. The card for which the request is made.
 		 * @returns {map} The modified request.
 		 * @private
 		 * @ui5-restricted
-	 	 * @experimental Since 1.109. The API might change.
+		 * @deprecated Since 1.113 Use Host.prototype.fetch instead.
 		 */
 		Host.prototype.modifyRequest = function (mRequest, mSettings, oCard) {
 			var oUrl;
@@ -438,6 +444,23 @@ sap.ui.define([
 			return mRequest;
 		};
 
+		/**
+		 * Starts the process of fetching a resource from the network, returning a promise that is fulfilled once the response is available.
+		 * Use this method to override the default behavior when fetching network resources.
+		 * Mimics the browser native Fetch API.
+		 * @private
+		 * @ui5-restricted
+		 * @experimental Since 1.113. The API might change.
+		 * @param {string} sResource This defines the resource that you wish to fetch.
+		 * @param {object} mOptions An object containing any custom settings that you want to apply to the request.
+		 * @param {object} mRequestSettings The map of request settings defined in the card manifest. Use this only for reading, they can not be modified.
+		 * @param {sap.ui.integration.widgets.Card} oCard The card which initiated the request.
+		 * @returns {Promise<Response>} A <code>Promise</code> that resolves to a <code>Response</code> object.
+		 */
+		Host.prototype.fetch = function (sResource, mOptions, mRequestSettings, oCard) {
+			return fetch(sResource, mOptions);
+		};
+
 		/**
 		 * @private
 		 * @param {map} mHeaders The current map of headers.

package/src/sap/ui/integration/cards/AdaptiveContent.js

@@ -37,7 +37,7 @@ sap.ui.define([
 		 * @extends sap.ui.integration.cards.BaseContent
 		 *
 		 * @author SAP SE
-		 * @version 1.112.2
+		 * @version 1.113.0
 		 *
 		 * @constructor
 		 * @private
@@ -61,23 +61,22 @@ sap.ui.define([
 		AdaptiveContent.prototype.init = function () {
 			BaseContent.prototype.init.apply(this, arguments);
 
+			this.awaitEvent("_adaptiveCardElementsReady");
 			//workaround until actions refactor
 			this.fireEvent("_actionContentReady"); // todo
 			this.setComponentsReady(false);
-			this._bAdaptiveCardElementsReady = false;
 			this._setupCardContent();
 		};
 
 		AdaptiveContent.prototype.onAfterRendering = function () {
-			this._renderMSCardContent(this._oCardTemplate || this._oCardConfig);
+			this._renderMSCardContent(this._oCardTemplate || this.getConfiguration());
 		};
 
 		/**
 		 * @override
 		 */
 		AdaptiveContent.prototype.loadDependencies = function (oCardManifest) {
-			this._loadWebcomponents();
-			var aPromises = [];
+			var aPromises = [this._loadWebcomponents()];
 
 			// load adaptivecards and modules that depend on it here
 			aPromises.push(new Promise(function (resolve, reject) {
@@ -147,13 +146,10 @@ sap.ui.define([
 		};
 
 		/**
-		 * Setter for configuring a <code>sap.ui.integration.cards.AdaptiveContent</code>.
-		 *
-		 * @public
-		 * @param {Object} oConfiguration Configuration object used to create Adaptive card.
+		 * @override
 		 */
-		AdaptiveContent.prototype.setConfiguration = function (oConfiguration) {
-			this._oCardConfig = oConfiguration;
+		AdaptiveContent.prototype.applyConfiguration = function () {
+			var oConfiguration = this.getConfiguration();
 
 			// if oConfiguration.request is present, load the adaptive card manifest from url
 			if (oConfiguration && oConfiguration.request && oConfiguration.request.url) {
@@ -165,10 +161,6 @@ sap.ui.define([
 			this._setupMSCardContent();
 		};
 
-		AdaptiveContent.prototype.getConfiguration = function () {
-			return this._oCardConfig;
-		};
-
 		AdaptiveContent.prototype.onThemeChanged = function () {
 			if (this.getDomRef() && AdaptiveCards) {
 				this._adjustHostConfig();
@@ -210,7 +202,7 @@ sap.ui.define([
 			oData.loadData(sUrl)
 				.then(function () {
 					// set the data from the url as a card config
-					that._oCardConfig = Object.assign(that._oCardConfig, oData.getData());
+					that.setConfiguration(Object.assign(that.getConfiguration(), oData.getData()));
 				}).then(function () {
 					that._handleMarkDown();
 					that._setupMSCardContent();
@@ -219,9 +211,12 @@ sap.ui.define([
 					oData.destroy();
 					oData = null;
 				}).catch(function () {
+					this.fireEvent("_dataReady");
+					this.fireEvent("_adaptiveCardElementsReady");
+
 					// notify the user that the provided URL is not correct
 					Log.error("No JSON file found on this URL. Please provide a correct path to the JSON-serialized card object model file.");
-				});
+				}.bind(this));
 		};
 
 		/**
@@ -358,7 +353,7 @@ sap.ui.define([
 		 * @private
 		 */
 		AdaptiveContent.prototype._setupMSCardContent = function () {
-			var oConfiguration = this._oCardConfig,
+			var oConfiguration = this.getConfiguration(),
 				oContentTemplateData,
 				oCardDataProvider = this._oCardDataProvider;
 
@@ -398,9 +393,8 @@ sap.ui.define([
 				oData = this.getModel().getProperty(sPath);
 
 			// Аttaches the data with the card template
-			this._oCardTemplate = this._setTemplating(this._oCardConfig, oData);
-			// Marks the loading as finished manually, because hideLoadingPlaceholders() is called too early in this case
-			this.getAggregation("_loadingProvider").setLoading(false);
+			this._oCardTemplate = this._setTemplating(this.getConfiguration(), oData);
+
 			// Re-renders the card with the new data
 			this.invalidate();
 		};
@@ -422,8 +416,8 @@ sap.ui.define([
 			if (this.adaptiveCardInstance && oCard && oDom.length) {
 				this.adaptiveCardInstance.parse(oCard);
 				oDom.html(this.adaptiveCardInstance.render());
-				this._bAdaptiveCardElementsReady = true;
-				this._fireCardReadyEvent();
+
+				this.fireEvent("_adaptiveCardElementsReady");
 
 				// avoid additional tab stop
 				if (this.adaptiveCardInstance.renderedElement) {
@@ -432,13 +426,6 @@ sap.ui.define([
 			}
 		};
 
-		AdaptiveContent.prototype._fireCardReadyEvent = function () {
-			if (this._bAdaptiveCardElementsReady && this.getComponentsReady()) {
-				this._bReady = true;
-				this.fireReady();
-			}
-		};
-
 		/**
 		 * Connects the template object with the data.
 		 *
@@ -468,24 +455,27 @@ sap.ui.define([
 		AdaptiveContent.prototype._loadWebcomponents = function () {
 			if (this.getComponentsReady()) {
 				Log.debug("WebComponents were already loaded");
-				this._fireCardReadyEvent();
 
-				return;
+				return Promise.resolve();
 			}
 
-			// Thе timeout is needed to delay the check if UI5 WebComponents gets loaded from elsewhere.
-			// This detection relies on the assumption that there's the full bundle and the ui5-button is present.
-			setTimeout(function(){
-				if (!window.customElements.get("ui5-button")) {
+			return new Promise(function (resolve, reject) {
+				// Thе timeout is needed to delay the check if UI5 WebComponents gets loaded from elsewhere.
+				// This detection relies on the assumption that there's the full bundle and the ui5-button is present.
+				setTimeout(function(){
+					if (window.customElements.get("ui5-button")) {
+						resolve();
+						return;
+					}
+
 					includeScript({
 						id: "webcomponents-bundle",
 						attributes: {type: "module"},
 						url: sap.ui.require.toUrl("sap/ui/integration/thirdparty/webcomponents/bundle.esm.js")
-					});
-				}
-
+					}).then(resolve);
+				});
+			}).then(function () {
 				this.setComponentsReady(true);
-				this._fireCardReadyEvent();
 			}.bind(this));
 		};
 

package/src/sap/ui/integration/cards/AnalyticalContent.js

@@ -6,6 +6,7 @@
 sap.ui.define([
 	"./AnalyticalContentRenderer",
 	"./BaseContent",
+	"sap/m/IllustratedMessageType",
 	"sap/ui/integration/library",
 	"sap/ui/integration/util/BindingResolver",
 	"sap/base/Log",
@@ -14,6 +15,7 @@ sap.ui.define([
 ], function (
 	AnalyticalContentRenderer,
 	BaseContent,
+	IllustratedMessageType,
 	library,
 	BindingResolver,
 	Log,
@@ -88,7 +90,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseContent
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 *
 	 * @constructor
 	 * @private
@@ -146,15 +148,22 @@ sap.ui.define([
 	AnalyticalContent.prototype.onDataChanged = function () {
 		this._createChart();
 		var oChart = this.getAggregation("_content");
+
 		if (oChart) {
 			var vizDS = oChart._getVizDataset(),
-				noData = vizDS
+				bHasData = vizDS
 					&& vizDS._FlatTableD
 					&& vizDS._FlatTableD._data
 					&& Array.isArray(vizDS._FlatTableD._data)
-					&& (!vizDS._FlatTableD._data.length);
-			if (noData) {
-				this.getParent()._handleError("No data available", true);
+					&& vizDS._FlatTableD._data.length;
+
+			if (bHasData) {
+				this.destroyAggregation("_noDataMessage");
+			} else {
+				this.showNoDataMessage({
+					type: IllustratedMessageType.NoEntries,
+					title: this.getCardInstance().getTranslatedText("CARD_NO_ITEMS_ERROR_LISTS")
+				});
 			}
 		}
 	};

package/src/sap/ui/integration/cards/AnalyticsCloudContent.js

@@ -10,8 +10,16 @@ sap.ui.define([
 	"sap/ui/integration/library",
 	"sap/ui/core/HTML",
 	"sap/ui/integration/util/BindingResolver",
+	"sap/m/IllustratedMessageType",
 	"sap/base/Log"
-], function (AnalyticsCloudContentRenderer, BaseContent, library, HTML, BindingResolver, Log) {
+], function (
+	AnalyticsCloudContentRenderer,
+	BaseContent,
+	library,
+	HTML,
+	BindingResolver,
+	IllustratedMessageType,
+	Log) {
 	"use strict";
 
 	var ActionArea = library.CardActionArea;
@@ -30,7 +38,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseContent
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 *
 	 * @constructor
 	 * @private
@@ -83,11 +91,10 @@ sap.ui.define([
 	};
 
 	/**
-	 * @inheritdoc
+	 * @override
 	 */
-	AnalyticsCloudContent.prototype.setConfiguration = function (oConfiguration) {
-		BaseContent.prototype.setConfiguration.apply(this, arguments);
-		oConfiguration = this.getParsedConfiguration();
+	AnalyticsCloudContent.prototype.applyConfiguration = function () {
+		var oConfiguration = this.getParsedConfiguration();
 
 		//workaround until actions refactor
 		this.fireEvent("_actionContentReady");
@@ -145,7 +152,11 @@ sap.ui.define([
 
 		// is Highcharts library available
 		if (!window.Highcharts) {
-			this.handleError("There was a problem with loading Highcharts library. Could not initialize AnalyticsCloud card content.");
+			this.handleError({
+				type: IllustratedMessageType.ErrorScreen,
+				title: oCard.getTranslatedText("CARD_DATA_LOAD_ERROR"),
+				description: oCard.getTranslatedText("CARD_ERROR_HIGHCHARTS_DESCRIPTION")
+			});
 			return;
 		}