@sap/open.fe 1.96.0 → 1.97.0

package/packages/sap.fe.core/test/sap/fe/core/jest/helpers/ModelHelper.spec.js

@@ -1,4 +1,8 @@
-sap.ui.define(["sap/fe/core/helpers/ModelHelper"], function(ModelHelper) {
+sap.ui.define(["sap/fe/core/helpers/ModelHelper", "sap/ui/core/mvc/View", "sap/fe/test/UI5MockHelper"], function(
+	ModelHelper,
+	View,
+	UI5MockHelper
+) {
 	"use strict";
 
 	describe("ModelHelper", () => {
@@ -113,5 +117,118 @@ sap.ui.define(["sap/fe/core/helpers/ModelHelper"], function(ModelHelper) {
 				expect(ModelHelper.getActionParameterItemsModelPath(oParameter)).toEqual(undefined);
 			});
 		});
+
+		describe("getAbsoluteMetaPathForListBinding", () => {
+			var vListBinding, oView, sViewContextPath, oRootBinding, sBindingPath, oMockGetMetaPath;
+			beforeAll(async function() {
+				oView = new View();
+
+				// metaModel mocks
+				var oMetaModel = new UI5MockHelper.MockMetaModel();
+				oMockGetMetaPath = jest.spyOn(oMetaModel, "getMetaPath");
+
+				// model mocks
+				var oModel = new UI5MockHelper.MockModel();
+				oModel.setMetaModel(oMetaModel);
+				var oMockGetModel = jest.spyOn(oView, "getModel");
+				oMockGetModel.mockReturnValue(oModel);
+
+				// context mocks
+				var oContext = new UI5MockHelper.MockContext();
+				var oMockGetContext = jest.spyOn(oView, "getBindingContext");
+				oMockGetContext.mockReturnValue(oContext);
+				var oMockGetPath = jest.spyOn(oContext, "getPath");
+				oMockGetPath.mockImplementation(() => sViewContextPath);
+				vListBinding = {
+					getRootBinding: () => oRootBinding,
+					getPath: () => sBindingPath
+				};
+			});
+
+			beforeEach(async function() {
+				// Clean JSON
+				oRootBinding = {};
+				sViewContextPath = "";
+				sBindingPath = "";
+			});
+
+			afterAll(async function() {
+				jest.restoreAllMocks();
+			});
+
+			it("With Absolute list binding", async () => {
+				// Cases to consider
+				oRootBinding = vListBinding;
+				sBindingPath = "/SO";
+				ModelHelper.getAbsoluteMetaPathForListBinding(oView, vListBinding);
+				expect(oMockGetMetaPath).lastCalledWith("/SO");
+			});
+
+			it("With Relative list binding", async () => {
+				// Cases to consider
+				oRootBinding = {
+					getPath: () => "/SO(a=1,b=2)"
+				};
+				sBindingPath = "_Item";
+				ModelHelper.getAbsoluteMetaPathForListBinding(oView, vListBinding);
+				expect(oMockGetMetaPath).lastCalledWith("/SO(a=1,b=2)/_Item");
+			});
+
+			it("With Absolute path", async () => {
+				// Cases to consider
+				ModelHelper.getAbsoluteMetaPathForListBinding(oView, "/SO");
+				expect(oMockGetMetaPath).lastCalledWith("/SO");
+			});
+
+			it("With String path", async () => {
+				// Cases to consider
+				sViewContextPath = "/SO(a=1,b=2)";
+				ModelHelper.getAbsoluteMetaPathForListBinding(oView, "_Item");
+				expect(oMockGetMetaPath).lastCalledWith("/SO(a=1,b=2)/_Item");
+			});
+		});
+
+		describe("getMetaPathForContext", () => {
+			var oContext, sContextPath, oMockGetMetaPath;
+			beforeAll(async function() {
+				// metaModel mocks
+				var oMetaModel = new UI5MockHelper.MockMetaModel();
+				oMockGetMetaPath = jest.spyOn(oMetaModel, "getMetaPath");
+
+				// model mocks
+				var oModel = new UI5MockHelper.MockModel();
+				oModel.setMetaModel(oMetaModel);
+
+				// context mocks
+				oContext = new UI5MockHelper.MockContext();
+				var oMockGetModel = jest.spyOn(oContext, "getModel");
+				oMockGetModel.mockReturnValue(oModel);
+				var oMockGetPath = jest.spyOn(oContext, "getPath");
+				oMockGetPath.mockImplementation(() => sContextPath);
+			});
+
+			beforeEach(async function() {
+				// Clean JSON
+				sContextPath = "";
+			});
+
+			afterAll(async function() {
+				jest.restoreAllMocks();
+			});
+
+			it("With context Path", async () => {
+				// Cases to consider
+				sContextPath = "/SO(a=1,b=2)";
+				ModelHelper.getMetaPathForContext(oContext);
+				expect(oMockGetMetaPath).lastCalledWith("/SO(a=1,b=2)");
+			});
+
+			it("With context Path and navigation", async () => {
+				// Cases to consider
+				sContextPath = "/SO(a=1,b=2)/_Item";
+				ModelHelper.getMetaPathForContext(oContext);
+				expect(oMockGetMetaPath).lastCalledWith("/SO(a=1,b=2)/_Item");
+			});
+		});
 	});
 });

package/packages/sap.fe.core/test/sap/fe/core/jest/services/RoutingServiceFactory.spec.js

@@ -1,3 +1,4 @@
+/* global describe it beforeAll expect */
 sap.ui.define(["sap/fe/core/services/RoutingServiceFactory"], function(RoutingServiceFactory) {
 	"use strict";
 	describe("RoutingServiceFactory", function() {
@@ -230,6 +231,75 @@ sap.ui.define(["sap/fe/core/services/RoutingServiceFactory"], function(RoutingSe
 			});
 		});
 
+		describe("_requestObjectsFromParameters", () => {
+			let oRoutingServicePromise,
+				oModel,
+				oStartUpParameters = {
+					ID: ["ID"],
+					IsActiveEntity: ["true"],
+					SemanticKey: ["key"]
+				},
+				aExternallyNavigablePages = [
+					{
+						isSemanticKeyNavigation: true,
+						draft: {},
+						semanticKeys: [
+							{
+								$PropertyPath: "SemanticKey"
+							}
+						],
+						technicalKeys: ["ID", "IsActiveEntity"]
+					}
+				];
+			beforeAll(() => {
+				const oServiceContext = {
+					scopeType: "",
+					scopeObject: {},
+					settings: {}
+				};
+				const oRoutingServiceFactory = new RoutingServiceFactory();
+				oRoutingServicePromise = oRoutingServiceFactory.createInstance(oServiceContext);
+				oModel = {
+					bindList: function(sPath, oContext, vSorters, vFilters, mParameters) {
+						return {
+							requestContexts: function() {
+								return Promise.resolve(mParameters);
+							}
+						};
+					}
+				};
+			});
+			it("Request for semantic keys without draft", async () => {
+				return oRoutingServicePromise.then(async function(oRoutingService) {
+					let that = {
+							oModel: oModel,
+							_createFilter: oRoutingService._createFilter
+						},
+						requestObjectsFromParametersResult = await oRoutingService._requestObjectsFromParameters.call(
+							that,
+							oStartUpParameters,
+							aExternallyNavigablePages
+						);
+					expect(requestObjectsFromParametersResult).toEqual([{ "$select": ["SemanticKey"] }]);
+				});
+			});
+			it("Request for technical keys with draft", async () => {
+				aExternallyNavigablePages[0].isSemanticKeyNavigation = false;
+				return oRoutingServicePromise.then(async function(oRoutingService) {
+					let that = {
+							oModel: oModel,
+							_createFilter: oRoutingService._createFilter
+						},
+						requestObjectsFromParametersResult = await oRoutingService._requestObjectsFromParameters.call(
+							that,
+							oStartUpParameters,
+							aExternallyNavigablePages
+						);
+					expect(requestObjectsFromParametersResult).toEqual([{ "$select": ["ID", "IsActiveEntity"] }]);
+				});
+			});
+		});
+
 		describe("getDefaultCreateHash", () => {
 			let oRoutingServicePromise;
 

package/packages/sap.fe.core/test/sap/fe/core/jest/templating/EntitySetHelper.spec.js

@@ -0,0 +1,89 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+ *      (c) Copyright 2009-2021 SAP SE. All rights reserved
+ */
+sap.ui.define(["path", "sap/fe/core/converters/MetaModelConverter", "sap/fe/test/JestTemplatingHelper", "sap/fe/core/templating/EntitySetHelper"], function (path, MetaModelConverter, JestTemplatingHelper, EntitySetHelper) {
+  "use strict";
+
+  var getNonSortablePropertiesRestrictions = EntitySetHelper.getNonSortablePropertiesRestrictions;
+  var getMetaModel = JestTemplatingHelper.getMetaModel;
+  var compileCDS = JestTemplatingHelper.compileCDS;
+  var convertTypes = MetaModelConverter.convertTypes;
+
+  var convertedTypes;
+  var entitySet;
+  beforeAll(function () {
+    try {
+      var sMetadataUrl = compileCDS(path.join(__dirname, "../data/EntitySetHelper.cds"));
+      return Promise.resolve(getMetaModel(sMetadataUrl)).then(function (metaModel) {
+        convertedTypes = convertTypes(metaModel);
+        var maybeEntitySet = convertedTypes.entitySets.find(function (et) {
+          return et.name === "MainEntity";
+        });
+
+        if (maybeEntitySet) {
+          entitySet = maybeEntitySet;
+        } else {
+          throw new Error("Error in test setup");
+        }
+      });
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  });
+  describe("PropertyHelper", function () {
+    it("#getNonSortablePropertiesRestrictions", {
+      "references": [{
+        "type": "JIRA",
+        "ID": "FIORITECHP1-21370"
+      }]
+    }, function () {
+      try {
+        var sMetadataUrl = compileCDS(path.join(__dirname, "../data/EntitySetHelper.cds"));
+        return Promise.resolve(getMetaModel(sMetadataUrl)).then(function (metaModel) {
+          convertedTypes = convertTypes(metaModel);
+          var maybeEntitySet = convertedTypes.entitySets.find(function (et) {
+            return et.name === "MainEntity";
+          });
+
+          if (maybeEntitySet) {
+            entitySet = maybeEntitySet;
+          } else {
+            throw new Error("Error in test setup");
+          }
+
+          expect(getNonSortablePropertiesRestrictions(entitySet)).toEqual(["stringProperty", "_navigationEntityA/stringProperty", "_navigationEntityB/keyProperty", "_navigationEntityB/stringProperty"]);
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    });
+    it("#getNonSortablePropertiesRestrictions - main entity sortable=false", {
+      "references": [{
+        "type": "JIRA",
+        "ID": "FIORITECHP1-21370"
+      }]
+    }, function () {
+      try {
+        var sMetadataUrl = compileCDS(path.join(__dirname, "../data/EntitySetHelperMainEntitySortableFalse.cds"));
+        return Promise.resolve(getMetaModel(sMetadataUrl)).then(function (metaModel) {
+          convertedTypes = convertTypes(metaModel);
+          var maybeEntitySet = convertedTypes.entitySets.find(function (et) {
+            return et.name === "MainEntity";
+          });
+
+          if (maybeEntitySet) {
+            entitySet = maybeEntitySet;
+          } else {
+            throw new Error("Error in test setup");
+          }
+
+          expect(getNonSortablePropertiesRestrictions(entitySet)).toEqual(["keyProperty", "stringProperty"]);
+        });
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    });
+  });
+}, false);
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkVudGl0eVNldEhlbHBlci5zcGVjLnRzIl0sIm5hbWVzIjpbImNvbnZlcnRlZFR5cGVzIiwiZW50aXR5U2V0IiwiYmVmb3JlQWxsIiwic01ldGFkYXRhVXJsIiwiY29tcGlsZUNEUyIsInBhdGgiLCJqb2luIiwiX19kaXJuYW1lIiwiZ2V0TWV0YU1vZGVsIiwibWV0YU1vZGVsIiwiY29udmVydFR5cGVzIiwibWF5YmVFbnRpdHlTZXQiLCJlbnRpdHlTZXRzIiwiZmluZCIsImV0IiwibmFtZSIsIkVycm9yIiwiZGVzY3JpYmUiLCJpdCIsImV4cGVjdCIsImdldE5vblNvcnRhYmxlUHJvcGVydGllc1Jlc3RyaWN0aW9ucyIsInRvRXF1YWwiXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7Ozs7Ozs7OztBQUlBLE1BQUlBLGNBQUo7QUFDQSxNQUFJQyxTQUFKO0FBQ0FDLEVBQUFBLFNBQVM7QUFBQSxRQUFrQjtBQUMxQixVQUFNQyxZQUFZLEdBQUdDLFVBQVUsQ0FBQ0MsSUFBSSxDQUFDQyxJQUFMLENBQVVDLFNBQVYsRUFBcUIsNkJBQXJCLENBQUQsQ0FBL0I7QUFEMEIsNkJBRUZDLFlBQVksQ0FBQ0wsWUFBRCxDQUZWLGlCQUVwQk0sU0FGb0I7QUFHMUJULFFBQUFBLGNBQWMsR0FBR1UsWUFBWSxDQUFDRCxTQUFELENBQTdCO0FBQ0EsWUFBTUUsY0FBYyxHQUFHWCxjQUFjLENBQUNZLFVBQWYsQ0FBMEJDLElBQTFCLENBQStCLFVBQUFDLEVBQUU7QUFBQSxpQkFBSUEsRUFBRSxDQUFDQyxJQUFILEtBQVksWUFBaEI7QUFBQSxTQUFqQyxDQUF2Qjs7QUFKMEIsWUFLdEJKLGNBTHNCO0FBTXpCVixVQUFBQSxTQUFTLEdBQUdVLGNBQVo7QUFOeUI7QUFRekIsZ0JBQU0sSUFBSUssS0FBSixDQUFVLHFCQUFWLENBQU47QUFSeUI7QUFBQTtBQVUxQixLQVZRO0FBQUE7QUFBQTtBQUFBLElBQVQ7QUFZQUMsRUFBQUEsUUFBUSxDQUFDLGdCQUFELEVBQW1CLFlBQVc7QUFDckNDLElBQUFBLEVBQUUsQ0FDRCx1Q0FEQyxFQUVEO0FBQ0Msb0JBQWMsQ0FDYjtBQUNDLGdCQUFRLE1BRFQ7QUFFQyxjQUFNO0FBRlAsT0FEYTtBQURmLEtBRkM7QUFBQSxVQVVnQjtBQUNoQixZQUFNZixZQUFZLEdBQUdDLFVBQVUsQ0FBQ0MsSUFBSSxDQUFDQyxJQUFMLENBQVVDLFNBQVYsRUFBcUIsNkJBQXJCLENBQUQsQ0FBL0I7QUFEZ0IsK0JBRVFDLFlBQVksQ0FBQ0wsWUFBRCxDQUZwQixpQkFFVk0sU0FGVTtBQUdoQlQsVUFBQUEsY0FBYyxHQUFHVSxZQUFZLENBQUNELFNBQUQsQ0FBN0I7QUFDQSxjQUFNRSxjQUFjLEdBQUdYLGNBQWMsQ0FBQ1ksVUFBZixDQUEwQkMsSUFBMUIsQ0FBK0IsVUFBQUMsRUFBRTtBQUFBLG1CQUFJQSxFQUFFLENBQUNDLElBQUgsS0FBWSxZQUFoQjtBQUFBLFdBQWpDLENBQXZCOztBQUNBLGNBQUlKLGNBQUosRUFBb0I7QUFDbkJWLFlBQUFBLFNBQVMsR0FBR1UsY0FBWjtBQUNBLFdBRkQsTUFFTztBQUNOLGtCQUFNLElBQUlLLEtBQUosQ0FBVSxxQkFBVixDQUFOO0FBQ0E7O0FBQ0RHLFVBQUFBLE1BQU0sQ0FBQ0Msb0NBQW9DLENBQUNuQixTQUFELENBQXJDLENBQU4sQ0FBd0RvQixPQUF4RCxDQUFnRSxDQUMvRCxnQkFEK0QsRUFFL0QsbUNBRitELEVBRy9ELGdDQUgrRCxFQUkvRCxtQ0FKK0QsQ0FBaEU7QUFWZ0I7QUFnQmhCLE9BMUJBO0FBQUE7QUFBQTtBQUFBLE1BQUY7QUE0QkFILElBQUFBLEVBQUUsQ0FDRCxvRUFEQyxFQUVEO0FBQ0Msb0JBQWMsQ0FDYjtBQUNDLGdCQUFRLE1BRFQ7QUFFQyxjQUFNO0FBRlAsT0FEYTtBQURmLEtBRkM7QUFBQSxVQVVnQjtBQUNoQixZQUFNZixZQUFZLEdBQUdDLFVBQVUsQ0FBQ0MsSUFBSSxDQUFDQyxJQUFMLENBQVVDLFNBQVYsRUFBcUIsb0RBQXJCLENBQUQsQ0FBL0I7QUFEZ0IsK0JBRVFDLFlBQVksQ0FBQ0wsWUFBRCxDQUZwQixpQkFFVk0sU0FGVTtBQUdoQlQsVUFBQUEsY0FBYyxHQUFHVSxZQUFZLENBQUNELFNBQUQsQ0FBN0I7QUFDQSxjQUFNRSxjQUFjLEdBQUdYLGNBQWMsQ0FBQ1ksVUFBZixDQUEwQkMsSUFBMUIsQ0FBK0IsVUFBQUMsRUFBRTtBQUFBLG1CQUFJQSxFQUFFLENBQUNDLElBQUgsS0FBWSxZQUFoQjtBQUFBLFdBQWpDLENBQXZCOztBQUNBLGNBQUlKLGNBQUosRUFBb0I7QUFDbkJWLFlBQUFBLFNBQVMsR0FBR1UsY0FBWjtBQUNBLFdBRkQsTUFFTztBQUNOLGtCQUFNLElBQUlLLEtBQUosQ0FBVSxxQkFBVixDQUFOO0FBQ0E7O0FBQ0RHLFVBQUFBLE1BQU0sQ0FBQ0Msb0NBQW9DLENBQUNuQixTQUFELENBQXJDLENBQU4sQ0FBd0RvQixPQUF4RCxDQUFnRSxDQUFDLGFBQUQsRUFBZ0IsZ0JBQWhCLENBQWhFO0FBVmdCO0FBV2hCLE9BckJBO0FBQUE7QUFBQTtBQUFBLE1BQUY7QUF1QkEsR0FwRE8sQ0FBUiIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHBhdGggZnJvbSBcInBhdGhcIjtcbmltcG9ydCB7IGNvbnZlcnRUeXBlcyB9IGZyb20gXCJzYXAvZmUvY29yZS9jb252ZXJ0ZXJzL01ldGFNb2RlbENvbnZlcnRlclwiO1xuaW1wb3J0IHsgY29tcGlsZUNEUywgZ2V0TWV0YU1vZGVsIH0gZnJvbSBcInNhcC9mZS90ZXN0L0plc3RUZW1wbGF0aW5nSGVscGVyXCI7XG5pbXBvcnQgeyBFbnRpdHlTZXQgfSBmcm9tIFwiQHNhcC11eC9hbm5vdGF0aW9uLWNvbnZlcnRlclwiO1xuaW1wb3J0IHsgZ2V0Tm9uU29ydGFibGVQcm9wZXJ0aWVzUmVzdHJpY3Rpb25zIH0gZnJvbSBcInNhcC9mZS9jb3JlL3RlbXBsYXRpbmcvRW50aXR5U2V0SGVscGVyXCI7XG5cbmxldCBjb252ZXJ0ZWRUeXBlcztcbmxldCBlbnRpdHlTZXQ6IEVudGl0eVNldDtcbmJlZm9yZUFsbChhc3luYyBmdW5jdGlvbigpIHtcblx0Y29uc3Qgc01ldGFkYXRhVXJsID0gY29tcGlsZUNEUyhwYXRoLmpvaW4oX19kaXJuYW1lLCBcIi4uL2RhdGEvRW50aXR5U2V0SGVscGVyLmNkc1wiKSk7XG5cdGNvbnN0IG1ldGFNb2RlbCA9IGF3YWl0IGdldE1ldGFNb2RlbChzTWV0YWRhdGFVcmwpO1xuXHRjb252ZXJ0ZWRUeXBlcyA9IGNvbnZlcnRUeXBlcyhtZXRhTW9kZWwpO1xuXHRjb25zdCBtYXliZUVudGl0eVNldCA9IGNvbnZlcnRlZFR5cGVzLmVudGl0eVNldHMuZmluZChldCA9PiBldC5uYW1lID09PSBcIk1haW5FbnRpdHlcIik7XG5cdGlmIChtYXliZUVudGl0eVNldCkge1xuXHRcdGVudGl0eVNldCA9IG1heWJlRW50aXR5U2V0O1xuXHR9IGVsc2Uge1xuXHRcdHRocm93IG5ldyBFcnJvcihcIkVycm9yIGluIHRlc3Qgc2V0dXBcIik7XG5cdH1cbn0pO1xuXG5kZXNjcmliZShcIlByb3BlcnR5SGVscGVyXCIsIGZ1bmN0aW9uKCkge1xuXHRpdChcblx0XHRcIiNnZXROb25Tb3J0YWJsZVByb3BlcnRpZXNSZXN0cmljdGlvbnNcIixcblx0XHR7XG5cdFx0XHRcInJlZmVyZW5jZXNcIjogW1xuXHRcdFx0XHR7XG5cdFx0XHRcdFx0XCJ0eXBlXCI6IFwiSklSQVwiLFxuXHRcdFx0XHRcdFwiSURcIjogXCJGSU9SSVRFQ0hQMS0yMTM3MFwiXG5cdFx0XHRcdH1cblx0XHRcdF1cblx0XHR9LFxuXHRcdGFzeW5jIGZ1bmN0aW9uKCkge1xuXHRcdFx0Y29uc3Qgc01ldGFkYXRhVXJsID0gY29tcGlsZUNEUyhwYXRoLmpvaW4oX19kaXJuYW1lLCBcIi4uL2RhdGEvRW50aXR5U2V0SGVscGVyLmNkc1wiKSk7XG5cdFx0XHRjb25zdCBtZXRhTW9kZWwgPSBhd2FpdCBnZXRNZXRhTW9kZWwoc01ldGFkYXRhVXJsKTtcblx0XHRcdGNvbnZlcnRlZFR5cGVzID0gY29udmVydFR5cGVzKG1ldGFNb2RlbCk7XG5cdFx0XHRjb25zdCBtYXliZUVudGl0eVNldCA9IGNvbnZlcnRlZFR5cGVzLmVudGl0eVNldHMuZmluZChldCA9PiBldC5uYW1lID09PSBcIk1haW5FbnRpdHlcIik7XG5cdFx0XHRpZiAobWF5YmVFbnRpdHlTZXQpIHtcblx0XHRcdFx0ZW50aXR5U2V0ID0gbWF5YmVFbnRpdHlTZXQ7XG5cdFx0XHR9IGVsc2Uge1xuXHRcdFx0XHR0aHJvdyBuZXcgRXJyb3IoXCJFcnJvciBpbiB0ZXN0IHNldHVwXCIpO1xuXHRcdFx0fVxuXHRcdFx0ZXhwZWN0KGdldE5vblNvcnRhYmxlUHJvcGVydGllc1Jlc3RyaWN0aW9ucyhlbnRpdHlTZXQpKS50b0VxdWFsKFtcblx0XHRcdFx0XCJzdHJpbmdQcm9wZXJ0eVwiLFxuXHRcdFx0XHRcIl9uYXZpZ2F0aW9uRW50aXR5QS9zdHJpbmdQcm9wZXJ0eVwiLFxuXHRcdFx0XHRcIl9uYXZpZ2F0aW9uRW50aXR5Qi9rZXlQcm9wZXJ0eVwiLFxuXHRcdFx0XHRcIl9uYXZpZ2F0aW9uRW50aXR5Qi9zdHJpbmdQcm9wZXJ0eVwiXG5cdFx0XHRdKTtcblx0XHR9XG5cdCk7XG5cdGl0KFxuXHRcdFwiI2dldE5vblNvcnRhYmxlUHJvcGVydGllc1Jlc3RyaWN0aW9ucyAtIG1haW4gZW50aXR5IHNvcnRhYmxlPWZhbHNlXCIsXG5cdFx0e1xuXHRcdFx0XCJyZWZlcmVuY2VzXCI6IFtcblx0XHRcdFx0e1xuXHRcdFx0XHRcdFwidHlwZVwiOiBcIkpJUkFcIixcblx0XHRcdFx0XHRcIklEXCI6IFwiRklPUklURUNIUDEtMjEzNzBcIlxuXHRcdFx0XHR9XG5cdFx0XHRdXG5cdFx0fSxcblx0XHRhc3luYyBmdW5jdGlvbigpIHtcblx0XHRcdGNvbnN0IHNNZXRhZGF0YVVybCA9IGNvbXBpbGVDRFMocGF0aC5qb2luKF9fZGlybmFtZSwgXCIuLi9kYXRhL0VudGl0eVNldEhlbHBlck1haW5FbnRpdHlTb3J0YWJsZUZhbHNlLmNkc1wiKSk7XG5cdFx0XHRjb25zdCBtZXRhTW9kZWwgPSBhd2FpdCBnZXRNZXRhTW9kZWwoc01ldGFkYXRhVXJsKTtcblx0XHRcdGNvbnZlcnRlZFR5cGVzID0gY29udmVydFR5cGVzKG1ldGFNb2RlbCk7XG5cdFx0XHRjb25zdCBtYXliZUVudGl0eVNldCA9IGNvbnZlcnRlZFR5cGVzLmVudGl0eVNldHMuZmluZChldCA9PiBldC5uYW1lID09PSBcIk1haW5FbnRpdHlcIik7XG5cdFx0XHRpZiAobWF5YmVFbnRpdHlTZXQpIHtcblx0XHRcdFx0ZW50aXR5U2V0ID0gbWF5YmVFbnRpdHlTZXQ7XG5cdFx0XHR9IGVsc2Uge1xuXHRcdFx0XHR0aHJvdyBuZXcgRXJyb3IoXCJFcnJvciBpbiB0ZXN0IHNldHVwXCIpO1xuXHRcdFx0fVxuXHRcdFx0ZXhwZWN0KGdldE5vblNvcnRhYmxlUHJvcGVydGllc1Jlc3RyaWN0aW9ucyhlbnRpdHlTZXQpKS50b0VxdWFsKFtcImtleVByb3BlcnR5XCIsIFwic3RyaW5nUHJvcGVydHlcIl0pO1xuXHRcdH1cblx0KTtcbn0pO1xuIl19

package/packages/sap.fe.core/test/sap/fe/core/jest/templating/EntitySetHelper.spec.ts

@@ -0,0 +1,73 @@
+import path from "path";
+import { convertTypes } from "sap/fe/core/converters/MetaModelConverter";
+import { compileCDS, getMetaModel } from "sap/fe/test/JestTemplatingHelper";
+import { EntitySet } from "@sap-ux/annotation-converter";
+import { getNonSortablePropertiesRestrictions } from "sap/fe/core/templating/EntitySetHelper";
+
+let convertedTypes;
+let entitySet: EntitySet;
+beforeAll(async function() {
+	const sMetadataUrl = compileCDS(path.join(__dirname, "../data/EntitySetHelper.cds"));
+	const metaModel = await getMetaModel(sMetadataUrl);
+	convertedTypes = convertTypes(metaModel);
+	const maybeEntitySet = convertedTypes.entitySets.find(et => et.name === "MainEntity");
+	if (maybeEntitySet) {
+		entitySet = maybeEntitySet;
+	} else {
+		throw new Error("Error in test setup");
+	}
+});
+
+describe("PropertyHelper", function() {
+	it(
+		"#getNonSortablePropertiesRestrictions",
+		{
+			"references": [
+				{
+					"type": "JIRA",
+					"ID": "FIORITECHP1-21370"
+				}
+			]
+		},
+		async function() {
+			const sMetadataUrl = compileCDS(path.join(__dirname, "../data/EntitySetHelper.cds"));
+			const metaModel = await getMetaModel(sMetadataUrl);
+			convertedTypes = convertTypes(metaModel);
+			const maybeEntitySet = convertedTypes.entitySets.find(et => et.name === "MainEntity");
+			if (maybeEntitySet) {
+				entitySet = maybeEntitySet;
+			} else {
+				throw new Error("Error in test setup");
+			}
+			expect(getNonSortablePropertiesRestrictions(entitySet)).toEqual([
+				"stringProperty",
+				"_navigationEntityA/stringProperty",
+				"_navigationEntityB/keyProperty",
+				"_navigationEntityB/stringProperty"
+			]);
+		}
+	);
+	it(
+		"#getNonSortablePropertiesRestrictions - main entity sortable=false",
+		{
+			"references": [
+				{
+					"type": "JIRA",
+					"ID": "FIORITECHP1-21370"
+				}
+			]
+		},
+		async function() {
+			const sMetadataUrl = compileCDS(path.join(__dirname, "../data/EntitySetHelperMainEntitySortableFalse.cds"));
+			const metaModel = await getMetaModel(sMetadataUrl);
+			convertedTypes = convertTypes(metaModel);
+			const maybeEntitySet = convertedTypes.entitySets.find(et => et.name === "MainEntity");
+			if (maybeEntitySet) {
+				entitySet = maybeEntitySet;
+			} else {
+				throw new Error("Error in test setup");
+			}
+			expect(getNonSortablePropertiesRestrictions(entitySet)).toEqual(["keyProperty", "stringProperty"]);
+		}
+	);
+});

package/packages/sap.fe.core/test/sap/fe/core/qunit/TemplatingExpressions.qunit.js

@@ -939,9 +939,11 @@ sap.ui.define(
 								"converterHeaderFacet": "/header/facets/32"
 							},
 							oExpectedResultsPerTest: {
-								"headerDataPointLinkTest": {
+								"headerDataPointLinkTitleTest": {
 									"visible":
-										"{= COMMON.getHeaderDataPointLinkVisibility(ID.generate(['fe', 'HeaderDPLink', ${converterHeaderFacet>targetAnnotationValue}]), true, ${dataPoint>@@FIELD.isNotAlwaysHidden}) }",
+										"{= COMMON.getHeaderDataPointLinkVisibility(ID.generate(['fe', 'HeaderDPLink', ${converterHeaderFacet>targetAnnotationValue}]), true, ${dataPoint>@@FIELD.isNotAlwaysHidden}) }"
+								},
+								"headerDataPointLinkInsideTitleTest": {
 									"press": '.handlers.onDataPointTitlePressed($controller, ${$source>}, undefined,"FreestyleNav")'
 								},
 								"headerDataPointTitleTest": {

package/packages/sap.fe.core/test/sap/fe/core/qunit/apps/generalTests.json

@@ -223,5 +223,11 @@
 		"module": "test-resources/sap/fe/core/internal/qunit/VisualFilterUtils.qunit",
 		"title": "VisualFilterUtils - Unit Tests",
 		"group": []
+	},
+	{
+		"name": "FilterUtils",
+		"module": "test-resources/sap/fe/core/internal/qunit/FilterUtils.qunit",
+		"title": "FilterUtils - Unit Tests",
+		"group": []
 	}
 ]

package/packages/sap.fe.macros/src/sap/fe/macros/.library

@@ -6,7 +6,7 @@
     <copyright>SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     </copyright>
-    <version>1.96.0</version>
+    <version>1.97.0</version>
 
     <documentation>UI5 library: sap.fe.macros</documentation>
 

package/packages/sap.fe.macros/src/sap/fe/macros/.theming

@@ -1,6 +1,6 @@
 {
   "sEntity": "Library",
   "sId": "sap/fe/macros",
-  "sVersion": "1.96.0",
+  "sVersion": "1.97.0",
   "bIgnore": true
 }

package/packages/sap.fe.macros/src/sap/fe/macros/ChartDelegate-dbg.js

@@ -94,7 +94,14 @@ sap.ui.define(
 			}
 		}
 
-		function handleProperty(oMDCChart, mEntitySetAnnotations, mKnownAggregatableProps, mCustomAggregates, aProperties, sCriticality) {
+		ChartDelegate._handleProperty = function(
+			oMDCChart,
+			mEntitySetAnnotations,
+			mKnownAggregatableProps,
+			mCustomAggregates,
+			aProperties,
+			sCriticality
+		) {
 			var oApplySupported = CommonHelper.parseCustomData(oMDCChart.data("applySupported"));
 			var oSortRestrictions = mEntitySetAnnotations["@Org.OData.Capabilities.V1.SortRestrictions"] || {};
 			var oSortRestrictionsInfo = ODataMetaModelUtil.getSortRestrictionsInfo(oSortRestrictions);
@@ -216,7 +223,7 @@ sap.ui.define(
 					});
 				}
 			}
-		}
+		};
 
 		ChartDelegate.updateBindingInfo = function(oChart, oBindingInfo) {
 			setChartNoDataText(oChart, oBindingInfo);
@@ -351,7 +358,7 @@ sap.ui.define(
 									oMetaModel,
 									oMetaModel.createBindingContext(sEntitySetPath + "/" + sKey)
 								).then(
-									handleProperty.bind(
+									ChartDelegate._handleProperty.bind(
 										oMetaModel.getMetaContext(sEntitySetPath + "/" + sKey),
 										oMDCChart,
 										mEntitySetAnnotations,
@@ -404,9 +411,12 @@ sap.ui.define(
 				for (var sCustom in mCustomAggregates) {
 					if (sCustom === sKey) {
 						var oItem = merge({}, mCustomAggregates[sCustom], {
-							kind: MDCLib.ChartItemType.Measure,
+							groupable: false,
+							aggregatable: true,
+							kind: "Aggregatable",
+							availableRoles: ChartDelegate._getLayoutOptionsForType("aggregatable"), //for p13n
 							role: MDCLib.ChartItemRoleType.axis1,
-							sortable: mCustomAggregates[sCustom].sortable
+							datapoint: null //To be implemented by FE
 						});
 						aAggregateProperties.push(oItem);
 

package/packages/sap.fe.macros/src/sap/fe/macros/ChartDelegate.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/mdc/library","sap/ui/mdc/odata/v4/vizChart/ChartDelegateNew","sap/fe/macros/ODataMetaModelUtil","sap/ui/mdc/odata/v4/ODataMetaModelUtil","sap/base/util/merge","sap/fe/macros/chart/ChartUtils","sap/ui/mdc/util/FilterUtil","sap/ui/mdc/odata/v4/util/DelegateUtil","sap/ui/base/SyncPromise","sap/base/Log","sap/fe/core/CommonUtils","sap/fe/macros/ResourceModel","sap/fe/macros/CommonHelper","sap/fe/macros/ChartAPI"],function(M,B,a,O,m,C,F,D,S,L,b,R,c,d){"use strict";var e=Object.assign({},B);function s(f,g){var n="",i=C.getAllFilterInfo(f),j=g.path.substr(1);if(f.getFilter()){if(i.search||(i.filters&&i.filters.length)){n="T_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER";}else{n="T_OP_TABLE_AND_CHART_NO_DATA_TEXT";}}else{if(i.search||(i.filters&&i.filters.length)){n="T_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER";}else{n="M_OP_TABLE_AND_CHART_OP_NO_FILTERS_NO_DATA_TEXT";}}if(n==="T_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER"||n==="T_OP_TABLE_AND_CHART_NO_DATA_TEXT"){return f.getModel("sap.fe.i18n").getResourceBundle().then(function(r){f.setNoDataText(b.getTranslatedText(n,r,null,j));}).catch(function(k){L.error(k);});}else{if(R){f.setNoDataText(R.getText(n));}}}function h(f,E,k,g,p,l){var A=c.parseCustomData(f.data("applySupported"));var n=E["@Org.OData.Capabilities.V1.SortRestrictions"]||{};var q=O.getSortRestrictionsInfo(n);var r=E["@Org.OData.Capabilities.V1.FilterRestrictions"];var t=O.getFilterRestrictionsInfo(r);var u=this.getModel().getObject(this.getPath());var K=this.getModel().getObject(this.getPath()+"@sapui.name");var v=this.getModel();if(u&&u.$kind==="Property"){if(u.$isCollection){return;}var P=v.getObject(this.getPath()+"@");var w=v.getObject("@sapui.name",v.getMetaContext(this.getPath()));var G=A&&A.GroupableProperties;var x=A&&A.AggregatableProperties;var y=false,z=false;if(G&&G.length){for(var i=0;i<G.length;i++){if(G[i].$PropertyPath===w){y=true;break;}}}if(x&&x.length){for(var j=0;j<x.length;j++){if(x[j].Property.$PropertyPath===w){z=true;break;}}}if(!G||(G&&!G.length)){y=P["@Org.OData.Aggregation.V1.Groupable"];}if(!x||(x&&!x.length)){z=P["@Org.OData.Aggregation.V1.Aggregatable"];}if(!y&&!z){return;}if(z){var H=e._createPropertyInfosForAggregatable(K,P,t,q,k,g);H.forEach(function(J){p.push(J);});}if(y){var N=K||"",T=P["@com.sap.vocabularies.Common.v1.Text"]?P["@com.sap.vocabularies.Common.v1.Text"].$Path:null;var I=false;if(N&&N.indexOf("/")>-1){L.error("$expand is not yet supported. Property: "+N+" from an association cannot be used");return;}if(T&&T.indexOf("/")>-1){L.error("$expand is not yet supported. Text Property: "+T+" from an association cannot be used");I=true;}p.push({name:K,propertyPath:K,label:P["@com.sap.vocabularies.Common.v1.Label"]||K,sortable:q[K]?q[K].sortable:true,filterable:t[K]?t[K].filterable:true,groupable:true,aggregatable:false,maxConditions:O.isMultiValueFilterExpression(t.propertyInfo[K])?-1:1,sortKey:K,kind:"Groupable",availableRoles:e._getLayoutOptionsForType("groupable"),role:M.ChartItemRoleType.category,criticality:l,textProperty:!I&&P["@com.sap.vocabularies.Common.v1.Text"]?P["@com.sap.vocabularies.Common.v1.Text"].$Path:null,textFormatter:function(V,J){if(P["@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement"]){var Q=P["@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement"];if(Q.$EnumMember==="com.sap.vocabularies.UI.v1.TextArrangementType/TextFirst"){return J+" ("+V+")";}else if(Q.$EnumMember==="com.sap.vocabularies.UI.v1.TextArrangementType/TextLast"){return V+" ("+J+")";}else if(Q.$EnumMember==="com.sap.vocabularies.UI.v1.TextArrangementType/TextOnly"){return J;}}return J?J:V;}});}}}e.updateBindingInfo=function(f,g){s(f,g);var i=sap.ui.getCore().byId(f.getFilter());if(i){var j=i.getConditions();if(j){if(!g){g={};}var I=f.getControlDelegate()._getChart(f);var k;if(I){if(C.getChartSelectionsExist(f)){k=C.getAllFilterInfo(f);}}k=k?k:C.getFilterBarFilterInfo(f);if(k){g.filters=k.filters;}var p=D.getParametersInfo(i,j);if(p){g.path=p;}}}};e.fetchProperties=function(f){var g=this._getModel(f);var p;if(!g){p=new Promise(function(r){f.attachModelContextChange({resolver:r},o,this);}.bind(this)).then(function(g){return this._createPropertyInfos(f,g);}.bind(this));}else{p=this._createPropertyInfos(f,g);}return p.then(function(P){if(f.data){f.data("$mdcChartPropertyInfo",P);}return P;});};function o(E,f){var g=E.getSource();var i=this._getModel(g);if(i){g.detachModelContextChange(o);f.resolver(i);}}e._createPropertyInfos=function(f,g){var E="/"+f.data("entitySet");var i=g.getMetaModel();return Promise.all([i.requestObject(E+"/"),i.requestObject(E+"@")]).then(function(r){var p=[];var j=r[0],k=r[1];var l=c.parseCustomData(f.data("customAgg"));var A;var P=[];for(var n in k){if(n.startsWith("@Org.OData.Aggregation.V1.CustomAggregate")){A=n.replace("@Org.OData.Aggregation.V1.CustomAggregate#","");var q=A.split("@");if(q.length==2&&q[1]=="com.sap.vocabularies.Common.v1.Label"){l[q[0].label]=k[n];}}}var t=[],u=[];if(Object.keys(l).length>=1){var v=f.getItems();for(var w in v){if(v[w].isA("sap.ui.mdc.chart.DimensionItem")){t.push(v[w].getKey());}else if(v[w].isA("sap.ui.mdc.chart.MeasureItem")){u.push(v[w].getKey());}}if(u.filter(function(G){return t.indexOf(G)!=-1;}).length>=1){L.error("Dimension and Measure has the sameProperty Configured");}}var T=c.parseCustomData(f.data("transAgg"));var K={};for(var x in T){var y=T[x].propertyPath;K[y]=K[y]||{};K[y][T[x].aggregationMethod]={name:T[x].name,label:T[x].label};}for(var z in j){if(z.indexOf("$")!==0){P.push(a.fetchCriticality(i,i.createBindingContext(E+"/"+z)).then(h.bind(i.getMetaContext(E+"/"+z),f,k,K,l,p)));}}return Promise.all(P).then(function(){return p;});});};e._createPropertyInfosForAggregatable=function(k,p,f,g,K,i){var A=[];if(Object.keys(K).indexOf(k)>-1){for(var j in K[k]){A.push({name:K[k][j].name,propertyPath:k,label:K[k][j].label||p["@com.sap.vocabularies.Common.v1.Label"]+" ("+j+")"||k+" ("+j+")",sortable:g[k]?g[k].sortable:true,filterable:f[k]?f[k].filterable:true,groupable:false,aggregatable:true,aggregationMethod:j,maxConditions:O.isMultiValueFilterExpression(f.propertyInfo[k])?-1:1,kind:"Aggregatable",availableRoles:e._getLayoutOptionsForType("aggregatable"),role:M.ChartItemRoleType.axis1,datapoint:null});}}else if(Object.keys(i).indexOf(k)>-1){for(var l in i){if(l===k){var I=m({},i[l],{kind:M.ChartItemType.Measure,role:M.ChartItemRoleType.axis1,sortable:i[l].sortable});A.push(I);break;}}}return A;};e.rebindChart=function(f,g){B.rebindChart(f,g);};e._setChart=function(f,i){var g=f.getParent();i.setVizProperties(f.data("vizProperties"));i.detachSelectData(g.handleSelectionChange.bind(g));i.detachDeselectData(g.handleSelectionChange.bind(g));i.detachDrilledUp(g.handleSelectionChange.bind(g));i.attachSelectData(g.handleSelectionChange.bind(g));i.attachDeselectData(g.handleSelectionChange.bind(g));i.attachDrilledUp(g.handleSelectionChange.bind(g));i.setSelectionMode(f.getPayload().selectionMode.toUpperCase());B._setChart(f,i);};e._getBindingInfo=function(f){if(this._getBindingInfoFromState(f)){return this._getBindingInfoFromState(f);}var g=f.getDelegate().payload;var i=f.getModel()&&f.getModel().getMetaModel();var t=f.data("targetCollectionPath");var E=(i.getObject(t+"/$kind")==="EntitySet"?"/":"")+g.contextPath;var p=m({},g.parameters,{entitySet:f.data("entitySet"),useBatchRequests:true,provideGrandTotals:true,provideTotalResultSize:true,noPaging:true});var j={path:E,parameters:p};return j;};e.removeItemFromInnerChart=function(f,g){B.removeItemFromInnerChart.call(this,f,g);if(g.getType()==="groupable"){var i=this._getChart(f);i.fireDeselectData();}};return e;},false);
+sap.ui.define(["sap/ui/mdc/library","sap/ui/mdc/odata/v4/vizChart/ChartDelegateNew","sap/fe/macros/ODataMetaModelUtil","sap/ui/mdc/odata/v4/ODataMetaModelUtil","sap/base/util/merge","sap/fe/macros/chart/ChartUtils","sap/ui/mdc/util/FilterUtil","sap/ui/mdc/odata/v4/util/DelegateUtil","sap/ui/base/SyncPromise","sap/base/Log","sap/fe/core/CommonUtils","sap/fe/macros/ResourceModel","sap/fe/macros/CommonHelper","sap/fe/macros/ChartAPI"],function(M,B,a,O,m,C,F,D,S,L,b,R,c,d){"use strict";var e=Object.assign({},B);function s(f,g){var n="",h=C.getAllFilterInfo(f),i=g.path.substr(1);if(f.getFilter()){if(h.search||(h.filters&&h.filters.length)){n="T_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER";}else{n="T_OP_TABLE_AND_CHART_NO_DATA_TEXT";}}else{if(h.search||(h.filters&&h.filters.length)){n="T_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER";}else{n="M_OP_TABLE_AND_CHART_OP_NO_FILTERS_NO_DATA_TEXT";}}if(n==="T_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER"||n==="T_OP_TABLE_AND_CHART_NO_DATA_TEXT"){return f.getModel("sap.fe.i18n").getResourceBundle().then(function(r){f.setNoDataText(b.getTranslatedText(n,r,null,i));}).catch(function(j){L.error(j);});}else{if(R){f.setNoDataText(R.getText(n));}}}e._handleProperty=function(f,E,k,g,p,h){var A=c.parseCustomData(f.data("applySupported"));var l=E["@Org.OData.Capabilities.V1.SortRestrictions"]||{};var n=O.getSortRestrictionsInfo(l);var q=E["@Org.OData.Capabilities.V1.FilterRestrictions"];var r=O.getFilterRestrictionsInfo(q);var t=this.getModel().getObject(this.getPath());var K=this.getModel().getObject(this.getPath()+"@sapui.name");var u=this.getModel();if(t&&t.$kind==="Property"){if(t.$isCollection){return;}var P=u.getObject(this.getPath()+"@");var v=u.getObject("@sapui.name",u.getMetaContext(this.getPath()));var G=A&&A.GroupableProperties;var w=A&&A.AggregatableProperties;var x=false,y=false;if(G&&G.length){for(var i=0;i<G.length;i++){if(G[i].$PropertyPath===v){x=true;break;}}}if(w&&w.length){for(var j=0;j<w.length;j++){if(w[j].Property.$PropertyPath===v){y=true;break;}}}if(!G||(G&&!G.length)){x=P["@Org.OData.Aggregation.V1.Groupable"];}if(!w||(w&&!w.length)){y=P["@Org.OData.Aggregation.V1.Aggregatable"];}if(!x&&!y){return;}if(y){var z=e._createPropertyInfosForAggregatable(K,P,r,n,k,g);z.forEach(function(H){p.push(H);});}if(x){var N=K||"",T=P["@com.sap.vocabularies.Common.v1.Text"]?P["@com.sap.vocabularies.Common.v1.Text"].$Path:null;var I=false;if(N&&N.indexOf("/")>-1){L.error("$expand is not yet supported. Property: "+N+" from an association cannot be used");return;}if(T&&T.indexOf("/")>-1){L.error("$expand is not yet supported. Text Property: "+T+" from an association cannot be used");I=true;}p.push({name:K,propertyPath:K,label:P["@com.sap.vocabularies.Common.v1.Label"]||K,sortable:n[K]?n[K].sortable:true,filterable:r[K]?r[K].filterable:true,groupable:true,aggregatable:false,maxConditions:O.isMultiValueFilterExpression(r.propertyInfo[K])?-1:1,sortKey:K,kind:"Groupable",availableRoles:e._getLayoutOptionsForType("groupable"),role:M.ChartItemRoleType.category,criticality:h,textProperty:!I&&P["@com.sap.vocabularies.Common.v1.Text"]?P["@com.sap.vocabularies.Common.v1.Text"].$Path:null,textFormatter:function(V,H){if(P["@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement"]){var J=P["@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement"];if(J.$EnumMember==="com.sap.vocabularies.UI.v1.TextArrangementType/TextFirst"){return H+" ("+V+")";}else if(J.$EnumMember==="com.sap.vocabularies.UI.v1.TextArrangementType/TextLast"){return V+" ("+H+")";}else if(J.$EnumMember==="com.sap.vocabularies.UI.v1.TextArrangementType/TextOnly"){return H;}}return H?H:V;}});}}};e.updateBindingInfo=function(f,g){s(f,g);var h=sap.ui.getCore().byId(f.getFilter());if(h){var i=h.getConditions();if(i){if(!g){g={};}var I=f.getControlDelegate()._getChart(f);var j;if(I){if(C.getChartSelectionsExist(f)){j=C.getAllFilterInfo(f);}}j=j?j:C.getFilterBarFilterInfo(f);if(j){g.filters=j.filters;}var p=D.getParametersInfo(h,i);if(p){g.path=p;}}}};e.fetchProperties=function(f){var g=this._getModel(f);var p;if(!g){p=new Promise(function(r){f.attachModelContextChange({resolver:r},o,this);}.bind(this)).then(function(g){return this._createPropertyInfos(f,g);}.bind(this));}else{p=this._createPropertyInfos(f,g);}return p.then(function(P){if(f.data){f.data("$mdcChartPropertyInfo",P);}return P;});};function o(E,f){var g=E.getSource();var h=this._getModel(g);if(h){g.detachModelContextChange(o);f.resolver(h);}}e._createPropertyInfos=function(f,g){var E="/"+f.data("entitySet");var h=g.getMetaModel();return Promise.all([h.requestObject(E+"/"),h.requestObject(E+"@")]).then(function(r){var p=[];var i=r[0],j=r[1];var k=c.parseCustomData(f.data("customAgg"));var A;var P=[];for(var l in j){if(l.startsWith("@Org.OData.Aggregation.V1.CustomAggregate")){A=l.replace("@Org.OData.Aggregation.V1.CustomAggregate#","");var n=A.split("@");if(n.length==2&&n[1]=="com.sap.vocabularies.Common.v1.Label"){k[n[0].label]=j[l];}}}var q=[],t=[];if(Object.keys(k).length>=1){var u=f.getItems();for(var v in u){if(u[v].isA("sap.ui.mdc.chart.DimensionItem")){q.push(u[v].getKey());}else if(u[v].isA("sap.ui.mdc.chart.MeasureItem")){t.push(u[v].getKey());}}if(t.filter(function(z){return q.indexOf(z)!=-1;}).length>=1){L.error("Dimension and Measure has the sameProperty Configured");}}var T=c.parseCustomData(f.data("transAgg"));var K={};for(var w in T){var x=T[w].propertyPath;K[x]=K[x]||{};K[x][T[w].aggregationMethod]={name:T[w].name,label:T[w].label};}for(var y in i){if(y.indexOf("$")!==0){P.push(a.fetchCriticality(h,h.createBindingContext(E+"/"+y)).then(e._handleProperty.bind(h.getMetaContext(E+"/"+y),f,j,K,k,p)));}}return Promise.all(P).then(function(){return p;});});};e._createPropertyInfosForAggregatable=function(k,p,f,g,K,h){var A=[];if(Object.keys(K).indexOf(k)>-1){for(var i in K[k]){A.push({name:K[k][i].name,propertyPath:k,label:K[k][i].label||p["@com.sap.vocabularies.Common.v1.Label"]+" ("+i+")"||k+" ("+i+")",sortable:g[k]?g[k].sortable:true,filterable:f[k]?f[k].filterable:true,groupable:false,aggregatable:true,aggregationMethod:i,maxConditions:O.isMultiValueFilterExpression(f.propertyInfo[k])?-1:1,kind:"Aggregatable",availableRoles:e._getLayoutOptionsForType("aggregatable"),role:M.ChartItemRoleType.axis1,datapoint:null});}}else if(Object.keys(h).indexOf(k)>-1){for(var j in h){if(j===k){var I=m({},h[j],{groupable:false,aggregatable:true,kind:"Aggregatable",availableRoles:e._getLayoutOptionsForType("aggregatable"),role:M.ChartItemRoleType.axis1,datapoint:null});A.push(I);break;}}}return A;};e.rebindChart=function(f,g){B.rebindChart(f,g);};e._setChart=function(f,i){var g=f.getParent();i.setVizProperties(f.data("vizProperties"));i.detachSelectData(g.handleSelectionChange.bind(g));i.detachDeselectData(g.handleSelectionChange.bind(g));i.detachDrilledUp(g.handleSelectionChange.bind(g));i.attachSelectData(g.handleSelectionChange.bind(g));i.attachDeselectData(g.handleSelectionChange.bind(g));i.attachDrilledUp(g.handleSelectionChange.bind(g));i.setSelectionMode(f.getPayload().selectionMode.toUpperCase());B._setChart(f,i);};e._getBindingInfo=function(f){if(this._getBindingInfoFromState(f)){return this._getBindingInfoFromState(f);}var g=f.getDelegate().payload;var h=f.getModel()&&f.getModel().getMetaModel();var t=f.data("targetCollectionPath");var E=(h.getObject(t+"/$kind")==="EntitySet"?"/":"")+g.contextPath;var p=m({},g.parameters,{entitySet:f.data("entitySet"),useBatchRequests:true,provideGrandTotals:true,provideTotalResultSize:true,noPaging:true});var i={path:E,parameters:p};return i;};e.removeItemFromInnerChart=function(f,g){B.removeItemFromInnerChart.call(this,f,g);if(g.getType()==="groupable"){var i=this._getChart(f);i.fireDeselectData();}};return e;},false);

package/packages/sap.fe.macros/src/sap/fe/macros/CommonHelper-dbg.js

@@ -560,20 +560,24 @@ sap.ui.define(
 			 * @function
 			 * @memberof sap.fe.macros.CommonHelper
 			 * @param {string} sValue Some string that needs to be converted into single quotes
+			 * @param {boolean} bEscape Should the string be escaped beforehand
 			 * @returns {string} - String with single quotes
 			 **/
-			addSingleQuotes: function(sValue) {
+			addSingleQuotes: function(sValue, bEscape) {
+				if (bEscape && sValue) {
+					sValue = sValue.replace(/[']/g, "\\'");
+				}
 				return "'" + sValue + "'";
 			},
 
 			/**
-			 * Returns function string,
-			 * First argument of generateFunction is name of the generated function string.
-			 * Remaining arguments of generateFunction are args to generated function string.
+			 * Returns the function string
+			 * The first argument of generateFunction is name of the generated function string.
+			 * Remaining arguments of generateFunction are arguments of the newly generated function string.
 			 * @function
 			 * @memberof sap.fe.macros.CommonHelper
 			 * @param {string} sFuncName Some string for the function name
-			 * @returns {string} - Function string depends on args passed
+			 * @returns {string} - Function string depends on arguments passed
 			 **/
 			generateFunction: function(sFuncName) {
 				var sParams = "";