@openui5/sap.ui.core 1.107.0 → 1.108.0

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

@@ -15,6 +15,7 @@ sap.ui.define([
 	"sap/ui/model/odata/ODataUtils"
 ], function (_GroupLock, _Helper, _Requestor, Log, isEmptyObject, SyncPromise, ODataUtils) {
 	"use strict";
+	/*eslint max-nested-callbacks: 0 */
 
 	var sClassName = "sap.ui.model.odata.v4.lib._Cache",
 		// Matches if ending with a transient key predicate:
@@ -24,9 +25,9 @@ sap.ui.define([
 		rInactive = /^\$inactive\./,
 		sMessagesAnnotation = "@com.sap.vocabularies.Common.v1.Messages",
 		rNumber = /^-?\d+$/,
-		// Matches two cases:  segment with predicate or simply predicate:
+		// Matches two cases: segment with predicate or simply predicate:
 		//   EMPLOYEE(ID='42') -> aMatches[1] === "EMPLOYEE", aMatches[2] === "(ID='42')"
-		//   (ID='42') ->  aMatches[1] === "",  aMatches[2] === "(ID='42')"
+		//   (ID='42') -> aMatches[1] === "", aMatches[2] === "(ID='42')"
 		rSegmentWithPredicate = /^([^(]*)(\(.*\))$/;
 
 	/**
@@ -136,7 +137,7 @@ sap.ui.define([
 	 *   A lock for the group ID to be used for the DELETE request; w/o a lock, no DELETE is sent.
 	 *   For a transient entity, the lock is ignored (use NULL)!
 	 * @param {string} sEditUrl
-	 *   The entity's edit URL to be used for the DELETE request;  w/o a lock, this is mostly
+	 *   The entity's edit URL to be used for the DELETE request; w/o a lock, this is mostly
 	 *   ignored.
 	 * @param {string} sPath
 	 *   The entity's path within the cache (as used by change listeners)
@@ -144,10 +145,6 @@ sap.ui.define([
 	 *   An entity with the ETag of the binding for which the deletion was requested. This is
 	 *   provided if the deletion is delegated from a context binding with empty path to a list
 	 *   binding. W/o a lock, this is ignored.
-	 * @param {boolean} [bDoNotRequestCount]
-	 *   Whether not to request the new count from the server; useful in case of
-	 *   {@link sap.ui.model.odata.v4.Context#replaceWith} where it is known that the count remains
-	 *   unchanged; only used when deleting from an entity collection
 	 * @param {function} [fnCallback]
 	 *   A function which is called immediately when an entity has been deleted from the cache, or
 	 *   when it was re-inserted due to an error; only used when deleting from an entity collection,
@@ -160,8 +157,7 @@ sap.ui.define([
 	 *
 	 * @public
 	 */
-	_Cache.prototype._delete = function (oGroupLock, sEditUrl, sPath, oETagEntity,
-			bDoNotRequestCount, fnCallback) {
+	_Cache.prototype._delete = function (oGroupLock, sEditUrl, sPath, oETagEntity, fnCallback) {
 		var aSegments = sPath.split("/"),
 			vDeleteProperty = aSegments.pop(),
 			sParentPath = aSegments.join("/"),
@@ -200,14 +196,7 @@ sap.ui.define([
 			aMessages = oModelInterface.getMessagesByPath(
 				_Helper.buildPath("/", that.sResourcePath, sEntityPath), true);
 
-			if (aMessages.length) {
-				aMessages = aMessages.filter(function (oMessage) {
-					return !oMessage.persistent;
-				});
-				_Helper.setPrivateAnnotation(oEntity, "messages", aMessages);
-			}
-
-			oModelInterface.reportStateMessages(that.sResourcePath, {}, [sEntityPath]);
+			oModelInterface.fireMessageChange({oldMessages : aMessages});
 
 			oEntity["@$ui5.context.isDeleted"] = true;
 			if (Array.isArray(vCacheData)) {
@@ -220,23 +209,16 @@ sap.ui.define([
 			sEditUrl += that.oRequestor.buildQueryString(that.sMetaPath, that.mQueryOptions, true);
 			// the existence of an onCancel callback causes a pending change in the requestor
 			oRequestPromise = oGroupLock
-				? that.oRequestor.request("DELETE", sEditUrl, oGroupLock.getUnlockedCopy(),
-					mHeaders, undefined, undefined, /*onCancel*/function () {}, undefined,
+				? that.oRequestor.request("DELETE", sEditUrl, oGroupLock, mHeaders, undefined,
+					undefined, /*onCancel*/function () {}, undefined,
 					_Helper.buildPath(that.getOriginalResourcePath(oEntity), sEntityPath))
 				: SyncPromise.resolve();
 			_Helper.addByPath(that.mChangeRequests, sEntityPath, oRequestPromise);
-			return SyncPromise.all([
-				oRequestPromise.catch(function (oError) {
-					if (oError.status !== 404) {
-						throw oError;
-					} // else: map 404 to 200
-				}),
-				iIndex === undefined // single element or kept-alive not in list
-					&& !bDoNotRequestCount
-					&& that.requestCount(oGroupLock || that.oRequestor.lockGroup("$auto", that)),
-				oGroupLock && oGroupLock.unlock() // unlock when all requests have been queued
-			]).then(function () {
-				_Helper.deletePrivateAnnotation(oEntity, "messages");
+			return oRequestPromise.catch(function (oError) {
+				if (oError.status !== 404) {
+					throw oError;
+				} // else: map 404 to 200
+			}).then(function () {
 				if (Array.isArray(vCacheData)) {
 					vCacheData.$deleted.splice(vCacheData.$deleted.indexOf(oDeleted), 1);
 					delete vCacheData.$byPredicate[sKeyPredicate];
@@ -249,13 +231,16 @@ sap.ui.define([
 					oEntity["$ui5.deleted"] = true;
 				}
 			}, function (oError) {
-				var iDeletedIndex,
-					aMessages = _Helper.getPrivateAnnotation(oEntity, "messages");
+				var iDeletedIndex;
 
-				if (aMessages) {
+				if (aMessages.length) {
+					if (!oError.canceled) {
+						aMessages = aMessages.filter(function (oMessage) {
+							return !oMessage.persistent;
+						});
+					}
 					oModelInterface.fireMessageChange({newMessages : aMessages});
 				}
-				_Helper.deletePrivateAnnotation(oEntity, "messages");
 
 				delete oEntity["@$ui5.context.isDeleted"];
 				if (Array.isArray(vCacheData)) {
@@ -271,7 +256,14 @@ sap.ui.define([
 							that.iActiveElements += 1;
 						}
 					}
-					fnCallback(iIndex, 1);
+					if (that.iActiveUsages) {
+						fnCallback(iIndex, 1);
+					} else if (iIndex === undefined) {
+						// an active cache must let the binding reset to be told about kept-alive
+						// elements, an inactive cache however has no binding and no kept-alive
+						// elements
+						that.reset([]);
+					}
 				}
 				throw oError;
 			}).finally(function () {
@@ -282,11 +274,12 @@ sap.ui.define([
 
 	/**
 	 * Adds an entry about a deleted entity to <code>aElements.$deleted</code>. Ensures that the
-	 * entries are ordered by entity index and deletion order (if two entities were deleted on the
-	 * same index, the second one must be behind).
+	 * entries are ordered ascending by entity index and deletion order (if two entities were
+	 * deleted on the same index, the second one must be behind). Entities w/o index are placed at
+	 * the start.
 	 *
 	 * @param {object[]} aElements - The elements collection
-	 * @param {number} iIndex - The entity's index
+	 * @param {number} [iIndex] - The entity's index, undefined if it was not in the collection
 	 * @param {string} sPredicate - The entity's key predicate
 	 * @param {sap.ui.model.odata.v4.lib._GroupLock|undefined} oGroupLock - The deletion group lock
 	 * @param {boolean} bCreated - Whether the entity was created
@@ -304,12 +297,16 @@ sap.ui.define([
 			i;
 
 		aElements.$deleted = aElements.$deleted || [];
-		for (i = 0; i < aElements.$deleted.length; i += 1) {
-			if (iIndex < aElements.$deleted[i].index) {
-				break;
+		if (iIndex === undefined) {
+			aElements.$deleted.unshift(oDeleted);
+		} else {
+			for (i = 0; i < aElements.$deleted.length; i += 1) {
+				if (iIndex < aElements.$deleted[i].index) {
+					break;
+				}
 			}
+			aElements.$deleted.splice(i, 0, oDeleted);
 		}
-		aElements.$deleted.splice(i, 0, oDeleted);
 		return oDeleted;
 	};
 
@@ -336,7 +333,8 @@ sap.ui.define([
 	 *
 	 * @param {string} sPath The path of the collection in the cache
 	 * @param {object[]} aElements The collection
-	 * @param {number} iIndex The index at which the element has been inserted or removed
+	 * @param {number} [iIndex]
+	 *   The index at which the element has been inserted or removed; undefined if not in the list
 	 * @param {number} iOffset The offset (1 = insert, -1 = remove)
 	 * @param {number} iDeletedIndex The element's index in $deleted (only for re-insertion)
 	 * @param {boolean} bCreate Whether the insert is a create (and not reverting a delete)
@@ -345,6 +343,9 @@ sap.ui.define([
 	 */
 	_Cache.prototype.adjustIndexes = function (sPath, aElements, iIndex, iOffset, iDeletedIndex,
 			bCreate) {
+		if (iIndex === undefined) {
+			return; // not in the list -> nothing to adjust
+		}
 		if (!sPath) {
 			// If the path is empty, we are in a _CollectionCache and aReadRequest exists
 			this.aReadRequests.forEach(function (oReadRequest) {
@@ -835,7 +836,7 @@ sap.ui.define([
 
 		function onSubmit() {
 			bDataRequested = true;
-			that.oRequestor.getModelInterface().fireDataRequested();
+			that.oRequestor.getModelInterface().fireDataRequested("/" + sFullResourcePath);
 		}
 
 		/*
@@ -942,11 +943,13 @@ sap.ui.define([
 				aUpdateProperties);
 			if (bDataRequested) {
 				bDataRequested = false;
-				that.oRequestor.getModelInterface().fireDataReceived();
+				that.oRequestor.getModelInterface()
+					.fireDataReceived(undefined, "/" + sFullResourcePath);
 			}
 		}).catch(function (oError) {
 			if (bDataRequested) {
-				that.oRequestor.getModelInterface().fireDataReceived(oError);
+				that.oRequestor
+					.getModelInterface().fireDataReceived(oError, "/" + sFullResourcePath);
 			}
 			throw oError;
 		}).finally(function () { // clean up only after updateSelected!
@@ -1199,7 +1202,7 @@ sap.ui.define([
 	 *   The relative path of a binding; must not end with '/'
 	 * @param {boolean} [bIgnoreKeptAlive]
 	 *   Whether to ignore changes which will not be lost by APIs like sort or filter because they
-	 *   relate to a context which is kept alive
+	 *   relate to a deleted context or a context which is kept alive
 	 * @param {boolean} [bIgnoreTransient]
 	 *   Whether to ignore transient elements on top level which will not be lost by APIs like sort
 	 *   or filter
@@ -1216,8 +1219,9 @@ sap.ui.define([
 		return Object.keys(this.mChangeRequests).some(function (sRequestPath) {
 			return _Helper.hasPathPrefix(sRequestPath, sPath)
 				&& !(bIgnoreKeptAlive
-					&& that.mChangeRequests[sRequestPath].every(function (oPatchPromise) {
-						return oPatchPromise.$isKeepAlive();
+					&& that.mChangeRequests[sRequestPath].every(function (oChangePromise) {
+						// w/o $isKeepAlive it is a DELETE
+						return !oChangePromise.$isKeepAlive || oChangePromise.$isKeepAlive();
 					}));
 		}) || Object.keys(this.mPostRequests).some(function (sRequestPath) {
 			return bIgnoreTransient && !sRequestPath
@@ -1249,7 +1253,7 @@ sap.ui.define([
 	 *   A promise to be resolved with the patched data
 	 * @throws {Error} If the cache is shared
 	 *
-	 * @private
+	 * @public
 	 */
 	_Cache.prototype.patch = function (sPath, oData) {
 		var that = this;
@@ -1280,7 +1284,8 @@ sap.ui.define([
 	 *   The function is called just before the back-end request is sent.
 	 *   If no back-end request is needed, the function is not called.
 	 * @returns {sap.ui.base.SyncPromise}
-	 *   A promise which resolves without a defined result when it is updated in the cache.
+	 *   A promise which resolves without a defined result when it is updated in the cache; it
+	 *   rejects with an error when no key predicate is known.
 	 * @throws {Error} If the cache is shared
 	 *
 	 * @public
@@ -1298,6 +1303,9 @@ sap.ui.define([
 			if (iIndex !== undefined) {
 				sPredicate = _Helper.getPrivateAnnotation(aElements[iIndex], "predicate");
 			}
+			if (!sPredicate) { // Note: no need to give path here, error is wrapped by ODLB!
+				throw new Error("No key predicate known");
+			}
 			sReadUrl = _Helper.buildPath(that.sResourcePath, sPath, sPredicate);
 			if (bKeepAlive && that.mLateQueryOptions) {
 				// bKeepAlive === true -> own cache of the list binding -> sPath === ''
@@ -1354,7 +1362,7 @@ sap.ui.define([
 	 *   <code>false</code>
 	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise which resolves with <code>undefined</code> when the entity is updated in
-	 *   the cache.
+	 *   the cache; it rejects with an error when no key predicate is known.
 	 * @throws {Error} If the cache is shared
 	 *
 	 * @private
@@ -1384,6 +1392,9 @@ sap.ui.define([
 			if (iIndex !== undefined) {
 				oEntity = aElements[iIndex];
 				sPredicate = _Helper.getPrivateAnnotation(oEntity, "predicate");
+				if (!sPredicate) { // Note: no need to give path here, error is wrapped by ODLB!
+					throw new Error("No key predicate known");
+				}
 			} else {
 				oEntity = aElements.$byPredicate[sPredicate];
 			}
@@ -1536,7 +1547,7 @@ sap.ui.define([
 	 * @public
 	 */
 	_Cache.prototype.removeMessages = function () {
-		if (this.sReportedMessagesPath) {
+		if (this.sReportedMessagesPath) { // Note: never set if the cache shares requests
 			this.oRequestor.getModelInterface().reportStateMessages(this.sReportedMessagesPath, {});
 			this.sReportedMessagesPath = undefined;
 		}
@@ -1602,7 +1613,7 @@ sap.ui.define([
 		}
 		_Helper.restoreUpdatingProperties(oOldElement, oElement);
 
-		// Note: iStart is not needed here because we know we have key predicates
+		// 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);
 	};
@@ -1612,11 +1623,10 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.model.odata.v4.lib._GroupLock} oGroupLock
 	 *   A lock for the group ID
-	 * @returns {Promise|undefined}
-	 *   A promise that resolves if the count has been determined or <code>undefined</code> if no
-	 *   request needed
+	 * @returns {Promise<number>}
+	 *   A promise that resolves with the count regardless whether a request was needed
 	 *
-	 * @private
+	 * @public
 	 */
 	_Cache.prototype.requestCount = function (oGroupLock) {
 		var sExclusiveFilter, mQueryOptions, sReadUrl,
@@ -1651,8 +1661,11 @@ sap.ui.define([
 
 					setCount(that.mChangeListeners, "", that.aElements, iCount);
 					that.iLimit = iCount;
+					return iCount;
 				});
 		}
+
+		return Promise.resolve(that.iLimit);
 	};
 
 	/**
@@ -1662,13 +1675,15 @@ sap.ui.define([
 	 *   The path
 	 * @throws {Error}
 	 *   If there is a change which has been sent to the server and for which there is no response
-	 *   yet.
+	 *   yet, or if the cache is shared
 	 *
 	 * @public
 	 */
 	_Cache.prototype.resetChangesForPath = function (sPath) {
 		var that = this;
 
+		this.checkSharedRequest();
+
 		Object.keys(this.mChangeRequests).reverse().forEach(function (sRequestPath) {
 			var aPromises, i;
 
@@ -1732,6 +1747,7 @@ sap.ui.define([
 	 * @see #hasSentRequest
 	 */
 	_Cache.prototype.setLateQueryOptions = function (mQueryOptions) {
+		// this.checkSharedRequest(); // don't do that here! it might work well enough
 		if (mQueryOptions) {
 			this.mLateQueryOptions = {
 				// must contain both properties for requestSideEffects
@@ -1855,7 +1871,8 @@ sap.ui.define([
 	 * @param {string} [sEntityPath]
 	 *   Path of the entity, relative to the cache (as used by change listeners)
 	 * @param {string} [sUnitOrCurrencyPath]
-	 *   Path of the unit or currency for the property, relative to the entity
+	 *   Path of the unit or currency for the property, relative to the (entity or complex) type
+	 *   which contains the property to update
 	 * @param {boolean} [bPatchWithoutSideEffects]
 	 *   Whether the PATCH response is ignored, except for a new ETag
 	 * @param {function} fnPatchSent
@@ -2073,6 +2090,8 @@ sap.ui.define([
 			// write the changed value into the cache
 			_Helper.updateAll(that.mChangeListeners, sEntityPath, oEntity, oUpdateData);
 			if (sUnitOrCurrencyPath) {
+				sUnitOrCurrencyPath
+					= _Helper.buildPath(aPropertyPath.slice(0, -1).join("/"), sUnitOrCurrencyPath);
 				aUnitOrCurrencyPath = sUnitOrCurrencyPath.split("/");
 				sUnitOrCurrencyPath = _Helper.buildPath(sEntityPath, sUnitOrCurrencyPath);
 				sUnitOrCurrencyValue = that.getValue(sUnitOrCurrencyPath);
@@ -2121,6 +2140,8 @@ sap.ui.define([
 	 * @param {number} [iStart]
 	 *    The index in the collection where "oRoot.value" needs to be inserted or undefined if
 	 *    "oRoot" references a single entity
+	 * @throws {Error}
+	 *   If the cache is shared and OData messages would be reported
 	 *
 	 * @private
 	 */
@@ -2141,6 +2162,7 @@ sap.ui.define([
 		function addMessages(aMessages, sInstancePath, sContextUrl) {
 			bHasMessages = true;
 			if (aMessages && aMessages.length) {
+				that.checkSharedRequest();
 				mPathToODataMessages[sInstancePath] = aMessages;
 				aMessages.forEach(function (oMessage) {
 					if (oMessage.longtextUrl) {
@@ -2280,7 +2302,7 @@ sap.ui.define([
 		} else if (oRoot && typeof oRoot === "object") {
 			visitInstance(oRoot, sRootMetaPath || this.sMetaPath, sRootPath || "", sRequestUrl);
 		}
-		if (bHasMessages) {
+		if (bHasMessages && !this.bSharedRequest) {
 			this.sReportedMessagesPath = this.getOriginalResourcePath(oRoot);
 			this.oRequestor.getModelInterface().reportStateMessages(this.sReportedMessagesPath,
 				mPathToODataMessages, aCachePaths);
@@ -2345,10 +2367,13 @@ sap.ui.define([
 	 * Adds the element to $byPredicate of the cache's element list.
 	 *
 	 * @param {object} oElement - The element
+	 * @throws {Error}
+	 *   If the cache is shared
 	 *
 	 * @public
 	 */
 	_CollectionCache.prototype.addKeptElement = function (oElement) {
+		this.checkSharedRequest();
 		this.aElements.$byPredicate[_Helper.getPrivateAnnotation(oElement, "predicate")] = oElement;
 	};
 
@@ -2386,12 +2411,15 @@ sap.ui.define([
 	 *
 	 * @param {string} sPredicate - The predicate
 	 * @returns {object} The empty element
+	 * @throws {Error}
+	 *   If the cache is shared
 	 *
 	 * @public
 	 */
 	_CollectionCache.prototype.createEmptyElement = function (sPredicate) {
 		var oElement = {};
 
+		this.checkSharedRequest();
 		_Helper.setPrivateAnnotation(oElement, "predicate", sPredicate);
 		this.aElements.$byPredicate[sPredicate] = oElement;
 
@@ -2403,12 +2431,15 @@ sap.ui.define([
 	 *
 	 * @param {number} iIndex - The index
 	 * @param {object} oElement - The new element
+	 * @throws {Error}
+	 *   If the cache is shared
 	 *
 	 * @public
 	 */
 	_CollectionCache.prototype.doReplaceWith = function (iIndex, oElement) {
 		var oOldElement = this.aElements[iIndex];
 
+		this.checkSharedRequest();
 		if (oOldElement && _Helper.hasPrivateAnnotation(oOldElement, "transientPredicate")
 				&& !_Helper.hasPrivateAnnotation(oElement, "transientPredicate")) {
 			// when replacing a created element (w/ transientPredicate), make sure the replacement
@@ -2767,6 +2798,20 @@ sap.ui.define([
 		return iOffset;
 	};
 
+	/**
+	 * Returns whether there are pending deletions in any group but the given one.
+	 *
+	 * @param {string} sGroupId - The ID of the allowed group
+	 * @returns {boolean} Whether there are such pending deletions
+	 *
+	 * @public
+	 */
+	_CollectionCache.prototype.isDeletingInOtherGroup = function (sGroupId) {
+		return Object.values(this.aElements.$deleted || {}).some(function (oDeleted) {
+			return oDeleted.sGroupId !== sGroupId;
+		});
+	};
+
 	/**
 	 * Returns a promise to be resolved with an OData object for a range of the requested data.
 	 * Calculates the key predicates for all entities in the result before the promise is resolved.
@@ -2893,6 +2938,8 @@ sap.ui.define([
 	 * @returns {sap.ui.base.SyncPromise|undefined}
 	 *   A promise resolving without a defined result, or rejecting with an error if the refresh
 	 *   fails, or <code>undefined</code> if there are no kept-alive elements.
+	 * @throws {Error}
+	 *   If the cache is shared
 	 *
 	 * @public
 	 */
@@ -2948,6 +2995,7 @@ sap.ui.define([
 				&& !that.hasPendingChangesForPath(sPredicate);
 		}
 
+		this.checkSharedRequest();
 		if (aPredicates.length === 0) {
 			return undefined;
 		}
@@ -2970,7 +3018,7 @@ sap.ui.define([
 							mStillAliveElements[sPredicate]);
 					} else {
 						oElement = that.aElements.$byPredicate[sPredicate];
-						if (_Helper.getPrivateAnnotation(oElement, "transientPredicate")) {
+						if (_Helper.hasPrivateAnnotation(oElement, "transientPredicate")) {
 							iIndex = that.removeElement(that.aElements, -1, sPredicate, "");
 						} else {
 							delete that.aElements.$byPredicate[sPredicate];
@@ -3195,7 +3243,7 @@ sap.ui.define([
 	/**
 	 * Resets this cache to its initial state, but keeps certain elements and their change listeners
 	 * alive: all kept-alive elements identified by the given key predicates as well as all
-	 * transient elements on top level.
+	 * transient and deleted elements on top level.
 	 *
 	 * @param {string[]} aKeptElementPredicates
 	 *   The key predicates for all kept-alive elements
@@ -3203,6 +3251,8 @@ sap.ui.define([
 	 *   The group ID used for a side-effects refresh; if given, only inline creation
 	 *   rows and transient elements with a different batch group shall be kept in place and a
 	 *   backup shall be remembered for a later {@link #restore}
+	 * @throws {Error}
+	 *   If a cache is shared and a group ID is given
 	 *
 	 * @public
 	 * @see _Cache#hasPendingChangesForPath
@@ -3217,6 +3267,7 @@ sap.ui.define([
 			that = this;
 
 		if (sGroupId) {
+			this.checkSharedRequest();
 			this.oBackup = {
 				iActiveElements : this.iActiveElements,
 				mChangeListeners : this.mChangeListeners,
@@ -3244,6 +3295,11 @@ sap.ui.define([
 				this.iActiveElements -= 1;
 			}
 		}
+		Object.keys(mByPredicate).forEach(function (sPredicate) {
+			if ("@$ui5.context.isDeleted" in mByPredicate[sPredicate]) {
+				aKeptElementPredicates.push(sPredicate);
+			}
+		});
 		this.mChangeListeners = {};
 		this.sContext = undefined;
 		this.aElements.length = this.aElements.$created = iCreated;
@@ -3263,6 +3319,9 @@ sap.ui.define([
 			this.mChangeListeners[""] = mChangeListeners[""];
 			_Helper.fireChange(this.mChangeListeners, "");
 		}
+		Object.values(this.aElements.$deleted || {}).forEach(function (oDeleted) {
+			oDeleted.index = undefined;
+		});
 	};
 
 	/**
@@ -3270,11 +3329,14 @@ sap.ui.define([
 	 * really do so; drops the backup in any case to free memory.
 	 *
 	 * @param {boolean} bReally - Whether to really restore, not just drop the backup
+	 * @throws {Error}
+	 *   If a shared cache is told to really restore
 	 *
 	 * @public
 	 */
 	_CollectionCache.prototype.restore = function (bReally) {
 		if (bReally) {
+			this.checkSharedRequest();
 			this.iActiveElements = this.oBackup.iActiveElements;
 			this.mChangeListeners = this.oBackup.mChangeListeners;
 			this.sContext = this.oBackup.sContext;
@@ -3725,6 +3787,8 @@ sap.ui.define([
 	 * order to allow that it may change.
 	 *
 	 * @param {string} sPath - The path to the property within the cache
+	 *
+	 * @private
 	 */
 	_SingleCache.prototype.resetProperty = function (sPath) {
 		var oData = this.oPromise.getResult();
@@ -3840,6 +3904,8 @@ sap.ui.define([
 	 * Resets the property for its own relative path within the singleton's single cache. This means
 	 * that the next #fetchValue will request the property again via #fetchLateProperty. Deletes
 	 * also the entity's ETag within the cache in order to allow that it may change.
+	 *
+	 * @public
 	 */
 	_SingletonPropertyCache.prototype.reset = function () {
 		this.oSingleton.resetProperty(this.sRelativePath);

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

@@ -1511,7 +1511,7 @@ sap.ui.define([
 		 *
 		 * Note: In case the meta path <code>sRootMetaPath</code> points to a single-valued
 		 * navigation property, for example "/SalesOrderList/SO_2_BP", this methods adds the key
-		 * properties of the related entity type to the "$select" query options. Although this
+		 * properties of the related entity type to the "$select" query options. Although this is
 		 * not needed in order to obtain the correct nested entity it enables
 		 * {@link sap.ui.model.odata.v4.Context#requestSideEffects}) to check the consistency of the
 		 * key predicates.

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

@@ -454,7 +454,7 @@ sap.ui.define([
 		}
 
 		function isUsingStrictHandling(oRequest) {
-			return oRequest.headers["Prefer"] === "handling=strict";
+			return oRequest.headers.Prefer === "handling=strict";
 		}
 
 		// do not look past aRequests.iChangeSet because these cannot be change sets
@@ -1043,6 +1043,32 @@ sap.ui.define([
 		return this.lockGroup("$auto", oGroupLock.getOwner());
 	};
 
+	/**
+	 * Tells whether there are only PATCH requests with the "Prefer" header set to "return=minimal"
+	 * (results from using $$patchWithoutSideEffects=true) enqueued in the batch queue with the
+	 * given group ID.
+	 *
+	 * @param {string} sGroupId
+	 *   The group ID
+	 * @returns {boolean}
+	 *   Returns <code>true</code> if only PATCHes are enqueued in the batch queue with the given
+	 *   group ID
+	 *
+	 * @private
+	 */
+	_Requestor.prototype.hasOnlyPatchesWithoutSideEffects = function (sGroupId) {
+		return this.getGroupSubmitMode(sGroupId) === "Auto"
+			&& !!this.mBatchQueue[sGroupId]
+			&& this.mBatchQueue[sGroupId].every(function (vChangeSetOrRequest) {
+				// PATCH requests must be in a change set which is modeled as an array
+				return Array.isArray(vChangeSetOrRequest)
+					&& vChangeSetOrRequest.every(function (oRequest) {
+					return oRequest.method === "PATCH"
+						&& oRequest.headers.Prefer === "return=minimal";
+				});
+			});
+	};
+
 	/**
 	 * Tells whether there are changes (that is, updates via PATCH or bound actions via POST) for
 	 * the given group ID and given entity.
@@ -1383,13 +1409,13 @@ sap.ui.define([
 
 	/**
 	 * This function has two tasks:
-	 *   <ul>
-	 *     <li>We are in the 1st app start, no optimistic batch payload stored so far. If optimistic
-	 *       batch handling is enabled via
-	*        {@link sap.ui.model.odata.v4.ODataModel#setOptimisticBatchEnabler}, this function
-	 *       stores the current batch requests in cache.
-	 *     <li>If an optimistic batch was already sent, it returns its result promise.
-	 *   </ul>
+	 * <ul>
+	 *   <li> We are in the 1st app start, no optimistic batch payload stored so far. If optimistic
+	 *     batch handling is enabled via
+	 *     {@link sap.ui.model.odata.v4.ODataModel#setOptimisticBatchEnabler}, this function stores
+	 *     the current batch requests in cache.
+	 *   <li> If an optimistic batch was already sent, it returns its result promise.
+	 * </ul>
 	 *
 	 * @param {object[]} aRequests The requests of the current batch
 	 * @param {string} sGroupId The group ID
@@ -1397,12 +1423,12 @@ sap.ui.define([
 	 *   The optimistic batch result or <code>undefined</code> if the batch should be sent
 	 *   normally. <code>undefined</code> can have the following reasons:
 	 *   <ul>
-	 *     <li>We are in the 1st app start, no optimistic batch payload stored so far, or
-	 *     <li>the optimistic batch was sent, but its payload did not match to the current one, or
-	 *     <li>we are not in the first #sendBatch call within the _Requestors lifecycle, or
-	 *     <li>#sendBatch was called before first batch payload could be read via CacheManager or
-	 *     <li>we are in the first #sendBatch but the batch is modifying, means contains others than
-	 *       GET requests.
+	 *     <li> We are in the 1st app start, no optimistic batch payload stored so far, or
+	 *     <li> the optimistic batch was sent, but its payload did not match to the current one, or
+	 *     <li> we are not in the first #sendBatch call within the _Requestors lifecycle, or
+	 *     <li> #sendBatch was called before first batch payload could be read via CacheManager or
+	 *     <li> we are in the first #sendBatch but the batch is modifying, means contains others
+	 *       than GET requests.
 	 *   </ul>
 	 *
 	 * @private
@@ -2040,7 +2066,10 @@ sap.ui.define([
 
 	/**
 	 * Waits until all group locks for the given group ID have been unlocked and submits the
-	 * requests associated with this group ID in one batch request.
+	 * requests associated with this group ID in one batch request. If only PATCH requests are
+	 * enqueued (see {@link #hasOnlyPatchesWithoutSideEffects}), this will delay the execution to
+	 * wait for potential side effect requests triggered by
+	 * {@link sap.ui.core.Control#event:validateFieldGroup}.
 	 *
 	 * @param {string} sGroupId
 	 *   The group ID
@@ -2064,7 +2093,19 @@ sap.ui.define([
 		if (bBlocked) {
 			Log.info("submitBatch('" + sGroupId + "') is waiting for locks", null, sClassName);
 		}
+
 		return oPromise.then(function () {
+			if (that.hasOnlyPatchesWithoutSideEffects(sGroupId)) {
+				bBlocked = true;
+				Log.info("submitBatch('" + sGroupId
+					+ "') is waiting for potential side effect requests", null, sClassName);
+				return new Promise(function (fnResolve) {
+					setTimeout(function () {
+						fnResolve();
+					}, 0);
+				});
+			}
+		}).then(function () {
 			if (bBlocked) {
 				Log.info("submitBatch('" + sGroupId + "') continues", null, sClassName);
 			}