@openui5/sap.ui.integration 1.128.0 → 1.130.0

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.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private
@@ -44,24 +44,24 @@ sap.ui.define(["sap/ui/integration/util/DataProvider"], function (DataProvider)
 	 * @returns {Promise} A promise resolved when the data is available and rejected in case of an error.
 	 */
 	ExtensionDataProvider.prototype.getData = function () {
-		var oExtensionSettings = this.getSettings().extension;
+		const oConfiguration = this.getResolvedConfiguration().extension;
 
 		if (!this._oExtension) {
 			return Promise.reject("The extension module is not loaded properly or doesn't export a correct value.");
 		}
 
-		if (!this._oExtension[oExtensionSettings.method]) {
-			return Promise.reject("Extension doesn't implement " + oExtensionSettings.method + " method.");
+		if (!this._oExtension[oConfiguration.method]) {
+			return Promise.reject("Extension doesn't implement " + oConfiguration.method + " method.");
 		}
 
-		return this._oExtension[oExtensionSettings.method].apply(this._oExtension, oExtensionSettings.args);
+		return this._oExtension[oConfiguration.method].apply(this._oExtension, oConfiguration.args);
 	};
 
 	/**
  	 * @override
  	 */
 	ExtensionDataProvider.prototype.getDetails = function () {
-		return "Load data from Extension. Method: " + this.getSettings().extension.method;
+		return "Load data from Extension. Method: " + this.getResolvedConfiguration().extension.method;
 	};
 
 	return ExtensionDataProvider;

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

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

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

@@ -15,7 +15,8 @@ sap.ui.define([
 	"sap/ui/integration/cards/NumericHeader",
 	"sap/ui/integration/cards/Header",
 	"sap/ui/integration/util/Utils",
-	"sap/m/Button"
+	"sap/m/Button",
+	"sap/m/AvatarImageFitType"
 ], function (
 	BaseFactory,
 	Log,
@@ -28,7 +29,8 @@ sap.ui.define([
 	NumericHeader,
 	Header,
 	Utils,
-	Button
+	Button,
+	AvatarImageFitType
 ) {
 	"use strict";
 
@@ -50,7 +52,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.BaseFactory
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private
@@ -72,7 +74,7 @@ sap.ui.define([
 
 		mConfiguration = this.createBindingInfos(mConfiguration, oCard.getBindingNamespaces());
 
-		if (bIsInDialog) {
+		if (bIsInDialog && !oCard.hasPaginator()) {
 			oToolbar = this._createCloseButton(mConfiguration);
 		}
 
@@ -163,6 +165,10 @@ sap.ui.define([
 			oHeader.setTitleMaxLines(bIsFlatTile ? 1 : 2);
 		}
 
+		if (!mConfiguration.icon?.fitType) {
+			oHeader.setIconFitType(AvatarImageFitType.Contain);
+		}
+
 		if (bIsFlatTile) {
 			oHeader.setIconSize("XS");
 

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.128.0
+	 * @version 1.130.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.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -68,7 +68,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -18,7 +18,7 @@ sap.ui.define([], function () {
 	 * Utility class helping with OAuth 3LO flow handling.
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @private
 	 * @alias sap.ui.integration.util.OAuth3LOHelper

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

@@ -72,7 +72,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.DataProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private
@@ -127,8 +127,8 @@ sap.ui.define([
 	 * @override
 	 */
 	RequestDataProvider.prototype.getData = function () {
-		var oRequestConfig = this.getSettings().request,
-			pRequestChain = Promise.resolve(oRequestConfig);
+		const oRequestConfig = this._getResolvedRequestConfiguration();
+		let pRequestChain = Promise.resolve(oRequestConfig);
 
 		if (this._oDestinations) {
 			pRequestChain = this._oDestinations.process(oRequestConfig);
@@ -156,6 +156,25 @@ sap.ui.define([
 		return DataProvider.prototype.triggerDataUpdate.apply(this, arguments);
 	};
 
+	/**
+	 * @override
+	 */
+	RequestDataProvider.prototype.getResolvedConfiguration = function () {
+		const oConfiguration = DataProvider.prototype.getResolvedConfiguration.apply(this, arguments);
+
+		this._reviveFormData(oConfiguration);
+
+		return oConfiguration;
+	};
+
+	RequestDataProvider.prototype._reviveFormData = function (oResolvedConfiguration) {
+		const oConfiguration = this.getConfiguration();
+
+		if (oConfiguration?.request?.parameters instanceof FormData) {
+			oResolvedConfiguration.request.parameters = oConfiguration.request.parameters;
+		}
+	};
+
 	RequestDataProvider.prototype._handleExpiredToken = function (oError) {
 		if (!this._oCsrfTokenHandler.isExpiredToken(this.getLastResponse())) {
 			throw oError;
@@ -209,6 +228,8 @@ sap.ui.define([
 				vBody = JSON.stringify(oParameters);
 			} else if (bGetMethod) {
 				sUrl = combineUrlAndParams(sUrl, oParameters);
+			} else if (oParameters instanceof FormData) {
+				vBody = oParameters;
 			} else {
 				// application/x-www-form-urlencoded
 				vBody = new URLSearchParams(oParameters);
@@ -242,7 +263,7 @@ sap.ui.define([
 			oRequest.options.headers.set("Accept", mDataTypeHeaders[sDataType]);
 		}
 
-		oRequest = this._modifyRequestBeforeSent(oRequest, this.getSettings());
+		oRequest = this._modifyRequestBeforeSent(oRequest, this.getResolvedConfiguration());
 
 		if (!this._isValidRequest(oRequest)) {
 			Log.error(sMessage);
@@ -262,7 +283,7 @@ sap.ui.define([
 	};
 
 	RequestDataProvider.prototype._request = function (oRequest, bNoRetry) {
-		var fnFetch = this._getFetchMethod(this._getRequestSettings());
+		var fnFetch = this._getFetchMethod(this._getResolvedRequestConfiguration());
 
 		return fnFetch(oRequest.url, oRequest.options)
 			.then(function (oResponse) {
@@ -342,7 +363,7 @@ sap.ui.define([
 	 * @returns {int} The number of seconds after which to retry the request.
 	 */
 	RequestDataProvider.prototype._getRetryAfter = function (oResponse) {
-		var oRequestConfig = this.getSettings().request,
+		const oRequestConfig = this._getResolvedRequestConfiguration(),
 			vRetryAfter = oResponse.headers.get("Retry-After") || oRequestConfig.retryAfter;
 
 		if (!vRetryAfter) {
@@ -364,31 +385,48 @@ sap.ui.define([
 	/**
 	 * Gets the method which should execute the HTTP fetch.
 	 * @private
-	 * @param {object} oRequestSettings settings in manifest format
+	 * @param {object} oRequestConfiguration Configuration in manifest format
 	 * @returns {Function} The function to use for HTTP fetch.
 	 */
-	RequestDataProvider.prototype._getFetchMethod = function (oRequestSettings) {
-		var oCard = Element.getElementById(this.getCard()),
+	RequestDataProvider.prototype._getFetchMethod = function (oRequestConfiguration) {
+		var oCard = this.getCardInstance(),
 			oExtension = oCard && oCard.getAggregation("_extension"),
 			oHost = Element.getElementById(this.getHost());
 
 		if (oExtension) {
-			return function (sResource, mOptions) {
-				return oExtension.fetch(sResource, mOptions, deepClone(oRequestSettings, 1000));
+			return (sResource, mOptions) => {
+				return oExtension.fetch(sResource, mOptions, this._cloneRequestConfiguration(oRequestConfiguration));
 			};
 		}
 
 		if (oHost) {
-			return function (sResource, mOptions) {
-				return oHost.fetch(sResource, mOptions, deepClone(oRequestSettings, 1000), oCard);
+			return (sResource, mOptions) => {
+				return oHost.fetch(sResource, mOptions, this._cloneRequestConfiguration(oRequestConfiguration), oCard);
 			};
 		}
 
 		return fetch;
 	};
 
-	RequestDataProvider.prototype._getRequestSettings = function () {
-		return this.getSettings().request;
+	RequestDataProvider.prototype._getResolvedRequestConfiguration = function () {
+		return this.getResolvedConfiguration().request;
+	};
+
+	RequestDataProvider.prototype._cloneRequestConfiguration = function (oRequestConfiguration) {
+		let oFormData;
+
+		if (oRequestConfiguration?.parameters instanceof FormData) {
+			oFormData = oRequestConfiguration.parameters;
+			delete oRequestConfiguration.parameters;
+		}
+
+		const oClonedConfiguration = deepClone(oRequestConfiguration, 1000);
+
+		if (oFormData) {
+			oClonedConfiguration.parameters = oFormData;
+		}
+
+		return oClonedConfiguration;
 	};
 
 	/**
@@ -495,11 +533,11 @@ 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
+	 * @param {object} oConfiguration The request configuration
 	 * @returns {object} The modified request
 	 */
-	RequestDataProvider.prototype._modifyRequestBeforeSent = function (oRequest, oSettings) {
-		var oCard = Element.getElementById(this.getCard()),
+	RequestDataProvider.prototype._modifyRequestBeforeSent = function (oRequest, oConfiguration) {
+		var oCard = this.getCardInstance(),
 			oHost = Element.getElementById(this.getHost());
 
 		if (!oHost) {
@@ -510,14 +548,14 @@ sap.ui.define([
 		 * @deprecated since 1.113
 		 */
 		if (oHost.modifyRequestHeaders) {
-			oRequest.options.headers = new Headers(oHost.modifyRequestHeaders(Object.fromEntries(oRequest.options.headers), oSettings, oCard));
+			oRequest.options.headers = new Headers(oHost.modifyRequestHeaders(Object.fromEntries(oRequest.options.headers), oConfiguration, oCard));
 		}
 
 		/**
 		 * @deprecated since 1.113
 		 */
 		if (oHost.modifyRequest) {
-			oRequest = oHost.modifyRequest(oRequest, oSettings, oCard);
+			oRequest = oHost.modifyRequest(oRequest, oConfiguration, oCard);
 		}
 
 		return oRequest;
@@ -527,7 +565,7 @@ sap.ui.define([
 	 * @override
 	 */
 	RequestDataProvider.prototype.getDetails = function () {
-		return "Backend interaction - load data from URL: " + this.getSettings().request.url;
+		return "Backend interaction - load data from URL: " + this._getResolvedRequestConfiguration().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.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private
@@ -50,12 +50,14 @@ sap.ui.define(["sap/ui/integration/util/DataProvider"], function (DataProvider)
 	 */
 	ServiceDataProvider.prototype.createServiceInstances = function (oServiceManager) {
 		this._oServiceManager = oServiceManager;
+		const oConfiguration = this.getResolvedConfiguration();
 
-		if (!this.getSettings() || !this.getSettings().service) {
+		if (!oConfiguration || !oConfiguration.service) {
 			return;
 		}
 
-		var vService = this.getSettings().service;
+		let vService = oConfiguration.service;
+
 		if (vService && typeof vService === "object") {
 			vService = vService.name;
 		}
@@ -69,14 +71,14 @@ sap.ui.define(["sap/ui/integration/util/DataProvider"], function (DataProvider)
 	 * @param {string} sServiceName The name of the service to create an instance of.
 	 */
 	ServiceDataProvider.prototype._createServiceInstance = function (sServiceName) {
-		var oDataSettings = this.getSettings();
+		const oConfiguration = this.getResolvedConfiguration();
 
 		this._oDataServicePromise = this._oServiceManager
 			.getService(sServiceName)
 			.then(function (oDataService) {
 				oDataService.attachDataChanged(function (oEvent) {
 					this.fireDataChanged({ data: oEvent.data });
-				}.bind(this), oDataSettings.service.parameters);
+				}.bind(this), oConfiguration.service.parameters);
 
 				return oDataService;
 			}.bind(this));
@@ -87,8 +89,8 @@ sap.ui.define(["sap/ui/integration/util/DataProvider"], function (DataProvider)
 	 * @returns {Promise} A promise resolved when the data is available and rejected in case of an error.
 	 */
 	ServiceDataProvider.prototype.getData = function () {
-		var oDataSettings = this.getSettings();
-		var oService = oDataSettings.service;
+		const oConfiguration = this.getResolvedConfiguration();
+		const oService = oConfiguration.service;
 
 		return new Promise(function (resolve, reject) {
 			if (oService && this._oDataServicePromise) {

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.128.0
+	 * @version 1.130.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.128.0
+	 * @version 1.130.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * Utility class helping with JSON strings and formatters.
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.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.128.0
+	 * @version 1.130.0
 	 *
 	 * @private
 	 * @alias sap.ui.integration.util.Validators

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

@@ -0,0 +1,191 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"sap/m/Dialog",
+	"sap/ui/Device",
+	"sap/ui/core/Element",
+	"sap/ui/integration/library",
+	// jQuery Plugin "firstFocusableDomRef", "lastFocusableDomRef"
+	"sap/ui/dom/jquery/Focusable"
+], (
+	Dialog,
+	Device,
+	Element,
+	library
+) => {
+	"use strict";
+
+	const CardDataMode = library.CardDataMode;
+
+	function _addDimensionsDelegate(oDialog, oParentCard, bSetMinSize) {
+		const oChildCard = oDialog.getContent()[0];
+		let bSetMaxDimensions = true;
+
+		oChildCard.addEventDelegate({
+			onAfterRendering: () => {
+				const oChildCardDomRef = oChildCard.getDomRef();
+
+				if (bSetMinSize) {
+					oChildCardDomRef.style.minHeight = oParentCard.getDomRef().offsetHeight + "px";
+					oChildCardDomRef.style.minWidth = oParentCard.getDomRef().offsetWidth + "px";
+				}
+
+				if (bSetMaxDimensions) {
+					oChildCardDomRef.style.maxHeight = oDialog._getAreaDimensions().height * 70 / 100 + "px";
+					oChildCardDomRef.style.maxWidth = oDialog._getAreaDimensions().width * 70 / 100 + "px";
+				} else {
+					oChildCardDomRef.style.maxHeight = "";
+					oChildCardDomRef.style.maxWidth = "";
+				}
+			}
+		});
+
+		oDialog.addEventDelegate({
+			onmousedown: (e) => {
+				if (e.target.closest(".sapMDialogResizeHandle")) {
+					bSetMaxDimensions = false;
+				}
+			},
+			onAfterRendering: () => {
+				oDialog.getDomRef().style.minHeight = "8.25rem";
+			}
+		});
+	}
+
+	function _addAnimationDelegate(oDialog, oParentCard) {
+		const oParentRect = oParentCard.getDomRef().getBoundingClientRect();
+		const oParentPos = {
+			top: Math.round(oParentRect.top) + window.scrollX,
+			left: Math.round(oParentRect.left) + window.scrollX,
+			width: Math.round(oParentRect.width),
+			height: Math.round(oParentRect.height)
+		};
+
+		oDialog.attachBeforeClose(() => {
+			const oDialogRef = oDialog.getDomRef();
+
+			oDialogRef.classList.add("sapUiIntCardDialogAnimate");
+			oDialogRef.style.top = oParentPos.top + "px";
+			oDialogRef.style.left = oParentPos.left + "px";
+		});
+
+		oDialog.addEventDelegate({
+			onAfterRendering: () => {
+				const oDialogRef = oDialog.getDomRef();
+
+				if (!oDialog.isOpen()) {
+					oDialogRef.classList.add("sapUiIntCardDialogAnimate");
+					oDialogRef.style.top = oParentPos.top + "px";
+					oDialogRef.style.left = oParentPos.left + "px";
+				}
+
+				const fnTransitionEnd = (oEvent) => {
+					if (["left", "right"].includes(oEvent.propertyName)) {
+						oDialogRef.classList.remove("sapUiIntCardDialogAnimate");
+						oDialogRef.removeEventListener("transitionend", fnTransitionEnd);
+					}
+				};
+
+				oDialogRef.addEventListener("transitionend", fnTransitionEnd);
+			}
+		});
+	}
+
+	function _addResizeDelegate(oDialog, oChildCard) {
+		const oDelegate = {
+			onmousedown: (e) => {
+				if (e.target.closest(".sapMDialogResizeHandle")) {
+					oChildCard.setHeight("100%");
+					oDialog.setContentHeight(oDialog.getDomRef("cont").offsetHeight + "px");
+					oDialog.setVerticalScrolling(false);
+					oDialog.removeEventDelegate(oDelegate);
+				}
+			}
+		};
+
+		oDialog.addEventDelegate(oDelegate);
+	}
+
+	function _openDialog(oChildCard, oParentCard, oParameters, bSetMinSize) {
+		oChildCard.setDisplayVariant("Large"); // always use large variant for dialog, scrolling content is possible
+		oParentCard.setBusy(true).setBusyIndicatorDelay(750);
+
+		const oDialog = new Dialog({
+				content: [
+					oChildCard
+				],
+				contentWidth: oParameters.width,
+				verticalScrolling: false,
+				horizontalScrolling: false,
+				draggable: true,
+				showHeader: false,
+				ariaLabelledBy: oChildCard.getId(),
+				escapeHandler: function (oPromise) {
+					oChildCard.hide();
+					oPromise.resolve();
+				},
+				resizable: oParameters.resizable,
+				afterOpen: () => {
+					oParentCard.setBusy(false);
+				},
+				afterClose: () => {
+					oDialog.destroy();
+				}
+			});
+
+		oDialog.addStyleClass("sapUiIntCardDialog");
+
+		oParentCard.addDependent(oDialog);
+		oChildCard.attachEventOnce("_ready", () => {
+			oDialog.open();
+			_setFocus(oChildCard, oDialog);
+		});
+
+		if (!Device.system.phone) {
+			_addDimensionsDelegate(oDialog, oParentCard, bSetMinSize);
+			_addAnimationDelegate(oDialog, oParentCard);
+			_addResizeDelegate(oDialog, oChildCard);
+		}
+
+		oChildCard.startManifestProcessing();
+
+		return oDialog;
+	}
+
+	function _setFocus(oCard, oDialog) {
+		var oFilters = oCard.getAggregation("_filter"),
+			oContent = oCard.getAggregation("_content"),
+			oFooter = oCard.getAggregation("_footer"),
+			oFirstFocusable;
+
+		oFirstFocusable = oFilters && oFilters.$().firstFocusableDomRef()
+			|| oContent && oContent.$().firstFocusableDomRef()
+			|| oFooter && oFooter.$().firstFocusableDomRef();
+
+		if (oFirstFocusable) {
+			oDialog.setInitialFocus(oFirstFocusable.id);
+			oFirstFocusable.focus();
+		}
+	}
+
+	function openCardDialog(oParentCard, oParameters, bSetMinSize = false) {
+		let oChildCard;
+
+		if (oParameters._cardId) {
+			oChildCard = Element.getElementById(oParameters._cardId);
+		} else {
+			oChildCard = oParentCard._createChildCard({
+				dataMode: CardDataMode.Active,
+				...oParameters
+			});
+		}
+
+		return _openDialog(oChildCard, oParentCard, oParameters, bSetMinSize);
+	}
+
+	return openCardDialog;
+});