@openui5/sap.ui.core 1.142.1 → 1.143.1

package/src/sap/ui/model/odata/v4/lib/_AggregationCache.js

@@ -309,6 +309,7 @@ sap.ui.define([
 	 * @throws {Error}
 	 *   If no recursive hierarchy is used
 	 *
+	 * @protected
 	 * @see sap.ui.model.odata.v4.lib._CollectionCache#requestSideEffects
 	 */
 	_AggregationCache.prototype.beforeRequestSideEffects = function (mQueryOptions) {
@@ -330,6 +331,7 @@ sap.ui.define([
 	 * @param {object} oNewValue - The new value, which usually just contains parts of the old
 	 * @throws {Error} In case of a structural change
 	 *
+	 * @protected
 	 * @see sap.ui.model.odata.v4.lib._CollectionCache#requestSideEffects
 	 */
 	_AggregationCache.prototype.beforeUpdateSelected = function (sPredicate, oNewValue) {
@@ -349,16 +351,13 @@ sap.ui.define([
 	 *   Whether no ("change") events should be fired
 	 * @param {boolean} [bNested]
 	 *   Whether the "collapse all" was performed at an ancestor
-	 * @param {string[]} [aKeptElementPredicates]
-	 *   The key predicates for all (effectively) kept-alive elements incl. exceptions of selection
 	 * @returns {number}
 	 *   The number of descendant nodes that were affected
 	 *
 	 * @public
 	 * @see #expand
 	 */
-	_AggregationCache.prototype.collapse = function (sGroupNodePath, oGroupLock, bSilent, bNested,
-			aKeptElementPredicates) {
+	_AggregationCache.prototype.collapse = function (sGroupNodePath, oGroupLock, bSilent, bNested) {
 		const oGroupNode = this.getValue(sGroupNodePath);
 		const oCollapsed = _AggregationHelper.getCollapsedObject(oGroupNode);
 		_Helper.updateAll(bSilent ? {} : this.mChangeListeners, sGroupNodePath, oGroupNode,
@@ -383,15 +382,13 @@ sap.ui.define([
 			if (_Helper.hasPrivateAnnotation(oElement, "placeholder")) {
 				continue;
 			}
-			const sPredicate = _Helper.getPrivateAnnotation(oElement, "predicate");
 			if (bAll && oElement["@$ui5.node.isExpanded"]) {
-				iRemaining
-					-= this.collapse(sPredicate, oGroupLock, bSilent, true, aKeptElementPredicates);
+				iRemaining -= this.collapse(
+					_Helper.getPrivateAnnotation(oElement, "predicate"), oGroupLock, bSilent, true);
 			}
 			// exceptions of selection are effectively kept alive
-			if (!this.isSelectionDifferent(oElement)
-					&& !aKeptElementPredicates?.includes(sPredicate)) {
-				delete aElements.$byPredicate[sPredicate];
+			if (!this.isSelectionDifferent(oElement)) {
+				delete aElements.$byPredicate[_Helper.getPrivateAnnotation(oElement, "predicate")];
 				delete aElements.$byPredicate[
 					_Helper.getPrivateAnnotation(oElement, "transientPredicate")];
 			}
@@ -550,7 +547,7 @@ sap.ui.define([
 		if (sParentPath) { // add @odata.bind to POST body only
 			_Helper.getPrivateAnnotation(oEntityData, "postBody")
 				[this.oAggregation.$ParentNavigationProperty + "@odata.bind"]
-					= _Helper.makeRelativeUrl("/" + sParentPath, "/" + this.sResourcePath);
+					= _Helper.makeRelativePath("/" + sParentPath, "/" + this.sResourcePath);
 		}
 
 		const bParentIsLeaf = oParentNode && oParentNode["@$ui5.node.isExpanded"] === undefined;
@@ -1456,6 +1453,24 @@ sap.ui.define([
 		this.oFirstLevel.restoreElement(iRank, oNode);
 	};
 
+	/**
+	 * Returns whether the given entity represents aggregated data.
+	 *
+	 * @param {object} oEntity - An entity
+	 * @returns {boolean} Whether the given entity is aggregated
+	 *
+	 * @protected
+	 * @see sap.ui.model.odata.v4.lib._Cache#drillDown
+	 * @see sap.ui.model.odata.v4.Context#isAggregated
+	 */
+	_AggregationCache.prototype.isAggregated = function (oEntity) {
+		const bAggregated = this.oAggregation.$leafLevelAggregated;
+		if (bAggregated === undefined) {
+			return false;
+		}
+		return bAggregated || oEntity["@$ui5.node.isExpanded"] !== undefined;
+	};
+
 	/**
 	 * Tells whether the first given node is an ancestor of (or the same as) the second given node
 	 * (in case of a recursive hierarchy).

package/src/sap/ui/model/odata/v4/lib/_Cache.js

@@ -803,7 +803,7 @@ sap.ui.define([
 							oEntity = oData;
 							iEntityPathLength = 0;
 						}
-						if (oEntity && !bAgain) {
+						if (oEntity && !bAgain && !that.isAggregated?.(oEntity)) {
 							vResult = that.fetchLateProperty(oGroupLock, oEntity,
 								aSegments.slice(0, iEntityPathLength).join("/"),
 								aSegments.slice(iEntityPathLength).join("/"));
@@ -3792,7 +3792,9 @@ sap.ui.define([
 	 */
 	_CollectionCache.prototype.requestSeparateProperties = async function (iStart, iEnd,
 			oMainPromise, fnSeparateReceived) {
-		if (!this.aSeparateProperties.length) {
+		const mExpand = this.mQueryOptions.$expand ?? {};
+		const aProperties = this.aSeparateProperties.filter((sProperty) => sProperty in mExpand);
+		if (!aProperties.length) {
 			return;
 		}
 
@@ -3802,7 +3804,7 @@ sap.ui.define([
 		// This function resolves at no defined point in time as it is not (yet) relevant for the
 		// function caller. This may changes in the future. The completion of each separate property
 		// can be observed with the below oReadRange.promise
-		this.aSeparateProperties.forEach(async (sProperty) => {
+		aProperties.forEach(async (sProperty) => {
 			let fnResolve;
 			let fnReject;
 			const oReadRange = {

package/src/sap/ui/model/odata/v4/lib/_Helper.js

@@ -15,18 +15,15 @@ sap.ui.define([
 	"sap/ui/base/SyncPromise",
 	"sap/ui/model/Filter",
 	"sap/ui/model/FilterOperator",
-	"sap/ui/thirdparty/URI"
+	"sap/ui/util/_URL"
 ], function (_Parser, Log, deepEqual, isEmptyObject, merge, uid, SyncPromise, Filter,
-		FilterOperator, URI) {
+		FilterOperator, _URL) {
 	"use strict";
 
 	var rAmpersand = /&/g,
 		rApplicationGroupID = /^\w+$/,
 		sClassName = "sap.ui.model.odata.v4.lib._Helper",
 		rEquals = /\=/g,
-		rEscapedCloseBracket = /%29/g,
-		rEscapedOpenBracket = /%28/g,
-		rEscapedTick = /%27/g,
 		rGroupID = /^(\$auto(\.\w+)?|\$direct|\w+)$/,
 		rHash = /#/g,
 		// matches the rest of a segment after '(' and any segment that consists only of a number
@@ -40,18 +37,6 @@ sap.ui.define([
 		 */
 		_Helper;
 
-	/**
-	 * Ensures that the key predicates in the given URL are not %-encoded.
-	 *
-	 * @param {string} sUrl - The URL
-	 * @returns {string} The converted URL
-	 */
-	function preserveKeyPredicates(sUrl) {
-		return sUrl.replace(rEscapedTick, "'")
-			.replace(rEscapedOpenBracket, "(")
-			.replace(rEscapedCloseBracket, ")");
-	}
-
 	_Helper = {
 		/**
 		 * Adds an item to the given map by path.
@@ -1835,6 +1820,22 @@ sap.ui.define([
 			return sPath;
 		},
 
+		/**
+		 * Parses the URL parameters from a given query string. Takes care of array parameters.
+		 *
+		 * @param {string} sQuery - A query string
+		 * @returns {object} - A map of URL parameters
+		 */
+		getUrlParameters : function (sQuery) {
+			const mUrlParameters = {};
+			const oUrlParams = new URLSearchParams(sQuery);
+			for (const sKey of oUrlParams.keys()) {
+				const aValues = oUrlParams.getAll(sKey);
+				mUrlParameters[sKey] = aValues.length > 1 ? aValues : aValues[0];
+			}
+			return mUrlParameters;
+		},
+
 		/**
 		 * Tells whether <code>sPath</code> has <code>sBasePath</code> as path prefix. It returns
 		 * <code>true</code> iff {@link .getRelativePath} does not return <code>undefined</code>.
@@ -2270,37 +2271,50 @@ sap.ui.define([
 		},
 
 		/**
-		 * Make the given URL absolute using the given base URL. The URLs must not contain a host
-		 * or protocol part. Ensures that key predicates are not %-encoded.
+		 * Resolves the given URL with the given base URL to create either a root-relative (relative
+		 * to the origin, e.g. "/service") or an absolute (including the origin, e.g.
+		 * "protocol://host:port/service") URL. If <code>sBase</code> is a cross-origin URL, the
+		 * result will be an absolute URL, otherwise a root-relative URL is returned. Note that an
+		 * absolute <code>sUrl</code> overrules the <code>sBase</code>, and a root-relative
+		 * <code>sUrl</code> only takes the origin of <code>sBase</code> into account.
 		 *
 		 * @param {string} sUrl
 		 *   The URL
 		 * @param {string} sBase
-		 *   The base URL
+		 *   The absolute or root-relative base URL
+		 * @param {boolean} [bServiceUrl]
+		 *   Whether to turn a metadata URL ("/service/$metadata") into a service URL ("/service/")
+		 *   as needed by an ODataModel
 		 * @returns {string}
-		 *   The absolute URL
+		 *   The resolved absolute or root-relative URL
 		 *
 		 * @public
 		 */
-		makeAbsolute : function (sUrl, sBase) {
-			return preserveKeyPredicates(new URI(sUrl).absoluteTo(sBase).toString());
+		makeAbsolute : function (sUrl, sBase, bServiceUrl) {
+			const oUrl = new URL(sUrl, new URL(sBase, document.baseURI));
+			if (bServiceUrl) {
+				oUrl.pathname = oUrl.pathname.slice(0, oUrl.pathname.lastIndexOf("/") + 1);
+			}
+			return oUrl.origin === new URL(document.baseURI).origin
+				? oUrl.toString().slice(oUrl.origin.length)
+				: oUrl.toString();
 		},
 
 		/**
-		 * Make the given absolute URL relative to the given base URL. The URLs must not contain a
-		 * host or protocol part. Ensures that key predicates are not %-encoded.
+		 * Make the given absolute path relative to the given base path. The paths must be OData
+		 * resource paths (ABNF rule resourcePath).
 		 *
-		 * @param {string} sUrl
-		 *   The URL
+		 * @param {string} sPath
+		 *   The absolute path
 		 * @param {string} sBase
-		 *   The base URL
+		 *   The base path
 		 * @returns {string}
-		 *   The relative URL
+		 *   The relative path
 		 *
 		 * @public
 		 */
-		makeRelativeUrl : function (sUrl, sBase) {
-			return preserveKeyPredicates(new URI(sUrl).relativeTo(sBase).toString());
+		makeRelativePath : function (sPath, sBase) {
+			return new _URL(sPath).relativeTo(new _URL(sBase));
 		},
 
 		/**

package/src/sap/ui/model/resource/ResourceModel.js

@@ -227,7 +227,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 */
 	var ResourceModel = Model.extend("sap.ui.model.resource.ResourceModel", /** @lends sap.ui.model.resource.ResourceModel.prototype */ {
 

package/src/sap/ui/model/type/Boolean.js

@@ -19,7 +19,7 @@ sap.ui.define(["sap/ui/core/Lib", 'sap/ui/model/SimpleType', 'sap/ui/model/Forma
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Currency.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Date.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateInstance DateFormat}.

package/src/sap/ui/model/type/DateInterval.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 *
 	 * @alias sap.ui.model.type.DateInterval
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/DateTime.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.

package/src/sap/ui/model/type/DateTimeInterval.js

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.

package/src/sap/ui/model/type/FileSize.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Float.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Integer.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/String.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 *
 	 * @alias sap.ui.model.type.String
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Time.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.

package/src/sap/ui/model/type/TimeInterval.js

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.

package/src/sap/ui/model/type/Unit.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/xml/XMLModel.js

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.ClientModel
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 *
 	 * @param {XMLDocument|string} oData
 	 *   Either the URL where to load the XML from or an XML document

package/src/sap/ui/model/xml/XMLTreeBinding.js

@@ -33,6 +33,16 @@ sap.ui.define(['sap/ui/model/ClientTreeBinding', "sap/base/util/each"],
 	 */
 	var XMLTreeBinding = ClientTreeBinding.extend("sap.ui.model.xml.XMLTreeBinding");
 
+	/**
+	 * Returns sap.ui.model.ClientTreeBinding.CannotCloneData.
+	 *
+	 * @returns {sap.ui.model.ClientTreeBinding.CannotCloneData} a symbol indicating that the tree data cannot be cloned
+	 * @override
+	 */
+	XMLTreeBinding.prototype.cloneData = function() {
+		return ClientTreeBinding.CannotCloneData;
+	};
+
 	/**
 	 * Return node contexts for the tree
 	 * @param {sap.ui.model.Context} oContext to use for retrieving the node contexts

package/src/sap/ui/qunit/utils/ControlIterator.js

@@ -53,7 +53,7 @@ sap.ui.define(['sap/ui/core/Core', "sap/ui/VersionInfo", "sap/ui/core/Lib"],
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/qunit/utils/MemoryLeakCheck.js

@@ -30,7 +30,7 @@ sap.ui.define([ 'sap/ui/core/ElementRegistry', 'sap/ui/core/Control', "sap/ui/qu
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/test/generic/TestBase.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 * @since 1.100
 	 */
 	return BaseObject.extend("sap.ui.test.generic.TestBase", {

package/src/sap/ui/thirdparty/caja-html-sanitizer.js

@@ -713,6 +713,12 @@ var cssSchema = (function () {
         'cssPropBits': 0,
         'cssLitGroup': [ L[ 18 ], L[ 47 ], L[ 54 ] ]
       },
+      // ##### BEGIN: MODIFIED BY SAP
+      'text-decoration-line': {
+        'cssPropBits': 0,
+        'cssLitGroup': [ L[ 18 ], L[ 47 ], L[ 54 ] ]
+      },
+      // ##### END: MODIFIED BY SAP
       'text-indent': {
         'cssPropBits': 5,
         'cssLitGroup': [ L[ 47 ] ]

package/src/sap/ui/util/Storage.js

@@ -277,7 +277,7 @@ sap.ui.define(["sap/base/assert"], function (assert) {
 	 *
 	 * @enum {string}
 	 * @public
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 */
 	Storage.Type = {
 		/**

package/src/ui5loader.js

@@ -1461,13 +1461,7 @@
 	function loadScript(oModule, sAlternativeURL) {
 
 		const oScript = document.createElement('SCRIPT');
-		// Accessing the 'src' property of the script in this strange way prevents Safari 12 (or WebKit) from
-		// wrongly optimizing access. SF12 seems to check at optimization time whether there's a setter for the
-		// property and optimize accordingly. When a setter is defined or changed at a later point in time (e.g.
-		// by the AppCacheBuster), then the optimization seems not to be updated and the new setter is ignored
-		// BCP 1970035485
-		oScript["s" + "rc"] = oModule.url;
-		//oScript.src = oModule.url;
+		oScript.src = oModule.url;
 		oScript.setAttribute("data-sap-ui-module", oModule.name);
 
 		function onload(e) {
@@ -2696,7 +2690,7 @@
 	/**
 	 * Root namespace for JavaScript functionality provided by SAP SE.
 	 *
-	 * @version 1.142.1
+	 * @version 1.143.1
 	 * @namespace
 	 * @public
 	 * @name sap