@openui5/sap.ui.core 1.107.1 → 1.108.1

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.107.1
+		 * @version 1.108.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
@@ -261,7 +261,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 {sap.ui.model.odata.v4.Context} oContext
 	 *   The context to be deleted
@@ -291,22 +291,16 @@ sap.ui.define([
 				// context is not in aContexts -> use the predicate
 				? _Helper.getRelativePath(oContext.getPath(), this.oHeaderContext.getPath())
 				: String(oContext.iIndex),
-			bReadCount = false,
+			bReset = false,
 			that = this;
 
-		if (oGroupLock && oContext.iIndex === undefined
-				&& this.oModel.isApiGroup(oGroupLock.getGroupId())) {
-			throw new Error("Cannot delete a kept-alive context in an API group when it is not in"
-				+ " the collection");
-		}
-
 		this.iDeletedContexts += 1;
 
-		return this.deleteFromCache(oGroupLock, sEditUrl, sPath, oETagEntity, bDoNotRequestCount,
+		return this.deleteFromCache(oGroupLock, sEditUrl, sPath, oETagEntity,
 			function (iIndex, iOffset) {
 				if (iIndex !== undefined) {
 					// An entity can only be deleted when its key predicate is known. So we can be
-					// sure to have key predicates and the contexts a related to entities and not
+					// sure to have key predicates and the contexts are related to entities and not
 					// rows. -> Shift them and adjust the indexes
 					if (iOffset > 0) { // we're re-inserting
 						delete that.mPreviousContextsByPath[oContext.getPath()];
@@ -330,37 +324,45 @@ sap.ui.define([
 					that.aContexts.forEach(function (oContext0, i) {
 						oContext0.iIndex = i - that.iCreatedContexts;
 					});
-				} else if (that.bLengthFinal) {
-					// a kept-alive context is not in aContexts  -> read the count afterwards
-					bReadCount = true;
+				} else if (iOffset > 0) { // trying to reinsert an element w/o index
+					bReset = true;
+				} else if (that.bLengthFinal && !bDoNotRequestCount) {
+					// a kept-alive context is not in aContexts -> request the count
+					that.oCache.requestCount(
+						oGroupLock && !that.oModel.isApiGroup(oGroupLock.getGroupId())
+							? oGroupLock.getUnlockedCopy()
+							: that.lockGroup("$auto")
+					).then(function (iCount) {
+						var iOldMaxLength = that.iMaxLength;
+
+						that.iMaxLength = iCount - that.iActiveContexts;
+						// Note: Although we know that oContext is not in aContexts, a "change"
+						// event needs to be fired in order to notify the control about the new
+						// length, for example, to update the 'More' button or the scrollbar.
+						if (iOldMaxLength !== that.iMaxLength) {
+							that._fireChange({reason : ChangeReason.Remove});
+						}
+					});
 				}
 			}
 		).then(function () {
-			var iOldMaxLength = that.iMaxLength;
-
 			that.iDeletedContexts -= 1;
 			if (!that.iDeletedContexts && !that.iCreatedContexts) {
 				// all (created) contexts finally gone -> free to create at any end
 				that.bFirstCreateAtEnd = undefined;
 			}
 			oContext.resetKeepAlive();
-			if (bReadCount) {
-				that.iMaxLength = that.fetchValue("$count", undefined, true).getResult()
-					- that.iActiveContexts;
-
-				// Note: Although we know that oContext is not in aContexts, a "change" event needs
-				// to be fired in order to notify the control about the new length, for example, to
-				// update the 'More' button or the scrollbar.
-				if (iOldMaxLength !== that.iMaxLength) {
-					that._fireChange({reason : ChangeReason.Remove});
-				}
-			}
 			oContext.iIndex = Context.VIRTUAL; // prevent further cache access via this context
 			that.oModel.addPrerenderingTask(
 				that.destroyPreviousContexts.bind(that, [oContext.getPath()]));
 		}, function (oError) {
 			that.iDeletedContexts -= 1;
-			that._fireChange({reason : ChangeReason.Insert});
+			if (bReset) {
+				that.oCache.reset(that.getKeepAlivePredicates());
+				that.reset(ChangeReason.Change);
+			} else {
+				that._fireChange({reason : ChangeReason.Add});
+			}
 			throw oError;
 		});
 	};
@@ -1152,22 +1154,14 @@ sap.ui.define([
 	 */
 	ODataListBinding.prototype.doCreateCache = function (sResourcePath, mQueryOptions, oContext,
 			sDeepResourcePath, sGroupId, oOldCache) {
-		var sBindingPath,
-			oCache,
-			aKeptElementPaths,
-			that = this;
+		var oCache,
+			aKeepAlivePredicates;
 
 		if (oOldCache && oOldCache.getResourcePath() === sResourcePath
 				&& oOldCache.$deepResourcePath === sDeepResourcePath) {
-			sBindingPath = this.oHeaderContext.getPath();
-			aKeptElementPaths = Object.keys(this.mPreviousContextsByPath).filter(function (sPath) {
-				return that.mPreviousContextsByPath[sPath].isKeepAlive();
-			});
-
-			if (this.iCreatedContexts || aKeptElementPaths.length) {
-				oOldCache.reset(aKeptElementPaths.map(function (sPath) {
-					return _Helper.getRelativePath(sPath, sBindingPath);
-				}), sGroupId);
+			aKeepAlivePredicates = this.getKeepAlivePredicates();
+			if (this.iCreatedContexts || this.iDeletedContexts || aKeepAlivePredicates.length) {
+				oOldCache.reset(aKeepAlivePredicates, sGroupId);
 				// Note: #inheritQueryOptions as called below should not matter in case of own
 				// requests, which are a precondition for kept-alive elements
 				oOldCache.setQueryOptions(mQueryOptions, true);
@@ -1758,13 +1752,17 @@ sap.ui.define([
 	 * @returns {this}
 	 *   <code>this</code> to facilitate method chaining
 	 * @throws {Error}
-	 *   If there are pending changes that cannot be ignored or if an unsupported operation mode is
-	 *   used (see {@link sap.ui.model.odata.v4.ODataModel#bindList}). Since 1.97.0, pending changes
-	 *   are ignored if they relate to a
-	 *   {@link sap.ui.model.odata.v4.Context#isKeepAlive kept-alive} context of this binding.
-	 *   Since 1.98.0, {@link sap.ui.model.odata.v4.Context#isTransient transient} contexts
-	 *   of a {@link #getRootBinding root binding} do not count as pending changes. Pending
-	 *   {@link sap.ui.model.odata.v4.Context#delete deletions} lead to an error.
+	 *   If there are pending changes that cannot be ignored or an unsupported operation mode is
+	 *   used (see {@link sap.ui.model.odata.v4.ODataModel#bindList}).
+	 *   <br>
+	 *   The following pending changes are ignored:
+	 *   <ul>
+	 *     <li> changes relating to a {@link sap.ui.model.odata.v4.Context#isKeepAlive kept-alive}
+	 *       context of this binding (since 1.97.0),
+	 *     <li> {@link sap.ui.model.odata.v4.Context#isTransient transient} contexts of a
+	 *       {@link #getRootBinding root binding} (since 1.98.0),
+	 *     <li> {@link sap.ui.model.odata.v4.Context#delete deleted} contexts (since 1.108.0).
+	 *   </ul>
 	 *
 	 * @public
 	 * @see sap.ui.model.ListBinding#filter
@@ -1785,10 +1783,6 @@ sap.ui.define([
 			return this;
 		}
 
-		if (this.iDeletedContexts) {
-			throw new Error("Cannot filter when delete requests are pending");
-		}
-
 		if (this.hasPendingChanges(true)) {
 			throw new Error("Cannot filter due to pending changes");
 		}
@@ -2148,11 +2142,11 @@ sap.ui.define([
 	 *
 	 * If known, the value represents the sum of the element count of the collection on the server
 	 * and the number of {@link sap.ui.model.odata.v4.Context#isInactive active}
-	 * {@link sap.ui.model.odata.v4.Context#isTransient transient} entities created on the client.
-	 * Otherwise, it is <code>undefined</code>. The value is a number of type
-	 * <code>Edm.Int64</code>. Since 1.91.0, in case of data aggregation with group levels, the
-	 * count is the leaf count on the server; it is only determined if the <code>$count</code>
-	 * system query option is given.
+	 * {@link sap.ui.model.odata.v4.Context#isTransient transient} entities created on the client,
+	 * minus the {@link #sap.ui.model.data.v4.Context#delete deleted} entities. Otherwise, it is
+	 * <code>undefined</code>. The value is a number of type <code>Edm.Int64</code>. Since 1.91.0,
+	 * in case of data aggregation with group levels, the count is the leaf count on the server; it
+	 * is only determined if the <code>$count</code> system query option is given.
 	 *
 	 * The count is known to the binding in the following situations:
 	 * <ul>
@@ -2189,7 +2183,7 @@ sap.ui.define([
 	 * Returns the contexts that were requested by a control last time. Does not trigger a data
 	 * request. In the time between the {@link #event:dataRequested} event and the
 	 * {@link #event:dataReceived} event, the resulting array contains <code>undefined</code> at
-	 * those indexes where the data is not yet available.
+	 * those indexes where the data is not yet available or has been deleted.
 	 *
 	 * @returns {sap.ui.model.odata.v4.Context[]}
 	 *   The contexts
@@ -2484,6 +2478,24 @@ sap.ui.define([
 		return oContext;
 	};
 
+	/**
+	 * Returns a list of key predicates of all kept-alive contexts.
+	 *
+	 * @returns {string[]} The list of key predicates
+	 *
+	 * @private
+	 */
+	ODataListBinding.prototype.getKeepAlivePredicates = function () {
+		var sBindingPath = this.getHeaderContext().getPath();
+
+		return Object.values(this.mPreviousContextsByPath).concat(this.aContexts)
+			.filter(function (oContext) {
+				return oContext.isKeepAlive();
+			}).map(function (oContext) {
+				return _Helper.getRelativePath(oContext.getPath(), sBindingPath);
+			});
+	};
+
 	/**
 	 * Returns the number of entries in the list. As long as the client does not know the size on
 	 * the server, an estimated length is returned.
@@ -2760,10 +2772,6 @@ sap.ui.define([
 			});
 		}
 
-		if (this.iDeletedContexts) {
-			throw new Error("Cannot refresh when delete requests are pending");
-		}
-
 		if (this.isRootBindingSuspended()) {
 			// Note: side-effects (incl. refresh) are forbidden while suspended
 			if (this.bSharedRequest) {
@@ -3236,6 +3244,11 @@ sap.ui.define([
 			return SyncPromise.resolve();
 		}
 
+		if (!bSingle && this.oCache && this.oCache.isDeletingInOtherGroup(sGroupId)) {
+			throw new Error("Must not request side effects when there is a pending delete in a"
+				+ " different batch group");
+		}
+
 		if (aPaths.indexOf("") < 0) {
 			if (bSingle) {
 				aContexts = [oContext];
@@ -3289,9 +3302,9 @@ sap.ui.define([
 	 *   as long as the binding is still empty.
 	 * @param {boolean} [bDrop]
 	 *   By default, all created persisted contexts are dropped while transient ones are not.
-	 *   <code>true</code> also drops transient ones, and <code>false</code> keeps inline creation
-	 *   rows only and transient ones where the POST is not within the same $batch as the GET for
-	 *   the side-effects refresh.
+	 *   (Deleted contexts are not affected here.) <code>true</code> also drops transient ones, and
+	 *   <code>false</code> keeps inline creation rows only and transient ones where the POST is not
+	 *   within the same $batch as the GET for the side-effects refresh.
 	 * @param {string} [sGroupId]
 	 *   The group ID to be used for refresh; used only in case <code>bDrop === false</code>
 	 *
@@ -3476,9 +3489,14 @@ sap.ui.define([
 	 *   details:
 	 *   <ul>
 	 *     <li> <code>grandTotal</code>: An optional boolean that tells whether a grand total for
-	 *       this aggregatable property is needed (since 1.59.0); filtering by any aggregatable
-	 *       property is not supported in this case (since 1.89.0) as is "$search" (since 1.93.0)
-	 *       or the <code>vGroup</code> parameter of {@link sap.ui.model.Sorter} (since 1.107.0)
+	 *       this aggregatable property is needed (since 1.59.0); not supported in this case are:
+	 *       <ul>
+	 *         <li> filtering by any aggregatable property (since 1.89.0),
+	 *         <li> "$search" (since 1.93.0),
+	 *         <li> the <code>vGroup</code> parameter of {@link sap.ui.model.Sorter}
+	 *           (since 1.107.0),
+	 *         <li> shared requests (since 1.108.0).
+	 *       </ul>
 	 *     <li> <code>subtotals</code>: An optional boolean that tells whether subtotals for this
 	 *       aggregatable property are needed
 	 *     <li> <code>with</code>: An optional string that provides the name of the method (for
@@ -3511,17 +3529,25 @@ sap.ui.define([
 	 *   </ul>
 	 * @param {string[]} [oAggregation.groupLevels]
 	 *   A list of groupable property names used to determine group levels. They may, but don't need
-	 *   to, be repeated in <code>oAggregation.group</code>. Group levels cannot be combined with
-	 *   filtering for aggregated properties or (since 1.93.0) with "$search" or (since 1.107.0) the
-	 *   <code>vGroup</code> parameter of {@link sap.ui.model.Sorter}.
+	 *   to, be repeated in <code>oAggregation.group</code>. Group levels cannot be combined with:
+	 *   <ul>
+	 *     <li> filtering for aggregated properties,
+	 *     <li> "$search" (since 1.93.0),
+	 *     <li> the <code>vGroup</code> parameter of {@link sap.ui.model.Sorter} (since 1.107.0),
+	 *     <li> shared requests (since 1.108.0).
+	 *   </ul>
 	 * @param {string} [oAggregation.hierarchyQualifier]
 	 *   The qualifier for the pair of "Org.OData.Aggregation.V1.RecursiveHierarchy" and
 	 *   "com.sap.vocabularies.Hierarchy.v1.RecursiveHierarchy" annotations at this binding's
 	 *   entity type (@experimental as of version 1.105.0). If present, a recursive hierarchy
 	 *   without data aggregation is defined, and the only other supported properties are
 	 *   <code>expandTo</code> and <code>search</code>. A recursive hierarchy cannot be combined
-	 *   with "$search" or (since 1.107.0) the <code>vGroup</code> parameter of
-	 *   {@link sap.ui.model.Sorter}.
+	 *   with:
+	 *   <ul>
+	 *     <li> "$search",
+	 *     <li> the <code>vGroup</code> parameter of {@link sap.ui.model.Sorter} (since 1.107.0),
+	 *     <li> shared requests (since 1.108.0).
+	 *   </ul>
 	 * @param {string} [oAggregation.search]
 	 *   Like the <a href=
 	 *   "https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part2-url-conventions.html#_Search_System_Query"
@@ -3677,17 +3703,17 @@ sap.ui.define([
 	 *   the dynamic sorters.
 	 * @returns {this}
 	 *   <code>this</code> to facilitate method chaining
-	 * @throws {Error} If
+	 * @throws {Error}
+	 *   If there are pending changes that cannot be ignored or an unsupported operation mode is
+	 *   used (see {@link sap.ui.model.odata.v4.ODataModel#bindList}).
+	 *   <br>
+	 *   The following pending changes are ignored:
 	 *   <ul>
-	 *     <li> there are pending changes that cannot be ignored,
-	 *     <li> an unsupported operation mode is used (see
-	 *       {@link sap.ui.model.odata.v4.ODataModel#bindList}). Since 1.97.0, pending changes are
-	 *       ignored if they relate to a
-	 *       {@link sap.ui.model.odata.v4.Context#isKeepAlive kept-alive} context of this binding.
-	 *       Since 1.98.0, {@link sap.ui.model.odata.v4.Context#isTransient transient} contexts of a
-	 *       {@link #getRootBinding root binding} do not count as pending changes.
-	 *     <li> contexts are {@link sap.ui.model.data.v4.Context#delete deleted} on the client, but
-	 *       the server request has not finished yet.
+	 *     <li> changes relating to a {@link sap.ui.model.odata.v4.Context#isKeepAlive kept-alive}
+	 *       context of this binding (since 1.97.0),
+	 *     <li> {@link sap.ui.model.odata.v4.Context#isTransient transient} contexts of a
+	 *       {@link #getRootBinding root binding} (since 1.98.0),
+	 *     <li> {@link sap.ui.model.odata.v4.Context#delete deleted} contexts (since 1.108.0).
 	 *   </ul>
 	 *
 	 * @public
@@ -3706,10 +3732,6 @@ sap.ui.define([
 			return this;
 		}
 
-		if (this.iDeletedContexts) {
-			throw new Error("Cannot sort when delete requests are pending");
-		}
-
 		if (this.hasPendingChanges(true)) {
 			throw new Error("Cannot sort due to pending changes");
 		}
@@ -3761,11 +3783,11 @@ sap.ui.define([
 	 * @param {boolean} [aAggregation[].max]
 	 *   Measures only: Whether the maximum value (ignoring currencies or units of measure) for this
 	 *   measure is needed (since 1.55.0); filtering and sorting is supported in this case
-	 *   (since 1.58.0)
+	 *   (since 1.58.0), but shared requests are not (since 1.108.0)
 	 * @param {boolean} [aAggregation[].min]
 	 *   Measures only: Whether the minimum value (ignoring currencies or units of measure) for this
 	 *   measure is needed (since 1.55.0); filtering and sorting is supported in this case
-	 *   (since 1.58.0)
+	 *   (since 1.58.0), but shared requests are not (since 1.108.0)
 	 * @param {string} [aAggregation[].with]
 	 *   Measures only: The name of the method (for example "sum") used for aggregation of this
 	 *   measure; see "3.1.2 Keyword with" (since 1.55.0)

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

@@ -157,7 +157,7 @@ sap.ui.define([
 		 * @hideconstructor
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.107.1
+		 * @version 1.108.1
 		 */
 		ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 				constructor : constructor
@@ -1676,7 +1676,7 @@ sap.ui.define([
 	 * @param {string} sPropertyPath
 	 *   A path of a property in the OData data model, absolute or relative to <code>oContext</code>
 	 * @param {sap.ui.model.odata.v4.Context} oContext
-	 *   A context, used for building the path and for fetching key predicates
+	 *   A context, used for building the path and for determining the key predicate
 	 * @param {boolean} [bNoEditUrl]
 	 *   Whether no edit URL is required
 	 * @returns {sap.ui.base.SyncPromise}
@@ -2446,8 +2446,9 @@ sap.ui.define([
 	 * @param {string} sPropertyPath
 	 *   An absolute path to an OData property within the OData data model
 	 * @returns {string|undefined}
-	 *   The path of the property's unit or currency relative to the property's entity, or
-	 *   <code>undefined</code> in case the property has no associated unit or currency
+	 *   The path of the property's unit or currency relative to the (entity or complex) type which
+	 *   contains the original property, or <code>undefined</code> in case the property has no
+	 *   associated unit or currency
 	 *
 	 * @private
 	 */

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

@@ -218,7 +218,7 @@ sap.ui.define([
 		 * @extends sap.ui.model.Model
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.107.1
+		 * @version 1.108.1
 		 */
 		ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */{
@@ -379,9 +379,11 @@ sap.ui.define([
 		}
 		this.aPrerenderingTasks = null; // @see #addPrerenderingTask
 		this.fnOptimisticBatchEnabler = null;
-		this.oDataReceivedError = undefined; // the error for the next dataReceived event
-		// counts the fireDataRequested calls for which one event was fired
-		this.iDataRequestedCount = 0;
+		// maps the path to the error for the next dataReceived event
+		this.mPath2DataReceivedError = {};
+		// maps a path to the difference between fireDataRequested and fireDataReceived calls, to
+		// ensure the events are respectively fired once for a GET request
+		this.mPath2DataRequestedCount = {};
 	}
 
 	/**
@@ -411,27 +413,36 @@ sap.ui.define([
 
 	/**
 	 * The 'dataReceived' event is fired when the back-end data has been received on the client. It
-	 * is only fired for GET requests and is to be used by applications to process an error.
+	 * is only fired for GET requests and is to be used by applications to process an error. For
+	 * each 'dataRequested' event, a 'dataReceived' event is fired.
 	 *
-	 * If back-end requests are successful, the event has almost no parameters. For compatibility
+	 * If a back-end request is successful, the event has almost no parameters. For compatibility
 	 * with {@link sap.ui.model.Binding#event:dataReceived}, an event parameter
 	 * <code>data : {}</code> is provided: "In error cases it will be undefined", but otherwise it
-	 * is not.
+	 * is not. For additional property requests, the absolute path to the entity is also available.
+	 *
+	 * The 'dataReceived' event can be triggered by a binding or by additional property requests for
+	 * an entity that already has been requested. Events triggered by a binding may be bubbled up to
+	 * the model, while events triggered by additional property requests are fired directly by the
+	 * model.
 	 *
 	 * If a back-end request fails, the 'dataReceived' event provides an <code>Error</code> in the
-	 * 'error' event parameter.  If multiple requests are processed within a single $batch
+	 * 'error' event parameter. If multiple requests are processed within a single $batch
 	 * (or even a single change set), the order of 'dataReceived' events is not guaranteed. For
 	 * requests which are not processed because a previous request failed, <code>error.cause</code>
 	 * points to the root cause error - you should either ignore those events, or unwrap the error
-	 * to access the root cause immediately.
+	 * to access the root cause immediately. For additional property requests, the absolute path to
+	 * the entity is also available.
 	 *
 	 * @param {sap.ui.base.Event} oEvent
 	 * @param {object} oEvent.getParameters()
 	 * @param {object} [oEvent.getParameters().data]
 	 *   An empty data object if a back-end request succeeds
 	 * @param {Error} [oEvent.getParameters().error]
-	 *   The error object if a back-end request failed. If there are multiple failed back-end
-	 *   requests, the error of the first one is provided.
+	 *   The error object if a back-end request failed.
+	 * @param {string} [oEvent.getParameters().path]
+	 *   The absolute path to the entity which caused the event. The path is only provided for
+	 *   additional property requests; for other requests it is <code>undefined</code>.
 	 *
 	 * @event sap.ui.model.odata.v4.ODataModel#dataReceived
 	 * @public
@@ -443,7 +454,17 @@ sap.ui.define([
 
 	/**
 	 * The 'dataRequested' event is fired directly after data has been requested from a back end.
-	 * It is only fired for GET requests. Registered event handlers are called without parameters.
+	 * It is only fired for GET requests. For each 'dataRequested' event, a 'dataReceived' event is
+	 * fired.
+	 *
+	 * For additional property requests, the absolute path to the entity is available as an event
+	 * parameter.
+	 *
+	 * The 'dataRequested' event can be triggered by a binding or by additional property requests
+	 * for an entity that already has been requested.
+	 * Events triggered by a binding may be bubbled up to the model, while events triggered by
+	 * additional property requests are fired directly by the model. Every GET request caused by
+	 * additional properties is causing one 'dataRequested' event.
 	 *
 	 * There are two kinds of requests leading to such an event:
 	 * <ul>
@@ -456,6 +477,10 @@ sap.ui.define([
 	 * </ul>
 	 *
 	 * @param {sap.ui.base.Event} oEvent
+	 * @param {object} oEvent.getParameters()
+	 * @param {string} [oEvent.getParameters().path]
+	 *   The absolute path to the entity which caused the event. The path is only provided for
+	 *   additional property requests; for other requests it is <code>undefined</code>.
 	 *
 	 * @event sap.ui.model.odata.v4.ODataModel#dataRequested
 	 * @public
@@ -843,11 +868,14 @@ sap.ui.define([
 	 *   inherited from the model's parameter "sharedRequests", see
 	 *   {@link sap.ui.model.odata.v4.ODataModel#constructor}. Supported since 1.80.0
 	 *   <b>Note:</b> These bindings are read-only, so they may be especially useful for value
-	 *   lists; the following APIs are <b>not</b> allowed
+	 *   lists; state messages (since 1.108.0) and the following APIs are <b>not</b> allowed
 	 *   <ul>
 	 *     <li> for the list binding itself:
 	 *       <ul>
 	 *         <li> {@link sap.ui.model.odata.v4.ODataListBinding#create}
+	 *         <li> {@link sap.ui.model.odata.v4.ODataListBinding#getKeepAliveContext} or
+	 *           {@link #getKeepAliveContext} as far as it affects such a list binding
+	 *         <li> {@link sap.ui.model.odata.v4.ODataListBinding#resetChanges}
 	 *       </ul>
 	 *     <li> for the {@link sap.ui.model.odata.v4.ODataListBinding#getHeaderContext header
 	 *       context} of a list binding:
@@ -858,8 +886,12 @@ sap.ui.define([
 	 *       <ul>
 	 *         <li> {@link sap.ui.model.odata.v4.Context#delete}
 	 *         <li> {@link sap.ui.model.odata.v4.Context#refresh}
+	 *         <li> {@link sap.ui.model.odata.v4.Context#replaceWith}
 	 *         <li> {@link sap.ui.model.odata.v4.Context#requestSideEffects}
+	 *         <li> {@link sap.ui.model.odata.v4.Context#setKeepAlive}
 	 *         <li> {@link sap.ui.model.odata.v4.Context#setProperty}
+	 *         <li> executing a bound operation using <code>bReplaceWithRVC</code>, see
+	 *           {@link sap.ui.model.odata.v4.ODataContextBinding#execute}
 	 *       </ul>
 	 *     <li> for a dependent property binding of the list binding:
 	 *       <ul>
@@ -1210,7 +1242,7 @@ sap.ui.define([
 	 * Note: The parameters <code>mParameters</code>, <code>fnCallBack</code>, and
 	 * <code>bReload</code> from {@link sap.ui.model.Model#createBindingContext} are not supported.
 	 *
-	 * It is possible to create binding contexts pointing to metadata.  A '##' is recognized
+	 * It is possible to create binding contexts pointing to metadata. A '##' is recognized
 	 * as separator in the resolved path and splits it into two parts; note that '#' may also be
 	 * used as separator but is deprecated since 1.51.
 	 * The part before the separator is transformed into a metadata context (see
@@ -1555,43 +1587,49 @@ sap.ui.define([
 	};
 
 	/**
-	 * Fires the 'dataReceived' event. This function is only called from the property bindings for
-	 * late property requests. Bubbling up from the binding goes directly to fireEvent.
-	 *
-	 * Fire only one event, even when many late properties are requested (and each request calls
-	 * this function). Use the first response error.
+	 * Fires a 'dataReceived' event. This function is only called for additional property requests
+	 * for an entity that already has been requested. Bubbling up from a binding goes directly to
+	 * fireEvent.
 	 *
 	 * @param {Error} [oError]
-	 *   The error if the request failed
+	 *   The error if an additional property request failed
+	 * @param {string} [sPath]
+	 *   The absolute path to the entity
 	 *
 	 * @private
 	 */
-	ODataModel.prototype.fireDataReceived = function (oError) {
-		if (this.iDataRequestedCount === 0) {
+	ODataModel.prototype.fireDataReceived = function (oError, sPath) {
+		if (!(sPath in this.mPath2DataRequestedCount)) {
 			throw new Error("Received more data than requested");
 		}
-		this.iDataRequestedCount -= 1;
-		this.oDataReceivedError = this.oDataReceivedError || oError; // first error wins
-		if (this.iDataRequestedCount === 0) {
-			this.fireEvent("dataReceived",
-				this.oDataReceivedError ? {error : this.oDataReceivedError} : {data : {}});
-			this.oDataReceivedError = undefined;
+		this.mPath2DataRequestedCount[sPath] -= 1;
+		// first error wins
+		this.mPath2DataReceivedError[sPath] = this.mPath2DataReceivedError[sPath] || oError;
+		if (this.mPath2DataRequestedCount[sPath] === 0) {
+			this.fireEvent("dataReceived", this.mPath2DataReceivedError[sPath]
+				? {error : this.mPath2DataReceivedError[sPath], path : sPath}
+				: {data : {}, path : sPath});
+			delete this.mPath2DataReceivedError[sPath];
+			delete this.mPath2DataRequestedCount[sPath];
 		}
 	};
 
 	/**
-	 * Fires the 'dataRequested' event. This function is only called from the property bindings for
-	 * late property requests. Bubbling up from the binding goes directly to fireEvent.
+	 * Fires a 'dataRequested' event. This function is only called for additional property requests
+	 * for an entity that already has been requested. Bubbling up from a binding goes directly to
+	 * fireEvent.
 	 *
-	 * Fire only one event, even when many late properties are requested (and each request calls
-	 * this function).
+	 *  @param {string} [sPath]
+	 *   The absolute path to the entity
 	 *
 	 * @private
 	 */
-	ODataModel.prototype.fireDataRequested = function () {
-		this.iDataRequestedCount += 1;
-		if (this.iDataRequestedCount === 1) {
-			this.fireEvent("dataRequested");
+	ODataModel.prototype.fireDataRequested = function (sPath) {
+		if (sPath in this.mPath2DataRequestedCount) {
+			this.mPath2DataRequestedCount[sPath] += 1;
+		} else {
+			this.mPath2DataRequestedCount[sPath] = 1;
+			this.fireEvent("dataRequested", {path : sPath});
 		}
 	};
 
@@ -1959,10 +1997,11 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns <code>true</code> if there are pending changes, meaning updates or created entities
-	 * (see {@link sap.ui.model.odata.v4.ODataListBinding#create}) that have not yet been
-	 * successfully sent to the server. Since 1.98.0,
-	 * {@link sap.ui.model.odata.v4.Context#isInactive inactive} contexts are ignored.
+	 * Returns <code>true</code> if there are pending changes, which can be updates, created
+	 * entities (see {@link sap.ui.model.odata.v4.ODataListBinding#create}) or entity deletions
+	 * (see {@link sap.ui.model.odata.v4.Context#delete}) that have not yet been successfully sent
+	 * to the server. Since 1.98.0, {@link sap.ui.model.odata.v4.Context#isInactive inactive}
+	 * contexts are ignored.
 	 *
 	 * @param {string} [sGroupId]
 	 *   A group ID as specified in {@link sap.ui.model.odata.v4.ODataModel}, except group IDs
@@ -2400,7 +2439,7 @@ sap.ui.define([
 	 *
 	 * @function
 	 * @public
-	 * @see #getKeyPredicates
+	 * @see #getKeyPredicate
 	 * @since 1.107.0
 	 */
 	ODataModel.prototype.requestKeyPredicate = _Helper.createRequestMethod("fetchKeyPredicate");
@@ -2434,11 +2473,10 @@ sap.ui.define([
 	};
 
 	/**
-	 * Resets all property changes and created entities associated with the given group ID which
-	 * have not been successfully submitted via {@link #submitBatch}. Resets also invalid user
-	 * input for the same group ID. This function does not reset the deletion of entities
-	 * (see {@link sap.ui.model.odata.v4.Context#delete}) and the execution of OData operations
-	 * (see {@link sap.ui.model.odata.v4.ODataContextBinding#execute}).
+	 * Resets all property changes, created entities, and entity deletions associated with the given
+	 * group ID which have not been successfully submitted via {@link #submitBatch}. Resets also
+	 * invalid user input for the same group ID. This function does not reset the execution of OData
+	 * operations (see {@link sap.ui.model.odata.v4.ODataContextBinding#execute}).
 	 *
 	 * @param {string} [sGroupId]
 	 *   A valid group ID as specified in {@link sap.ui.model.odata.v4.ODataModel}. If it is