@openui5/sap.ui.integration 1.99.0 → 1.100.0

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

@@ -7,10 +7,12 @@
 sap.ui.define([
 	"sap/ui/base/Object",
 	"sap/base/Log",
+	"sap/base/util/deepExtend",
 	"sap/ui/integration/util/Utils"
 ], function (
 	BaseObject,
 	Log,
+	deepExtend,
 	Utils
 ) {
 	"use strict";
@@ -27,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @param {sap.ui.integration.Host} oHost The Host which will be used for resolving destinations.
@@ -73,7 +75,7 @@ sap.ui.define([
 			return Promise.resolve(oConfig);
 		}
 
-		oClonedConfig = jQuery.extend(true, {}, oConfig);
+		oClonedConfig = deepExtend({}, oConfig);
 
 		return this.processString(sUrl)
 			.then(function (sProcessedUrl) {

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.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -68,7 +68,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.BaseFactory
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @private
@@ -122,6 +122,11 @@ sap.ui.define([
 			oHeader.setVisible(oToolbar.getVisible());
 		}
 
+		if (oCard.getOpener()) {
+			// if card is in dialog - header shouldn't be focusable
+			oHeader.setProperty("focusable", false);
+		}
+
 		return oHeader;
 	};
 

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.99.0
+	 * @version 1.100.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.integration, shell-toolkit

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @private
@@ -45,10 +45,10 @@ sap.ui.define([
 
 	LoadingProvider.prototype.setLoading = function (bLoading) {
 		if (this.isDataProviderJson()) {
-			return;
+			return this;
 		}
 
-		this.setProperty("loading", bLoading);
+		return this.setProperty("loading", bLoading);
 	};
 
 	LoadingProvider.prototype.isDataProviderJson = function () {

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

@@ -8,6 +8,8 @@ sap.ui.define([
 	"sap/ui/base/Object",
 	"sap/ui/core/Manifest",
 	"sap/base/util/deepClone",
+	"sap/base/util/deepExtend",
+	"sap/base/util/each",
 	"sap/base/util/isPlainObject",
 	"sap/base/util/isEmptyObject",
 	"sap/base/Log",
@@ -17,6 +19,8 @@ sap.ui.define([
 	BaseObject,
 	CoreManifest,
 	deepClone,
+	deepExtend,
+	each,
 	isPlainObject,
 	isEmptyObject,
 	Log,
@@ -60,7 +64,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @private
@@ -281,7 +285,7 @@ sap.ui.define([
 		var iCurrentLevel = 0,
 			iMaxLevel = 15,
 			//Always need the unprocessed manifest
-			oUnprocessedJson = jQuery.extend(true, {}, this._oManifest.getRawJson()),
+			oUnprocessedJson = deepExtend({}, this._oManifest.getRawJson()),
 			oDataSources = this.get(APP_DATA_SOURCES);
 
 		process(oUnprocessedJson, this.oResourceBundle, iCurrentLevel, iMaxLevel, this._oCombinedParams, oDataSources, this._oCombinedFilters);
@@ -495,7 +499,7 @@ sap.ui.define([
 			return;
 		}
 
-		jQuery.each(oManifestFilters, function (sKey, oConfig) {
+		each(oManifestFilters, function (sKey, oConfig) {
 			var sValue = mRuntimeFilters.get(sKey) || oConfig.value;
 
 			oCombinedFilters[sKey] = sValue;

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

@@ -93,7 +93,6 @@ sap.ui.define([
 			Utils.setNestedPropertyValue(oManifest, sManifestPath, oSubConfig);
 		});
 
-		oCard.destroy();
 		return JSON.stringify(oManifest);
 	};
 

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

@@ -7,8 +7,9 @@ sap.ui.define([
 	"sap/ui/integration/util/DataProvider",
 	"sap/ui/thirdparty/jquery",
 	"sap/base/Log",
-	"sap/ui/model/odata/v4/ODataUtils"
-], function (DataProvider, jQuery, Log, ODataUtils) {
+	"sap/ui/model/odata/v4/ODataUtils",
+	"sap/ui/core/Core"
+], function (DataProvider, jQuery, Log, ODataUtils, Core) {
 	"use strict";
 	/*global Response*/
 
@@ -31,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.DataProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @private
@@ -49,6 +50,24 @@ sap.ui.define([
 			 */
 			properties: {
 				allowCustomDataType: { type: "boolean", defaultValue: false }
+			},
+
+			associations : {
+				/**
+				 * The host which is used for communication with the caching service worker.
+				 */
+				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
+				}
 			}
 
 		}
@@ -258,7 +277,7 @@ sap.ui.define([
 	/**
 	 * Reads retry-after value from response headers or from settings.
 	 * @param {Object} jqXHR The jQuery XHR response.
-	 * @returns {integer} The number of seconds after which to retry the request.
+	 * @returns {int} The number of seconds after which to retry the request.
 	 */
 	RequestDataProvider.prototype._getRetryAfter = function (jqXHR) {
 		var oRequestConfig = this.getSettings().request,
@@ -364,12 +383,19 @@ sap.ui.define([
 
 	/**
 	 * Override if modification to the headers is needed.
+	 * Allows the host to modify the headers.
 	 * @param {map} mHeaders The current headers
 	 * @param {Object} oSettings The request settings
 	 * @returns {map} The modified headers
 	 */
 	RequestDataProvider.prototype._prepareHeaders = function (mHeaders, oSettings) {
-		// do nothing, use current headers
+		var oCard = Core.byId(this.getCard()),
+			oHost = Core.byId(this.getHost());
+
+		if (oHost && oHost.modifyRequestHeaders) {
+			return oHost.modifyRequestHeaders(Object.assign({}, mHeaders), oSettings, oCard);
+		}
+
 		return mHeaders;
 	};
 

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.99.0
+	 * @version 1.100.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.99.0
+	 * @version 1.100.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.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @private

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

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

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

@@ -15,10 +15,8 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/base/util/merge",
 	"sap/base/util/deepEqual",
+	"sap/base/util/each",
 	"sap/ui/integration/util/DataProviderFactory",
-	"sap/m/HBox",
-	"sap/ui/core/Icon",
-	"sap/m/Text",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/integration/model/ObservableModel",
 	"sap/ui/model/resource/ResourceModel",
@@ -39,7 +37,9 @@ sap.ui.define([
 	"sap/m/IllustratedMessage",
 	"sap/m/IllustratedMessageType",
 	"sap/m/IllustratedMessageSize",
-	"sap/ui/integration/util/Utils"
+	"sap/ui/integration/util/Utils",
+	"sap/m/HBox",
+	"sap/m/library"
 ], function (
 	CardRenderer,
 	Footer,
@@ -52,10 +52,8 @@ sap.ui.define([
 	Log,
 	merge,
 	deepEqual,
+	each,
 	DataProviderFactory,
-	HBox,
-	Icon,
-	Text,
 	JSONModel,
 	ObservableModel,
 	ResourceModel,
@@ -76,7 +74,9 @@ sap.ui.define([
 	IllustratedMessage,
 	IllustratedMessageType,
 	IllustratedMessageSize,
-	Utils
+	Utils,
+	HBox,
+	mLibrary
 ) {
 	"use strict";
 
@@ -105,11 +105,18 @@ sap.ui.define([
 
 	var HeaderPosition = fLibrary.cards.HeaderPosition;
 
+	var CardArea = library.CardArea;
+
 	var CardDataMode = library.CardDataMode;
 
 	var CARD_DESTROYED_ERROR = "Card is destroyed!";
 
-	var CardArea = library.CardArea;
+	var FlexRendertype = mLibrary.FlexRendertype;
+
+	var FlexJustifyContent = mLibrary.FlexJustifyContent;
+
+	var FlexAlignItems = mLibrary.FlexAlignItems;
+
 
 	/**
 	 * Constructor for a new <code>Card</code>.
@@ -168,7 +175,7 @@ sap.ui.define([
 	 * @extends sap.f.CardBase
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 * @public
 	 * @constructor
 	 * @see {@link topic:5b46b03f024542ba802d99d67bc1a3f4 Cards}
@@ -401,7 +408,14 @@ sap.ui.define([
 				/**
 				 * The host.
 				 */
-				host: {}
+				host: {},
+
+				/**
+				 * The opener card.
+				 * @private
+				 * @ui5-restricted
+				 */
+				openerReference: { visibility: "hidden" }
 			}
 		},
 		renderer: CardRenderer
@@ -438,7 +452,7 @@ sap.ui.define([
 		 * @experimental since 1.79
 		 * @public
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.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
@@ -462,6 +476,9 @@ sap.ui.define([
 		 * @borrows sap.ui.integration.widgets.Card#destroyActionDefinition as destroyActionDefinition
 		 * @borrows sap.ui.integration.widgets.Card#showLoadingPlaceholders as showLoadingPlaceholders
 		 * @borrows sap.ui.integration.widgets.Card#hideLoadingPlaceholders as hideLoadingPlaceholders
+		 * @borrows sap.ui.integration.widgets.Card#showCard as showCard
+		 * @borrows sap.ui.integration.widgets.Card#hide as hide
+		 * @borrows sap.ui.integration.widgets.Card#getOpener as getOpener
 		 */
 		this._oLimitedInterface = new Interface(this, [
 			"getDomRef",
@@ -486,7 +503,10 @@ sap.ui.define([
 			"indexOfActionDefinition",
 			"destroyActionDefinition",
 			"showLoadingPlaceholders",
-			"hideLoadingPlaceholders"
+			"hideLoadingPlaceholders",
+			"showCard",
+			"hide",
+			"getOpener"
 		]);
 	};
 
@@ -568,16 +588,10 @@ sap.ui.define([
 			this._initReadyState();
 		}
 
-		if (this._bApplyManifest) {
-			var vManifest = this.getManifest();
-
-			if (!vManifest) {
-				// Destroy the manifest when null/undefined/empty string are passed
-				this.destroyManifest();
-			} else {
-				this._cleanupOldManifest();
-				this.createManifest(vManifest, this.getBaseUrl());
-			}
+		var vManifest = this.getManifest();
+		if (vManifest && this._bApplyManifest) {
+			this._cleanupOldManifest();
+			this.createManifest(vManifest, this.getBaseUrl());
 		}
 
 		if (!this._bApplyManifest && this._bApplyParameters) {
@@ -592,9 +606,17 @@ sap.ui.define([
 	};
 
 	Card.prototype.setManifest = function (vValue) {
-		this.setProperty("manifest", vValue);
-		this.destroyActionDefinitions();
+		if (!deepEqual(this.getProperty("manifest"), vValue)) {
+			this.destroyActionDefinitions();
+		}
+
+		if (!vValue) {
+			// Destroy the manifest when null/undefined/empty string is passed
+			this._destroyManifest();
+		}
+
 		this._bApplyManifest = true;
+		this.setProperty("manifest", vValue);
 		return this;
 	};
 
@@ -725,9 +747,9 @@ sap.ui.define([
 
 				resolve();
 			}.bind(this), function (vErr) {
-				this._logFundamentalError("Failed to load " + sExtensionPath + ". Check if the path is correct. Reason: " + vErr);
+				this._logFundamentalError("Failed to load " + sFullExtensionPath + ". Check if the path is correct. Reason: " + vErr);
 				reject(vErr);
-			});
+			}.bind(this));
 		}.bind(this));
 	};
 
@@ -955,6 +977,7 @@ sap.ui.define([
 			oContent.refreshData();
 		} else {
 			this.destroyAggregation("_content");
+			this._destroyTemporaryContent();
 			this._applyContentManifestSettings();
 		}
 
@@ -997,7 +1020,7 @@ sap.ui.define([
 
 		CardBase.prototype.exit.call(this);
 
-		this.destroyManifest();
+		this._destroyManifest();
 		this._oCardObserver.destroy();
 		this._oCardObserver = null;
 		this._oContentFactory = null;
@@ -1012,7 +1035,7 @@ sap.ui.define([
 	/**
 	 * Destroys everything configured by the manifest.
 	 */
-	Card.prototype.destroyManifest = function () {
+	Card.prototype._destroyManifest = function () {
 		if (this._oCardManifest) {
 			this._oCardManifest.destroy();
 			this._oCardManifest = null;
@@ -1063,10 +1086,7 @@ sap.ui.define([
 
 		this.destroyAggregation("_extension");
 
-		if (this._oTemporaryContent) {
-			this._oTemporaryContent.destroy();
-			this._oTemporaryContent = null;
-		}
+		this._destroyTemporaryContent();
 
 		// destroying the factory would also destroy the data provider
 		if (this._oDataProviderFactory) {
@@ -1421,6 +1441,13 @@ sap.ui.define([
 		}
 
 		oModel.attachEvent("change", function () {
+			var oCardContent = this.getAggregation("_content");
+			if (oCardContent && !oCardContent.isA("sap.ui.integration.cards.BaseContent")) {
+				this.destroyAggregation("_content");
+				this._destroyTemporaryContent();
+				this._applyContentManifestSettings();
+			}
+
 			if (this._createContentPromise) {
 				this._createContentPromise.then(function (oContent) {
 					oContent.onDataChanged();
@@ -1781,6 +1808,13 @@ sap.ui.define([
 		}
 	};
 
+	Card.prototype._destroyTemporaryContent = function () {
+		if (this._oTemporaryContent) {
+			this._oTemporaryContent.destroy();
+			this._oTemporaryContent = null;
+		}
+	};
+
 	/**
 	 * Handler for error states.
 	 * If the content is not provided in the manifest, the error message will be displayed in the header.
@@ -1840,6 +1874,9 @@ sap.ui.define([
 					sIllustratedMessageType = IllustratedMessageType.NoEntries;
 					sTitle = this._oIntegrationRb.getText("CARD_NO_ITEMS_ERROR_LISTS");
 					break;
+				case "Analytical":
+					sIllustratedMessageType = IllustratedMessageType.NoEntries;
+					sTitle = this._oIntegrationRb.getText("CARD_NO_ITEMS_ERROR_CHART");
 			}
 		}
 
@@ -1852,14 +1889,22 @@ sap.ui.define([
 				sDescription = oErrorData.description;
 		}
 
+
 		var oIllustratedMessage = new IllustratedMessage({
 			illustrationType: sIllustratedMessageType,
 			illustrationSize: sIllustratedMessageSize,
 			title: sTitle,
 			description: sDescription ? sDescription : " "
-		}).addStyleClass("sapFCardErrorContent");
+		});
 
-		return oIllustratedMessage;
+		var oFlexBox = new HBox({
+			renderType: FlexRendertype.Bare,
+			justifyContent: FlexJustifyContent.Center,
+			alignItems: FlexAlignItems.Center,
+			width: "100%",
+			items: [oIllustratedMessage]
+		}).addStyleClass("sapFCardErrorContent");
+		return oFlexBox;
 	};
 
 	/**
@@ -2320,7 +2365,7 @@ sap.ui.define([
 	 * @private
 	 */
 	Card.prototype.getContentPageSize = function (oContentConfig) {
-		var iMaxItems = parseInt((oContentConfig || {}).maxItems) || 0,
+		var iMaxItems = parseInt(BindingResolver.resolveValue(oContentConfig, this).maxItems) || 0,
 			oFooter = this.getAggregation("_footer"),
 			oPaginator;
 
@@ -2345,5 +2390,96 @@ sap.ui.define([
 		return oManifestFooter && oManifestFooter.paginator;
 	};
 
+	/**
+	 * Shows a child card. By default opens in a dialog.
+	 * @private
+	 * @ui5-restricted
+	 * @param {Object} oParameters The settings for showing the card.
+	 * @param {String|Object} oParameters.manifest Url to a manifest or the manifest itself.
+	 * @param {String} oParameters.baseUrl If manifest is an object - specify the base url to the card.
+	 * @param {Object} oParameters.parameters Parameters to be passed to the new card.
+	 * @param {Object} oParameters.data Data to be passed to the new card.
+	 * @returns {Promise} Promise which resolves with the created card.
+	 */
+	Card.prototype.showCard = function (oParameters) {
+		var oChildCard = this._createChildCard(oParameters);
+
+		oParameters._cardId = oChildCard.getId();
+
+		this.triggerAction({
+			type: "ShowCard",
+			parameters: oParameters
+		});
+
+		return Promise.resolve(oChildCard);
+	};
+
+	/**
+	 * Hides the card.
+	 * @private
+	 * @ui5-restricted
+	 */
+	Card.prototype.hide = function () {
+		this.triggerAction({
+			type: "HideCard"
+		});
+	};
+
+	/**
+	 * Gets the card which has opened this one if any.
+	 * @private
+	 * @ui5-restricted
+	 * @returns {sap.ui.integration.widgets.Card} The card which opened the current one.
+	 */
+	Card.prototype.getOpener = function () {
+		var oOpener = Core.byId(this.getAssociation("openerReference"));
+
+		if (!oOpener) {
+			return null;
+		}
+
+		return oOpener._oLimitedInterface;
+	};
+
+	/**
+	 * Creates the child card.
+	 *
+	 * @private
+	 * @ui5-restricted
+	 * @param {Object} oParameters The parameters for the card.
+	 * @returns {sap.ui.integration.widgets.Card} The result card.
+	 */
+	Card.prototype._createChildCard = function (oParameters) {
+		var vManifest = oParameters.manifest,
+			sBaseUrl = oParameters.baseUrl,
+			oData = oParameters.data,
+			oChildCard = new Card({
+				width: oParameters.width,
+				host: this.getHostInstance(),
+				parameters: oParameters.parameters
+			});
+
+		oChildCard.setAssociation("openerReference", this);
+
+		if (oData) {
+			each(oData, function (sModelName, oModelData) {
+				var oModel = new JSONModel(oModelData);
+				oChildCard.setModel(oModel, sModelName);
+			});
+		}
+
+		if (typeof vManifest === "string") {
+			oChildCard.setManifest(this.getRuntimeUrl(vManifest));
+			if (sBaseUrl) {
+				oChildCard.setBaseUrl(sBaseUrl);
+			}
+		} else {
+			oChildCard.setManifest(vManifest);
+			oChildCard.setBaseUrl(sBaseUrl || this.getRuntimeUrl("/"));
+		}
+
+		return oChildCard;
+	};
+
 	return Card;
 });