@openui5/sap.ui.integration 1.104.0 → 1.105.0

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

@@ -3,8 +3,13 @@
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-sap.ui.define(["sap/ui/base/ManagedObject"],
-	function (ManagedObject) {
+sap.ui.define([
+	"sap/ui/base/ManagedObject",
+	"sap/ui/performance/Measurement"
+], function (
+	ManagedObject,
+	Measurement
+) {
 	"use strict";
 
 	/**
@@ -24,7 +29,7 @@ sap.ui.define(["sap/ui/base/ManagedObject"],
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @private
@@ -87,10 +92,20 @@ sap.ui.define(["sap/ui/base/ManagedObject"],
 						message : { type : "string" }
 					}
 				}
+			},
+			associations: {
+				card: {
+					type : "sap.ui.integration.widgets.Card",
+					multiple: false
+				}
 			}
 		}
 	});
 
+	DataProvider.prototype.init = function () {
+		this._iCurrentRequestNumber = 0;
+	};
+
 	/**
 	 * Sets the destinations resolver
 	 *
@@ -191,13 +206,30 @@ sap.ui.define(["sap/ui/base/ManagedObject"],
 
 	DataProvider.prototype._triggerDataUpdate = function () {
 		this._bActive = true;
+		this._iCurrentRequestNumber++;
+		var oGetDataMeasurement;
+
+		if (this.getCard()) {
+			oGetDataMeasurement = Measurement.start(
+				"UI5 Integration Cards - " + this.getCard() +  "-" + this.getId() + "---getData#" + this._iCurrentRequestNumber,
+				this.getDetails()
+			);
+		}
 
 		return this.getData()
 			.then(function (oData) {
+				if (oGetDataMeasurement) {
+					Measurement.end(oGetDataMeasurement.id);
+				}
+
 				this.fireDataChanged({data: oData});
 				this.onDataRequestComplete();
 			}.bind(this))
 			.catch(function (oResult) {
+				if (oGetDataMeasurement) {
+					Measurement.end(oGetDataMeasurement.id);
+				}
+
 				if (Array.isArray(oResult) && oResult.length > 0) {
 					this.fireError({message: oResult[0], jqXHR: oResult[1]});
 				} else {
@@ -244,7 +276,6 @@ sap.ui.define(["sap/ui/base/ManagedObject"],
 	};
 
 	DataProvider.prototype.onDataRequestComplete = function () {
-
 		var iInterval;
 
 		if (!this._oSettings || !this._oSettings.updateInterval) {
@@ -291,5 +322,13 @@ sap.ui.define(["sap/ui/base/ManagedObject"],
 		return Promise.all(aPromises);
 	};
 
+	/**
+	 * @protected
+	 * @returns {string} Details about the provider, to be used for logging.
+	 */
+	DataProvider.prototype.getDetails = function () {
+		return "Static JSON data provided in the manifest.";
+	};
+
 	return DataProvider;
 });

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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * When destroyed, all data providers created by this class are also destroyed.
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.integration, shell-toolkit
@@ -140,14 +140,10 @@ sap.ui.define([
 
 		if (oDataSettings.request && bUseExperimentalCaching) {
 			oDataProvider = new CacheAndRequestDataProvider(oConfig);
-			oDataProvider.setCard(oCard);
 			oDataProvider.setHost(oHost);
 		} else if (oDataSettings.request) {
 			oDataProvider = new RequestDataProvider(oConfig);
 
-			if (oCard) {
-				oDataProvider.setCard(oCard);
-			}
 			if (oHost) {
 				oDataProvider.setHost(oHost);
 			}
@@ -162,6 +158,7 @@ sap.ui.define([
 		}
 
 		if (oCard) {
+			oDataProvider.setCard(oCard);
 			BindingHelper.propagateModels(oCard, oDataProvider);
 		} else if (oEditor) {
 			BindingHelper.propagateModels(oEditor, oDataProvider);

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

@@ -7,13 +7,11 @@
 sap.ui.define([
 	"sap/ui/base/Object",
 	"sap/base/Log",
-	"sap/base/util/deepExtend",
 	"sap/base/util/isPlainObject",
 	"sap/ui/integration/util/Utils"
 ], function (
 	BaseObject,
 	Log,
-	deepExtend,
 	isPlainObject,
 	Utils
 ) {
@@ -31,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @param {sap.ui.integration.Host} oHost The Host which will be used for resolving destinations.

package/src/sap/ui/integration/util/ExtensionDataProvider.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.104.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @private
@@ -57,5 +57,12 @@ sap.ui.define(["sap/ui/integration/util/DataProvider"], function (DataProvider)
 		return this._oExtension[oExtensionSettings.method].apply(this._oExtension, oExtensionSettings.args);
 	};
 
+	/**
+ 	 * @override
+ 	 */
+	ExtensionDataProvider.prototype.getDetails = function () {
+		return "Load data from Extension. Method: " + this.getSettings().extension.method;
+	};
+
 	return ExtensionDataProvider;
 });

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.BaseFactory
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.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.104.0
+	 * @version 1.105.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.integration, shell-toolkit

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

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @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.104.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -41,6 +41,10 @@ sap.ui.define([
 	};
 
 	ManifestResolver._awaitReadyEvent = function (oCard) {
+		if (oCard.isReady()) {
+			return Promise.resolve(oCard);
+		}
+
 		return new Promise(function (resolve, reject) {
 			oCard.attachEvent("_ready", function (e) {
 				resolve(oCard);

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

@@ -75,6 +75,20 @@ sap.ui.define([
 		return sPlaceholder;
 	};
 
+	ParameterMap.getParamsForModel = function () {
+
+		var oParameters = {};
+
+		for (var parameter in mParameters) {
+
+			var iIndexStart = parameter.indexOf("."),
+			iIndexEnd = parameter.indexOf("}");
+			oParameters[parameter.substring(iIndexStart + 1, iIndexEnd)] = mParameters[parameter]();
+		}
+
+		return oParameters;
+	};
+
 	return ParameterMap;
 
 });

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

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.DataProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @private
@@ -59,14 +59,6 @@ sap.ui.define([
 				host: {
 					type : "sap.ui.integration.Host",
 					multiple: false
-				},
-
-				/**
-				 * Optionally the card which will be used as reference for the requests and for visual representation of cache timestamp and refresh.
-				 */
-				card: {
-					type : "sap.ui.integration.widgets.Card",
-					multiple: false
 				}
 			}
 
@@ -399,5 +391,12 @@ sap.ui.define([
 		return mHeaders;
 	};
 
+	/**
+	 * @override
+	 */
+	RequestDataProvider.prototype.getDetails = function () {
+		return "Backend interaction - load data from URL: " + this.getSettings().request.url;
+	};
+
 	return RequestDataProvider;
 });

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.104.0
+	 * @version 1.105.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.104.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @param {Object} mServiceFactoryReferences A map with service descriptions.

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.widgets.Card
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @private

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

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

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

@@ -38,6 +38,8 @@ sap.ui.define([
 	"sap/m/IllustratedMessageType",
 	"sap/m/IllustratedMessageSize",
 	"sap/ui/integration/util/Utils",
+	"sap/ui/integration/util/ParameterMap",
+	"sap/ui/performance/Measurement",
 	"sap/m/HBox",
 	"sap/m/library"
 ], function (
@@ -75,6 +77,8 @@ sap.ui.define([
 	IllustratedMessageType,
 	IllustratedMessageSize,
 	Utils,
+	ParameterMap,
+	Measurement,
 	HBox,
 	mLibrary
 ) {
@@ -119,6 +123,13 @@ sap.ui.define([
 
 	var MODULE_PREFIX = "module:";
 
+	function measurementStartTime() {
+		if (performance && performance.now) {
+			return "Start since page load: " + performance.now();
+		}
+
+		return "";
+	}
 
 	/**
 	 * Constructor for a new <code>Card</code>.
@@ -177,7 +188,7 @@ sap.ui.define([
 	 * @extends sap.f.CardBase
 	 *
 	 * @author SAP SE
-	 * @version 1.104.0
+	 * @version 1.105.0
 	 * @public
 	 * @constructor
 	 * @see {@link topic:5b46b03f024542ba802d99d67bc1a3f4 Cards}
@@ -249,8 +260,24 @@ sap.ui.define([
 				 * Example:
 				 * <pre>
 				 * [
-				 *     {"content": {"header": {"title": "My title"}}},
-				 *     {"content": {"header": {"title": "My new title"}}}
+				 * 	{
+				 * 		"/sap.card/header/title": "My Configured Title in Default Language",
+				 * 		"/sap.card/content/maxItems": 10,
+				 * 		"texts": {
+				 * 			"en-US": {
+				 * 				"/sap.card/header/title": "My Configured Title in US-English"
+				 * 			}
+				 * 		}
+				 * 	},
+				 * 	{
+				 * 		"/sap.card/header/title": "My Configured Title in Default Language",
+				 * 		"/sap.card/content/maxItems": 10,
+				 * 		"texts": {
+				 * 			"en-US": {
+				 * 				"/sap.card/header/title": "My Configured Title in US-English"
+				 * 			}
+				 * 		}
+				 * 	}
 				 * ]
 				 * </pre>
 				 *
@@ -437,7 +464,6 @@ sap.ui.define([
 	 * @private
 	 */
 	Card.prototype.init = function () {
-
 		CardBase.prototype.init.call(this);
 
 		this.setAggregation("_loadingProvider", new LoadingProvider());
@@ -450,10 +476,11 @@ sap.ui.define([
 		this._oCardObserver = new CardObserver(this);
 		this._bFirstRendering = true;
 		this._aFundamentalErrors = [];
+		this._sPerformanceId = "UI5 Integration Cards - " + this.getId() + "---";
+		this._fnOnCardReady = function () {
+			this._bCardReady = true;
+		}.bind(this);
 
-		if (this.getProperty("dataMode") === CardDataMode.Auto) {
-			this._oCardObserver.createObserver(this);
-		}
 		/**
 		 * Facade of the {@link sap.ui.integration.widgets.Card} control.
 		 * @interface
@@ -461,7 +488,7 @@ sap.ui.define([
 		 * @experimental since 1.79
 		 * @public
 		 * @author SAP SE
-		 * @version 1.104.0
+		 * @version 1.105.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
@@ -537,6 +564,11 @@ sap.ui.define([
 						bundle: this._oIntegrationRb
 					});
 				break;
+				case "parameters":
+					oModel = new JSONModel(
+						ParameterMap.getParamsForModel()
+					);
+				break;
 				default:
 					oModel = new JSONModel();
 				break;
@@ -577,6 +609,8 @@ sap.ui.define([
 			this._bReady = true;
 			this.fireEvent("_ready");
 		}.bind(this));
+
+		this.attachEventOnce("_cardReady", this._fnOnCardReady);
 	};
 
 	/**
@@ -586,7 +620,9 @@ sap.ui.define([
 	 */
 	Card.prototype._clearReadyState = function () {
 		this._bReady = false;
+		this._bCardReady = false;
 		this._aReadyPromises = [];
+		this.detachEvent("_cardReady", this._fnOnCardReady);
 	};
 
 	/**
@@ -607,6 +643,16 @@ sap.ui.define([
 	 * @private
 	 */
 	Card.prototype.onAfterRendering = function () {
+		if (Measurement.getActive() && this._isManifestReady) {
+			if (!Measurement.getMeasurement(this._sPerformanceId + "firstRenderingWithStaticData").end) {
+				Measurement.end(this._sPerformanceId + "firstRenderingWithStaticData");
+			}
+
+			if (this._bCardReady && !Measurement.getMeasurement(this._sPerformanceId + "firstRenderingWithDynamicData").end) {
+				Measurement.end(this._sPerformanceId + "firstRenderingWithDynamicData");
+			}
+		}
+
 		var oCardDomRef = this.getDomRef();
 
 		if (this.getDataMode() === CardDataMode.Auto && this._bFirstRendering) {
@@ -645,7 +691,6 @@ sap.ui.define([
 
 		if (!this._bApplyManifest && this._bApplyParameters) {
 			this._oCardManifest.processParameters(this._getContextAndRuntimeParams());
-
 			this._applyManifestSettings();
 		}
 
@@ -749,6 +794,10 @@ sap.ui.define([
 			this._oCardManifest.destroy();
 		}
 
+		Measurement.start(this._sPerformanceId + "initManifest", "Load and initialize manifest. " + measurementStartTime());
+		Measurement.start(this._sPerformanceId + "firstRenderingWithStaticData", "First rendering with static data (includes initManifest). " + measurementStartTime());
+		Measurement.start(this._sPerformanceId + "firstRenderingWithDynamicData","First rendering with dynamic card level data (includes firstRenderingWithStaticData). " + measurementStartTime());
+
 		this._oCardManifest = new CardManifest("sap.card", vManifest, sBaseUrl, this.getManifestChanges());
 
 		this._oCardManifest
@@ -758,6 +807,7 @@ sap.ui.define([
 					throw new Error(CARD_DESTROYED_ERROR);
 				}
 
+				Measurement.end(this._sPerformanceId + "initManifest");
 				this._registerManifestModulePath();
 				this._isManifestReady = true;
 				this.fireManifestReady();
@@ -1286,7 +1336,7 @@ sap.ui.define([
 	 * @param {string} sMessage The message.
 	 * @param {sap.ui.core.MessageType} sType Type of the message.
 	 */
-	 Card.prototype.showMessage = function (sMessage, sType) {
+	Card.prototype.showMessage = function (sMessage, sType) {
 		if (this._createContentPromise) {
 			this._createContentPromise.then(function (oContent) {
 				oContent.showMessage(sMessage, sType);
@@ -1438,7 +1488,6 @@ sap.ui.define([
 		this._applyFooterManifestSettings();
 
 		this.fireManifestApplied();
-
 	};
 
 	/**
@@ -1450,7 +1499,8 @@ sap.ui.define([
 
 	Card.prototype._setParametersModelData = function () {
 
-		var oCustomParameters = {},
+		var oPredefinedParameters = ParameterMap.getParamsForModel(),
+			oCustomParameters = {},
 			oCombinedParameters = this.getCombinedParameters(),
 			sKey;
 
@@ -1461,7 +1511,7 @@ sap.ui.define([
 				oCustomParameters[sKey] = {value: oCombinedParameters[sKey]};
 			}
 		}
-		this.getModel("parameters").setData(oCustomParameters);
+		this.getModel("parameters").setData(merge(oPredefinedParameters, oCustomParameters));
 	};
 
 	Card.prototype._applyDataManifestSettings = function () {
@@ -1473,7 +1523,7 @@ sap.ui.define([
 			return;
 		}
 
-		this.bindObject(oDataSettings.path || "/");
+		this.bindObject(BindingResolver.resolveValue(oDataSettings.path || "/", this));
 
 		if (this._oDataProvider) {
 			this._oDataProvider.destroy();