@openui5/sap.ui.core 1.110.0 → 1.111.0

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

@@ -136,7 +136,8 @@ sap.ui.define([
 	 * @private
 	 */
 	_AggregationCache.prototype.addElements = function (vReadElements, iOffset, oCache, iStart) {
-		var aElements = this.aElements;
+		var aElements = this.aElements,
+			sNodeProperty = this.oAggregation.$NodeProperty;
 
 		function addElement(oElement, i) {
 			var oOldElement = aElements[iOffset + i],
@@ -147,8 +148,8 @@ sap.ui.define([
 				if (oOldElement === oElement) {
 					return;
 				}
-				_AggregationHelper
-					.beforeOverwritePlaceholder(oOldElement, oElement, oCache, iStart + i);
+				_AggregationHelper.beforeOverwritePlaceholder(oOldElement, oElement, oCache,
+					iStart + i, sNodeProperty);
 			} else if (iOffset + i >= aElements.length) {
 				throw new Error("Array index out of bounds: " + (iOffset + i));
 			}
@@ -178,7 +179,8 @@ sap.ui.define([
 	};
 
 	/**
-	 * Deletes the "$apply" system query option before side effects are requested.
+	 * Deletes the "$apply" system query option before side effects are requested and adds the
+	 * NodeProperty path to the "$select" system query option (if not already present).
 	 *
 	 * @param {object} mQueryOptions
 	 *   A modifiable map of key-value pairs representing the query string
@@ -192,6 +194,31 @@ sap.ui.define([
 			throw new Error("Missing recursive hierarchy");
 		}
 		delete mQueryOptions.$apply;
+		if (!mQueryOptions.$select.includes(this.oAggregation.$NodeProperty)) {
+			mQueryOptions.$select.push(this.oAggregation.$NodeProperty);
+		}
+	};
+
+	/**
+	 * Before trying to update the element with the given key predicate with the given new value
+	 * via {@link sap.ui.model.odata.v4.lib._Helper.updateSelected} (which might fail due to key
+	 * predicate checks), checks that the NodeProperty ("the hierarchy node value") has not changed.
+	 *
+	 * @param {string} sPredicate - A key predicate
+	 * @param {object} oNewValue - The new value, which usually just contains parts of the old
+	 * @throws {Error} In case of a structural change
+	 *
+	 * @see sap.ui.model.odata.v4.lib._CollectionCache#requestSideEffects
+	 */
+	_AggregationCache.prototype.beforeUpdateSelected = function (sPredicate, oNewValue) {
+		var oElement = this.aElements.$byPredicate[sPredicate],
+			sNodeProperty = this.oAggregation.$NodeProperty;
+
+		if (oElement[sNodeProperty] !== oNewValue[sNodeProperty]) {
+			throw new Error("Unexpected structural change: " + sNodeProperty
+				+ " from " + JSON.stringify(oElement[sNodeProperty])
+				+ " to " + JSON.stringify(oNewValue[sNodeProperty]));
+		}
 	};
 
 	/**
@@ -747,7 +774,7 @@ sap.ui.define([
 	 * @param {sap.ui.model.odata.v4.lib._GroupLock} oGroupLock
 	 *   A lock for the group to associate the requests with;
 	 *   {@link sap.ui.model.odata.v4.lib._GroupLock#getUnlockedCopy} still needs to be called!
-	 * @returns {sap.ui.base.SyncPromise|undefined}
+	 * @returns {Promise|undefined}
 	 *   A promise resolving without a defined result when the read is finished, or rejecting in
 	 *   case of an error; <code>undefined</code> in case no count needs to be read
 	 * @throws {Error}
@@ -938,8 +965,8 @@ sap.ui.define([
 
 	/**
 	 * Replaces the given element, which is at the given position and has the given predicate, with
-	 * a placeholder which keeps all private annotations. The original element is removed from its
-	 * corresponding cache and must not be used any longer.
+	 * a placeholder which keeps all private annotations plus the hierarchy node value. The original
+	 * element is removed from its corresponding cache and must not be used any longer.
 	 *
 	 * @param {number} iIndex - Its index
 	 * @param {object} oElement - An element
@@ -948,16 +975,20 @@ sap.ui.define([
 	 * @private
 	 */
 	_AggregationCache.prototype.replaceByPlaceholder = function (iIndex, oElement, sPredicate) {
+		var sNodeProperty = this.oAggregation.$NodeProperty,
+			oPlaceholder;
+
 		if (_Helper.hasPrivateAnnotation(oElement, "placeholder")) {
 			return;
 		}
 
 		_AggregationHelper.markSplicedStale(oElement);
-		this.aElements[iIndex] = {
+		this.aElements[iIndex] = oPlaceholder = {
 			"@$ui5._" : Object.assign(oElement["@$ui5._"], {placeholder : true}),
 			"@$ui5.node.isExpanded" : oElement["@$ui5.node.isExpanded"],
 			"@$ui5.node.level" : oElement["@$ui5.node.level"]
 		};
+		oPlaceholder[sNodeProperty] = oElement[sNodeProperty];
 		delete this.aElements.$byPredicate[sPredicate];
 
 		// drop original element from its cache's collection
@@ -1081,6 +1112,10 @@ sap.ui.define([
 
 		sPredicate = _Helper.getKeyPredicate(oElement, sMetaPath, mTypeForMetaPath);
 		_Helper.setPrivateAnnotation(oElement, "predicate", sPredicate);
+		if (sMetaPath !== oAggregation.$metaPath) { // related entity (via navigation property)
+			return sPredicate;
+		}
+
 		switch (oElement[sDrillStateProperty]) {
 			case "expanded":
 				bIsExpanded = true;

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

@@ -135,13 +135,16 @@ sap.ui.define([
 		 *   The group level cache which the given element has been read from
 		 * @param {number} iIndex
 		 *   The index of the given element within the cache's collection
+		 * @param {string} [sNodeProperty]
+		 *   Optional property path to the hierarchy node value
 		 * @throws {Error}
 		 *   In case an unexpected element or placeholder would be overwritten, or in case of a
 		 *   structural change
 		 *
 		 * @private
 		 */
-		beforeOverwritePlaceholder : function (oPlaceholder, oElement, oCache, iIndex) {
+		beforeOverwritePlaceholder : function (oPlaceholder, oElement, oCache, iIndex,
+				sNodeProperty) {
 			var oParent = _Helper.getPrivateAnnotation(oPlaceholder, "parent");
 
 			if (!_Helper.hasPrivateAnnotation(oPlaceholder, "placeholder")) {
@@ -157,16 +160,22 @@ sap.ui.define([
 			}
 			["descendants", "filter", "predicate"].forEach(function (sAnnotation) {
 				if (_Helper.hasPrivateAnnotation(oPlaceholder, sAnnotation)
-					&& _Helper.getPrivateAnnotation(oElement, sAnnotation)
-						!== _Helper.getPrivateAnnotation(oPlaceholder, sAnnotation)) {
+					&& _Helper.getPrivateAnnotation(oPlaceholder, sAnnotation)
+						!== _Helper.getPrivateAnnotation(oElement, sAnnotation)) {
 					throw new Error("Unexpected structural change: " + sAnnotation);
 				}
 			});
+			if (sNodeProperty in oPlaceholder
+					&& oPlaceholder[sNodeProperty] !== oElement[sNodeProperty]) {
+				throw new Error("Unexpected structural change: " + sNodeProperty
+					+ " from " + JSON.stringify(oPlaceholder[sNodeProperty])
+					+ " to " + JSON.stringify(oElement[sNodeProperty]));
+			}
 
 			_Helper.copyPrivateAnnotation(oPlaceholder, "spliced", oElement);
 			if ("@$ui5.node.isExpanded" in oPlaceholder) {
-				if ((oElement["@$ui5.node.isExpanded"] === undefined)
-						!== (oPlaceholder["@$ui5.node.isExpanded"] === undefined)) {
+				if ((oPlaceholder["@$ui5.node.isExpanded"] === undefined)
+						!== (oElement["@$ui5.node.isExpanded"] === undefined)) {
 					throw new Error("Not a leaf anymore (or vice versa)");
 				}
 				oElement["@$ui5.node.isExpanded"] = oPlaceholder["@$ui5.node.isExpanded"];
@@ -397,8 +406,9 @@ sap.ui.define([
 		 * Builds the value for a "$apply" system query option based on the given data aggregation
 		 * information for a recursive hierarchy. If no query options are given, only a symbolic
 		 * "$apply" is constructed to avoid timing issues with metadata. The property paths for
-		 * DistanceFromRootProperty, DrillStateProperty, and LimitedDescendantCountProperty are
-		 * stored at <code>oAggregation</code> using a "$" prefix (if not already stored).
+		 * DistanceFromRootProperty, DrillStateProperty, LimitedDescendantCountProperty, and
+		 * NodeProperty are stored at <code>oAggregation</code> using a "$" prefix (if not already
+		 * stored).
 		 *
 		 * @param {object} oAggregation
 		 *   An object holding the information needed for a recursive hierarchy; see
@@ -415,8 +425,8 @@ sap.ui.define([
 		 *   The value for a "$orderby" system query option; it is removed from the returned map and
 		 *   turned into an "orderby()" transformation
 		 * @param {string[]} [mQueryOptions.$select]
-		 *   The value for a "$select" system query option; additional technical properties are
-		 *   added to the returned copy
+		 *   The value for a "$select" system query option; additional technical properties
+		 *   including NodeProperty ("the hierarchy node value") are added to the returned copy
 		 * @param {boolean} [bAllLevels]
 		 *   Whether to expand all levels
 		 * @returns {object}
@@ -429,14 +439,12 @@ sap.ui.define([
 		buildApply4Hierarchy : function (oAggregation, mQueryOptions, bAllLevels) {
 			var sApply = "",
 				sHierarchyQualifier = oAggregation.hierarchyQualifier,
+				sMetaPath = oAggregation.$metaPath,
+				sNodeProperty = oAggregation.$NodeProperty,
 				sPath = oAggregation.$path,
-				sNodeProperty = mQueryOptions
-					? oAggregation.$fetchMetadata(sPath
-						+ "/@Org.OData.Aggregation.V1.RecursiveHierarchy#" + sHierarchyQualifier
-						+ "/NodeProperty/$PropertyPath").getResult()
-					: "???",
 				mRecursiveHierarchy,
-				sSeparator = "";
+				sSeparator = "",
+				oSyncPromise;
 
 			function select(sProperty) {
 				var sPropertyPath;
@@ -445,7 +453,7 @@ sap.ui.define([
 					sPropertyPath = oAggregation["$" + sProperty];
 					if (!sPropertyPath) {
 						if (!mRecursiveHierarchy) {
-							mRecursiveHierarchy = oAggregation.$fetchMetadata(sPath
+							mRecursiveHierarchy = oAggregation.$fetchMetadata(sMetaPath
 								+ "/@com.sap.vocabularies.Hierarchy.v1.RecursiveHierarchy#"
 								+ sHierarchyQualifier).getResult();
 						}
@@ -457,9 +465,24 @@ sap.ui.define([
 				}
 			}
 
+			if (!sNodeProperty) {
+				sNodeProperty = "???";
+				if (mQueryOptions) {
+					oSyncPromise = oAggregation.$fetchMetadata(sMetaPath
+						+ "/@Org.OData.Aggregation.V1.RecursiveHierarchy#" + sHierarchyQualifier
+						+ "/NodeProperty/$PropertyPath");
+					if (oSyncPromise.isFulfilled()) {
+						sNodeProperty = oAggregation.$NodeProperty = oSyncPromise.getResult();
+					}
+				}
+			}
+
 			mQueryOptions = Object.assign({}, mQueryOptions); // shallow clone
 			if (mQueryOptions.$select) {
 				mQueryOptions.$select = mQueryOptions.$select.slice();
+				if (!mQueryOptions.$select.includes(sNodeProperty)) {
+					mQueryOptions.$select.push(sNodeProperty);
+				}
 			}
 
 			if (mQueryOptions.$filter || oAggregation.search) {
@@ -491,7 +514,8 @@ sap.ui.define([
 					sApply += "orderby(" + mQueryOptions.$orderby + ")/";
 					delete mQueryOptions.$orderby;
 				}
-				sApply += "com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root" + sPath
+				sApply += "com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root"
+					+ (sPath || "")
 					+ ",HierarchyQualifier='" + sHierarchyQualifier
 					+ "',NodeProperty='" + sNodeProperty
 					+ "',Levels=" + (bAllLevels ? 9 : oAggregation.expandTo || 1)
@@ -988,6 +1012,24 @@ sap.ui.define([
 			}
 		},
 
+		/**
+		 * Stores the given path and its corresponding meta path inside the given data aggregation
+		 * information as <code>$metaPath</code> and <code>$path</code>.
+		 *
+		 *
+		 * @param {object} oAggregation
+		 *   An object holding the information needed for data aggregation; see
+		 *   {@link sap.ui.model.odata.v4.ODataListBinding#setAggregation}.
+		 * @param {string} [sPath]
+		 *   The list binding's absolute data path, <code>undefined</code> if currently unresolved
+		 *
+		 * @public
+		 */
+		setPath : function (oAggregation, sPath) {
+			oAggregation.$metaPath = sPath && _Helper.getMetaPath(sPath);
+			oAggregation.$path = sPath;
+		},
+
 		/**
 		 * Splits a filter depending on the aggregation information into an array that consists of
 		 * two filters, one that must be applied after and one that must be applied before
@@ -1061,27 +1103,21 @@ sap.ui.define([
 		},
 
 		/**
-		 * Validates the given data aggregation information. If successful, the given path and
-		 * function are stored inside that information as <code>$path</code> and
-		 * <code>$fetchMetadata</code> respectively.
-		 *
+		 * Validates the given data aggregation information.
 		 *
 		 * @param {object} oAggregation
 		 *   An object holding the information needed for data aggregation; see
 		 *   {@link sap.ui.model.odata.v4.ODataListBinding#setAggregation}.
-		 * @param {string} sPath
-		 *   The list binding's absolute data path
-		 * @param {function} fnFetchMetadata
-		 *   Function which fetches metadata for a given meta path
 		 * @param {boolean} bAutoExpandSelect
 		 *   The value of the model's parameter <code>autoExpandSelect</code>
 		 * @throws {Error}
 		 *   If the given data aggregation object is unsupported, or if a recursive hierarchy is
 		 *   requested, but the model does not use the <code>autoExpandSelect</code> parameter.
 		 *
-		 * @public
+		 * @private
+		 * @see validateAggregationAndSetPath
 		 */
-		validateAggregation : function (oAggregation, sPath, fnFetchMetadata, bAutoExpandSelect) {
+		validateAggregation : function (oAggregation, bAutoExpandSelect) {
 			if (oAggregation.hierarchyQualifier && !bAutoExpandSelect) {
 				throw new Error("Missing parameter autoExpandSelect at model");
 			}
@@ -1089,9 +1125,37 @@ sap.ui.define([
 			_AggregationHelper.checkTypeof(oAggregation,
 				oAggregation.hierarchyQualifier ? mRecursiveHierarchyType : mDataAggregationType,
 				"$$aggregation");
+		},
+
+		/**
+		 * Validates the given data aggregation information. If successful, the given path and its
+		 * corresponding meta path as well as the given function are stored inside that information
+		 * as <code>$metaPath</code>, <code>$path</code>, and <code>$fetchMetadata</code>
+		 * respectively.
+		 *
+		 * @param {object} oAggregation
+		 *   An object holding the information needed for data aggregation; see
+		 *   {@link sap.ui.model.odata.v4.ODataListBinding#setAggregation}.
+		 * @param {boolean} bAutoExpandSelect
+		 *   The value of the model's parameter <code>autoExpandSelect</code>
+		 * @param {function} fnFetchMetadata
+		 *   Function which fetches metadata for a given meta path
+		 * @param {string} [sPath]
+		 *   The list binding's absolute data path, <code>undefined</code> if currently unresolved
+		 * @throws {Error}
+		 *   If the given data aggregation object is unsupported, or if a recursive hierarchy is
+		 *   requested, but the model does not use the <code>autoExpandSelect</code> parameter.
+		 *
+		 * @public
+		 * @see setPath
+		 * @see validateAggregation
+		 */
+		validateAggregationAndSetPath : function (oAggregation, bAutoExpandSelect, fnFetchMetadata,
+				sPath) {
+			_AggregationHelper.validateAggregation(oAggregation, bAutoExpandSelect);
 
 			oAggregation.$fetchMetadata = fnFetchMetadata;
-			oAggregation.$path = sPath;
+			_AggregationHelper.setPath(oAggregation, sPath);
 		}
 	};
 

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

@@ -224,6 +224,7 @@ sap.ui.define([
 					throw new Error("No 'delete' allowed while waiting for server response");
 				}
 				that.oRequestor.removePost(sTransientGroup, oEntity);
+
 				return undefined;
 			}
 
@@ -460,9 +461,27 @@ sap.ui.define([
 			fnResolve,
 			that = this;
 
-		// Clean-up when the create has been canceled.
-		function cleanUp() {
-			var iIndex = aCollection.indexOf(oEntityData);
+		/*
+		 * Clean-up when the create has been canceled.
+		 *
+		 * @param {boolean} bResetInactive
+		 *   Whether an edited inactive entity should be reset instead of being removed.
+		 * @returns {boolean}
+		 *   Whether the entity was reset only and kept in the collection instead of being removed.
+		 *
+		 * @see sap.ui.model.odata.v4.lib._Requestor#cancelChangesByFilter
+		 */
+		function cleanUp(bResetInactive) {
+			var bInactiveEntity = oEntityData["@$ui5.context.isInactive"],
+				iIndex = aCollection.indexOf(oEntityData);
+
+			if (bResetInactive && bInactiveEntity) {
+				if (bInactiveEntity === 1) {
+					_Helper.resetInactiveEntity(that.mChangeListeners, sTransientPredicate,
+						oEntityData);
+				} // there is nothing to reset if the entity is simply inactive
+				return true;
+			}
 
 			_Helper.removeByPath(that.mPostRequests, sPath, oEntityData);
 			aCollection.splice(iIndex, 1);
@@ -830,7 +849,7 @@ sap.ui.define([
 	 *   The path of the requested property relative to oResource; this property is requested from
 	 *   the server. For annotations, except client annotations, the annotated property is requested
 	 *   from the server.
-	 * @returns {sap.ui.base.SyncPromise|boolean}
+	 * @returns {Promise|boolean}
 	 *   A promise resolving w/o any result if the requested property is an expected late property,
 	 *   or a <code>boolean</code> value if it is not; it rejects with an error if the GET request
 	 *   failed, or if the key predicate or the ETag has changed. The returned <code>boolean</code>
@@ -1298,6 +1317,9 @@ sap.ui.define([
 	 *   The key predicate of the entity; only evaluated if <code>iIndex === undefined</code>
 	 * @param {boolean} [bKeepAlive]
 	 *   Whether the entity is kept-alive
+	 * @param {boolean} [bWithMessages]
+	 *   Whether the "@com.sap.vocabularies.Common.v1.Messages" path is treated specially, supported
+	 *   only for <code>sPath === ""</code>
 	 * @param {function} [fnDataRequested]
 	 *   The function is called just before the back-end request is sent.
 	 *   If no back-end request is needed, the function is not called.
@@ -1309,13 +1331,18 @@ sap.ui.define([
 	 * @public
 	 */
 	_Cache.prototype.refreshSingle = function (oGroupLock, sPath, iIndex, sPredicate, bKeepAlive,
-			fnDataRequested) {
-		var that = this;
+			bWithMessages, fnDataRequested) {
+		var bKeepReportedMessagesPath = false,
+			that = this;
 
 		this.checkSharedRequest();
 		return this.fetchValue(_GroupLock.$cached, sPath).then(function (aElements) {
-			var mQueryOptions
-					= Object.assign({}, _Helper.getQueryOptionsForPath(that.mQueryOptions, sPath)),
+			var sMessagesPath = bWithMessages && sPath === ""
+					&& that.oRequestor.getModelInterface().fetchMetadata(
+						that.sMetaPath + "/@com.sap.vocabularies.Common.v1.Messages/$Path"
+					).getResult(),
+				mQueryOptions = _Helper.clone(
+					_Helper.getQueryOptionsForPath(that.mQueryOptions, sPath)),
 				sReadUrl;
 
 			if (iIndex !== undefined) {
@@ -1330,6 +1357,12 @@ sap.ui.define([
 				// -> no need to apply _Helper.getQueryOptionsForPath
 				_Helper.aggregateExpandSelect(mQueryOptions, that.mLateQueryOptions);
 			}
+			if (sMessagesPath && mQueryOptions.$select
+				&& !mQueryOptions.$select.includes(sMessagesPath)) {
+				// Note: w/o existing $select, we must not end up w/ just messages
+				mQueryOptions.$select.push(sMessagesPath);
+				bKeepReportedMessagesPath = true;
+			}
 			// drop collection related system query options
 			delete mQueryOptions.$apply;
 			delete mQueryOptions.$count;
@@ -1347,7 +1380,8 @@ sap.ui.define([
 			]).then(function (aResult) {
 				var oElement = aResult[0];
 
-				that.replaceElement(aElements, iIndex, sPredicate, oElement, aResult[1], sPath);
+				that.replaceElement(aElements, iIndex, sPredicate, oElement, aResult[1], sPath,
+					bKeepReportedMessagesPath);
 			});
 		});
 	};
@@ -1606,11 +1640,13 @@ sap.ui.define([
 	 *   A map from meta path to the entity type (as delivered by {@link #fetchTypes})
 	 * @param {string} sPath
 	 *   The element collection's path within this cache, may be <code>""</code>
+	 * @param {boolean} [bKeepReportedMessagesPath]
+	 *   Whether <code>this.sReportedMessagesPath</code> should be kept unchanged
 	 *
 	 * @private
 	 */
 	_Cache.prototype.replaceElement = function (aElements, iIndex, sPredicate, oElement,
-			mTypeForMetaPath, sPath) {
+			mTypeForMetaPath, sPath, bKeepReportedMessagesPath) {
 		var oOldElement, sTransientPredicate;
 
 		if (iIndex === undefined) { // kept-alive element not in the list
@@ -1633,7 +1669,8 @@ sap.ui.define([
 
 		// 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);
+			_Helper.getMetaPath(_Helper.buildPath(this.sMetaPath, sPath)), sPath + sPredicate,
+			false, undefined, bKeepReportedMessagesPath);
 	};
 
 	/**
@@ -1734,7 +1771,11 @@ sap.ui.define([
 			} else if (isSubPath(sRequestPath, sPath)) {
 				for (i = aEntities.length - 1; i >= 0; i -= 1) {
 					sTransientGroup = _Helper.getPrivateAnnotation(aEntities[i], "transient");
-					if (!sTransientGroup.startsWith("$inactive.")) {
+					if (sTransientGroup.startsWith("$inactive.")) {
+						_Helper.resetInactiveEntity(that.mChangeListeners,
+							_Helper.getPrivateAnnotation(aEntities[i], "transientPredicate"),
+							aEntities[i]);
+					} else {
 						// this also cleans up that.mPostRequests
 						that.oRequestor.removePost(sTransientGroup, aEntities[i]);
 					}
@@ -1914,7 +1955,7 @@ sap.ui.define([
 	 * @param {boolean} [bInactive]
 	 *   If <code>true</code>, the cache and the POST request will be updated, but the entity stays
 	 *   inactive
-	 * @returns {Promise}
+	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise for the PATCH request (resolves with <code>undefined</code>); rejected in case of
 	 *   cancellation or if no <code>fnErrorCallback</code> is given
 	 * @throws {Error} If the cache is shared
@@ -2178,15 +2219,17 @@ sap.ui.define([
 	 * @param {boolean} [bKeepTransientPath] Whether the transient path shall be used to report
 	 *   messages
 	 * @param {number} [iStart]
-	 *    The index in the collection where "oRoot.value" needs to be inserted or undefined if
-	 *    "oRoot" references a single entity
+	 *   The index in the collection where "oRoot.value" needs to be inserted or undefined if
+	 *   "oRoot" references a single entity.
+	 * @param {boolean} [bKeepReportedMessagesPath]
+	 *   Whether <code>this.sReportedMessagesPath</code> should be kept unchanged
 	 * @throws {Error}
 	 *   If the cache is shared and OData messages would be reported
 	 *
 	 * @private
 	 */
 	_Cache.prototype.visitResponse = function (oRoot, mTypeForMetaPath, sRootMetaPath, sRootPath,
-			bKeepTransientPath, iStart) {
+			bKeepTransientPath, iStart, bKeepReportedMessagesPath) {
 		var aCachePaths,
 			bHasMessages = false,
 			mPathToODataMessages = {},
@@ -2343,8 +2386,10 @@ sap.ui.define([
 			visitInstance(oRoot, sRootMetaPath || this.sMetaPath, sRootPath || "", sRequestUrl);
 		}
 		if (bHasMessages && !this.bSharedRequest) {
-			this.sReportedMessagesPath = this.sOriginalResourcePath;
-			this.oRequestor.getModelInterface().reportStateMessages(this.sReportedMessagesPath,
+			if (!bKeepReportedMessagesPath) {
+				this.sReportedMessagesPath = this.sOriginalResourcePath;
+			}
+			this.oRequestor.getModelInterface().reportStateMessages(this.sOriginalResourcePath,
 				mPathToODataMessages, aCachePaths);
 		}
 	};
@@ -2857,7 +2902,7 @@ sap.ui.define([
 	 */
 	_CollectionCache.prototype.isDeletingInOtherGroup = function (sGroupId) {
 		return Object.values(this.aElements.$deleted || {}).some(function (oDeleted) {
-			return oDeleted.sGroupId !== sGroupId;
+			return oDeleted.groupId !== sGroupId;
 		});
 	};
 
@@ -3034,7 +3079,7 @@ sap.ui.define([
 	 * @param {function(string,number)} fnOnRemove
 	 *   A function which is called with predicate and index if a kept-alive or created element does
 	 *   no longer exist after refresh; the index is undefined for a non-created element
-	 * @returns {sap.ui.base.SyncPromise|undefined}
+	 * @returns {Promise|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}
@@ -3208,6 +3253,8 @@ sap.ui.define([
 	 * @param {boolean} bSingle
 	 *   Whether only the side effects for a single element are requested; no element is discarded
 	 *   in this case
+	 * @param {boolean} bWithMessages
+	 *   Whether the "@com.sap.vocabularies.Common.v1.Messages" path is treated specially
 	 * @returns {Promise|sap.ui.base.SyncPromise}
 	 *   A promise resolving without a defined result, or rejecting with an error if loading of side
 	 *   effects fails
@@ -3218,7 +3265,7 @@ sap.ui.define([
 	 * @public
 	 */
 	_CollectionCache.prototype.requestSideEffects = function (oGroupLock, aPaths, aPredicates,
-			bSingle) {
+			bSingle, bWithMessages) {
 		var aElements,
 			mMergeableQueryOptions,
 			mQueryOptions,
@@ -3231,7 +3278,7 @@ sap.ui.define([
 
 		mQueryOptions = _Helper.intersectQueryOptions(
 			Object.assign({}, this.mQueryOptions, this.mLateQueryOptions), aPaths,
-			this.oRequestor.getModelInterface().fetchMetadata, this.sMetaPath, "");
+			this.oRequestor.getModelInterface().fetchMetadata, this.sMetaPath, "", bWithMessages);
 		if (!mQueryOptions) {
 			return SyncPromise.resolve(); // micro optimization: use *sync.* promise which is cached
 		}
@@ -3292,10 +3339,13 @@ sap.ui.define([
 				}
 				// Note: iStart makes no sense here (use NaN instead), but is not needed because
 				// we know we have key predicates
-				that.visitResponse(oResult, mTypeForMetaPath, undefined, "", false, NaN);
+				that.visitResponse(oResult, mTypeForMetaPath, undefined, "", false, NaN, true);
 				for (i = 0, n = oResult.value.length; i < n; i += 1) {
 					oElement = oResult.value[i];
 					sPredicate = _Helper.getPrivateAnnotation(oElement, "predicate");
+					if (that.beforeUpdateSelected) {
+						that.beforeUpdateSelected(sPredicate, oElement);
+					}
 					_Helper.updateSelected(that.mChangeListeners, sPredicate,
 						that.aElements.$byPredicate[sPredicate], oElement, aPaths,
 						preventKeyPredicateChange);
@@ -3799,7 +3849,7 @@ sap.ui.define([
 	 *   because they may have changed due to side effects of a previous update
 	 * @param {string} [sResourcePath=this.sResourcePath]
 	 *   A resource path relative to the service URL; it must not contain a query string
-	 * @returns {Promise|sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise resolving without a defined result, or rejecting with an error if loading of side
 	 *   effects fails.
 	 * @throws {Error} If the side effects require a $expand, if group ID is '$cached' (the error

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

@@ -1618,6 +1618,8 @@ sap.ui.define([
 		 *   identifier may be appended
 		 * @param {string} [sPrefix=""]
 		 *   Optional prefix for navigation property meta paths used during recursion
+		 * @param {boolean} bWithMessages
+		 *   Whether the "@com.sap.vocabularies.Common.v1.Messages" path is treated specially
 		 * @returns {object}
 		 *   The updated query options or <code>null</code> if no request is needed
 		 * @throws {Error}
@@ -1625,9 +1627,11 @@ sap.ui.define([
 		 *   collection-valued navigation property
 		 */
 		intersectQueryOptions : function (mCacheQueryOptions, aPaths, fnFetchMetadata,
-				sRootMetaPath, sPrefix) {
+				sRootMetaPath, sPrefix, bWithMessages) {
 			var aExpands = [],
 				mExpands = {},
+				sMessagesPath = bWithMessages && fnFetchMetadata(sRootMetaPath
+					+ "/@com.sap.vocabularies.Common.v1.Messages/$Path").getResult(),
 				mResult,
 				oRootMetaData,
 				aSelects,
@@ -1661,10 +1665,16 @@ sap.ui.define([
 
 			if (aPaths.indexOf("*") >= 0) {
 				aSelects = (mCacheQueryOptions && mCacheQueryOptions.$select || []).slice();
+				if (sMessagesPath && !aSelects.includes(sMessagesPath)) {
+					aSelects.push(sMessagesPath);
+				}
 			} else if (mCacheQueryOptions && mCacheQueryOptions.$select
 					&& mCacheQueryOptions.$select.indexOf("*") < 0) {
 				_Helper.addChildrenWithAncestor(aPaths, mCacheQueryOptions.$select, mSelects);
 				_Helper.addChildrenWithAncestor(mCacheQueryOptions.$select, aPaths, mSelects);
+				if (sMessagesPath && aPaths.includes(sMessagesPath)) {
+					mSelects[sMessagesPath] = true;
+				}
 				aSelects = Object.keys(mSelects).filter(filterStructural.bind(null, true));
 			} else {
 				aSelects = aPaths.filter(filterStructural.bind(null, false));
@@ -1997,8 +2007,8 @@ sap.ui.define([
 		/**
 		 * Restores an entity and its POST body to the initial state which is read from a private
 		 * annotation. Key-value pairs are deleted if they are not in the initial state. Change
-		 * listeners are notified about the changed or deleted values, and the "inactive" flag is
-		 * reset to <code>true</code>.
+		 * listeners are notified about the changed or deleted values, and the "inactive" flag at
+		 * the entity and at its corresponding context is reset to <code>true</code>.
 		 *
 		 * @param {object} mChangeListeners - A map of change listeners by path
 		 * @param {string} sPath - The path to the entity; used to notify change listeners
@@ -2021,6 +2031,7 @@ sap.ui.define([
 			_Helper.updateAll(mChangeListeners, sPath, oEntity,
 				{"@$ui5.context.isInactive" : true}
 			);
+			_Helper.getPrivateAnnotation(oEntity, "context").setInactive();
 		},
 
 		/**