@openui5/sap.ui.integration 1.117.0 → 1.118.0

package/src/sap/ui/integration/model/ContextModel.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.json.JSONModel
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.integration.model.ContextModel

package/src/sap/ui/integration/model/ObservableModel.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.json.JSONModel
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.integration.model.ObservableModel

package/src/sap/ui/integration/model/PagingModelListBinding.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.json.JSONListBinding
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.integration.model.PagingModelListBinding

package/src/sap/ui/integration/themes/base/Card.less

@@ -21,4 +21,48 @@
 .sapFCard.sapUiIntCardWithFooter .sapFCardContent {
 	border-bottom-left-radius: 0;
 	border-bottom-right-radius: 0;
-}
+}
+
+.sapFCard.sapUiIntCardDisplayVariantTileStandard,
+.sapFCard.sapUiIntCardDisplayVariantTileStandardWide {
+	.sapFCardHeader {
+		height: 100%;
+		box-sizing: border-box;
+
+		.sapFCardDataTimestamp,
+		.sapFCardStatus,
+		.sapFCardHeaderToolbarCont {
+			display: none;
+		}
+
+		.sapFCardHeaderWrapper {
+			flex-direction: column;
+			justify-content: space-between;
+			height: 100%;
+
+			.sapFCardHeaderText {
+				justify-content: flex-start;
+			}
+		}
+
+		&.sapFCardNumericHeader {
+			.sapFCardHeaderContent {
+				display: flex;
+				flex-direction: column;
+
+				.sapFCardSubtitle {
+					align-items: flex-start;
+				}
+			}
+		}
+	}
+}
+
+.sapFCard.sapUiIntCardDisplayVariantTileStandard .sapFCardHeader .sapFCardNumericIndicatorsSide {
+	display: none;
+}
+
+.sapFCard.sapUiIntCardDisplayVariantStandard .sapFCardHeaderBanner {
+	/* the banner feature is not yet available for standard card variant */
+	display: none!important;
+}

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

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

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

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * Helper class for working with bindings.
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @private
 	 * @alias sap.ui.integration.util.BindingHelper

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.117.0
+		 * @version 1.118.0
 		 *
 		 * @private
 		 * @ui5-restricted sap.ushell

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

@@ -7,11 +7,10 @@ sap.ui.define([
 	"sap/ui/integration/util/RequestDataProvider",
 	"sap/base/Log",
 	"sap/ui/core/Core",
-	"sap/base/util/merge",
+	"sap/base/util/deepExtend",
 	"sap/ui/core/date/UI5Date"
-], function (RequestDataProvider, Log, Core, merge, UI5Date) {
+], function (RequestDataProvider, Log, Core, deepExtend, UI5Date) {
 	"use strict";
-	/*global URL*/
 
 	/**
 	 * @const The amount of seconds in a common calendar year.
@@ -169,13 +168,24 @@ sap.ui.define([
 	 * @inheritdoc
 	 */
 	CacheAndRequestDataProvider.prototype._modifyRequestBeforeSent = function (oRequest, oSettings) {
+		oSettings.request = this._addCacheSettings(oSettings.request);
+
+		return RequestDataProvider.prototype._modifyRequestBeforeSent.call(this, oRequest, oSettings);
+	};
+
+	/**
+	 * @inheritdoc
+	 */
+	CacheAndRequestDataProvider.prototype._addCacheSettings = function (oSettings) {
 		var oDefault = {
-				enabled: true,
-				maxAge: 0,
-				staleWhileRevalidate: true
+				cache: {
+					enabled: true,
+					maxAge: 0,
+					staleWhileRevalidate: true
+				}
 			},
-			oNewSettings = merge({request: { cache: oDefault }}, oSettings),
-			oCache = oNewSettings.request.cache;
+			oNewSettings = deepExtend(oDefault, oSettings),
+			oCache = oNewSettings.cache;
 
 		if (oCache.noStore) {
 			// temporary needed for backward compatibility
@@ -192,9 +202,14 @@ sap.ui.define([
 			}
 		}
 
-		oNewSettings.request.cache = oCache;
+		return oNewSettings;
+	};
 
-		return RequestDataProvider.prototype._modifyRequestBeforeSent.call(this, oRequest, oNewSettings);
+	/**
+	 * @override
+	 */
+	CacheAndRequestDataProvider.prototype._getRequestSettings = function () {
+		return this._addCacheSettings(this.getSettings().request);
 	};
 
 	/**

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.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.BaseFactory
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @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.117.0
+	 * @version 1.118.0
 	 *
 	 * @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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * When destroyed, all data providers created by this class are also destroyed.
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.integration, shell-toolkit

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.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @param {sap.ui.integration.Host} oHost The Host which will be used for resolving destinations.

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

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * Utility class for handling errors in the cards.
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @private
 	 * @ui5-restricted

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.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * Utility class for handling forms in the cards.
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @private
 	 * @ui5-restricted

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

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.BaseFactory
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @private
@@ -72,7 +72,7 @@ sap.ui.define([
 
 		switch (mConfiguration.type) {
 			case "Numeric":
-				oHeader = new NumericHeader(sId, mConfiguration, oToolbar);
+				oHeader = new NumericHeader(sId, mConfiguration, oToolbar, oCard._oIconFormatter);
 				break;
 			default:
 				oHeader = new Header(sId, mConfiguration, oToolbar, oCard._oIconFormatter);
@@ -95,6 +95,12 @@ sap.ui.define([
 		oHeader.setDataProviderFactory(oCard._oDataProviderFactory);
 		oHeader._setDataConfiguration(mConfiguration.data);
 
+		oHeader.setProperty("useTileLayout", oCard.isTileDisplayVariant());
+
+		if (oCard.isTileDisplayVariant() && !mConfiguration.titleMaxLines) {
+			oHeader.setTitleMaxLines(2);
+		}
+
 		var oActions = new CardActions({
 			card: oCard
 		});

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

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -66,7 +66,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -8,9 +8,18 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/model/odata/v4/ODataUtils",
 	"sap/ui/core/Core",
+	"sap/ui/core/Configuration",
 	"sap/base/util/fetch",
 	"sap/base/util/deepClone"
-], function (DataProvider, Log, ODataUtils, Core, fetch, deepClone) {
+], function (
+	DataProvider,
+	Log,
+	ODataUtils,
+	Core,
+	Configuration,
+	fetch,
+	deepClone
+) {
 	"use strict";
 
 	/**
@@ -65,7 +74,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.DataProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 *
 	 * @constructor
 	 * @private
@@ -239,7 +248,8 @@ sap.ui.define([
 	};
 
 	RequestDataProvider.prototype._request = function (oRequest, bNoRetry) {
-		var fnFetch = this._getFetchMethod();
+		var fnFetch = this._getFetchMethod(this._getRequestSettings());
+
 		return fnFetch(oRequest.url, oRequest.options)
 			.then(function (oResponse) {
 				if (this.bIsDestroyed) {
@@ -340,11 +350,11 @@ sap.ui.define([
 	/**
 	 * Gets the method which should execute the HTTP fetch.
 	 * @private
+	 * @param {object} oRequestSettings settings in manifest format
 	 * @returns {Function} The function to use for HTTP fetch.
 	 */
-	RequestDataProvider.prototype._getFetchMethod = function () {
-		var oRequestSettings = this.getSettings().request,
-			oCard = Core.byId(this.getCard()),
+	RequestDataProvider.prototype._getFetchMethod = function (oRequestSettings) {
+		var oCard = Core.byId(this.getCard()),
 			oExtension = oCard && oCard.getAggregation("_extension"),
 			oHost = Core.byId(this.getHost());
 
@@ -363,6 +373,10 @@ sap.ui.define([
 		return fetch;
 	};
 
+	RequestDataProvider.prototype._getRequestSettings = function () {
+		return this.getSettings().request;
+	};
+
 	/**
 	 * Checks if header with given value is part of the request.
 	 * Header name is case-insensitive, but the value is case-sensitive (RFC7230 https://tools.ietf.org/html/rfc7230#section-3.2).
@@ -466,24 +480,28 @@ sap.ui.define([
 	/**
 	 * Override if modification to the request is needed.
 	 * Allows the host to modify the headers or the full request.
-	 * @param {Object} oRequest The current request.
-	 * @param {Object} oSettings The request settings
-	 * @returns {map} The modified headers
+	 * @param {object} oRequest The current request.
+	 * @param {object} oSettings The request settings
+	 * @returns {object} The modified request
 	 */
 	RequestDataProvider.prototype._modifyRequestBeforeSent = function (oRequest, oSettings) {
 		var oCard = Core.byId(this.getCard()),
-			oHost = Core.byId(this.getHost()),
-			oModifiedHeaders;
+			oHost = Core.byId(this.getHost());
 
 		if (!oHost) {
 			return oRequest;
 		}
 
+		/**
+		 * @deprecated since 1.113
+		 */
 		if (oHost.modifyRequestHeaders) {
-			oModifiedHeaders = oHost.modifyRequestHeaders(Object.fromEntries(oRequest.options.headers), oSettings, oCard);
-			oRequest.options.headers = new Headers(oModifiedHeaders);
+			oRequest.options.headers = new Headers(oHost.modifyRequestHeaders(Object.fromEntries(oRequest.options.headers), oSettings, oCard));
 		}
 
+		/**
+		 * @deprecated since 1.113
+		 */
 		if (oHost.modifyRequest) {
 			oRequest = oHost.modifyRequest(oRequest, oSettings, oCard);
 		}

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.117.0
+	 * @version 1.118.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.117.0
+	 * @version 1.118.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.117.0
+	 * @version 1.118.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.117.0
+	 * @version 1.118.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.117.0
+	 * @version 1.118.0
 	 *
 	 * @private
 	 * @alias sap.ui.integration.util.Validators

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

@@ -31,7 +31,7 @@ function (includeScript) {
 	 * @public
 	 */
 	return function () {
-		return includeScript("sap-ui-integration-cardEditor.js")
+		return includeScript({ url: "sap-ui-integration-cardEditor.js" })
 			.then(loadCardEditor)
 			.catch(loadCardEditor);
 	};

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

@@ -114,6 +114,8 @@ sap.ui.define([
 
 	var CardDesign = library.CardDesign;
 
+	var CardDisplayVariant = library.CardDisplayVariant;
+
 	var CardPreviewMode = library.CardPreviewMode;
 
 	var CardBlockingMessageType = library.CardBlockingMessageType;
@@ -183,7 +185,7 @@ sap.ui.define([
 	 * @extends sap.f.CardBase
 	 *
 	 * @author SAP SE
-	 * @version 1.117.0
+	 * @version 1.118.0
 	 * @public
 	 * @constructor
 	 * @see {@link topic:5b46b03f024542ba802d99d67bc1a3f4 Cards}
@@ -311,6 +313,17 @@ sap.ui.define([
 					defaultValue: CardDesign.Solid
 				},
 
+				/**
+				 * Defines the display variant for card rendering and behavior.
+				 * @experimental Since 1.118. For usage only by Work Zone.
+				 * @since 1.118
+				 */
+				displayVariant: {
+					type: "sap.ui.integration.CardDisplayVariant",
+					group: "Appearance",
+					defaultValue: CardDisplayVariant.Standard
+				},
+
 				/**
 				 * Preview mode of the <code>Card</code>.
 				 * Helpful in scenarios when the end user is choosing or configuring a card.
@@ -542,7 +555,7 @@ sap.ui.define([
 		 * @experimental since 1.79
 		 * @public
 		 * @author SAP SE
-		 * @version 1.117.0
+		 * @version 1.118.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
@@ -2043,7 +2056,7 @@ sap.ui.define([
 		this.destroyAggregation("_content");
 		this._ariaText.setText(sAriaText);
 
-		if (!oContentManifest) {
+		if (!oContentManifest || this.isTileDisplayVariant()) {
 			this.fireEvent("_contentReady");
 			return;
 		}
@@ -2070,6 +2083,15 @@ sap.ui.define([
 		this._setCardContent(oContent);
 	};
 
+	/**
+	 * @private
+	 * @ui5-restricted sap.ui.integration
+	 * @returns {boolean} If the card is rendered as a tile variant
+	 */
+	Card.prototype.isTileDisplayVariant = function () {
+		return [CardDisplayVariant.TileStandard, CardDisplayVariant.TileStandardWide].indexOf(this.getDisplayVariant()) > -1;
+	};
+
 	Card.prototype.createHeader = function () {
 		var oManifestHeader = this._oCardManifest.get(MANIFEST_PATHS.HEADER),
 			oHeaderFactory = new HeaderFactory(this);
@@ -2169,7 +2191,7 @@ sap.ui.define([
 			mMessageSettings = ErrorHandler.configureErrorInfo(mErrorInfo, this);
 		}
 
-		if (oContentSection || bIsComponentCard) {
+		if (!this.isTileDisplayVariant() && (oContentSection || bIsComponentCard)) {
 			if (oContent && oContent.isA("sap.ui.integration.cards.BaseContent")) {
 				this.showBlockingMessage(mMessageSettings);
 			} else { // case where error ocurred during content creation

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

@@ -44,6 +44,8 @@ sap.ui.define([
 			if (oCard.getPreviewMode() === CardPreviewMode.Abstract) {
 				oRm.class("sapFCardPreview");
 			}
+
+			oRm.class("sapUiIntCardDisplayVariant" + oCard.getDisplayVariant());
 		},
 
 		/**

package/src/sap-ui-integration.js

@@ -15,7 +15,7 @@
  * - Based on the dependencies (tags that should be used) automatic registration of these tags
  *   tags are additionally maintained in the library.js file
  * Usage:
- *   <script src="https://some/path/sap-ui-integration.js" id="sap-ui-bootstrap" data-sap-ui-theme="sap_fiori_3">
+ *   <script src="https://some/path/sap-ui-integration.js" id="sap-ui-bootstrap" data-sap-ui-theme="sap_horizon">
  *   </script>
  *
  *   <ui-integration-card manifest="./path/to/manifest"></ui-integration-card>