@openui5/sap.ui.core 1.119.1 → 1.120.1

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

@@ -7,7 +7,7 @@
 		},
 		"dataSources" : {
 			"default" : {
-				"uri" : "/sap/opu/odata4/sap/zjb_v4_sadl_rs_hier_bind_act/srvd/sap/zjb_sd_sadl_rs_hier_bind_act/0001/",
+				"uri" : "/sap/opu/odata4/sap/zjb_sadl_rs_hier_dir_v4/srvd/sap/zjb_sadl_rs_hier_dir_sd/0001/",
 				"type" : "OData",
 				"settings" : {
 					"odataVersion" : "4.0"

package/test/sap/ui/core/demokit/sample/odata/v4/LateProperties/Main.controller.js

@@ -3,7 +3,6 @@
  */
 
 sap.ui.define([
-	"sap/base/util/UriParameters",
 	"sap/m/Button",
 	"sap/m/library",
 	"sap/m/Dialog",
@@ -19,13 +18,13 @@ sap.ui.define([
 	"sap/ui/model/Sorter",
 	"sap/ui/model/odata/v4/ODataModel",
 	"sap/ui/test/TestUtils"
-], function (UriParameters, Button, mobileLibrary, Dialog, Input, Label, MessageToast, Text,
+], function (Button, mobileLibrary, Dialog, Input, Label, MessageToast, Text,
 		Controller, Title, UI5Date, _ColumnLayout, SimpleForm, Sorter, ODataModel, TestUtils) {
 	"use strict";
 
 	// shortcut for sap.m.ButtonType
 	var ButtonType = mobileLibrary.ButtonType,
-		sOptimisticBatch = UriParameters.fromQuery(window.location.search).get("optimisticBatch");
+		sOptimisticBatch = new URLSearchParams(window.location.search).get("optimisticBatch");
 
 	return Controller.extend("sap.ui.core.sample.odata.v4.LateProperties.Main", {
 		onCleanUpOptimisticBatchCache : function (oEvent) {

package/test/sap/ui/core/demokit/sample/odata/v4/ListBindingTemplate/Facets.fragment.xml

@@ -1,30 +1,29 @@
 <core:FragmentDefinition
+	template:require="{AH : 'sap/ui/model/odata/v4/AnnotationHelper'}"
 	xmlns="sap.m"
 	xmlns:core="sap.ui.core"
 	xmlns:scenario="sap.ui.core.sample.ViewTemplate.scenario"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1">
 	<!-- Note: "facets>" MUST point to Collection(com.sap.vocabularies.UI.v1.Facet) -->
-	<template:alias name="AH" value="sap.ui.model.odata.v4.AnnotationHelper">
-		<template:repeat list="{facets>}" var="facet">
-			<template:if test="{:= ${facet>$Type} === 'com.sap.vocabularies.UI.v1.CollectionFacet' }">
-				<template:then>
-					<Label design="Bold" text="Collection Facet '{facet>Label}'"/>
-					<template:with path="facet>Facets" var="facets">
-						<core:Fragment
-							fragmentName="sap.ui.core.sample.odata.v4.ListBindingTemplate.Facets"
-							type="XML"/>
-					</template:with>
-					<Label text="End of Collection Facet '{facet>Label}'"/>
-				</template:then>
-				<template:else>
-					<!-- if test="{:= ${facet>$Type} === 'com.sap.vocabularies.UI.v1.ReferenceFacet' }" -->
-					<!-- Note: alias "AH" is used only once to test both ways! -->
-					<Text text="Facet: {facet>Label},
-					 Target: {facet>Target/$AnnotationPath},
-					 isMultiple: {facet>Target/$AnnotationPath@@AH.isMultiple},
-					 getNavigationPath: {facet>Target/$AnnotationPath@@sap.ui.model.odata.v4.AnnotationHelper.getNavigationPath}"/>
-				</template:else>
-			</template:if>
-		</template:repeat>
-	</template:alias>
+	<template:repeat list="{facets>}" var="facet">
+		<template:if test="{:= ${facet>$Type} === 'com.sap.vocabularies.UI.v1.CollectionFacet' }">
+			<template:then>
+				<Label design="Bold" text="Collection Facet '{facet>Label}'"/>
+				<template:with path="facet>Facets" var="facets">
+					<core:Fragment
+						fragmentName="sap.ui.core.sample.odata.v4.ListBindingTemplate.Facets"
+						type="XML"/>
+				</template:with>
+				<Label text="End of Collection Facet '{facet>Label}'"/>
+			</template:then>
+			<template:else>
+				<!-- if test="{:= ${facet>$Type} === 'com.sap.vocabularies.UI.v1.ReferenceFacet' }" -->
+				<!-- Note: alias "AH" is used only once to test both ways! -->
+				<Text text="Facet: {facet>Label},
+				 Target: {facet>Target/$AnnotationPath},
+				 isMultiple: {facet>Target/$AnnotationPath@@AH.isMultiple},
+				 getNavigationPath: {facet>Target/$AnnotationPath@@sap.ui.model.odata.v4.AnnotationHelper.getNavigationPath}"/>
+			</template:else>
+		</template:if>
+	</template:repeat>
 </core:FragmentDefinition>

package/test/sap/ui/core/demokit/sample/odata/v4/ListBindingTemplate/FormattedText.fragment.xml

@@ -1,10 +1,9 @@
 <core:FragmentDefinition
-	template:require="sap.ui.core.sample.odata.v4.ListBindingTemplate.Helper"
+	template:require="{Helper: 'sap/ui/core/sample/odata/v4/ListBindingTemplate/Helper'}"
 	xmlns="sap.m"
 	xmlns:core="sap.ui.core"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1">
-	<template:alias name="format"
-			value="sap.ui.core.sample.odata.v4.ListBindingTemplate.Helper.format">
+	<template:alias name="format" value="Helper.format">
 		<template:if test="{= ${objectWithKind>$kind} === 'EntityContainer' }">
 			<template:then>
 				<Text text="{objectWithKind>@sapui.name}/$kind: ~EntityContainer~"/>

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

@@ -1,18 +1,18 @@
 <mvc:View
 	controllerName="sap.ui.core.sample.odata.v4.ListBindingTemplate.Main"
-	template:require="{Helper : 'sap/ui/core/sample/odata/v4/ListBindingTemplate/Helper',
-		AnnotationHelper : 'sap/ui/model/odata/v4/AnnotationHelper'}"
+	template:require="{AH : 'sap/ui/model/odata/v4/AnnotationHelper',
+		Helper : 'sap/ui/core/sample/odata/v4/ListBindingTemplate/Helper'}"
 	xmlns="sap.m"
 	xmlns:ce="sap.ui.codeeditor"
 	xmlns:core="sap.ui.core"
 	xmlns:demo="sap.ui.core.sample.common"
 	xmlns:mvc="sap.ui.core.mvc"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1">
-	<template:alias name="getValueListType" value="AnnotationHelper.getValueListType">
+	<template:alias name="getValueListType" value="AH.getValueListType">
 	<template:alias name="stringify" value="Helper.stringify">
-	<template:alias name="format" value="AnnotationHelper.format">
-	<template:alias name="value" value="AnnotationHelper.value">
-	<template:alias name="label" value="AnnotationHelper.label">
+	<template:alias name="format" value="AH.format">
+	<template:alias name="value" value="AH.value">
+	<template:alias name="label" value="AH.label">
 	<VBox>
 		<HBox>
 			<ToggleButton icon="sap-icon://syntax" press="onSourceCode"
@@ -123,7 +123,7 @@
 				<Label text="meta>/Equipments/@com.sap.vocabularies.UI.v1.LineItem/4/Value/$Path@com.sap.vocabularies.Common.v1.QuickInfo@@value"/>
 				<Text text="{path : 'meta>/Equipments/@com.sap.vocabularies.UI.v1.LineItem/4/Value/$Path@com.sap.vocabularies.Common.v1.QuickInfo@@value', formatter : 'stringify'}"/>
 
-				<template:with path="meta>/Equipments/@com.sap.vocabularies.UI.v1.LineItem/4/Value/$Path" helper="AnnotationHelper.resolve$Path" var="value">
+				<template:with path="meta>/Equipments/@com.sap.vocabularies.UI.v1.LineItem/4/Value/$Path" helper="AH.resolve$Path" var="value">
 					<Label text="value>@com.sap.vocabularies.Common.v1.QuickInfo@@format"/>
 					<Text text="{path : 'value>@com.sap.vocabularies.Common.v1.QuickInfo@@format', formatter : 'stringify'}"/>
 				</template:with>

package/test/sap/ui/core/demokit/sample/odata/v4/MultipleInlineCreationRowsGrid/Main.controller.js

@@ -136,7 +136,6 @@ sap.ui.define([
 			} else {
 				Messaging.removeMessages(oMessage);
 				delete this.mCreateActivateMessages[oContext.getPath()];
-				this.messagePopover.navigateBack();
 
 				setTimeout(function () { // there are sporadic issues without using setTimeout
 					if (oBinding.getPath() === "/Products") {
@@ -167,7 +166,6 @@ sap.ui.define([
 				oContext.resetChanges();
 				Messaging.removeMessages(this.mCreateActivateMessages[oContext.getPath()]);
 				delete this.mCreateActivateMessages[oContext.getPath()];
-				this.messagePopover.navigateBack();
 			} else {
 				MessageBox.confirm(
 					"Do you really want to delete " + sEntity + " " + sObjectId + "?",
@@ -331,7 +329,6 @@ sap.ui.define([
 					delete that.mCreateActivateMessages[sKey];
 				}
 			});
-			this.messagePopover.navigateBack();
 		},
 
 		setPartsContext : function (oContext) {

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

@@ -2,11 +2,10 @@
  * ${copyright}
  */
 sap.ui.define([
-	"sap/base/util/UriParameters",
 	"sap/m/MessageBox",
 	"sap/ui/core/sample/common/Controller",
 	"sap/ui/test/TestUtils"
-], function (UriParameters, MessageBox, Controller, TestUtils) {
+], function (MessageBox, Controller, TestUtils) {
 	"use strict";
 
 	return Controller.extend("sap.ui.core.sample.odata.v4.RecursiveHierarchy.RecursiveHierarchy", {
@@ -17,18 +16,63 @@ sap.ui.define([
 					"@$ui5.node.parent" : oParentContext
 				}, /*bSkipRefresh*/true);
 			} catch (oError) {
-				MessageBox.alert(oError.message, {icon : MessageBox.Icon.ERROR,
-					title : "Error"});
+				MessageBox.alert(oError.message, {icon : MessageBox.Icon.ERROR, title : "Error"});
+			}
+		},
+
+		onCreateRoot : async function () {
+			try {
+				await this.byId("table").getBinding("rows").create({
+						// "@$ui5.node.parent" : null
+					}, /*bSkipRefresh*/true);
+			} catch (oError) {
+				MessageBox.alert(oError.message, {icon : MessageBox.Icon.ERROR, title : "Error"});
+			}
+		},
+
+		onCreateRootInTreeTable : async function () {
+			try {
+				await this.byId("treeTable").getBinding("rows").create({
+						"@$ui5.node.parent" : null
+					}, /*bSkipRefresh*/true);
+			} catch (oError) {
+				MessageBox.alert(oError.message, {icon : MessageBox.Icon.ERROR, title : "Error"});
+			}
+		},
+
+		onCut : function (oEvent) {
+			try {
+				const oNode = oEvent.getSource().getBindingContext();
+				oNode.delete("noSubmit");
+				MessageBox.confirm("Restore again (undo cut)", {
+					actions : MessageBox.Action.OK,
+					emphasizedAction : MessageBox.Action.OK,
+					onClose : function () {
+						oNode.resetChanges();
+					}
+				});
+			} catch (oError) {
+				MessageBox.alert(oError.message, {icon : MessageBox.Icon.ERROR, title : "Error"});
+			}
+		},
+
+		onDelete : async function (oEvent) {
+			try {
+				await oEvent.getSource().getBindingContext().delete();
+			} catch (oError) {
+				MessageBox.alert(oError.message, {icon : MessageBox.Icon.ERROR, title : "Error"});
 			}
 		},
 
 		onInit : function () {
-			const oUriParameters = UriParameters.fromQuery(window.location.search);
+			const oUriParameters = new URLSearchParams(window.location.search);
 			const sExpandTo = TestUtils.retrieveData( // controlled by OPA
 					"sap.ui.core.sample.odata.v4.RecursiveHierarchy.expandTo")
 				|| oUriParameters.get("expandTo");
 			this._oAggregation = {
-				expandTo : parseInt(sExpandTo || "3"),
+				expandTo : sExpandTo === "*"
+					? Number.MAX_SAFE_INTEGER
+					: parseInt(sExpandTo || "3"),
 				hierarchyQualifier : "OrgChart"
 			};
 			const sVisibleRowCount = TestUtils.retrieveData( // controlled by OPA
@@ -69,6 +113,7 @@ sap.ui.define([
 		onMove : function (oEvent) {
 			this.oNode = oEvent.getSource().getBindingContext();
 			const oSelectDialog = this.byId("moveDialog");
+			oSelectDialog.setBindingContext(this.oNode);
 			const oListBinding = oSelectDialog.getBinding("items");
 			if (oListBinding.isSuspended()) {
 				oListBinding.resume();
@@ -79,13 +124,13 @@ sap.ui.define([
 		onMoveConfirm : async function (oEvent) {
 			try {
 				this.getView().setBusy(true);
-				const sParentId = oEvent.getParameter("selectedItem").getTitle();
+				const sParentId = oEvent.getParameter("selectedItem").getBindingContext()
+					.getProperty("ID");
 				const oParent = this.oNode.getBinding().getAllCurrentContexts()
 					.find((oNode) => oNode.getProperty("ID") === sParentId);
 				await this.oNode.move({parent : oParent});
 			} catch (oError) {
-				MessageBox.alert(oError.message, {icon : MessageBox.Icon.ERROR,
-					title : "Error"});
+				MessageBox.alert(oError.message, {icon : MessageBox.Icon.ERROR, title : "Error"});
 			} finally {
 				this.getView().setBusy(false);
 			}

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

@@ -15,6 +15,7 @@
 			<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://synchronize" id="synchronize" press="onSynchronize"
 					tooltip="Synchronize"/>
 			</m:Toolbar>
@@ -31,11 +32,11 @@
 		<Column width="4em">
 			<template>
 				<m:Button enabled="{= %{@$ui5.node.isExpanded} !== undefined}"
-					id="expand"
 					icon="{= %{@$ui5.node.isExpanded} === true
 						? 'sap-icon://collapse'
 						: (%{@$ui5.node.isExpanded} === false
 							? 'sap-icon://expand' : 'sap-icon://e-care')}"
+					id="expand"
 					press=".onToggleExpand"
 					tooltip="{= %{@$ui5.node.isExpanded} === true
 						? 'Collapse'
@@ -69,13 +70,23 @@
 		</Column>
 		<Column width="4em">
 			<template>
-				<m:Button enabled="{= %{@$ui5.node.isExpanded} !== false}" id="create"
-					icon="sap-icon://create" press=".onCreate" tooltip="Create New Child"/>
+				<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 id="cut" icon="sap-icon://scissors" press=".onCut" tooltip="Cut"/>
+			</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="move" icon="sap-icon://move" press=".onMove" tooltip="Move"/>
+				<m:Button id="delete" icon="sap-icon://delete" press=".onDelete" tooltip="Delete"/>
 			</template>
 		</Column>
 	</Table>
@@ -89,6 +100,8 @@
 			<m:Toolbar design="Transparent" class="sapMTBHeader-CTX">
 				<m:Title id="treeTitle" level="H1" text="Organizational Chart - TreeTable"/>
 				<m:ToolbarSpacer/>
+				<m:Button icon="sap-icon://create" press=".onCreateRootInTreeTable"
+					tooltip="Create New Root"/>
 				<m:Button icon="sap-icon://synchronize" id="synchronizeTreeTable"
 					press="onSynchronizeTreeTable" tooltip="SynchronizeTreeTable"/>
 			</m:Toolbar>
@@ -128,23 +141,35 @@
 		</Column>
 		<Column width="4em">
 			<template>
-				<m:Button enabled="{= %{@$ui5.node.isExpanded} !== false}" id="createInTreeTable"
-					icon="sap-icon://create" press=".onCreate" tooltip="Create New Child"/>
+				<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 id="cutInTreeTable" icon="sap-icon://scissors" press=".onCut"
+					tooltip="Cut"/>
 			</template>
 		</Column>
 		<Column width="4em">
 			<template>
-				<m:Button id="moveInTreeTable" icon="sap-icon://move" press=".onMove"
+				<m:Button icon="sap-icon://move" id="moveInTreeTable" press=".onMove"
 					tooltip="Move"/>
 			</template>
 		</Column>
+		<Column width="4em">
+			<template>
+				<m:Button id="deleteInTreeTable" icon="sap-icon://delete" press=".onDelete"
+					tooltip="Delete"/>
+			</template>
+		</Column>
 	</TreeTable>
 
 	<mvc:dependents>
 		<m:SelectDialog confirm=".onMoveConfirm" draggable="true" id="moveDialog"
 			items="{path : '/EMPLOYEES', parameters : {$count : true}, suspended : true}"
-			title="Select New Parent">
-			<m:StandardListItem description="{Name}" title="{ID}" type="Active" />
+			title="Select New Parent For {ID} ({Name})">
+			<m:StandardListItem title="{ID} ({Name})" type="Active" />
 		</m:SelectDialog>
 	</mvc:dependents>
 </mvc:View>

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

@@ -16,11 +16,17 @@ sap.ui.define([
 					sFilterBase : "/sap/opu/odata4/IWBEP/TEA/default/IWBEP/TEA_BUSI/0001/",
 					mFixture : {},
 					aRegExps : [{
+						regExp : /^DELETE \/sap\/opu\/odata4\/IWBEP\/TEA\/default\/IWBEP\/TEA_BUSI\/0001\/EMPLOYEES\('([^']*)'\)$/,
+						response : {buildResponse : buildDeleteResponse, code : 204}
+					}, {
 						regExp : /^GET [\w\/.]+\$metadata[\w?&\-=]+sap-language=..$/,
 						response : {source : "metadata.xml"}
 					}, {
 						regExp : /^GET \/sap\/opu\/odata4\/IWBEP\/TEA\/default\/IWBEP\/TEA_BUSI\/0001\/EMPLOYEES\?(.*)$/,
-						response : {buildResponse : buildGetResponse}
+						response : {buildResponse : buildGetCollectionResponse}
+					}, {
+						regExp : /^GET \/sap\/opu\/odata4\/IWBEP\/TEA\/default\/IWBEP\/TEA_BUSI\/0001\/EMPLOYEES\('([^']*)'\)\?(.*)$/,
+						response : {buildResponse : buildGetSingleResponse}
 					}, {
 						regExp : /^PATCH \/sap\/opu\/odata4\/IWBEP\/TEA\/default\/IWBEP\/TEA_BUSI\/0001\/EMPLOYEES\('([^']*)'\)$/,
 						response : {buildResponse : buildPatchResponse, code : 204}
@@ -159,8 +165,8 @@ sap.ui.define([
 		Name : "Omega"
 	}];
 
-	let aAllNodes;
-	let mChildrenByParentId;
+	let aAllNodes; // in preorder
+	let mChildrenByParentId; // no entry for leaves!
 	let mNodeById;
 	let iRevision;
 	let mRevisionOfAgeById;
@@ -209,25 +215,69 @@ sap.ui.define([
 
 	reset();
 
+	/**
+	 * Adjust the DescendantCount of the node with given ID (and all of its ancestors) by the
+	 * given difference.
+	 *
+	 * @param {string} sId - A node ID
+	 * @param {number} iDiff - Some difference
+	 */
+	function adjustDescendantCount(sId, iDiff) {
+		mNodeById[sId].DescendantCount += iDiff;
+		sId = mNodeById[sId].MANAGER_ID;
+		if (sId) {
+			adjustDescendantCount(sId, iDiff);
+		}
+	}
+
+	/**
+	 * Builds a response for any DELETE request on a specific "EMPLOYEE" instance.
+	 *
+	 * @param {string[]} aMatches - The matches against the RegExp
+	 * @param {object} _oResponse - Response object to fill
+	 */
+	function buildDeleteResponse(aMatches, _oResponse) {
+		/**
+		 * Recursively visits all of the given node's descendants, deleting them in post order.
+		 *
+		 * @param {object} oNode - A node
+		 */
+		function visit(oNode) {
+			const sId = oNode.ID;
+			mChildrenByParentId[sId]?.forEach(visit);
+			delete mChildrenByParentId[sId];
+			delete mNodeById[sId];
+			delete mRevisionOfAgeById[sId];
+			aAllNodes.splice(aAllNodes.indexOf(oNode), 1);
+		}
+
+		const oNode = mNodeById[aMatches[1]];
+		visit(oNode);
+		if (oNode.MANAGER_ID) {
+			const aChildren = mChildrenByParentId[oNode.MANAGER_ID];
+			aChildren.splice(aChildren.indexOf(oNode), 1);
+			adjustDescendantCount(oNode.MANAGER_ID, -(oNode.DescendantCount + 1));
+		}
+	}
+
 	/**
 	 * Builds a response for any GET query on the "EMPLOYEES" collection.
 	 *
 	 * @param {string[]} aMatches - The matches against the RegExp
 	 * @param {object} oResponse - Response object to fill
 	 */
-	function buildGetResponse(aMatches, oResponse) {
-		const mQueryOptions = {};
-		for (const sName_Value of aMatches[1].split("&")) {
-			const [sName, ...aValues] = sName_Value.split("=");
-			mQueryOptions[sName] = aValues.join("=");
-		}
+	function buildGetCollectionResponse(aMatches, oResponse) {
+		const mQueryOptions = getQueryOptions(aMatches[1]);
 
 		if ("$apply" in mQueryOptions) {
 			if (mQueryOptions.$apply.includes("TopLevels")) {
 				// "EMPLOYEES?$apply=orderby(AGE)"
 				// + "/com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root/EMPLOYEES"
 				// + ",HierarchyQualifier='OrgChart',NodeProperty='ID',Levels=" + iLevels + ")"
-				const iLevels = parseInt(mQueryOptions.$apply.match(/,Levels=(\d+)/)[1]);
+				// Note: "Levels" is optional!
+				const iLevels = mQueryOptions.$apply.includes(",Levels=")
+					? parseInt(mQueryOptions.$apply.match(/,Levels=(\d+)/)[1])
+					: Infinity;
 				selectCountSkipTop(topLevels(iLevels - 1), mQueryOptions, oResponse);
 				return;
 			}
@@ -251,15 +301,15 @@ sap.ui.define([
 			// ID%20eq%20'0'%20or%20ID%20eq%20'1'%20or%20ID%20eq%20'1.1'
 			const aIDs = mQueryOptions.$filter.split("%20or%20")
 				.map((sID_Predicate) => sID_Predicate.split("%20eq%20")[1].slice(1, -1));
-			if (mQueryOptions.$select.includes("MANAGER_ID")) {
+			if (mQueryOptions.$select.includes("MANAGER_ID")) { // side effect for all rows
 				iRevision += 1;
-			} else {
+			} else { // side effect for single row (after PATCH of Name)
 				if (aIDs.length !== 1) {
 					throw new Error("Unexpected ID filter length");
 				}
 				mRevisionOfAgeById[aIDs[0]] += 1;
 			}
-			const aRows = aIDs.map((sID) => mNodeById[sID]);
+			const aRows = aIDs.map((sId) => mNodeById[sId]);
 			selectCountSkipTop(aRows, mQueryOptions, oResponse);
 			return;
 		}
@@ -267,6 +317,31 @@ sap.ui.define([
 		selectCountSkipTop(aAllNodes, mQueryOptions, oResponse);
 	}
 
+	/**
+	 * Builds a response for any GET request on a specific "EMPLOYEE" instance.
+	 *
+	 * @param {string[]} aMatches - The matches against the RegExp
+	 * @param {object} oResponse - Response object to fill
+	 */
+	function buildGetSingleResponse(aMatches, oResponse) {
+		// EMPLOYEES('B')?$select=AGE,DescendantCount,DistanceFromRoot,DrillState,ID,MANAGER_ID,Name
+		const aSelect = getQueryOptions(aMatches[2]).$select.split(",");
+		const select = (oNode) => { //TODO share w/ selectCountSkipTop?
+			const oResult = {};
+			for (const sSelect of aSelect) {
+				oResult[sSelect] = oNode[sSelect];
+			}
+			return oResult;
+		};
+		const oNode = select(mNodeById[aMatches[1]]);
+		// RAP would not respond w/ DescendantCount,DistanceFromRoot,DrillState!
+		delete oNode.DescendantCount;
+		delete oNode.DistanceFromRoot;
+		delete oNode.DrillState;
+		// Note: bSkipCopy due to select
+		oResponse.message = JSON.stringify(SandboxModel.update([oNode], true)[0]);
+	}
+
 	/**
 	 * Builds a response for any PATCH request on a specific "EMPLOYEE" instance.
 	 *
@@ -275,6 +350,19 @@ sap.ui.define([
 	 * @param {object} oRequest - Request object to get PATCH body from
 	 */
 	function buildPatchResponse(aMatches, _oResponse, oRequest) {
+		/**
+		 * Adjust the DistanceFromRoot of the given node (and all of its descendants) by the given
+		 * difference.
+		 *
+		 * @param {object} oNode - A node
+		 * @param {number} iDiff - Some difference
+		 */
+		function adjustDistanceFromRoot(oNode, iDiff) {
+			oNode.DistanceFromRoot += iDiff;
+			(mChildrenByParentId[oNode.ID] || [])
+				.forEach((oChild) => adjustDistanceFromRoot(oChild, iDiff));
+		}
+
 		if (oRequest.requestHeaders.Prefer !== "return=minimal") {
 			throw new Error("Unsupported Prefer header: " + oRequest.requestHeaders.Prefer);
 		}
@@ -284,19 +372,40 @@ sap.ui.define([
 		switch (Object.keys(oBody).length === 1 && Object.keys(oBody)[0]) {
 			case "EMPLOYEE_2_MANAGER@odata.bind": {
 				const oChild = mNodeById[aMatches[1]];
+				if (oChild.Name.includes("ERROR")) {
+					throw new Error("This request intentionally failed!");
+				}
+
 				const sParentId = oBody["EMPLOYEE_2_MANAGER@odata.bind"]
 					.slice("EMPLOYEES('".length, -"')".length);
-				//TODO prevent cycles!
+				for (let sId = sParentId; sId; sId = mNodeById[sId].MANAGER_ID) {
+					if (sId === oChild.ID) { // cycle detected
+						throw new Error("Parent must not be a descendant of moved node");
+					}
+				}
 
 				if (oChild.MANAGER_ID) {
 					const aChildren = mChildrenByParentId[oChild.MANAGER_ID];
 					aChildren.splice(aChildren.indexOf(oChild), 1);
+					if (!aChildren.length) { // last child has gone
+						delete mChildrenByParentId[oChild.MANAGER_ID];
+						mNodeById[oChild.MANAGER_ID].DrillState = "leaf";
+					}
+					adjustDescendantCount(oChild.MANAGER_ID, -(oChild.DescendantCount + 1));
+				} // else: cannot really happen w/ a single root and no cycles!
+
+				if (!(sParentId in mChildrenByParentId)) { // new parent not a leaf anymore
+					mNodeById[sParentId].DrillState = "collapsed"; // @see #reset
 				}
 				//TODO Note: "AGE determines sibling order (ascending)"
 				(mChildrenByParentId[sParentId] ??= []).push(oChild);
-
 				oChild.MANAGER_ID = sParentId;
-				//TODO update position in aAllNodes!
+				adjustDescendantCount(sParentId, oChild.DescendantCount + 1);
+				adjustDistanceFromRoot(oChild,
+					mNodeById[sParentId].DistanceFromRoot + 1 - oChild.DistanceFromRoot);
+				const aSpliced
+					= aAllNodes.splice(aAllNodes.indexOf(oChild), oChild.DescendantCount + 1);
+				aAllNodes.splice(aAllNodes.indexOf(mNodeById[sParentId]) + 1, 0, ...aSpliced);
 				break;
 			}
 
@@ -322,15 +431,15 @@ sap.ui.define([
 		// {"EMPLOYEE_2_MANAGER@odata.bind" : "EMPLOYEES('0')"}
 		const oBody = JSON.parse(oRequest.requestBody);
 		const sParentId = oBody["EMPLOYEE_2_MANAGER@odata.bind"]
-			.slice("EMPLOYEES('".length, -"')".length);
+			?.slice("EMPLOYEES('".length, -"')".length);
 		const oParent = mNodeById[sParentId];
 		const oNewChild = { // same order of keys than for "old" nodes ;-)
 			AGE : 0, // see below
 			ID : "", // see below
 			Name : "", // Q: Derive default from parent's Name? A: No, it's editable!
-			DistanceFromRoot : oParent.DistanceFromRoot + 1,
+			DistanceFromRoot : oParent ? oParent.DistanceFromRoot + 1 : 0,
 			DrillState : "leaf",
-			MANAGER_ID : sParentId,
+			MANAGER_ID : sParentId ?? null,
 			DescendantCount : 0
 		};
 
@@ -346,11 +455,15 @@ sap.ui.define([
 			} else { // sParentId === "0"
 				oNewChild.ID = "" + (parseInt(sLastChildID) + 1);
 			}
-		} else { // parent not a leaf anymore
-			oParent.DrillState = "expanded";
+		} else if (sParentId) { // parent not a leaf anymore
+			oParent.DrillState = "collapsed"; // @see #reset
 			mChildrenByParentId[sParentId] = [];
 			oNewChild.AGE = oParent.AGE - 1;
 			oNewChild.ID = sParentId + ".1";
+		} else { // new root
+			const iRootCount = aAllNodes.filter((oNode) => oNode.MANAGER_ID === null).length;
+			oNewChild.AGE = 60 + iRootCount;
+			oNewChild.ID = "0ABCDEFGHIJKLMNOPQRSTUVWXYZ"[iRootCount];
 		}
 
 		if (oNewChild.ID in mNodeById) {
@@ -359,12 +472,31 @@ sap.ui.define([
 		aAllNodes.push(oNewChild); //TODO not good enough once we need "refresh"
 		mNodeById[oNewChild.ID] = oNewChild;
 		mRevisionOfAgeById[oNewChild.ID] = 0;
-		// Note: server's insert position must not affect UI (until refresh!)
-		mChildrenByParentId[sParentId].push(oNewChild);
+		if (sParentId) {
+			// Note: server's insert position must not affect UI (until refresh!)
+			mChildrenByParentId[sParentId].push(oNewChild);
+			adjustDescendantCount(sParentId, +1);
+		}
 
 		oResponse.message = JSON.stringify(SandboxModel.update([oNewChild])[0]);
 	}
 
+	/**
+	 * Gets the query options as a map from the given URL query part.
+	 *
+	 * @param {string} sQuery - Query part of a URL
+	 * @returns {Object<string,string>} Map of query options
+	 */
+	function getQueryOptions(sQuery) {
+		const mQueryOptions = {};
+		for (const sName_Value of sQuery.split("&")) {
+			const [sName, ...aValues] = sName_Value.split("=");
+			mQueryOptions[sName] = aValues.join("=");
+		}
+
+		return mQueryOptions;
+	}
+
 	/**
 	 * Fills the given response object from the given list of rows, taking $select, $count, $skip,
 	 * and $top into account.
@@ -390,6 +522,7 @@ sap.ui.define([
 		}
 		const iSkip = "$skip" in mQueryOptions ? parseInt(mQueryOptions.$skip) : 0;
 		const iTop = "$top" in mQueryOptions ? parseInt(mQueryOptions.$top) : Infinity;
+		// Note: bSkipCopy due to select
 		oMessage.value = SandboxModel.update(aRows.slice(iSkip, iSkip + iTop).map(select), true);
 		oResponse.message = JSON.stringify(oMessage);
 	}