@openui5/sap.ui.integration 1.115.0 → 1.116.0

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

@@ -6,6 +6,7 @@
 
 sap.ui.define([
 	"sap/ui/base/Object",
+	"sap/base/util/LoaderExtensions",
 	"sap/ui/core/Manifest",
 	"sap/base/util/deepClone",
 	"sap/base/util/deepExtend",
@@ -17,6 +18,7 @@ sap.ui.define([
 	"sap/ui/integration/util/CardMerger"
 ], function (
 	BaseObject,
+	LoaderExtensions,
 	CoreManifest,
 	deepClone,
 	deepExtend,
@@ -64,7 +66,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @private
@@ -75,6 +77,7 @@ sap.ui.define([
 		constructor: function (sSection, oManifestJson, sBaseUrl, aChanges) {
 			BaseObject.call(this);
 
+			this._sBaseUrl = sBaseUrl;
 			this._aChanges = aChanges;
 			this._sSection = sSection;
 
@@ -91,11 +94,12 @@ sap.ui.define([
 
 				if (sBaseUrl) {
 					mOptions.baseUrl = sBaseUrl;
-					this._sBaseUrl = sBaseUrl;
 				} else {
-					Log.warning("If no base URL is provided when the manifest is an object static resources cannot be loaded.");
+					Log.error("If baseUrl is not provided when the manifest is an object, the relative resources cannot be loaded.", "sap.ui.integration.widgets.Card");
 				}
 
+				this._registerManifestModulePath(oManifestJson, sBaseUrl || "/");
+
 				if (this._aChanges) {
 					oMergedManifest = this.mergeDeltaChanges(oManifestJson);
 				} else {
@@ -230,7 +234,8 @@ sap.ui.define([
 			manifestUrl: mSettings.manifestUrl,
 			async: true,
 			processJson: function (oManifestJson) {
-
+				var sModuleBaseUrl = this._sBaseUrl || mSettings.manifestUrl.replace(/\/+[^\/]*$/, "") || "/";
+				this._registerManifestModulePath(oManifestJson, sModuleBaseUrl);
 				this._oInitialJson = deepClone(oManifestJson, 500);
 
 				if (this._aChanges) {
@@ -618,5 +623,15 @@ sap.ui.define([
 		return aResult;
 	};
 
+	Manifest.prototype._registerManifestModulePath = function (oManifestJson, sBaseUrl) {
+		var sAppId = oManifestJson && oManifestJson["sap.app"] && oManifestJson["sap.app"].id;
+
+		if (!sAppId) {
+			return;
+		}
+
+		LoaderExtensions.registerResourcePath(sAppId.replace(/\./g, "/"), sBaseUrl);
+	};
+
 	return Manifest;
 });

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.115.0
+	 * @version 1.116.0
 	 *
 	 * @constructor
 	 * @private
@@ -261,7 +261,11 @@ sap.ui.define([
 
 				return oResponse.text().then(function (vData) {
 					if (isJsonResponse(oResponse)) {
-						vData = JSON.parse(vData !== "" ? vData : null);
+						try {
+							vData = JSON.parse(vData);
+						} catch (oError) {
+							return Promise.reject([oError.toString(), null, null, oRequest]);
+						}
 					} else if (isXmlResponse(oResponse)) {
 						vData = (new window.DOMParser()).parseFromString(vData, "text/xml");
 					}

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

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

@@ -183,7 +183,7 @@ sap.ui.define([
 	 * @extends sap.f.CardBase
 	 *
 	 * @author SAP SE
-	 * @version 1.115.0
+	 * @version 1.116.0
 	 * @public
 	 * @constructor
 	 * @see {@link topic:5b46b03f024542ba802d99d67bc1a3f4 Cards}
@@ -236,7 +236,8 @@ 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.
+				 * 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.
 				 * @experimental Since 1.70
 				 * @since 1.70
 				 */
@@ -532,6 +533,8 @@ sap.ui.define([
 			this._bDataReady = true;
 		}.bind(this);
 
+		this._fireStateChangedBound = this._fireStateChanged.bind(this);
+
 		/**
 		 * Facade of the {@link sap.ui.integration.widgets.Card} control.
 		 * @interface
@@ -539,7 +542,7 @@ sap.ui.define([
 		 * @experimental since 1.79
 		 * @public
 		 * @author SAP SE
-		 * @version 1.115.0
+		 * @version 1.116.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
@@ -843,7 +846,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Instantiates a Card Manifest and applies it.
+	 * Instantiates a card manifest and applies it.
 	 *
 	 * @private
 	 * @param {object|string} vManifest The manifest URL or the manifest JSON.
@@ -876,6 +879,10 @@ sap.ui.define([
 					throw new Error(CARD_DESTROYED_ERROR);
 				}
 
+				if (!this._oCardManifest.get("/sap.app/id")) {
+					this._logSevereError("Card sap.app/id entry in the manifest is mandatory");
+				}
+
 				return this._oCardManifest.loadDependenciesAndIncludes();
 			}.bind(this))
 			.then(function () {
@@ -884,7 +891,6 @@ sap.ui.define([
 				}
 
 				Measurement.end(this._sPerformanceId + "initManifest");
-				this._registerManifestModulePath();
 				this._isManifestReady = true;
 				this.fireManifestReady();
 
@@ -1219,10 +1225,10 @@ sap.ui.define([
 		this.resetPaginator();
 	};
 
-	/*
-	* @private
-	* @ui5-restricted sap.ui.integration
-	* */
+	/**
+	 * @private
+	 * @ui5-restricted sap.ui.integration
+	 */
 	Card.prototype.refreshAllData = function () {
 		var oHeader = this.getCardHeader(),
 			oContent = this.getCardContent(),
@@ -1287,6 +1293,7 @@ sap.ui.define([
 		this._oIntegrationRb = null;
 		this._aActiveLoadingProviders = null;
 		this._oContentMessage = null;
+		clearTimeout(this._iFireStateChangedCallId);
 
 		if (this._oActionsToolbar) {
 			this._oActionsToolbar.destroy();
@@ -1362,22 +1369,6 @@ sap.ui.define([
 		this._setLoadingProviderState(false);
 	};
 
-	/**
-	 * Registers the manifest ID as a module path.
-	 */
-	Card.prototype._registerManifestModulePath = function () {
-		if (!this._oCardManifest) {
-			return;
-		}
-
-		this._sAppId = this._oCardManifest.get("/sap.app/id");
-		if (this._sAppId) {
-			LoaderExtensions.registerResourcePath(this._sAppId.replace(/\./g, "/"), this._oCardManifest.getUrl() || "/");
-		} else {
-			this._logSevereError("Card sap.app/id entry in the manifest is mandatory");
-		}
-	};
-
 	/**
 	 * Overwrites getter for card manifest.
 	 *
@@ -1551,7 +1542,7 @@ sap.ui.define([
 
 		if (oContent) {
 			oContent.showBlockingMessage(oSettings);
-			this._fireStateChanged();
+			this.scheduleFireStateChanged();
 		}
 	};
 
@@ -1642,7 +1633,7 @@ sap.ui.define([
 	 * Absolute paths are not changed.
 	 *
 	 * @example
-	 * oCard.getRuntimeUrl("images/Avatar.png") === "sample/card/images/Avatar.png"
+	 * oCard.getRuntimeUrl("images/Avatar.png") === "{cardBaseUrl}/images/Avatar.png"
 	 * oCard.getRuntimeUrl("http://www.someurl.com/Avatar.png") === "http://www.someurl.com/Avatar.png"
 	 * oCard.getRuntimeUrl("https://www.someurl.com/Avatar.png") === "https://www.someurl.com/Avatar.png"
 	 *
@@ -1651,7 +1642,7 @@ sap.ui.define([
 	 * @returns {string} The resolved URL.
 	 */
 	Card.prototype.getRuntimeUrl = function (sUrl) {
-		var sAppId = this._sAppId,
+		var sAppId = this._oCardManifest ? this._oCardManifest.get("/sap.app/id") : null,
 			sAppName,
 			sSanitizedUrl = sUrl && sUrl.trim().replace(/^\//, "");
 
@@ -2029,7 +2020,6 @@ sap.ui.define([
 				serviceManager: this._oServiceManager,
 				dataProviderFactory: this._oDataProviderFactory,
 				iconFormatter: this._oIconFormatter,
-				appId: this._sAppId,
 				noDataConfiguration: this._oCardManifest.get(MANIFEST_PATHS.NO_DATA_MESSAGES)
 			});
 		} catch (e) {
@@ -2594,6 +2584,23 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Schedules to fire the stateChanged event. If called multiple times in the same tick, only one stateChanged will be fired.
+	 * @private
+	 * @ui5-restricted sap.ui.integration
+	 */
+	Card.prototype.scheduleFireStateChanged = function () {
+		if (this._iFireStateChangedCallId) {
+			clearTimeout(this._iFireStateChangedCallId);
+		}
+
+		this._iFireStateChangedCallId = setTimeout(this._fireStateChangedBound, 0);
+	};
+
+	/**
+	 * Fires the stateChanged event of the card and of the host if any.
+	 * @private
+	 */
 	Card.prototype._fireStateChanged = function () {
 		var oHostInstance = this.getHostInstance();
 
@@ -2610,9 +2617,31 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Fires the initial ready event of the card and of the host if any.
+	 * This ready event is fired only once and will not be fired consecutively, even if the card is fully refreshed.
+	 * @private
+	 */
+	Card.prototype._fireInitialized = function () {
+		if (this._bInitializedFired) {
+			return;
+		}
+
+		var oHostInstance = this.getHostInstance();
+
+		this.fireEvent("_initialized");
+		this._bInitializedFired = true;
+
+		if (oHostInstance) {
+			oHostInstance.fireCardInitialized({
+				card: this
+			});
+		}
+	};
+
 	Card.prototype._fireDataChange = function () {
 		this.fireEvent("_dataChange");
-		this._fireStateChanged();
+		this.scheduleFireStateChanged();
 	};
 
 	Card.prototype._fireContentDataChange = function () {
@@ -2625,7 +2654,8 @@ sap.ui.define([
 		this._setActionButtonsEnabled(true);
 		this._validateContentControls(false, true);
 		this.fireEvent("_ready");
-		this._fireStateChanged();
+		this._fireInitialized();
+		this.scheduleFireStateChanged();
 	};
 
 	/**