@openui5/sap.ui.core 1.120.0 → 1.120.2

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

@@ -76,8 +76,19 @@ sap.ui.require([
 						message : "ID must not be empty",
 						type : MessageType.Warning
 					}]);
+					// toggle filter for messages
+					Then.onAnyTable.checkMessageStrip("parts", "Warning");
+					When.onTheObjectPage.toggleMessageFilter();
+					Then.onTheObjectPage.checkPartsLength(2);
+					Then.onTheObjectPage.checkPartsTableTitle("Product: 10, 0 Parts");
+					Then.onTheObjectPage.checkPart(0, "", "Inactive");
+					Then.onTheObjectPage.checkPart(1, "", "Inactive");
+					Then.onTheObjectPage.checkPartIDValueState("Warning", 1);
+					When.onTheObjectPage.toggleMessageFilter();
 					// reset edited inactive row
 					When.onTheObjectPage.pressResetOrDeletePartButton(1);
+					Then.onTheObjectPage.checkPartsLength(5);
+					Then.onAnyTable.checkMessageStrip("parts");
 					Then.onTheObjectPage.checkPart(1, "", "Inactive", "");
 					When.onTheObjectPage.enterPartDescription(1, "Part 99");
 					Then.onTheMessagePopover.checkMessages([{
@@ -192,8 +203,20 @@ sap.ui.require([
 						message : "ID must not be empty",
 						type : MessageType.Warning
 					}]);
+					// toggle filter for messages
+					Then.onAnyTable.checkMessageStrip("parts", "Warning");
+					When.onTheObjectPage.toggleMessageFilter();
+					Then.onTheObjectPage.checkPartsLength(2);
+					Then.onTheObjectPage.checkPartsTableTitle("Product: 10, 0 Parts");
+					Then.onTheObjectPage.checkPart(0, "", "Inactive");
+					Then.onTheObjectPage.checkPart(1, "", "Inactive");
+					Then.onTheObjectPage.checkPartIDValueState("Warning", 0);
+					When.onTheObjectPage.toggleMessageFilter();
+
 					// reset edited inactive row
 					When.onTheObjectPage.pressResetOrDeletePartButton(3);
+					Then.onAnyTable.checkMessageStrip("parts");
+					Then.onTheObjectPage.checkPartsLength(5);
 					Then.onTheObjectPage.checkPart(3, "", "Inactive", "");
 					When.onTheObjectPage.enterPartDescription(3, "Part 99");
 					Then.onTheMessagePopover.checkMessages([{

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

@@ -5,12 +5,47 @@ sap.ui.define([
 	"sap/ui/core/sample/common/Helper",
 	"sap/ui/test/Opa5",
 	"sap/ui/test/actions/Press",
+	"sap/ui/test/matchers/Ancestor",
 	"sap/ui/test/matchers/Properties"
-], function (Helper, Opa5, Press, Properties) {
+
+], function (Helper, Opa5, Press, Ancestor, Properties) {
 	"use strict";
 	var sViewName = "sap.ui.core.sample.odata.v4.MultipleInlineCreationRowsGrid.Main";
 
 	Opa5.createPageObjects({
+		onAnyTable : {
+			assertions : {
+				checkMessageStrip : function (sTableId, sExpectedMessageType) {
+					this.waitFor({
+						controlType : "sap.m.Table",
+						id : sTableId,
+						success : function (oTable) {
+							this.waitFor({
+								controlType : "sap.m.MessageStrip",
+								matchers : new Ancestor(oTable),
+								success : function (aControls) {
+									var oMessageStrip = aControls[0];
+
+									if (oMessageStrip.getVisible()) {
+										Opa5.assert.strictEqual(oMessageStrip.getType(),
+											sExpectedMessageType,
+											"Message strip in table " + sTableId
+											+ " shows correct message type: "
+											+ sExpectedMessageType);
+									} else {
+										Opa5.assert.strictEqual(sExpectedMessageType, undefined,
+											"Message strip in table " + sTableId + " is invisible");
+									}
+								},
+								viewName : sViewName,
+								visible : false
+							});
+						},
+						viewName : sViewName
+					});
+				}
+			}
+		},
 		onTheListReport : {
 			actions : {
 				enterProductId : function (iRow, sId, bPressSave) {
@@ -125,6 +160,24 @@ sap.ui.define([
 				enterPartDescription : function (iRow, sId) {
 					Helper.changeInputValue(this, sViewName, /description/, sId, iRow);
 				},
+				toggleMessageFilter : function () {
+					this.waitFor({
+						controlType : "sap.m.Table",
+						id : "parts",
+						success : function (oTable) {
+							this.waitFor({
+								actions : new Press(),
+								matchers : new Ancestor(oTable),
+								controlType : "sap.m.Link",
+								success : function (aLinks) {
+									Opa5.assert.ok(true, "Link pressed: " + aLinks[0].getText());
+								},
+								viewName : sViewName
+							});
+						},
+						viewName : sViewName
+					});
+				},
 				pressCancel : function () {
 					Helper.pressButton(this, sViewName, "cancel");
 				},
@@ -150,6 +203,10 @@ sap.ui.define([
 				}
 			},
 			assertions : {
+				checkPartIDValueState : function (sValueState, iRow) {
+					Helper.checkValueState(this, sViewName, /partId-__clone/, sValueState,
+						undefined, false, iRow || 0);
+				},
 				checkPartsLength : function (iExpectedLength) {
 					this.waitFor({
 						controlType : "sap.ui.table.Table",

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

@@ -71,52 +71,79 @@ sap.ui.define([
 				|| oUriParameters.get("expandTo");
 			this._oAggregation = {
 				expandTo : sExpandTo === "*"
-					? Number.MAX_SAFE_INTEGER
-					: parseInt(sExpandTo || "3"),
+					? 999
+					: parseFloat(sExpandTo || "3"), // Note: parseInt("1E16") === 1
 				hierarchyQualifier : "OrgChart"
 			};
+			const sTreeTable = oUriParameters.get("TreeTable");
 			const sVisibleRowCount = TestUtils.retrieveData( // controlled by OPA
 					"sap.ui.core.sample.odata.v4.RecursiveHierarchy.visibleRowCount")
 				|| oUriParameters.get("visibleRowCount");
 
 			const oTable = this.byId("table");
-			if (sVisibleRowCount) {
-				oTable.getRowMode().setRowCount(parseInt(sVisibleRowCount));
+			if (sTreeTable === "Y") {
+				oTable.unbindRows();
+				oTable.setVisible(false);
+			} else {
+				if (sVisibleRowCount) {
+					oTable.getRowMode().setRowCount(parseInt(sVisibleRowCount));
+				}
+				const oRowsBinding = oTable.getBinding("rows");
+				oRowsBinding.setAggregation(this._oAggregation);
+				oRowsBinding.resume();
+				oRowsBinding.attachCreateSent(() => {
+					oTable.setBusy(true);
+				});
+				oRowsBinding.attachCreateCompleted(() => {
+					oTable.setBusy(false);
+				});
 			}
-			const oRowsBinding = oTable.getBinding("rows");
-			oRowsBinding.setAggregation(this._oAggregation);
-			oRowsBinding.resume();
-			oRowsBinding.attachCreateSent(() => {
-				oTable.setBusy(true);
-			});
-			oRowsBinding.attachCreateCompleted(() => {
-				oTable.setBusy(false);
-			});
 
 			const oTreeTable = this.byId("treeTable");
-			// enable V4 tree table flag
-			oTreeTable._oProxy._bEnableV4 = true;
-			if (sVisibleRowCount) {
-				oTreeTable.getRowMode().setRowCount(parseInt(sVisibleRowCount));
+			if (sTreeTable === "N") {
+				oTreeTable.unbindRows();
+				oTreeTable.setVisible(false);
+			} else {
+				// enable V4 tree table flag
+				oTreeTable._oProxy._bEnableV4 = true;
+				if (sVisibleRowCount) {
+					oTreeTable.getRowMode().setRowCount(parseInt(sVisibleRowCount));
+				}
+				const oTreeRowsBinding = oTreeTable.getBinding("rows");
+				oTreeRowsBinding.setAggregation(this._oAggregation);
+				oTreeRowsBinding.resume();
+				oTreeRowsBinding.attachCreateSent(() => {
+					oTreeTable.setBusy(true);
+				});
+				oTreeRowsBinding.attachCreateCompleted(() => {
+					oTreeTable.setBusy(false);
+				});
+			}
+
+			this.initMessagePopover(sTreeTable === "N" ? "table" : "treeTable");
+		},
+
+		onMakeRoot : async function (oEvent) {
+			try {
+				this.getView().setBusy(true);
+				await oEvent.getSource().getBindingContext().move();
+			} catch (oError) {
+				MessageBox.alert(oError.message, {icon : MessageBox.Icon.ERROR, title : "Error"});
+			} finally {
+				this.getView().setBusy(false);
 			}
-			const oTreeRowsBinding = oTreeTable.getBinding("rows");
-			oTreeRowsBinding.setAggregation(this._oAggregation);
-			oTreeRowsBinding.resume();
-			oTreeRowsBinding.attachCreateSent(() => {
-				oTreeTable.setBusy(true);
-			});
-			oTreeRowsBinding.attachCreateCompleted(() => {
-				oTreeTable.setBusy(false);
-			});
 		},
 
 		onMove : function (oEvent) {
-			this.oNode = oEvent.getSource().getBindingContext();
+			this._bInTreeTable = false;
+			this._oNode = oEvent.getSource().getBindingContext();
 			const oSelectDialog = this.byId("moveDialog");
-			oSelectDialog.setBindingContext(this.oNode);
+			oSelectDialog.setBindingContext(this._oNode);
 			const oListBinding = oSelectDialog.getBinding("items");
 			if (oListBinding.isSuspended()) {
 				oListBinding.resume();
+			} else {
+				oListBinding.refresh();
 			}
 			oSelectDialog.open();
 		},
@@ -126,9 +153,22 @@ sap.ui.define([
 				this.getView().setBusy(true);
 				const sParentId = oEvent.getParameter("selectedItem").getBindingContext()
 					.getProperty("ID");
-				const oParent = this.oNode.getBinding().getAllCurrentContexts()
+				const oParent = this._oNode.getBinding().getAllCurrentContexts()
 					.find((oNode) => oNode.getProperty("ID") === sParentId);
-				await this.oNode.move({parent : oParent});
+				if (!oParent) {
+					throw new Error(`Parent ${sParentId} not yet loaded`);
+				}
+
+				await this._oNode.move({parent : oParent});
+
+				const oTable = this.byId(this._bInTreeTable ? "treeTable" : "table");
+				const iParentIndex = oParent.getIndex();
+				if (iParentIndex < oTable.getFirstVisibleRow()
+					|| iParentIndex + 1
+						>= oTable.getFirstVisibleRow() + oTable.getRowMode().getRowCount()) {
+					// make sure parent & child are visible
+					oTable.setFirstVisibleRow(iParentIndex);
+				}
 			} catch (oError) {
 				MessageBox.alert(oError.message, {icon : MessageBox.Icon.ERROR, title : "Error"});
 			} finally {
@@ -136,6 +176,11 @@ sap.ui.define([
 			}
 		},
 
+		onMoveInTreeTable : function (oEvent) {
+			this.onMove(oEvent);
+			this._bInTreeTable = true;
+		},
+
 		onNameChanged : function (oEvent) {
 			const oContext = oEvent.getSource().getBindingContext();
 			if (oContext.hasPendingChanges()) {

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

@@ -89,6 +89,12 @@
 				<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"/>
+			</template>
+		</Column>
 	</Table>
 
 	<TreeTable id="treeTable" ariaLabelledBy="treeTitle"
@@ -153,7 +159,7 @@
 		</Column>
 		<Column width="4em">
 			<template>
-				<m:Button icon="sap-icon://move" id="moveInTreeTable" press=".onMove"
+				<m:Button icon="sap-icon://move" id="moveInTreeTable" press=".onMoveInTreeTable"
 					tooltip="Move"/>
 			</template>
 		</Column>
@@ -163,6 +169,12 @@
 					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"/>
+			</template>
+		</Column>
 	</TreeTable>
 
 	<mvc:dependents>
@@ -172,4 +184,10 @@
 			<m:StandardListItem title="{ID} ({Name})" type="Active" />
 		</m:SelectDialog>
 	</mvc:dependents>
+
+	<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>visibleRowCount&lt;/code> A number; default 5
+			&lt;li> &lt;code>TreeTable&lt;/code> 'Y' for yes, 'N' for no; default both tables"/>
 </mvc:View>

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

@@ -278,7 +278,22 @@ sap.ui.define([
 				const iLevels = mQueryOptions.$apply.includes(",Levels=")
 					? parseInt(mQueryOptions.$apply.match(/,Levels=(\d+)/)[1])
 					: Infinity;
-				selectCountSkipTop(topLevels(iLevels - 1), mQueryOptions, oResponse);
+				let aRows = topLevels(iLevels - 1); // 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]) {
+							oNode.LimitedRank = "" + i; // Edm.Int64
+							return true;
+						}
+					});
+				}
+				selectCountSkipTop(aRows, mQueryOptions, oResponse);
 				return;
 			}
 			// "EMPLOYEES?$apply=descendants($root/EMPLOYEES,OrgChart,ID"
@@ -377,10 +392,12 @@ sap.ui.define([
 				}
 
 				const sParentId = oBody["EMPLOYEE_2_MANAGER@odata.bind"]
-					.slice("EMPLOYEES('".length, -"')".length);
-				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");
+					?.slice("EMPLOYEES('".length, -"')".length);
+				if (sParentId) {
+					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");
+						}
 					}
 				}
 
@@ -394,18 +411,27 @@ sap.ui.define([
 					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
+				if (sParentId) {
+					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);
+					adjustDescendantCount(sParentId, oChild.DescendantCount + 1);
 				}
-				//TODO Note: "AGE determines sibling order (ascending)"
-				(mChildrenByParentId[sParentId] ??= []).push(oChild);
 				oChild.MANAGER_ID = sParentId;
-				adjustDescendantCount(sParentId, oChild.DescendantCount + 1);
+				const iParentDistanceFromRoot = sParentId
+					? mNodeById[sParentId].DistanceFromRoot
+					: 0;
 				adjustDistanceFromRoot(oChild,
-					mNodeById[sParentId].DistanceFromRoot + 1 - oChild.DistanceFromRoot);
+					iParentDistanceFromRoot + 1 - oChild.DistanceFromRoot);
 				const aSpliced
 					= aAllNodes.splice(aAllNodes.indexOf(oChild), oChild.DescendantCount + 1);
-				aAllNodes.splice(aAllNodes.indexOf(mNodeById[sParentId]) + 1, 0, ...aSpliced);
+				const iNewIndex = sParentId
+					? aAllNodes.indexOf(mNodeById[sParentId]) + 1
+					: 0;
+				aAllNodes.splice(iNewIndex, 0, ...aSpliced);
 				break;
 			}
 
@@ -428,11 +454,36 @@ sap.ui.define([
 	 * @param {object} oRequest - Request object to get POST body from
 	 */
 	function buildPostResponse(_aMatches, oResponse, oRequest) {
+		function parseLastSegment(sId) {
+			if (sId.includes(".")) {
+				sId = sId.slice(sId.lastIndexOf(".") + 1);
+			}
+
+			return parseInt(sId);
+		}
+
+		// compares two hierarchical IDs according to the last(!) segment (numerically, ascending)
+		function compareByID(oNodeA, oNodeB) {
+			return parseLastSegment(oNodeA.ID) - parseLastSegment(oNodeB.ID);
+		}
+
+		function isChildID(sChildID, sParentId) {
+			return sChildID !== sParentId
+				&& (sParentId === "0"
+					? !sChildID.includes(".")
+					: sChildID.startsWith(sParentId)
+						&& !sChildID.slice(sParentId.length + 1).includes("."));
+		}
+
 		// {"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);
 		const oParent = mNodeById[sParentId];
+		if (sParentId && !oParent) {
+			throw new Error("Invalid parent ID: " + sParentId);
+		}
+
 		const oNewChild = { // same order of keys than for "old" nodes ;-)
 			AGE : 0, // see below
 			ID : "", // see below
@@ -443,23 +494,28 @@ sap.ui.define([
 			DescendantCount : 0
 		};
 
-		if (sParentId in mChildrenByParentId) {
-			// Note: "AGE determines sibling order (ascending)"
-			oNewChild.AGE = mChildrenByParentId[sParentId][0].AGE - 1;
-			//TODO use "largest" child ID which is hierarchical to parent? cf. move!
-			// .../c/openui5/+/5940246/6/src/sap.ui.core/test/sap/ui/core/demokit/sample/odata/v4/RecursiveHierarchy/SandboxModel.js#b302
-			const sLastChildID = mChildrenByParentId[sParentId].at(-1).ID;
-			if (sLastChildID.includes(".")) {
-				oNewChild.ID = sParentId + "."
-					+ (parseInt(sLastChildID.slice(sLastChildID.lastIndexOf(".") + 1)) + 1);
-			} else { // sParentId === "0"
-				oNewChild.ID = "" + (parseInt(sLastChildID) + 1);
+		if (sParentId) {
+			if (sParentId in mChildrenByParentId) {
+				// Note: "AGE determines sibling order (ascending)"
+				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
+				.filter((oChild) => isChildID(oChild.ID, sParentId))
+				.sort(compareByID)
+				.at(-1)?.ID;
+			if (sLastChildID === undefined) {
+				oNewChild.ID = sParentId + ".1";
+			} else if (sParentId === "0") {
+				oNewChild.ID = "" + (parseLastSegment(sLastChildID) + 1);
+			} else {
+				oNewChild.ID = sParentId + "." + (parseLastSegment(sLastChildID) + 1);
 			}
-		} 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;

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

@@ -399,11 +399,11 @@
 				<Annotation Qualifier="OrgChart" Term="com.sap.vocabularies.Hierarchy.v1.RecursiveHierarchy">
 					<Record>
 						<!--Edm.Int64-->
-						<PropertyValue Property="DistanceFromRootProperty" PropertyPath="DistanceFromRoot"/>
+						<PropertyValue Property="DistanceFromRoot" Path="DistanceFromRoot"/>
 						<!--Edm.String: collapsed,expanded,leaf-->
-						<PropertyValue Property="DrillStateProperty" PropertyPath="DrillState"/>
+						<PropertyValue Property="DrillState" Path="DrillState"/>
 						<!--Edm.Int64-->
-						<PropertyValue Property="LimitedDescendantCountProperty" PropertyPath="DescendantCount"/>
+						<PropertyValue Property="LimitedDescendantCount" Path="DescendantCount"/>
 					</Record>
 				</Annotation>
 			</Annotations>

package/test/sap/ui/core/demokit/tutorial/databinding/01/Component.js

@@ -1,26 +1,10 @@
-sap.ui.define(['sap/ui/core/UIComponent'],
-	function (UIComponent) {
-		"use strict";
-
-		var Component = UIComponent.extend("sap.ui.core.tutorial.databinding.01.Component", {
-
-			metadata: {
-				config: {
-					sample: {
-						iframe: "webapp/index.html",
-						stretch: true,
-						files: [
-							"webapp/index.html",
-							"webapp/index.js",
-							"ui5.yaml",
-							"package.json"
-						]
-					}
-				}
-			}
-
-		});
-
-		return Component;
-
+sap.ui.define([
+	"sap/ui/core/UIComponent"
+], (UIComponent) => {
+	"use strict";
+	return UIComponent.extend("sap.ui.core.tutorial.databinding.01.Component", {
+		metadata: {
+			manifest: "json"
+		}
 	});
+});

package/test/sap/ui/core/demokit/tutorial/databinding/01/manifest.json

@@ -0,0 +1,20 @@
+{
+	"sap.app": {
+		"id": "sap.ui.core.tutorial.databinding.01"
+	},
+	"sap.ui5": {
+		"config": {
+			"sample": {
+				"iframe": "webapp/index.html",
+				"stretch": true,
+				"files": [
+					"webapp/index.html",
+					"webapp/index.js",
+					"webapp/manifest.json",
+					"ui5.yaml",
+					"package.json"
+				]
+			}
+		}
+	}
+}

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

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

package/test/sap/ui/core/demokit/tutorial/databinding/01/webapp/manifest.json

@@ -0,0 +1,5 @@
+{
+	"sap.app": {
+		"id": "ui5.databinding"
+	}
+}

package/test/sap/ui/core/demokit/tutorial/databinding/02/Component.js

@@ -1,26 +1,10 @@
-sap.ui.define(['sap/ui/core/UIComponent'],
-	function (UIComponent) {
-		"use strict";
-
-		var Component = UIComponent.extend("sap.ui.core.tutorial.databinding.02.Component", {
-
-			metadata: {
-				config: {
-					sample: {
-						iframe: "webapp/index.html",
-						stretch: true,
-						files: [
-							"webapp/index.html",
-							"webapp/index.js",
-							"ui5.yaml",
-							"package.json"
-						]
-					}
-				}
-			}
-
-		});
-
-		return Component;
-
+sap.ui.define([
+	"sap/ui/core/UIComponent"
+], (UIComponent) => {
+	"use strict";
+	return UIComponent.extend("sap.ui.core.tutorial.databinding.02.Component", {
+		metadata: {
+			manifest: "json"
+		}
 	});
+});

package/test/sap/ui/core/demokit/tutorial/databinding/02/manifest.json

@@ -0,0 +1,20 @@
+{
+	"sap.app": {
+		"id": "sap.ui.core.tutorial.databinding.02"
+	},
+	"sap.ui5": {
+		"config": {
+			"sample": {
+				"iframe": "webapp/index.html",
+				"stretch": true,
+				"files": [
+					"webapp/index.html",
+					"webapp/index.js",
+					"webapp/manifest.json",
+					"ui5.yaml",
+					"package.json"
+				]
+			}
+		}
+	}
+}

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

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

package/test/sap/ui/core/demokit/tutorial/databinding/02/webapp/manifest.json

@@ -0,0 +1,5 @@
+{
+	"sap.app": {
+		"id": "ui5.databinding"
+	}
+}

package/test/sap/ui/core/demokit/tutorial/databinding/03/Component.js

@@ -1,26 +1,10 @@
-sap.ui.define(['sap/ui/core/UIComponent'],
-	function (UIComponent) {
-		"use strict";
-
-		var Component = UIComponent.extend("sap.ui.core.tutorial.databinding.03.Component", {
-
-			metadata: {
-				config: {
-					sample: {
-						iframe: "webapp/index.html",
-						stretch: true,
-						files: [
-							"webapp/index.html",
-							"webapp/index.js",
-							"ui5.yaml",
-							"package.json"
-						]
-					}
-				}
-			}
-
-		});
-
-		return Component;
-
+sap.ui.define([
+	"sap/ui/core/UIComponent"
+], (UIComponent) => {
+	"use strict";
+	return UIComponent.extend("sap.ui.core.tutorial.databinding.03.Component", {
+		metadata: {
+			manifest: "json"
+		}
 	});
+});