@openui5/sap.ui.core 1.120.18 → 1.120.20

package/test/sap/ui/core/demokit/tutorial/odatav4/05/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.18" #MainVersion#
+  version: "1.120.20" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

package/test/sap/ui/core/demokit/tutorial/odatav4/06/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.18" #MainVersion#
+  version: "1.120.20" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

package/test/sap/ui/core/demokit/tutorial/odatav4/07/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.18" #MainVersion#
+  version: "1.120.20" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

package/test/sap/ui/core/demokit/tutorial/odatav4/08/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.18" #MainVersion#
+  version: "1.120.20" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

package/test/sap/ui/core/demokit/tutorial/odatav4/09/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.18" #MainVersion#
+  version: "1.120.20" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

package/test/sap/ui/core/demokit/tutorial/odatav4/10/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.18" #MainVersion#
+  version: "1.120.20" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

package/test/sap/ui/core/demokit/tutorial/odatav4/11/ui5.yaml

@@ -4,7 +4,7 @@ metadata:
 type: application
 framework:
   name: OpenUI5
-  version: "1.120.18" #MainVersion#
+  version: "1.120.20" #MainVersion#
   libraries:
     - name: sap.m
     - name: sap.f

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

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

package/test/sap/ui/core/qunit/odata/v4/ODataModel.integration.qunit.js

@@ -5601,8 +5601,24 @@ sap.ui.define([
 	// refreshSingle is able to calculate the key predicates in its response and a subsequent PATCH
 	// is possible.
 	// BCP: 2070137560
+	//
+	// A header message is returned in the response. The targets of the message are pointing to the
+	// binding parameter. The UI5 message contains the adjusted targets. (SNOW: DINC0122620)
+	//
+	// The header message contains the property "longtextUrl", which points one level up. See that
+	// the UI5 message contains the resolved "descriptionUrl". (SNOW: DINC0197984)
 	QUnit.test("Context.refresh() in a list relative to a return value context", function (assert) {
-		var oTable,
+		var oMessage = {
+				additionalTargets : [
+					"$Parameter/SalesOrder/SO_2_SOITEM(ProductID='HT-1000')/ProductID"
+				],
+				code : "foo-42",
+				longtextUrl : "../LongText('0815')",
+				message : "text",
+				numericSeverity : 1,
+				target : "$Parameter/SalesOrder/SO_2_SOITEM(ProductID='HT-1000')/Name"
+			},
+			oTable,
 			sView = '\
 <FlexBox binding="{/SalesOrderList(\'1\')}">\
 	<Text id="id" text="{SalesOrderID}"/>\
@@ -5639,7 +5655,23 @@ sap.ui.define([
 							ProductID : "HT-1000"
 						}
 					}]
-			});
+				}, {
+					"sap-messages" : JSON.stringify([oMessage])
+				})
+				.expectMessages([{
+					code : "foo-42",
+					descriptionUrl : sSalesOrderService + "LongText('0815')",
+					message : "text",
+					persistent : true,
+					targets : [
+						"/SalesOrderList('1')/SO_2_SOITEM(ProductID='HT-1000')/Name",
+						"/SalesOrderList('1')/SO_2_SOITEM(ProductID='HT-1000')/ProductID"
+					],
+					technicalDetails : {
+						originalMessage : oMessage
+					},
+					type : "Success"
+				}]);
 
 			return Promise.all([
 				that.oView.byId("action").getObjectBinding().execute(),
@@ -18807,8 +18839,18 @@ sap.ui.define([
 	// result.
 	// JIRA: CPOUI5UISERVICESV3-965
 	// BCP: 2070134549
+	//
+	// A header message is returned in the response. The target of the message is pointing to the
+	// binding parameter. The UI5 message contains the adjusted target. (SNOW: DINC0122620)
 	QUnit.test("Rel. bound function, auto-$expand/$select (BCP 2070134549)", function (assert) {
-		var sFunctionName = "com.sap.gateway.default.iwbep.tea_busi.v0001"
+		var oMessage = {
+				// additional targets are missing intentionally
+				code : "foo-42",
+				message : "text",
+				numericSeverity : 1,
+				target : "$Parameter/_it/Name"
+			},
+			sFunctionName = "com.sap.gateway.default.iwbep.tea_busi.v0001"
 				+ ".__FAKE__FuGetEmployeesByManager",
 			oModel = this.createTeaBusiModel({autoExpandSelect : true}),
 			sView = '\
@@ -18834,7 +18876,21 @@ sap.ui.define([
 					ID : "6",
 					Name : "Susan Bay"
 				}]
+			}, {
+				"sap-messages" : JSON.stringify([oMessage])
 			})
+			.expectMessages([{
+				code : "foo-42",
+				message : "text",
+				persistent : true,
+				targets : [
+					"/MANAGERS('1')/Name"
+				],
+				technicalDetails : {
+					originalMessage : oMessage
+				},
+				type : "Success"
+			}])
 			.expectChange("TEAM_ID", "TEAM_03")
 			.expectChange("id", ["3", "6"])
 			.expectChange("name", ["Jonathan Smith", "Susan Bay"]);
@@ -59736,4 +59792,72 @@ make root = ${bMakeRoot}`;
 
 		await this.oView.byId("root").getBindingContext().requestRefresh();
 	});
+
+	//*********************************************************************************************
+	// Scenario: A context binding with empty path has a hidden context binding to the draft as
+	// parent. Request a property and set a hidden context binding to the active entity as parent.
+	// Before the request finished, set the binding context to null. In the end, request side
+	// effects for the complete model to see that no change listeners remained in the hidden ODCB
+	// for the active entity. (The issue is that registering is delayed due to the pending
+	// request, but deregistering happens immediately when the binding loses its parent context. So
+	// it deregisters when there is no registration yet, and registers afterwards when there is no
+	// more deregistration to be expected.)
+	// SNOW: DINC0117588
+	QUnit.test("DINC0117588 #2", async function (assert) {
+		const oModel = this.createSpecialCasesModel({autoExpandSelect : true});
+		const sView = `
+<FlexBox id="root" binding="{}">
+	<Text id="id" text="{ArtistID}"/>
+	<Text id="active" text="{IsActiveEntity}"/>
+</FlexBox>`;
+
+		this.expectChange("id")
+			.expectChange("active");
+
+		await this.createView(assert, sView, oModel);
+
+		this.expectRequest("Artists(ArtistID='1',IsActiveEntity=false)"
+				+ "?$select=ArtistID,IsActiveEntity",
+				{ArtistID : "1", IsActiveEntity : false})
+			.expectChange("id", "1")
+			.expectChange("active", "No");
+
+		const oForm = this.oView.byId("root");
+		oForm.setBindingContext(
+			oModel.bindContext("/Artists(ArtistID='1',IsActiveEntity=false)").getBoundContext());
+
+		await this.waitForChanges(assert, "inactive entity");
+
+		let fnResolve;
+		this.expectRequest("Artists(ArtistID='1',IsActiveEntity=true)"
+				+ "?$select=ArtistID,IsActiveEntity",
+				new Promise((resolve) => {
+					fnResolve = resolve;
+				})
+			);
+
+		const oContext
+			= oModel.bindContext("/Artists(ArtistID='1',IsActiveEntity=true)").getBoundContext();
+		const oPropertyPromise = oContext.requestProperty("ArtistID");
+		oForm.setBindingContext(oContext);
+
+		await this.waitForChanges(assert, "active entity");
+
+		this.expectChange("id", null)
+			.expectChange("active", null);
+
+		oForm.setBindingContext(null);
+
+		fnResolve({ArtistID : "1", IsActiveEntity : true});
+
+		await Promise.all([
+			oPropertyPromise,
+			this.waitForChanges(assert, "no entity")
+		]);
+
+		await Promise.all([
+			oContext.requestSideEffects(["/special.cases.Container/Artists"]),
+			this.waitForChanges(assert, "request full side-effects refresh")
+		]);
+	});
 });

package/test/sap/ui/core/qunit/odata/v4/ODataModel.qunit.js

@@ -1790,15 +1790,27 @@ sap.ui.define([
 			aMessages = [{}, {}],
 			sResourcePath = "~res~";
 
+		const oMetaModel = {
+			getObject : mustBeMocked
+		};
+
+		oModelMock.expects("getMetaModel").returns(oMetaModel);
+		this.mock(_Helper).expects("getMetaPath")
+			.withExactArgs("/" + sResourcePath)
+			.returns("~metaPath~");
+		this.mock(oMetaModel).expects("getObject")
+			.withExactArgs("~metaPath~")
+			.returns("~metadata~"); // not an array
+
 		oModelMock.expects("createUI5Message")
 			.withExactArgs(sinon.match(function (oMessage) {
 				return oMessage === aMessages[0] && oMessage.transition === true;
-			}), sResourcePath)
+			}), sResourcePath, undefined, sinon.match.same(aMessages[0]))
 			.returns("~UI5msg0~");
 		oModelMock.expects("createUI5Message")
 			.withExactArgs(sinon.match(function (oMessage) {
 				return oMessage === aMessages[1] && oMessage.transition === true;
-			}), sResourcePath)
+			}), sResourcePath, undefined, sinon.match.same(aMessages[1]))
 			.returns("~UI5msg1~");
 		this.mock(Messaging).expects("updateMessages")
 			.withExactArgs(undefined, sinon.match(["~UI5msg0~", "~UI5msg1~"]));
@@ -1808,9 +1820,78 @@ sap.ui.define([
 
 		// code under test
 		oModel.reportTransitionMessages([], sResourcePath);
+	});
+
+	//*********************************************************************************************
+	QUnit.test("reportTransitionMessages: w/o resourcePath", function () {
+		var oModel = this.createModel(),
+			oModelMock = this.mock(oModel),
+			aMessages = [{}, {}];
+
+		oModelMock.expects("getMetaModel").never();
+
+		oModelMock.expects("createUI5Message")
+			.withExactArgs(sinon.match(function (oMessage) {
+				return oMessage === aMessages[0] && oMessage.transition === true;
+			}), undefined, undefined, sinon.match.same(aMessages[0]))
+			.returns("~UI5msg0~");
+		oModelMock.expects("createUI5Message")
+			.withExactArgs(sinon.match(function (oMessage) {
+				return oMessage === aMessages[1] && oMessage.transition === true;
+			}), undefined, undefined, sinon.match.same(aMessages[1]))
+			.returns("~UI5msg1~");
+		this.mock(Messaging).expects("updateMessages")
+			.withExactArgs(undefined, sinon.match(["~UI5msg0~", "~UI5msg1~"]));
 
 		// code under test
-		oModel.reportTransitionMessages(null, sResourcePath);
+		oModel.reportTransitionMessages(aMessages);
+	});
+
+	//*********************************************************************************************
+	QUnit.test("reportTransitionMessages: operationMetadata is used to adjustTargets", function () {
+		const oModel = this.createModel();
+		const oModelMock = this.mock(oModel);
+		const oMetaModel = {
+			getObject : mustBeMocked
+		};
+		oModelMock.expects("getMetaModel").returns(oMetaModel);
+		const oHelperMock = this.mock(_Helper);
+		oHelperMock.expects("getMetaPath")
+			.withExactArgs("/resource/path/operation")
+			.returns("~metaPath~");
+		const oMetaModelMock = this.mock(oMetaModel);
+		oMetaModelMock.expects("getObject")
+			.withExactArgs("~metaPath~")
+			.returns(["~metadata~"]);
+		oMetaModelMock.expects("getObject")
+			.withExactArgs("~metaPath~/@$ui5.overload/0")
+			.returns("~operationMetadata~");
+		const oClonedMessage0 = {};
+		oHelperMock.expects("clone").withExactArgs("~message0~").returns(oClonedMessage0);
+		const oClonedMessage1 = {};
+		oHelperMock.expects("clone").withExactArgs("~message1~").returns(oClonedMessage1);
+		oHelperMock.expects("adjustTargets")
+			.withExactArgs(sinon.match.same(oClonedMessage0), "~operationMetadata~", undefined,
+				"/resource/path");
+		oHelperMock.expects("adjustTargets")
+			.withExactArgs(sinon.match.same(oClonedMessage1), "~operationMetadata~", undefined,
+				"/resource/path");
+		oModelMock.expects("createUI5Message")
+			.withExactArgs(sinon.match(function (oMessage) {
+				return oMessage === oClonedMessage0 && oMessage.transition === true;
+			}), "resource/path/operation?~queryOptions~", undefined, "~message0~")
+			.returns("~UI5msg0~");
+		oModelMock.expects("createUI5Message")
+			.withExactArgs(sinon.match(function (oMessage) {
+				return oMessage === oClonedMessage1 && oMessage.transition === true;
+			}), "resource/path/operation?~queryOptions~", undefined, "~message1~")
+			.returns("~UI5msg1~");
+		this.mock(Messaging).expects("updateMessages")
+			.withExactArgs(undefined, sinon.match(["~UI5msg0~", "~UI5msg1~"]));
+
+		// code under test
+		oModel.reportTransitionMessages(["~message0~", "~message1~"],
+			"resource/path/operation?~queryOptions~");
 	});
 
 	//*********************************************************************************************
@@ -2659,7 +2740,8 @@ sap.ui.define([
 			},
 			oUI5Message;
 
-		oHelperMock.expects("createTechnicalDetails"); // ignore details
+		oHelperMock.expects("createTechnicalDetails")
+			.withExactArgs("~originalMessage~"); // ignore details
 		oHelperMock.expects("buildPath").never();
 		[oFixture.target].concat(oFixture.additionalTargets || []).forEach(function (sTarget) {
 			if (sTarget[0] !== "/") {
@@ -2678,7 +2760,8 @@ sap.ui.define([
 		});
 
 		// code under test
-		oUI5Message = oModel.createUI5Message(oRawMessage, "~resourcePath~", "~cachePath~");
+		oUI5Message = oModel.createUI5Message(oRawMessage, "~resourcePath~", "~cachePath~",
+			"~originalMessage~");
 
 		assert.deepEqual(oUI5Message.getTargets(), oFixture.expectedTargets);
 		assert.strictEqual(oUI5Message.getPersistent(), oFixture.expectedPersistent || false);

package/test/sap/ui/core/qunit/odata/v4/lib/_Cache.qunit.js

@@ -11084,9 +11084,10 @@ sap.ui.define([
 		oCacheMock = this.mock(oCache);
 		assert.strictEqual(oCache.oPromise, null);
 
-		oCacheMock.expects("registerChangeListener").never();
+		const oRegisterExpectation = oCacheMock.expects("registerChangeListener")
+			.withExactArgs(undefined, "~oListener1~");
 		this.mock(oGroupLock1).expects("unlock").never();
-		this.oRequestorMock.expects("request")
+		const oRequestExpectation = this.oRequestorMock.expects("request")
 			.withExactArgs("GET", sResourcePath + "?~", sinon.match.same(oGroupLock1), undefined,
 				undefined, sinon.match.same(fnDataRequested1), undefined, sMetaPath)
 			.returns(Promise.resolve(oExpectedResult).then(function () {
@@ -11096,8 +11097,6 @@ sap.ui.define([
 				oResponseExpectation = oCacheMock.expects("visitResponse")
 					.withExactArgs(sinon.match.same(oExpectedResult),
 						sinon.match.same(mTypeForMetaPath));
-				oCacheMock.expects("registerChangeListener")
-					.withExactArgs(undefined, "~oListener1~");
 				oCacheMock.expects("drillDown")
 					.withExactArgs(sinon.match.same(oExpectedResult), undefined,
 						sinon.match.same(oGroupLock1), bCreateOnDemand)
@@ -11120,6 +11119,7 @@ sap.ui.define([
 					bCreateOnDemand, "fnGetOriginalResourcePath")
 				.then(function (oResult) {
 					assert.strictEqual(oResult, oExpectedResult);
+					assert.ok(oRegisterExpectation.calledBefore(oRequestExpectation));
 				})
 		];
 		oOldPromise = oCache.oPromise;

package/test/sap/ui/core/qunit/odata/v4/lib/_Helper.qunit.js

@@ -4504,18 +4504,32 @@ sap.ui.define([
 
 	//*********************************************************************************************
 [true, false].forEach(function (bTargetIsValid) {
-	var sTitle = "adjustTargets: with additional targets, target is valid: " + bTargetIsValid;
+	[true, false].forEach(function (bAnnotation) {
+	var sTitle = "adjustTargets: with additional targets, annotation: " + bAnnotation
+			+ ", target is valid: " + bTargetIsValid;
 
 	QUnit.test(sTitle, function (assert) {
 		var oHelperMock = this.mock(_Helper),
+			oMessage;
+
+		if (bAnnotation) {
 			oMessage = {
 				target : "target",
 				"@foo.additionalTargets" : ["additional1", "foo", "additional2"]
 			};
 
-		oHelperMock.expects("getAnnotationKey")
-			.withExactArgs(sinon.match.same(oMessage), ".additionalTargets")
-			.returns("@foo.additionalTargets");
+			oHelperMock.expects("getAnnotationKey")
+				.withExactArgs(sinon.match.same(oMessage), ".additionalTargets")
+				.returns("@foo.additionalTargets");
+		} else {
+			oMessage = {
+				target : "target",
+				additionalTargets : ["additional1", "foo", "additional2"],
+				"@foo.additionalTargets" : "n/a" // additionalTargets must win!
+			};
+
+			oHelperMock.expects("getAnnotationKey").never();
+		}
 		oHelperMock.expects("getAdjustedTarget")
 			.withExactArgs("target", "oOperationMetadata", "sParameterContextPath", "sContextPath")
 			.returns(bTargetIsValid ? "~adjusted~" : undefined);
@@ -4536,18 +4550,21 @@ sap.ui.define([
 		_Helper.adjustTargets(oMessage, "oOperationMetadata", "sParameterContextPath",
 			"sContextPath");
 
-		if (bTargetIsValid) {
-			assert.deepEqual(oMessage, {
-				target : "~adjusted~",
-				"@foo.additionalTargets" : ["~adjusted1~", "~adjusted2~"]
-			});
+		const oExpectedMessage = {
+			target : bTargetIsValid ? "~adjusted~" : "~adjusted1~",
+			"@foo.additionalTargets" : "n/a"
+		};
+		const aAdditionalTargets
+			= bTargetIsValid ? ["~adjusted1~", "~adjusted2~"] : ["~adjusted2~"];
+
+		if (bAnnotation) {
+			oExpectedMessage["@foo.additionalTargets"] = aAdditionalTargets;
 		} else {
-			assert.deepEqual(oMessage, {
-				target : "~adjusted1~",
-				"@foo.additionalTargets" : ["~adjusted2~"]
-			});
+			oExpectedMessage.additionalTargets = aAdditionalTargets;
 		}
+		assert.deepEqual(oMessage, oExpectedMessage);
 	});
+});
 });
 
 	//*********************************************************************************************
@@ -4576,6 +4593,11 @@ sap.ui.define([
 			_Helper.getAdjustedTarget("$Parameter/foo/bar", oOperationMetadata,
 				"~parameterContextPath~"),
 			"~parameterContextPath~/foo/bar");
+
+		assert.strictEqual(
+			// code under test
+			_Helper.getAdjustedTarget("foo/bar", oOperationMetadata),
+			"foo/bar");
 	});
 
 	//*********************************************************************************************