@openui5/sap.ui.core 1.120.10 → 1.121.1

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

@@ -111,6 +111,12 @@ sap.ui.define([
 
 			oView.setModel(oView.getModel(), "header");
 			oView.setBindingContext(oRowsBinding.getHeaderContext(), "header");
+
+			this.initMessagePopover("table");
+		},
+
+		onRefresh : function () {
+			this.byId("table").getBinding("rows").refresh();
 		},
 
 		onSort : function () {
@@ -138,6 +144,10 @@ sap.ui.define([
 
 			this.getView().getModel("ui").setProperty("/sIcon", sNewIcon);
 			this.byId("table").getBinding("rows").sort(oSorter);
+		},
+
+		onSynchronize : function () {
+			this.byId("table").getBinding("rows").getHeaderContext().requestSideEffects([""]);
 		}
 	});
 });

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

@@ -15,6 +15,9 @@
 				<m:Button icon="sap-icon://excel-attachment" press="onExport"
 					tooltip="Export To Spreadsheet"/>
 				<m:ToolbarSpacer/>
+				<m:Button icon="sap-icon://refresh" press="onRefresh" tooltip="Refresh"/>
+				<m:Button icon="sap-icon://synchronize" press="onSynchronize"
+					tooltip="Synchronize"/>
 				<m:SearchField placeholder="Hobby contains..." search="onFilter"
 					value="{ui>/sFilter}" width="40%"/>
 			</m:Toolbar>

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

@@ -2,7 +2,6 @@
  * ${copyright}
  */
 sap.ui.define([
-	"./Formatter", // make it available to the view
 	"sap/f/library",
 	"sap/m/MessageBox",
 	"sap/m/MessageToast",
@@ -14,7 +13,7 @@ sap.ui.define([
 	"sap/ui/model/Sorter",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/test/TestUtils"
-], function (_Formatter, library, MessageBox, MessageToast, Messaging, UI5Date, Controller, Filter,
+], function (library, MessageBox, MessageToast, Messaging, UI5Date, Controller, Filter,
 		FilterOperator, Sorter, JSONModel, TestUtils) {
 	"use strict";
 

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

@@ -1,8 +1,11 @@
 <mvc:View
 	class="sapUiSizeCompact"
 	controllerName="sap.ui.core.sample.odata.v4.FlexibleColumnLayout.Main"
-	xmlns="sap.m" xmlns:f="sap.f" xmlns:form="sap.ui.layout.form" xmlns:mvc="sap.ui.core.mvc"
-	xmlns:plugins="sap.m.plugins">
+	xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:f="sap.f" xmlns:form="sap.ui.layout.form"
+	xmlns:mvc="sap.ui.core.mvc" xmlns:plugins="sap.m.plugins"
+	core:require="{
+		formatRowHighlight : 'sap/ui/core/sample/odata/v4/FlexibleColumnLayout/formatRowHighlight'
+	}">
 	<App>
 	<Page floatingFooter="true" id="page" showHeader="false">
 	<Toolbar>
@@ -158,7 +161,7 @@
 									'messages>/',
 									{mode : 'OneTime', path : '', targetType : 'any'}
 								],
-								formatter : 'sap.ui.core.sample.odata.v4.FlexibleColumnLayout.Formatter.formatRowHighlight'
+								formatter : 'formatRowHighlight'
 							}" >
 						<Text text="{ProductID}"/>
 						<Text id="itemPosition" text="{ItemPosition}"/>

package/test/sap/ui/core/demokit/sample/odata/v4/FlexibleColumnLayout/formatRowHighlight.js

@@ -0,0 +1,20 @@
+/*!
+ * ${copyright}
+ */
+sap.ui.define([], function () {
+	"use strict";
+
+	return function (_aAllMessages, _oRowData) {
+		var aMessages,
+			// 'this' is the control!
+			oRowContext = this.getBindingContext();
+
+		if (oRowContext) { // formatter is called with oRowContext null initially
+			aMessages = oRowContext.getMessages();
+			if (aMessages.length) {
+				return aMessages[0].type;
+			}
+		}
+		return null;
+	};
+}, true);

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

@@ -8,6 +8,22 @@ sap.ui.define([
 	"use strict";
 
 	return Controller.extend("sap.ui.core.sample.odata.v4.HierarchyBindAction.Main", {
+		onChangeHierarchy : function (oEvent) {
+			const oSource = oEvent.getSource();
+			const oContext = oSource.toString().includes("ODataListBinding")
+				? oSource.getAllCurrentContexts()[0]
+				: oSource.getSelectedItem().getBindingContext();
+			const oTreeTable = this.byId("table");
+			oTreeTable.setBindingContext(oContext);
+
+			const oRowsBinding = oTreeTable.getBinding("rows");
+			oRowsBinding.setAggregation(this._oAggregation);
+
+			const oView = this.getView();
+			oView.setModel(oView.getModel(), "header");
+			oView.setBindingContext(oRowsBinding.getHeaderContext(), "header");
+		},
+
 		onCreate : async function (oEvent) {
 			try {
 				const oParentContext = oEvent.getSource().getBindingContext();
@@ -27,22 +43,6 @@ sap.ui.define([
 			}
 		},
 
-		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();
@@ -60,9 +60,7 @@ sap.ui.define([
 
 		onInit : function () {
 			var oTreeTable = this.byId("table"),
-				oRowsBinding = oTreeTable.getBinding("rows"),
-				oUriParameters = new URLSearchParams(window.location.search),
-				oView = this.getView();
+				oUriParameters = new URLSearchParams(window.location.search);
 
 			oTreeTable._oProxy._bEnableV4 = true; // enable V4 tree table flag
 			const sVisibleRowCount = oUriParameters.get("visibleRowCount");
@@ -77,11 +75,11 @@ sap.ui.define([
 					: parseFloat(sExpandTo || "1"), // Note: parseInt("1E16") === 1
 				hierarchyQualifier : "I_SADL_BHV_BIND_DIR_HIERVIEW"
 			};
-			oRowsBinding.setAggregation(this._oAggregation);
-			oRowsBinding.resume();
 
-			oView.setModel(oView.getModel(), "header");
-			oView.setBindingContext(oRowsBinding.getHeaderContext(), "header");
+			this.byId("selectHierarchy").getBinding("items")
+				.attachEventOnce("dataReceived", this.onChangeHierarchy.bind(this));
+
+			this.initMessagePopover("table");
 		},
 
 		onMakeRoot : async function (oEvent) {
@@ -114,6 +112,10 @@ sap.ui.define([
 				const sParentId = oEvent.getParameter("selectedItem").getTitle();
 				const oParent = this.oNode.getBinding().getAllCurrentContexts()
 					.find((oNode) => oNode.getProperty("Id") === sParentId);
+				if (!oParent) {
+					throw new Error(`Parent ${sParentId} not yet loaded`);
+				}
+
 				await this.oNode.move({parent : oParent});
 			} catch (oError) {
 				MessageBox.alert(oError.message, {icon : MessageBox.Icon.ERROR, title : "Error"});
@@ -122,8 +124,12 @@ sap.ui.define([
 			}
 		},
 
+		onRefresh : function () {
+			this.byId("table").getBindingContext().refresh();
+		},
+
 		onSynchronize : function () {
-			this.byId("table").getBinding("rows").getHeaderContext().requestSideEffects(["*"]);
+			this.byId("table").getBinding("rows").getHeaderContext().requestSideEffects([""]);
 		}
 	});
 });

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

@@ -2,20 +2,27 @@
 	class="sapUiSizeCompact"
 	controllerName="sap.ui.core.sample.odata.v4.HierarchyBindAction.Main"
 	xmlns="sap.ui.table"
+	xmlns:core="sap.ui.core"
 	xmlns:m="sap.m"
 	xmlns:mvc="sap.ui.core.mvc"
 	xmlns:rm="sap.ui.table.rowmodes">
 
 	<TreeTable id="table" ariaLabelledBy="title"
-		rows="{path : '/I_SADL_BHV_HIER_BIND_DIRECTORY(\'1\')/_Hierarchy',
-			parameters : {$count : true, $$patchWithoutSideEffects : true}, suspended : true}"
+		rows="{path : '_Hierarchy', parameters : {$count : true, $$patchWithoutSideEffects : true}}"
 		selectionMode="None" threshold="0">
 		<extension>
 			<m:Toolbar design="Transparent" class="sapMTBHeader-CTX">
 				<m:Title id="title" level="H1" text="{header>$count} Items"/>
 				<m:ToolbarSpacer/>
+				<m:Select change="onChangeHierarchy" id="selectHierarchy"
+					items="{/I_SADL_BHV_HIER_BIND_DIRECTORY}">
+					<core:ListItem text="{Description} ({Hierarchy})"/>
+				</m:Select>
+				<m:ToolbarSpacer/>
 				<m:Button icon="sap-icon://create" press=".onCreateRoot" tooltip="Create New Root"/>
-				<m:Button icon="sap-icon://synchronize" press="onSynchronize" tooltip="Synchronize"/>
+				<m:Button icon="sap-icon://refresh" press="onRefresh" tooltip="Refresh"/>
+				<m:Button icon="sap-icon://synchronize" press="onSynchronize"
+					tooltip="Synchronize"/>
 			</m:Toolbar>
 		</extension>
 		<rowMode>
@@ -57,11 +64,6 @@
 					icon="sap-icon://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 id="move" icon="sap-icon://move" press=".onMove" tooltip="Move"/>

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

@@ -292,6 +292,7 @@ sap.ui.define([
 						oTable.setSelectedItem(oTable.getItems()[i]);
 						return true;
 					}
+					return false;
 				});
 			});
 

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

@@ -120,7 +120,7 @@ sap.ui.define([
 				oMessage = this.mCreateActivateMessages[oContext.getPath()],
 				that = this;
 
-			if (!oContext.getProperty("ID")) {
+			if (oContext.getProperty("ID") === null) {
 				// do not activate context if no ID is given
 				oEvent.preventDefault();
 				if (!oMessage) {

package/test/sap/ui/core/demokit/sample/odata/v4/MultipleInlineCreationRowsGrid/Opa.qunit.js

@@ -72,6 +72,7 @@ sap.ui.require([
 
 					// activate row 2
 					When.onTheObjectPage.enterPartDescription(1, "Part 99");
+					Then.onTheObjectPage.checkPartIDValueState("Warning", 1);
 					Then.onTheMessagePopover.checkMessages([{
 						message : "ID must not be empty",
 						type : MessageType.Warning
@@ -91,6 +92,7 @@ sap.ui.require([
 					Then.onAnyTable.checkMessageStrip("parts");
 					Then.onTheObjectPage.checkPart(1, "", "Inactive", "");
 					When.onTheObjectPage.enterPartDescription(1, "Part 99");
+					Then.onTheObjectPage.checkPartIDValueState("Warning", 1);
 					Then.onTheMessagePopover.checkMessages([{
 						message : "ID must not be empty",
 						type : MessageType.Warning
@@ -199,6 +201,7 @@ sap.ui.require([
 
 					// activate row 4
 					When.onTheObjectPage.enterPartDescription(3, "Part 99");
+					Then.onTheObjectPage.checkPartIDValueState("Warning", 3);
 					Then.onTheMessagePopover.checkMessages([{
 						message : "ID must not be empty",
 						type : MessageType.Warning
@@ -219,6 +222,7 @@ sap.ui.require([
 					Then.onTheObjectPage.checkPartsLength(5);
 					Then.onTheObjectPage.checkPart(3, "", "Inactive", "");
 					When.onTheObjectPage.enterPartDescription(3, "Part 99");
+					Then.onTheObjectPage.checkPartIDValueState("Warning", 3);
 					Then.onTheMessagePopover.checkMessages([{
 						message : "ID must not be empty",
 						type : MessageType.Warning
@@ -403,6 +407,7 @@ sap.ui.require([
 		Then.onTheObjectPage.checkPartsTableTitle("Product: 110, 0 Parts");
 
 		When.onTheObjectPage.enterPartDescription(0, "Part 50");
+		Then.onTheObjectPage.checkPartIDValueState("Warning", 0);
 		Then.onTheMessagePopover.checkMessages([{
 			message : "ID must not be empty",
 			type : MessageType.Warning
@@ -410,6 +415,7 @@ sap.ui.require([
 		When.onTheObjectPage.pressResetButton(sAtBinding ? "Parts" : "All");
 		Then.onTheObjectPage.checkPart(0, "", "Inactive", "");
 		When.onTheObjectPage.enterPartDescription(0, "Part 50");
+		Then.onTheObjectPage.checkPartIDValueState("Warning", 0);
 		Then.onTheMessagePopover.checkMessages([{
 			message : "ID must not be empty",
 			type : MessageType.Warning

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

@@ -40,22 +40,6 @@ sap.ui.define([
 			}
 		},
 
-		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();
@@ -71,7 +55,7 @@ sap.ui.define([
 				|| oUriParameters.get("expandTo");
 			this._oAggregation = {
 				expandTo : sExpandTo === "*"
-					? 999
+					? Number.MAX_SAFE_INTEGER
 					: parseFloat(sExpandTo || "3"), // Note: parseInt("1E16") === 1
 				hierarchyQualifier : "OrgChart"
 			};
@@ -79,6 +63,7 @@ sap.ui.define([
 			const sVisibleRowCount = TestUtils.retrieveData( // controlled by OPA
 					"sap.ui.core.sample.odata.v4.RecursiveHierarchy.visibleRowCount")
 				|| oUriParameters.get("visibleRowCount");
+			const sThreshold = oUriParameters.get("threshold");
 
 			const oTable = this.byId("table");
 			if (sTreeTable === "Y") {
@@ -88,6 +73,9 @@ sap.ui.define([
 				if (sVisibleRowCount) {
 					oTable.getRowMode().setRowCount(parseInt(sVisibleRowCount));
 				}
+				if (sThreshold) {
+					oTable.setThreshold(parseInt(sThreshold));
+				}
 				const oRowsBinding = oTable.getBinding("rows");
 				oRowsBinding.setAggregation(this._oAggregation);
 				oRowsBinding.resume();
@@ -109,6 +97,9 @@ sap.ui.define([
 				if (sVisibleRowCount) {
 					oTreeTable.getRowMode().setRowCount(parseInt(sVisibleRowCount));
 				}
+				if (sThreshold) {
+					oTable.setThreshold(parseInt(sThreshold));
+				}
 				const oTreeRowsBinding = oTreeTable.getBinding("rows");
 				oTreeRowsBinding.setAggregation(this._oAggregation);
 				oTreeRowsBinding.resume();
@@ -188,6 +179,14 @@ sap.ui.define([
 			} // else: invalid value (has not reached model)
 		},
 
+		onRefresh : function () {
+			this.byId("table").getBinding("rows").getHeaderContext().requestSideEffects([""]);
+		},
+
+		onRefreshTreeTable : function () {
+			this.byId("treeTable").getBinding("rows").getHeaderContext().requestSideEffects([""]);
+		},
+
 		onSynchronize : function () {
 			this.byId("table").getBinding("rows").getHeaderContext().requestSideEffects(["*"]);
 		},

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

@@ -10,7 +10,7 @@
 		rows="{path : '/EMPLOYEES',
 			parameters : {$count : false, $orderby : 'AGE', $$patchWithoutSideEffects : true},
 			suspended : true}"
-		selectionMode="None" threshold="5">
+		selectionMode="None">
 		<extension>
 			<m:Toolbar design="Transparent" class="sapMTBHeader-CTX">
 				<m:Title id="title" level="H1" text="Organizational Chart"/>
@@ -18,6 +18,8 @@
 				<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:Button icon="sap-icon://refresh" press="onRefresh"
+					tooltip="Refresh, while keeping tree state"/>
 			</m:Toolbar>
 		</extension>
 		<rowMode>
@@ -74,11 +76,6 @@
 					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"/>
@@ -101,7 +98,7 @@
 		rows="{path : '/EMPLOYEES',
 			parameters : {$count : false, $orderby : 'AGE', $$patchWithoutSideEffects : true},
 			suspended : true}"
-		selectionMode="None" threshold="5">
+		selectionMode="None">
 		<extension>
 			<m:Toolbar design="Transparent" class="sapMTBHeader-CTX">
 				<m:Title id="treeTitle" level="H1" text="Organizational Chart - TreeTable"/>
@@ -110,6 +107,8 @@
 					tooltip="Create New Root"/>
 				<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"/>
 			</m:Toolbar>
 		</extension>
 		<rowMode>
@@ -151,12 +150,6 @@
 					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 icon="sap-icon://move" id="moveInTreeTable" press=".onMoveInTreeTable"
@@ -189,5 +182,6 @@
 		&lt;ul>
 			&lt;li> &lt;code>expandTo&lt;/code> Either * for 'expand all' or a number; default 3
 			&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>TreeTable&lt;/code> 'Y' for yes, 'N' for no; default both tables
+			&lt;li> &lt;code>threshold&lt;/code> A number; default 0"/>
 </mvc:View>

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

@@ -19,7 +19,7 @@ sap.ui.define([
 						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=..$/,
+						regExp : /^GET [\w\/.]+\$metadata([\w?&\-=]+sap-language=..|)$/,
 						response : {source : "metadata.xml"}
 					}, {
 						regExp : /^GET \/sap\/opu\/odata4\/IWBEP\/TEA\/default\/IWBEP\/TEA_BUSI\/0001\/EMPLOYEES\?(.*)$/,
@@ -44,29 +44,29 @@ sap.ui.define([
 	// - ID is hierarchical (but we omit the "0." prefix)
 	// - Name follows Greek alphabet in preorder
 	// Αα  Alpha
-	// Ββ  Beta
-	// Γγ  Gamma
-	// Δδ  Delta
-	// Εε  Epsilon
-	// Ζζ  Zeta
-	// Ηη  Eta
-	// Θθ  Theta
-	// Ιι  Iota
-	// Κκ  Kappa
-	// Λλ  Lambda
-	// Μμ  Mu
-	// Νν  Nu
-	// Ξξ  Xi
-	// Οο  Omicron
-	// Ππ  Pi
-	// Ρρ  Rho
-	// Σσς Sigma
-	// Ττ  Tau
-	// Υυ  Upsilon
-	// Φφ  Phi
-	// Χχ  Chi
-	// Ψψ  Psi
-	// Ωω  Omega
+		// Ββ  Beta
+			// Γγ  Gamma
+				// Δδ  Delta
+				// Εε  Epsilon
+			// Ζζ  Zeta
+				// Ηη  Eta
+				// Θθ  Theta
+				// Ιι  Iota
+		// Κκ  Kappa
+		// Λλ  Lambda
+		// Μμ  Mu
+			// Νν  Nu
+		// Ξξ  Xi
+			// Οο  Omicron
+				// Ππ  Pi
+				// Ρρ  Rho
+				// Σσς Sigma
+				// Ττ  Tau
+				// Υυ  Upsilon
+				// Φφ  Phi
+				// Χχ  Chi
+				// Ψψ  Psi
+				// Ωω  Omega
 	const aOriginalData = [{
 		AGE : 60,
 		ID : "0",
@@ -268,6 +268,13 @@ sap.ui.define([
 	 */
 	function buildGetCollectionResponse(aMatches, oResponse) {
 		const mQueryOptions = getQueryOptions(aMatches[1]);
+		function getExpandLevels() {
+			if (mQueryOptions.$apply.includes("ExpandLevels")) {
+				let sExpandLevels = mQueryOptions.$apply.match(/,ExpandLevels=(.+)\)/)[1];
+				sExpandLevels = decodeURIComponent(sExpandLevels);
+				return new Map(JSON.parse(sExpandLevels).map((o) => [o.NodeID, o.Levels]));
+			}
+		}
 
 		if ("$apply" in mQueryOptions) {
 			if (mQueryOptions.$apply.includes("TopLevels")) {
@@ -278,7 +285,7 @@ sap.ui.define([
 				const iLevels = mQueryOptions.$apply.includes(",Levels=")
 					? parseInt(mQueryOptions.$apply.match(/,Levels=(\d+)/)[1])
 					: Infinity;
-				let aRows = topLevels(iLevels - 1); // Note: already cloned
+				let aRows = topLevels(iLevels - 1, getExpandLevels()); // Note: already cloned
 				if ("$filter" in mQueryOptions) {
 					// ID%20eq%20'1'
 					const aIDs = mQueryOptions.$filter.split("%20or%20")
@@ -291,6 +298,7 @@ sap.ui.define([
 							oNode.LimitedRank = "" + i; // Edm.Int64
 							return true;
 						}
+						return false;
 					});
 				}
 				selectCountSkipTop(aRows, mQueryOptions, oResponse);
@@ -375,7 +383,7 @@ sap.ui.define([
 		function adjustDistanceFromRoot(oNode, iDiff) {
 			oNode.DistanceFromRoot += iDiff;
 			(mChildrenByParentId[oNode.ID] || [])
-				.forEach((oChild) => adjustDistanceFromRoot(oChild, iDiff));
+				.forEach((oChild) => { adjustDistanceFromRoot(oChild, iDiff); });
 		}
 
 		if (oRequest.requestHeaders.Prefer !== "return=minimal") {
@@ -587,11 +595,27 @@ sap.ui.define([
 	 * Returns the hierarchy's top levels in preorder.
 	 *
 	 * @param {number} iMaxDistanceFromRoot - Maximum distance from root to include
+	 * @param {Map} [oExpandLevels] - Mapping of NodeID to Levels to be expanded
 	 * @returns {object[]} - List of node objects in preorder
 	 */
-	function topLevels(iMaxDistanceFromRoot) {
+	function topLevels(iMaxDistanceFromRoot, oExpandLevels = new Map()) {
+		function isAncestorCollapsed(oNode) {
+			const oParent = mNodeById[oNode.MANAGER_ID];
+			if (!oParent) {
+				return false;
+			}
+			return !isExpanded(oParent) || isAncestorCollapsed(oParent);
+		}
+
+		function isExpanded(oNode) {
+			if (oExpandLevels.has(oNode.ID)) {
+				return oExpandLevels.get(oNode.ID) > 0;
+			}
+			return oNode.DistanceFromRoot < iMaxDistanceFromRoot;
+		}
+
 		function limitedDescendantCount(oNode) {
-			const aChildren = oNode.DistanceFromRoot < iMaxDistanceFromRoot
+			const aChildren = isExpanded(oNode)
 				? mChildrenByParentId[oNode.ID] || [] // "expanded"
 				: [];
 
@@ -601,12 +625,22 @@ sap.ui.define([
 		}
 
 		return aAllNodes
-			.filter((oNode) => oNode.DistanceFromRoot <= iMaxDistanceFromRoot)
+			.filter((oNode) => {
+				if (isAncestorCollapsed(oNode)) {
+					return false; // node is not part of hierarchy if an ancestor is collapsed
+				}
+				if (oExpandLevels.get(oNode.MANAGER_ID) === 1) {
+					return true; // node is part of hierarchy if parent is expanded
+				}
+				return oNode.DistanceFromRoot <= iMaxDistanceFromRoot;
+			})
 			.map((oNode) => {
 				oNode = {...oNode, DescendantCount : limitedDescendantCount(oNode)};
-				if (oNode.DrillState === "collapsed"
-						&& oNode.DistanceFromRoot < iMaxDistanceFromRoot) {
+				const bIsExpanded = isExpanded(oNode);
+				if (oNode.DrillState === "collapsed" && bIsExpanded) {
 					oNode.DrillState = "expanded";
+				} else if (oNode.DrillState === "expanded" && !bIsExpanded) {
+					oNode.DrillState = "collapsed";
 				}
 				return oNode;
 			});

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

@@ -1172,6 +1172,7 @@ sap.ui.define([
 									new Press().executeOn(oNewItem);
 									return true;
 								}
+								return false;
 							});
 							Opa5.assert.ok(oNewItem, "Selected item: " + oNewItem.getText());
 						},

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

@@ -53,7 +53,7 @@ sap.ui.define([
 		/**
 		 * Adapt the given container control like table or form
 		 *
-		 * @param {oControl} [oControl]
+		 * @param {sap.m.Table|sap.ui.layout.form.SimpleForm} [oControl]
 		 *   The Container control
 		 * @param {number} [iStart]
 		 *   Index in the "items" or "content" aggregation of the container control: controls can be

package/test/sap/ui/core/demokit/tutorial/databinding/01/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.10" #MainVersion#
+  version: "1.121.1" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.ui.layout

package/test/sap/ui/core/demokit/tutorial/databinding/02/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.10" #MainVersion#
+  version: "1.121.1" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.ui.layout

package/test/sap/ui/core/demokit/tutorial/databinding/03/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.10" #MainVersion#
+  version: "1.121.1" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.ui.layout

package/test/sap/ui/core/demokit/tutorial/databinding/04/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.10" #MainVersion#
+  version: "1.121.1" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.ui.layout