@openui5/sap.ui.core 1.122.1 → 1.123.1

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

@@ -131,7 +131,7 @@ sap.ui.define([
 			throw new Error("Completed more PATCH requests than sent");
 		}
 		this.iPatchCounter -= 1;
-		this.bPatchSuccess = this.bPatchSuccess && bSuccess;
+		this.bPatchSuccess &&= bSuccess;
 		if (this.iPatchCounter === 0) {
 			this.fireEvent("patchCompleted", {success : this.bPatchSuccess});
 			this.bPatchSuccess = true;
@@ -296,10 +296,10 @@ sap.ui.define([
 							}
 							return true;
 						case "$expand":
-							mAggregatedQueryOptions.$expand = mAggregatedQueryOptions.$expand || {};
+							mAggregatedQueryOptions.$expand ??= {};
 							return Object.keys(mQueryOptions0.$expand).every(mergeExpandPath);
 						case "$select":
-							mAggregatedQueryOptions.$select = mAggregatedQueryOptions.$select || [];
+							mAggregatedQueryOptions.$select ??= [];
 							return mQueryOptions0.$select.every(mergeSelectPath);
 						default:
 							if (bAdd) {
@@ -398,8 +398,8 @@ sap.ui.define([
 				sChangeReason = ChangeReason.Filter;
 			} else if (sName === "$orderby" && sChangeReason !== ChangeReason.Filter) {
 				sChangeReason = ChangeReason.Sort;
-			} else if (!sChangeReason) {
-				sChangeReason = ChangeReason.Change;
+			} else {
+				sChangeReason ??= ChangeReason.Change;
 			}
 		}
 
@@ -1069,7 +1069,7 @@ sap.ui.define([
 			return _Helper.getQueryOptionsForPath(this.getQueryOptionsFromParameters(), sPath);
 		}
 
-		oContext = oContext || this.oContext;
+		oContext ??= this.oContext;
 		// oContext is always set; as getQueryOptionsForPath is called only from ODLB#doCreateCache
 		// binding has no parameters -> no own query options
 		if (!this.bRelative || !oContext.getQueryOptionsForPath) {
@@ -1343,7 +1343,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Resumes this binding. The binding can again fire change events and trigger data service
+	 * Resumes this binding. The binding can again fire change events and initiate data service
 	 * requests.
 	 *
 	 * @param {boolean} bAsPrerenderingTask
@@ -1390,7 +1390,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Resumes this binding. The binding can then again fire change events and trigger data service
+	 * Resumes this binding. The binding can then again fire change events and initiate data service
 	 * requests.
 	 * Before 1.53.0, this method was not supported and threw an error.
 	 *
@@ -1452,7 +1452,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Suspends this binding. A suspended binding does not fire change events nor does it trigger
+	 * Suspends this binding. A suspended binding does not fire change events nor does it initiate
 	 * data service requests. Call {@link #resume} to resume the binding. Before 1.53.0, this method
 	 * was not supported and threw an error. 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

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

@@ -42,7 +42,7 @@ sap.ui.define([
 		 * @mixes sap.ui.model.odata.v4.ODataBinding
 		 * @public
 		 * @since 1.37.0
-		 * @version 1.122.1
+		 * @version 1.123.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
@@ -226,7 +226,7 @@ sap.ui.define([
 	 * type information.
 	 * If the binding's path cannot be resolved or if reading the binding's value fails or if the
 	 * value read is invalid (e.g. not a primitive value), the binding's value is reset to
-	 * <code>undefined</code>. As described above, this may trigger a change event depending on the
+	 * <code>undefined</code>. As described above, this may initiate a change event depending on the
 	 * previous value and the <code>bForceUpdate</code> parameter. In the end the data state is
 	 * checked (see {@link sap.ui.model.PropertyBinding#checkDataState}) even if there is no change
 	 * event. If there are multiple synchronous <code>checkUpdateInternal</code> calls the data
@@ -341,8 +341,7 @@ sap.ui.define([
 			});
 			if (bForceUpdate && vValue.isFulfilled()) {
 				if (vType && vType.isFulfilled && vType.isFulfilled()) {
-					PropertyBinding.prototype.setType
-						.call(this, vType.getResult(), this.sInternalType);
+					this.doSetType(vType.getResult());
 				}
 				this.vValue = vValue.getResult();
 			}
@@ -356,7 +355,7 @@ sap.ui.define([
 
 			if (oCallToken === that.oCheckUpdateCallToken) { // latest call to checkUpdateInternal
 				that.oCheckUpdateCallToken = undefined;
-				PropertyBinding.prototype.setType.call(that, oType, that.sInternalType);
+				that.doSetType(oType);
 				if (oCallToken.forceUpdate || that.vValue !== vValue) {
 					that.bInitial = false;
 					that.vValue = vValue;
@@ -423,6 +422,19 @@ sap.ui.define([
 		return this.isRoot() ? this.mQueryOptions : undefined;
 	};
 
+	/**
+	 * Sets the given type for this binding while keeping its internal type.
+	 *
+	 * @param {sap.ui.model.Type} oType
+	 *   The type for this binding
+	 *
+	 * @private
+	 * @see sap.ui.model.PropertyBinding#setType
+	 */
+	ODataPropertyBinding.prototype.doSetType = function (oType) {
+		PropertyBinding.prototype.setType.call(this, oType, this.sInternalType);
+	};
+
 	/**
 	 * @override
 	 * @see sap.ui.model.odata.v4.ODataBinding#getDependentBindings
@@ -673,7 +685,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Sets the (base) context if the binding path is relative. Triggers (@link #fetchCache) to
+	 * Sets the (base) context if the binding path is relative. Invokes (@link #fetchCache) to
 	 * create a cache and {@link #checkUpdate} to check for the current value if the
 	 * context has changed. In case of absolute bindings nothing is done.
 	 *
@@ -695,7 +707,7 @@ sap.ui.define([
 						// Note: this.oType => this.sReducedPath
 						&& _Helper.getMetaPath(this.oModel.resolve(this.sPath, oContext))
 							!== _Helper.getMetaPath(this.sReducedPath)) {
-						PropertyBinding.prototype.setType.call(this, undefined, this.sInternalType);
+						this.doSetType(undefined);
 					}
 					this.sReducedPath = undefined;
 				}
@@ -746,7 +758,7 @@ sap.ui.define([
 	 * {@link sap.ui.model.odata.v4.ODataModel#event:propertyChange 'propertyChange'} event is
 	 * fired and provides a promise on the outcome of the asynchronous operation. Since 1.122.0
 	 * this method allows updates to the client-side annotation "@$ui5.context.isSelected". Note:
-	 * Changing the value of a client-side annotation never triggers a PATCH request, no matter
+	 * Changing the value of a client-side annotation never initiates a PATCH request, no matter
 	 * which <code>sGroupId</code> is given. Thus, it cannot be reverted via {@link #resetChanges}.
 	 *
 	 * @param {any} vValue

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

@@ -25,7 +25,7 @@ sap.ui.define(function () {
 		API : "API",
 
 		/**
-		 * Requests associated with the group ID are sent in a batch request which is triggered
+		 * Requests associated with the group ID are sent in a batch request which is initiated
 		 * automatically before rendering.
 		 * @public
 		 */

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

@@ -176,6 +176,7 @@ sap.ui.define([
 		return SyncPromise.resolve(
 			this.oRequestor.request("DELETE", sEditUrl, oGroupLock, {"If-Match" : oElement})
 		).then(() => {
+			this.oTreeState.delete(oElement);
 			// the element might have moved due to parallel insert/delete
 			iIndex = _Cache.getElementIndex(this.aElements, sPredicate, iIndex);
 			// remove in parent cache
@@ -402,6 +403,7 @@ sap.ui.define([
 				_Helper.getPrivateAnnotation(aElements[i], "transientPredicate")];
 		}
 		const aSpliced = aElements.splice(iIndex + 1, iCount);
+		aSpliced.$level = oGroupNode["@$ui5.node.level"];
 		aSpliced.$rank = _Helper.getPrivateAnnotation(oGroupNode, "rank");
 		_Helper.setPrivateAnnotation(oGroupNode, "spliced", aSpliced);
 		aElements.$count -= iCount;
@@ -554,7 +556,7 @@ sap.ui.define([
 			if (oCache === this.oFirstLevel && this.oAggregation.expandTo > 1) {
 				const [iRank] = await Promise.all([
 					this.requestRank(oEntityData, oGroupLock),
-					this.requestNodeProperty(oEntityData, oGroupLock)
+					this.requestNodeProperty(oEntityData, oGroupLock, /*bDropFilter*/true)
 				]);
 
 				oCache.removeElement(0, sTransientPredicate);
@@ -565,7 +567,7 @@ sap.ui.define([
 				_Helper.setPrivateAnnotation(oEntityData, "rank", iRank);
 				this.shiftRank(iIndex, +1);
 			} else {
-				await this.requestNodeProperty(oEntityData, oGroupLock);
+				await this.requestNodeProperty(oEntityData, oGroupLock, /*bDropFilter*/true);
 			}
 
 			return oEntityData;
@@ -588,7 +590,7 @@ sap.ui.define([
 	_AggregationCache.prototype.createGroupLevelCache = function (oGroupNode, bHasConcatHelper) {
 		var oAggregation = this.oAggregation,
 			iLevel = oGroupNode ? oGroupNode["@$ui5.node.level"] + 1 : 1,
-			aAllProperties, oCache, aGroupBy, bLeaf, mQueryOptions, bTotal;
+			aAllProperties, oCache, aGroupBy, bLeaf, sParentFilter, mQueryOptions, bTotal;
 
 		if (oAggregation.hierarchyQualifier) {
 			mQueryOptions = Object.assign({}, this.mQueryOptions);
@@ -605,8 +607,8 @@ sap.ui.define([
 			});
 		}
 		if (oGroupNode) {
-			const sParentFilter = _Helper.getPrivateAnnotation(oGroupNode, "filter")
-				|| _Helper.getKeyFilter(oGroupNode, oAggregation.$metaPath, this.getTypes());
+			sParentFilter = _Helper.getPrivateAnnotation(oGroupNode, "filter")
+				|| _Helper.getKeyFilter(oGroupNode, this.sMetaPath, this.getTypes());
 			// Note: parent filter is just eq/and, no need for parentheses, but
 			// $$filterBeforeAggregate is a black box! Put specific filter 1st for performance!
 			mQueryOptions.$$filterBeforeAggregate = sParentFilter
@@ -625,6 +627,9 @@ sap.ui.define([
 			? _AggregationCache.calculateKeyPredicateRH.bind(null, oGroupNode, oAggregation)
 			: _AggregationCache.calculateKeyPredicate.bind(null, oGroupNode, aGroupBy,
 				aAllProperties, bLeaf, bTotal);
+		if (sParentFilter) {
+			oCache.$parentFilter = sParentFilter;
+		}
 
 		return oCache;
 	};
@@ -672,7 +677,7 @@ sap.ui.define([
 			this.aElements.$byPredicate = aOldElements.$byPredicate;
 			iCount = aSpliced.length;
 			this.aElements.$count = aOldElements.$count + iCount;
-			const iLevelDiff = oGroupNode["@$ui5.node.level"] + 1 - aSpliced[0]["@$ui5.node.level"];
+			const iLevelDiff = oGroupNode["@$ui5.node.level"] - aSpliced.$level;
 			const iRankDiff = _Helper.getPrivateAnnotation(oGroupNode, "rank") - aSpliced.$rank;
 			aSpliced.forEach(function (oElement) {
 				var sPredicate = _Helper.getPrivateAnnotation(oElement, "predicate");
@@ -825,7 +830,7 @@ sap.ui.define([
 			return oPromise;
 		}
 
-		const sFilter = _Helper.getKeyFilter(oNode, this.oAggregation.$metaPath, this.getTypes());
+		const sFilter = _Helper.getKeyFilter(oNode, this.sMetaPath, this.getTypes());
 		const mQueryOptions = Object.assign({}, this.mQueryOptions);
 		mQueryOptions.$apply = "ancestors($root" + this.oAggregation.$path
 			+ "," + this.oAggregation.hierarchyQualifier + "," + this.oAggregation.$NodeProperty
@@ -853,7 +858,7 @@ sap.ui.define([
 				const [iRank] = await Promise.all([
 					this.requestRank(oParent, oGroupLock),
 					this.requestProperties(oParent, aSelect, oGroupLock, true),
-					this.requestNodeProperty(oParent, oGroupLock)
+					this.requestNodeProperty(oParent, oGroupLock, /*bDropFilter*/false)
 				]);
 
 				// Note: overridden by _AggregationCache.calculateKeyPredicateRH
@@ -1108,14 +1113,27 @@ sap.ui.define([
 		oRankResult.value.forEach((oNode) => {
 			mPredicate2RankResult[getPredicate(oNode)] = oNode;
 		});
+		// all nodes are considered in place until they are found to still have the same parent
+		const oPredicatesNowInPlace = new Set(this.oTreeState.getOutOfPlacePredicates());
 
 		// import data
 		aNodeResults.forEach((oNodeResult) => {
 			oNodeResult.value.forEach((oNode) => {
 				const sPredicate = getPredicate(oNode);
+				oPredicatesNowInPlace.delete(sPredicate); // still the same parent
 				if (this.aElements.$byPredicate[sPredicate]) {
 					return; // already read with the in-place request
 				}
+				const sParentPredicate = this.oTreeState.getOutOfPlace(sPredicate).parentPredicate;
+				const oParent = mPredicate2RankResult[sParentPredicate];
+				if (oParent) { // parent has a rank
+					const sDrillState = _Helper.drillDown(oParent, this.oAggregation.$DrillState);
+					if (sDrillState === "collapsed") {
+						return; // parent is collapsed -> do not insert
+					}
+				} else if (sParentPredicate) { // parent has no rank
+					return; // do not insert
+				} // else: no parent (root) -> insert
 				_Helper.merge(oNode, mPredicate2RankResult[sPredicate]);
 				// Note: overridden by _AggregationCache.calculateKeyPredicateRH
 				this.oFirstLevel.calculateKeyPredicate(oNode, this.getTypes(), this.sMetaPath);
@@ -1124,6 +1142,8 @@ sap.ui.define([
 			});
 		});
 
+		oPredicatesNowInPlace.forEach((sPredicate) => this.oTreeState.deleteOutOfPlace(sPredicate));
+
 		this.oTreeState.getOutOfPlaceGroupedByParent().forEach((oOutOfPlace) => {
 			// move the out-of-place nodes in creation order
 			const oParentRankResult = mPredicate2RankResult[oOutOfPlace.parentPredicate];
@@ -1285,25 +1305,17 @@ sap.ui.define([
 				/*fnSubmit*/null, function fnCancel() { /*nothing to do*/ }),
 			oReadPromise
 		]).then(([oPatchResult, iPreorderRank]) => {
-			const updateChildNode = () => {
+			const updateChildNode = (oAdditional = {}) => {
 				// update the cache with the PATCH response (Note: "@odata.etag" is optional!)
 				_Helper.updateExisting(this.mChangeListeners, sChildPredicate, oChildNode, {
 					"@odata.etag" : oPatchResult["@odata.etag"],
-					"@$ui5.node.level" : oParentNode ? oParentNode["@$ui5.node.level"] + 1 : 1
+					"@$ui5.node.level" : oParentNode ? oParentNode["@$ui5.node.level"] + 1 : 1,
+					...oAdditional
 				});
 			};
-			const iOldIndex = this.aElements.indexOf(oChildNode);
 			let iResult = 1;
 
 			if (this.oAggregation.expandTo > 1) {
-				const iOffset = _Helper.getPrivateAnnotation(oChildNode, "descendants", 0) + 1;
-				this.adjustDescendantCount(oChildNode, iOldIndex, -iOffset);
-				this.shiftRank(iOldIndex, -iOffset);
-				this.aElements.splice(iOldIndex, 1);
-				this.oFirstLevel.move(_Helper.getPrivateAnnotation(oChildNode, "rank"),
-					iPreorderRank, iOffset);
-				updateChildNode();
-				_Helper.setPrivateAnnotation(oChildNode, "rank", iPreorderRank);
 				switch (oParentNode ? oParentNode["@$ui5.node.isExpanded"] : true) {
 					case false:
 						iResult = this.expand(_GroupLock.$cached, sParentPredicate).unwrap() + 1;
@@ -1315,14 +1327,24 @@ sap.ui.define([
 						_Helper.updateAll(this.mChangeListeners, sParentPredicate, oParentNode,
 							{"@$ui5.node.isExpanded" : true}); // not a leaf anymore
 				}
-				const iNewIndex = this.aElements.indexOf(oParentNode) + 1; // 0 w/o oParentNode :-)
+				// Note: iOldIndex might be affected by #expand above
+				const iOldIndex = this.aElements.indexOf(oChildNode);
+				const iOffset = _Helper.getPrivateAnnotation(oChildNode, "descendants", 0) + 1;
+				this.adjustDescendantCount(oChildNode, iOldIndex, -iOffset);
+				this.aElements.splice(iOldIndex, 1);
+				const iOldRank = _Helper.getPrivateAnnotation(oChildNode, "rank");
+				this.shiftRankForMove(iOldRank, iOffset, iPreorderRank);
+				this.oFirstLevel.move(iOldRank, iPreorderRank, iOffset);
+				updateChildNode({"@$ui5.context.isTransient" : undefined});
+				_Helper.setPrivateAnnotation(oChildNode, "rank", iPreorderRank);
+				const iNewIndex = this.getArrayIndex(iPreorderRank);
 				this.aElements.splice(iNewIndex, 0, oChildNode);
-				this.shiftRank(iNewIndex, +iOffset);
 				this.adjustDescendantCount(oChildNode, iNewIndex, +iOffset);
 
-				return iResult;
+				return [iResult, iNewIndex];
 			}
 
+			const iOldIndex = this.aElements.indexOf(oChildNode);
 			// remove original element from its cache's collection
 			const oOldParentCache = _Helper.getPrivateAnnotation(oChildNode, "parent");
 			oOldParentCache.removeElement(_Helper.getPrivateAnnotation(oChildNode, "rank", 0),
@@ -1381,7 +1403,7 @@ sap.ui.define([
 				}
 			}
 
-			return iResult;
+			return [iResult];
 		});
 	};
 
@@ -1403,9 +1425,18 @@ sap.ui.define([
 				(oNode) => _Helper.getPrivateAnnotation(oNode, "rank") === iParentRank);
 		aOutOfPlacePredicates.forEach((sNodePredicate) => {
 			const oNode = this.aElements.$byPredicate[sNodePredicate];
-			const iNodeIndex = this.aElements.indexOf(oNode);
-			this.aElements.splice(iNodeIndex, 1);
-			this.aElements.splice(iParentIndex + 1, 0, oNode);
+			if (oNode) {
+				const bExpanded = oNode["@$ui5.node.isExpanded"];
+				if (bExpanded) {
+					this.collapse(sNodePredicate);
+				}
+				const iNodeIndex = this.aElements.indexOf(oNode);
+				this.aElements.splice(iNodeIndex, 1);
+				this.aElements.splice(iParentIndex + 1, 0, oNode);
+				if (bExpanded) {
+					this.expand(_GroupLock.$cached, sNodePredicate);
+				}
+			}
 		});
 	};
 
@@ -1625,7 +1656,7 @@ sap.ui.define([
 		// "before the given range"
 		// after a side-effects refresh out-of-place nodes may shift the visible range, we have
 		// to read as many nodes before this range to be on the safe side
-		iPrefetchLength += this.oTreeState.getOutOfPlaceCount();
+		iPrefetchLength = Math.max(iPrefetchLength, this.oTreeState.getOutOfPlaceCount());
 		if (iStart > iPrefetchLength) {
 			iLength += iPrefetchLength;
 			iStart -= iPrefetchLength;
@@ -1634,9 +1665,13 @@ sap.ui.define([
 			iStart = 0;
 		}
 
+		// Note: this.oFirstLevel.read changes this value
+		const bSentRequest = this.oFirstLevel.bSentRequest;
+
 		return SyncPromise.all([
 				this.oFirstLevel.read(iStart, iLength, 0, oGroupLock, fnDataRequested),
-				...this.requestOutOfPlaceNodes(oGroupLock)
+				// request out-of-place nodes only once
+				...(bSentRequest ? [] : this.requestOutOfPlaceNodes(oGroupLock))
 			]).then(function ([oResult, ...aOutOfPlaceResults]) {
 				// Note: this code must be idempotent, it might well run twice!
 				var oGrandTotal,
@@ -1674,13 +1709,11 @@ sap.ui.define([
 
 				that.addElements(oResult.value, iStart + iOffset, that.oFirstLevel, iStart);
 				for (j = 0; j < that.aElements.$count; j += 1) {
-					if (!that.aElements[j]) {
-						that.aElements[j] = _AggregationHelper.createPlaceholder(
-							that.oAggregation.expandTo > 1 || that.bUnifiedCache
-								? /*don't know*/0
-								: 1,
-							j - iOffset, that.oFirstLevel);
-					}
+					that.aElements[j] ??= _AggregationHelper.createPlaceholder(
+						that.oAggregation.expandTo > 1 || that.bUnifiedCache
+							? /*don't know*/0
+							: 1,
+						j - iOffset, that.oFirstLevel);
 				}
 
 				that.handleOutOfPlaceNodes(aOutOfPlaceResults);
@@ -1799,18 +1832,23 @@ sap.ui.define([
 	 * @param {sap.ui.model.odata.v4.lib._GroupLock} oGroupLock
 	 *   An original lock for the group ID to be used for the GET request, to be cloned via
 	 *   {@link sap.ui.model.odata.v4.lib._GroupLock#getUnlockedCopy}
+	 * @param {boolean} [bDropFilter]
+	 *   Whether to drop the list's filter from the request in order to support out-of-place nodes
+	 *   outside the list's current collection
 	 * @returns {Promise<void>}
 	 *   A promise which is resolved without a defined result in case of success, or
 	 *   rejected in case of an error
 	 *
 	 * @private
 	 */
-	_AggregationCache.prototype.requestNodeProperty = async function (oElement, oGroupLock) {
+	_AggregationCache.prototype.requestNodeProperty = async function (oElement, oGroupLock,
+			bDropFilter) {
 		if (_Helper.drillDown(oElement, this.oAggregation.$NodeProperty) !== undefined) {
 			return; // already available
 		}
 
-		await this.requestProperties(oElement, [this.oAggregation.$NodeProperty], oGroupLock, true);
+		await this.requestProperties(oElement, [this.oAggregation.$NodeProperty], oGroupLock, true,
+			bDropFilter);
 	};
 
 	/**
@@ -1864,6 +1902,9 @@ sap.ui.define([
 	 *   {@link sap.ui.model.odata.v4.lib._GroupLock#getUnlockedCopy}
 	 * @param {boolean} [bInheritResult]
 	 *   Whether the result is inherited in the given element
+	 * @param {boolean} [bDropFilter]
+	 *   Whether to drop the list's filter from the request in order to support out-of-place nodes
+	 *   outside the list's current collection
 	 * @returns {Promise<object|void>}
 	 *   A promise which is resolved without a defined result in case <code>bInheritResult</code> is
 	 *   set to <code>true</code>, or with the result object, or rejected in case of an error
@@ -1871,17 +1912,27 @@ sap.ui.define([
 	 * @private
 	 */
 	_AggregationCache.prototype.requestProperties = async function (oElement, aSelect, oGroupLock,
-			bInheritResult) {
-		const sMetaPath = this.oAggregation.$metaPath;
-		const mQueryOptions = {
-			$apply : _Helper.getPrivateAnnotation(oElement, "parent").getQueryOptions().$apply,
-			$filter : _Helper.getKeyFilter(oElement, sMetaPath, this.getTypes())
-		};
+			bInheritResult, bDropFilter) {
+		function getApply(mQueryOptions) { // keep $apply and custom query options
+			mQueryOptions = {...mQueryOptions};
+			// Note: $filter is overwritten below, $orderby is part of $apply already
+			delete mQueryOptions.$count;
+			delete mQueryOptions.$expand;
+			delete mQueryOptions.$select;
+			return mQueryOptions;
+		}
+
+		const oCache = _Helper.getPrivateAnnotation(oElement, "parent");
+		const mQueryOptions = bDropFilter
+			? _AggregationHelper
+				.dropFilter(this.oAggregation, this.mQueryOptions, oCache.$parentFilter)
+			: getApply(oCache.getQueryOptions());
+		mQueryOptions.$filter = _Helper.getKeyFilter(oElement, this.sMetaPath, this.getTypes());
 		const sResourcePath = this.sResourcePath
-			+ this.oRequestor.buildQueryString(sMetaPath, mQueryOptions, false, true);
+			+ this.oRequestor.buildQueryString(this.sMetaPath, mQueryOptions, false, true);
 		const oResult = await this.oRequestor.request("GET", sResourcePath,
-			oGroupLock.getUnlockedCopy(), undefined, undefined, undefined, undefined, sMetaPath,
-			undefined, false, {$select : aSelect}, this);
+			oGroupLock.getUnlockedCopy(), undefined, undefined, undefined, undefined,
+			this.sMetaPath, undefined, false, {$select : aSelect}, this);
 		const oRequestedProperties = oResult.value[0];
 
 		if (bInheritResult) {
@@ -2031,6 +2082,35 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Shifts the rank (aka. $skip index) of all other nodes or placeholders affected by the move of
+	 * a subtree of the given size from the given old to the given new rank. The subtree itself is
+	 * unaffected and may, but need not be present.
+	 *
+	 * @param {number} iOldRank - The old rank of the subtree's root node
+	 * @param {number} iSize - Size of subtree (number of moving elements)
+	 * @param {number} iNewRank - The new rank of the subtree's root node
+	 *
+	 * @private
+	 */
+	_AggregationCache.prototype.shiftRankForMove = function (iOldRank, iSize, iNewRank) {
+		if (iOldRank < iNewRank) {
+			this.aElements.forEach((oElement) => {
+				const iRank = _Helper.getPrivateAnnotation(oElement, "rank");
+				if (iOldRank + iSize <= iRank && iRank < iNewRank + iSize) {
+					_Helper.setPrivateAnnotation(oElement, "rank", iRank - iSize);
+				}
+			});
+		} else if (iNewRank < iOldRank) {
+			this.aElements.forEach((oElement) => {
+				const iRank = _Helper.getPrivateAnnotation(oElement, "rank");
+				if (iNewRank <= iRank && iRank < iOldRank) {
+					_Helper.setPrivateAnnotation(oElement, "rank", iRank + iSize);
+				}
+			});
+		} // iOldRank === iNewRank => nothing to do
+	};
+
 	/**
 	 * Returns the cache's URL.
 	 *

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

@@ -296,12 +296,12 @@ sap.ui.define([
 			}
 
 			mQueryOptions = Object.assign({}, mQueryOptions);
-			oAggregation.groupLevels = oAggregation.groupLevels || [];
+			oAggregation.groupLevels ??= [];
 			bIsLeafLevel = !iLevel || iLevel > oAggregation.groupLevels.length;
 
-			oAggregation.group = oAggregation.group || {};
+			oAggregation.group ??= {};
 			oAggregation.groupLevels.forEach(function (sGroup) {
-				oAggregation.group[sGroup] = oAggregation.group[sGroup] || {};
+				oAggregation.group[sGroup] ??= {};
 			});
 			aGroupBy = bIsLeafLevel
 				? Object.keys(oAggregation.group).sort().filter(function (sGroup) {
@@ -312,7 +312,7 @@ sap.ui.define([
 				aGroupBy = oAggregation.groupLevels.concat(aGroupBy);
 			}
 
-			oAggregation.aggregate = oAggregation.aggregate || {};
+			oAggregation.aggregate ??= {};
 			aAliases = Object.keys(oAggregation.aggregate).sort();
 			if (iLevel === 1 && !bFollowUp) {
 				aAliases.filter(function (sAlias) {
@@ -433,6 +433,9 @@ sap.ui.define([
 		 *   into the search expression parameter of an "ancestors()" transformation
 		 * @param {object} [mQueryOptions={}]
 		 *   A map of key-value pairs representing the query string; it is not modified
+		 * @param {string} [mQueryOptions.$$filterBeforeAggregate]
+		 *   The value for a filter which identifies a parent node; it is removed from the returned
+		 *   map and turned into a "filter()" transformation
 		 * @param {string} [mQueryOptions.$filter]
 		 *   The value for a "$filter" system query option; it is removed from the returned map and
 		 *   turned into the filter expression parameter of an "ancestors()" transformation
@@ -458,12 +461,10 @@ sap.ui.define([
 				if (mQueryOptions.$select) {
 					let sPropertyPath = oAggregation["$" + sProperty];
 					if (!sPropertyPath) {
-						if (!mRecursiveHierarchy) {
-							mRecursiveHierarchy = oAggregation.$fetchMetadata(oAggregation.$metaPath
-									+ "/@com.sap.vocabularies.Hierarchy.v1.RecursiveHierarchy#"
-									+ oAggregation.hierarchyQualifier
-								).getResult();
-						}
+						mRecursiveHierarchy ??= oAggregation.$fetchMetadata(oAggregation.$metaPath
+								+ "/@com.sap.vocabularies.Hierarchy.v1.RecursiveHierarchy#"
+								+ oAggregation.hierarchyQualifier
+							).getResult();
 
 						sPropertyPath = oAggregation["$" + sProperty]
 							= mRecursiveHierarchy[sProperty + "Property"]?.$PropertyPath
@@ -664,6 +665,50 @@ sap.ui.define([
 			return oPlaceholder;
 		},
 
+		/**
+		 * Drops filter, search, and other stuff from the given query options and recursive
+		 * hierarchy information, then adds the corresponding "$apply" system query option.
+		 *
+		 * @param {object} oAggregation
+		 *   An object holding the information needed for a recursive hierarchy; see
+		 *   {@link sap.ui.model.odata.v4.ODataListBinding#setAggregation}.
+		 * @param {string} [oAggregation.search] - Ignored
+		 * @param {object} mQueryOptions
+		 *   A map of key-value pairs representing the query string; it is not modified
+		 * @param {string} [mQueryOptions.$$filterBeforeAggregate] - Removed from the returned map
+		 * @param {string} [mQueryOptions.$apply] - Replaced in the returned map
+		 * @param {string} [mQueryOptions.$count] - Removed from the returned map
+		 * @param {string} [mQueryOptions.$expand] - Removed from the returned map
+		 * @param {string} [mQueryOptions.$filter] - Removed from the returned map
+		 * @param {string} [mQueryOptions.$orderby] - Removed from the returned map
+		 * @param {string} [mQueryOptions.$select] - Removed from the returned map
+		 * @param {string} [sFilterBeforeAggregate]
+		 *   The value for a filter which identifies a parent node; see
+		 *   {@link #buildApply4Hierarchy}
+		 * @returns {object}
+		 *   A map of key-value pairs representing the query string, including a value for the
+		 *   "$apply" system query option; it is a modified copy of <code>mQueryOptions</code>, with
+		 *   values changed as described above
+		 */
+		dropFilter : function (oAggregation, mQueryOptions, sFilterBeforeAggregate) {
+			oAggregation = {...oAggregation};
+			delete oAggregation.search;
+
+			mQueryOptions = {...mQueryOptions};
+			delete mQueryOptions.$count;
+			delete mQueryOptions.$expand;
+			delete mQueryOptions.$filter;
+			delete mQueryOptions.$orderby;
+			delete mQueryOptions.$select;
+			if (sFilterBeforeAggregate) {
+				mQueryOptions.$$filterBeforeAggregate = sFilterBeforeAggregate;
+			} else {
+				delete mQueryOptions.$$filterBeforeAggregate;
+			}
+
+			return _AggregationHelper.buildApply4Hierarchy(oAggregation, mQueryOptions);
+		},
+
 		/**
 		 * Extract subtotals and their units from the given group node, so that they can be used
 		 * for an extra row showing subtotals at the bottom and also to restore them when
@@ -954,7 +999,7 @@ sap.ui.define([
 			delete mQueryOptions.$filter;
 			delete mQueryOptions.$orderby;
 			mQueryOptions = _AggregationHelper.buildApply(oAggregation, mQueryOptions, 1);
-			const aNodeFilters = oOutOfPlace.nodeFilters.toSorted();
+			const aNodeFilters = oOutOfPlace.nodeFilters.slice().sort();
 			mQueryOptions.$filter = aNodeFilters.join(" or ");
 			mQueryOptions.$top = aNodeFilters.length;
 			const iDrillStateIndex = mQueryOptions.$select.indexOf(oAggregation.$DrillState);