@openui5/sap.ui.core 1.110.0 → 1.111.1

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

@@ -24,8 +24,8 @@ sap.ui.define([
 		 * @author SAP SE
 		 * @class Implementation of an OData V4 model's context.
 		 *
-		 *   The context is a pointer to model data as returned by a query from a
-		 *   {@link sap.ui.model.odata.v4.ODataContextBinding} or a
+		 *   The context is a pointer to model data as returned by a query from an
+		 *   {@link sap.ui.model.odata.v4.ODataContextBinding} or an
 		 *   {@link sap.ui.model.odata.v4.ODataListBinding}. Contexts are always and only
 		 *   created by such bindings. A context for a context binding points to the complete query
 		 *   result. A context for a list binding points to one specific entry in the binding's
@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.39.0
-		 * @version 1.110.0
+		 * @version 1.111.1
 		 */
 		Context = BaseContext.extend("sap.ui.model.odata.v4.Context", {
 				constructor : constructor
@@ -98,6 +98,7 @@ sap.ui.define([
 		this.bInactive = bInactive || undefined; // be in sync with the annotation
 		this.iIndex = iIndex;
 		this.bKeepAlive = false;
+		this.bSelected = false;
 		this.fnOnBeforeDestroy = undefined;
 	}
 
@@ -353,9 +354,11 @@ sap.ui.define([
 		});
 		this.oBinding = undefined;
 		this.oCreatedPromise = undefined;
+		// keep oDeletePromise so that isDeleted does not unexpectedly become false
 		this.oSyncCreatePromise = undefined;
 		this.bInactive = undefined;
 		this.bKeepAlive = undefined;
+		this.bSelected = false;
 		// When removing oModel, ManagedObject#getBindingContext does not return the destroyed
 		// context although the control still refers to it
 		this.oModel = undefined;
@@ -452,7 +455,7 @@ sap.ui.define([
 			if (oGroupLock) {
 				oGroupLock.unlock();
 			}
-			throw new Error("must not modify a deleted entity: " + this);
+			throw new Error("Must not modify a deleted entity: " + this);
 		}
 		if (oGroupLock && this.isTransient() && !this.isInactive()) {
 			oValue = this.getValue();
@@ -964,8 +967,8 @@ sap.ui.define([
 			|| this.getBinding().hasPendingChangesForPath(this.sPath)
 			|| this.oModel.getDependentBindings(this).some(function (oDependentBinding) {
 				return oDependentBinding.oCache
-					? oDependentBinding.hasPendingChanges()
-					: oDependentBinding.hasPendingChangesInDependents();
+					? oDependentBinding._hasPendingChanges(false, true)
+					: oDependentBinding.hasPendingChangesInDependents(false, true);
 			})
 			|| this.oModel.withUnresolvedBindings("hasPendingChangesInCaches", this.sPath.slice(1));
 	};
@@ -1048,6 +1051,19 @@ sap.ui.define([
 		return this.bKeepAlive;
 	};
 
+	/**
+	 * Tells whether this context is currently selected.
+	 *
+	 * @returns {boolean} Whether this context is currently selected
+	 *
+	 * @experimental As of version 1.111.0
+	 * @public
+	 * @see #setSelected
+	 */
+	Context.prototype.isSelected = function () {
+		return this.bSelected;
+	};
+
 	/**
 	 * For a context created using {@link sap.ui.model.odata.v4.ODataListBinding#create}, the
 	 * method returns <code>true</code> if the context is transient, meaning that the promise
@@ -1394,6 +1410,12 @@ sap.ui.define([
 	 *   container (example "/com.sap.gateway.default.iwbep.tea_busi.v0001.Container/TEAMS") of the
 	 *   service. All (navigation) properties in the complete model matching such an absolute path
 	 *   are updated. Since 1.85.0, "14.4.11 Expression edm:String" is accepted as well.
+	 *
+	 *   Since 1.108.8, a property path matching the "com.sap.vocabularies.Common.v1.Messages"
+	 *   annotation of a list binding's entity type is treated specially for a row context of a list
+	 *   binding: It is loaded even if it has not yet been requested by that list binding. This way,
+	 *   exactly the messages for a single row can be updated. Same for a "*" segment or an empty
+	 *   navigation property path.
 	 * @param {string} [sGroupId]
 	 *   The group ID to be used (since 1.69.0); if not specified, the update group ID for the
 	 *   context's binding is used, see {@link #getUpdateGroupId}. If a different group ID is
@@ -1552,7 +1574,7 @@ sap.ui.define([
 	 *   The absolute paths to request side effects for
 	 * @param {string} sGroupId
 	 *   The effective group ID
-	 * @returns {sap.ui.base.SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise|undefined}
 	 *   A promise resolving without a defined result, or rejecting with an error if loading of side
 	 *   effects fails, or <code>undefined</code> if there is nothing to do
 	 *
@@ -1618,27 +1640,31 @@ sap.ui.define([
 	};
 
 	/**
-	 * Resets all pending changes of this context, see {@link #hasPendingChanges}. Resets also
-	 * invalid user input. If this context is currently {@link #delete deleted} on the client, but
-	 * not yet on the server, this method cancels the deletion and restores the context.
+	 * Resets all property changes, created entities, and entity deletions of this context. Resets
+	 * also invalid user input and inactive contexts which had their activation prevented (see
+	 * {@link sap.ui.model.odata.v4.Context#isInactive}). This function does not reset the execution
+	 * of OData operations (see {@link sap.ui.model.odata.v4.ODataContextBinding#execute}). For a
+	 * context which is currently {@link #delete deleted} on the client, but not yet on the server,
+	 * this method cancels the deletion and restores the context.
 	 *
-	 * Note: This is an experimental API. Currently only PATCH and DELETE changes for row contexts
-	 * of an absolute {@link sap.ui.model.odata.v4.ODataListBinding} are supported.
+	 * Note: This is an experimental API. Currently only row contexts of an
+	 * {@link sap.ui.model.odata.v4.ODataListBinding} are supported.
 	 *
 	 * @returns {Promise}
 	 *   A promise which is resolved without a defined result as soon as all changes in the context
-	 *   itself are canceled
+	 *   and its current dependent bindings are canceled
 	 * @throws {Error} If
 	 * <ul>
 	 *   <li> the binding's root binding is suspended,
 	 *   <li> a change of this context has already been sent to the server and there is no response
 	 *     yet,
-	 *   <li> this context is transient but not inactive and therefore should rather be reset via
+	 *   <li> this context is transient, but not inactive and therefore should rather be reset via
 	 *     {@link #delete}.
 	 * </ul>
 	 *
 	 * @experimental As of version 1.109.0
 	 * @public
+	 * @see #hasPendingChanges
 	 */
 	Context.prototype.resetChanges = function () {
 		var aPromises = this.oDeletePromise
@@ -1654,6 +1680,8 @@ sap.ui.define([
 		if (this.bInactive === 1) {
 			this.bInactive = true;
 		}
+		this.oBinding.resetChangesInDependents(aPromises, true);
+
 		return Promise.all(aPromises).then(function () {});
 	};
 
@@ -1668,15 +1696,20 @@ sap.ui.define([
 	};
 
 	/**
-	 * Sets a new unique number for this context's generation, just like
-	 * {@link sap.ui.model.odata.v4.Context.createNewContext} does for a new context.
+	 * Sets the inactive flag to <code>true</code>
+	 *
+	 * Note: this is a private and internal API. Do not call this!
+	 *
+	 * @throws {Error} - If this context is not inactive
 	 *
 	 * @private
-	 * @see #getGeneration
+	 * @see #isInactive
 	 */
-	Context.prototype.setNewGeneration = function () {
-		iGenerationCounter += 1;
-		this.iGeneration = iGenerationCounter;
+	Context.prototype.setInactive = function () {
+		if (!this.bInactive) {
+			throw new Error("Not inactive: " + this.bInactive);
+		}
+		this.bInactive = true;
 	};
 
 	/**
@@ -1755,6 +1788,18 @@ sap.ui.define([
 		this.fnOnBeforeDestroy = bKeepAlive ? fnOnBeforeDestroy : undefined;
 	};
 
+	/**
+	 * Sets a new unique number for this context's generation, just like
+	 * {@link sap.ui.model.odata.v4.Context.createNewContext} does for a new context.
+	 *
+	 * @private
+	 * @see #getGeneration
+	 */
+	Context.prototype.setNewGeneration = function () {
+		iGenerationCounter += 1;
+		this.iGeneration = iGenerationCounter;
+	};
+
 	/**
 	 * Sets a new value for the property identified by the given path. The path is relative to this
 	 * context and is expected to point to a structural property with primitive type or, since
@@ -1833,9 +1878,36 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns a string representation of this object including the {@link #getPath binding path},
-	 * {@link #getIndex index}, and state (see also "Context states" of
-	 * {@link topic:c9723f8265f644af91c0ed941e114d46 Creating an Entity}).
+	 * Determines whether this context is currently selected.
+	 *
+	 * @param {boolean} bSelected - Whether this context is currently selected
+	 * @throws {Error}
+	 *   If this context does not belong to a list binding, or if it is {@link #isDeleted deleted}
+	 *   and <code>bSelected</code> is <code>true</code>
+	 *
+	 * @experimental As of version 1.111.0
+	 * @public
+	 * @see #isSelected
+	 */
+	Context.prototype.setSelected = function (bSelected) {
+		if (!this.oBinding.getHeaderContext) {
+			throw new Error("Unsupported context: " + this);
+		}
+		if (bSelected && this.isDeleted()) {
+			throw new Error("Must not select a deleted entity: " + this);
+		}
+		this.bSelected = bSelected;
+	};
+
+	/**
+	 * Returns a string representation of this object including the following information:
+	 * <ul>
+	 *   <li> {@link #getPath Binding path},
+	 *   <li> {@link #getIndex Index},
+	 *   <li> State (see also "Context states" of
+	 *     {@link topic:c9723f8265f644af91c0ed941e114d46 Creating an Entity}), including whether
+	 *     this context is {@link #isSelected selected}.
+	 * </ul>
 	 *
 	 * @returns {string} A string description of this binding
 	 *
@@ -1869,6 +1941,9 @@ sap.ui.define([
 					// no default
 				}
 			}
+			if (this.bSelected) {
+				sSuffix += ";selected";
+			}
 			sSuffix = "[" + this.iIndex + sSuffix + "]";
 		}
 

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

@@ -56,6 +56,28 @@ sap.ui.define([
 		this.sResumeChangeReason = undefined;
 	}
 
+	/**
+	 * Returns <code>true</code> if this binding or its dependent bindings have changes.
+	 *
+	 * Note: This private function is needed in order to hide the additional parameter
+	 * <code>bIgnoreInactiveCaches</code> from the public API {@link #hasPendingChanges}.
+	 *
+	 * @param {boolean} [bIgnoreKeptAlive]
+	 *   Whether to ignore changes which will not be lost by certain APIs, see
+	 *   {@link #hasPendingChanges}
+	 * @param {boolean} [bIgnoreInactiveCaches]
+	 *   Whether to ignore changes in inactive caches
+	 * @returns {boolean}
+	 *   <code>true</code> if the binding is resolved and has pending changes
+	 *
+	 * @private
+	 */
+	ODataBinding.prototype._hasPendingChanges = function (bIgnoreKeptAlive, bIgnoreInactiveCaches) {
+		return this.isResolved()
+			&& (this.hasPendingChangesForPath("", bIgnoreKeptAlive)
+				|| this.hasPendingChangesInDependents(bIgnoreKeptAlive, bIgnoreInactiveCaches));
+	};
+
 	/**
 	 * Adjusts the paths of all contexts of this binding by replacing the given transient predicate
 	 * with the given predicate. Recursively adjusts all child bindings.
@@ -385,7 +407,9 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataBinding.prototype.doDeregisterChangeListener = function (sPath, oListener) {
-		this.oCache.deregisterChangeListener(sPath, oListener);
+		if (this.oCache) {
+			this.oCache.deregisterChangeListener(sPath, oListener);
+		}
 	};
 
 	/**
@@ -618,9 +642,9 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.model.Context|sap.ui.model.odata.v4.Context} [oContext=this.oContext]
 	 *   A context; if omitted, the binding's context is used
-	 * @returns {SyncPromise} A promise resolving with the resource path or <code>undefined</code>
-	 *   for an unresolved binding. If computation of the canonical path fails, the promise is
-	 *   rejected.
+	 * @returns {sap.ui.base.SyncPromise} A promise resolving with the resource path or
+	 *   <code>undefined</code> for an unresolved binding. If computation of the canonical path
+	 *   fails, the promise is rejected.
 	 *
 	 * @private
 	 */
@@ -873,7 +897,11 @@ sap.ui.define([
 	 * created entities, or entity deletions which have not been sent successfully to the server.
 	 * This function does not take the execution of OData operations
 	 * (see {@link sap.ui.model.odata.v4.ODataContextBinding#execute}) into account. Since 1.98.0,
-	 * {@link sap.ui.model.odata.v4.Context#isInactive inactive} contexts are ignored.
+	 * {@link sap.ui.model.odata.v4.Context#isInactive inactive} contexts are ignored, unless
+	 * (since 1.100.0) their
+	 * {@link sap.ui.model.odata.v4.ODataListBinding#event:createActivate activation} has been
+	 * prevented and {@link sap.ui.model.odata.v4.Context#isInactive} therefore returns
+	 * <code>1</code>.
 	 *
 	 * Note: If this binding is relative, its data is cached separately for each parent context
 	 * path. This method returns <code>true</code> if there are pending changes for the current
@@ -900,9 +928,7 @@ sap.ui.define([
 	 * @since 1.39.0
 	 */
 	ODataBinding.prototype.hasPendingChanges = function (bIgnoreKeptAlive) {
-		return this.isResolved()
-			&& (this.hasPendingChangesForPath("", bIgnoreKeptAlive)
-				|| this.hasPendingChangesInDependents(bIgnoreKeptAlive));
+		return this._hasPendingChanges(bIgnoreKeptAlive);
 	};
 
 	/**
@@ -957,6 +983,8 @@ sap.ui.define([
 	 * @param {boolean} [bIgnoreKeptAlive]
 	 *   Whether to ignore changes which will not be lost by APIs like sort or filter because they
 	 *   relate to a deleted context or a context which is kept alive
+	 * @param {boolean} [bIgnoreInactiveCaches]
+	 *   Whether to ignore changes in inactive caches
 	 * @returns {boolean}
 	 *   <code>true</code> if this binding has pending changes
 	 *
@@ -1052,7 +1080,7 @@ sap.ui.define([
 	 * Refreshes the binding. Prompts the model to retrieve data from the server using the given
 	 * group ID and notifies the control that new data is available.
 	 *
-	 * Refresh is supported for bindings which are not relative to a
+	 * Refresh is supported for bindings which are not relative to an
 	 * {@link sap.ui.model.odata.v4.Context}.
 	 *
 	 * Note: When calling {@link #refresh} multiple times, the result of the request triggered by
@@ -1301,6 +1329,8 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.base.SyncPromise[]} aPromises
 	 *   List of promises which is extended for each call to {@link #resetChangesInDependents}.
+	 * @param {boolean} [bIgnoreInactiveCaches]
+	 *   Whether to ignore changes in inactive caches
 	 * @throws {Error}
 	 *   If there is a change of this binding which has been sent to the server and for which there
 	 *   is no response yet.

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

@@ -74,7 +74,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.110.0
+		 * @version 1.111.1
 		 *
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
@@ -559,7 +559,7 @@ sap.ui.define([
 	 *   actions only
 	 * @param {function} [fnOnStrictHandlingFailed]
 	 *   Callback for strict handling; supported for actions only
-	 * @returns {SyncPromise}
+	 * @returns {sap.ui.base.SyncPromise}
 	 *   The request promise
 	 * @throws {Error} If
 	 *   <ul>
@@ -916,10 +916,10 @@ sap.ui.define([
 	 *   value context at all or the existing context as described above is currently part of the
 	 *   list's collection (that is, has an index).
 	 *   <br>
-	 *   A return value context is a {@link sap.ui.model.odata.v4.Context} which represents a bound
+	 *   A return value context is an {@link sap.ui.model.odata.v4.Context} which represents a bound
 	 *   operation response. It is created only if the operation is bound and has a single entity
 	 *   return value from the same entity set as the operation's binding parameter and has a
-	 *   parent context which is a {@link sap.ui.model.odata.v4.Context} and points to an entity
+	 *   parent context which is an {@link sap.ui.model.odata.v4.Context} and points to an entity
 	 *   from an entity set. It is destroyed the next time this operation binding is executed again!
 	 *   <br>
 	 *   If a return value context is created, it must be used instead of

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

@@ -57,7 +57,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.110.0
+		 * @version 1.111.1
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
 		 * @borrows sap.ui.model.odata.v4.ODataBinding#getUpdateGroupId as #getUpdateGroupId
@@ -302,7 +302,8 @@ sap.ui.define([
 
 	/**
 	 * Applies the given map of parameters to this binding's parameters and triggers the
-	 * creation of a new cache if called with a change reason.
+	 * creation of a new cache if called with a change reason. Since 1.111.0, the header context is
+	 * deselected.
 	 *
 	 * @param {object} mParameters
 	 *   Map of binding parameters, {@link sap.ui.model.odata.v4.ODataModel#constructor}
@@ -326,8 +327,9 @@ sap.ui.define([
 				throw new Error("Cannot combine $$aggregation and $apply");
 			}
 			if (!sChangeReason) { // called from c'tor or #setAggregation
-				_AggregationHelper.validateAggregation(mParameters.$$aggregation, this.sPath,
-					this.oModel.oInterface.fetchMetadata, this.oModel.bAutoExpandSelect);
+				_AggregationHelper.validateAggregationAndSetPath(mParameters.$$aggregation,
+					this.oModel.bAutoExpandSelect, this.oModel.oInterface.fetchMetadata,
+					this.getResolvedPath());
 			}
 			sApply = _AggregationHelper.buildApply(mParameters.$$aggregation).$apply;
 		}
@@ -356,6 +358,7 @@ sap.ui.define([
 		this.fetchCache(this.oContext);
 		this.reset(sChangeReason);
 		if (this.oHeaderContext) {
+			this.oHeaderContext.setSelected(false);
 			// Update after the refresh event, otherwise $count is fetched before the request
 			this.oHeaderContext.checkUpdate();
 		}
@@ -973,6 +976,10 @@ sap.ui.define([
 			bReset = false,
 			that = this;
 
+		if (oContext.isDeleted()) {
+			return oContext.oDeletePromise; // do not delete twice
+		}
+
 		this.iDeletedContexts += 1;
 
 		return oContext.doDelete(oGroupLock, sEditUrl, sPath, oETagEntity, this,
@@ -1712,7 +1719,7 @@ sap.ui.define([
 
 	/**
 	 * Filters the list with the given filters. Since 1.97.0, if filters are unchanged, no request
-	 * is sent, regardless of pending changes.
+	 * is sent, regardless of pending changes. Since 1.111.0, the header context is deselected.
 	 *
 	 * If there are pending changes that cannot be ignored, an error is thrown. Use
 	 * {@link #hasPendingChanges} to check if there are such pending changes. If there are, call
@@ -1807,6 +1814,7 @@ sap.ui.define([
 		this.fetchCache(this.oContext);
 		this.reset(ChangeReason.Filter);
 		if (this.oHeaderContext) {
+			this.oHeaderContext.setSelected(false);
 			// Update after the refresh event, otherwise $count is fetched before the request
 			this.oHeaderContext.checkUpdate();
 		}
@@ -1838,15 +1846,32 @@ sap.ui.define([
 	 * Returns the current object holding the information needed for data aggregation, see
 	 * {@link #setAggregation}.
 	 *
+	 * @param {boolean} [bVerbose]
+	 *   Whether to additionally return the "$"-prefixed values described below which obviously
+	 *   cannot be given back to the setter (@experimental as of version 1.111.0). They are
+	 *   retrieved from the pair of "Org.OData.Aggregation.V1.RecursiveHierarchy" and
+	 *   "com.sap.vocabularies.Hierarchy.v1.RecursiveHierarchy" annotations at this binding's
+	 *   entity type, identified via the <code>hierarchyQualifier</code> given to
+	 *   {@link #setAggregation}.
+	 *   <ul>
+	 *     <li> "$DistanceFromRootProperty" holds the path to the property which provides the raw
+	 *       value for "@$ui5.node.level" (minus one) and should be used only to interpret the
+	 *       response retrieved via {@link #getDownloadUrl}.
+	 *     <li> "$NodeProperty" holds the path to the property which provides the hierarchy node
+	 *       value. That property is always $select'ed automatically and can be accessed as usual.
+	 *   </ul>
 	 * @returns {object}
 	 *   The current data aggregation object, incl. some default values
 	 *
 	 * @public
 	 * @since 1.109.0
 	 */
-	ODataListBinding.prototype.getAggregation = function () {
+	ODataListBinding.prototype.getAggregation = function (bVerbose) {
 		return _Helper.clone(this.mParameters.$$aggregation, function (sKey, vValue) {
-			return sKey[0] === "$" ? undefined : vValue;
+			return sKey[0] === "$"
+				&& !(bVerbose && ["$DistanceFromRootProperty", "$NodeProperty"].includes(sKey))
+				? undefined
+				: vValue;
 		});
 	};
 
@@ -2980,15 +3005,21 @@ sap.ui.define([
 	 *   A removed context is destroyed unless it is
 	 *   {@link sap.ui.model.odata.v4.Context#isKeepAlive kept alive} and still exists on the
 	 *   server.
+	 * @param {boolean} [bKeepCacheOnError]
+	 *   If <code>true</code>, the binding data remains unchanged if the refresh fails
+	 * @param {boolean} [bWithMessages]
+	 *   Whether the "@com.sap.vocabularies.Common.v1.Messages" path is treated specially
 	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise which resolves without a defined value when the entity is updated in the cache,
 	 *   or rejects if the refresh failed.
 	 * @throws {Error}
-	 *   If the given context does not represent a single entity (see {@link #getHeaderContext})
+	 *   If the given context does not represent a single entity (see {@link #getHeaderContext}), or
+	 *   if <code>bAllowRemoval && bWithMessages</code> are combined
 	 *
 	 * @private
 	 */
-	ODataListBinding.prototype.refreshSingle = function (oContext, oGroupLock, bAllowRemoval) {
+	ODataListBinding.prototype.refreshSingle = function (oContext, oGroupLock, bAllowRemoval,
+			bKeepCacheOnError, bWithMessages) {
 		var sContextPath = oContext.getPath(),
 			sResourcePathPrefix = sContextPath.slice(1),
 			that = this;
@@ -2996,6 +3027,9 @@ sap.ui.define([
 		if (oContext === this.oHeaderContext) {
 			throw new Error("Unsupported header context: " + oContext);
 		}
+		if (bAllowRemoval && bWithMessages) {
+			throw new Error("Unsupported: bAllowRemoval && bWithMessages");
+		}
 
 		return this.withCache(function (oCache, sPath, oBinding) {
 			var bDataRequested = false,
@@ -3064,7 +3098,7 @@ sap.ui.define([
 					? oCache.refreshSingleWithRemove(oGroupLock, sPath, oContext.getModelIndex(),
 						sPredicate, bKeepAlive, fireDataRequested, onRemove)
 					: oCache.refreshSingle(oGroupLock, sPath, oContext.getModelIndex(), sPredicate,
-						bKeepAlive, fireDataRequested))
+						bKeepAlive, bWithMessages, fireDataRequested))
 				.then(function () {
 					var aUpdatePromises = [];
 
@@ -3075,7 +3109,7 @@ sap.ui.define([
 						if (bAllowRemoval) {
 							aUpdatePromises.push(
 								oContext.refreshDependentBindings(sResourcePathPrefix,
-									oGroupLock.getGroupId()));
+									oGroupLock.getGroupId(), false, bKeepCacheOnError));
 						}
 					}
 
@@ -3097,7 +3131,7 @@ sap.ui.define([
 				// call refreshInternal on all dependent bindings to ensure that all resulting data
 				// requests are in the same batch request
 				aPromises.push(oContext.refreshDependentBindings(sResourcePathPrefix,
-					oGroupLock.getGroupId()));
+					oGroupLock.getGroupId(), false, bKeepCacheOnError));
 			}
 
 			return SyncPromise.all(aPromises);
@@ -3215,8 +3249,8 @@ sap.ui.define([
 	ODataListBinding.prototype.requestDownloadUrl = _Helper.createRequestMethod("fetchDownloadUrl");
 
 	/**
-	 * Requests a {@link sap.ui.model.Filter} object which can be used to filter the list binding by
-	 * entries with model messages. With the filter callback, you can define if a message is
+	 * Requests an {@link sap.ui.model.Filter} object which can be used to filter the list binding
+	 * by entries with model messages. With the filter callback, you can define if a message is
 	 * considered when creating the filter for entries with messages.
 	 *
 	 * The resulting filter does not consider application or control filters specified for this list
@@ -3228,7 +3262,7 @@ sap.ui.define([
 	 *   given {@link sap.ui.core.message.Message} is considered. If no callback function is given,
 	 *   all messages are considered.
 	 * @returns {Promise<sap.ui.model.Filter|null>}
-	 *   A Promise that resolves with a {@link sap.ui.model.Filter} representing the entries with
+	 *   A Promise that resolves with an {@link sap.ui.model.Filter} representing the entries with
 	 *   messages; it resolves with <code>null</code> if the binding is not resolved or if there is
 	 *   no message for any entry
 	 *
@@ -3324,7 +3358,7 @@ sap.ui.define([
 		}
 
 		if (this.oCache && this.oCache.getPendingRequestsPromise()) {
-			return this.oCache.getPendingRequestsPromise().then(function () {
+			return SyncPromise.resolve(this.oCache.getPendingRequestsPromise()).then(function () {
 				// Note: This is quite early! Transient predicate not yet replaced inside path,
 				// #isTransient not yet updated etc. Be careful below!
 				return that.requestSideEffects(sGroupId, aPaths, oContext);
@@ -3337,7 +3371,7 @@ sap.ui.define([
 			if (aPredicates) {
 				aPromises = this.oCache
 					? [this.oCache.requestSideEffects(this.lockGroup(sGroupId), aPaths, aPredicates,
-						bSingle)]
+						bSingle, /*bWithMessages*/bSingle)]
 					: []; // can happen if invoked via absolute side effect
 				this.visitSideEffects(sGroupId, aPaths, bSingle ? oContext : undefined, aPromises);
 
@@ -3347,7 +3381,8 @@ sap.ui.define([
 			}
 		}
 		if (bSingle) {
-			return this.refreshSingle(oContext, this.lockGroup(sGroupId), false);
+			return this.refreshSingle(oContext, this.lockGroup(sGroupId), /*bAllowRemoval*/false,
+				/*bKeepCacheOnError*/true, /*bWithMessages*/true);
 		}
 		if (this.iCurrentEnd === 0) {
 			return SyncPromise.resolve();
@@ -3730,8 +3765,9 @@ sap.ui.define([
 					if (!this.oHeaderContext) {
 						this.oHeaderContext = Context.create(this.oModel, this, sResolvedPath);
 					}
-					if (this.bHasPathReductionToParent && this.oModel.bAutoExpandSelect
-							&& !this.mParameters.$$aggregation) {
+					if (this.mParameters.$$aggregation) {
+						_AggregationHelper.setPath(this.mParameters.$$aggregation, sResolvedPath);
+					} else if (this.bHasPathReductionToParent && this.oModel.bAutoExpandSelect) {
 						this.sChangeReason = "AddVirtualContext"; // JIRA: CPOUI5ODATAV4-848
 					}
 					if (oContext.getBinding
@@ -3951,7 +3987,7 @@ sap.ui.define([
 	 * @param {object} oEntityType The metadata for the entity type
 	 * @param {sap.ui.model.odata.v4.ODataMetaModel} oMetaModel The meta model
 	 * @param {string} sMetaPath The meta path
-	 * @returns {sap.ui.model.Filter} a {@link sap.ui.model.Filter} for the given key predicate
+	 * @returns {sap.ui.model.Filter} an {@link sap.ui.model.Filter} for the given key predicate
 	 *
 	 * @private
 	 */

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

@@ -157,7 +157,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.110.0
+		 * @version 1.111.1
 		 */
 		ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 				constructor : constructor
@@ -211,7 +211,7 @@ sap.ui.define([
 	 *   A namespace, for example "foo.bar.", of a schema.
 	 * @param {function} fnLog
 	 *   The log function
-	 * @returns {object|SyncPromise|undefined}
+	 * @returns {object|sap.ui.base.SyncPromise|undefined}
 	 *   The schema, or a promise which is resolved without details or rejected with an error, or
 	 *   <code>undefined</code>.
 	 * @throws {Error}
@@ -3016,8 +3016,7 @@ sap.ui.define([
 	 * @see #getUI5Type
 	 * @since 1.37.0
 	 */
-	ODataMetaModel.prototype.requestUI5Type
-		= _Helper.createRequestMethod("fetchUI5Type");
+	ODataMetaModel.prototype.requestUI5Type = _Helper.createRequestMethod("fetchUI5Type");
 
 	/**
 	 * Request unit customizing based on the code list reference given in the entity container's