@openui5/sap.ui.core 1.120.3 → 1.120.4

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

@@ -8671,6 +8671,168 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 		});
 	});
 
+	//*********************************************************************************************
+	// Scenario: Grouping by a property of type "Edm.Time" is possible with the AnalyticalBinding.
+	// The AnalyticalBinding has to ensure that the generated IDs e.g. multi-unit ID, group ID are
+	// different for different "Edm.Time" values. "Edm.Time" objects are the only ones that do not
+	// provide a useful toString representation.
+	// SNOW: CS20230006325114
+[{
+	sTitle: "no multi-unit case ([a, b, c,| d, e,| f, g, h, i, j])",
+	aLengths: [551, 551, 551],
+	aKeyIndexForRoot: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
+	aMultiUnitIndices: [],
+	aMultiUnitKeysForRoot: undefined,
+	aSkip: [5, 3],
+	aTop: [5, 2],
+	aVisibleRow: [7, 2],
+	bWithWarning: false
+}, {
+	sTitle: "multi-unit at the end of the gap ([a, a, b,| c, d, d, e, f,| f, g, h, ...]); case c) II",
+	aKeyIndexForRoot: ["ZERO", 2, 3, -4, 6, -7, 9, 10, 11, 12, 13, 14, 15],
+	aLengths: [550, 550, 548],
+	aMultiUnitIndices: [[0, 1], [4,5], [7, 8]],
+	aMultiUnitKeysForRoot: [
+		",,,0,*,,,-multiple-units-not-dereferencable",
+		undefined,
+		undefined,
+		",,,4,*,,,-multiple-units-not-dereferencable",
+		undefined,
+		",,,7,*,,,-multiple-units-not-dereferencable"
+	],
+	aSkip: [8, 3],
+	aTop: [8, 5],
+	aVisibleRow: [9, 2],
+	bWithWarning: true
+}, {
+	sTitle: "multi-unit in block one and at the beginning and the end of last block"
+		+ " ([a, a, b,| b, c, d, e, e,| e, g, h, ...])",
+	aKeyIndexForRoot: ["ZERO", -2, 4, 5, -6, 9, 10, 11, 12, 13, 14, 15],
+	aLengths: [550, 550, 547],
+	aMultiUnitIndices: [[0, 1], [2, 3], [6, 8]],
+	aMultiUnitKeysForRoot: [
+		",,,0,*,,,-multiple-units-not-dereferencable",
+		",,,2,*,,,-multiple-units-not-dereferencable",
+		undefined,
+		undefined,
+		",,,6,*,,,-multiple-units-not-dereferencable"
+	],
+	aSkip: [8, 3],
+	aTop: [8, 5],
+	aVisibleRow: [9, 2],
+	bWithWarning: true
+}].forEach(function (oFixture) {
+	QUnit.test("AnalyticalBinding: grouping by property of type Edm.Time, " + oFixture.sTitle, function (assert) {
+		var oBinding, oTable,
+			oModel = createModel("/sap/opu/odata/sap/FAR_CUSTOMER_LINE_ITEMS", {
+				tokenHandling : false
+			}),
+			sView = '\
+<t:AnalyticalTable id="table" rows="{path : \'/Items\', parameters : {useBatchRequests : true}}"\
+		threshold="2" visibleRowCount="2">\
+	<t:AnalyticalColumn grouped="true" leadingProperty="CreationTime">\
+		<Label text="CreationTime"/>\
+		<t:template><Text wrapping="false" text="{CreationTime}"/></t:template>\
+	</t:AnalyticalColumn>\
+	<t:AnalyticalColumn summed="true" leadingProperty="AmountInCompanyCodeCurrency">\
+		<Label text="AmountInCompanyCodeCurrency"/>\
+		<t:template><Text wrapping="false" text="{AmountInCompanyCodeCurrency}"/></t:template>\
+	</t:AnalyticalColumn>\
+</t:AnalyticalTable>',
+			that = this;
+
+		var aItems = [];
+		for (var i = 0; i < 50; i += 1) {
+			aItems.push({
+				__metadata : {uri : "/sap/opu/odata/sap/FAR_CUSTOMER_LINE_ITEMS/Items(" + i + ")"},
+				CreationTime : {ms: i, __edmType: 'Edm.Time'},
+				AmountInCompanyCodeCurrency : String(i),
+				Currency : "USD"
+			});
+		}
+		// create multi-unit situations by reusing the dimension value of the grouped column (CreationTime) of the first
+		// item of the range for all others in the range; a multi-unit situation requires also a different dimension
+		// value of the measure's dimension, so use different the Currency values.
+		oFixture.aMultiUnitIndices.forEach(function (aMultiUnitRange) {
+			var iFrom = aMultiUnitRange[0],
+				iTo = aMultiUnitRange[1];
+
+			for (var i = iFrom + 1; i <= iTo; i += 1) {
+				aItems[i].CreationTime = aItems[iFrom].CreationTime;
+				aItems[i].Currency = aItems[iFrom].Currency + i;
+			}
+		});
+
+		this.oLogMock.expects("warning")
+			.withExactArgs("Detected a multi-unit case, so sorting is only possible on leaves", "/Items",
+				"sap.ui.model.analytics.AnalyticalBinding", undefined)
+			.exactly(oFixture.bWithWarning ? 1 : 0);
+
+		this.expectRequest({
+				encodeRequestUri : false,
+				requestUri : "Items" // Grand Total Request
+					+ "?$select=AmountInCompanyCodeCurrency,Currency&$top=100"
+					+ "&$inlinecount=allpages"
+			}, {
+				__count : "1",
+				results : [{
+					__metadata : {uri : "/sap/opu/odata/sap/FAR_CUSTOMER_LINE_ITEMS/Items('grandTotal')"},
+					AmountInCompanyCodeCurrency : "42.00",
+					Currency : "USD"
+				}]
+			})
+			.expectRequest({
+				encodeRequestUri : false,
+				requestUri : "Items" // Data and Count Request
+					+ "?$select=CreationTime,AmountInCompanyCodeCurrency,Currency"
+					+ "&$orderby=CreationTime%20asc&$top=3&$inlinecount=allpages"
+			}, {
+				__count : "550",
+				results : aItems.slice(0, 3)
+			});
+
+		function readBlock(i) {
+			assert.strictEqual(oBinding.getLength(), oFixture.aLengths[i]);
+
+			var iSkip = oFixture.aSkip[i];
+			var iTop = oFixture.aTop[i];
+			that.expectRequest({
+					encodeRequestUri : false,
+					requestUri : "Items"
+						+ "?$select=CreationTime,AmountInCompanyCodeCurrency,"
+						+ "Currency&$orderby=CreationTime%20asc&$skip=" + iSkip + "&$top=" + iTop
+				}, {
+					results : aItems.slice(iSkip, iSkip + iTop)
+				});
+
+			// code under test
+			oTable.setFirstVisibleRow(oFixture.aVisibleRow[i]);
+
+			return that.waitForChanges(assert);
+		}
+
+		return this.createView(assert, sView, oModel).then(function () {
+			oTable = that.oView.byId("table");
+			oBinding = oTable.getBinding("rows");
+
+			return readBlock(0);
+		}).then(function () {
+			return readBlock(1);
+		}).then(function () {
+			assert.strictEqual(oBinding.getLength(), oFixture.aLengths[2]);
+			var aMultiUnitKeysForRoot = oBinding.mMultiUnitKey["/"];
+			// strip trailing |<number> to before comparing; number is a global counter of multi-unit situations
+			if (aMultiUnitKeysForRoot) {
+				aMultiUnitKeysForRoot = aMultiUnitKeysForRoot.map(function (sKey) {
+					return sKey.split("|")[0];
+				});
+			}
+			assert.deepEqual(aMultiUnitKeysForRoot, oFixture.aMultiUnitKeysForRoot);
+			assert.deepEqual(oBinding.mKeyIndex["/"], oFixture.aKeyIndexForRoot);
+		});
+	});
+});
+
 	//*********************************************************************************************
 	// Scenario: A user scrolls in an AnalyticalTable. Further data needs to be requested. The first
 	// entry of a response for a level request belongs to a different node than the watermark node.
@@ -21716,4 +21878,107 @@ ToProduct/ToSupplier/BusinessPartnerID\'}}">\
 			return this.waitForChanges(assert);
 		});
 	});
+
+	//*********************************************************************************************
+	// Scenario: A table is filtered via a property of a complex type which is addressed via a navigation
+	// property. The binding is using the operation mode "Client".
+	// SNOW: CS20230006626867
+	QUnit.test("Filter via a complex type property addressed via navigation property (client)", function (assert) {
+		var oModel = createSalesOrdersModel({defaultOperationMode : "Client"}),
+			sView = '\
+<t:Table id="Table" rows="{\
+			path: \'/SalesOrderSet\',\
+			parameters: {\
+				expand: \'ToBusinessPartner\',\
+				select: \'SalesOrderID,ToBusinessPartner/BusinessPartnerID,ToBusinessPartner/Address\'\
+			}\
+		}" visibleRowCount="2">\
+	<Text id="SalesOrderID" text="{SalesOrderID}" />\
+	<Text id="City" text="{ToBusinessPartner/Address/City}" />\
+</t:Table>',
+			that = this;
+
+		this.expectHeadRequest()
+			.expectRequest("SalesOrderSet?$expand=ToBusinessPartner"
+					+ "&$select=SalesOrderID,ToBusinessPartner/BusinessPartnerID,ToBusinessPartner/Address", {
+				results: [{
+					__metadata: {uri: "/SalesOrderSet('1')"},
+					SalesOrderID: "1",
+					ToBusinessPartner: {
+						__metadata: {uri: "/BusinessPartnerSet('42')"},
+						BusinessPartnerID: "42",
+						Address: {City: "Foo"}
+					}
+				}, {
+					__metadata: {uri: "/SalesOrderSet('2')"},
+					SalesOrderID: "2",
+					ToBusinessPartner: {
+						__metadata: {uri: "/BusinessPartnerSet('43')"},
+						BusinessPartnerID: "43",
+						Address: {City: "Bar"}
+					}
+				}]
+			})
+			.expectValue("SalesOrderID", ["1", "2"])
+			.expectValue("City", ["Foo", "Bar"]);
+
+		return this.createView(assert, sView, oModel).then(function () {
+			that.expectValue("SalesOrderID", "", 1)
+				.expectValue("City", "", 1);
+
+			// code under test
+			that.oView.byId("Table").getBinding("rows").filter(
+				new Filter({
+					path: "ToBusinessPartner/Address/City",
+					operator: FilterOperator.EQ,
+					value1: "Foo"
+				})
+			);
+
+			return that.waitForChanges(assert);
+		});
+	});
+
+	//*********************************************************************************************
+	// Scenario: A table is filtered via a property of a complex type which is addressed via a navigation
+	// property. The binding is using the operation mode "Server".
+	// SNOW: CS20230006626867
+	QUnit.test("Filter via a complex type property addressed via navigation property (server)", function (assert) {
+		var oModel = createSalesOrdersModel(),
+			sView = '\
+<t:Table id="Table" rows="{\
+			path: \'/SalesOrderSet\',\
+			parameters: {\
+				expand: \'ToBusinessPartner\',\
+				select: \'SalesOrderID,ToBusinessPartner/BusinessPartnerID,ToBusinessPartner/Address\'\
+			},\
+			filters : [{path: \'ToBusinessPartner/Address/City\', operator: \'EQ\', value1: \'Foo\'}]\
+		}" visibleRowCount="2">\
+	<Text id="SalesOrderID" text="{SalesOrderID}" />\
+	<Text id="City" text="{ToBusinessPartner/Address/City}" />\
+</t:Table>';
+
+		this.expectHeadRequest()
+			.expectRequest({
+				encodeRequestUri: false, // the / in the filter is not escaped
+				requestUri: "SalesOrderSet?$skip=0&$top=102"
+					+ "&$filter=ToBusinessPartner/Address/City%20eq%20%27Foo%27"
+					+ "&$expand=ToBusinessPartner"
+					+ "&$select=SalesOrderID%2cToBusinessPartner%2fBusinessPartnerID%2cToBusinessPartner%2fAddress"
+			}, {
+				results: [{
+					__metadata: {uri: "/SalesOrderSet('1')"},
+					SalesOrderID: "1",
+					ToBusinessPartner: {
+						__metadata: {uri: "/BusinessPartnerSet('42')"},
+						BusinessPartnerID: "42",
+						Address: {City: "Foo"}
+					}
+				}]
+			})
+			.expectValue("SalesOrderID", ["1", ""])
+			.expectValue("City", ["Foo", ""]);
+
+		return this.createView(assert, sView, oModel);
+	});
 });

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

@@ -4463,7 +4463,12 @@ sap.ui.define([
 	});
 
 	//*********************************************************************************************
-	QUnit.test("isEffectivelyKeptAlive: $$ownRequest", function (assert) {
+[
+	"/TEAMS('1')/TEAM_2_EMPLOYEES('2')",
+	"/TEAMS/0/TEAM_2_EMPLOYEES('2')"
+].forEach(function (sContextPath) {
+	const sTitle = "isEffectivelyKeptAlive: $$ownRequest, context path: " + sContextPath;
+	QUnit.test(sTitle, function (assert) {
 		var oBinding = {
 				checkKeepAlive : function () {},
 				getHeaderContext : function () {},
@@ -4471,7 +4476,7 @@ sap.ui.define([
 				isRelative : function () { return true; },
 				mParameters : {$$ownRequest : true}
 			},
-			oContext = Context.create({/*oModel*/}, oBinding, "/TEAMS('1')/TEAM_2_EMPLOYEES('2')");
+			oContext = Context.create({/*oModel*/}, oBinding, sContextPath);
 
 		oContext.setSelected(true);
 		this.mock(_Helper).expects("isDataAggregation")
@@ -4480,6 +4485,7 @@ sap.ui.define([
 		// code under test
 		assert.strictEqual(oContext.isEffectivelyKeptAlive(), true);
 	});
+});
 
 	//*********************************************************************************************
 	QUnit.test("isEffectivelyKeptAlive: data aggregation", function (assert) {
@@ -4499,6 +4505,24 @@ sap.ui.define([
 		assert.strictEqual(oContext.isEffectivelyKeptAlive(), false);
 	});
 
+	//*********************************************************************************************
+	QUnit.test("isEffectivelyKeptAlive: no key predicate", function (assert) {
+		const oBinding = {
+			getHeaderContext : function () {},
+			onKeepAliveChanged : function () {},
+			isRelative : function () { return false; },
+			mParameters : {}
+		};
+		const oContext = Context.create({/*oModel*/}, oBinding, "/SalesOrderList('0')/Messages/0");
+
+		oContext.setSelected(true);
+		this.mock(_Helper).expects("isDataAggregation")
+			.withExactArgs(sinon.match.same(oBinding.mParameters)).returns(false);
+
+		// code under test
+		assert.strictEqual(oContext.isEffectivelyKeptAlive(), false);
+	});
+
 	//*********************************************************************************************
 	QUnit.test("refreshDependentBindings", function (assert) {
 		var oModel = {

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

@@ -1113,6 +1113,8 @@ sap.ui.define([
 		}
 	}
 
+	function mustBeMocked() { throw new Error("Must be mocked"); }
+
 	//*********************************************************************************************
 	QUnit.module("sap.ui.model.odata.v4.ODataMetaModel", {
 		// remember copy to ensure test isolation
@@ -7298,28 +7300,52 @@ forEach({
 	});
 
 	//*********************************************************************************************
-	QUnit.test("requestValue4Annotation: no edm:Path", function (assert) {
+// 0: no addt'l Nav.Prop. // 1: no $Partner // 2: addt'l Nav.Prop. w/ $Partner
+[0, 1, 2].forEach((i) => {
+	let oOverload;
+
+	function setup(oTestContext, oContext) {
+		oTestContext.mock(oContext).expects("getPath").withExactArgs().returns("~path~");
+		oTestContext.mock(_Helper).expects("getMetaPath").withExactArgs("~path~")
+			.returns(i > 0 ? "/meta" : "/meta/path");
+		oTestContext.oMetaModelMock.expects("getObject").exactly(i > 0 ? 1 : 0)
+			.withExactArgs("/meta/path/$Partner").returns(i > 1 ? "~Partner~" : undefined);
+		if (i > 1) {
+			oOverload = {
+				$IsBound : true,
+				$Parameter : [{$Name : "~Partner~"}]
+			};
+		}
+	}
+
+	//* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	QUnit.test("requestValue4Annotation: no edm:Path #" + i, function (assert) {
 		var oContext = {
-				getModel : function () { return null; }
+				getModel : function () { return null; },
+				getPath : mustBeMocked
 			},
 			oMetaContext = {},
 			vRawValue = {};
 
-		this.oMetaModelMock.expects("createBindingContext").withExactArgs("/meta/path")
+		setup(this, oContext);
+		this.oMetaModelMock.expects("createBindingContext").withExactArgs("/meta/path/value")
 			.returns(oMetaContext);
 		this.mock(AnnotationHelper).expects("value")
-			.withExactArgs(sinon.match.same(vRawValue), {context : sinon.match.same(oMetaContext)})
+			.withExactArgs(sinon.match.same(vRawValue), {
+				context : sinon.match.same(oMetaContext),
+				overload : oOverload
+			})
 			.returns("foo");
 
 		// code under test
-		return this.oMetaModel.requestValue4Annotation(vRawValue, "/meta/path", oContext)
+		return this.oMetaModel.requestValue4Annotation(vRawValue, "/meta/path/value", oContext)
 			.then(function (sValue) {
 				assert.strictEqual(sValue, "foo");
 			});
 	});
 
-	//*********************************************************************************************
-	QUnit.test("requestValue4Annotation: composite binding", function (assert) {
+	//* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	QUnit.test("requestValue4Annotation: composite binding #" + i, function (assert) {
 		var oModel = new Model(),
 			oContext = Context.create(oModel, null, "/Entity(1)"),
 			oBarBinding = new PropertyBinding(oModel, "bar", oContext),
@@ -7334,10 +7360,14 @@ forEach({
 		oFooBinding.requestValue = function () {};
 		oModel.bindProperty = function () {};
 
-		this.oMetaModelMock.expects("createBindingContext").withExactArgs("/meta/path")
+		setup(this, oContext);
+		this.oMetaModelMock.expects("createBindingContext").withExactArgs("/meta/path/value")
 			.returns(oMetaContext);
 		this.mock(AnnotationHelper).expects("value")
-			.withExactArgs(sinon.match.same(vRawValue), {context : sinon.match.same(oMetaContext)})
+			.withExactArgs(sinon.match.same(vRawValue), {
+				context : sinon.match.same(oMetaContext),
+				overload : oOverload
+			})
 			.returns("{foo} {bar}"); // sync behavior only with a sap.ui.model.CompositeBinding
 		oModelMock.expects("bindProperty")
 			.withExactArgs("foo", sinon.match.same(oContext), undefined)
@@ -7352,14 +7382,14 @@ forEach({
 		this.mock(oBarBinding).expects("requestValue").withExactArgs().resolves();
 
 		// code under test
-		return this.oMetaModel.requestValue4Annotation(vRawValue, "/meta/path", oContext)
+		return this.oMetaModel.requestValue4Annotation(vRawValue, "/meta/path/value", oContext)
 			.then(function (sValue) {
 				assert.strictEqual(sValue, "foo-value bar-value");
 			});
 	});
 
-	//*********************************************************************************************
-	QUnit.test("requestValue4Annotation: async", function (assert) {
+	//* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	QUnit.test("requestValue4Annotation: async #" + i, function (assert) {
 		var oModel = new Model(),
 			oContext = Context.create(oModel, null, "/Entity(1)"),
 			oFooBinding = new PropertyBinding(oModel, "foo", oContext),
@@ -7372,10 +7402,14 @@ forEach({
 		oFooBinding.requestValue = function () {};
 		oModel.bindProperty = function () {};
 
-		this.oMetaModelMock.expects("createBindingContext").withExactArgs("/meta/path")
+		setup(this, oContext);
+		this.oMetaModelMock.expects("createBindingContext").withExactArgs("/meta/path/value")
 			.returns(oMetaContext);
 		this.mock(AnnotationHelper).expects("value")
-			.withExactArgs(sinon.match.same(vRawValue), {context : sinon.match.same(oMetaContext)})
+			.withExactArgs(sinon.match.same(vRawValue), {
+				context : sinon.match.same(oMetaContext),
+				overload : oOverload
+			})
 			.returns("{foo}");
 		oModelMock.expects("bindProperty")
 			.withExactArgs("foo", sinon.match.same(oContext), undefined)
@@ -7388,11 +7422,12 @@ forEach({
 			});
 
 		// code under test
-		return this.oMetaModel.requestValue4Annotation(vRawValue, "/meta/path", oContext)
+		return this.oMetaModel.requestValue4Annotation(vRawValue, "/meta/path/value", oContext)
 			.then(function (sValue) {
 				assert.strictEqual(sValue, "foo-value");
 			});
 	});
+}); // end of forEach
 
 	//*********************************************************************************************
 	QUnit.test("filterValueListRelevantQualifiers", function (assert) {