@openui5/sap.ui.core 1.124.2 → 1.126.0

package/test/sap/ui/core/demokit/sample/odata/v4/RecursiveHierarchy/RecursiveHierarchy.view.xml

@@ -7,19 +7,29 @@
 	xmlns:rm="sap.ui.table.rowmodes">
 
 	<Table id="table" ariaLabelledBy="title"
-		rows="{path : '/EMPLOYEES',
-			parameters : {$count : false, $orderby : 'AGE', $$patchWithoutSideEffects : true},
-			suspended : true}"
+		rows="{
+				path : '/EMPLOYEES',
+				parameters : {
+					$count : false,
+					$filter : 'STATUS ne \'Out\'',
+					$orderby : 'AGE',
+					$$patchWithoutSideEffects : true
+				},
+				suspended : true
+			}"
 		selectionMode="None">
 		<extension>
 			<m:Toolbar design="Transparent" class="sapMTBHeader-CTX">
 				<m:Title id="title" level="H1" text="Organizational Chart"/>
 				<m:ToolbarSpacer/>
 				<m:Button icon="sap-icon://create" press=".onCreateRoot" tooltip="Create New Root"/>
+				<m:Button icon="sap-icon://hide" press=".onCreateRoot($event, true)"
+					tooltip="Create New Root (filtered out)"/>
 				<m:Button icon="sap-icon://synchronize" id="synchronize" press="onSynchronize"
-					tooltip="Synchronize"/>
-				<m:Button icon="sap-icon://refresh" press="onRefresh"
-					tooltip="Refresh, while keeping tree state"/>
+					tooltip="Side Effect"/>
+				<m:Button icon="sap-icon://response" press="onRefresh" tooltip="Refresh"/>
+				<m:Button icon="sap-icon://refresh" press="onRefresh($event, true)"
+						tooltip="Refresh (keeping tree state)"/>
 			</m:Toolbar>
 		</extension>
 		<rowMode>
@@ -31,7 +41,7 @@
 				<m:Text text="{= %{@$ui5.node.level} }" wrapping="false"/>
 			</template>
 		</Column>
-		<Column width="4em">
+		<Column width="3.14em">
 			<template>
 				<m:Button enabled="{= %{@$ui5.node.isExpanded} !== undefined}"
 					icon="{= %{@$ui5.node.isExpanded} === true
@@ -70,34 +80,53 @@
 				<m:Text text="{AGE}" wrapping="false"/>
 			</template>
 		</Column>
-		<Column width="4em">
-			<template>
-				<m:Button enabled="{= %{@$ui5.node.isExpanded} !== false}" icon="sap-icon://create"
-					id="create" press=".onCreate" tooltip="Create New Child"/>
-			</template>
-		</Column>
-		<Column width="4em">
-			<template>
-				<m:Button icon="sap-icon://move" id="move" press=".onMove" tooltip="Move"/>
-			</template>
-		</Column>
-		<Column width="4em">
-			<template>
-				<m:Button id="delete" icon="sap-icon://delete" press=".onDelete" tooltip="Delete"/>
-			</template>
-		</Column>
-		<Column width="4em">
-			<template>
-				<m:Button enabled="{= %{@$ui5.node.level} > 1}" icon="sap-icon://back-to-top"
-					press=".onMakeRoot" tooltip="Make Root"/>
+		<Column>
+			<m:Label text="Filtered Out"/>
+			<template>
+				<m:CheckBox editable="false" selected="{= %{STATUS} === 'Out'}"/>
+			</template>
+		</Column>
+		<Column width="27em">
+			<template>
+				<m:FlexBox justifyContent="SpaceBetween">
+					<m:Button enabled="{= %{STATUS} !== 'Out' &amp;&amp; %{@$ui5.node.isExpanded} !== false}"
+						icon="sap-icon://create" id="create" press=".onCreate"
+						tooltip="Create New Child"/>
+					<m:Button enabled="{= %{STATUS} !== 'Out' &amp;&amp; %{@$ui5.node.isExpanded} !== false}"
+						icon="sap-icon://hide" press=".onCreate($event, true)"
+						tooltip="Create New Hidden Child"/>
+					<m:Button enabled="{= %{STATUS} !== 'Out'}" icon="sap-icon://up"
+						press=".onMoveUp" tooltip="Move Up"/>
+					<m:Button enabled="{= %{STATUS} !== 'Out'}" icon="sap-icon://down"
+						press=".onMoveDown" tooltip="Move Down"/>
+					<m:Button enabled="{= %{STATUS} !== 'Out'}" icon="sap-icon://move"
+						press=".onMove" tooltip="Move To Parent..."/>
+					<m:Button enabled="{= %{STATUS} !== 'Out'}" icon="sap-icon://map"
+						press=".onMove($event, false, '?')" tooltip="Move Just Before Sibling..."/>
+					<m:Button enabled="{= %{STATUS} !== 'Out'}" icon="sap-icon://arrow-bottom"
+						press=".onMove($event, false, null)" tooltip="Move As Last Child Of..."/>
+					<m:Button enabled="{= %{STATUS} !== 'Out' &amp;&amp; %{@$ui5.node.level} > 1}"
+						icon="sap-icon://back-to-top" press=".onMakeRoot" tooltip="Make Root"/>
+					<m:Button enabled="{= %{STATUS} !== 'Out'}" icon="sap-icon://pull-down"
+						press=".onMakeRoot($event, null)" tooltip="Make Last Root"/>
+					<m:Button enabled="{= %{STATUS} !== 'Out'}" icon="sap-icon://delete"
+						press=".onDelete" tooltip="Delete"/>
+				</m:FlexBox>
 			</template>
 		</Column>
 	</Table>
 
 	<TreeTable id="treeTable" ariaLabelledBy="treeTitle"
-		rows="{path : '/EMPLOYEES',
-			parameters : {$count : false, $orderby : 'AGE', $$patchWithoutSideEffects : true},
-			suspended : true}"
+		rows="{
+				path : '/EMPLOYEES',
+				parameters : {
+					$count : false,
+					$filter : 'STATUS ne \'Out\'',
+					$orderby : 'AGE',
+					$$patchWithoutSideEffects : true
+				},
+				suspended : true
+			}"
 		selectionMode="None">
 		<extension>
 			<m:Toolbar design="Transparent" class="sapMTBHeader-CTX">
@@ -105,10 +134,13 @@
 				<m:ToolbarSpacer/>
 				<m:Button icon="sap-icon://create" press=".onCreateRootInTreeTable"
 					tooltip="Create New Root"/>
+				<m:Button icon="sap-icon://hide" press=".onCreateRootInTreeTable($event, true)"
+					tooltip="Create New Root (filtered out)"/>
 				<m:Button icon="sap-icon://synchronize" id="synchronizeTreeTable"
-					press="onSynchronizeTreeTable" tooltip="SynchronizeTreeTable"/>
-				<m:Button icon="sap-icon://refresh" press="onRefreshTreeTable"
-					tooltip="Refresh, while keeping tree state"/>
+					press="onSynchronizeTreeTable" tooltip="Side effect"/>
+				<m:Button icon="sap-icon://response" press="onRefreshTreeTable" tooltip="Refresh"/>
+				<m:Button icon="sap-icon://refresh" press="onRefreshTreeTable($event, true)"
+					tooltip="Refresh (keeping tree state)"/>
 			</m:Toolbar>
 		</extension>
 		<rowMode>
@@ -144,28 +176,38 @@
 				<m:Text text="{AGE}" wrapping="false"/>
 			</template>
 		</Column>
-		<Column width="4em">
-			<template>
-				<m:Button enabled="{= %{@$ui5.node.isExpanded} !== false}" icon="sap-icon://create"
-					id="createInTreeTable" press=".onCreate" tooltip="Create New Child"/>
-			</template>
-		</Column>
-		<Column width="4em">
-			<template>
-				<m:Button icon="sap-icon://move" id="moveInTreeTable" press=".onMoveInTreeTable"
-					tooltip="Move"/>
-			</template>
-		</Column>
-		<Column width="4em">
-			<template>
-				<m:Button id="deleteInTreeTable" icon="sap-icon://delete" press=".onDelete"
-					tooltip="Delete"/>
-			</template>
-		</Column>
-		<Column width="4em">
-			<template>
-				<m:Button enabled="{= %{@$ui5.node.level} > 1}" icon="sap-icon://back-to-top"
-					press=".onMakeRoot" tooltip="Make Root"/>
+		<Column>
+			<m:Label text="Filtered Out"/>
+			<template>
+				<m:CheckBox editable="false" selected="{= %{STATUS} === 'Out'}"/>
+			</template>
+		</Column>
+		<Column width="27em">
+			<template>
+				<m:FlexBox justifyContent="SpaceBetween">
+					<m:Button enabled="{= %{STATUS} !== 'Out' &amp;&amp; %{@$ui5.node.isExpanded} !== false}"
+						icon="sap-icon://create" id="createInTreeTable" press=".onCreate"
+						tooltip="Create New Child"/>
+					<m:Button enabled="{= %{STATUS} !== 'Out' &amp;&amp; %{@$ui5.node.isExpanded} !== false}"
+						icon="sap-icon://hide" press=".onCreate($event, true)"
+						tooltip="Create New Child (filtered out)"/>
+					<m:Button enabled="{= %{STATUS} !== 'Out'}" icon="sap-icon://up"
+						press=".onMoveUp" tooltip="Move Up"/>
+					<m:Button enabled="{= %{STATUS} !== 'Out'}" icon="sap-icon://down"
+						press=".onMoveDown" tooltip="Move Down"/>
+					<m:Button enabled="{= %{STATUS} !== 'Out'}" icon="sap-icon://move"
+						press=".onMove($event, true)" tooltip="Move To Parent..."/>
+					<m:Button enabled="{= %{STATUS} !== 'Out'}" icon="sap-icon://map"
+						press=".onMove($event, true, '?')" tooltip="Move Just Before Sibling..."/>
+					<m:Button enabled="{= %{STATUS} !== 'Out'}" icon="sap-icon://arrow-bottom"
+						press=".onMove($event, true, null)" tooltip="Move As Last Child Of..."/>
+					<m:Button enabled="{= %{STATUS} !== 'Out' &amp;&amp; %{@$ui5.node.level} > 1}"
+						icon="sap-icon://back-to-top" press=".onMakeRoot" tooltip="Make Root"/>
+					<m:Button enabled="{= %{STATUS} !== 'Out'}" icon="sap-icon://pull-down"
+						press=".onMakeRoot($event, null)" tooltip="Make Last Root"/>
+					<m:Button enabled="{= %{STATUS} !== 'Out'}" icon="sap-icon://delete"
+						press=".onDelete" tooltip="Delete"/>
+				</m:FlexBox>
 			</template>
 		</Column>
 	</TreeTable>
@@ -180,8 +222,10 @@
 
 	<m:FormattedText htmlText="&lt;em>Available URL parameters:&lt;/em>
 		&lt;ul>
-			&lt;li> &lt;code>expandTo&lt;/code> Either * for 'expand all' or a number; default 3
+			&lt;li> &lt;code>createInPlace&lt;/code> Either set or unset; default unset
+			&lt;li> &lt;code>expandTo&lt;/code> Either * for &lt;em>expand all&lt;/em> or a number; default 3
+			&lt;li> &lt;code>firstVisibleRow&lt;/code> A number; default 0
+			&lt;li> &lt;code>threshold&lt;/code> A number; default 0
 			&lt;li> &lt;code>visibleRowCount&lt;/code> A number; default 5
-			&lt;li> &lt;code>TreeTable&lt;/code> 'Y' for yes, 'N' for no; default both tables
-			&lt;li> &lt;code>threshold&lt;/code> A number; default 0"/>
+			&lt;li> &lt;code>TreeTable&lt;/code> Y for yes, N for no; default is both tables"/>
 </mvc:View>

package/test/sap/ui/core/demokit/sample/odata/v4/RecursiveHierarchy/SandboxModel.js

@@ -33,6 +33,9 @@ sap.ui.define([
 					}, {
 						regExp : /^POST \/sap\/opu\/odata4\/IWBEP\/TEA\/default\/IWBEP\/TEA_BUSI\/0001\/EMPLOYEES$/,
 						response : {buildResponse : buildPostResponse}
+					}, {
+						regExp : /^POST \/sap\/opu\/odata4\/IWBEP\/TEA\/default\/IWBEP\/TEA_BUSI\/0001\/EMPLOYEES\('([^']*)'\)\/com\.sap\.gateway\.default\.iwbep\.tea_busi\.v0001\.__FAKE__AcChangeNextSibling$/,
+						response : {buildResponse : buildChangeNextSiblingResponse}
 					}],
 					sSourceBase : "sap/ui/core/sample/odata/v4/RecursiveHierarchy/data"
 				});
@@ -165,9 +168,9 @@ sap.ui.define([
 		Name : "Omega"
 	}];
 
-	let aAllNodes; // in preorder
-	let mChildrenByParentId; // no entry for leaves!
-	let mNodeById;
+	let aAllNodes; // in preorder, does not contain nodes that are filtered out
+	let mChildrenByParentId; // no entry for leaves! Does not contain nodes that are filtered out
+	let mNodeById; // contains all nodes incl. those filtered out
 	let iRevision;
 	let mRevisionOfAgeById;
 
@@ -183,6 +186,7 @@ sap.ui.define([
 		mRevisionOfAgeById = {};
 
 		aAllNodes.forEach((oNode) => {
+			oNode.STATUS = "";
 			// oNode.DescendantCount = 0; // @see computeDescendantCount
 			oNode.DistanceFromRoot = oNode.ID === "0"
 				? 0
@@ -234,6 +238,51 @@ sap.ui.define([
 		}
 	}
 
+	/**
+	 * Builds a response for any POST request on the "ChangeNextSibling" action.
+	 *
+	 * @param {string[]} aMatches - The matches against the RegExp
+	 * @param {object} _oResponse - Response object to fill
+	 * @param {object} oRequest - Request object to get POST body from
+	 */
+	function buildChangeNextSiblingResponse(aMatches, _oResponse, oRequest) {
+		const oNode = mNodeById[aMatches[1]];
+		const sParentId = oNode.MANAGER_ID;
+
+		// {"NextSibling" : {"ID" : "1"}}
+		const oBody = JSON.parse(oRequest.requestBody);
+		if (oBody.NextSibling === null) { // node becomes *last*
+			if (sParentId) { // make last child
+				const aChildren = mChildrenByParentId[sParentId];
+				if (aChildren.length > 1) {
+					aChildren.splice(aChildren.indexOf(oNode), 1);
+					aChildren.push(oNode);
+					const aSpliced
+						= aAllNodes.splice(aAllNodes.indexOf(oNode), oNode.DescendantCount + 1);
+					aAllNodes.splice(aAllNodes.indexOf(aChildren.at(-2)) + 1, 0, ...aSpliced);
+				} // else: no change
+			} else { // make last root
+				const aSpliced
+					= aAllNodes.splice(aAllNodes.indexOf(oNode), oNode.DescendantCount + 1);
+				aAllNodes.push(...aSpliced);
+			}
+		} else { // next sibling is specified
+			const oNextSibling = mNodeById[oBody.NextSibling.ID];
+			if (oNextSibling.MANAGER_ID !== sParentId) {
+				throw new Error("Parent mismatch");
+			}
+			if (sParentId) { // move child inside mChildrenByParentId[...]
+				const aChildren = mChildrenByParentId[sParentId];
+				aChildren.splice(aChildren.indexOf(oNode), 1);
+				aChildren.splice(aChildren.indexOf(oNextSibling), 0, oNode);
+			}
+			// move root (or child inside aAllNodes)
+			const aSpliced = aAllNodes.splice(aAllNodes.indexOf(oNode), oNode.DescendantCount + 1);
+			aAllNodes.splice(aAllNodes.indexOf(oNextSibling), 0, ...aSpliced);
+		}
+		// no response required
+	}
+
 	/**
 	 * Builds a response for any DELETE request on a specific "EMPLOYEE" instance.
 	 *
@@ -260,8 +309,12 @@ sap.ui.define([
 		if (oNode.MANAGER_ID) {
 			const aChildren = mChildrenByParentId[oNode.MANAGER_ID];
 			aChildren.splice(aChildren.indexOf(oNode), 1);
+			if (!aChildren.length) {
+				delete mChildrenByParentId[oNode.MANAGER_ID];
+			}
 			adjustDescendantCount(oNode.MANAGER_ID, -(oNode.DescendantCount + 1));
 		}
+		// no response required
 	}
 
 	/**
@@ -291,36 +344,63 @@ sap.ui.define([
 					: Infinity;
 				let aRows = topLevels(iLevels - 1, getExpandLevels()); // Note: already cloned
 				if ("$filter" in mQueryOptions) {
-					// ID%20eq%20'1'
-					const aIDs = mQueryOptions.$filter.split("%20or%20")
-						.map((sID_Predicate) => sID_Predicate.split("%20eq%20")[1].slice(1, -1));
-					if (aIDs.length !== 1) {
-						throw new Error("Unexpected ID filter length");
-					}
-					aRows = aRows.filter((oNode, i) => {
-						if (oNode.ID === aIDs[0]) {
+					if (mQueryOptions.$filter.includes("LimitedRank")) {
+						// e.g. LimitedRank lt 5 and DistanceFromRoot lt 2
+						// e.g. LimitedRank gt 4 and DistanceFromRoot lt 2
+						const aFilterMatches = mQueryOptions.$filter.match(
+							/LimitedRank%20(gt|lt)%20(\d+)%20and%20DistanceFromRoot%20lt%20(\d+)/);
+						const bGreater = aFilterMatches[1] === "gt";
+						const iLimitedRank = parseInt(aFilterMatches[2]);
+						const iDistanceFromRoot = parseInt(aFilterMatches[3]);
+						aRows = aRows.filter((oNode, i) => {
 							oNode.LimitedRank = "" + i; // Edm.Int64
-							return true;
+							return (bGreater ? i > iLimitedRank : i < iLimitedRank)
+								&& oNode.DistanceFromRoot < iDistanceFromRoot;
+						});
+						if (mQueryOptions.$orderby === "LimitedRank%20desc") {
+							aRows = aRows.reverse();
 						}
-						return false;
-					});
+					} else { // ID%20eq%20'1'
+						const aIDs = mQueryOptions.$filter.split("%20or%20").map(
+							(sID_Predicate) => sID_Predicate.split("%20eq%20")[1].slice(1, -1));
+						aRows = aRows.filter((oNode, i) => {
+							oNode.LimitedRank = "" + i; // Edm.Int64
+							return aIDs.includes(oNode.ID);
+						});
+					}
 				}
 				selectCountSkipTop(aRows, mQueryOptions, oResponse);
 				return;
 			}
-			// "EMPLOYEES?$apply=descendants($root/EMPLOYEES,OrgChart,ID"
-			// + ",filter(ID%20eq%20'" + sParentId + "'),1)/orderby(AGE)"
-			const sParentId = mQueryOptions.$apply.match(/,filter\(ID%20eq%20'([^']*)'\)/)[1];
-			let aChildren = mChildrenByParentId[sParentId];
-			if ("$filter" in mQueryOptions) {
-				// not%20(ID%20eq%20'5.1.10'%20or%20ID%20eq%20'5.1.11')
-				const aIDs = mQueryOptions.$filter
-					.slice("not%20(".length, -")".length)
-					.split("%20or%20")
-					.map((sID_Predicate) => sID_Predicate.split("%20eq%20")[1].slice(1, -1));
-				aChildren = aChildren.filter((oChild) => !aIDs.includes(oChild.ID));
+
+			if (mQueryOptions.$apply.includes("descendants")) {
+				// "EMPLOYEES?$apply=ancestors($root/EMPLOYEES,OrgChart,ID
+				// + ",filter(STATUS%20ne%20'Out'),keep%20start)"
+				// + "/descendants($root/EMPLOYEES,OrgChart,ID,filter(ID%20eq%20'" + sParentId
+				// + "'),1)/orderby(AGE)"
+				const sParentId = mQueryOptions.$apply.match(/,filter\(ID%20eq%20'([^']*)'\)/)[1];
+				let aChildren = mChildrenByParentId[sParentId];
+				if ("$filter" in mQueryOptions) {
+					const bNot = mQueryOptions.$filter.startsWith("not%20(");
+					if (bNot) {
+						// not%20(ID%20eq%20'5.1.10'%20or%20ID%20eq%20'5.1.11')
+						mQueryOptions.$filter
+							= mQueryOptions.$filter.slice("not%20(".length, -")".length);
+					}
+					const aIDs = mQueryOptions.$filter
+						.split("%20or%20")
+						.map((sID_Predicate) => sID_Predicate.split("%20eq%20")[1].slice(1, -1));
+					aChildren = aChildren.filter((oChild) => aIDs.includes(oChild.ID) !== bNot);
+				}
+				selectCountSkipTop(aChildren, mQueryOptions, oResponse);
+				return;
 			}
-			selectCountSkipTop(aChildren, mQueryOptions, oResponse);
+
+			// "$orderby=AGE&$select=ID,MANAGER_ID,Name,AGE"
+			// + "&$apply=ancestors($root/EMPLOYEES,OrgChart,ID,filter(ID%20eq%20'3'),1)"
+			const sChildId = mQueryOptions.$apply.match(/,filter\(ID%20eq%20'([^']*)'\)/)[1];
+			const sParentId = mNodeById[sChildId].MANAGER_ID;
+			selectCountSkipTop([mNodeById[sParentId]], mQueryOptions, oResponse);
 			return;
 		}
 
@@ -496,13 +576,14 @@ sap.ui.define([
 		function isChildID(sChildID, sParentId) {
 			return sChildID !== sParentId
 				&& (sParentId === "0"
-					? !sChildID.includes(".")
+					? /^\d+$/.test(sChildID) // Note: letters denote other roots!
 					: sChildID.startsWith(sParentId)
 						&& !sChildID.slice(sParentId.length + 1).includes("."));
 		}
 
 		// {"EMPLOYEE_2_MANAGER@odata.bind" : "EMPLOYEES('0')"}
 		const oBody = JSON.parse(oRequest.requestBody);
+		const bFilteredOut = oBody.STATUS === "Out";
 		const sParentId = oBody["EMPLOYEE_2_MANAGER@odata.bind"]
 			?.slice("EMPLOYEES('".length, -"')".length);
 		const oParent = mNodeById[sParentId];
@@ -517,7 +598,8 @@ sap.ui.define([
 			DistanceFromRoot : oParent ? oParent.DistanceFromRoot + 1 : 0,
 			DrillState : "leaf",
 			MANAGER_ID : sParentId ?? null,
-			DescendantCount : 0
+			DescendantCount : 0,
+			STATUS : bFilteredOut ? "Out" : ""
 		};
 
 		if (sParentId) {
@@ -526,12 +608,11 @@ sap.ui.define([
 				oNewChild.AGE = mChildrenByParentId[sParentId][0].AGE - 1;
 			} else { // parent not a leaf anymore
 				oParent.DrillState = "collapsed"; // @see #reset
-				mChildrenByParentId[sParentId] = [];
 				oNewChild.AGE = oParent.AGE - 1;
 			}
 
 			// use "largest" child ID which is hierarchical to parent
-			const sLastChildID = aAllNodes
+			const sLastChildID = Object.values(mNodeById)
 				.filter((oChild) => isChildID(oChild.ID, sParentId))
 				.sort(compareByID)
 				.at(-1)?.ID;
@@ -543,24 +624,37 @@ sap.ui.define([
 				oNewChild.ID = sParentId + "." + (parseLastSegment(sLastChildID) + 1);
 			}
 		} else { // new root
-			const iRootCount = aAllNodes.filter((oNode) => oNode.MANAGER_ID === null).length;
+			const iRootCount = Object.values(mNodeById)
+				.filter((oNode) => oNode.MANAGER_ID === null)
+				.length;
 			oNewChild.AGE = 60 + iRootCount;
-			oNewChild.ID = "0ABCDEFGHIJKLMNOPQRSTUVWXYZ"[iRootCount];
+			oNewChild.ID = "0ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"[iRootCount];
 		}
 
 		if (oNewChild.ID in mNodeById) {
 			throw new Error("Illegal state: duplicate node ID " + oNewChild.ID);
 		}
-		aAllNodes.push(oNewChild); //TODO not good enough once we need "refresh"
 		mNodeById[oNewChild.ID] = oNewChild;
 		mRevisionOfAgeById[oNewChild.ID] = 0;
-		if (sParentId) {
-			// Note: server's insert position must not affect UI (until refresh!)
-			mChildrenByParentId[sParentId].push(oNewChild);
-			adjustDescendantCount(sParentId, +1);
+		if (!bFilteredOut) {
+			if (sParentId) {
+				// Note: server's insert position must not affect UI (until refresh!)
+				mChildrenByParentId[sParentId] ??= [];
+				mChildrenByParentId[sParentId].push(oNewChild);
+				adjustDescendantCount(sParentId, +1);
+				aAllNodes.splice(aAllNodes.indexOf(oParent) + oParent.DescendantCount, 0,
+					oNewChild);
+			} else {
+				aAllNodes.push(oNewChild);
+			}
 		}
 
-		oResponse.message = JSON.stringify(SandboxModel.update([oNewChild])[0]);
+		const oCopy = SandboxModel.update([oNewChild])[0];
+		// RAP would not respond w/ DescendantCount,DistanceFromRoot,DrillState!
+		delete oCopy.DescendantCount;
+		delete oCopy.DistanceFromRoot;
+		delete oCopy.DrillState;
+		oResponse.message = JSON.stringify(oCopy);
 	}
 
 	/**
@@ -593,7 +687,9 @@ sap.ui.define([
 		function select(oNode) {
 			const oResult = {};
 			for (const sSelect of aSelect) {
-				oResult[sSelect] = oNode[sSelect];
+				oResult[sSelect] = sSelect === "DescendantCount" || sSelect === "DistanceFromRoot"
+					? "" + oNode[sSelect] // Edm.Int64
+					: oNode[sSelect];
 			}
 			return oResult;
 		}

package/test/sap/ui/core/demokit/sample/odata/v4/RecursiveHierarchy/data/metadata.xml

@@ -143,6 +143,9 @@
 			<ComplexType Name="__CT__FAKE__Message">
 				<Property Name="__FAKE__Messages" Type="Collection(SAP__self.__FAKE__Message)" Nullable="false" />
 			</ComplexType>
+			<ComplexType Name="__FAKE__NextSiblingWorker">
+				<Property Name="ID" Type="Edm.String" Nullable="false" MaxLength="4"/>
+			</ComplexType>
 			<Action Name="AcChangeManagerOfDepartment" IsBound="true">
 				<Parameter Name="DEPARTMENT" Type="com.sap.gateway.default.iwbep.tea_busi.v0001.Department"
 					Nullable="false"/>
@@ -205,6 +208,10 @@
 				<Parameter Name="Message" Type="Edm.String"/>
 				<ReturnType Type="com.sap.gateway.default.iwbep.tea_busi.v0001.MANAGER"/>
 			</Action>
+			<Action Name="__FAKE__AcChangeNextSibling" IsBound="true">
+				<Parameter Name="_it" Type="com.sap.gateway.default.iwbep.tea_busi.v0001.Worker" Nullable="false"/>
+				<Parameter Name="NextSibling" Type="com.sap.gateway.default.iwbep.tea_busi.v0001.__FAKE__NextSiblingWorker" Nullable="true"/>
+			</Action>
 			<Function Name="FuGetEmployeeAges">
 				<ReturnType Type="Collection(Edm.Int16)" Nullable="false"/>
 			</Function>
@@ -406,6 +413,13 @@
 						<PropertyValue Property="LimitedDescendantCount" Path="DescendantCount"/>
 					</Record>
 				</Annotation>
+				<Annotation Qualifier="OrgChart" Term="com.sap.vocabularies.Hierarchy.v1.RecursiveHierarchyActions">
+					<Record>
+						<PropertyValue Property="ChangeNextSiblingAction"
+							String="com.sap.gateway.default.iwbep.tea_busi.v0001.__FAKE__AcChangeNextSibling"/>
+						<!-- PropertyValue Property="CopyAction" String="T.B.D."/ -->
+					</Record>
+				</Annotation>
 			</Annotations>
 		</Schema>
 	</edmx:DataServices>

package/test/sap/ui/core/demokit/sample/odata/v4/RecursiveHierarchy/manifest.json

@@ -20,11 +20,6 @@
 		"type" : "application"
 	},
 	"sap.ui" : {
-		"deviceTypes" : {
-			"desktop" : true,
-			"phone" : true,
-			"tablet" : true
-		},
 		"technology" : "UI5"
 	},
 	"sap.ui5" : {
@@ -40,13 +35,10 @@
 				]
 			}
 		},
-		"contentDensities" : {
-			"compact" : true,
-			"cozy" : true
-		},
 		"dependencies" : {
 			"libs" : {
 				"sap.m" : {},
+				"sap.ui.core" : {},
 				"sap.ui.table" : {}
 			},
 			"minUI5Version" : "1.105"
@@ -66,7 +58,6 @@
 			}
 		},
 		"rootView" : {
-			"async" : true,
 			"type" : "XML",
 			"viewName" : "sap.ui.core.sample.odata.v4.RecursiveHierarchy.RecursiveHierarchy"
 		}

package/test/sap/ui/core/demokit/sample/odata/v4/RecursiveHierarchy/pages/Main.js

@@ -31,9 +31,10 @@ sap.ui.define([
 		aCells = aRows[iRowIndex].getCells();
 		if (oExpected === null) {
 			aCells.forEach(function (oCell, i) {
-				// Note: don't care about invisible icon in 2nd column here
-				strictEqual(oCell.getText ? oCell.getText() : oCell.getValue(), "",
-					"Row " + iRowIndex + ", cell " + i + " is empty");
+				if (oCell.getText || oCell.getValue) {
+					strictEqual(oCell.getText?.() ?? oCell.getValue(), "",
+						"Row " + iRowIndex + ", cell " + i + " is empty");
+				} // else: don't care about invisible icon in 2nd column here (or button column)
 			});
 			return;
 		}

package/test/sap/ui/core/demokit/sample/odata/v4/SalesOrderTP100_V2/Component.js

@@ -14,6 +14,7 @@ sap.ui.define([
 
 	return UIComponent.extend("sap.ui.core.sample.odata.v4.SalesOrderTP100_V2.Component", {
 		metadata : {
+			interfaces : ["sap.ui.core.IAsyncContentCreation"],
 			manifest : "json"
 		}
 	});

package/test/sap/ui/core/demokit/sample/odata/v4/SalesOrderTP100_V2/Opa.qunit.html

@@ -10,7 +10,6 @@
 		<script id="sap-ui-bootstrap" src="resources/sap-ui-core.js"
 			data-sap-ui-async="true"
 			data-sap-ui-compatversion="edge"
-			data-sap-ui-libs="sap.m"
 			data-sap-ui-resourceroots='{"sap.ui.core.sample":"test-resources/sap/ui/core/demokit/sample"}'>
 		</script>
 

package/test/sap/ui/core/demokit/sample/odata/v4/SalesOrderTP100_V2/manifest.json

@@ -22,11 +22,6 @@
 	},
 	"sap.ui" : {
 		"_version" : "1.1.0",
-		"deviceTypes" : {
-			"desktop" : true,
-			"phone" : true,
-			"tablet" : true
-		},
 		"technology" : "UI5"
 	},
 	"sap.ui5" : {
@@ -44,14 +39,11 @@
 				]
 			}
 		},
-		"contentDensities" : {
-			"compact" : true,
-			"cozy" : true
-		},
 		"dependencies" : {
 			"minUI5Version" : "1.51",
 			"libs" : {
-				"sap.m" : {}
+				"sap.m" : {},
+				"sap.ui.core" : {}
 			}
 		},
 		"handleValidation" : true,
@@ -70,7 +62,6 @@
 			}
 		},
 		"rootView" : {
-			"async" : true,
 			"type" : "XML",
 			"viewName" : "sap.ui.core.sample.odata.v4.SalesOrderTP100_V2.Main"
 		}

package/test/sap/ui/core/demokit/sample/odata/v4/SalesOrderTP100_V4/Component.js

@@ -13,6 +13,7 @@ sap.ui.define([
 
 	return UIComponent.extend("sap.ui.core.sample.odata.v4.SalesOrderTP100_V4.Component", {
 		metadata : {
+			interfaces : ["sap.ui.core.IAsyncContentCreation"],
 			manifest : "json"
 		}
 	});

package/test/sap/ui/core/demokit/sample/odata/v4/SalesOrderTP100_V4/Opa.qunit.html

@@ -10,7 +10,6 @@
 		<script id="sap-ui-bootstrap" src="resources/sap-ui-core.js"
 			data-sap-ui-async="true"
 			data-sap-ui-compatversion="edge"
-			data-sap-ui-libs="sap.m"
 			data-sap-ui-resourceroots='{"sap.ui.core.sample":"test-resources/sap/ui/core/demokit/sample"}'>
 		</script>