@openui5/sap.ui.core 1.117.1 → 1.118.0

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

@@ -36,6 +36,18 @@ 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.
@@ -2118,10 +2130,24 @@ sap.ui.define([
 		 * @public
 		 */
 		makeAbsolute : function (sUrl, sBase) {
-			return new URI(sUrl).absoluteTo(sBase).toString()
-				.replace(rEscapedTick, "'")
-				.replace(rEscapedOpenBracket, "(")
-				.replace(rEscapedCloseBracket, ")");
+			return preserveKeyPredicates(new URI(sUrl).absoluteTo(sBase).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.
+		 *
+		 * @param {string} sUrl
+		 *   The URL
+		 * @param {string} sBase
+		 *   The base URL
+		 * @returns {string}
+		 *   The relative URL
+		 *
+		 * @public
+		 */
+		makeRelativeUrl : function (sUrl, sBase) {
+			return preserveKeyPredicates(new URI(sUrl).relativeTo(sBase).toString());
 		},
 
 		/**

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

@@ -338,6 +338,7 @@ sap.ui.define([], function () {
 	 * @constructor
 	 */
 	function _FilterParser() {
+		_Parser.apply(this, arguments);
 	}
 
 	_FilterParser.prototype = Object.create(_Parser.prototype);
@@ -421,6 +422,7 @@ sap.ui.define([], function () {
 	 * @constructor
 	 */
 	function _KeyPredicateParser() {
+		_Parser.apply(this, arguments);
 	}
 
 	_KeyPredicateParser.prototype = Object.create(_Parser.prototype);
@@ -463,6 +465,7 @@ sap.ui.define([], function () {
 	 * @constructor
 	 */
 	function _SystemQueryOptionParser() {
+		_Parser.apply(this, arguments);
 	}
 
 	_SystemQueryOptionParser.prototype = Object.create(_Parser.prototype);

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

@@ -1465,20 +1465,30 @@ sap.ui.define([
 		if (!oOptimisticBatch) {
 			return;
 		}
-
+		fnOptimisticBatchEnabler = this.oModelInterface.getOptimisticBatchEnabler();
 		sKey = oOptimisticBatch.key;
 		this.oOptimisticBatch = null;
 		if (oOptimisticBatch.result) { // n+1 app start, consume optimistic batch result
 			if (_Requestor.matchesOptimisticBatch(aRequests, sGroupId,
 					oOptimisticBatch.firstBatch.requests, oOptimisticBatch.firstBatch.groupId)) {
+				if (fnOptimisticBatchEnabler) {
+					Promise.resolve(fnOptimisticBatchEnabler(sKey)).then(async (bEnabled) => {
+						if (!bEnabled) {
+							await CacheManager.del(sCachePrefix + sKey);
+							Log.info("optimistic batch: disabled, response deleted", sKey,
+								sClassName);
+						}
+					}).catch(that.oModelInterface.getReporter());
+				}
+
 				Log.info("optimistic batch: success, response consumed", sKey, sClassName);
 				return oOptimisticBatch.result;
 			}
-			CacheManager.del(sCachePrefix + sKey).catch(this.oModelInterface.getReporter());
-			Log.warning("optimistic batch: mismatch, response skipped", sKey, sClassName);
+			CacheManager.del(sCachePrefix + sKey).then(() => {
+				Log.warning("optimistic batch: mismatch, response skipped", sKey, sClassName);
+			}, this.oModelInterface.getReporter());
 		}
 
-		fnOptimisticBatchEnabler = this.oModelInterface.getOptimisticBatchEnabler();
 		if (fnOptimisticBatchEnabler) { // 1st app start, or optimistic batch payload did not match
 			bIsModifyingBatch = aRequests.some(function (oRequest) {
 					return Array.isArray(oRequest) || oRequest.method !== "GET";

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

@@ -30,33 +30,28 @@ sap.ui.define([
 		oTimeFormatter;
 
 	/**
-	 * A mixin for a requestor using an OData V2 service.
-	 *
-	 * @alias sap.ui.model.odata.v4.lib._V2Requestor
-	 * @constructor
-	 * @mixin
-	 * @private
+	 * A bag of modified functions and properties for a requestor using an OData V2 service.
 	 */
-	function _V2Requestor() {}
+	const _V2Requestor = {};
 
 	/**
 	 * Final (cannot be overridden) request headers for OData V2.
 	 */
-	_V2Requestor.prototype.mFinalHeaders = {
+	_V2Requestor.mFinalHeaders = {
 		"Content-Type" : "application/json;charset=UTF-8"
 	};
 
 	/**
 	 * Predefined request headers in $batch parts for OData V2.
 	 */
-	_V2Requestor.prototype.mPredefinedPartHeaders = {
+	_V2Requestor.mPredefinedPartHeaders = {
 		Accept : "application/json"
 	};
 
 	/**
 	 * Predefined request headers for all requests for OData V2.
 	 */
-	_V2Requestor.prototype.mPredefinedRequestHeaders = {
+	_V2Requestor.mPredefinedRequestHeaders = {
 		Accept : "application/json",
 		MaxDataServiceVersion : "2.0",
 		DataServiceVersion : "2.0",
@@ -66,7 +61,7 @@ sap.ui.define([
 	/**
 	 * OData V2 request headers reserved for internal use.
 	 */
-	_V2Requestor.prototype.mReservedHeaders = {
+	_V2Requestor.mReservedHeaders = {
 		accept : true,
 		"content-id" : true,
 		"content-transfer-encoding" : true,
@@ -91,7 +86,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	_V2Requestor.prototype.convertBinary = function (sV2Value) {
+	_V2Requestor.convertBinary = function (sV2Value) {
 		return sV2Value.replace(rPlus, "-").replace(rSlash, "_");
 	};
 
@@ -108,7 +103,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	_V2Requestor.prototype.convertDate = function (sV2Value) {
+	_V2Requestor.convertDate = function (sV2Value) {
 		var oDate,
 			aMatches = rDate.exec(sV2Value);
 
@@ -139,7 +134,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	_V2Requestor.prototype.convertDateTimeOffset = function (sV2Value, oPropertyMetadata) {
+	_V2Requestor.convertDateTimeOffset = function (sV2Value, oPropertyMetadata) {
 		var aMatches = rDateTimeOffset.exec(sV2Value),
 			sOffset,
 			iOffsetHours,
@@ -187,7 +182,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	_V2Requestor.prototype.convertDoubleSingle = function (sV2Value) {
+	_V2Requestor.convertDoubleSingle = function (sV2Value) {
 		switch (sV2Value) {
 			case "NaN":
 			case "INF":
@@ -209,7 +204,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	_V2Requestor.prototype.convertFilter = function (sFilter, sMetaPath) {
+	_V2Requestor.convertFilter = function (sFilter, sMetaPath) {
 		var oFilterTree = _Parser.parseFilter(sFilter),
 			that = this;
 
@@ -316,7 +311,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	_V2Requestor.prototype.convertKeyPredicate = function (sV4KeyPredicate, sPath) {
+	_V2Requestor.convertKeyPredicate = function (sV4KeyPredicate, sPath) {
 		// Note: metadata can be fetched synchronously because ready() ensured that it's loaded
 		var oEntityType = this.fetchTypeForPath(_Helper.getMetaPath(sPath)).getResult(),
 			mKeyToValue = _Parser.parseKeyPredicate(decodeURIComponent(sV4KeyPredicate)),
@@ -357,7 +352,7 @@ sap.ui.define([
 	 * @public
 	 */
 	// @override sap.ui.model.odata.v4.lib._Requestor#convertResourcePath
-	_V2Requestor.prototype.convertResourcePath = function (sResourcePath) {
+	_V2Requestor.convertResourcePath = function (sResourcePath) {
 		var iIndex = sResourcePath.indexOf("?"),
 			sQueryString = "",
 			aSegments,
@@ -393,7 +388,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	_V2Requestor.prototype.convertTimeOfDay = function (sV2Value) {
+	_V2Requestor.convertTimeOfDay = function (sV2Value) {
 		var oDate,
 			aMatches = rTime.exec(sV2Value),
 			iTicks;
@@ -421,7 +416,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	_V2Requestor.prototype.convertNonPrimitive = function (oObject) {
+	_V2Requestor.convertNonPrimitive = function (oObject) {
 		var sPropertyName,
 			oType,
 			sTypeName,
@@ -486,8 +481,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	_V2Requestor.prototype.convertPrimitive = function (vValue, oPropertyMetadata, sTypeName,
-			sPropertyName) {
+	_V2Requestor.convertPrimitive = function (vValue, oPropertyMetadata, sTypeName, sPropertyName) {
 		switch (oPropertyMetadata && oPropertyMetadata.$Type) {
 			case "Edm.Binary":
 				return this.convertBinary(vValue);
@@ -535,8 +529,7 @@ sap.ui.define([
 	 * @public
 	 */
 	// @override sap.ui.model.odata.v4.lib._Requestor#doCheckVersionHeader
-	_V2Requestor.prototype.doCheckVersionHeader = function (fnGetHeader, sResourcePath,
-			_bVersionOptional) {
+	_V2Requestor.doCheckVersionHeader = function (fnGetHeader, sResourcePath, _bVersionOptional) {
 		var sDataServiceVersion = fnGetHeader("DataServiceVersion"),
 			vODataVersion = !sDataServiceVersion && fnGetHeader("OData-Version");
 
@@ -575,7 +568,7 @@ sap.ui.define([
 	 * @public
 	 */
 	// @override sap.ui.model.odata.v4.lib._Requestor#doConvertResponse
-	_V2Requestor.prototype.doConvertResponse = function (oResponsePayload, sMetaPath) {
+	_V2Requestor.doConvertResponse = function (oResponsePayload, sMetaPath) {
 		var oCandidate, bIsArray, aKeys, oPayload, oPropertyMetadata,
 			that = this;
 
@@ -651,8 +644,8 @@ sap.ui.define([
 	 * @public
 	 */
 	// @override sap.ui.model.odata.v4.lib._Requestor#doConvertSystemQueryOptions
-	_V2Requestor.prototype.doConvertSystemQueryOptions = function (sMetaPath, mQueryOptions,
-			fnResultHandler, bDropSystemQueryOptions, bSortExpandSelect) {
+	_V2Requestor.doConvertSystemQueryOptions = function (sMetaPath, mQueryOptions, fnResultHandler,
+			bDropSystemQueryOptions, bSortExpandSelect) {
 		var aSelects,
 			mSelects = {},
 			that = this;
@@ -788,7 +781,7 @@ sap.ui.define([
 	 * @public
 	 */
 	// @override sap.ui.model.odata.v4.lib._Requestor#formatPropertyAsLiteral
-	_V2Requestor.prototype.formatPropertyAsLiteral = function (vValue, oPropertyMetadata) {
+	_V2Requestor.formatPropertyAsLiteral = function (vValue, oPropertyMetadata) {
 		// Parse using the given formatter and check that the result is valid
 		function parseAndCheck(oDateFormat, sValue) {
 			var oDate = oDateFormat.parse(sValue);
@@ -864,8 +857,8 @@ sap.ui.define([
 	 * @public
 	 */
 	// @override sap.ui.model.odata.v4.lib._Requestor#getPathAndAddQueryOptions
-	_V2Requestor.prototype.getPathAndAddQueryOptions = function (sPath, oOperationMetadata,
-		mParameters, mQueryOptions, vEntity) {
+	_V2Requestor.getPathAndAddQueryOptions = function (sPath, oOperationMetadata, mParameters,
+			mQueryOptions, vEntity) {
 		var sName,
 			oTypeMetadata,
 			that = this;
@@ -916,7 +909,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	_V2Requestor.prototype.getTypeForName = function (sName) {
+	_V2Requestor.getTypeForName = function (sName) {
 		var oType;
 
 		this.mTypesByName = this.mTypesByName || {};
@@ -938,7 +931,7 @@ sap.ui.define([
 	 * @public
 	 */
 	// @override sap.ui.model.odata.v4.lib._Requestor#isActionBodyOptional
-	_V2Requestor.prototype.isActionBodyOptional = function () {
+	_V2Requestor.isActionBodyOptional = function () {
 		return true;
 	};
 
@@ -951,7 +944,7 @@ sap.ui.define([
 	 * @public
 	 */
 	// @override sap.ui.model.odata.v4.lib._Requestor#isChangeSetOptional
-	_V2Requestor.prototype.isChangeSetOptional = function () {
+	_V2Requestor.isChangeSetOptional = function () {
 		return false;
 	};
 
@@ -965,7 +958,7 @@ sap.ui.define([
 	 * @public
 	 */
 	// @override sap.ui.model.odata.v4.lib._Requestor#ready
-	_V2Requestor.prototype.ready = function () {
+	_V2Requestor.ready = function () {
 		return this.oModelInterface.fetchEntityContainer().then(function () {});
 	};
 
@@ -973,7 +966,7 @@ sap.ui.define([
 	// "static" functions
 	//*********************************************************************************************
 	function asV2Requestor(oRequestor) {
-		Object.assign(oRequestor, _V2Requestor.prototype);
+		Object.assign(oRequestor, _V2Requestor);
 		oRequestor.oModelInterface.reportStateMessages = function () {};
 		oRequestor.oModelInterface.reportTransitionMessages = function () {};
 	}

package/src/sap/ui/model/odata/v4/ts.js

@@ -0,0 +1,44 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+/**
+ * Namespace for TypeScript type definitions of the OData V4 model.
+ *
+ * @name sap.ui.model.odata.v4.ts
+ * @namespace
+ * @public
+ * @since 1.118.0
+ */
+
+/**
+ * An object representing a "14.5.11 Expression edm:NavigationPropertyPath". Its shape corresponds
+ * exactly to the shape of such an expression in the
+ * {@link topic:87aac894a40640f89920d7b2a414499b OData V4 Metadata JSON Format} as returned by
+ * {@link sap.ui.model.odata.v4.ODataMetaModel#requestObject}.
+ *
+ * @typedef {object} sap.ui.model.odata.v4.ts.NavigationPropertyPathExpression
+ * @property {string} $NavigationPropertyPath
+ *   A value of type <code>Edm.NavigationPropertyPath</code>.
+ *
+ * @public
+ * @see {@link sap.ui.model.odata.v4.Context#requestSideEffects}
+ * @since 1.118.0
+ */
+
+/**
+ * An object representing a "14.5.13 Expression edm:PropertyPath". Its shape corresponds exactly to
+ * the shape of such an expression in the
+ * {@link topic:87aac894a40640f89920d7b2a414499b OData V4 Metadata JSON Format} as returned by
+ * {@link sap.ui.model.odata.v4.ODataMetaModel#requestObject}.
+ *
+ * @typedef {object} sap.ui.model.odata.v4.ts.PropertyPathExpression
+ * @property {string} $PropertyPath
+ *   A value of type <code>Edm.PropertyPath</code>.
+ *
+ * @public
+ * @see {@link sap.ui.model.odata.v4.Context#requestSideEffects}
+ * @since 1.118.0
+ */

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

@@ -227,7 +227,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.117.1
+	 * @version 1.118.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/model/SimpleType', 'sap/ui/model/FormatException', 'sap/u
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

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

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.118.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.117.1
+	 * @version 1.118.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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 *
 	 * @alias sap.ui.model.type.DateInterval
 	 * @param {object} [oFormatOptions]
@@ -147,7 +147,7 @@ sap.ui.define([
 	/**
 	 * Parses the given value to an array of two values representing the start date and the end date
 	 * of the interval, where the time part of the start date is 0 and the time part of end date is
-	 * the end of day (23:59:59.999). If the <code>singleIntervalValue</code> format option is used,
+	 * the end of day (23:59:59). If the <code>singleIntervalValue</code> format option is used,
 	 * the second entry is <code>null</code> if no end date is given.
 	 *
 	 * @param {string} sValue
@@ -192,10 +192,11 @@ sap.ui.define([
 				// for client side filtering, ensure to set the end of day for the second value;
 				// don't do it for subclasses like DateTimeInterval as they consider the time part
 				if (aDates[1] && this.sName === "DateInterval") {
+					// to avoid rounding issues with some back-ends keep the milliseconds empty
 					if (this.oFormatOptions.UTC) {
-						aDates[1].setUTCHours(23, 59, 59, 999);
+						aDates[1].setUTCHours(23, 59, 59, 0);
 					} else {
-						aDates[1].setHours(23, 59, 59, 999);
+						aDates[1].setHours(23, 59, 59, 0);
 					}
 				}
 

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.117.1
+	 * @version 1.118.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.117.1
+	 * @version 1.118.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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.118.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.117.1
+	 * @version 1.118.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.117.1
+	 * @version 1.118.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.118.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.117.1
+	 * @version 1.118.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.117.1
+	 * @version 1.118.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

@@ -48,7 +48,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.118.0
 	 *
 	 * @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.117.1
+	 * @version 1.118.0
 	 *
 	 * @param {XMLDocument|string} oData
 	 *   Either the URL where to load the XML from or an XML document

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

@@ -331,7 +331,7 @@ sap.ui.define([
 		});
 
 		// register the response handler for data collection
-		XHRInterceptor.register(INTERACTION, "open", function () {
+		XHRInterceptor.register(INTERACTION, "open", function (sMethod, sUrl, bAsync) {
 			var sEpp,
 				sAction,
 				sRootContextID;
@@ -343,8 +343,9 @@ sap.ui.define([
 			}
 			// we only need to take care of requests when we have a running interaction
 			if (oPendingInteraction) {
+				var bIsNoCorsRequest = !isCORSRequest(sUrl);
 				// only use Interaction for non CORS requests
-				if (!isCORSRequest(arguments[1])) {
+				if (bIsNoCorsRequest) {
 					//only track if FESR.clientID == EPP.Action && FESR.rootContextID == EPP.rootContextID
 					sEpp = Interaction.passportHeader.get(this);
 					if (sEpp && sEpp.length >= 370) {
@@ -356,6 +357,13 @@ sap.ui.define([
 					if (!sEpp || sAction && sRootContextID && oPendingInteraction.passportAction.endsWith(sAction)) {
 						this.addEventListener("readystatechange", handleResponse.bind(this,  oPendingInteraction.id));
 					}
+				}
+				// arguments at position 2 is indicatior whether request is async or not
+				// readystatechange must not be used for sync CORS request since it does not work properly
+				// this is especially necessary in case request was not started by LoaderExtension
+				// bAsync is by default true, therefore we need to check eplicitly for value 'false'
+				if (bIsNoCorsRequest || bAsync !== false) {
+					// notify async step for all XHRs (even CORS requests)
 					this.addEventListener("readystatechange", handleInteraction.bind(this, Interaction.notifyAsyncStep()));
 				}
 				// assign the current interaction to the xhr for later response header retrieval.
@@ -601,6 +609,7 @@ sap.ui.define([
 				LoaderExtensions.notifyResourceLoading = Interaction.notifyAsyncStep;
 			}
 			bInteractionActive = bActive;
+			Interaction.notifyStepStart("startup", "startup", true);
 		},
 
 		/**

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

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