@openui5/sap.ui.core 1.103.1 → 1.106.0

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

@@ -58,7 +58,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.103.1
+		 * @version 1.106.0
 		 * @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
@@ -121,10 +121,13 @@ sap.ui.define([
 		// number of active (client-side) created contexts in aContexts
 		this.iActiveContexts = 0;
 		this.aApplicationFilters = _Helper.toArray(vFilters);
-		this.sChangeReason = oModel.bAutoExpandSelect && !mParameters.$$aggregation
+		this.sChangeReason = oModel.bAutoExpandSelect && !_Helper.isDataAggregation(mParameters)
 			? "AddVirtualContext"
 			: undefined;
+		// BEWARE: #doReplaceWith can insert a context w/ negative index, but w/o #created promise
+		// into aContexts' area of "created contexts"!
 		this.iCreatedContexts = 0; // number of (client-side) created contexts in aContexts
+		this.iDeletedContexts = 0; // number of (client-side) deleted contexts
 		this.oDiff = undefined;
 		this.aFilters = [];
 		this.sGroupId = mParameters.$$groupId;
@@ -264,7 +267,7 @@ sap.ui.define([
 	 *   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; w/o a lock this should be true
-	 * @returns {Promise}
+	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise which is resolved without a result in case of success, or rejected with an
 	 *   instance of <code>Error</code> in case of failure.
 	 * @throws {Error}
@@ -274,8 +277,10 @@ sap.ui.define([
 	 */
 	ODataListBinding.prototype._delete = function (oGroupLock, sEditUrl, oContext, oETagEntity,
 			bDoNotRequestCount) {
-		var bDestroy,
-			bFireChange = false,
+		// When deleting a context with negative index, iCreatedContexts et al. must be adjusted.
+		// However, when re-inserting, the context has lost its index. Beware: Do NOT use the
+		// created() promise, because doReplaceWith places a context w/o the promise here.
+		var bCreated = oContext.iIndex < 0,
 			sPath = oContext.iIndex === undefined
 				// context is not in aContexts -> use the predicate
 				? _Helper.getRelativePath(oContext.getPath(), this.oHeaderContext.getPath())
@@ -283,61 +288,56 @@ sap.ui.define([
 			bReadCount = false,
 			that = this;
 
-		return this.deleteFromCache(oGroupLock, sEditUrl, sPath, oETagEntity, bDoNotRequestCount,
-			function (iIndex, aEntities) {
-				var sContextPath, sPredicate, sResolvedPath, i$skipIndex, i;
+		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");
+		}
 
-				if (oContext.isKeepAlive()) {
-					oContext.resetKeepAlive(); // ensure that it is destroyed later
-					bDestroy = true;
-				}
-				if (oContext.created()) {
-					// happens only for a created context that is not transient anymore
-					that.destroyCreated(oContext);
-					bFireChange = true;
-				} else if (iIndex >= 0) {
-					// prepare all contexts for deletion
-					for (i = iIndex; i < that.aContexts.length; i += 1) {
-						oContext = that.aContexts[i];
-						if (oContext) {
-							that.mPreviousContextsByPath[oContext.getPath()] = oContext;
-						}
+		this.iDeletedContexts += 1;
+
+		return this.deleteFromCache(oGroupLock, sEditUrl, sPath, oETagEntity, bDoNotRequestCount,
+			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
+					// rows. -> Shift them and adjust the indexes
+					if (iOffset > 0) { // we're re-inserting
+						delete that.mPreviousContextsByPath[oContext.getPath()];
+						that.aContexts.splice(iIndex, 0, oContext);
+					} else { // we're deleting
+						that.mPreviousContextsByPath[oContext.getPath()] = oContext;
+						that.aContexts.splice(iIndex, 1);
+						oContext.iIndex = undefined;
+						// fire asynchronously so that multiple deletes only update the table once
+						Promise.resolve().then(function () {
+							that._fireChange({reason : ChangeReason.Remove});
+						});
 					}
-					sResolvedPath = that.getResolvedPath();
-					that.aContexts.splice(iIndex, 1); // adjust the contexts array
-					for (i = iIndex; i < that.aContexts.length; i += 1) {
-						if (that.aContexts[i]) {
-							i$skipIndex = i - that.iCreatedContexts;
-							// calculate the context path and try to re-use the context for it
-							sPredicate = _Helper.getPrivateAnnotation(aEntities[i], "predicate");
-							sContextPath = sResolvedPath + (sPredicate || "/" + i$skipIndex);
-							oContext = that.mPreviousContextsByPath[sContextPath];
-							if (oContext) {
-								delete that.mPreviousContextsByPath[sContextPath];
-								if (oContext.iIndex === i$skipIndex) {
-									oContext.checkUpdate(); // same row, but different data
-								} else {
-									oContext.iIndex = i$skipIndex; // same data, but different row
-								}
-							} else {
-								oContext
-									= Context.create(that.oModel, that, sContextPath, i$skipIndex);
-							}
-							that.aContexts[i] = oContext;
-						}
+					if (bCreated) {
+						that.iCreatedContexts += iOffset;
+						that.iActiveContexts += iOffset;
+					} else {
+						// iMaxLength is the number of server rows w/o the created entities
+						that.iMaxLength += iOffset; // this doesn't change Infinity
 					}
-					that.iMaxLength -= 1; // this doesn't change Infinity
-					bFireChange = true;
+					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;
 				}
-				// Do not destroy the context immediately to avoid timing issues with dependent
-				// bindings, keep it in mPreviousContextsByPath to destroy it later
 			}
 		).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;
@@ -345,18 +345,17 @@ sap.ui.define([
 				// 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.
-				bFireChange = iOldMaxLength !== that.iMaxLength;
-			}
-			// Fire the change asynchronously so that Cache#delete is finished and #getContexts can
-			// read the data synchronously. This is important for extended change detection.
-			// Without change event there is no destroyPreviousContexts and a kept-alive context
-			// must be destroyed here.
-			if (bFireChange) {
-				that._fireChange({reason : ChangeReason.Remove});
-			} else if (bDestroy) {
-				delete that.mPreviousContextsByPath[oContext.getPath()];
-				oContext.destroy();
+				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});
+			throw oError;
 		});
 	};
 
@@ -431,7 +430,10 @@ sap.ui.define([
 			if ("$apply" in mParameters) {
 				throw new Error("Cannot combine $$aggregation and $apply");
 			}
-			// Note: this validates mParameters.$$aggregation!
+			if (!sChangeReason) { // called from c'tor or #setAggregation
+				_AggregationHelper.validateAggregation(mParameters.$$aggregation, this.sPath,
+					this.oModel.oInterface.fetchMetadata, this.oModel.bAutoExpandSelect);
+			}
 			sApply = _AggregationHelper.buildApply(mParameters.$$aggregation).$apply;
 		}
 		this.mQueryOptions = this.oModel.buildQueryOptions(mParameters, true);
@@ -558,7 +560,12 @@ sap.ui.define([
 	 * If a back-end request fails, the 'dataReceived' event provides an <code>Error</code> in the
 	 * 'error' event parameter.
 	 *
+	 * Since 1.106 this event is bubbled up to the model, unless a listener calls
+	 * {@link sap.ui.base.Event#cancelBubble oEvent.cancelBubble()}.
+	 *
 	 * @param {sap.ui.base.Event} oEvent
+	 * @param {function} oEvent.cancelBubble
+	 *   A callback function to prevent that the event is bubbled up to the model
 	 * @param {object} oEvent.getParameters()
 	 * @param {object} [oEvent.getParameters().data]
 	 *   An empty data object if a back-end request succeeds
@@ -567,6 +574,7 @@ sap.ui.define([
 	 *
 	 * @event sap.ui.model.odata.v4.ODataListBinding#dataReceived
 	 * @public
+	 * @see sap.ui.model.odata.v4.ODataModel#event:dataReceived
 	 * @since 1.37.0
 	 */
 
@@ -576,10 +584,16 @@ sap.ui.define([
 	 * for example to switch on a busy indicator. Registered event handlers are called without
 	 * parameters.
 	 *
+	 * Since 1.106 this event is bubbled up to the model, unless a listener calls
+	 * {@link sap.ui.base.Event#cancelBubble oEvent.cancelBubble()}.
+	 *
 	 * @param {sap.ui.base.Event} oEvent
+	 * @param {function} oEvent.cancelBubble
+	 *   A callback function to prevent that the event is bubbled up to the model
 	 *
 	 * @event sap.ui.model.odata.v4.ODataListBinding#dataRequested
 	 * @public
+	 * @see sap.ui.model.odata.v4.ODataModel#event:dataRequested
 	 * @since 1.37.0
 	 */
 
@@ -868,7 +882,7 @@ sap.ui.define([
 				return;
 			}
 
-			that.destroyCreated(oContext);
+			that.removeCreated(oContext);
 			return Promise.resolve().then(function () {
 				// Fire the change asynchronously so that Cache#delete is finished and #getContexts
 				// can read the data synchronously. This is important for extended change detection.
@@ -1075,35 +1089,6 @@ sap.ui.define([
 		ListBinding.prototype.destroy.call(this);
 	};
 
-	/**
-	 * Removes the given context for a created entity from the list of contexts and destroys it
-	 * later so that the control has time to handle the context's dependent bindings before.
-	 *
-	 * @param {sap.ui.model.odata.v4.Context} oContext
-	 *   The context instance for the created entity to be destroyed
-	 *
-	 * @private
-	 */
-	ODataListBinding.prototype.destroyCreated = function (oContext) {
-		var iIndex = oContext.getModelIndex(),
-			i;
-
-		this.iCreatedContexts -= 1;
-		if (!oContext.isInactive()) {
-			this.iActiveContexts -= 1;
-		}
-		for (i = 0; i < iIndex; i += 1) {
-			this.aContexts[i].iIndex += 1;
-		}
-		if (!this.iCreatedContexts) {
-			this.bFirstCreateAtEnd = undefined;
-		}
-		this.aContexts.splice(iIndex, 1);
-		this.destroyLater(oContext);
-		// The path of all contexts in aContexts after the removed one is untouched, still points to
-		// the same data, hence no checkUpdate is needed.
-	};
-
 	/**
 	 * Destroys the given context later so that the control has time to handle the context's
 	 * dependent bindings before.
@@ -1128,9 +1113,9 @@ sap.ui.define([
 	 * Removes and destroys contexts from mPreviousContextsByPath.
 	 *
 	 * @param {string[]} [aPathsToDelete]
-	 *   If given, only contexts with paths in this list except kept-alive ones are removed and
-	 *   destroyed (transient contexts are removed only); otherwise all contexts in the list are
-	 *   removed and destroyed
+	 *   If given, only contexts with paths in this list except kept-alive and deleted ones are
+	 *   removed and destroyed (transient contexts are removed only); otherwise all contexts in the
+	 *   list are removed and destroyed
 	 *
 	 * @private
 	 */
@@ -1142,7 +1127,7 @@ sap.ui.define([
 				var oContext = mPreviousContextsByPath[sPath];
 
 				if (oContext) {
-					if (aPathsToDelete && oContext.isKeepAlive()) {
+					if (aPathsToDelete && (oContext.isKeepAlive() || oContext.isDeleted())) {
 						oContext.iIndex = undefined;
 					} else {
 						if (!oContext.isTransient()) {
@@ -1224,8 +1209,7 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataListBinding.prototype.doReplaceWith = function (oOldContext, oElement, sPredicate) {
-		var iIndex = oOldContext.iIndex,
-			bKeepAlive = oOldContext.isKeepAlive(),
+		var iModelIndex = oOldContext.getModelIndex(),
 			bNew,
 			fnOnBeforeDestroy = oOldContext.fnOnBeforeDestroy,
 			fnOnBeforeDestroyClone,
@@ -1239,21 +1223,21 @@ sap.ui.define([
 			if (oResult.iIndex !== undefined) {
 				throw new Error("Unexpected index: " + oResult);
 			}
-			oResult.iIndex = iIndex;
+			oResult.iIndex = oOldContext.iIndex;
 			delete this.mPreviousContextsByPath[sPath];
 		} else {
-			oResult = Context.create(this.oModel, this, sPath, iIndex);
+			oResult = Context.create(this.oModel, this, sPath, oOldContext.iIndex);
 			bNew = true;
 		}
-		oOldContext.iIndex = undefined;
-		if (iIndex === undefined) {
+		if (iModelIndex === undefined) { // => oOldContext.iIndex === undefined
 			this.mPreviousContextsByPath[sPath] = oResult;
 			this.oCache.addKeptElement(oElement);
 		} else {
-			this.aContexts[iIndex] = oResult;
-			this.oCache.doReplaceWith(iIndex, oElement);
+			oOldContext.iIndex = undefined;
+			this.aContexts[iModelIndex] = oResult;
+			this.oCache.doReplaceWith(iModelIndex, oElement);
 		}
-		if (bKeepAlive) {
+		if (oOldContext.isKeepAlive()) {
 			this.mPreviousContextsByPath[oOldContext.getPath()] = oOldContext;
 			if (bNew) {
 				if (fnOnBeforeDestroy) {
@@ -1263,7 +1247,7 @@ sap.ui.define([
 				}
 				oResult.setKeepAlive(true, fnOnBeforeDestroyClone);
 			}
-		} else {
+		} else { // Note: w/o a key predicate, oOldContext cannot be kept alive
 			this.destroyLater(oOldContext);
 		}
 		this._fireChange({reason : ChangeReason.Change});
@@ -1765,9 +1749,10 @@ sap.ui.define([
 	 *   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#setKeepAlive kept-alive} context of this binding.
+	 *   {@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.
+	 *   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.
 	 *
 	 * @public
 	 * @see sap.ui.model.ListBinding#filter
@@ -1782,11 +1767,16 @@ sap.ui.define([
 			throw new Error("Operation mode has to be sap.ui.model.odata.OperationMode.Server");
 		}
 
-		if (sFilterType === FilterType.Control && _Helper.deepEqual(aFilters, this.aFilters)
-				|| _Helper.deepEqual(aFilters, this.aApplicationFilters)) {
+		if (sFilterType === FilterType.Control
+				? _Helper.deepEqual(aFilters, this.aFilters)
+				: _Helper.deepEqual(aFilters, this.aApplicationFilters)) {
 			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");
 		}
@@ -1832,8 +1822,9 @@ sap.ui.define([
 	 * {@link #getCurrentContexts}, this method does not request any data from a back end and does
 	 * not change the binding's state. In contrast to {@link #getCurrentContexts}, it does not only
 	 * return those contexts that were last requested by a control, but all contexts that are
-	 * currently available in the binding, including kept-alive contexts. To filter out kept-alive
-	 * contexts that are not part of the list, you could check whether the index is
+	 * currently available in the binding, including
+	 * {@link sap.ui.model.odata.v4.Context#isKeepAlive kept-alive} contexts. To filter out
+	 * kept-alive contexts that are not part of the list, you could check whether the index is
 	 * <code>undefined</code>, as described in {@link sap.ui.model.odata.v4.Context#getIndex}.
 	 *
 	 * @returns {sap.ui.model.odata.v4.Context[]}
@@ -1960,6 +1951,7 @@ sap.ui.define([
 			bDataRequested = false,
 			bFireChange = false,
 			oGroupLock,
+			bPreventBubbling,
 			oPromise,
 			bRefreshEvent = !!this.sChangeReason, // ignored for "*VirtualContext"
 			sResolvedPath = this.getResolvedPath(),
@@ -2014,6 +2006,7 @@ sap.ui.define([
 				}
 				if (!that.isRootBindingSuspended()) {
 					// request data (before removing virtual context), but avoid E.C.D.
+					// (see BCP: 2270085692 for some interesting discussions)
 					that.bUseExtendedChangeDetection = false;
 					that.getContexts(iStart, iLength, iMaximumPrefetchSize);
 					that.bUseExtendedChangeDetection = bOld;
@@ -2050,14 +2043,15 @@ sap.ui.define([
 		oGroupLock = this.oReadGroupLock;
 		this.oReadGroupLock = undefined;
 		if (!this.oDiff) { // w/o E.C.D there won't be a diff
+			// before fetchContexts needing it and resolveRefreshPromise destroying it
+			bPreventBubbling = this.isRefreshWithoutBubbling();
 			// make sure "refresh" is followed by async "change"
 			oPromise = this.fetchContexts(iStart, iLength, iMaximumPrefetchSize, oGroupLock,
 				/*bAsync*/bRefreshEvent, function () {
 					bDataRequested = true;
-					that.fireDataRequested();
+					that.fireDataRequested(bPreventBubbling);
 				});
-			this.resolveRefreshPromise(oPromise);
-			oPromise.then(function (bChanged) {
+			this.resolveRefreshPromise(oPromise).then(function (bChanged) {
 				if (that.bUseExtendedChangeDetection) {
 					that.oDiff = {
 						aDiff : that.getDiff(iLength),
@@ -2072,12 +2066,13 @@ sap.ui.define([
 					}
 				}
 				if (bDataRequested) {
-					that.fireDataReceived({data : {}});
+					that.fireDataReceived({data : {}}, bPreventBubbling);
 				}
 			}, function (oError) {
 				// cache shares promises for concurrent read
 				if (bDataRequested) {
-					that.fireDataReceived(oError.canceled ? {data : {}} : {error : oError});
+					that.fireDataReceived(oError.canceled ? {data : {}} : {error : oError},
+						bPreventBubbling);
 				}
 				throw oError;
 			}).catch(function (oError) {
@@ -2373,7 +2368,7 @@ sap.ui.define([
 	/**
 	 * Returns the header context which allows binding to <code>$count</code>.
 	 *
-	 * @returns {sap.ui.model.odata.v4.Context}
+	 * @returns {sap.ui.model.odata.v4.Context|null}
 	 *   The header context or <code>null</code> if the binding is relative and has no context
 	 *
 	 * @public
@@ -2724,6 +2719,10 @@ 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
 			this.refreshSuspended(sGroupId);
@@ -2746,7 +2745,9 @@ sap.ui.define([
 					bKeepCacheOnError ? sGroupId : undefined);
 				oKeptElementsPromise = that.refreshKeptElements(sGroupId);
 				if (that.iCurrentEnd > 0) {
-					oPromise = that.createRefreshPromise().catch(function (oError) {
+					oPromise = that.createRefreshPromise(
+						/*bPreventBubbling*/bKeepCacheOnError
+					).catch(function (oError) {
 						if (!bKeepCacheOnError || oError.canceled) {
 							throw oError;
 						}
@@ -2781,8 +2782,8 @@ sap.ui.define([
 			}
 			// Note: after reset the dependent bindings cannot be found any more
 			aDependentBindings = that.getDependentBindings();
-			// this may reset that.oRefreshPromise
-			that.reset(ChangeReason.Refresh, bKeepCacheOnError ? false : undefined, sGroupId);
+			that.reset(ChangeReason.Refresh, !oCache || (bKeepCacheOnError ? false : undefined),
+				sGroupId); // this may reset that.oRefreshPromise
 			return SyncPromise.all(
 				refreshAll(aDependentBindings).concat(oPromise, oKeptElementsPromise)
 			).then(function () {
@@ -2815,7 +2816,7 @@ sap.ui.define([
 						that.mPreviousContextsByPath[that.getResolvedPath() + sPredicate]
 							.resetKeepAlive();
 					} else { // Note: implies oContext.created()
-						that.destroyCreated(that.aContexts[iIndex]);
+						that.removeCreated(that.aContexts[iIndex]);
 					}
 				});
 		}).catch(function (oError) {
@@ -2839,8 +2840,9 @@ sap.ui.define([
 	 *   destroyed, see {@link sap.ui.model.Context#destroy}.
 	 *   Supported since 1.55.0
 	 *
-	 *   A removed context is destroyed unless it is kept alive
-	 *   (see {@link sap.ui.model.odata.v4.Context#isKeepAlive}) and still exists on the server.
+	 *   A removed context is destroyed unless it is
+	 *   {@link sap.ui.model.odata.v4.Context#isKeepAlive kept alive} and still exists on the
+	 *   server.
 	 * @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.
@@ -2891,8 +2893,8 @@ sap.ui.define([
 				var iIndex = oContext.getModelIndex(),
 					i;
 
-				if (oContext.created()) {
-					that.destroyCreated(oContext);
+				if (oContext.iIndex < 0) {
+					that.removeCreated(oContext);
 					bDestroyed = true;
 				} else {
 					if (iIndex === undefined) { // -> bStillAlive === false
@@ -2965,6 +2967,38 @@ sap.ui.define([
 		});
 	};
 
+	/**
+	 * Removes the given context for a created entity from the list of contexts and - unless it is
+	 * kept alive - destroys it later so that the control has time to handle the context's dependent
+	 * bindings before.
+	 *
+	 * @param {sap.ui.model.odata.v4.Context} oContext
+	 *   The context instance for the created entity to be destroyed
+	 *
+	 * @private
+	 */
+	ODataListBinding.prototype.removeCreated = function (oContext) {
+		var iIndex = oContext.getModelIndex(),
+			i;
+
+		this.iCreatedContexts -= 1;
+		if (!oContext.isInactive()) {
+			this.iActiveContexts -= 1;
+		}
+		for (i = 0; i < iIndex; i += 1) {
+			this.aContexts[i].iIndex += 1;
+		}
+		if (!this.iCreatedContexts) {
+			this.bFirstCreateAtEnd = undefined;
+		}
+		this.aContexts.splice(iIndex, 1);
+		if (!oContext.isKeepAlive()) {
+			this.destroyLater(oContext);
+		}
+		// The path of all contexts in aContexts after the removed one is untouched, still points to
+		// the same data, hence no checkUpdate is needed.
+	};
+
 	/**
 	 * Requests the entities for the given index range of the binding's collection and resolves with
 	 * the corresponding contexts.
@@ -3056,7 +3090,7 @@ sap.ui.define([
 	 *   A callback function to filter only relevant messages. The callback returns whether the
 	 *   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>}
+	 * @returns {Promise<sap.ui.model.Filter|null>}
 	 *   A Promise that resolves with a {@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
@@ -3114,9 +3148,6 @@ sap.ui.define([
 		var aContexts,
 			bMissingPredicate,
 			oModel = this.oModel,
-			// Hash set of collection-valued navigation property meta paths (relative to the cache's
-			// root) which need to be refreshed, maps string to <code>true</code>
-			mNavigationPropertyPaths = {},
 			aPredicates,
 			aPromises,
 			// since this is called from a context or a parent binding, the binding is resolved
@@ -3159,7 +3190,7 @@ sap.ui.define([
 				aContexts = [oContext];
 			} else {
 				aContexts = this.getCurrentContexts().filter(function (oContext0) {
-					return !oContext0.isTransient();
+					return oContext0 && !oContext0.isTransient();
 				});
 				// add kept-alive contexts outside collection
 				Object.keys(this.mPreviousContextsByPath).forEach(function (sPath) {
@@ -3178,11 +3209,10 @@ sap.ui.define([
 			});
 			if (!bMissingPredicate) {
 				aPromises = this.oCache
-					? [this.oCache.requestSideEffects(this.lockGroup(sGroupId),
-						aPaths, mNavigationPropertyPaths, aPredicates, bSingle)]
+					? [this.oCache.requestSideEffects(this.lockGroup(sGroupId), aPaths, aPredicates,
+						bSingle)]
 					: []; // can happen if invoked via absolute side effect
-				this.visitSideEffects(sGroupId, aPaths, bSingle ? oContext : undefined,
-					mNavigationPropertyPaths, aPromises);
+				this.visitSideEffects(sGroupId, aPaths, bSingle ? oContext : undefined, aPromises);
 
 				return SyncPromise.all(aPromises.map(reportError)).then(function () {
 					return that.refreshDependentListBindingsWithoutCache();
@@ -3367,7 +3397,7 @@ sap.ui.define([
 	 *
 	 * @param {object} [oAggregation]
 	 *   An object holding the information needed for data aggregation; see also
-	 *   <a href="http://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/">OData
+	 *   <a href="https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/">OData
 	 *   Extension for Data Aggregation Version 4.0</a>. Since 1.76.0, <code>undefined</code> can be
 	 *   used to remove the data aggregation object, which allows to set <code>$apply</code>
 	 *   explicitly afterwards. <code>null</code> is not supported.<br>
@@ -3375,7 +3405,11 @@ sap.ui.define([
 	 *   used to turn on the handling of grand totals like in 1.84.0, using aggregates of aggregates
 	 *   and thus allowing to filter by aggregated properties while grand totals are needed. Beware
 	 *   that methods like "average" or "countdistinct" are not compatible with this approach, and
-	 *   it cannot be combined with group levels.
+	 *   it cannot be combined with group levels.<br>
+	 *   Since 1.105.0, either a recursive hierarchy or pure data aggregation is supported, but no
+	 *   mix; <code>hierarchyQualifier</code> is the leading property that decides between those two
+	 *   use cases - this is an <b>experimental API</b> and is only supported if the model uses the
+	 *   <code>autoExpandSelect</code> parameter!
 	 * @param {object} [oAggregation.aggregate]
 	 *   A map from aggregatable property names or aliases to objects containing the following
 	 *   details:
@@ -3397,6 +3431,9 @@ sap.ui.define([
 	 *       there is only one, or <code>null</code> otherwise ("multi-unit situation"). (SQL
 	 *       suggestion: <code>CASE WHEN MIN(Unit) = MAX(Unit) THEN MIN(Unit) END</code>)
 	 *   </ul>
+	 * @param {number} [oAggregation.expandTo=1]
+	 *   The number of initially expanded levels as a positive integer (@experimental as of version
+	 *   1.105.0), supported only if a <code>hierarchyQualifier</code> is given.
 	 * @param {boolean} [oAggregation.grandTotalAtBottomOnly]
 	 *   Tells whether the grand totals for aggregatable properties are displayed at the bottom only
 	 *   (since 1.86.0); <code>true</code> for bottom only, <code>false</code> for top and bottom,
@@ -3414,10 +3451,17 @@ sap.ui.define([
 	 *   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".
+	 * @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".
 	 * @param {string} [oAggregation.search]
-	 *   Like the <a
-	 *   href="https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part2-url-conventions.html">
-	 *   "5.1.7 System Query Option $search"</a>, but applied before data aggregation
+	 *   Like the <a href=
+	 *   "https://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part2-url-conventions.html#_Search_System_Query"
+	 *   >"5.1.7 System Query Option $search"</a>, but applied before data aggregation
 	 *   (since 1.93.0). Note that certain content will break the syntax of the system query option
 	 *   <code>$apply</code> and result in an invalid request. If the OData service supports the
 	 *   proposal <a href="https://issues.oasis-open.org/browse/ODATA-1452">ODATA-1452</a>, then
@@ -3433,8 +3477,11 @@ sap.ui.define([
 	 *   <ul>
 	 *     <li> the given data aggregation object is unsupported,
 	 *     <li> the <code>$apply</code> system query option has been specified explicitly before,
-	 *     <li> the binding has a kept-alive context,
-	 *     <li> there are pending changes
+	 *     <li> the binding has a {@link sap.ui.model.odata.v4.Context#isKeepAlive kept-alive}
+	 *       context,
+	 *     <li> there are pending changes,
+	 *     <li> a recursive hierarchy is requested, but the model does not use the
+	 *       <code>autoExpandSelect</code> parameter.
 	 *   </ul>
 	 * @example <caption>First group level is product category including subtotals for the net
 	 *     amount in display currency. On leaf level, transaction currency is used as an additional
@@ -3566,13 +3613,18 @@ sap.ui.define([
 	 *   the dynamic sorters.
 	 * @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#setKeepAlive 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.
+	 * @throws {Error} If
+	 *   <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.
+	 *   </ul>
 	 *
 	 * @public
 	 * @see sap.ui.model.ListBinding#sort
@@ -3590,6 +3642,10 @@ 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");
 		}
@@ -3624,8 +3680,8 @@ sap.ui.define([
 	 *
 	 * @param {object[]} aAggregation
 	 *   An array with objects holding the information needed for data aggregation; see also
-	 *   <a href="http://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/">OData Extension
-	 *   for Data Aggregation Version 4.0</a>
+	 *   <a href="https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/">OData
+	 *   Extension for Data Aggregation Version 4.0</a>
 	 * @param {string} aAggregation[].name
 	 *   The name of an OData property. A property which is neither a dimension nor a measure, but
 	 *   for instance a text property or in some cases a unit property, has no further details.