@openui5/sap.ui.core 1.115.1 → 1.117.0

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

@@ -0,0 +1,134 @@
+{
+	"_version" : "1.115.0",
+	"sap.app" : {
+		"ach" : "CA-UI5-COR",
+		"applicationVersion" : {
+			"version" : "${version}"
+		},
+		"description" : "Demo Application for Deep Create",
+		"dataSources" : {
+			"default" : {
+				"uri" : "/sap/opu/odata4/sap/zui5_testv4/default/sap/zui5_epm_sample/0002/",
+				"type" : "OData"
+			}
+		},
+		"id" : "sap.ui.core.sample.odata.v4.DeepCreate",
+		"title" : "Deep Create Application",
+		"type" : "application"
+	},
+	"sap.ui" : {
+		"deviceTypes" : {
+			"desktop" : true,
+			"phone" : true,
+			"tablet" : true
+		},
+		"technology" : "UI5"
+	},
+	"sap.ui5" : {
+		"config" : {
+			"sample" : {
+				"files" : [
+					"Component.js",
+					"ListReport.controller.js",
+					"ListReport.view.xml",
+					"Main.controller.js",
+					"Main.view.xml",
+					"manifest.json",
+					"NotFound.view.xml",
+					"ObjectPage.controller.js",
+					"ObjectPage.view.xml",
+					"README.html",
+					"SandboxModel.js",
+					"data/metadata.xml",
+					"data/POST-SalesOrderList.json",
+					"data/SalesOrderList('0500000000').json",
+					"data/SalesOrderList('0500000000')-SO_2_SOITEM.json",
+					"data/SalesOrderList('0500000001').json",
+					"data/SalesOrderList('0500000007')-SO_2_BP.json",
+					"data/SalesOrderList.json",
+					"data/VH_CurrencyCode.json",
+					"data/VH_CurrencyCode.xml",
+					"data/VH_ProductID.json",
+					"data/VH_ProductID.xml",
+					"../../../common/Controller.js",
+					"../../../common/SandboxModelHelper.js",
+					"../../../common/ValueHelp.js"
+				]
+			}
+		},
+		"contentDensities" : {
+			"compact" : true,
+			"cozy" : true
+		},
+		"dependencies" : {
+			"minUI5Version" : "1.115.0",
+			"libs" : {
+				"sap.m" : {},
+				"sap.ui.layout" : {}
+			}
+		},
+		"handleValidation" : true,
+		"models" : {
+			"" : {
+				"dataSource" : "default",
+				"preload" : true,
+				"settings" : {
+					"autoExpandSelect" : true,
+					"earlyRequests" : true,
+					"updateGroupId" : "UpdateGroup"
+				},
+				"type" : "sap.ui.core.sample.odata.v4.DeepCreate.SandboxModel",
+				"uriSettingName" : "serviceUrl"
+			}
+		},
+		"rootView" : {
+			"async" : true,
+			"type" : "XML",
+			"viewName" : "sap.ui.core.sample.odata.v4.DeepCreate.Main"
+		},
+		"routing" : {
+			"config" : {
+				"async" : true,
+				"bypassed": {
+					"target": "notFound"
+				},
+				"controlAggregation" : "pages",
+				"controlId" : "app",
+				"path" : "sap.ui.core.sample.odata.v4.DeepCreate",
+				"routerClass" : "sap.m.routing.Router",
+				"type" : "View",
+				"viewType" : "XML"
+			},
+			"routes" : [{
+				"name" : "listReport",
+				"pattern" : "",
+				"target" : ["listReport"]
+			}, {
+				"name" : "objectPage",
+				"pattern" : "id={id}",
+				"target" : ["objectPage"]
+			}, {
+				"name" : "create",
+				"pattern" : "create",
+				"target" : ["objectPage"]
+			}],
+			"targets" : {
+				"listReport" : {
+					"id" : "listReport",
+					"level" : 1,
+					"name" : "ListReport"
+				},
+				"objectPage" : {
+					"id" : "objectPage",
+					"level" : 1,
+					"name" : "ObjectPage"
+				},
+				"notFound": {
+					"id": "notFound",
+					"name": "NotFound",
+					"transition": "show"
+				}
+			}
+		}
+	}
+}

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

@@ -0,0 +1,119 @@
+/*!
+ * ${copyright}
+ */
+sap.ui.define([
+	"sap/ui/core/sample/common/Helper",
+	"sap/ui/test/Opa",
+	"sap/ui/test/Opa5",
+	"sap/ui/test/TestUtils",
+	"sap/ui/test/actions/Press"
+], function (Helper, Opa, Opa5, TestUtils, Press) {
+	"use strict";
+	var sListReport = "sap.ui.core.sample.odata.v4.DeepCreate.ListReport",
+		sObjectPage = "sap.ui.core.sample.odata.v4.DeepCreate.ObjectPage";
+
+	Opa5.createPageObjects({
+		onTheListReport : {
+			actions : {
+				pressCreate : function () {
+					Helper.pressButton(this, sListReport, "create");
+					if (TestUtils.isRealOData()) {
+						// remember created sales order for cleanup
+						this.waitFor({id : "objectPage",
+							success : function (oControl) {
+								var oCreated = oControl.getBindingContext();
+
+								oCreated.created().then(function () {
+									var aCreatedEntityPaths = Opa.getContext().aCreatedEntityPaths,
+										sPath = oCreated.getPath();
+
+									if (!aCreatedEntityPaths) {
+										Opa.getContext().aCreatedEntityPaths
+											= aCreatedEntityPaths = [];
+									}
+									aCreatedEntityPaths.push(sPath);
+									Opa5.assert.ok(true, "Remembered SalesOrder: " + sPath);
+								}, function () { /* ignore */ });
+							},
+							viewName : sObjectPage});
+					}
+				}
+			}
+		},
+		onTheObjectPage : {
+			actions : {
+				changeNote : function (sNote) {
+					Helper.changeInputValue(this, sObjectPage, "SalesOrder::note", sNote);
+				},
+				pressCreateLineItem : function () {
+					Helper.pressButton(this, sObjectPage, "createLineItem");
+				},
+				pressDeleteSelectedLineItems : function () {
+					Helper.pressButton(this, sObjectPage, "deleteLineItem");
+				},
+				pressResetChanges : function () {
+					Helper.pressButton(this, sObjectPage, "resetChanges");
+				},
+				pressSave : function () {
+					Helper.pressButton(this, sObjectPage, "save");
+				},
+				pressValueHelpOnProductID : function (iRow) {
+					this.waitFor({
+						actions : function (oControl) {
+							new Press().executeOn(oControl.getAggregation("field"));
+						},
+						matchers : function (oControl) {
+							return oControl.getBindingContext().getIndex() === iRow;
+						},
+						controlType : "sap.ui.core.sample.common.ValueHelp",
+						id : /SO_2_SOITEM:ProductID/,
+						success : function (oControls) {
+							Opa5.assert.ok(true, "ValueHelp pressed: " + oControls[0].getValue());
+						},
+						viewName : sObjectPage
+					});
+				},
+				selectLineItem : function (iRow) {
+					this.waitFor({
+						actions : new Press(),
+						controlType : "sap.m.CheckBox",
+						id : /selectMulti/,
+						matchers : function (oControl) {
+							return oControl.getBindingContext().getIndex() === iRow;
+						},
+						success : function (aControls) {
+							aControls.forEach(function (oControl) {
+								Opa5.assert.ok(true, "Item selected: "
+									+ oControl.getBindingContext());
+							});
+						},
+						viewName : sObjectPage
+					});
+				}
+			},
+			assertions : {
+				checkGrossAmount : function (sGrossAmount) {
+					Helper.checkInputValue(this, sObjectPage, "SalesOrder::grossAmount",
+						sGrossAmount);
+				},
+				checkSalesOrderID : function (sSalesOrderID) {
+					Helper.checkInputValue(this, sObjectPage, "SalesOrder::id", sSalesOrderID);
+				},
+				checkSalesOrderItemsCount : function (iCount) {
+					Helper.waitForSortedByID(this, {
+						id : /SO_2_SOITEM-trigger|lineItemsTitle/,
+						success : function (aControls) {
+							if (aControls.length === 2) {
+								Helper.checkMoreButtonCount(aControls.shift(),
+									"[5/" + iCount + "]");
+							}
+							Opa5.assert.strictEqual(aControls[0].getText(),
+								iCount + " Sales Order Line Items", "Count in title is " + iCount);
+						},
+						viewName : sObjectPage
+					});
+				}
+			}
+		}
+	});
+});

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

@@ -11,7 +11,8 @@ sap.ui.getCore().attachInit(function () {
 		"sap/ui/core/sample/common/pages/Any",
 		"sap/ui/core/sample/odata/v4/Draft/pages/Main",
 		"sap/ui/test/opaQunit",
-		"sap/ui/test/TestUtils"
+		"sap/ui/test/TestUtils",
+		"sap/ui/core/sample/odata/v4/Draft/SandboxModel" // preload only
 	], function (Helper, Any, Main, opaTest, TestUtils) {
 		/*
 		 * The actual test run.

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

@@ -11,7 +11,8 @@ sap.ui.getCore().attachInit(function () {
 		"sap/ui/core/sample/common/pages/Any",
 		"sap/ui/core/sample/odata/v4/FieldGroups/pages/Main",
 		"sap/ui/test/opaQunit",
-		"sap/ui/test/TestUtils"
+		"sap/ui/test/TestUtils",
+		"sap/ui/core/sample/odata/v4/FieldGroups/SandboxModel" // preload only
 	], function (Helper, Any, Main, opaTest, TestUtils) {
 		Helper.qUnitModule("sap.ui.core.sample.odata.v4.FieldGroups");
 

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

@@ -65,8 +65,11 @@
 					visible="{ui>/bRealOData}" width="50%" search="onFilterGrid"/>
 			</Toolbar>
 		</table:extension>
-		<table:Column template="Region">
+		<table:Column>
 			<Label text="Region"/>
+			<table:template>
+				<Text text="{Region}"/>
+			</table:template>
 		</table:Column>
 		<table:Column hAlign="End">
 			<Label text="Amount Per Sale"/>

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

@@ -18,7 +18,8 @@ sap.ui.getCore().attachInit(function () {
 		"sap/ui/core/sample/common/pages/Any",
 		"sap/ui/core/sample/odata/v4/FlexibleColumnLayout/pages/Main",
 		"sap/ui/test/opaQunit",
-		"sap/ui/test/TestUtils"
+		"sap/ui/test/TestUtils",
+		"sap/ui/core/sample/odata/v4/FlexibleColumnLayout/SandboxModel" // preload only
 	], function (Helper, Any, Main, opaTest, TestUtils) {
 		Helper.qUnitModule("sap.ui.core.sample.odata.v4.FlexibleColumnLayout");
 

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

@@ -15,11 +15,17 @@
 				<m:Button icon="sap-icon://synchronize" press="onSynchronize" tooltip="Synchronize"/>
 			</m:Toolbar>
 		</extension>
-		<Column template="ID">
+		<Column>
 			<m:Label text="ID"/>
+			<template>
+				<m:Text text="{ID}" wrapping="false"/>
+			</template>
 		</Column>
-		<Column template="MANAGER_ID">
+		<Column>
 			<m:Label text="Manager's ID"/>
+			<template>
+				<m:Text text="{MANAGER_ID}" wrapping="false"/>
+			</template>
 		</Column>
 		<Column>
 			<m:Label text="Name"/>
@@ -27,8 +33,11 @@
 				<m:Input value="{Name}" change="onNameChanged"/>
 			</template>
 		</Column>
-		<Column template="AGE">
+		<Column>
 			<m:Label text="Age"/>
+			<template>
+				<m:Text text="{AGE}" wrapping="false"/>
+			</template>
 		</Column>
 	</Table>
 </mvc:View>

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

@@ -14,12 +14,13 @@ sap.ui.define([
 	"sap/ui/core/sample/common/Controller",
 	"sap/ui/core/Title",
 	"sap/ui/core/date/UI5Date",
+	"sap/ui/layout/form/ColumnLayout",
 	"sap/ui/layout/form/SimpleForm",
 	"sap/ui/model/Sorter",
 	"sap/ui/model/odata/v4/ODataModel",
 	"sap/ui/test/TestUtils"
 ], function (UriParameters, Button, mobileLibrary, Dialog, Input, Label, MessageToast, Text,
-		Controller, Title, UI5Date, SimpleForm, Sorter, ODataModel, TestUtils) {
+		Controller, Title, UI5Date, _ColumnLayout, SimpleForm, Sorter, ODataModel, TestUtils) {
 	"use strict";
 
 	// shortcut for sap.m.ButtonType

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

@@ -12,7 +12,8 @@ sap.ui.getCore().attachInit(function () {
 		"sap/ui/core/sample/common/pages/Any",
 		"sap/ui/core/sample/odata/v4/LateProperties/pages/Main",
 		"sap/ui/model/odata/v4/ODataModel",
-		"sap/ui/test/opaQunit"
+		"sap/ui/test/opaQunit",
+		"sap/ui/core/sample/odata/v4/LateProperties/SandboxModel" // preload only
 	], function (Log, CacheManager, Any, Main, ODataModel, opaTest) {
 		var sDefaultLanguage = sap.ui.getCore().getConfiguration().getLanguage(),
 			oSkipPromise = new Promise(function (fnResolve) {

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

@@ -10,7 +10,8 @@ sap.ui.getCore().attachInit(function () {
 		"sap/ui/core/sample/common/Helper",
 		"sap/ui/core/sample/common/pages/Any",
 		"sap/ui/core/sample/odata/v4/LateProperties/pages/Main",
-		"sap/ui/test/opaQunit"
+		"sap/ui/test/opaQunit",
+		"sap/ui/core/sample/odata/v4/LateProperties/SandboxModel" // preload only
 	], function (Helper, Any, Main, opaTest) {
 		Helper.qUnitModule("sap.ui.core.sample.odata.v4.LateProperties");
 

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

@@ -11,7 +11,8 @@ sap.ui.getCore().attachInit(function () {
 		"sap/ui/core/sample/common/pages/Any",
 		"sap/ui/core/sample/odata/v4/ListBinding/pages/Main",
 		"sap/ui/test/opaQunit",
-		"sap/ui/test/TestUtils"
+		"sap/ui/test/TestUtils",
+		"sap/ui/core/sample/odata/v4/ListBinding/SandboxModel" // preload only
 	], function (Helper, Any, Main, opaTest, TestUtils) {
 		Helper.qUnitModule("sap.ui.core.sample.odata.v4.ListBinding");
 

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

@@ -9,7 +9,8 @@ sap.ui.getCore().attachInit(function () {
 	sap.ui.require([
 		"sap/ui/core/sample/common/Helper",
 		"sap/ui/core/sample/common/pages/Any",
-		"sap/ui/test/opaQunit"
+		"sap/ui/test/opaQunit",
+		"sap/ui/core/sample/odata/v4/ListBindingTemplate/SandboxModel" // preload only
 	], function (Helper, Any, opaTest) {
 		Helper.qUnitModule("sap.ui.core.sample.odata.v4.ListBindingTemplate");
 

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

@@ -13,7 +13,8 @@ sap.ui.getCore().attachInit(function () {
 		"sap/ui/core/sample/common/pages/Any",
 		"sap/ui/core/sample/odata/v4/MultipleInlineCreationRowsGrid/pages/Main",
 		"sap/ui/test/opaQunit",
-		"sap/ui/test/TestUtils"
+		"sap/ui/test/TestUtils",
+		"sap/ui/core/sample/odata/v4/MultipleInlineCreationRowsGrid/SandboxModel" // preload only
 	], function (Log, library, Helper, Any, Main, opaTest, TestUtils) {
 		var MessageType = library.MessageType; // shortcut for sap.ui.core.MessageType
 

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

@@ -104,47 +104,6 @@ sap.ui.define([
 				}
 			}
 		},
-		onTheMessagePopover : {
-			actions : {
-				close : function () {
-					this.waitFor({
-						actions : function (oMessagePopover) {
-							oMessagePopover.close();
-						},
-						controlType : "sap.m.MessagePopover",
-						success : function (aControls) {
-							Opa5.assert.strictEqual(aControls.length, 1, "Message Popover closed");
-						}
-					});
-				}
-			}, assertions : {
-				checkMessages : function (aExpectedMessages) {
-					this.waitFor({
-						controlType : "sap.m.MessagePopover",
-						success : function (aMessagePopover) {
-							var iExpectedCount = aExpectedMessages.length,
-								aItems = aMessagePopover[0].getItems();
-
-							Opa5.assert.ok(aMessagePopover.length === 1);
-							Opa5.assert.strictEqual(aItems.length, iExpectedCount,
-								"Check Messages: message count is as expected: " + iExpectedCount
-							);
-							aExpectedMessages.forEach(function (oExpectedMessage, i) {
-								var bFound;
-
-								bFound = aItems.some(function (oItem) {
-									return oItem.getTitle() === oExpectedMessage.message
-										&& oItem.getType() === oExpectedMessage.type;
-								});
-								Opa5.assert.ok(bFound, "Check Messages: expected message[" + i
-									+ "]: " + oExpectedMessage.message + " type: "
-									+ oExpectedMessage.type);
-							});
-						}
-					});
-				}
-			}
-		},
 		onTheObjectPage : {
 			actions : {
 				confirmDeletion : function () {

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

@@ -12,7 +12,8 @@ sap.ui.getCore().attachInit(function () {
 		"sap/ui/core/sample/odata/v4/Products/pages/Main",
 		"sap/base/Log",
 		"sap/ui/test/opaQunit",
-		"sap/ui/test/TestUtils"
+		"sap/ui/test/TestUtils",
+		"sap/ui/core/sample/odata/v4/Products/SandboxModel" // preload only
 	], function (Helper, Any, Main, Log, opaTest, TestUtils) {
 		Helper.qUnitModule("sap.ui.core.sample.odata.v4.Products");
 

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

@@ -20,7 +20,7 @@
 		<Column hAlign="End" width="5em">
 			<m:Label text="Level"/>
 			<template>
-				<m:Text wrapping="false" text="{= %{@$ui5.node.level} }"/>
+				<m:Text text="{= %{@$ui5.node.level} }" wrapping="false"/>
 			</template>
 		</Column>
 		<Column width="4em">
@@ -38,11 +38,17 @@
 					/>
 			</template>
 		</Column>
-		<Column template="ID">
+		<Column>
 			<m:Label text="ID"/>
+			<template>
+				<m:Text text="{ID}" wrapping="false"/>
+			</template>
 		</Column>
-		<Column template="MANAGER_ID">
+		<Column>
 			<m:Label text="Manager's ID"/>
+			<template>
+				<m:Text text="{MANAGER_ID}" wrapping="false"/>
+			</template>
 		</Column>
 		<Column>
 			<m:Label text="Name"/>
@@ -50,8 +56,11 @@
 				<m:Input value="{Name}" change="onNameChanged"/>
 			</template>
 		</Column>
-		<Column template="AGE">
+		<Column>
 			<m:Label text="Age"/>
+			<template>
+				<m:Text text="{AGE}" wrapping="false"/>
+			</template>
 		</Column>
 	</Table>
 
@@ -67,17 +76,23 @@
 					press="onSynchronizeTreeTable" tooltip="SynchronizeTreeTable"/>
 			</m:Toolbar>
 		</extension>
-		<Column template="ID">
+		<Column>
 			<m:Label text="ID"/>
+			<template>
+				<m:Text text="{ID}" wrapping="false"/>
+			</template>
 		</Column>
 		<Column hAlign="End" width="5em">
 			<m:Label text="Level"/>
 			<template>
-				<m:Text wrapping="false" text="{= %{@$ui5.node.level} }"/>
+				<m:Text text="{= %{@$ui5.node.level} }" wrapping="false"/>
 			</template>
 		</Column>
-		<Column template="MANAGER_ID">
+		<Column>
 			<m:Label text="Manager's ID"/>
+			<template>
+				<m:Text text="{MANAGER_ID}" wrapping="false"/>
+			</template>
 		</Column>
 		<Column>
 			<m:Label text="Name"/>
@@ -85,8 +100,11 @@
 				<m:Input value="{Name}" change="onNameChangedInTreeTable"/>
 			</template>
 		</Column>
-		<Column template="AGE">
+		<Column>
 			<m:Label text="Age"/>
+			<template>
+				<m:Text text="{AGE}" wrapping="false"/>
+			</template>
 		</Column>
 	</TreeTable>
 

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

@@ -390,6 +390,10 @@
 				<Annotation Qualifier="OrgChart" Term="Org.OData.Aggregation.V1.RecursiveHierarchy">
 					<Record>
 						<PropertyValue Property="NodeProperty" PropertyPath="ID"/>
+						<!-- TODO "Its type MUST be the entity type annotated with this term"
+							=> Manager should derive from Worker
+						-->
+						<PropertyValue Property="ParentNavigationProperty" NavigationPropertyPath="EMPLOYEE_2_MANAGER"/>
 					</Record>
 				</Annotation>
 				<Annotation Qualifier="OrgChart" Term="com.sap.vocabularies.Hierarchy.v1.RecursiveHierarchy">

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

@@ -11,7 +11,8 @@ sap.ui.getCore().attachInit(function () {
 		"sap/ui/core/sample/common/pages/Any",
 		"sap/ui/core/sample/odata/v4/SalesOrderTP100_V2/pages/Main",
 		"sap/base/Log",
-		"sap/ui/test/opaQunit"
+		"sap/ui/test/opaQunit",
+		"sap/ui/core/sample/odata/v4/SalesOrderTP100_V2/SandboxModel" // preload only
 	], function (Helper, Any, Main, Log, opaTest) {
 		Helper.qUnitModule("sap.ui.core.sample.odata.v4.SalesOrderTP100_V2");
 

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

@@ -39,7 +39,7 @@
 					"Main.view.xml",
 					"manifest.json",
 					"SandboxModel.js",
-					"../../../common/Helper",
+					"../../../common/Helper.js",
 					"../../../common/SandboxModelHelper.js"
 				]
 			}

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

@@ -10,7 +10,8 @@ sap.ui.getCore().attachInit(function () {
 		"sap/ui/core/sample/common/Helper",
 		"sap/ui/core/sample/common/pages/Any",
 		"sap/ui/core/sample/odata/v4/SalesOrderTP100_V4/pages/Main",
-		"sap/ui/test/opaQunit"
+		"sap/ui/test/opaQunit",
+		"sap/ui/core/sample/odata/v4/SalesOrderTP100_V4/SandboxModel" // preload only
 	], function (Helper, Any, Main, opaTest) {
 		Helper.qUnitModule("sap.ui.core.sample.odata.v4.SalesOrderTP100_V4");
 

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

@@ -39,7 +39,7 @@
 					"Main.view.xml",
 					"manifest.json",
 					"SandboxModel.js",
-					"../../../common/Helper",
+					"../../../common/Helper.js",
 					"../../../common/SandboxModelHelper.js"
 				]
 			}

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

@@ -154,7 +154,6 @@ sap.ui.define([
 					+ ", " + oContext.getProperty("SO_2_BP/CompanyName"));
 			}).catch(function (oError) {
 				if (!oError.canceled) {
-					MessageBox.error("" + oError);
 					throw oError; // unexpected error
 				}
 			});
@@ -274,7 +273,7 @@ sap.ui.define([
 			this.setSalesOrderBindingContext(null); // hide the object page
 			this.aDeletedSalesOrders.push(oContext);
 			this.updateUndoButton();
-			oContext.delete().catch(function (oError) {
+			oContext.delete().catch(function () { // canceled or error already reported
 				var oItem;
 
 				if (!oSalesOrderTable.getSelectedItem()) {
@@ -286,10 +285,6 @@ sap.ui.define([
 						that.setSalesOrderBindingContext(oContext); // show the object page again
 					}
 				}
-				if (!oError.canceled) {
-					MessageToast.show("Could not delete sales order "
-						+ oContext.getProperty("SalesOrderID"));
-				}
 			}).finally(function () {
 				that.aDeletedSalesOrders.splice(that.aDeletedSalesOrders.indexOf(oContext), 1);
 				that.updateUndoButton();
@@ -297,15 +292,8 @@ sap.ui.define([
 		},
 
 		onDeleteSalesOrderLineItem : function () {
-			var oContext = this.byId("SO_2_SOITEM").getSelectedItem().getBindingContext();
-
-			oContext.delete().catch(function (oError) {
-				if (!oError.canceled) {
-					MessageToast.show("Could not delete line item "
-						+ oContext.getProperty("ItemPosition") + " of sales order "
-						+ oContext.getProperty("SalesOrderID"));
-				}
-			});
+			this.byId("SO_2_SOITEM").getSelectedItem().getBindingContext().delete()
+				.catch(function () { /* canceled or error already reported */ });
 		},
 
 		onDeleteSalesOrderSchedules : function () {
@@ -328,13 +316,13 @@ sap.ui.define([
 			// removing schedule(s) implicitly removes items
 			// -> remove context of dependent bindings and hide details
 			this.setSalesOrderLineItemBindingContext();
-			this.requestSideEffects(sGroupId, "SO_2_SOITEM");
+			aPromises.push(this.requestSideEffects(sGroupId, "SO_2_SOITEM"));
 
 			Promise.all(aPromises).then(function () {
 				oTable.removeSelections();
 				oUiModel.setProperty("/bScheduleSelected", false);
 				MessageBox.success("Deleted " + aPromises.length + " sales order schedule(s)");
-			});
+			}, function () { /* error already reported */ });
 		},
 
 		onExecuteSimulateDiscount : function () {