@openui5/sap.ui.integration 1.111.2 → 1.112.2

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

@@ -33,7 +33,7 @@ sap.ui.define([
 		 * Resolves a binding syntax based on a provided model and path.
 		 *
 		 * @author SAP SE
-		 * @version 1.111.2
+		 * @version 1.112.2
 		 *
 		 * @private
 		 * @ui5-restricted sap.ushell
@@ -50,10 +50,11 @@ sap.ui.define([
 		 * @param {string} [sPath] The path to take.
 		 * @param {number} iCurrentLevel The current level of recursion.
 		 * @param {number} iMaxLevel The maximum level of recursion.
+		 * @param {boolean} [bBindingInfosOnly] Set to true if it should resolve only binding infos, without resolving strings.
 		 * @private
 		 * @returns {*} The resolved value.
 		 */
-		function process(vValue, vModelOrObject, sPath, iCurrentLevel, iMaxLevel) {
+		function process(vValue, vModelOrObject, sPath, iCurrentLevel, iMaxLevel, bBindingInfosOnly) {
 
 			if (iCurrentLevel === iMaxLevel) {
 				Log.warning("BindingResolver maximum level processing reached. Please check for circular dependencies.");
@@ -63,7 +64,7 @@ sap.ui.define([
 			// iterates arrays
 			if (Array.isArray(vValue)) {
 				return vValue.map(function(vItem) {
-					return process(vItem, vModelOrObject, sPath, iCurrentLevel + 1, iMaxLevel);
+					return process(vItem, vModelOrObject, sPath, iCurrentLevel + 1, iMaxLevel, bBindingInfosOnly);
 				});
 			}
 
@@ -71,13 +72,18 @@ sap.ui.define([
 			if (vValue && isPlainObject(vValue) && !BindingResolver.isBindingInfo(vValue)) {
 				var oNewObj = {};
 				for (var sProp in vValue) {
-					oNewObj[sProp] = process(vValue[sProp], vModelOrObject, sPath, iCurrentLevel + 1, iMaxLevel);
+					oNewObj[sProp] = process(vValue[sProp], vModelOrObject, sPath, iCurrentLevel + 1, iMaxLevel, bBindingInfosOnly);
 				}
 				return oNewObj;
 			}
 
-			// resolves strings that might contain binding syntax or objects that are binding infos
-			if (typeof vValue === "string" || (typeof vValue === "object" && BindingResolver.isBindingInfo(vValue))) {
+			// resolves strings that might contain binding syntax
+			if (typeof vValue === "string" && !bBindingInfosOnly) {
+				return resolveBinding(vValue, vModelOrObject, sPath);
+			}
+
+			// resolve objects that are binding infos
+			if (typeof vValue === "object" && BindingResolver.isBindingInfo(vValue)) {
 				return resolveBinding(vValue, vModelOrObject, sPath);
 			}
 
@@ -135,16 +141,17 @@ sap.ui.define([
 		 * @param {*} vValue The value to resolve.
 		 * @param {*} vModelOrObject The model.
 		 * @param {string} [sPath] The path to the referenced entity which is going to be used as a binding context.
+		 * @param {boolean} [bBindingInfosOnly] Set to true if it should resolve only binding infos, without resolving strings.
 		 * @private
 		 * @ui5-restricted sap.ushell
 		 * @returns {*} The resolved value.
 		 */
-		BindingResolver.resolveValue = function (vValue, vModelOrObject, sPath) {
+		BindingResolver.resolveValue = function (vValue, vModelOrObject, sPath, bBindingInfosOnly) {
 			var iCurrentLevel = 0,
 				iMaxLevel = 30;
 
 			if (vModelOrObject) {
-				return process(vValue, vModelOrObject, sPath, iCurrentLevel, iMaxLevel);
+				return process(vValue, vModelOrObject, sPath, iCurrentLevel, iMaxLevel, bBindingInfosOnly);
 			} else {
 				return vValue;
 			}

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @private

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.BaseFactory
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @private

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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @param {sap.ui.integration.Host} oHost The Host which will be used for resolve CSRF tokens.

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

@@ -5,7 +5,7 @@
  */
 sap.ui.define([
 	"sap/ui/base/ManagedObject",
-	"sap/ui/performance/Measurement"
+	"sap/ui/integration/util/Measurement"
 ], function (
 	ManagedObject,
 	Measurement
@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @private
@@ -193,29 +193,29 @@ sap.ui.define([
 	};
 
 	DataProvider.prototype._triggerDataUpdate = function () {
+		var oCard = this.getCard(),
+			sMeasureId;
+
 		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()
-			);
+		if (oCard) {
+			sMeasureId = "UI5 Integration Cards " + oCard +  " " + this.getId() + " getData#" + this._iCurrentRequestNumber;
+			Measurement.start(sMeasureId, this.getDetails());
 		}
 
 		return this.getData()
 			.then(function (oData) {
-				if (oGetDataMeasurement) {
-					Measurement.end(oGetDataMeasurement.id);
+				if (oCard) {
+					Measurement.end(sMeasureId);
 				}
 
 				this.fireDataChanged({data: oData});
 				this.onDataRequestComplete();
 			}.bind(this))
 			.catch(function (oResult) {
-				if (oGetDataMeasurement) {
-					Measurement.end(oGetDataMeasurement.id);
+				if (oCard) {
+					Measurement.end(sMeasureId);
 				}
 
 				if (Array.isArray(oResult) && oResult.length > 0) {

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

@@ -4,7 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/base/Object",
+	"sap/ui/base/EventProvider",
+	"sap/ui/integration/library",
 	"sap/ui/integration/util/ServiceDataProvider",
 	"sap/ui/integration/util/RequestDataProvider",
 	"sap/ui/integration/util/CacheAndRequestDataProvider",
@@ -13,33 +14,38 @@ sap.ui.define([
 	"sap/ui/integration/util/JSONBindingHelper",
 	"sap/ui/integration/util/BindingHelper",
 	"sap/ui/integration/util/CsrfTokenHandler"
-], function (BaseObject,
-			 ServiceDataProvider,
-			 RequestDataProvider,
-			 CacheAndRequestDataProvider,
-			 DataProvider,
-			 ExtensionDataProvider,
-			 JSONBindingHelper,
-			 BindingHelper,
-			 CsrfTokenHandler) {
+], function (
+	EventProvider,
+	library,
+	ServiceDataProvider,
+	RequestDataProvider,
+	CacheAndRequestDataProvider,
+	DataProvider,
+	ExtensionDataProvider,
+	JSONBindingHelper,
+	BindingHelper,
+	CsrfTokenHandler
+) {
 	"use strict";
 
+	var CardPreviewMode = library.CardPreviewMode;
+
 	/**
 	 * @class
 	 * A factory class which creates a data provider based on data settings and stores the created instance.
 	 * When destroyed, all data providers created by this class are also destroyed.
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.integration, shell-toolkit
 	 * @since 1.65
 	 * @alias sap.ui.integration.util.DataProviderFactory
 	 */
-	var DataProviderFactory = BaseObject.extend("sap.ui.integration.util.DataProviderFactory", {
+	var DataProviderFactory = EventProvider.extend("sap.ui.integration.util.DataProviderFactory", {
 		constructor: function (mSettings) {
-			BaseObject.call(this);
+			EventProvider.call(this);
 
 			mSettings = mSettings || {};
 
@@ -67,7 +73,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.integration, shell-toolkit
 	 */
 	DataProviderFactory.prototype.destroy = function () {
-		BaseObject.prototype.destroy.apply(this, arguments);
+		EventProvider.prototype.destroy.apply(this, arguments);
 
 		if (this._aDataProviders) {
 			this._aDataProviders.forEach(function(oDataProvider) {
@@ -113,12 +119,17 @@ sap.ui.define([
 	 * @returns {sap.ui.integration.util.DataProvider|null} A data provider instance used for data retrieval.
 	 */
 	DataProviderFactory.prototype.create = function (oDataConfiguration, oServiceManager, bIsFilter, bConfigurationAlreadyResolved) {
-		if (!oDataConfiguration) {
+		var oCard = this._oCard;
+
+		if (!this._isProvidingConfiguration(oDataConfiguration) || oCard && oCard.getPreviewMode() === CardPreviewMode.Abstract) {
 			return null;
 		}
 
-		var oCard = this._oCard,
-			oEditor = this._oEditor,
+		if (oCard && oCard.getPreviewMode() === CardPreviewMode.MockData) {
+			oDataConfiguration = this._applyMockDataConfiguration(oDataConfiguration);
+		}
+
+		var oEditor = this._oEditor,
 			oHost = this._oHost || (oCard && oCard.getHostInstance()) || (oEditor && oEditor.getHostInstance()),
 			bUseExperimentalCaching = oHost && oHost.bUseExperimentalCaching,
 			oSettings = this._createDataProviderSettings(oDataConfiguration, bConfigurationAlreadyResolved),
@@ -139,8 +150,6 @@ sap.ui.define([
 			oDataProvider = new DataProvider(oSettings);
 		} else if (oDataConfiguration.extension) {
 			oDataProvider = new ExtensionDataProvider(oSettings, this._oExtension);
-		} else {
-			return null;
 		}
 
 		if (oCard) {
@@ -176,7 +185,7 @@ sap.ui.define([
 	/**
 	 * Removes a DataProvider from Factory's registry.
 	 *
-	 * @param oDataProvider {sap.ui.integration.util.DataProvider}
+	 * @param {sap.ui.integration.util.DataProvider} oDataProvider The data provider to be removed
 	 * @private
 	 * @ui5-restricted sap.ui.integration, shell-toolkit
 	 * @experimental
@@ -224,5 +233,29 @@ sap.ui.define([
 		return oConfig;
 	};
 
+	DataProviderFactory.prototype._applyMockDataConfiguration = function (oDataConfiguration) {
+		if (oDataConfiguration.mockData && this._isProvidingConfiguration(oDataConfiguration.mockData)) {
+			var oNewDataConfiguration = Object.assign({}, oDataConfiguration);
+			delete oNewDataConfiguration.request;
+			delete oNewDataConfiguration.service;
+			delete oNewDataConfiguration.json;
+			delete oNewDataConfiguration.extension;
+
+			return Object.assign(oNewDataConfiguration, oDataConfiguration.mockData);
+		}
+
+		this.fireEvent("liveDataFallback");
+
+		return oDataConfiguration;
+	};
+
+	/**
+	 * @param {object} oDataCfg Data configuration
+	 * @returns {boolean} Whether the configuration provides data
+	 */
+	DataProviderFactory.prototype._isProvidingConfiguration = function (oDataCfg) {
+		return oDataCfg && (oDataCfg.request || oDataCfg.service || oDataCfg.json || oDataCfg.extension);
+	};
+
 	return DataProviderFactory;
 });

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.111.2
+	 * @version 1.112.2
 	 *
 	 * @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.111.2
+	 * @version 1.112.2
 	 *
 	 * @constructor
 	 * @private