@sap/open.fe 1.98.0 → 1.99.0

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

@@ -43,20 +43,20 @@ sap.ui.define(["path", "sap/fe/core/converters/MetaModelConverter", "sap/fe/test
       expect(isReadOnlyExpression(properties["FieldControlReadOnly"])).toEqual(true);
       expect(isReadOnlyExpression(properties["FieldControlInapplicable"])).toEqual(false);
       expect(isReadOnlyExpression(properties["FieldControlRequired"])).toEqual(false);
-      expect(compileBinding(isReadOnlyExpression(properties["FieldControlDynamic"]))).toEqual("{= %{FieldControlValue} === 1}");
+      expect(compileBinding(isReadOnlyExpression(properties["FieldControlDynamic"]))).toEqual("{= %{FieldControlValue} === 1 || %{FieldControlValue} === '1'}");
     });
     it("#isDisabledExpression", function () {
       expect(isDisabledExpression(properties["FieldControlReadOnly"])).toEqual(false);
       expect(isDisabledExpression(properties["FieldControlInapplicable"])).toEqual(true);
       expect(isDisabledExpression(properties["FieldControlRequired"])).toEqual(false);
-      expect(compileBinding(isDisabledExpression(properties["FieldControlDynamic"]))).toEqual("{= %{FieldControlValue} === 0}");
+      expect(compileBinding(isDisabledExpression(properties["FieldControlDynamic"]))).toEqual("{= %{FieldControlValue} === 0 || %{FieldControlValue} === '0'}");
     });
     it("#isRequiredExpression", function () {
       expect(isRequiredExpression(properties["FieldControlReadOnly"])).toEqual(false);
       expect(isRequiredExpression(properties["FieldControlInapplicable"])).toEqual(false);
       expect(isRequiredExpression(properties["FieldControlRequired"])).toEqual(true);
-      expect(compileBinding(isRequiredExpression(properties["FieldControlDynamic"]))).toEqual("{= %{FieldControlValue} === 7}");
+      expect(compileBinding(isRequiredExpression(properties["FieldControlDynamic"]))).toEqual("{= %{FieldControlValue} === 7 || %{FieldControlValue} === '7'}");
     });
   });
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlByb3BlcnR5SGVscGVyLnNwZWMudHMiXSwibmFtZXMiOlsiY29udmVydGVkVHlwZXMiLCJlbnRpdHlUeXBlIiwicHJvcGVydGllcyIsImJlZm9yZUFsbCIsInNNZXRhZGF0YVVybCIsImNvbXBpbGVDRFMiLCJwYXRoIiwiam9pbiIsIl9fZGlybmFtZSIsImdldE1ldGFNb2RlbCIsIm1ldGFNb2RlbCIsImNvbnZlcnRUeXBlcyIsIm1heWJlRW50aXR5VHlwZSIsImVudGl0eVR5cGVzIiwiZmluZCIsImV0IiwibmFtZSIsImVudGl0eVByb3BlcnRpZXMiLCJmb3JFYWNoIiwicHJvcCIsIkVycm9yIiwiZGVzY3JpYmUiLCJpdCIsImV4cGVjdCIsImlzUmVhZE9ubHlFeHByZXNzaW9uIiwidG9FcXVhbCIsImNvbXBpbGVCaW5kaW5nIiwiaXNEaXNhYmxlZEV4cHJlc3Npb24iLCJpc1JlcXVpcmVkRXhwcmVzc2lvbiJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7Ozs7Ozs7Ozs7O0FBS0EsTUFBSUEsY0FBSjtBQUNBLE1BQUlDLFVBQUo7QUFDQSxNQUFNQyxVQUFvQyxHQUFHLEVBQTdDO0FBQ0FDLEVBQUFBLFNBQVM7QUFBQSxRQUFrQjtBQUMxQixVQUFNQyxZQUFZLEdBQUdDLFVBQVUsQ0FBQ0MsSUFBSSxDQUFDQyxJQUFMLENBQVVDLFNBQVYsRUFBcUIsNEJBQXJCLENBQUQsQ0FBL0I7QUFEMEIsNkJBRUZDLFlBQVksQ0FBQ0wsWUFBRCxDQUZWLGlCQUVwQk0sU0FGb0I7QUFHMUJWLFFBQUFBLGNBQWMsR0FBR1csWUFBWSxDQUFDRCxTQUFELENBQTdCO0FBQ0EsWUFBTUUsZUFBZSxHQUFHWixjQUFjLENBQUNhLFdBQWYsQ0FBMkJDLElBQTNCLENBQWdDLFVBQUFDLEVBQUU7QUFBQSxpQkFBSUEsRUFBRSxDQUFDQyxJQUFILEtBQVksWUFBaEI7QUFBQSxTQUFsQyxDQUF4Qjs7QUFKMEIsWUFLdEJKLGVBTHNCO0FBTXpCWCxVQUFBQSxVQUFVLEdBQUdXLGVBQWI7QUFDQVgsVUFBQUEsVUFBVSxDQUFDZ0IsZ0JBQVgsQ0FBNEJDLE9BQTVCLENBQW9DLFVBQUFDLElBQUksRUFBSTtBQUMzQ2pCLFlBQUFBLFVBQVUsQ0FBQ2lCLElBQUksQ0FBQ0gsSUFBTixDQUFWLEdBQXdCRyxJQUF4QjtBQUNBLFdBRkQ7QUFQeUI7QUFXekIsZ0JBQU0sSUFBSUMsS0FBSixDQUFVLHFCQUFWLENBQU47QUFYeUI7QUFBQTtBQWExQixLQWJRO0FBQUE7QUFBQTtBQUFBLElBQVQ7QUFlQUMsRUFBQUEsUUFBUSxDQUFDLGdCQUFELEVBQW1CLFlBQVc7QUFDckNDLElBQUFBLEVBQUUsQ0FBQyx1QkFBRCxFQUEwQixZQUFNO0FBQ2pDQyxNQUFBQSxNQUFNLENBQUNDLG9CQUFvQixDQUFDdEIsVUFBVSxDQUFDLHNCQUFELENBQVgsQ0FBckIsQ0FBTixDQUFpRXVCLE9BQWpFLENBQXlFLElBQXpFO0FBQ0FGLE1BQUFBLE1BQU0sQ0FBQ0Msb0JBQW9CLENBQUN0QixVQUFVLENBQUMsMEJBQUQsQ0FBWCxDQUFyQixDQUFOLENBQXFFdUIsT0FBckUsQ0FBNkUsS0FBN0U7QUFDQUYsTUFBQUEsTUFBTSxDQUFDQyxvQkFBb0IsQ0FBQ3RCLFVBQVUsQ0FBQyxzQkFBRCxDQUFYLENBQXJCLENBQU4sQ0FBaUV1QixPQUFqRSxDQUF5RSxLQUF6RTtBQUNBRixNQUFBQSxNQUFNLENBQUNHLGNBQWMsQ0FBQ0Ysb0JBQW9CLENBQUN0QixVQUFVLENBQUMscUJBQUQsQ0FBWCxDQUFyQixDQUFmLENBQU4sQ0FBZ0Z1QixPQUFoRixDQUF3RixnQ0FBeEY7QUFDQSxLQUxDLENBQUY7QUFNQUgsSUFBQUEsRUFBRSxDQUFDLHVCQUFELEVBQTBCLFlBQU07QUFDakNDLE1BQUFBLE1BQU0sQ0FBQ0ksb0JBQW9CLENBQUN6QixVQUFVLENBQUMsc0JBQUQsQ0FBWCxDQUFyQixDQUFOLENBQWlFdUIsT0FBakUsQ0FBeUUsS0FBekU7QUFDQUYsTUFBQUEsTUFBTSxDQUFDSSxvQkFBb0IsQ0FBQ3pCLFVBQVUsQ0FBQywwQkFBRCxDQUFYLENBQXJCLENBQU4sQ0FBcUV1QixPQUFyRSxDQUE2RSxJQUE3RTtBQUNBRixNQUFBQSxNQUFNLENBQUNJLG9CQUFvQixDQUFDekIsVUFBVSxDQUFDLHNCQUFELENBQVgsQ0FBckIsQ0FBTixDQUFpRXVCLE9BQWpFLENBQXlFLEtBQXpFO0FBQ0FGLE1BQUFBLE1BQU0sQ0FBQ0csY0FBYyxDQUFDQyxvQkFBb0IsQ0FBQ3pCLFVBQVUsQ0FBQyxxQkFBRCxDQUFYLENBQXJCLENBQWYsQ0FBTixDQUFnRnVCLE9BQWhGLENBQXdGLGdDQUF4RjtBQUNBLEtBTEMsQ0FBRjtBQU1BSCxJQUFBQSxFQUFFLENBQUMsdUJBQUQsRUFBMEIsWUFBTTtBQUNqQ0MsTUFBQUEsTUFBTSxDQUFDSyxvQkFBb0IsQ0FBQzFCLFVBQVUsQ0FBQyxzQkFBRCxDQUFYLENBQXJCLENBQU4sQ0FBaUV1QixPQUFqRSxDQUF5RSxLQUF6RTtBQUNBRixNQUFBQSxNQUFNLENBQUNLLG9CQUFvQixDQUFDMUIsVUFBVSxDQUFDLDBCQUFELENBQVgsQ0FBckIsQ0FBTixDQUFxRXVCLE9BQXJFLENBQTZFLEtBQTdFO0FBQ0FGLE1BQUFBLE1BQU0sQ0FBQ0ssb0JBQW9CLENBQUMxQixVQUFVLENBQUMsc0JBQUQsQ0FBWCxDQUFyQixDQUFOLENBQWlFdUIsT0FBakUsQ0FBeUUsSUFBekU7QUFDQUYsTUFBQUEsTUFBTSxDQUFDRyxjQUFjLENBQUNFLG9CQUFvQixDQUFDMUIsVUFBVSxDQUFDLHFCQUFELENBQVgsQ0FBckIsQ0FBZixDQUFOLENBQWdGdUIsT0FBaEYsQ0FBd0YsZ0NBQXhGO0FBQ0EsS0FMQyxDQUFGO0FBTUEsR0FuQk8sQ0FBUiIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHBhdGggZnJvbSBcInBhdGhcIjtcbmltcG9ydCB7IGNvbnZlcnRUeXBlcyB9IGZyb20gXCJzYXAvZmUvY29yZS9jb252ZXJ0ZXJzL01ldGFNb2RlbENvbnZlcnRlclwiO1xuaW1wb3J0IHsgY29tcGlsZUNEUywgZ2V0TWV0YU1vZGVsIH0gZnJvbSBcInNhcC9mZS90ZXN0L0plc3RUZW1wbGF0aW5nSGVscGVyXCI7XG5pbXBvcnQgeyBFbnRpdHlUeXBlLCBQcm9wZXJ0eSB9IGZyb20gXCJAc2FwLXV4L2Fubm90YXRpb24tY29udmVydGVyXCI7XG5pbXBvcnQgeyBpc0Rpc2FibGVkRXhwcmVzc2lvbiwgaXNSZWFkT25seUV4cHJlc3Npb24sIGlzUmVxdWlyZWRFeHByZXNzaW9uIH0gZnJvbSBcInNhcC9mZS9jb3JlL3RlbXBsYXRpbmcvRmllbGRDb250cm9sSGVscGVyXCI7XG5pbXBvcnQgeyBjb21waWxlQmluZGluZyB9IGZyb20gXCJzYXAvZmUvY29yZS9oZWxwZXJzL0JpbmRpbmdFeHByZXNzaW9uXCI7XG5cbmxldCBjb252ZXJ0ZWRUeXBlcztcbmxldCBlbnRpdHlUeXBlOiBFbnRpdHlUeXBlO1xuY29uc3QgcHJvcGVydGllczogUmVjb3JkPHN0cmluZywgUHJvcGVydHk+ID0ge307XG5iZWZvcmVBbGwoYXN5bmMgZnVuY3Rpb24oKSB7XG5cdGNvbnN0IHNNZXRhZGF0YVVybCA9IGNvbXBpbGVDRFMocGF0aC5qb2luKF9fZGlybmFtZSwgXCIuLi9kYXRhL1Byb3BlcnR5SGVscGVyLmNkc1wiKSk7XG5cdGNvbnN0IG1ldGFNb2RlbCA9IGF3YWl0IGdldE1ldGFNb2RlbChzTWV0YWRhdGFVcmwpO1xuXHRjb252ZXJ0ZWRUeXBlcyA9IGNvbnZlcnRUeXBlcyhtZXRhTW9kZWwpO1xuXHRjb25zdCBtYXliZUVudGl0eVR5cGUgPSBjb252ZXJ0ZWRUeXBlcy5lbnRpdHlUeXBlcy5maW5kKGV0ID0+IGV0Lm5hbWUgPT09IFwiVGVzdEVudGl0eVwiKTtcblx0aWYgKG1heWJlRW50aXR5VHlwZSkge1xuXHRcdGVudGl0eVR5cGUgPSBtYXliZUVudGl0eVR5cGU7XG5cdFx0ZW50aXR5VHlwZS5lbnRpdHlQcm9wZXJ0aWVzLmZvckVhY2gocHJvcCA9PiB7XG5cdFx0XHRwcm9wZXJ0aWVzW3Byb3AubmFtZV0gPSBwcm9wO1xuXHRcdH0pO1xuXHR9IGVsc2Uge1xuXHRcdHRocm93IG5ldyBFcnJvcihcIkVycm9yIGluIHRlc3Qgc2V0dXBcIik7XG5cdH1cbn0pO1xuXG5kZXNjcmliZShcIlByb3BlcnR5SGVscGVyXCIsIGZ1bmN0aW9uKCkge1xuXHRpdChcIiNpc1JlYWRPbmx5RXhwcmVzc2lvblwiLCAoKSA9PiB7XG5cdFx0ZXhwZWN0KGlzUmVhZE9ubHlFeHByZXNzaW9uKHByb3BlcnRpZXNbXCJGaWVsZENvbnRyb2xSZWFkT25seVwiXSkpLnRvRXF1YWwodHJ1ZSk7XG5cdFx0ZXhwZWN0KGlzUmVhZE9ubHlFeHByZXNzaW9uKHByb3BlcnRpZXNbXCJGaWVsZENvbnRyb2xJbmFwcGxpY2FibGVcIl0pKS50b0VxdWFsKGZhbHNlKTtcblx0XHRleHBlY3QoaXNSZWFkT25seUV4cHJlc3Npb24ocHJvcGVydGllc1tcIkZpZWxkQ29udHJvbFJlcXVpcmVkXCJdKSkudG9FcXVhbChmYWxzZSk7XG5cdFx0ZXhwZWN0KGNvbXBpbGVCaW5kaW5nKGlzUmVhZE9ubHlFeHByZXNzaW9uKHByb3BlcnRpZXNbXCJGaWVsZENvbnRyb2xEeW5hbWljXCJdKSkpLnRvRXF1YWwoXCJ7PSAle0ZpZWxkQ29udHJvbFZhbHVlfSA9PT0gMX1cIik7XG5cdH0pO1xuXHRpdChcIiNpc0Rpc2FibGVkRXhwcmVzc2lvblwiLCAoKSA9PiB7XG5cdFx0ZXhwZWN0KGlzRGlzYWJsZWRFeHByZXNzaW9uKHByb3BlcnRpZXNbXCJGaWVsZENvbnRyb2xSZWFkT25seVwiXSkpLnRvRXF1YWwoZmFsc2UpO1xuXHRcdGV4cGVjdChpc0Rpc2FibGVkRXhwcmVzc2lvbihwcm9wZXJ0aWVzW1wiRmllbGRDb250cm9sSW5hcHBsaWNhYmxlXCJdKSkudG9FcXVhbCh0cnVlKTtcblx0XHRleHBlY3QoaXNEaXNhYmxlZEV4cHJlc3Npb24ocHJvcGVydGllc1tcIkZpZWxkQ29udHJvbFJlcXVpcmVkXCJdKSkudG9FcXVhbChmYWxzZSk7XG5cdFx0ZXhwZWN0KGNvbXBpbGVCaW5kaW5nKGlzRGlzYWJsZWRFeHByZXNzaW9uKHByb3BlcnRpZXNbXCJGaWVsZENvbnRyb2xEeW5hbWljXCJdKSkpLnRvRXF1YWwoXCJ7PSAle0ZpZWxkQ29udHJvbFZhbHVlfSA9PT0gMH1cIik7XG5cdH0pO1xuXHRpdChcIiNpc1JlcXVpcmVkRXhwcmVzc2lvblwiLCAoKSA9PiB7XG5cdFx0ZXhwZWN0KGlzUmVxdWlyZWRFeHByZXNzaW9uKHByb3BlcnRpZXNbXCJGaWVsZENvbnRyb2xSZWFkT25seVwiXSkpLnRvRXF1YWwoZmFsc2UpO1xuXHRcdGV4cGVjdChpc1JlcXVpcmVkRXhwcmVzc2lvbihwcm9wZXJ0aWVzW1wiRmllbGRDb250cm9sSW5hcHBsaWNhYmxlXCJdKSkudG9FcXVhbChmYWxzZSk7XG5cdFx0ZXhwZWN0KGlzUmVxdWlyZWRFeHByZXNzaW9uKHByb3BlcnRpZXNbXCJGaWVsZENvbnRyb2xSZXF1aXJlZFwiXSkpLnRvRXF1YWwodHJ1ZSk7XG5cdFx0ZXhwZWN0KGNvbXBpbGVCaW5kaW5nKGlzUmVxdWlyZWRFeHByZXNzaW9uKHByb3BlcnRpZXNbXCJGaWVsZENvbnRyb2xEeW5hbWljXCJdKSkpLnRvRXF1YWwoXCJ7PSAle0ZpZWxkQ29udHJvbFZhbHVlfSA9PT0gN31cIik7XG5cdH0pO1xufSk7XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlByb3BlcnR5SGVscGVyLnNwZWMudHMiXSwibmFtZXMiOlsiY29udmVydGVkVHlwZXMiLCJlbnRpdHlUeXBlIiwicHJvcGVydGllcyIsImJlZm9yZUFsbCIsInNNZXRhZGF0YVVybCIsImNvbXBpbGVDRFMiLCJwYXRoIiwiam9pbiIsIl9fZGlybmFtZSIsImdldE1ldGFNb2RlbCIsIm1ldGFNb2RlbCIsImNvbnZlcnRUeXBlcyIsIm1heWJlRW50aXR5VHlwZSIsImVudGl0eVR5cGVzIiwiZmluZCIsImV0IiwibmFtZSIsImVudGl0eVByb3BlcnRpZXMiLCJmb3JFYWNoIiwicHJvcCIsIkVycm9yIiwiZGVzY3JpYmUiLCJpdCIsImV4cGVjdCIsImlzUmVhZE9ubHlFeHByZXNzaW9uIiwidG9FcXVhbCIsImNvbXBpbGVCaW5kaW5nIiwiaXNEaXNhYmxlZEV4cHJlc3Npb24iLCJpc1JlcXVpcmVkRXhwcmVzc2lvbiJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7Ozs7Ozs7Ozs7O0FBS0EsTUFBSUEsY0FBSjtBQUNBLE1BQUlDLFVBQUo7QUFDQSxNQUFNQyxVQUFvQyxHQUFHLEVBQTdDO0FBQ0FDLEVBQUFBLFNBQVM7QUFBQSxRQUFrQjtBQUMxQixVQUFNQyxZQUFZLEdBQUdDLFVBQVUsQ0FBQ0MsSUFBSSxDQUFDQyxJQUFMLENBQVVDLFNBQVYsRUFBcUIsNEJBQXJCLENBQUQsQ0FBL0I7QUFEMEIsNkJBRUZDLFlBQVksQ0FBQ0wsWUFBRCxDQUZWLGlCQUVwQk0sU0FGb0I7QUFHMUJWLFFBQUFBLGNBQWMsR0FBR1csWUFBWSxDQUFDRCxTQUFELENBQTdCO0FBQ0EsWUFBTUUsZUFBZSxHQUFHWixjQUFjLENBQUNhLFdBQWYsQ0FBMkJDLElBQTNCLENBQWdDLFVBQUFDLEVBQUU7QUFBQSxpQkFBSUEsRUFBRSxDQUFDQyxJQUFILEtBQVksWUFBaEI7QUFBQSxTQUFsQyxDQUF4Qjs7QUFKMEIsWUFLdEJKLGVBTHNCO0FBTXpCWCxVQUFBQSxVQUFVLEdBQUdXLGVBQWI7QUFDQVgsVUFBQUEsVUFBVSxDQUFDZ0IsZ0JBQVgsQ0FBNEJDLE9BQTVCLENBQW9DLFVBQUFDLElBQUksRUFBSTtBQUMzQ2pCLFlBQUFBLFVBQVUsQ0FBQ2lCLElBQUksQ0FBQ0gsSUFBTixDQUFWLEdBQXdCRyxJQUF4QjtBQUNBLFdBRkQ7QUFQeUI7QUFXekIsZ0JBQU0sSUFBSUMsS0FBSixDQUFVLHFCQUFWLENBQU47QUFYeUI7QUFBQTtBQWExQixLQWJRO0FBQUE7QUFBQTtBQUFBLElBQVQ7QUFlQUMsRUFBQUEsUUFBUSxDQUFDLGdCQUFELEVBQW1CLFlBQVc7QUFDckNDLElBQUFBLEVBQUUsQ0FBQyx1QkFBRCxFQUEwQixZQUFNO0FBQ2pDQyxNQUFBQSxNQUFNLENBQUNDLG9CQUFvQixDQUFDdEIsVUFBVSxDQUFDLHNCQUFELENBQVgsQ0FBckIsQ0FBTixDQUFpRXVCLE9BQWpFLENBQXlFLElBQXpFO0FBQ0FGLE1BQUFBLE1BQU0sQ0FBQ0Msb0JBQW9CLENBQUN0QixVQUFVLENBQUMsMEJBQUQsQ0FBWCxDQUFyQixDQUFOLENBQXFFdUIsT0FBckUsQ0FBNkUsS0FBN0U7QUFDQUYsTUFBQUEsTUFBTSxDQUFDQyxvQkFBb0IsQ0FBQ3RCLFVBQVUsQ0FBQyxzQkFBRCxDQUFYLENBQXJCLENBQU4sQ0FBaUV1QixPQUFqRSxDQUF5RSxLQUF6RTtBQUNBRixNQUFBQSxNQUFNLENBQUNHLGNBQWMsQ0FBQ0Ysb0JBQW9CLENBQUN0QixVQUFVLENBQUMscUJBQUQsQ0FBWCxDQUFyQixDQUFmLENBQU4sQ0FBZ0Z1QixPQUFoRixDQUNDLGdFQUREO0FBR0EsS0FQQyxDQUFGO0FBUUFILElBQUFBLEVBQUUsQ0FBQyx1QkFBRCxFQUEwQixZQUFNO0FBQ2pDQyxNQUFBQSxNQUFNLENBQUNJLG9CQUFvQixDQUFDekIsVUFBVSxDQUFDLHNCQUFELENBQVgsQ0FBckIsQ0FBTixDQUFpRXVCLE9BQWpFLENBQXlFLEtBQXpFO0FBQ0FGLE1BQUFBLE1BQU0sQ0FBQ0ksb0JBQW9CLENBQUN6QixVQUFVLENBQUMsMEJBQUQsQ0FBWCxDQUFyQixDQUFOLENBQXFFdUIsT0FBckUsQ0FBNkUsSUFBN0U7QUFDQUYsTUFBQUEsTUFBTSxDQUFDSSxvQkFBb0IsQ0FBQ3pCLFVBQVUsQ0FBQyxzQkFBRCxDQUFYLENBQXJCLENBQU4sQ0FBaUV1QixPQUFqRSxDQUF5RSxLQUF6RTtBQUNBRixNQUFBQSxNQUFNLENBQUNHLGNBQWMsQ0FBQ0Msb0JBQW9CLENBQUN6QixVQUFVLENBQUMscUJBQUQsQ0FBWCxDQUFyQixDQUFmLENBQU4sQ0FBZ0Z1QixPQUFoRixDQUNDLGdFQUREO0FBR0EsS0FQQyxDQUFGO0FBUUFILElBQUFBLEVBQUUsQ0FBQyx1QkFBRCxFQUEwQixZQUFNO0FBQ2pDQyxNQUFBQSxNQUFNLENBQUNLLG9CQUFvQixDQUFDMUIsVUFBVSxDQUFDLHNCQUFELENBQVgsQ0FBckIsQ0FBTixDQUFpRXVCLE9BQWpFLENBQXlFLEtBQXpFO0FBQ0FGLE1BQUFBLE1BQU0sQ0FBQ0ssb0JBQW9CLENBQUMxQixVQUFVLENBQUMsMEJBQUQsQ0FBWCxDQUFyQixDQUFOLENBQXFFdUIsT0FBckUsQ0FBNkUsS0FBN0U7QUFDQUYsTUFBQUEsTUFBTSxDQUFDSyxvQkFBb0IsQ0FBQzFCLFVBQVUsQ0FBQyxzQkFBRCxDQUFYLENBQXJCLENBQU4sQ0FBaUV1QixPQUFqRSxDQUF5RSxJQUF6RTtBQUNBRixNQUFBQSxNQUFNLENBQUNHLGNBQWMsQ0FBQ0Usb0JBQW9CLENBQUMxQixVQUFVLENBQUMscUJBQUQsQ0FBWCxDQUFyQixDQUFmLENBQU4sQ0FBZ0Z1QixPQUFoRixDQUNDLGdFQUREO0FBR0EsS0FQQyxDQUFGO0FBUUEsR0F6Qk8sQ0FBUiIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHBhdGggZnJvbSBcInBhdGhcIjtcbmltcG9ydCB7IGNvbnZlcnRUeXBlcyB9IGZyb20gXCJzYXAvZmUvY29yZS9jb252ZXJ0ZXJzL01ldGFNb2RlbENvbnZlcnRlclwiO1xuaW1wb3J0IHsgY29tcGlsZUNEUywgZ2V0TWV0YU1vZGVsIH0gZnJvbSBcInNhcC9mZS90ZXN0L0plc3RUZW1wbGF0aW5nSGVscGVyXCI7XG5pbXBvcnQgeyBFbnRpdHlUeXBlLCBQcm9wZXJ0eSB9IGZyb20gXCJAc2FwLXV4L2Fubm90YXRpb24tY29udmVydGVyXCI7XG5pbXBvcnQgeyBpc0Rpc2FibGVkRXhwcmVzc2lvbiwgaXNSZWFkT25seUV4cHJlc3Npb24sIGlzUmVxdWlyZWRFeHByZXNzaW9uIH0gZnJvbSBcInNhcC9mZS9jb3JlL3RlbXBsYXRpbmcvRmllbGRDb250cm9sSGVscGVyXCI7XG5pbXBvcnQgeyBjb21waWxlQmluZGluZyB9IGZyb20gXCJzYXAvZmUvY29yZS9oZWxwZXJzL0JpbmRpbmdFeHByZXNzaW9uXCI7XG5cbmxldCBjb252ZXJ0ZWRUeXBlcztcbmxldCBlbnRpdHlUeXBlOiBFbnRpdHlUeXBlO1xuY29uc3QgcHJvcGVydGllczogUmVjb3JkPHN0cmluZywgUHJvcGVydHk+ID0ge307XG5iZWZvcmVBbGwoYXN5bmMgZnVuY3Rpb24oKSB7XG5cdGNvbnN0IHNNZXRhZGF0YVVybCA9IGNvbXBpbGVDRFMocGF0aC5qb2luKF9fZGlybmFtZSwgXCIuLi9kYXRhL1Byb3BlcnR5SGVscGVyLmNkc1wiKSk7XG5cdGNvbnN0IG1ldGFNb2RlbCA9IGF3YWl0IGdldE1ldGFNb2RlbChzTWV0YWRhdGFVcmwpO1xuXHRjb252ZXJ0ZWRUeXBlcyA9IGNvbnZlcnRUeXBlcyhtZXRhTW9kZWwpO1xuXHRjb25zdCBtYXliZUVudGl0eVR5cGUgPSBjb252ZXJ0ZWRUeXBlcy5lbnRpdHlUeXBlcy5maW5kKGV0ID0+IGV0Lm5hbWUgPT09IFwiVGVzdEVudGl0eVwiKTtcblx0aWYgKG1heWJlRW50aXR5VHlwZSkge1xuXHRcdGVudGl0eVR5cGUgPSBtYXliZUVudGl0eVR5cGU7XG5cdFx0ZW50aXR5VHlwZS5lbnRpdHlQcm9wZXJ0aWVzLmZvckVhY2gocHJvcCA9PiB7XG5cdFx0XHRwcm9wZXJ0aWVzW3Byb3AubmFtZV0gPSBwcm9wO1xuXHRcdH0pO1xuXHR9IGVsc2Uge1xuXHRcdHRocm93IG5ldyBFcnJvcihcIkVycm9yIGluIHRlc3Qgc2V0dXBcIik7XG5cdH1cbn0pO1xuXG5kZXNjcmliZShcIlByb3BlcnR5SGVscGVyXCIsIGZ1bmN0aW9uKCkge1xuXHRpdChcIiNpc1JlYWRPbmx5RXhwcmVzc2lvblwiLCAoKSA9PiB7XG5cdFx0ZXhwZWN0KGlzUmVhZE9ubHlFeHByZXNzaW9uKHByb3BlcnRpZXNbXCJGaWVsZENvbnRyb2xSZWFkT25seVwiXSkpLnRvRXF1YWwodHJ1ZSk7XG5cdFx0ZXhwZWN0KGlzUmVhZE9ubHlFeHByZXNzaW9uKHByb3BlcnRpZXNbXCJGaWVsZENvbnRyb2xJbmFwcGxpY2FibGVcIl0pKS50b0VxdWFsKGZhbHNlKTtcblx0XHRleHBlY3QoaXNSZWFkT25seUV4cHJlc3Npb24ocHJvcGVydGllc1tcIkZpZWxkQ29udHJvbFJlcXVpcmVkXCJdKSkudG9FcXVhbChmYWxzZSk7XG5cdFx0ZXhwZWN0KGNvbXBpbGVCaW5kaW5nKGlzUmVhZE9ubHlFeHByZXNzaW9uKHByb3BlcnRpZXNbXCJGaWVsZENvbnRyb2xEeW5hbWljXCJdKSkpLnRvRXF1YWwoXG5cdFx0XHRcIns9ICV7RmllbGRDb250cm9sVmFsdWV9ID09PSAxIHx8ICV7RmllbGRDb250cm9sVmFsdWV9ID09PSAnMSd9XCJcblx0XHQpO1xuXHR9KTtcblx0aXQoXCIjaXNEaXNhYmxlZEV4cHJlc3Npb25cIiwgKCkgPT4ge1xuXHRcdGV4cGVjdChpc0Rpc2FibGVkRXhwcmVzc2lvbihwcm9wZXJ0aWVzW1wiRmllbGRDb250cm9sUmVhZE9ubHlcIl0pKS50b0VxdWFsKGZhbHNlKTtcblx0XHRleHBlY3QoaXNEaXNhYmxlZEV4cHJlc3Npb24ocHJvcGVydGllc1tcIkZpZWxkQ29udHJvbEluYXBwbGljYWJsZVwiXSkpLnRvRXF1YWwodHJ1ZSk7XG5cdFx0ZXhwZWN0KGlzRGlzYWJsZWRFeHByZXNzaW9uKHByb3BlcnRpZXNbXCJGaWVsZENvbnRyb2xSZXF1aXJlZFwiXSkpLnRvRXF1YWwoZmFsc2UpO1xuXHRcdGV4cGVjdChjb21waWxlQmluZGluZyhpc0Rpc2FibGVkRXhwcmVzc2lvbihwcm9wZXJ0aWVzW1wiRmllbGRDb250cm9sRHluYW1pY1wiXSkpKS50b0VxdWFsKFxuXHRcdFx0XCJ7PSAle0ZpZWxkQ29udHJvbFZhbHVlfSA9PT0gMCB8fCAle0ZpZWxkQ29udHJvbFZhbHVlfSA9PT0gJzAnfVwiXG5cdFx0KTtcblx0fSk7XG5cdGl0KFwiI2lzUmVxdWlyZWRFeHByZXNzaW9uXCIsICgpID0+IHtcblx0XHRleHBlY3QoaXNSZXF1aXJlZEV4cHJlc3Npb24ocHJvcGVydGllc1tcIkZpZWxkQ29udHJvbFJlYWRPbmx5XCJdKSkudG9FcXVhbChmYWxzZSk7XG5cdFx0ZXhwZWN0KGlzUmVxdWlyZWRFeHByZXNzaW9uKHByb3BlcnRpZXNbXCJGaWVsZENvbnRyb2xJbmFwcGxpY2FibGVcIl0pKS50b0VxdWFsKGZhbHNlKTtcblx0XHRleHBlY3QoaXNSZXF1aXJlZEV4cHJlc3Npb24ocHJvcGVydGllc1tcIkZpZWxkQ29udHJvbFJlcXVpcmVkXCJdKSkudG9FcXVhbCh0cnVlKTtcblx0XHRleHBlY3QoY29tcGlsZUJpbmRpbmcoaXNSZXF1aXJlZEV4cHJlc3Npb24ocHJvcGVydGllc1tcIkZpZWxkQ29udHJvbER5bmFtaWNcIl0pKSkudG9FcXVhbChcblx0XHRcdFwiez0gJXtGaWVsZENvbnRyb2xWYWx1ZX0gPT09IDcgfHwgJXtGaWVsZENvbnRyb2xWYWx1ZX0gPT09ICc3J31cIlxuXHRcdCk7XG5cdH0pO1xufSk7XG4iXX0=

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

@@ -28,18 +28,24 @@ describe("PropertyHelper", function() {
 		expect(isReadOnlyExpression(properties["FieldControlReadOnly"])).toEqual(true);
 		expect(isReadOnlyExpression(properties["FieldControlInapplicable"])).toEqual(false);
 		expect(isReadOnlyExpression(properties["FieldControlRequired"])).toEqual(false);
-		expect(compileBinding(isReadOnlyExpression(properties["FieldControlDynamic"]))).toEqual("{= %{FieldControlValue} === 1}");
+		expect(compileBinding(isReadOnlyExpression(properties["FieldControlDynamic"]))).toEqual(
+			"{= %{FieldControlValue} === 1 || %{FieldControlValue} === '1'}"
+		);
 	});
 	it("#isDisabledExpression", () => {
 		expect(isDisabledExpression(properties["FieldControlReadOnly"])).toEqual(false);
 		expect(isDisabledExpression(properties["FieldControlInapplicable"])).toEqual(true);
 		expect(isDisabledExpression(properties["FieldControlRequired"])).toEqual(false);
-		expect(compileBinding(isDisabledExpression(properties["FieldControlDynamic"]))).toEqual("{= %{FieldControlValue} === 0}");
+		expect(compileBinding(isDisabledExpression(properties["FieldControlDynamic"]))).toEqual(
+			"{= %{FieldControlValue} === 0 || %{FieldControlValue} === '0'}"
+		);
 	});
 	it("#isRequiredExpression", () => {
 		expect(isRequiredExpression(properties["FieldControlReadOnly"])).toEqual(false);
 		expect(isRequiredExpression(properties["FieldControlInapplicable"])).toEqual(false);
 		expect(isRequiredExpression(properties["FieldControlRequired"])).toEqual(true);
-		expect(compileBinding(isRequiredExpression(properties["FieldControlDynamic"]))).toEqual("{= %{FieldControlValue} === 7}");
+		expect(compileBinding(isRequiredExpression(properties["FieldControlDynamic"]))).toEqual(
+			"{= %{FieldControlValue} === 7 || %{FieldControlValue} === '7'}"
+		);
 	});
 });

package/packages/sap.fe.core/test/sap/fe/core/jest/type/ComplexType.spec.js

@@ -0,0 +1,68 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+ *      (c) Copyright 2009-2021 SAP SE. All rights reserved
+ */
+sap.ui.define(["sap/fe/core/converters/MetaModelConverter", "sap/fe/test/JestTemplatingHelper", "path", "sap/fe/core/converters/ManifestSettings", "sap/fe/core/converters/controls/Common/Table"], function (MetaModelConverter, JestTemplatingHelper, path, ManifestSettings, Table) {
+  "use strict";
+
+  var getTableColumns = Table.getTableColumns;
+  var TemplateType = ManifestSettings.TemplateType;
+  var getMetaModel = JestTemplatingHelper.getMetaModel;
+  var getConverterContextForTest = JestTemplatingHelper.getConverterContextForTest;
+  var compileCDS = JestTemplatingHelper.compileCDS;
+  var convertTypes = MetaModelConverter.convertTypes;
+
+  var columns = [];
+  var convertedTypes;
+  beforeAll(function () {
+    try {
+      var sMetadataUrl = compileCDS(path.join(__dirname, "../data/ComplexType.cds"));
+      return Promise.resolve(getMetaModel(sMetadataUrl)).then(function (metaModel) {
+        var _converterContext$get;
+
+        convertedTypes = convertTypes(metaModel);
+        var converterContext = getConverterContextForTest(convertedTypes, {
+          converterType: TemplateType.ListReport,
+          entitySet: "TestEntity"
+        });
+        var lineItem = (_converterContext$get = converterContext.getEntityType().annotations.UI) === null || _converterContext$get === void 0 ? void 0 : _converterContext$get.LineItem;
+
+        if (lineItem) {
+          columns = getTableColumns(lineItem, "@" + "com.sap.vocabularies.UI.v1.LineItem", converterContext, {});
+        }
+      });
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  });
+  describe("Complex Types", function () {
+    //the type of OperationAvailable is missing a "path" component in Core_Edm.d.ts
+    //So I use type "any" as a local workaround
+    var operationAvalableFirst;
+    var operationAvalableSecond;
+    it("check if OperationAvailable is bound correctly to complex property", function () {
+      var _convertedTypes$actio, _convertedTypes$actio2, _convertedTypes$actio3, _convertedTypes$actio4;
+
+      operationAvalableFirst = (_convertedTypes$actio = convertedTypes.actions[0]) === null || _convertedTypes$actio === void 0 ? void 0 : (_convertedTypes$actio2 = _convertedTypes$actio.annotations.Core) === null || _convertedTypes$actio2 === void 0 ? void 0 : _convertedTypes$actio2.OperationAvailable;
+      expect(operationAvalableFirst.path).toBe("in/flags/first");
+      operationAvalableSecond = (_convertedTypes$actio3 = convertedTypes.actions[1]) === null || _convertedTypes$actio3 === void 0 ? void 0 : (_convertedTypes$actio4 = _convertedTypes$actio3.annotations.Core) === null || _convertedTypes$actio4 === void 0 ? void 0 : _convertedTypes$actio4.OperationAvailable;
+      expect(operationAvalableSecond.path).toBe("in/flags/second");
+    }); // Currently there is a functional gap: Complex properties are not available in the
+    // personalisation. Therefore the following test is currently deacivated
+    // it("check if complex properties are available in table personalisation", () => {
+    //   expect(columns.length).toBe(10);
+    // });
+
+    it("check if column tooltips are bound correctly to complex Property", function () {
+      var idColumn = columns.find(function (x) {
+        return x.key === "DataField::ID";
+      });
+      var indexColumn = columns.find(function (x) {
+        return x.key === "DataField::name";
+      });
+      expect(idColumn === null || idColumn === void 0 ? void 0 : idColumn.tooltip).toBe("{toolTips/tipID}");
+      expect(indexColumn === null || indexColumn === void 0 ? void 0 : indexColumn.tooltip).toBe("{toolTips/tipName}");
+    });
+  });
+}, false);
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkNvbXBsZXhUeXBlLnNwZWMudHMiXSwibmFtZXMiOlsiY29sdW1ucyIsImNvbnZlcnRlZFR5cGVzIiwiYmVmb3JlQWxsIiwic01ldGFkYXRhVXJsIiwiY29tcGlsZUNEUyIsInBhdGgiLCJqb2luIiwiX19kaXJuYW1lIiwiZ2V0TWV0YU1vZGVsIiwibWV0YU1vZGVsIiwiY29udmVydFR5cGVzIiwiY29udmVydGVyQ29udGV4dCIsImdldENvbnZlcnRlckNvbnRleHRGb3JUZXN0IiwiY29udmVydGVyVHlwZSIsIlRlbXBsYXRlVHlwZSIsIkxpc3RSZXBvcnQiLCJlbnRpdHlTZXQiLCJsaW5lSXRlbSIsImdldEVudGl0eVR5cGUiLCJhbm5vdGF0aW9ucyIsIlVJIiwiTGluZUl0ZW0iLCJnZXRUYWJsZUNvbHVtbnMiLCJkZXNjcmliZSIsIm9wZXJhdGlvbkF2YWxhYmxlRmlyc3QiLCJvcGVyYXRpb25BdmFsYWJsZVNlY29uZCIsIml0IiwiYWN0aW9ucyIsIkNvcmUiLCJPcGVyYXRpb25BdmFpbGFibGUiLCJleHBlY3QiLCJ0b0JlIiwiaWRDb2x1bW4iLCJmaW5kIiwieCIsImtleSIsImluZGV4Q29sdW1uIiwidG9vbHRpcCJdLCJtYXBwaW5ncyI6IjtBQUFBO0FBQ0E7QUFDQTs7Ozs7Ozs7Ozs7QUFLQSxNQUFJQSxPQUFnQyxHQUFHLEVBQXZDO0FBQ0EsTUFBSUMsY0FBSjtBQUVBQyxFQUFBQSxTQUFTO0FBQUEsUUFBa0I7QUFDMUIsVUFBTUMsWUFBWSxHQUFHQyxVQUFVLENBQUNDLElBQUksQ0FBQ0MsSUFBTCxDQUFVQyxTQUFWLEVBQXFCLHlCQUFyQixDQUFELENBQS9CO0FBRDBCLDZCQUVGQyxZQUFZLENBQUNMLFlBQUQsQ0FGVixpQkFFcEJNLFNBRm9CO0FBQUE7O0FBRzFCUixRQUFBQSxjQUFjLEdBQUdTLFlBQVksQ0FBQ0QsU0FBRCxDQUE3QjtBQUNBLFlBQU1FLGdCQUFnQixHQUFHQywwQkFBMEIsQ0FBQ1gsY0FBRCxFQUFpQjtBQUNuRVksVUFBQUEsYUFBYSxFQUFFQyxZQUFZLENBQUNDLFVBRHVDO0FBRW5FQyxVQUFBQSxTQUFTLEVBQUU7QUFGd0QsU0FBakIsQ0FBbkQ7QUFJQSxZQUFNQyxRQUFRLDRCQUFHTixnQkFBZ0IsQ0FBQ08sYUFBakIsR0FBaUNDLFdBQWpDLENBQTZDQyxFQUFoRCwwREFBRyxzQkFBaURDLFFBQWxFOztBQVIwQixZQVN0QkosUUFUc0I7QUFVekJqQixVQUFBQSxPQUFPLEdBQUdzQixlQUFlLENBQUNMLFFBQUQsRUFBVywyQ0FBWCxFQUE2Q04sZ0JBQTdDLEVBQStELEVBQS9ELENBQXpCO0FBVnlCO0FBQUE7QUFZMUIsS0FaUTtBQUFBO0FBQUE7QUFBQSxJQUFUO0FBY0FZLEVBQUFBLFFBQVEsQ0FBQyxlQUFELEVBQWtCLFlBQVc7QUFDcEM7QUFDQTtBQUNBLFFBQUlDLHNCQUFKO0FBQ0EsUUFBSUMsdUJBQUo7QUFFQUMsSUFBQUEsRUFBRSxDQUFDLG9FQUFELEVBQXVFLFlBQU07QUFBQTs7QUFDOUVGLE1BQUFBLHNCQUFzQiw0QkFBR3ZCLGNBQWMsQ0FBQzBCLE9BQWYsQ0FBdUIsQ0FBdkIsQ0FBSCxvRkFBRyxzQkFBMkJSLFdBQTNCLENBQXVDUyxJQUExQywyREFBRyx1QkFBNkNDLGtCQUF0RTtBQUNBQyxNQUFBQSxNQUFNLENBQUNOLHNCQUFzQixDQUFDbkIsSUFBeEIsQ0FBTixDQUFvQzBCLElBQXBDLENBQXlDLGdCQUF6QztBQUNBTixNQUFBQSx1QkFBdUIsNkJBQUd4QixjQUFjLENBQUMwQixPQUFmLENBQXVCLENBQXZCLENBQUgscUZBQUcsdUJBQTJCUixXQUEzQixDQUF1Q1MsSUFBMUMsMkRBQUcsdUJBQTZDQyxrQkFBdkU7QUFDQUMsTUFBQUEsTUFBTSxDQUFDTCx1QkFBdUIsQ0FBQ3BCLElBQXpCLENBQU4sQ0FBcUMwQixJQUFyQyxDQUEwQyxpQkFBMUM7QUFDQSxLQUxDLENBQUYsQ0FOb0MsQ0FhcEM7QUFDQTtBQUNBO0FBQ0E7QUFDQTs7QUFFQUwsSUFBQUEsRUFBRSxDQUFDLGtFQUFELEVBQXFFLFlBQU07QUFDNUUsVUFBTU0sUUFBUSxHQUFHaEMsT0FBTyxDQUFDaUMsSUFBUixDQUFhLFVBQUFDLENBQUM7QUFBQSxlQUFJQSxDQUFDLENBQUNDLEdBQUYsS0FBVSxlQUFkO0FBQUEsT0FBZCxDQUFqQjtBQUNBLFVBQU1DLFdBQVcsR0FBR3BDLE9BQU8sQ0FBQ2lDLElBQVIsQ0FBYSxVQUFBQyxDQUFDO0FBQUEsZUFBSUEsQ0FBQyxDQUFDQyxHQUFGLEtBQVUsaUJBQWQ7QUFBQSxPQUFkLENBQXBCO0FBRUFMLE1BQUFBLE1BQU0sQ0FBQ0UsUUFBRCxhQUFDQSxRQUFELHVCQUFDQSxRQUFRLENBQUVLLE9BQVgsQ0FBTixDQUEwQk4sSUFBMUIsQ0FBK0Isa0JBQS9CO0FBQ0FELE1BQUFBLE1BQU0sQ0FBQ00sV0FBRCxhQUFDQSxXQUFELHVCQUFDQSxXQUFXLENBQUVDLE9BQWQsQ0FBTixDQUE2Qk4sSUFBN0IsQ0FBa0Msb0JBQWxDO0FBQ0EsS0FOQyxDQUFGO0FBT0EsR0ExQk8sQ0FBUiIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgY29udmVydFR5cGVzIH0gZnJvbSBcInNhcC9mZS9jb3JlL2NvbnZlcnRlcnMvTWV0YU1vZGVsQ29udmVydGVyXCI7XG5pbXBvcnQgeyBjb21waWxlQ0RTLCBnZXRDb252ZXJ0ZXJDb250ZXh0Rm9yVGVzdCwgZ2V0TWV0YU1vZGVsIH0gZnJvbSBcInNhcC9mZS90ZXN0L0plc3RUZW1wbGF0aW5nSGVscGVyXCI7XG5pbXBvcnQgeyBDb252ZXJ0ZXJPdXRwdXQsIExpbmVJdGVtLCBVSUFubm90YXRpb25UZXJtcyB9IGZyb20gXCJAc2FwLXV4L3ZvY2FidWxhcmllcy10eXBlc1wiO1xuaW1wb3J0IHBhdGggZnJvbSBcInBhdGhcIjtcbmltcG9ydCB7IFRlbXBsYXRlVHlwZSB9IGZyb20gXCJzYXAvZmUvY29yZS9jb252ZXJ0ZXJzL01hbmlmZXN0U2V0dGluZ3NcIjtcbmltcG9ydCB7IGdldFRhYmxlQ29sdW1ucywgQW5ub3RhdGlvblRhYmxlQ29sdW1uIH0gZnJvbSBcInNhcC9mZS9jb3JlL2NvbnZlcnRlcnMvY29udHJvbHMvQ29tbW9uL1RhYmxlXCI7XG5cbmxldCBjb2x1bW5zOiBBbm5vdGF0aW9uVGFibGVDb2x1bW5bXSA9IFtdO1xubGV0IGNvbnZlcnRlZFR5cGVzOiBDb252ZXJ0ZXJPdXRwdXQ7XG5cbmJlZm9yZUFsbChhc3luYyBmdW5jdGlvbigpIHtcblx0Y29uc3Qgc01ldGFkYXRhVXJsID0gY29tcGlsZUNEUyhwYXRoLmpvaW4oX19kaXJuYW1lLCBcIi4uL2RhdGEvQ29tcGxleFR5cGUuY2RzXCIpKTtcblx0Y29uc3QgbWV0YU1vZGVsID0gYXdhaXQgZ2V0TWV0YU1vZGVsKHNNZXRhZGF0YVVybCk7XG5cdGNvbnZlcnRlZFR5cGVzID0gY29udmVydFR5cGVzKG1ldGFNb2RlbCk7XG5cdGNvbnN0IGNvbnZlcnRlckNvbnRleHQgPSBnZXRDb252ZXJ0ZXJDb250ZXh0Rm9yVGVzdChjb252ZXJ0ZWRUeXBlcywge1xuXHRcdGNvbnZlcnRlclR5cGU6IFRlbXBsYXRlVHlwZS5MaXN0UmVwb3J0LFxuXHRcdGVudGl0eVNldDogXCJUZXN0RW50aXR5XCJcblx0fSk7XG5cdGNvbnN0IGxpbmVJdGVtID0gY29udmVydGVyQ29udGV4dC5nZXRFbnRpdHlUeXBlKCkuYW5ub3RhdGlvbnMuVUk/LkxpbmVJdGVtO1xuXHRpZiAobGluZUl0ZW0pIHtcblx0XHRjb2x1bW5zID0gZ2V0VGFibGVDb2x1bW5zKGxpbmVJdGVtLCBcIkBcIiArIFVJQW5ub3RhdGlvblRlcm1zLkxpbmVJdGVtLCBjb252ZXJ0ZXJDb250ZXh0LCB7fSkgYXMgQW5ub3RhdGlvblRhYmxlQ29sdW1uW107XG5cdH1cbn0pO1xuXG5kZXNjcmliZShcIkNvbXBsZXggVHlwZXNcIiwgZnVuY3Rpb24oKSB7XG5cdC8vdGhlIHR5cGUgb2YgT3BlcmF0aW9uQXZhaWxhYmxlIGlzIG1pc3NpbmcgYSBcInBhdGhcIiBjb21wb25lbnQgaW4gQ29yZV9FZG0uZC50c1xuXHQvL1NvIEkgdXNlIHR5cGUgXCJhbnlcIiBhcyBhIGxvY2FsIHdvcmthcm91bmRcblx0bGV0IG9wZXJhdGlvbkF2YWxhYmxlRmlyc3Q6IGFueTtcblx0bGV0IG9wZXJhdGlvbkF2YWxhYmxlU2Vjb25kOiBhbnk7XG5cblx0aXQoXCJjaGVjayBpZiBPcGVyYXRpb25BdmFpbGFibGUgaXMgYm91bmQgY29ycmVjdGx5IHRvIGNvbXBsZXggcHJvcGVydHlcIiwgKCkgPT4ge1xuXHRcdG9wZXJhdGlvbkF2YWxhYmxlRmlyc3QgPSBjb252ZXJ0ZWRUeXBlcy5hY3Rpb25zWzBdPy5hbm5vdGF0aW9ucy5Db3JlPy5PcGVyYXRpb25BdmFpbGFibGU7XG5cdFx0ZXhwZWN0KG9wZXJhdGlvbkF2YWxhYmxlRmlyc3QucGF0aCkudG9CZShcImluL2ZsYWdzL2ZpcnN0XCIpO1xuXHRcdG9wZXJhdGlvbkF2YWxhYmxlU2Vjb25kID0gY29udmVydGVkVHlwZXMuYWN0aW9uc1sxXT8uYW5ub3RhdGlvbnMuQ29yZT8uT3BlcmF0aW9uQXZhaWxhYmxlO1xuXHRcdGV4cGVjdChvcGVyYXRpb25BdmFsYWJsZVNlY29uZC5wYXRoKS50b0JlKFwiaW4vZmxhZ3Mvc2Vjb25kXCIpO1xuXHR9KTtcblxuXHQvLyBDdXJyZW50bHkgdGhlcmUgaXMgYSBmdW5jdGlvbmFsIGdhcDogQ29tcGxleCBwcm9wZXJ0aWVzIGFyZSBub3QgYXZhaWxhYmxlIGluIHRoZVxuXHQvLyBwZXJzb25hbGlzYXRpb24uIFRoZXJlZm9yZSB0aGUgZm9sbG93aW5nIHRlc3QgaXMgY3VycmVudGx5IGRlYWNpdmF0ZWRcblx0Ly8gaXQoXCJjaGVjayBpZiBjb21wbGV4IHByb3BlcnRpZXMgYXJlIGF2YWlsYWJsZSBpbiB0YWJsZSBwZXJzb25hbGlzYXRpb25cIiwgKCkgPT4ge1xuXHQvLyAgIGV4cGVjdChjb2x1bW5zLmxlbmd0aCkudG9CZSgxMCk7XG5cdC8vIH0pO1xuXG5cdGl0KFwiY2hlY2sgaWYgY29sdW1uIHRvb2x0aXBzIGFyZSBib3VuZCBjb3JyZWN0bHkgdG8gY29tcGxleCBQcm9wZXJ0eVwiLCAoKSA9PiB7XG5cdFx0Y29uc3QgaWRDb2x1bW4gPSBjb2x1bW5zLmZpbmQoeCA9PiB4LmtleSA9PT0gXCJEYXRhRmllbGQ6OklEXCIpO1xuXHRcdGNvbnN0IGluZGV4Q29sdW1uID0gY29sdW1ucy5maW5kKHggPT4geC5rZXkgPT09IFwiRGF0YUZpZWxkOjpuYW1lXCIpO1xuXG5cdFx0ZXhwZWN0KGlkQ29sdW1uPy50b29sdGlwKS50b0JlKFwie3Rvb2xUaXBzL3RpcElEfVwiKTtcblx0XHRleHBlY3QoaW5kZXhDb2x1bW4/LnRvb2x0aXApLnRvQmUoXCJ7dG9vbFRpcHMvdGlwTmFtZX1cIik7XG5cdH0pO1xufSk7XG4iXX0=

package/packages/sap.fe.core/test/sap/fe/core/jest/type/ComplexType.spec.ts

@@ -0,0 +1,51 @@
+import { convertTypes } from "sap/fe/core/converters/MetaModelConverter";
+import { compileCDS, getConverterContextForTest, getMetaModel } from "sap/fe/test/JestTemplatingHelper";
+import { ConverterOutput, LineItem, UIAnnotationTerms } from "@sap-ux/vocabularies-types";
+import path from "path";
+import { TemplateType } from "sap/fe/core/converters/ManifestSettings";
+import { getTableColumns, AnnotationTableColumn } from "sap/fe/core/converters/controls/Common/Table";
+
+let columns: AnnotationTableColumn[] = [];
+let convertedTypes: ConverterOutput;
+
+beforeAll(async function() {
+	const sMetadataUrl = compileCDS(path.join(__dirname, "../data/ComplexType.cds"));
+	const metaModel = await getMetaModel(sMetadataUrl);
+	convertedTypes = convertTypes(metaModel);
+	const converterContext = getConverterContextForTest(convertedTypes, {
+		converterType: TemplateType.ListReport,
+		entitySet: "TestEntity"
+	});
+	const lineItem = converterContext.getEntityType().annotations.UI?.LineItem;
+	if (lineItem) {
+		columns = getTableColumns(lineItem, "@" + UIAnnotationTerms.LineItem, converterContext, {}) as AnnotationTableColumn[];
+	}
+});
+
+describe("Complex Types", function() {
+	//the type of OperationAvailable is missing a "path" component in Core_Edm.d.ts
+	//So I use type "any" as a local workaround
+	let operationAvalableFirst: any;
+	let operationAvalableSecond: any;
+
+	it("check if OperationAvailable is bound correctly to complex property", () => {
+		operationAvalableFirst = convertedTypes.actions[0]?.annotations.Core?.OperationAvailable;
+		expect(operationAvalableFirst.path).toBe("in/flags/first");
+		operationAvalableSecond = convertedTypes.actions[1]?.annotations.Core?.OperationAvailable;
+		expect(operationAvalableSecond.path).toBe("in/flags/second");
+	});
+
+	// Currently there is a functional gap: Complex properties are not available in the
+	// personalisation. Therefore the following test is currently deacivated
+	// it("check if complex properties are available in table personalisation", () => {
+	//   expect(columns.length).toBe(10);
+	// });
+
+	it("check if column tooltips are bound correctly to complex Property", () => {
+		const idColumn = columns.find(x => x.key === "DataField::ID");
+		const indexColumn = columns.find(x => x.key === "DataField::name");
+
+		expect(idColumn?.tooltip).toBe("{toolTips/tipID}");
+		expect(indexColumn?.tooltip).toBe("{toolTips/tipName}");
+	});
+});

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

@@ -841,7 +841,7 @@ sap.ui.define(
 									"type": "Transparent",
 									"enabled": "false",
 									"visible": "true",
-									"press": "FPM.actionWrapper($event, 'undefined', 'undefined')"
+									"press": "FPM.actionWrapper($event, undefined, undefined)"
 								},
 								"AnnotationActionTest": {
 									"type": "Default",
@@ -910,7 +910,7 @@ sap.ui.define(
 									"type": "Default",
 									"enabled": "false",
 									"visible": "true",
-									"press": "FPM.actionWrapper($event, 'undefined', 'undefined')"
+									"press": "FPM.actionWrapper($event, undefined, undefined)"
 								},
 								"AnnotationActionTest": {
 									"type": "Default",

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

@@ -23,18 +23,6 @@
 		"title": "sap.fe - Templating Expressions Unit Tests",
 		"group": []
 	},
-	{
-		"name": "MessageHandling",
-		"module": "test-resources/sap/fe/core/internal/qunit/MessageHandling.qunit",
-		"title": "Message Handling - Unit Tests",
-		"group": []
-	},
-	{
-		"name": "Draft",
-		"module": "test-resources/sap/fe/core/internal/qunit/Draft.qunit",
-		"title": "Draft - Unit Tests",
-		"group": []
-	},
 	{
 		"name": "FlexibleColumnLayout",
 		"module": "test-resources/sap/fe/core/internal/qunit/FlexibleColumnLayout.qunit",
@@ -47,75 +35,18 @@
 		"title": "EditFlow - Unit Tests",
 		"group": []
 	},
-	{
-		"name": "AnnotationHelper_Qunits",
-		"module": "test-resources/sap/fe/core/internal/qunit/AnnotationHelper.qunit",
-		"title": "sap.fe.AnnotationHelper Unit Tests",
-		"group": []
-	},
-	{
-		"name": "ModelHelper",
-		"module": "test-resources/sap/fe/core/internal/qunit/ModelHelper.qunit",
-		"title": "sap.fe.core.helpers.ModelHelper Unit Tests",
-		"group": []
-	},
-	{
-		"name": "Operations",
-		"module": "test-resources/sap/fe/core/internal/qunit/operations.qunit",
-		"title": "Operations - Unit Tests",
-		"group": []
-	},
-	{
-		"name": "StableIdHelper",
-		"module": "test-resources/sap/fe/core/qunit/helpers/StableIdHelper.qunit",
-		"title": "Stable Id Helper - Unit Tests",
-		"group": []
-	},
-	{
-		"name": "CacheHandlerService",
-		"module": "test-resources/sap/fe/core/qunit/services/CacheHandlerTest.qunit",
-		"title": "Cache Handler Service - Unit Tests",
-		"group": []
-	},
 	{
 		"name": "RouterProxy",
 		"module": "test-resources/sap/fe/core/internal/qunit/RouterProxy.qunit",
 		"title": "RouterProxy - Unit Tests",
 		"group": []
 	},
-	{
-		"name": "AppStateHandler_QUnits",
-		"module": "test-resources/sap/fe/core/internal/qunit/AppStateHandler.qunit",
-		"title": "AppStateHandler - Unit Tests",
-		"group": [],
-		"skip": true
-	},
-	{
-		"name": "DataVisualization Converter",
-		"module": "test-resources/sap/fe/core/internal/qunit/converters/controls/DataVisualization.qunit",
-		"title": "DataVisualization - Unit Tests",
-		"group": [],
-		"skip": true
-	},
-	{
-		"name": "Table Converter",
-		"module": "test-resources/sap/fe/core/internal/qunit/converters/controls/Table.qunit",
-		"title": "TableConverter - Unit Tests",
-		"group": [],
-		"skip": true
-	},
 	{
 		"name": "Table Converter (analytical case)",
 		"module": "test-resources/sap/fe/core/internal/qunit/converters/controls/TableAnalytics.qunit",
 		"title": "TableConverter - Unit Tests for analytical case",
 		"group": []
 	},
-	{
-		"name": "Filter Converter",
-		"module": "test-resources/sap/fe/core/internal/qunit/templating/FilterHelper.qunit",
-		"title": "FilterHelper - Unit Tests",
-		"group": []
-	},
 	{
 		"name": "Chart Converter",
 		"module": "test-resources/sap/fe/core/internal/qunit/converters/controls/Chart.qunit",
@@ -128,24 +59,6 @@
 		"title": "sap.fe.core.CommonUtils Unit Tests",
 		"group": []
 	},
-	{
-		"name": "DynamicPathExpression",
-		"module": "test-resources/sap/fe/core/internal/qunit/helpers/DynamicAnnotationPathHelper.qunit",
-		"title": "DynamicPathExpression - Unit Tests",
-		"group": []
-	},
-	{
-		"name": "ShellServices Factory",
-		"module": "test-resources/sap/fe/core/internal/qunit/services/ShellServicesFactory.qunit",
-		"title": "ShellServices Factory - Unit Tests",
-		"group": []
-	},
-	{
-		"name": "Navigation Services Factory",
-		"module": "test-resources/sap/fe/core/internal/qunit/services/NavigationServiceFactory.qunit",
-		"title": "Navigation Services Factory - Unit Tests",
-		"group": []
-	},
 	{
 		"name": "Templating: Property Helper",
 		"module": "test-resources/sap/fe/core/internal/qunit/templating/PropertyHelper.qunit",
@@ -164,24 +77,6 @@
 		"title": "Templating: Value Help - Unit Tests",
 		"group": []
 	},
-	{
-		"name": "SemanticKeyHelper",
-		"module": "test-resources/sap/fe/core/qunit/helpers/SemanticKeyHelper.qunit",
-		"title": "SemanticKeyHelper - Unit Tests",
-		"group": []
-	},
-	{
-		"name": "SemanticDateOperators",
-		"module": "test-resources/sap/fe/core/qunit/helpers/SemanticDateOperators.qunit",
-		"title": "SemanticDateOperators - Unit Tests",
-		"group": []
-	},
-	{
-		"name": "ExcelFormalHelper",
-		"module": "test-resources/sap/fe/core/qunit/helpers/ExcelFormatHelper.qunit",
-		"title": "ExcelFormalHelper - Unit Tests",
-		"group": []
-	},
 	{
 		"name": "Templating: Data Model Helper",
 		"module": "test-resources/sap/fe/core/internal/qunit/templating/DataModelPathHelper.qunit",

package/packages/sap.fe.core/test/sap/fe/core/relnotes/changes-1.98.json

@@ -2,17 +2,6 @@
   "1.98.0": {
     "date": "January 2022",
     "notes": [
-      {
-        "id": "2d1f4edb2db6a9d5358635468d668a78cd0c5c18",
-        "type": "FIX",
-        "text": " The documentation for custom hooks has been updated",
-        "references": [
-          {
-            "type": "BCP",
-            "reference": "2280013846"
-          }
-        ]
-      },
       {
         "id": "d95e0a218fb2b7c4c1525c3544d4454ad541791b",
         "type": "FIX",