@openui5/sap.ui.core 1.124.2 → 1.126.0

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

@@ -121,7 +121,8 @@ sap.ui.define([
 			(oNode) => _Helper.getKeyFilter(oNode, this.sMetaPath, this.getTypes()));
 		// Whether this cache is a unified cache, using oFirstLevel with ExpandLevels instead of
 		// separate group level caches
-		this.bUnifiedCache = this.oAggregation.expandTo >= Number.MAX_SAFE_INTEGER;
+		this.bUnifiedCache = this.oAggregation.expandTo >= Number.MAX_SAFE_INTEGER
+			|| !!this.oAggregation.createInPlace;
 	}
 
 	// make _AggregationCache a _Cache, but actively disinherit some critical methods
@@ -398,9 +399,14 @@ sap.ui.define([
 		}
 
 		for (let i = iIndex + 1; i < iIndex + 1 + iCount; i += 1) {
-			delete aElements.$byPredicate[_Helper.getPrivateAnnotation(aElements[i], "predicate")];
-			delete aElements.$byPredicate[
-				_Helper.getPrivateAnnotation(aElements[i], "transientPredicate")];
+			// selected elements are effectively kept alive (with recursive hierarchy)
+			if (!this.oAggregation.hierarchyQualifier
+				|| !aElements[i]["@$ui5.context.isSelected"]) {
+				delete aElements.$byPredicate[
+					_Helper.getPrivateAnnotation(aElements[i], "predicate")];
+				delete aElements.$byPredicate[
+					_Helper.getPrivateAnnotation(aElements[i], "transientPredicate")];
+			}
 		}
 		const aSpliced = aElements.splice(iIndex + 1, iCount);
 		aSpliced.$level = oGroupNode["@$ui5.node.level"];
@@ -426,7 +432,10 @@ sap.ui.define([
 	_AggregationCache.prototype.countDescendants = function (oGroupNode, iIndex) {
 		var i;
 
-		let iGroupNodeLevel = oGroupNode["@$ui5.node.level"];
+		let iGroupNodeLevel = oGroupNode["@$ui5.node.level"]; // max level of oGroupNode's cache
+		// We have to check a candidate's rank if oGroupNode is in oFirstLevel
+		// Note: expandTo may be undefined (when using data aggregation)
+		let bCheckRank = iGroupNodeLevel <= this.oAggregation.expandTo;
 		let iDescendants = _Helper.getPrivateAnnotation(oGroupNode, "descendants");
 		if (iDescendants) { // => this.oAggregation.expandTo > 1
 			// Note: "descendants" refers to LimitedDescendantCount and counts descendants within
@@ -435,10 +444,14 @@ sap.ui.define([
 		}
 		if (this.bUnifiedCache) {
 			iGroupNodeLevel = Infinity;
+			bCheckRank = true;
 		}
 		const aElements = this.aElements;
 		for (i = iIndex + 1; i < aElements.length; i += 1) {
-			if (aElements[i]["@$ui5.node.level"] <= iGroupNodeLevel) {
+			// If the candidate is not in a nested level cache and (in oFirstLevel) it has a rank,
+			// it counts as descendant. Or it is a sibling if oGroupNode did not have descendants.
+			if (aElements[i]["@$ui5.node.level"] <= iGroupNodeLevel
+					&& (!bCheckRank || _Helper.hasPrivateAnnotation(aElements[i], "rank"))) {
 				// Note: level 0 or 1 is used for initial placeholders of 1st level cache!
 				if (!iDescendants) {
 					break; // we've reached a sibling of the collapsed node
@@ -502,18 +515,11 @@ sap.ui.define([
 		if (oParentNode?.["@$ui5.node.isExpanded"] === false) {
 			throw new Error("Unsupported collapsed parent: " + sParentPath);
 		}
-		if (oParentNode && oParentNode["@$ui5.node.isExpanded"] === undefined) {
-			_Helper.updateAll(this.mChangeListeners, sParentPredicate, oParentNode,
-				{"@$ui5.node.isExpanded" : true}); // not a leaf anymore
-			if (oParentNode["@$ui5.node.level"] >= this.oAggregation.expandTo) {
-				this.oTreeState.expand(oParentNode);
-			} // else: already expanded automatically
-		}
 
 		const iLevel = oParentNode
 			? oParentNode["@$ui5.node.level"] + 1
 			: 1;
-		let oCache = iLevel > this.oAggregation.expandTo
+		let oCache = iLevel > this.oAggregation.expandTo && !this.oAggregation.createInPlace
 			? _Helper.getPrivateAnnotation(oParentNode, "cache")
 			: this.oFirstLevel;
 		if (!oCache) {
@@ -527,8 +533,8 @@ sap.ui.define([
 		const oPromise = oCache.create(oGroupLock, oPostPathPromise, sPath, sTransientPredicate,
 			oEntityData, bAtEndOfCreated, fnErrorCallback, fnSubmitCallback, /*onCancel*/() => {
 				_Helper.removeByPath(this.mPostRequests, sTransientPredicate, oEntityData);
-				if (oCache === this.oFirstLevel) {
-					this.adjustDescendantCount(oEntityData, iIndex, -1);
+				if (this.oAggregation.createInPlace) {
+					return;
 				}
 				aElements.$count -= 1;
 				delete aElements.$byPredicate[sTransientPredicate];
@@ -540,15 +546,59 @@ sap.ui.define([
 				[this.oAggregation.$ParentNavigationProperty + "@odata.bind"]
 					= _Helper.makeRelativeUrl("/" + sParentPath, "/" + this.sResourcePath);
 		}
-		oEntityData["@$ui5.node.level"] = iLevel; // do not send via POST!
 
-		aElements.splice(iIndex, 0, null); // create a gap
-		this.addElements(oEntityData, iIndex, oCache); // rank is undefined!
-		aElements.$count += 1;
-		if (oCache === this.oFirstLevel) {
-			this.adjustDescendantCount(oEntityData, iIndex, +1);
+		const bParentIsLeaf = oParentNode && oParentNode["@$ui5.node.isExpanded"] === undefined;
+		const bExpandTreeState = bParentIsLeaf
+			&& oParentNode?.["@$ui5.node.level"] >= this.oAggregation.expandTo;
+		if (bExpandTreeState) {
+			this.oTreeState.expand(oParentNode);
+		} // else: already expanded automatically
+
+		const addElement = (iIndex0, iRank) => {
+			if (bParentIsLeaf) {
+				_Helper.updateAll(this.mChangeListeners, sParentPredicate, oParentNode,
+					{"@$ui5.node.isExpanded" : true}); // not a leaf anymore
+			}
+			oEntityData["@$ui5.node.level"] = iLevel; // do not send via POST!
+			aElements.splice(iIndex0, 0, null); // create a gap
+			this.addElements(oEntityData, iIndex0, oCache, iRank);
+			aElements.$count += 1;
+		};
+
+		const completeCreation = (iIndex0, iRank) => {
+			oCache.removeElement(0);
+			_Helper.deletePrivateAnnotation(oEntityData, "transientPredicate");
+			delete aElements.$byPredicate[sTransientPredicate];
+			if (iRank !== undefined) {
+				this.adjustDescendantCount(oEntityData, iIndex0, +1);
+				oCache.restoreElement(iRank, oEntityData);
+				_Helper.setPrivateAnnotation(oEntityData, "rank", iRank);
+				this.shiftRank(iIndex0, +1);
+			}
+		};
+
+		if (this.oAggregation.createInPlace) {
+			return oPromise.then(async () => {
+				_Helper.removeByPath(this.mPostRequests, sTransientPredicate, oEntityData);
+				const [iRank] = await Promise.all([
+					this.requestRank(oEntityData, oGroupLock),
+					this.requestNodeProperty(oEntityData, oGroupLock)
+				]);
+				if (bExpandTreeState) { // isRefreshNeededAfterCreate returns true
+					_Helper.setPrivateAnnotation(oEntityData, "rank", iRank);
+				} else if (iRank === undefined) {
+					oCache.removeElement(0);
+				} else {
+					addElement(iRank, iRank);
+					completeCreation(iRank, iRank);
+				}
+
+				return oEntityData;
+			});
 		}
 
+		addElement(iIndex, /*iRank*/undefined);
+
 		return oPromise.then(async () => {
 			_Helper.removeByPath(this.mPostRequests, sTransientPredicate, oEntityData);
 			aElements.$byPredicate[_Helper.getPrivateAnnotation(oEntityData, "predicate")]
@@ -564,13 +614,7 @@ sap.ui.define([
 					this.requestNodeProperty(oEntityData, oGroupLock, /*bDropFilter*/true)
 				]);
 
-				oCache.removeElement(0, sTransientPredicate);
-				_Helper.deletePrivateAnnotation(oEntityData, "transientPredicate");
-				oCache.restoreElement(iRank, oEntityData);
-
-				delete this.aElements.$byPredicate[sTransientPredicate];
-				_Helper.setPrivateAnnotation(oEntityData, "rank", iRank);
-				this.shiftRank(iIndex, +1);
+				completeCreation(iIndex, iRank);
 			} else {
 				await this.requestNodeProperty(oEntityData, oGroupLock, /*bDropFilter*/true);
 			}
@@ -643,7 +687,7 @@ sap.ui.define([
 	 * Expands the given group node.
 	 *
 	 * @param {sap.ui.model.odata.v4.lib._GroupLock} oGroupLock
-	 *   A lock for the group to associate the requests with
+	 *   An unlocked lock for the group to associate the requests with
 	 * @param {object|string} vGroupNodeOrPath
 	 *   The group node or its path relative to the cache; a group node instance (instead of a path)
 	 *   MUST only be given in case of "expanding" continued
@@ -808,7 +852,7 @@ sap.ui.define([
 	 * @param {number} iIndex
 	 *   The index of the child node
 	 * @param {sap.ui.model.odata.v4.lib._GroupLock} oGroupLock
-	 *   A lock for the group to associate the requests with
+	 *   An unlocked lock for the group to associate the requests with
 	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise to be resolved with the requested index of the parent.
 	 *
@@ -869,7 +913,7 @@ sap.ui.define([
 				this.oFirstLevel.calculateKeyPredicate(oParent, this.getTypes(), this.sMetaPath);
 
 				const iParentIndex = this.findIndex(iRank);
-				if (_Helper.getPrivateAnnotation(this.aElements[iParentIndex], "placeholder")) {
+				if (_Helper.hasPrivateAnnotation(this.aElements[iParentIndex], "placeholder")) {
 					this.insertNode(oParent, iRank, iParentIndex);
 				} // else: parent already inside collection
 
@@ -888,8 +932,7 @@ sap.ui.define([
 	 * Returns a promise to be resolved with an OData object for the requested data.
 	 *
 	 * @param {sap.ui.model.odata.v4.lib._GroupLock} oGroupLock
-	 *   A lock for the group to associate the request with; unused in CollectionCache since no
-	 *   request will be created
+	 *   An unlocked lock for the group to associate the request with
 	 * @param {string} [sPath]
 	 *   Relative path to drill-down into
 	 * @param {function} [fnDataRequested]
@@ -935,20 +978,23 @@ sap.ui.define([
 
 	/**
 	 * Returns the index in <code>this.aElements</code> for a given (limited preorder) rank where
-	 * either a node or placeholder with that rank is present and belongs to the first level cache.
+	 * either a node or placeholder with that rank is present and belongs to the given first level
+	 * or group level cache.
 	 *
 	 * @param {number} iRank
 	 *   The (limited preorder) rank of a node
+	 * @param {sap.ui.model.odata.v4.lib._CollectionCache} [oCache]
+	 *   A (group level) cache
 	 * @returns {number}
 	 *   The array index
 	 *
 	 * @private
 	 * @see #getInsertIndex
 	 */
-	_AggregationCache.prototype.findIndex = function (iRank) {
+	_AggregationCache.prototype.findIndex = function (iRank, oCache = this.oFirstLevel) {
 		return this.aElements.findIndex(
 			(oNode) => _Helper.getPrivateAnnotation(oNode, "rank") === iRank
-					&& _Helper.getPrivateAnnotation(oNode, "parent") === this.oFirstLevel);
+					&& _Helper.getPrivateAnnotation(oNode, "parent") === oCache);
 	};
 
 	/**
@@ -1083,6 +1129,53 @@ sap.ui.define([
 		// return undefined;
 	};
 
+	/**
+	 * Returns the index of the given node's sibling, either the next one (via offset +1) or the
+	 * previous one (via offset -1).
+	 *
+	 * @param {number} iIndex - The index of a node
+	 * @param {number} iOffset - An offset, either -1 or +1
+	 * @param {boolean} [bAllowPlaceholder] - Whether the sibling is allowed to be a placeholder
+	 * @returns {number}
+	 *   The sibling node's index, or -1 if no such sibling exists for sure, or
+	 *   <code>undefined</code> if we cannot tell or if the sibling is currently a placeholder and
+	 *   that is not allowed
+	 *
+	 * @public
+	 */
+	_AggregationCache.prototype.getSiblingIndex = function (iIndex, iOffset, bAllowPlaceholder) {
+		const oNode = this.aElements[iIndex];
+		const oCache = _Helper.getPrivateAnnotation(oNode, "parent");
+		const bSingleLevelCache = oCache !== this.oFirstLevel
+			|| this.oAggregation.expandTo === 1 && !this.oAggregation.$ExpandLevels;
+		const iRank = _Helper.getPrivateAnnotation(oNode, "rank");
+		let iSiblingRank = iRank + iOffset;
+		if (iOffset < 0) { // previous sibling
+			if (!bSingleLevelCache) {
+				iSiblingRank // Note: may become undefined!
+					= _AggregationHelper.findPreviousSiblingIndex(oCache.aElements, iRank);
+			}
+			if (iSiblingRank < 0) {
+				return -1; // no such sibling
+			}
+		} else { // next sibling: skip descendants
+			iSiblingRank += _Helper.getPrivateAnnotation(oNode, "descendants", 0);
+			if (iSiblingRank >= oCache.aElements.$count
+				|| oCache.aElements[iSiblingRank]?.["@$ui5.node.level"]
+					< oNode["@$ui5.node.level"]) {
+				return -1; // no such sibling
+			}
+		}
+
+		if (iSiblingRank >= 0) {
+			const iSiblingIndex = this.findIndex(iSiblingRank, oCache);
+			if (bSingleLevelCache && bAllowPlaceholder
+				|| !_Helper.hasPrivateAnnotation(this.aElements[iSiblingIndex], "placeholder")) {
+				return iSiblingIndex; // sibling found
+			}
+		} // else: iSiblingRank === undefined => return undefined;
+	};
+
 	/**
 	 * @override
 	 * @see sap.ui.model.odata.v4.lib._Cache#getValue
@@ -1116,7 +1209,7 @@ sap.ui.define([
 		const getPredicate
 			= (oNode) => _Helper.getKeyPredicate(oNode, this.sMetaPath, this.getTypes());
 		const getRank
-			= (oNode) => Number.parseInt(_Helper.drillDown(oNode, this.oAggregation.$LimitedRank));
+			= (oNode) => parseInt(_Helper.drillDown(oNode, this.oAggregation.$LimitedRank));
 		const mPredicate2RankResult = {};
 		oRankResult.value.forEach((oNode) => {
 			mPredicate2RankResult[getPredicate(oNode)] = oNode;
@@ -1145,8 +1238,10 @@ sap.ui.define([
 				_Helper.merge(oNode, mPredicate2RankResult[sPredicate]);
 				// Note: overridden by _AggregationCache.calculateKeyPredicateRH
 				this.oFirstLevel.calculateKeyPredicate(oNode, this.getTypes(), this.sMetaPath);
+				const iRank = getRank(oNode);
+				_Helper.deleteProperty(oNode, this.oAggregation.$LimitedRank);
 				// insert at rank position to ensure correct placeholder is replaced
-				this.insertNode(oNode, getRank(oNode));
+				this.insertNode(oNode, iRank);
 			});
 		});
 
@@ -1213,6 +1308,22 @@ sap.ui.define([
 		return false;
 	};
 
+	/**
+	 * Returns whether a refresh is needed, if a child is created below the given parent (index).
+	 *
+	 * @param {number} iParentIndex Index of the parent
+	 * @returns {boolean} Whether a refresh is needed
+	 *
+	 * @public
+	 */
+	_AggregationCache.prototype.isRefreshNeededAfterCreate = function (iParentIndex) {
+		const oParent = this.aElements[iParentIndex];
+
+		return this.oAggregation.createInPlace
+			&& oParent["@$ui5.node.isExpanded"] === undefined
+			&& oParent["@$ui5.node.level"] >= this.oAggregation.expandTo;
+	};
+
 	/**
 	 * Determines the list of elements determined by the given predicates. All other elements are
 	 * turned into placeholders (lazily), except transient ones.
@@ -1284,12 +1395,15 @@ sap.ui.define([
 	 * @param {string} [sNonCanonicalChildPath]
 	 *   The (child) node's non-canonical path (relative to the service); only used when
 	 *   <code>sSiblingPath</code> is given
+	 * @param {boolean} [bRequestSiblingRank]
+	 *   Whether to request the next sibling's rank and return its new index
 	 * @returns {{promise : sap.ui.base.SyncPromise<function():number|number[]>, refresh : boolean}}
 	 *   An object with two properties:
 	 *   - <code>promise</code>: A promise which is resolved when the move is finished, or rejected
 	 *     in case of an error. In case a refresh is needed, the promise is resolved with a function
-	 *     that can be called w/o args once the refresh is finished; it then returns the new index
-	 *     of the moved node (or <code>undefined</code>). Else it resolves with with an array of:
+	 *     that can be called w/o args once the refresh is finished - it then returns an array with
+	 *     the new indices of the moved node (or <code>undefined</code>) and of the next sibling (if
+	 *     requested). Else it is resolved with an array of:
 	 *     - the number of child nodes added (normally one, but maybe more in case the parent node
 	 *       was collapsed before),
 	 *     - the new index of the moved node,
@@ -1300,7 +1414,7 @@ sap.ui.define([
 	 * @public
 	 */
 	_AggregationCache.prototype.move = function (oGroupLock, sChildPath, sParentPath, sSiblingPath,
-			sNonCanonicalChildPath) {
+			sNonCanonicalChildPath, bRequestSiblingRank) {
 		let bRefreshNeeded = !this.bUnifiedCache;
 
 		const sChildPredicate = sChildPath.slice(sChildPath.indexOf("("));
@@ -1330,13 +1444,15 @@ sap.ui.define([
 			}
 		}
 
+		let oSiblingNode; // side effect of calling invokeNextSibling()
 		const invokeNextSibling = () => {
 			if (sSiblingPath !== undefined) {
 				bRefreshNeeded = true;
 				const sActionPath = sNonCanonicalChildPath + "/"
 					+ this.oAggregation.$Actions.ChangeNextSiblingAction;
 				const sSiblingPredicate = sSiblingPath?.slice(sSiblingPath.indexOf("("));
-				let oSiblingNode = this.aElements.$byPredicate[sSiblingPredicate];
+				oSiblingNode = this.aElements.$byPredicate[sSiblingPredicate];
+				let oNextSibling = null;
 				if (oSiblingNode) {
 					// remove OOP for all descendants (incl. itself) of a next sibling
 					this.oTreeState.deleteOutOfPlace(sSiblingPredicate);
@@ -1344,18 +1460,16 @@ sap.ui.define([
 						_Helper.getMetaPath("/" + sActionPath + "/NextSibling/")
 					).getResult();
 					const aKeys = Object.keys(oNextSiblingType).filter((sKey) => sKey[0] !== "$");
-					oSiblingNode = aKeys.reduce((oKeys, sKey) => {
+					oNextSibling = aKeys.reduce((oKeys, sKey) => {
 						oKeys[sKey] = oSiblingNode[sKey];
 						return oKeys;
 					}, {});
-				} else {
-					oSiblingNode = null;
 				}
 
 				return this.oRequestor.request("POST", sActionPath, oGroupLock.getUnlockedCopy(), {
 						"If-Match" : oChildNode,
 						Prefer : "return=minimal"
-					}, {NextSibling : oSiblingNode});
+					}, {NextSibling : oNextSibling});
 			}
 		};
 
@@ -1366,13 +1480,17 @@ sap.ui.define([
 				}, {[this.oAggregation.$ParentNavigationProperty + "@odata.bind"] : sParentPath},
 				/*fnSubmit*/null, function fnCancel() { /*nothing to do*/ }),
 			invokeNextSibling(),
-			this.requestRank(oChildNode, oGroupLock, bRefreshNeeded)
+			this.requestRank(oChildNode, oGroupLock, bRefreshNeeded),
+			bRequestSiblingRank && this.requestRank(oSiblingNode, oGroupLock, true)
 		]);
 
 		if (bRefreshNeeded) {
-			oPromise = oPromise.then(([,, iRank]) => {
+			oPromise = oPromise.then(([,, iRank, iSiblingRank]) => {
 				return () => { // Note: caller MUST wait for side-effects refresh first
-					return iRank === undefined ? undefined : this.findIndex(iRank);
+					return [
+						iRank === undefined ? undefined : this.findIndex(iRank),
+						bRequestSiblingRank && this.findIndex(iSiblingRank)
+					];
 				};
 			});
 		} else {
@@ -1483,7 +1601,6 @@ sap.ui.define([
 	_AggregationCache.prototype.read = function (iIndex, iLength, iPrefetchLength, oGroupLock,
 			fnDataRequested) {
 		var oCurrentParent,
-			oElement,
 			iFirstLevelIndex = iIndex,
 			iFirstLevelLength = iLength,
 			oGapParent,
@@ -1501,9 +1618,9 @@ sap.ui.define([
 		 * @param {number} iGapStart start of gap, inclusive
 		 * @param {number} iGapEnd end of gap, exclusive
 		 */
-		function readGap(iGapStart, iGapEnd) {
+		function readGap(iGapStart0, iGapEnd) {
 			aReadPromises.push(
-				that.readGap(oGapParent, iGapStart, iGapEnd, oGroupLock.getUnlockedCopy(),
+				that.readGap(oGapParent, iGapStart0, iGapEnd, oGroupLock.getUnlockedCopy(),
 					fnDataRequested));
 		}
 
@@ -1549,7 +1666,7 @@ sap.ui.define([
 				});
 			const n = Math.min(oReadRange.start + oReadRange.length, this.aElements.length);
 			for (i = oReadRange.start; i < n; i += 1) {
-				oElement = this.aElements[i];
+				const oElement = this.aElements[i];
 				oCurrentParent = _Helper.hasPrivateAnnotation(oElement, "placeholder")
 					? _Helper.getPrivateAnnotation(oElement, "parent")
 					: undefined;
@@ -1596,8 +1713,8 @@ sap.ui.define([
 	 * search into account.
 	 *
 	 * @param {sap.ui.model.odata.v4.lib._GroupLock} oGroupLock
-	 *   A lock for the group to associate the requests with;
-	 *   {@link sap.ui.model.odata.v4.lib._GroupLock#getUnlockedCopy} still needs to be called!
+	 *   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}
 	 * @returns {Promise<void>|undefined}
 	 *   A promise which is resolved without a defined result when the read is finished, or
 	 *   rejected in case of an error; <code>undefined</code> in case no count needs to be read
@@ -1826,10 +1943,12 @@ sap.ui.define([
 	 * @override
 	 * @see sap.ui.model.odata.v4.lib._CollectionCache#refreshKeptElements
 	 */
-	_AggregationCache.prototype.refreshKeptElements = function (oGroupLock, fnOnRemove) {
+	_AggregationCache.prototype.refreshKeptElements = function (oGroupLock, fnOnRemove,
+			bIgnorePendingChanges, _bDropApply) {
 		// "super" call (like @borrows ...)
 		const fnSuper = this.oFirstLevel.refreshKeptElements;
-		return fnSuper.call(this, oGroupLock, fnOnRemove, true);
+		return fnSuper.call(this, oGroupLock, fnOnRemove, bIgnorePendingChanges,
+			/*bDropApply*/true);
 	};
 
 	/**
@@ -1864,7 +1983,8 @@ sap.ui.define([
 	 * moved to their out-of-place position in the cache.
 	 *
 	 * @param {sap.ui.model.odata.v4.lib._GroupLock} oGroupLock
-	 *   A lock for the group to associate the requests with
+	 *   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}
 	 * @returns {Promise[]}
 	 *   The request promises
 	 *
@@ -1943,7 +2063,7 @@ sap.ui.define([
 			mQueryOptions = getApply(
 				_AggregationHelper.buildApply4Hierarchy(oAggregation, this.mQueryOptions));
 		} else {
-			const oCache = _Helper.getPrivateAnnotation(oElement, "parent");
+			const oCache = _Helper.getPrivateAnnotation(oElement, "parent", this.oFirstLevel);
 			mQueryOptions = bDropFilter
 				? _AggregationHelper
 					.dropFilter(this.oAggregation, this.mQueryOptions, oCache.$parentFilter)
@@ -1957,7 +2077,7 @@ sap.ui.define([
 			this.sMetaPath, undefined, false, {$select : aSelect}, this);
 		const oRequestedProperties = oResult.value[0];
 
-		if (bInheritResult) {
+		if (bInheritResult && oRequestedProperties) {
 			aSelect.forEach((sPath) => {
 				_Helper.inheritPathValue(sPath.split("/"), oRequestedProperties, oElement, true);
 			});
@@ -1991,6 +2111,57 @@ sap.ui.define([
 		return oResult && parseInt(_Helper.drillDown(oResult, this.oAggregation.$LimitedRank));
 	};
 
+	/**
+	 * Returns the index of the given node's sibling, either the next one (via offset +1) or the
+	 * previous one (via offset -1).
+	 *
+	 * @param {number} iIndex - The index of a node
+	 * @param {number} iOffset - An offset, either -1 or +1
+	 * @param {sap.ui.model.odata.v4.lib._GroupLock} oGroupLock
+	 *   An unlocked lock for the group to associate the requests with
+	 * @returns {Promise<number>}
+	 *   The sibling node's index, or -1 if no such sibling exists
+	 *
+	 * @public
+	 */
+	_AggregationCache.prototype.requestSiblingIndex = async function (iIndex, iOffset, oGroupLock) {
+		const iSiblingIndex = this.getSiblingIndex(iIndex, iOffset, true);
+		if (iSiblingIndex !== undefined) {
+			return iSiblingIndex;
+		}
+
+		const oNode = this.aElements[iIndex];
+		const mQueryOptions = {
+			...this.oFirstLevel.mQueryOptions,
+			$filter : this.oAggregation.$LimitedRank + (iOffset < 0 ? " lt " : " gt ")
+				+ _Helper.getPrivateAnnotation(oNode, "rank") + " and "
+				+ this.oAggregation.$DistanceFromRoot + " lt " + oNode["@$ui5.node.level"],
+			$top : 1
+		};
+		if (iOffset < 0) {
+			mQueryOptions.$orderby = this.oAggregation.$LimitedRank + " desc";
+		}
+		mQueryOptions.$select = [...mQueryOptions.$select, this.oAggregation.$LimitedRank];
+		delete mQueryOptions.$count;
+		const sResourcePath = this.sResourcePath
+			+ this.oRequestor.buildQueryString("", mQueryOptions, false, true, true);
+
+		const oResult = await this.oRequestor.request("GET", sResourcePath, oGroupLock);
+
+		const oSibling = oResult.value[0];
+		// Note: overridden by _AggregationCache.calculateKeyPredicateRH
+		this.oFirstLevel.calculateKeyPredicate(oSibling, this.getTypes(), this.sMetaPath);
+		const iSiblingRank = parseInt(_Helper.drillDown(oSibling, this.oAggregation.$LimitedRank));
+		_Helper.deleteProperty(oSibling, this.oAggregation.$LimitedRank);
+		if (_Helper.hasPrivateAnnotation(this.aElements[iSiblingRank], "placeholder")) {
+			this.insertNode(oSibling, iSiblingRank);
+		} // else: sibling already inside collection
+
+		return oSibling["@$ui5.node.level"] === oNode["@$ui5.node.level"]
+			? iSiblingRank
+			: -1; // no such sibling
+	};
+
 	/**
 	 * @override
 	 * @see sap.ui.model.odata.v4.lib._CollectionCache#reset

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

@@ -44,6 +44,7 @@ sap.ui.define([
 			+ "(?:/" + _Parser.sODataIdentifier + ")*"
 			+ ")(?:" + _Parser.sWhitespace + "+(?:asc|desc))?$"),
 		mRecursiveHierarchyType = {
+			createInPlace : true,
 			expandTo : /^[1-9]\d*$/, // a positive integer
 			hierarchyQualifier : "string",
 			search : "string"
@@ -182,6 +183,7 @@ sap.ui.define([
 					// restore previous expansion state
 					oElement["@$ui5.node.isExpanded"] = oPlaceholder["@$ui5.node.isExpanded"];
 				}
+				_Helper.copySelected(oPlaceholder, oElement);
 			}
 		},
 
@@ -636,6 +638,10 @@ sap.ui.define([
 					_AggregationHelper.checkTypeof(vValue[sKey], vType[bIsMap ? "*" : sKey],
 						sPath + "/" + sKey);
 				});
+			} else if (vType === true) {
+				if (vValue !== true) {
+					throw new Error("Not a true value for '" + sPath + "'");
+				}
 			} else if (typeof vValue !== vType) { // eslint-disable-line valid-typeof
 				throw new Error("Not a " + vType + " value for '" + sPath + "'");
 			}
@@ -793,6 +799,44 @@ sap.ui.define([
 			return mQueryOptions;
 		},
 
+		/**
+		 * Finds the index of the previous sibling within the given list of elements (which is meant
+		 * to contain different levels), starting from an original node at the given index.
+		 *
+		 * @param {object[]} aElements - A list of elements with possible holes
+		 * @param {number} iIndex - The original node's index within list of elements
+		 * @returns {number}
+		 *   The previous sibling's index, or -1 if there is no previous sibling for sure, or
+		 *   <code>undefined</code> if we cannot tell
+		 *
+		 * @public
+		 */
+		findPreviousSiblingIndex : function (aElements, iIndex) {
+			let bHole;
+			const iLevel = aElements[iIndex]["@$ui5.node.level"];
+			for (let iSibling = iIndex - 1; iSibling >= 0; iSibling -= 1) {
+				const oCandidate = aElements[iSibling];
+				if (!oCandidate) {
+					bHole = true;
+					continue; // skip holes
+				}
+				if (oCandidate["@$ui5.node.level"] < iLevel) {
+					break; // sibling missed or no such sibling
+				}
+				if (oCandidate["@$ui5.node.level"] > iLevel) {
+					continue; // ignore descendants
+				}
+				// else: same level
+				if (iSibling + _Helper.getPrivateAnnotation(oCandidate, "descendants", 0)
+						=== iIndex - 1) {
+					return iSibling; // sibling found
+				}
+				break; // sibling missed (implies bHole)
+			}
+
+			return bHole ? undefined : -1;
+		},
+
 		/**
 		 * Returns an unsorted list of all aggregatable or groupable properties, including units.
 		 *
@@ -1257,10 +1301,10 @@ sap.ui.define([
 			 * @returns {boolean}
 			 *   Whether the filter must be applied after aggregating
 			 */
-			function isAfter(oFilter) {
-				return oFilter.aFilters
-					? oFilter.aFilters.some(isAfter)
-					: oFilter.sPath in oAggregation.aggregate;
+			function isAfter(oFilter0) {
+				return oFilter0.aFilters
+					? oFilter0.aFilters.some(isAfter)
+					: oFilter0.sPath in oAggregation.aggregate;
 			}
 
 			/*
@@ -1270,12 +1314,12 @@ sap.ui.define([
 			 * @param {sap.ui.model.Filter} oFilter
 			 *   A filter
 			 */
-			function split(oFilter) {
-				if (oFilter.aFilters && oFilter.bAnd) {
-					oFilter.aFilters.forEach(split);
+			function split(oFilter0) {
+				if (oFilter0.aFilters && oFilter0.bAnd) {
+					oFilter0.aFilters.forEach(split);
 				} else {
-					(isAfter(oFilter) ? aFiltersAfterAggregate : aFiltersBeforeAggregate)
-						.push(oFilter);
+					(isAfter(oFilter0) ? aFiltersAfterAggregate : aFiltersBeforeAggregate)
+						.push(oFilter0);
 				}
 			}