@openui5/sap.ui.core 1.136.1 → 1.138.0

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

@@ -52,79 +52,23 @@ sap.ui.define([
 	 */
 	function _AggregationCache(oRequestor, sResourcePath, oAggregation, mQueryOptions,
 			bHasGrandTotal) {
-		var fnCount = function () {}, // no specific handling needed for "UI5__count" here
-			fnLeaves = null,
-			fnResolve,
-			that = this;
-
 		_Cache.call(this, oRequestor, sResourcePath, mQueryOptions, true);
 
-		this.oAggregation = oAggregation;
-		// #getDownloadUrl must be called early (for recursive hierarchy to determine
-		// $DistanceFromRoot and for data aggregation before adding $$leaves)
-		this.sToString = this.getDownloadUrl("");
 		this.aElements = [];
 		this.aElements.$byPredicate = {};
 		this.aElements.$count = undefined;
 		this.aElements.$created = 0; // required for _Cache#drillDown (see _Cache.from$skip)
-		this.oCountPromise = undefined;
-		if (mQueryOptions.$count) {
-			if (oAggregation.hierarchyQualifier) {
-				this.oCountPromise = new SyncPromise(function (resolve) {
-					fnResolve = resolve;
-				});
-				this.oCountPromise.$resolve = fnResolve;
-			} else if (oAggregation.groupLevels.length) {
-				mQueryOptions.$$leaves = true; // do this after #getDownloadUrl
-				this.oCountPromise = new SyncPromise(function (resolve) {
-					fnLeaves = function (oLeaves) {
-						// Note: count has type Edm.Int64, represented as string in OData responses;
-						// $count should be a number and the loss of precision is acceptable
-						resolve(parseInt(oLeaves.UI5__leaves));
-					};
-				});
-			}
-		}
-		this.oFirstLevel = this.createGroupLevelCache(null, bHasGrandTotal || !!fnLeaves);
+		// Whether this cache is a unified cache, using oFirstLevel with ExpandLevels instead of
+		// separate group level caches
+		this.bUnifiedCache = oAggregation.expandTo >= Number.MAX_SAFE_INTEGER
+			|| !!oAggregation.createInPlace;
+
+		this.doReset(oAggregation, mQueryOptions, bHasGrandTotal);
 		this.addKeptElement = this.oFirstLevel.addKeptElement; // @borrows ...
 		this.removeKeptElement = this.oFirstLevel.removeKeptElement; // @borrows ...
 		this.requestSideEffects = this.oFirstLevel.requestSideEffects; // @borrows ...
-		this.oGrandTotalPromise = undefined;
-		if (bHasGrandTotal) {
-			this.oGrandTotalPromise = new SyncPromise(function (resolve) {
-				_ConcatHelper.enhanceCache(that.oFirstLevel, oAggregation, [fnLeaves,
-					function (oGrandTotal) {
-						var oGrandTotalCopy;
-
-						if (oAggregation["grandTotal like 1.84"]) { // rename measures
-							_AggregationHelper.removeUI5grand__(oGrandTotal);
-						}
-						_AggregationHelper.setAnnotations(oGrandTotal, true, true, 0,
-							_AggregationHelper.getAllProperties(oAggregation));
-
-						if (oAggregation.grandTotalAtBottomOnly === false) {
-							// Note: make shallow copy *before* there are private annotations!
-							oGrandTotalCopy = Object.assign({}, oGrandTotal, {
-									"@$ui5.node.isExpanded" : undefined // treat copy as a leaf
-								});
-							_Helper.setPrivateAnnotation(oGrandTotal, "copy", oGrandTotalCopy);
-							_Helper.setPrivateAnnotation(oGrandTotalCopy, "predicate",
-								"($isTotal=true)");
-						}
-						_Helper.setPrivateAnnotation(oGrandTotal, "predicate", "()");
-
-						resolve(oGrandTotal);
-					}, fnCount]);
-			});
-		} else if (fnLeaves) {
-			_ConcatHelper.enhanceCache(that.oFirstLevel, oAggregation, [fnLeaves, fnCount]);
-		}
 		this.oTreeState = new _TreeState(oAggregation.$NodeProperty,
 			(oNode) => _Helper.getKeyFilter(oNode, this.sMetaPath, this.getTypes()));
-		// Whether this cache is a unified cache, using oFirstLevel with ExpandLevels instead of
-		// separate group level caches
-		this.bUnifiedCache = this.oAggregation.expandTo >= Number.MAX_SAFE_INTEGER
-			|| !!this.oAggregation.createInPlace;
 	}
 
 	// make _AggregationCache a _Cache, but actively disinherit some critical methods
@@ -228,7 +172,6 @@ sap.ui.define([
 	 */
 	_AggregationCache.prototype.addElements = function (vReadElements, iOffset, oCache, iStart) {
 		var aElements = this.aElements,
-			sHierarchyQualifier = this.oAggregation.hierarchyQualifier,
 			sNodeProperty = this.oAggregation.$NodeProperty,
 			that = this;
 
@@ -250,7 +193,7 @@ sap.ui.define([
 			oKeptElement = aElements.$byPredicate[sPredicate];
 			if (oKeptElement && oKeptElement !== oElement
 					&& !(oKeptElement instanceof SyncPromise)) {
-				if (!sHierarchyQualifier || aElements.includes(oKeptElement)) {
+				if (aElements.includes(oKeptElement)) {
 					const sNewPredicate = oCache.fixDuplicatePredicate(oElement, sPredicate);
 					if (sNewPredicate) {
 						sPredicate = sNewPredicate;
@@ -426,7 +369,7 @@ sap.ui.define([
 				iRemaining -= this.collapse(
 					_Helper.getPrivateAnnotation(oElement, "predicate"), oGroupLock, bSilent, true);
 			}
-			// exceptions of selection are effectively kept alive (with recursive hierarchy)
+			// exceptions of selection are effectively kept alive
 			if (!this.isSelectionDifferent(oElement)) {
 				delete aElements.$byPredicate[_Helper.getPrivateAnnotation(oElement, "predicate")];
 				delete aElements.$byPredicate[
@@ -719,6 +662,67 @@ sap.ui.define([
 		return oCache;
 	};
 
+	/**
+	 * Hook method for both {@link #constructor} and {@link #reset}. Creates the promises needed
+	 * for the leaf count and grand total, if applicable. Creates a first level cache and
+	 * calculates the result of {@link #toString}. Remembers <code>oAggregation</code>, enhancing
+	 * it with "$NodeProperty" etc. in case of a recursive hierarchy (see
+	 * {@link sap.ui.model.odata.v4.lib._AggregationHelper.buildApply4Hierarchy} for details).
+	 *
+	 * @param {object} oAggregation
+	 *   An object holding the information needed for data aggregation; see also "OData Extension
+	 *   for Data Aggregation Version 4.0"; must already be normalized by
+	 *   {@link _AggregationHelper.buildApply} - it's MODIFIED here!
+	 * @param {object} mQueryOptions
+	 *   A map of key-value pairs representing the query string - it's MODIFIED here!
+	 * @param {boolean} bHasGrandTotal
+	 *   Whether a grand total is needed
+	 *
+	 * @private
+	 */
+	_AggregationCache.prototype.doReset = function (oAggregation, mQueryOptions, bHasGrandTotal) {
+		this.oAggregation = oAggregation;
+		// early call of _AggregationHelper.buildApply to determine $NodeProperty etc.
+		this.sToString = this.getDownloadUrl("");
+
+		const aAdditionalRowHandlers = [];
+		this.oCountPromise = undefined;
+		if (mQueryOptions.$count) {
+			if (oAggregation.hierarchyQualifier) {
+				let fnResolve;
+				this.oCountPromise = new SyncPromise(function (resolve) {
+					fnResolve = resolve;
+				});
+				this.oCountPromise.$resolve = fnResolve;
+			} else if (oAggregation.groupLevels.length) {
+				mQueryOptions.$$leaves = true;
+				this.oCountPromise = new SyncPromise(function (resolve) {
+					aAdditionalRowHandlers.push((oLeaves) => {
+						// Note: count has type Edm.Int64, represented as string in OData responses;
+						// $count should be a number and the loss of precision is acceptable
+						resolve(parseInt(oLeaves.UI5__leaves));
+					});
+				});
+			}
+		}
+		this.oGrandTotalPromise = bHasGrandTotal
+			? new SyncPromise((resolve) => {
+				aAdditionalRowHandlers.push((oGrandTotal) => {
+					_AggregationHelper.handleGrandTotal(oAggregation, oGrandTotal);
+					resolve(oGrandTotal);
+				});
+			})
+			: undefined;
+
+		const bHasConcatHelper = aAdditionalRowHandlers.length > 0;
+		this.oFirstLevel = this.createGroupLevelCache(null, bHasConcatHelper);
+		if (bHasConcatHelper) {
+			// no specific handling needed for "UI5__count" here
+			aAdditionalRowHandlers.push(function () {});
+			_ConcatHelper.enhanceCache(this.oFirstLevel, oAggregation, aAdditionalRowHandlers);
+		}
+	};
+
 	/**
 	 * Expands the given group node by the given number of levels.
 	 *
@@ -1261,6 +1265,24 @@ sap.ui.define([
 		} // else: iSiblingRank === undefined => return undefined;
 	};
 
+	/**
+	 * @override
+	 * @see sap.ui.model.odata.v4.lib._Cache#getQueryOptions4Single
+	 */
+	_AggregationCache.prototype.getQueryOptions4Single = function (sPath) {
+		if (sPath !== "") {
+			throw new Error("Unsupported path: " + sPath);
+		}
+
+		const mQueryOptions = _Helper.clone(this.mLateQueryOptions ?? this.mQueryOptions);
+		const iIndex = mQueryOptions.$select.indexOf(this.oAggregation.$NodeProperty);
+		if (iIndex >= 0) {
+			mQueryOptions.$select.splice(iIndex, 1);
+		}
+
+		return mQueryOptions;
+	};
+
 	/**
 	 * @override
 	 * @see sap.ui.model.odata.v4.lib._Cache#getValue
@@ -1411,18 +1433,15 @@ sap.ui.define([
 
 	/**
 	 * Determines if the "@$ui5.context.isSelected" annotation of the given element differs from the
-	 * annotation at the collection. Only relevant in case of a recursive hierarchy. Note: A missing
-	 * annotation is treated as <code>false</code>.
+	 * annotation at the collection. Note: A missing annotation is treated as <code>false</code>.
 	 *
 	 * @param {object} oElement - The element
-	 * @returns {boolean} Whether recursive hierarchy is used and the selection state of the element
-	 *   differs from the collection
+	 * @returns {boolean} Whether the selection state of the element differs from the collection
 	 *
 	 * @private
 	 */
 	_AggregationCache.prototype.isSelectionDifferent = function (oElement) {
-		return this.oAggregation.hierarchyQualifier
-			&& (oElement["@$ui5.context.isSelected"] ?? false)
+		return (oElement["@$ui5.context.isSelected"] ?? false)
 				!== (this.aElements["@$ui5.context.isSelected"] ?? false);
 	};
 
@@ -1955,7 +1974,7 @@ sap.ui.define([
 
 				that.aElements.length = that.aElements.$count = oResult.value.$count;
 
-				if (that.oGrandTotalPromise) {
+				if (that.aElements.length && that.oGrandTotalPromise) {
 					that.aElements.$count += 1;
 					that.aElements.length += 1;
 					oGrandTotal = that.oGrandTotalPromise.getResult();
@@ -2092,12 +2111,30 @@ sap.ui.define([
 	 */
 	_AggregationCache.prototype.refreshKeptElements = function (oGroupLock, fnOnRemove,
 			bIgnorePendingChanges, _bDropApply) {
+		if (!this.oAggregation.hierarchyQualifier) {
+			return; // no own request for data aggregation
+		}
+
 		// "super" call (like @borrows ...)
 		const fnSuper = this.oFirstLevel.refreshKeptElements;
 		return fnSuper.call(this, oGroupLock, fnOnRemove, bIgnorePendingChanges,
 			/*bDropApply*/true);
 	};
 
+	/**
+	 * @override
+	 * @see sap.ui.model.odata.v4.lib._Cache#replaceElement
+	 */
+	_AggregationCache.prototype.replaceElement = function (aElements, _iIndex, sPredicate,
+			oElement, mTypeForMetaPath, sPath, bKeepReportedMessagesPath) {
+		// Note: iStart is not needed here because we know we have a key predicate
+		this.visitResponse(oElement, mTypeForMetaPath,
+			_Helper.getMetaPath(_Helper.buildPath(this.sMetaPath, sPath)), sPath + sPredicate,
+			undefined, bKeepReportedMessagesPath);
+
+		_Helper.updateAll({/*mChangeListeners*/}, "", aElements.$byPredicate[sPredicate], oElement);
+	};
+
 	/**
 	 * Sends a request for the elements identified by the given key predicates. Returns predicates
 	 * for elements matching the current filter.
@@ -2363,15 +2400,12 @@ sap.ui.define([
 	 */
 	_AggregationCache.prototype.reset = function (aKeptElementPredicates, sGroupId, mQueryOptions,
 			oAggregation, bIsGrouped) {
-		var fnResolve,
-			that = this;
-
 		if (bIsGrouped) {
 			throw new Error("Unsupported grouping via sorter");
 		}
 
-		aKeptElementPredicates.forEach(function (sPredicate) {
-			var oKeptElement = that.aElements.$byPredicate[sPredicate];
+		aKeptElementPredicates.forEach((sPredicate) => {
+			var oKeptElement = this.aElements.$byPredicate[sPredicate];
 
 			if (_Helper.hasPrivateAnnotation(oKeptElement, "placeholder")) {
 				throw new Error("Unexpected placeholder");
@@ -2382,29 +2416,22 @@ sap.ui.define([
 			_Helper.setPrivateAnnotation(oKeptElement, "predicate", sPredicate);
 		});
 
-		this.oAggregation = oAggregation;
 		// "super" call (like @borrows ...)
 		const fnSuper = this.oFirstLevel.reset;
 		fnSuper.call(this, aKeptElementPredicates, sGroupId, mQueryOptions);
-		// reset modifies the cache's query options => recalculate result of #toString
-		this.sToString = this.getDownloadUrl("");
 		if (sGroupId) { // sGroupId means we are in a side-effects refresh
 			this.oBackup.oCountPromise = this.oCountPromise;
 			this.oBackup.oFirstLevel = this.oFirstLevel;
+			this.oBackup.oGrandTotalPromise = this.oGrandTotalPromise;
 			this.oBackup.bUnifiedCache = this.bUnifiedCache;
 			this.bUnifiedCache = true;
 		} else {
 			this.oTreeState.reset();
 		}
-		this.oAggregation.$ExpandLevels = this.oTreeState.getExpandLevels();
-		this.oCountPromise = undefined;
-		if (mQueryOptions.$count) {
-			this.oCountPromise = new SyncPromise(function (resolve) {
-				fnResolve = resolve;
-			});
-			this.oCountPromise.$resolve = fnResolve;
-		}
-		this.oFirstLevel = this.createGroupLevelCache();
+		oAggregation.$ExpandLevels = this.oTreeState.getExpandLevels();
+
+		this.doReset(oAggregation, mQueryOptions,
+			_AggregationHelper.hasGrandTotal(oAggregation.aggregate));
 	};
 
 	/**
@@ -2424,6 +2451,7 @@ sap.ui.define([
 		if (bReally) {
 			this.oCountPromise = this.oBackup.oCountPromise;
 			this.oFirstLevel = this.oBackup.oFirstLevel;
+			this.oGrandTotalPromise = this.oBackup.oGrandTotalPromise;
 			this.bUnifiedCache = this.oBackup.bUnifiedCache;
 		}
 		// "super" call (like @borrows ...)
@@ -2857,7 +2885,7 @@ sap.ui.define([
 			sDeepResourcePath, bSharedRequest);
 	};
 
-	// @override sap.ui.model.odata.v4.lib._Cache#fixDuplicatePredicate
+	// @override sap.ui.model.odata.v4.lib._CollectionCache#fixDuplicatePredicate
 	_AggregationCache.fixDuplicatePredicate = function (oElement, sPredicate) {
 		if (sPredicate === "('')" || sPredicate.includes("=''")) {
 			Log.warning("Duplicate key predicate: " + sPredicate, this.toString(),

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

@@ -1123,6 +1123,35 @@ sap.ui.define([
 			return mQueryOptions;
 		},
 
+		/**
+		 * Handles the given server response for a grand total row and updates it as needed by the
+		 * client.
+		 *
+		 * @param {object} oAggregation
+		 *   An object holding the information needed for data aggregation; see {@link .buildApply}
+		 * @param {object} oGrandTotal
+		 *   An object representing a grand total row response from the server
+		 *
+		 * @public
+		 */
+		handleGrandTotal : function (oAggregation, oGrandTotal) {
+			if (oAggregation["grandTotal like 1.84"]) { // rename measures
+				_AggregationHelper.removeUI5grand__(oGrandTotal);
+			}
+			_AggregationHelper.setAnnotations(oGrandTotal, true, true, 0,
+				_AggregationHelper.getAllProperties(oAggregation));
+
+			if (oAggregation.grandTotalAtBottomOnly === false) {
+				// Note: make shallow copy *before* there are private annotations!
+				const oGrandTotalCopy = Object.assign({}, oGrandTotal, {
+					"@$ui5.node.isExpanded" : undefined // treat copy as a leaf
+				});
+				_Helper.setPrivateAnnotation(oGrandTotal, "copy", oGrandTotalCopy);
+				_Helper.setPrivateAnnotation(oGrandTotalCopy, "predicate", "($isTotal=true)");
+			}
+			_Helper.setPrivateAnnotation(oGrandTotal, "predicate", "()");
+		},
+
 		/**
 		 * Tells whether grand total values are needed for at least one aggregatable property.
 		 *

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

@@ -1322,6 +1322,22 @@ sap.ui.define([
 		return this.mQueryOptions;
 	};
 
+	/**
+	 * Returns this cache's query options corresponding to the given path (already cloned!) as
+	 * suitable for a single-entity GET request.
+	 *
+	 * @param {string} sPath
+	 *   The entity collection's path within this cache, may be <code>""</code>
+	 * @returns {object|undefined} The query options as a clone, if any
+	 *
+	 * @protected
+	 * @see #getQueryOptions
+	 * @see #refreshSingle
+	 */
+	_Cache.prototype.getQueryOptions4Single = function (sPath) {
+		return _Helper.clone(_Helper.getQueryOptionsForPath(this.mQueryOptions, sPath));
+	};
+
 	/**
 	 * Gets the cache's resource path.
 	 *
@@ -1485,8 +1501,7 @@ sap.ui.define([
 					&& that.oRequestor.getModelInterface().fetchMetadata(
 						that.sMetaPath + "/@com.sap.vocabularies.Common.v1.Messages/$Path"
 					).getResult(),
-				mQueryOptions = _Helper.clone(
-					_Helper.getQueryOptionsForPath(that.mQueryOptions, sPath)),
+				mQueryOptions = that.getQueryOptions4Single(sPath),
 				sReadUrl;
 
 			if (iIndex >= 0) {
@@ -1820,7 +1835,7 @@ sap.ui.define([
 	 * @param {boolean} [bKeepReportedMessagesPath]
 	 *   Whether <code>this.sReportedMessagesPath</code> should be kept unchanged
 	 *
-	 * @private
+	 * @protected
 	 */
 	_Cache.prototype.replaceElement = function (aElements, iIndex, sPredicate, oElement,
 			mTypeForMetaPath, sPath, bKeepReportedMessagesPath) {
@@ -3805,8 +3820,9 @@ sap.ui.define([
 				end : iEnd,
 				promise : new SyncPromise(function (resolve, reject) {
 					fnResolve = resolve;
-					fnReject = function () {
-						const oError = new Error("$$separate: canceled " + sProperty);
+					fnReject = function (oError0) {
+						const oError = new Error("$$separate: canceled " + sProperty,
+							{cause : oError0});
 						oError.canceled = true;
 						reject(oError);
 					};
@@ -3819,9 +3835,9 @@ sap.ui.define([
 				const oResult = await this.oRequestor.request("GET", sReadUrl,
 					this.oRequestor.lockGroup("$single", this));
 
-				let bMainFailed;
-				await oMainPromise.catch(() => { /* handled by caller */
-					bMainFailed = true;
+				let oMainError;
+				await oMainPromise.catch((oError) => { /* handled by caller */
+					oMainError = oError;
 				});
 
 				const iIndex = this.mSeparateProperty2ReadRequests[sProperty].indexOf(oReadRange);
@@ -3831,8 +3847,8 @@ sap.ui.define([
 				}
 
 				this.mSeparateProperty2ReadRequests[sProperty].splice(iIndex, 1);
-				if (bMainFailed) {
-					fnReject();
+				if (oMainError) {
+					fnReject(oMainError);
 					return;
 				}
 
@@ -3842,6 +3858,10 @@ sap.ui.define([
 					const oElement = this.aElements.$byPredicate[sPredicate];
 					if (oElement) {
 						if (oElement["@odata.etag"] === oSeparateData["@odata.etag"]) {
+							if (oElement[sProperty]?.["@odata.etag"]
+									!== oSeparateData[sProperty]?.["@odata.etag"]) {
+								delete oElement[sProperty];
+							}
 							_Helper.updateSelected(this.mChangeListeners, sPredicate, oElement,
 								oSeparateData, [sProperty]);
 						} else {
@@ -3853,7 +3873,7 @@ sap.ui.define([
 				fnResolve();
 				fnSeparateReceived(sProperty, iStart, iEnd);
 			} catch (oError) {
-				fnReject();
+				fnReject(oError);
 				// do not clean up mSeparateProperty2ReadRequests to avoid late property requests
 				fnSeparateReceived(sProperty, iStart, iEnd, oError);
 			}
@@ -4537,7 +4557,8 @@ sap.ui.define([
 
 						if (bConfirm) {
 							delete mHeaders["Prefer"];
-							return post(oGroupLock0.getUnlockedCopy());
+							// decomposed error indicates request inside change set (but not alone)
+							return post(oGroupLock0.getUnlockedCopy(!oError.decomposed));
 						}
 
 						oCanceledError = Error("Action canceled due to strict handling");

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

@@ -28,7 +28,8 @@ sap.ui.define([
 	 * @param {boolean} [bModifying]
 	 *   Whether the reason for the group lock is a modifying request
 	 * @param {number} [iSerialNumber=Infinity]
-	 *   A serial number which may be used on unlock
+	 *   A {@link #getSerialNumber serial number} which may be used on unlock, or <code>NaN</code>
+	 *   if none should be used
 	 * @param {function} [fnCancel]
 	 *   Function that is called when the group lock is canceled
 	 * @throws {Error}
@@ -99,9 +100,10 @@ sap.ui.define([
 	 * Returns the serial number.
 	 *
 	 * @returns {number}
-	 *   The serial number
+	 *   The serial number or <code>NaN</code> if none should be used
 	 *
 	 * @public
+	 * @see #getUnlockedCopy
 	 */
 	_GroupLock.prototype.getSerialNumber = function () {
 		return this.iSerialNumber;
@@ -112,13 +114,17 @@ sap.ui.define([
 	 * lock on which {@link #unlock} has already been called (e.g. when one group is used to create
 	 * multiple requests).
 	 *
+	 * @param {boolean} [bNoSerialNumber]
+	 *   Whether to replace the old serial number with <code>NaN</code> instead of keeping it
 	 * @returns {sap.ui.model.odata.v4.lib._GroupLock}
 	 *   The group lock
 	 *
 	 * @public
+	 * @see #getSerialNumber
 	 */
-	_GroupLock.prototype.getUnlockedCopy = function () {
-		return new _GroupLock(this.sGroupId, this.oOwner, false, false, this.iSerialNumber);
+	_GroupLock.prototype.getUnlockedCopy = function (bNoSerialNumber) {
+		return new _GroupLock(this.sGroupId, this.oOwner, false, false,
+			bNoSerialNumber ? NaN : this.iSerialNumber);
 	};
 
 	/**

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

@@ -591,8 +591,6 @@ sap.ui.define([
 		 *       response JSON object (if available)
 		 *     <li> <code>isConcurrentModification</code>: (optional) <code>true</code> In case of a
 		 *       concurrent modification detected via ETags (i.e. HTTP status code 412)
-		 *     <li> <code>strictHandlingFailed</code>: (optional) <code>true</code> In case of HTTP
-		 *       status code 412 and response header "Preference-Applied:handling=strict"
 		 *     <li> <code>message</code>: Error message
 		 *     <li> <code>requestUrl</code>: (optional) The absolute request URL
 		 *     <li> <code>resourcePath</code>: (optional) The path by which this resource has
@@ -602,6 +600,8 @@ sap.ui.define([
 		 *       that header value was an HTTP date or a delay in seconds.
 		 *     <li> <code>status</code>: HTTP status code
 		 *     <li> <code>statusText</code>: (optional) HTTP status text
+		 *     <li> <code>strictHandlingFailed</code>: (optional) <code>true</code> In case of HTTP
+		 *       status code 412 and response header "Preference-Applied:handling=strict"
 		 *   </ul>
 		 * @see <a href=
 		 * "http://docs.oasis-open.org/odata/odata-json-format/v4.0/os/odata-json-format-v4.0-os.html#_Representing_Errors_in"
@@ -807,7 +807,8 @@ sap.ui.define([
 		 *   URL of the service document used to resolve relative request URLs
 		 * @returns {Error[]}
 		 *   One error for each request given, suitable for
-		 *   {@link sap.ui.model.odata.v4.ODataModel#reportError}
+		 *   {@link sap.ui.model.odata.v4.ODataModel#reportError} and marked as
+		 *   <code>decomposed</code>
 		 *
 		 * @public
 		 */
@@ -842,6 +843,7 @@ sap.ui.define([
 					return sContentID === oRequest.$ContentID;
 				}
 
+				oClone.decomposed = true;
 				oClone.error = _Helper.clone(oError.error);
 				oClone.requestUrl = sServiceUrl + oRequest.url;
 				oClone.resourcePath = oRequest.$resourcePath;

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

@@ -450,34 +450,53 @@ sap.ui.define([
 
 	/**
 	 * Throws an error if the new request uses strict handling and there is a change set containing
-	 * a strict handling request except the one at index <code>iChangeSetNo</code>.
+	 * a strict handling request except the one at index <code>iChangeSetNo</code>. On the other
+	 * hand, in case of the "odata.continue-on-error" preference, every request using strict
+	 * handling must belong to its own change set.
 	 *
 	 * @param {object} oRequest
-	 *   The new request
+	 *   The new request or <code>null</code> to re-check all change sets as a preparation for the
+	 *   "odata.continue-on-error" preference
 	 * @param {object[]} aRequests
 	 *   The batch queue
-	 * @param {number} iChangeSetNo
-	 *   The index of the irrelevant change set
+	 * @param {number} [iChangeSetNo]
+	 *   The index of the irrelevant change set; ignored for a <code>null</code> request
 	 * @throws {Error}
 	 *   If there is a conflicting change set
 	 *
 	 * @private
 	 */
 	_Requestor.prototype.checkConflictingStrictRequest = function (oRequest, aRequests,
-		iChangeSetNo) {
+			iChangeSetNo) {
+		function hasManyWithStrictHandling(aChangeSet) {
+			return aChangeSet.filter(isUsingStrictHandling).length > 1;
+		}
+
 		function isOtherChangeSetWithStrictHandling(aChangeSet, i) {
 			return iChangeSetNo !== i && aChangeSet.some(isUsingStrictHandling);
 		}
 
 		function isUsingStrictHandling(oRequest0) {
-			return oRequest0.headers.Prefer === "handling=strict";
+			return oRequest0.headers.Prefer?.includes("handling=strict");
 		}
 
-		// do not look past aRequests.iChangeSet because these cannot be change sets
-		if (isUsingStrictHandling(oRequest)
-				&& aRequests.slice(0, aRequests.iChangeSet + 1)
-					.some(isOtherChangeSetWithStrictHandling)) {
-			throw new Error("All requests with strict handling must belong to the same change set");
+		const sMessage = "Each request with strict handling must belong to its own change set due"
+			+ ' to the "odata.continue-on-error" preference';
+		const aChangeSets = aRequests.slice(0, aRequests.iChangeSet + 1);
+		if (oRequest === null) {
+			if (aChangeSets.some(hasManyWithStrictHandling)) {
+				throw new Error(sMessage);
+			}
+		} else if (aRequests.bContinueOnError) {
+			if (aChangeSets[iChangeSetNo].length
+					&& (isUsingStrictHandling(oRequest)
+						|| isUsingStrictHandling(aChangeSets[iChangeSetNo][0]))) {
+				throw new Error(sMessage);
+			}
+		} else if (isUsingStrictHandling(oRequest)
+				&& aChangeSets.some(isOtherChangeSetWithStrictHandling)) {
+			throw new Error(
+				"All requests with strict handling must belong to the same change set");
 		}
 	};
 
@@ -1793,7 +1812,8 @@ sap.ui.define([
 	 *   other group ID values, the request is added to the given group and you can use
 	 *   {@link #submitBatch} to send all requests in that group. This group lock will be unlocked
 	 *   immediately, even if the request itself is queued. The request is rejected if the lock is
-	 *   already canceled.
+	 *   already canceled. For a group lock w/o a serial number, a non-GET is put into a change set
+	 *   of its own (unless <code>bAtFront</code> is used).
 	 * @param {object} [mHeaders]
 	 *   Map of request-specific headers, overriding both the mandatory OData V4 headers and the
 	 *   default headers given to the factory. This map of headers must not contain
@@ -1843,8 +1863,10 @@ sap.ui.define([
 	 *   <code>oGroupLock</code> is already canceled.
 	 * @throws {Error} If
 	 *   <ul>
-	 *     <li>group ID is '$cached'. The error has a property <code>$cached = true</code>
-	 *     <li>group ID is '$single' and there is already an existing batch queue for this group
+	 *     <li>group ID is '$cached'; the error has a property <code>$cached = true</code>,
+	 *     <li>group ID is '$single' and there is already an existing batch queue for this group,
+	 *     <li>the {@link #checkConflictingStrictRequest rules for strict handling} w.r.t. change
+	 *       sets are violated
 	 *   </ul>
 	 * @public
 	 */
@@ -1911,13 +1933,18 @@ sap.ui.define([
 				} else if (bAtFront) { // add at front of first change set
 					aRequests[0].unshift(oRequest);
 				} else { // push into change set which was current when the request was initiated
+					if (!iRequestSerialNumber && aRequests[aRequests.iChangeSet].length) {
+						that.addChangeSet(sGroupId);
+					}
 					iChangeSetNo = aRequests.iChangeSet;
 					while (aRequests[iChangeSetNo].iSerialNumber > iRequestSerialNumber) {
 						iChangeSetNo -= 1;
 					}
 					that.checkConflictingStrictRequest(oRequest, aRequests, iChangeSetNo);
-
 					aRequests[iChangeSetNo].push(oRequest);
+					if (!iRequestSerialNumber) {
+						that.addChangeSet(sGroupId);
+					}
 				}
 				if (sGroupId === "$single") {
 					that.submitBatch("$single").catch(that.oModelInterface.getReporter());
@@ -2146,11 +2173,15 @@ sap.ui.define([
 	 *
 	 * @param {string} sGroupId
 	 *   The group ID
+	 * @throws {Error} If the {@link #checkConflictingStrictRequest rules for strict handling}
+	 *   w.r.t. change sets are violated
 	 *
 	 * @public
 	 */
 	_Requestor.prototype.setContinueOnError = function (sGroupId) {
-		this.getOrCreateBatchQueue(sGroupId).bContinueOnError = true;
+		const aRequests = this.getOrCreateBatchQueue(sGroupId);
+		this.checkConflictingStrictRequest(null, aRequests);
+		aRequests.bContinueOnError = true;
 	};
 
 	/**