@openui5/sap.ui.integration 1.140.0 → 1.141.1

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

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * Utility class helping with analytics cloud widget.
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 *
 	 * @private
 	 * @alias sap.ui.integration.util.AnalyticsCloudHelper

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.140.0
+	 * @version 1.141.1
 	 *
 	 * @constructor
 	 * @private

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

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

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

@@ -34,7 +34,7 @@ sap.ui.define([
 		 * Resolves a binding syntax based on a provided model and path.
 		 *
 		 * @author SAP SE
-		 * @version 1.140.0
+		 * @version 1.141.1
 		 *
 		 * @private
 		 * @ui5-restricted sap.ushell

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

@@ -20,6 +20,11 @@ sap.ui.define([
 		layers: { "admin": 0, "content": 5, "translation": 10, "all": 20 },
 		mergeManifestPathChanges: function (oModel, oChange) {
 			Object.keys(oChange).forEach(function (s) {
+				// don't merge manifest changes for child cards
+				if (s.match(/^\/sap.card\/configuration\/childCards\/.+\/_manifestChanges$/)) {
+					return;
+				}
+
 				if (s.charAt(0) === "/") {
 					var value = oChange[s];
 					CardMerger.updateManifestProperty(oModel, s, value);
@@ -173,6 +178,15 @@ sap.ui.define([
 				oModel.setProperty(sManifestPath, oValue);
 				return;
 			}
+		},
+		extractChildCardChanges: function (aManifestChanges, sChildCardKey) {
+			return aManifestChanges.map((oChanges) => {
+				const sChangesPath = `/sap.card/configuration/childCards/${sChildCardKey}/_manifestChanges`;
+
+				return oChanges[sChangesPath];
+			}).filter((oChanges) => {
+				return oChanges && Object.keys(oChanges).length > 0;
+			});
 		}
 	};
 

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

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 *
 	 * @constructor
 	 * @private

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

@@ -11,7 +11,7 @@ sap.ui.define([], function () {
 	 * Utility class helping with sap.m.ComboBox control.
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 *
 	 * @private
 	 * @alias sap.ui.integration.util.ComboBoxHelper

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

@@ -50,7 +50,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.BaseFactory
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 *
 	 * @constructor
 	 * @private

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

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 *
 	 * @constructor
 	 * @param {object} mSettings Token handler settings

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

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 *
 	 * @constructor
 	 * @private

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

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

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

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 *
 	 * @constructor
 	 * @param {sap.ui.integration.Host} oHost The Host which will be used for resolving destinations.

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

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 *
 	 * @constructor
 	 * @param {sap.ui.integration.widgets.Card} oCard The card.

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

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * Utility class for handling errors in the cards.
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 *
 	 * @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.140.0
+	 * @version 1.141.1
 	 *
 	 * @constructor
 	 * @private

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.140.0
+	 * @version 1.141.1
 	 *
 	 * @private
 	 * @ui5-restricted

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

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.BaseFactory
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 *
 	 * @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.140.0
+	 * @version 1.141.1
 	 *
 	 * @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.140.0
+	 * @version 1.141.1
 	 *
 	 * @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.140.0
+	 * @version 1.141.1
 	 *
 	 * @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.140.0
+	 * @version 1.141.1
 	 *
 	 * @private
 	 * @alias sap.ui.integration.util.OAuth3LOHelper

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * Utility class for creating objects.
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 *
 	 * @private
 	 * @alias sap.ui.integration.util.ObjectFactory

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

@@ -74,7 +74,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.DataProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 *
 	 * @constructor
 	 * @private

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.140.0
+	 * @version 1.141.1
 	 *
 	 * @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.140.0
+	 * @version 1.141.1
 	 *
 	 * @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.140.0
+	 * @version 1.141.1
 	 *
 	 * @constructor
 	 * @private

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

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * Utility class helping with sap.ui.model.Sorter control.
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 *
 	 * @private
 	 * @alias sap.ui.integration.util.SorterHelper

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.140.0
+	 * @version 1.141.1
 	 *
 	 * @private
 	 * @alias sap.ui.integration.util.Utils
@@ -68,7 +68,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Replace underline to dash of language codes in translation texts of changes
+	 * Replace underscore with hyphen of language codes in translation texts of changes
 	 * @returns {object} translation texts
 	 */
 	Utils.formatLanguageCodesInTranslationTexts = function(oTexts) {

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

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

@@ -100,7 +100,8 @@ sap.ui.define([
 		CSRF_TOKENS: "/sap.card/configuration/csrfTokens",
 		FILTERS: "/sap.card/configuration/filters",
 		NO_DATA_MESSAGES: "/sap.card/configuration/messages/noData",
-		MODEL_SIZE_LIMIT: "/sap.card/configuration/modelSizeLimit"
+		MODEL_SIZE_LIMIT: "/sap.card/configuration/modelSizeLimit",
+		CHILD_CARDS: "/sap.card/configuration/childCards"
 	};
 
 	const RESERVED_PARAMETER_NAMES = ["visibleItems", "allItems"];
@@ -190,7 +191,7 @@ sap.ui.define([
 	 * @extends sap.f.CardBase
 	 *
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.1
 	 * @public
 	 * @constructor
 	 * @see {@link topic:5b46b03f024542ba802d99d67bc1a3f4 Cards}
@@ -636,7 +637,7 @@ sap.ui.define([
 		 * @experimental since 1.79
 		 * @public
 		 * @author SAP SE
-		 * @version 1.140.0
+		 * @version 1.141.1
 		 * @borrows sap.ui.integration.widgets.Card#getId as getId
 		 * @borrows sap.ui.integration.widgets.Card#getDomRef as getDomRef
 		 * @borrows sap.ui.integration.widgets.Card#setVisible as setVisible
@@ -1927,6 +1928,7 @@ sap.ui.define([
 		this._applyPaginatorManifestSettings();
 		this._applyFooterManifestSettings();
 		this._applyContentManifestSettings();
+		this._validateChildCardsManifestSettings();
 
 		this.fireManifestApplied();
 	};
@@ -2240,6 +2242,44 @@ sap.ui.define([
 		this.getAggregation("_loadingProvider").applyDelay(iLoadingDelay);
 	};
 
+	Card.prototype._validateChildCardsManifestSettings = function () {
+		const mChildCards = this._oCardManifest.get(MANIFEST_PATHS.CHILD_CARDS);
+
+		if (!mChildCards) {
+			return;
+		}
+
+		let oAncestor = this;
+		let sMatchingChildManifestUrl;
+
+		while (oAncestor) {
+			for (const { manifest } of Object.values(mChildCards)) {
+				let sAncestorUrl;
+
+				if (typeof oAncestor.getManifest() === "string") {
+					sAncestorUrl = new URL(oAncestor.getManifest(), window.location).href;
+				}
+
+				if (new URL(this.getRuntimeUrl(manifest), window.location).href === sAncestorUrl) {
+					sMatchingChildManifestUrl = manifest;
+					break;
+				}
+			}
+
+			oAncestor =  Element.getElementById(oAncestor.getAssociation("openerReference"));
+		}
+
+		if (sMatchingChildManifestUrl) {
+			const oError = new Error("One of the card's ancestors, or the card itself, is set as its child, which is not allowed. Remove child with manifest '" + sMatchingChildManifestUrl + "' from the child cards configuration.");
+			this._handleError({
+				illustrationType: IllustratedMessageType.UnableToLoad,
+				title: oResourceBundle.getText("CARD_ERROR_CONFIGURATION_TITLE"),
+				description: oResourceBundle.getText("CARD_ERROR_CONFIGURATION_DESCRIPTION"),
+				originalError: oError
+			});
+		}
+	};
+
 	/**
 	 * Gets the instance of the <code>host</code> association.
 	 *
@@ -3311,15 +3351,17 @@ sap.ui.define([
 	};
 
 	/**
-	 * Shows a child card. By default opens in a dialog.
+	 * Displays a child card, opening it in a dialog by default.
+	 *
 	 * @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.
+	 * @param {object} oParameters The settings for displaying the card.
+	 * @param {string} oParameters.childCardKey Key of the child card to be shown.
+	 * @param {string|object} oParameters.manifest The URL to a manifest or the manifest object itself. Deprecated since 1.141. Use 'childCardKey' instead.
+	 * @param {string} oParameters.baseUrl If the manifest is an object, specify the base URL for the card.
+	 * @param {object} oParameters.parameters Parameters to be provided to the new card.
+	 * @param {object} oParameters.data Data to be provided to the new card.
+	 * @returns {Promise} A promise that resolves with the created card.
 	 */
 	Card.prototype.showCard = function (oParameters) {
 		var oChildCard = this._createChildCard(oParameters);
@@ -3362,21 +3404,34 @@ sap.ui.define([
 	};
 
 	/**
-	 * Creates the child card.
+	 * Creates a child card with the provided parameters.
 	 *
 	 * @private
 	 * @ui5-restricted
-	 * @param {Object} oParameters The parameters for the card.
-	 * @returns {sap.ui.integration.widgets.Card} The result card.
+	 * @param {Object} oParameters The parameters for the card creation.
+	 * @returns {sap.ui.integration.widgets.Card} The newly created card instance.
 	 */
 	Card.prototype._createChildCard = function (oParameters) {
-		var vManifest = oParameters.manifest,
-			sBaseUrl = oParameters.baseUrl,
+		const mChildCards = this._oCardManifest.get(MANIFEST_PATHS.CHILD_CARDS);
+		let vManifest;
+
+		if (oParameters.childCardKey) {
+			vManifest = mChildCards?.[oParameters.childCardKey]?.manifest;
+
+			if (!vManifest) {
+				Log.error("'ShowCard' action cannot find a child card with key '" + oParameters.childCardKey + "'.", null, "sap.ui.integration.widgets.Card");
+			}
+		} else {
+			vManifest = oParameters.manifest;
+		}
+
+		const sBaseUrl = oParameters.baseUrl,
 			oData = oParameters.data,
 			oChildCard = this._createCard({
 				host: this.getHostInstance(),
 				parameters: oParameters.parameters,
-				referenceId: this.getReferenceId()
+				referenceId: this.getReferenceId(),
+				manifestChanges: oParameters.manifestChanges
 			});
 
 		oChildCard.setAssociation("openerReference", this);

package/ui5.yaml

@@ -25,15 +25,14 @@ builder:
           - mode: preload
             name: sap-ui-integration
             filters:
+              - sap/ui/core/boot/
               - sap/ui/core/Core.js
               - sap/ui/core/CustomData.js
               - sap/ui/core/UIComponent.js
-              - sap/ui/core/boot/FieldHelpEndpoint.js
-              - sap/ui/core/boot/KeyboardInteractionEndpoint.js
               - sap/ui/core/mvc/XMLView.js
               - sap/ui/integration/
               - sap/f/cards/
-              - sap/ui/core/date/Gregorian.js
+              - sap/ui/core/date/
               - "!sap/ui/integration/sap-ui-integration-config.js"
               - "!sap/ui/integration/customElements/CustomElementCardEditor.js"
               - "!sap/ui/integration/customElements/CustomElementEditor.js"
@@ -90,15 +89,14 @@ builder:
         sections:
           - mode: provided
             filters:
+              - sap/ui/core/boot/
               - sap/ui/core/Core.js
               - sap/ui/core/CustomData.js
               - sap/ui/core/UIComponent.js
-              - sap/ui/core/boot/FieldHelpEndpoint.js
-              - sap/ui/core/boot/KeyboardInteractionEndpoint.js
               - sap/ui/core/mvc/XMLView.js
               - sap/ui/integration/
               - sap/f/cards/
-              - sap/ui/core/date/Gregorian.js
+              - sap/ui/core/date/
               - "!sap/ui/integration/sap-ui-integration-config.js"
               - "!sap/ui/integration/customElements/CustomElementCardEditor.js"
               - "!sap/ui/integration/customElements/CustomElementEditor.js"
@@ -161,16 +159,15 @@ builder:
           - mode: preload
             name: sap-ui-integration
             filters:
+              - sap/ui/core/boot/
               - sap/ui/thirdparty/jquery-compat.js
               - sap/ui/core/Core.js
               - sap/ui/core/CustomData.js
               - sap/ui/core/UIComponent.js
-              - sap/ui/core/boot/FieldHelpEndpoint.js
-              - sap/ui/core/boot/KeyboardInteractionEndpoint.js
               - sap/ui/core/mvc/XMLView.js
               - sap/ui/integration/
               - sap/f/cards/
-              - sap/ui/core/date/Gregorian.js
+              - sap/ui/core/date/
               - "!sap/ui/thirdparty/jquery.js"
               - "!sap/ui/thirdparty/jquery-mobile-custom.js"
               - "!sap/ui/integration/sap-ui-integration-config.js"
@@ -203,6 +200,7 @@ builder:
             name: sap-ui-integration-nojQuery-ext.js
             filters:
                - sap/ui/core/
+               - "!sap/ui/thirdparty/jquery*"
                - "!sap/ui/core/support/"
                - "!sap/ui/core/plugin/"
                - sap/ui/integration/
@@ -229,16 +227,15 @@ builder:
         sections:
           - mode: provided
             filters:
+              - sap/ui/core/boot/
               - sap/ui/thirdparty/jquery-compat.js
               - sap/ui/core/Core.js
               - sap/ui/core/CustomData.js
               - sap/ui/core/UIComponent.js
-              - sap/ui/core/boot/FieldHelpEndpoint.js
-              - sap/ui/core/boot/KeyboardInteractionEndpoint.js
               - sap/ui/core/mvc/XMLView.js
               - sap/ui/integration/
               - sap/f/cards/
-              - sap/ui/core/date/Gregorian.js
+              - sap/ui/core/date/
               - "!sap/ui/thirdparty/jquery.js"
               - "!sap/ui/thirdparty/jquery-mobile-custom.js"
               - "!sap/ui/integration/sap-ui-integration-config.js"
@@ -268,6 +265,7 @@ builder:
             name: sap-ui-integration-nojQuery-ext.js
             filters:
               - sap/ui/core/
+              - "!sap/ui/thirdparty/jquery*"
               - "!sap/ui/core/support/"
               - "!sap/ui/core/plugin/"
               - sap/ui/integration/