@openui5/sap.ui.core 1.139.0 → 1.141.0

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

@@ -192,11 +192,14 @@ sap.ui.define([
 	 * @param {string} sResourcePath The resource path with possible query options and placeholders
 	 * @param {string} sMetaPath The absolute meta path matching the resource path
 	 * @param {object} mQueryOptions Query options to add to the resource path
+	 * @param {boolean} [bSortSystemQueryOptions]
+	 *   Whether system query options are sorted alphabetically and moved to the query string's end
 	 * @returns {string} The resource path with the query options
 	 *
 	 * @private
 	 */
-	_Requestor.prototype.addQueryString = function (sResourcePath, sMetaPath, mQueryOptions) {
+	_Requestor.prototype.addQueryString = function (sResourcePath, sMetaPath, mQueryOptions,
+			bSortSystemQueryOptions) {
 		var sQueryString;
 
 		mQueryOptions = this.convertQueryOptions(sMetaPath, mQueryOptions, false, true);
@@ -209,7 +212,7 @@ sap.ui.define([
 				return _Helper.encodePair(sOption, sValue);
 			});
 
-		sQueryString = _Helper.buildQuery(mQueryOptions);
+		sQueryString = _Helper.buildQuery(mQueryOptions, bSortSystemQueryOptions);
 		if (!sQueryString) {
 			return sResourcePath;
 		}
@@ -916,7 +919,7 @@ sap.ui.define([
 	 *
 	 * @param {string} sMetaPath
 	 *   The meta path, e.g. "/SalesOrderList/SO_2_BP"
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<object>}
 	 *   A promise that is resolved with the type at the given path.
 	 *
 	 * @private
@@ -1285,6 +1288,9 @@ sap.ui.define([
 					if (oCandidate.$mergeRequests && oRequest.$mergeRequests) {
 						oCandidate.$mergeRequests(oRequest.$mergeRequests());
 					}
+					oCandidate.$sortSystemQueryOptions
+						||= oCandidate.$queryOptions.$$sortIfMerged
+							|| oRequest.$queryOptions.$$sortIfMerged;
 
 					return true;
 				}
@@ -1302,10 +1308,12 @@ sap.ui.define([
 			var mQueryOptions = oRequest.$queryOptions;
 
 			if (mQueryOptions) {
-				if (mQueryOptions.$expand && !mQueryOptions.$select.length) {
+				// if there was no $select, don't introduce one
+				if (mQueryOptions.$expand && mQueryOptions.$select?.length === 0) {
 					mQueryOptions.$select = Object.keys(mQueryOptions.$expand).sort().slice(0, 1);
 				}
-				oRequest.url = that.addQueryString(oRequest.url, oRequest.$metaPath, mQueryOptions);
+				oRequest.url = that.addQueryString(oRequest.url, oRequest.$metaPath, mQueryOptions,
+					oRequest.$sortSystemQueryOptions);
 			}
 		});
 		aResultingRequests.iChangeSet = aRequests.iChangeSet;
@@ -1582,7 +1590,8 @@ sap.ui.define([
 	 * Returns a sync promise that is resolved when the requestor is ready to be used. The V4
 	 * requestor is ready immediately. Subclasses may behave differently.
 	 *
-	 * @returns {sap.ui.base.SyncPromise} A sync promise that is resolved immediately with no result
+	 * @returns {sap.ui.base.SyncPromise<void>}
+	 *   A sync promise that is resolved immediately with no result
 	 *
 	 * @public
 	 */
@@ -1592,10 +1601,11 @@ sap.ui.define([
 
 	/**
 	 * Returns a promise that will be resolved once the CSRF token has been refreshed, or rejected
-	 * if that fails. Makes sure that only one HEAD request is underway at any given time and
-	 * shares the promise accordingly. If the HEAD request fails with a 503 HTTP status code and
-	 * a "Retry-After" response header, the promise is also resolved because the next request (in
-	 * {@link #sendRequest}) will also fail with 503 and is handled there.
+	 * (unless for an initial call without <code>sOldSecurityToken</code>) if that fails. Makes sure
+	 * that only one HEAD request is underway at any given time and shares the promise accordingly.
+	 * If the HEAD request fails with a 503 HTTP status code and a "Retry-After" response header,
+	 * the promise is also resolved because the next request (in {@link #sendRequest}) will also
+	 * fail with 503 and is handled there.
 	 *
 	 * @param {string} [sOldSecurityToken]
 	 *   Security token that caused a 403. A new token is only fetched if the old one is still
@@ -1638,7 +1648,8 @@ sap.ui.define([
 						fnResolve();
 					}, function (jqXHR) {
 						that.oSecurityTokenPromise = null;
-						if (jqXHR.status === 503 && jqXHR.getResponseHeader("Retry-After")) {
+						if (!sOldSecurityToken
+								|| jqXHR.status === 503 && jqXHR.getResponseHeader("Retry-After")) {
 							fnResolve();
 						} else {
 							fnReject(
@@ -1853,10 +1864,12 @@ sap.ui.define([
 	 *   contain $expand
 	 * @param {any} [vOwner]
 	 *   An additional precondition for the merging of GET requests: the owner must be identical.
+	 *   This is probably relevant when using parameter <code>fnMergeRequests</code> to ensure both
+	 *   functions work well together.
 	 * @param {function(string[]):string[]} [fnMergeRequests]
 	 *   Function which is called during merging of GET or PATCH requests. If a merged request has a
-	 *   function given, this function will be called and its return value is
-	 *   given to the one remaining request's function as a parameter.
+	 *   function given, this function will be called and its return value is given to the one
+	 *   remaining request's function as a parameter. See also <code>vOwner</code>.
 	 * @returns {Promise}
 	 *   A promise on the outcome of the HTTP request; it will be rejected with an error having the
 	 *   property <code>canceled = true</code> instead of sending a request if
@@ -2248,7 +2261,7 @@ sap.ui.define([
 	 *
 	 * @param {string} sGroupId
 	 *   The group ID
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<void>}
 	 *   A promise on the outcome of the HTTP request resolving with <code>undefined</code>; it is
 	 *   rejected with an error if the batch request itself fails.
 	 *
@@ -2296,7 +2309,7 @@ sap.ui.define([
 	 *
 	 * @param {string} sGroupId
 	 *   The group ID
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<void>}
 	 *   A promise that resolves without a defined result when a batch response has been received
 	 *   for the given group ID, no matter if the batch succeeded or failed
 	 *
@@ -2313,7 +2326,7 @@ sap.ui.define([
 	 *
 	 * @param {string} sGroupId
 	 *   The group ID
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise<void>}
 	 *   A promise that resolves without a defined result when all currently running change requests
 	 *   for the given group ID have been processed completely, no matter if they succeed or fail
 	 *

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

@@ -944,8 +944,8 @@ sap.ui.define([
 	 * Returns a sync promise that is resolved when the requestor is ready to be used. Waits for the
 	 * metadata to be available.
 	 *
-	 * @returns {sap.ui.base.SyncPromise} A sync promise that is resolved with no result when the
-	 * metadata is available
+	 * @returns {sap.ui.base.SyncPromise<void>}
+	 *   A sync promise that is resolved with no result when the metadata is available
 	 *
 	 * @public
 	 */

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

@@ -227,7 +227,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.139.0
+	 * @version 1.141.0
 	 */
 	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.139.0
+	 * @version 1.141.0
 	 *
 	 * @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.139.0
+	 * @version 1.141.0
 	 *
 	 * @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.139.0
+	 * @version 1.141.0
 	 *
 	 * @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.139.0
+	 * @version 1.141.0
 	 *
 	 * @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.139.0
+	 * @version 1.141.0
 	 *
 	 * @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.139.0
+	 * @version 1.141.0
 	 *
 	 * @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.139.0
+	 * @version 1.141.0
 	 *
 	 * @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.139.0
+	 * @version 1.141.0
 	 *
 	 * @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.139.0
+	 * @version 1.141.0
 	 *
 	 * @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.139.0
+	 * @version 1.141.0
 	 *
 	 * @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.139.0
+	 * @version 1.141.0
 	 *
 	 * @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.139.0
+	 * @version 1.141.0
 	 *
 	 * @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.139.0
+	 * @version 1.141.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]
@@ -61,9 +61,16 @@ sap.ui.define([
 	 *   {@link sap.ui.model.Binding#supportsIgnoreMessages}, and the corresponding binding
 	 *   parameter is not set manually.
 	 * @param {object} [oFormatOptions.decimals]
-	 *   The number of decimals to be used for formatting the number part of the unit; defaults to <b>3</b> if none of
-	 *   the format options <code>maxFractionDigits</code>, <code>minFractionDigits</code> or <code>decimals</code>
-	 *   is given
+	 *   The number of decimals to be used for formatting the numerical value of the unit composite type; if none of the
+	 *   format options <code>maxFractionDigits</code>, <code>minFractionDigits</code> or <code>decimals</code> are
+	 *   given, the following defaults apply:
+	 *   <ul>
+	 *      <li> <b>0</b> if the numerical value is of an OData integer type, i.e. {@link sap.ui.model.odata.type.Int}
+	 *        or {@link sap.ui.model.odata.type.Int64} </li>
+	 *      <li> the <b>scale constraint of the numerical value's type</b> if this type is
+	 *        {@link sap.ui.model.odata.type.Decimal} and the scale is not "variable" </li>
+	 *      <li> <b>3</b> otherwise </li>
+	 *   </ul>
 	 * @param {boolean} [oFormatOptions.preserveDecimals=true]
 	 *   By default decimals are preserved, unless <code>oFormatOptions.style</code> is given as
 	 *   "short" or "long"; since 1.89.0
@@ -324,9 +331,16 @@ sap.ui.define([
 	 * @since 1.120.0
 	 */
 	Unit.prototype.processPartTypes = function (aPartTypes) {
+		this.iScale = undefined; // type of quantity binding part may be changed => reset scale
 		const oQuantityType = aPartTypes[0];
+		if (oQuantityType?.isA(["sap.ui.model.odata.type.Int", "sap.ui.model.odata.type.Int64"])) {
+			this.iScale = 0;
+		}
 		if (oQuantityType?.isA("sap.ui.model.odata.type.Decimal")) {
-			this.iScale = oQuantityType.oConstraints?.scale || 0;
+			const iScale = oQuantityType.oConstraints?.scale;
+			if (iScale !== Infinity) { // like in Decimal type, do not propagate scale "variable" to formatter
+				this.iScale = iScale || 0;
+			}
 		}
 	};
 

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.139.0
+	 * @version 1.141.0
 	 *
 	 * @param {XMLDocument|string} oData
 	 *   Either the URL where to load the XML from or an XML document

package/src/sap/ui/performance/XHRInterceptor.js

@@ -71,7 +71,7 @@ sap.ui.define([
 	 * @since 1.58
 	 * @alias module:sap/ui/performance/XHRInterceptor
 	 * @private
-	 * @ui5-restricted sap.ui.core
+	 * @ui5-restricted sap.ui.performance.trace
 	 */
 	var oXHRInterceptor = {
 		/**
@@ -80,7 +80,8 @@ sap.ui.define([
 		 * @param {string} sName Name under which the function is registered
 		 * @param {string} sXHRMethod Name of the actual XHR method
 		 * @param {function} fnCallback The registered callback function
-		 * @public
+		 * @private
+		 * @ui5-restricted sap.ui.performance.trace
 		 */
 		register: function(sName, sXHRMethod, fnCallback) {
 			Log.debug("Register '" + sName + "' for XHR function '" + sXHRMethod + "'", XHRINTERCEPTOR);
@@ -95,10 +96,11 @@ sap.ui.define([
 		/**
 		 * Unregister a registered function.
 		 *
-	     * @param {string} sName Name under which the function is registered
+		 * @param {string} sName Name under which the function is registered
 		 * @param {string} sXHRMethod Name of the actual XHR method
 		 * @return {boolean} True if unregister was successful
-		 * @public
+		 * @private
+		 * @ui5-restricted sap.ui.performance.trace.FESR
 		 */
 		unregister: function(sName, sXHRMethod) {
 			var bRemove = delete mRegistry[sXHRMethod][sName];
@@ -106,11 +108,14 @@ sap.ui.define([
 			return bRemove;
 		},
 
-		/*
-		 * Check if a function is registered
-	     * @param {string} sName Name under which the function is registered
-		 * @param {string} sXHRMethod Name of the actual XHR method
-		 * @public
+		/**
+		 * Checks if a function is registered for a specific XHR method.
+		 *
+		 * @param {string} sName Name under which the function is registered
+		 * @param {string} sXHRMethod Name of the actual XHR method (e.g., "open", "send", "setRequestHeader")
+		 * @returns {boolean} True if a function is registered under the given name for the XHR method, false otherwise
+		 * @private
+		 * @ui5-restricted sap.ui.performance.trace.FESR
 		 */
 		isRegistered: function(sName, sXHRMethod) {
 			return mRegistry[sXHRMethod] && mRegistry[sXHRMethod][sName];

package/src/sap/ui/performance/trace/FESR.js

@@ -8,14 +8,14 @@
 
 sap.ui.define([
 	"sap/base/config",
-	'sap/ui/thirdparty/URI',
 	'sap/ui/Device',
 	'sap/ui/performance/trace/Passport',
 	'sap/ui/performance/trace/Interaction',
 	'sap/ui/performance/XHRInterceptor',
 	'sap/ui/performance/BeaconRequest',
+	'sap/ui/util/isCrossOriginURL',
 	'sap/base/util/Version'
-], function (BaseConfig, URI, Device, Passport, Interaction, XHRInterceptor, BeaconRequest, Version) {
+], function (BaseConfig, Device, Passport, Interaction, XHRInterceptor, BeaconRequest, isCrossOriginURL, Version) {
 	"use strict";
 
 	const sIntegrationEnvironment = BaseConfig.get({
@@ -30,7 +30,6 @@ sap.ui.define([
 		oBeaconRequest,
 		iBeaconTimeoutID,
 		ROOT_ID = Passport.getRootId(), // static per session
-		HOST = window.location.host, // static per session
 		CLIENT_OS = Device.os.name + "_" + Device.os.version,
 		CLIENT_MODEL = `${Device.browser.reportingName}_${Device.browser.version}${sIntegrationEnvironment ? ":" + sIntegrationEnvironment : ""}`,
 		CLIENT_DEVICE = setClientDevice(),
@@ -63,16 +62,10 @@ sap.ui.define([
 		return oDate.toISOString().replace(/[^\d]/g, '');
 	}
 
-	function isCORSRequest(sUrl) {
-		var sHost = new URI(sUrl.toString()).host();
-		// url is relative or with same host
-		return sHost && sHost !== HOST;
-	}
-
 	function passportHeaderOverride() {
 
 		// only use Passport for non CORS requests
-		if (!isCORSRequest(arguments[1])) {
+		if (!isCrossOriginURL(arguments[1])) {
 
 			// use the first request of an interaction as FESR TransactionID
 			if (!sFESRTransactionId) {
@@ -100,7 +93,7 @@ sap.ui.define([
 	function fesrHeaderOverride() {
 
 		// only use FESR for non CORS requests
-		if (!isCORSRequest(arguments[1])) {
+		if (!isCrossOriginURL(arguments[1])) {
 
 			if (sFESR && sFESRopt) {
 				this.setRequestHeader("SAP-Perf-FESRec", sFESR);

package/src/sap/ui/performance/trace/Passport.js

@@ -7,13 +7,12 @@
  * IMPORTANT: This is a private module, its API must not be used and is subject to change.
  * Code other than the OpenUI5 libraries must not introduce dependencies to this module.
  */
-sap.ui.define(["sap/ui/performance/XHRInterceptor", "sap/ui/thirdparty/URI"], function(XHRInterceptor, URI) {
+sap.ui.define(["sap/ui/performance/XHRInterceptor", "sap/ui/util/isCrossOriginURL"], function(XHRInterceptor, isCrossOriginURL) {
 	"use strict";
 
 	var iE2eTraceLevel;
 	var sTransactionId;
 	var ROOT_ID;
-	var HOST = window.location.host;
 
 	// old methods taken over from E2eTraceLib
 	function getBytesFromString(s) {
@@ -187,12 +186,6 @@ sap.ui.define(["sap/ui/performance/XHRInterceptor", "sap/ui/thirdparty/URI"], fu
 		return sTransactionId;
 	};
 
-	function isCORSRequest(sUrl) {
-		var sHost = new URI(sUrl.toString()).host();
-		// url is relative or with same host
-		return sHost && sHost !== HOST;
-	}
-
 	/**
 	 * @param {boolean} bActive State of the Passport header creation
 	 * @private
@@ -200,12 +193,12 @@ sap.ui.define(["sap/ui/performance/XHRInterceptor", "sap/ui/thirdparty/URI"], fu
 	Passport.setActive = function(bActive) {
 		if (bActive) {
 			XHRInterceptor.register("PASSPORT_ID", "open", function() {
-				if (!isCORSRequest(arguments[1])) {
+				if (!isCrossOriginURL(arguments[1])) {
 					sTransactionId = Passport.createGUID();
 				}
 			});
 			XHRInterceptor.register("PASSPORT_HEADER", "open", function() {
-				if (!isCORSRequest(arguments[1])) {
+				if (!isCrossOriginURL(arguments[1])) {
 					// set passport with Root Context ID, Transaction ID for Trace
 					this.setRequestHeader("SAP-PASSPORT", Passport.header(iE2eTraceLevel, ROOT_ID, sTransactionId));
 				}

package/src/sap/ui/performance/trace/_InteractionImpl.js

@@ -9,12 +9,12 @@ sap.ui.define([
 	"sap/ui/performance/Measurement",
 	"sap/ui/performance/XHRInterceptor",
 	"sap/ui/performance/trace/FESRHelper",
+	"sap/ui/util/isCrossOriginURL",
 	"sap/base/util/LoaderExtensions",
 	"sap/base/util/now",
 	"sap/base/util/uid",
-	"sap/base/Log",
-	"sap/ui/thirdparty/URI"
-], function(Measurement, XHRInterceptor, FESRHelper, LoaderExtensions, now, uid, Log, URI) {
+	"sap/base/Log"
+], function(Measurement, XHRInterceptor, FESRHelper, isCrossOriginURL, LoaderExtensions, now, uid, Log) {
 
 	"use strict";
 
@@ -43,12 +43,6 @@ sap.ui.define([
 		},
 		sCompressedExtensions = "zip,rar,arj,z,gz,tar,lzh,cab,hqx,ace,jar,ear,war,jpg,jpeg,pdf,gzip";
 
-	function isCORSRequest(sUrl) {
-		var sHost = new URI(sUrl.toString()).host();
-		// url is relative or with same host
-		return sHost && sHost !== window.location.host;
-	}
-
 	function hexToAscii(sValue) {
 		var hex = sValue.toString();
 		var str = '';
@@ -293,7 +287,7 @@ sap.ui.define([
 			}
 			// we only need to take care of requests when we have a running interaction
 			if (oPendingInteraction) {
-				var bIsNoCorsRequest = !isCORSRequest(sUrl);
+				var bIsNoCorsRequest = !isCrossOriginURL(sUrl);
 				// only use Interaction for non CORS requests
 				if (bIsNoCorsRequest) {
 					//only track if FESR.clientID == EPP.Action && FESR.rootContextID == EPP.rootContextID

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.139.0
+	 * @version 1.141.0
 	 *
 	 * @public
 	 * @since 1.48.0
@@ -63,7 +63,6 @@ sap.ui.define(['sap/ui/core/Core', "sap/ui/VersionInfo", "sap/ui/core/Lib"],
 
 	var aControlsThatCannotBeRenderedGenerically = [
 		"sap.chart.Chart",
-		"sap.m.ColumnHeaderPopover",
 		"sap.m.FacetFilterItem",
 		"sap.m.internal.NumericInput",
 		"sap.m.IconTabBarSelectList",

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.139.0
+	 * @version 1.141.0
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/test/TestUtils.js

@@ -19,6 +19,7 @@ sap.ui.define([
 
 	var rBatch = /\/\$batch($|\?)/,
 		rContentId = /(?:^|\r\n)Content-Id\s*:\s*(\S+)/i,
+		rContentIdReference = / \$([^ ?\/]+)/,
 		rEndsWithJSON = /\.json$/i,
 		rEndsWithXML = /\.xml$/i,
 		rHeaderLine = /^(.*)?:\s*(.*)$/,
@@ -445,13 +446,14 @@ sap.ui.define([
 		 *       extension unless specified. This has precedence over <code>message</code>.
 		 *   </ul>
 		 * @param {object[]} [aRegExps]
-		 *    An array containing regular expressions in the regExp property and the corresponding
-		 *    response(s) objects in the response property. If no match for a request was found in
-		 *    the normal fixture, the regular expressions are checked. The response object looks
-		 *    exactly the same as in the fixture and may additionally contain a method
-		 *    <code>buildResponse(aMatch, oResponse, oRequest)</code> which gets passed the match
-		 *    object, the response, and the request in order to allow modification of the response
-		 *   before sending.
+		 *   An array containing regular expressions in the regExp property and the corresponding
+		 *   response(s) objects in the response property. If no match for a request was found in
+		 *   the normal fixture, the regular expressions are checked. The response object looks
+		 *   exactly the same as in the fixture and may additionally contain a method
+		 *   <code>buildResponse(aMatch, oResponse, oRequest, sReferencedMessage)</code> which gets
+		 *   passed the match object, the response, the request, and optionally the referenced
+		 *   response message in case of Content-ID referencing in order to allow modification of
+		 *   the response before sending.
 		 * @param {string} [sServiceUrl]
 		 *   The service URL which determines a prefix for all requests the fake server responds to;
 		 *   it responds with an error for requests not given in the fixture, except DELETE, MERGE,
@@ -689,9 +691,11 @@ sap.ui.define([
 			 * @param {boolean} [bTry]
 			 *   Whether to do nothing and return <code>undefined</code> if no fixture matches; also
 			 *   prevents defaulting for non-GET requests
+			 * @param {object} [mContentId2Response]
+			 *   A map which refers a content ID to a response message while processing a batch
 			 * @returns {object|undefined} The response object or <code>undefined</code>
 			 */
-			function getResponseFromFixture(oRequest, sContentId, bTry) {
+			function getResponseFromFixture(oRequest, sContentId, bTry, mContentId2Response) {
 				var iAlternative,
 					oMatch = getMatchingResponse(oRequest.method, oRequest.url),
 					oResponse,
@@ -708,7 +712,13 @@ sap.ui.define([
 					if (typeof oResponse.buildResponse === "function") {
 						oResponse = merge({}, oResponse);
 						try {
-							oResponse.buildResponse(oMatch.match, oResponse, oRequest);
+							const aMatches = rContentIdReference.exec(oRequest.requestLine);
+							let sReferencedMessage;
+							if (aMatches) {
+								sReferencedMessage = mContentId2Response[aMatches[1]];
+							}
+							oResponse.buildResponse(oMatch.match, oResponse, oRequest,
+								sReferencedMessage);
 						} catch (oError) {
 							oResponse = error(500, oRequest, oError);
 						}
@@ -758,6 +768,9 @@ sap.ui.define([
 				oResponse.headers = jQuery.extend({}, getODataHeaders(oRequest), oResponse.headers);
 				if (sContentId && oResponse.code < 300) {
 					oResponse.contentId = sContentId;
+					if (mContentId2Response) {
+						mContentId2Response[sContentId] = oResponse.message;
+					}
 				}
 				return oResponse;
 			}
@@ -767,14 +780,13 @@ sap.ui.define([
 			 *
 			 * @param {string} sServiceBase The service base URL
 			 * @param {string} sBody The body
+			 * @param {object} [oBatch] allows to keep state while processing a batch
 			 * @returns {object} An object with the properties boundary and parts
 			 */
-			function multipart(sServiceBase, sBody) {
-				var sBoundary;
-
+			function multipart(sServiceBase, sBody, oBatch = {}) {
 				// skip preamble consisting of whitespace (as sent by datajs)
 				sBody = sBody.replace(/^\s+/, "");
-				sBoundary = firstLine(sBody);
+				const sBoundary = firstLine(sBody);
 				return {
 					boundary : firstLine(sBody).slice(2),
 					parts : sBody.split(sBoundary).slice(1, -1).map(function (sRequestPart) {
@@ -784,7 +796,7 @@ sap.ui.define([
 						sFirstLine = firstLine(sRequestPart);
 						if (rMultipartHeader.test(sFirstLine)) {
 							oMultipart = multipart(sServiceBase,
-								sRequestPart.slice(sFirstLine.length + 4));
+								sRequestPart.slice(sFirstLine.length + 4), oBatch);
 							aFailures = oMultipart.parts.filter(function (oPart) {
 								return oPart.code >= 300;
 							});
@@ -793,7 +805,7 @@ sap.ui.define([
 						iRequestStart = sRequestPart.indexOf("\r\n\r\n") + 4;
 						oRequest = parseRequest(sServiceBase, sRequestPart.slice(iRequestStart));
 						aMatch = rContentId.exec(sRequestPart.slice(0, iRequestStart));
-						return getResponseFromFixture(oRequest, aMatch && aMatch[1]);
+						return getResponseFromFixture(oRequest, aMatch && aMatch[1], false, oBatch);
 					})
 				};
 			}