@sapui5/sap.fe.core 1.102.3 → 1.105.0

package/src/sap/fe/core/templating/EntitySetHelper.js

@@ -34,8 +34,8 @@ sap.ui.define([], function () {
    * Reads all SortRestrictions of the main entity and the (first level) navigation restrictions.
    * This does not work for more than one level of navigation.
    *
-   * @param {EntitySet} entitySet Entity set to be analyzed
-   * @returns {string[]} Array containing the property names of all non-sortable properties
+   * @param entitySet Entity set to be analyzed
+   * @returns Array containing the property names of all non-sortable properties
    */
 
 
@@ -69,10 +69,10 @@ sap.ui.define([], function () {
         var _entitySet$entityType, _entitySet$entityType2;
 
         // find correct navigation property
-        var navigationProperty = entitySet === null || entitySet === void 0 ? void 0 : (_entitySet$entityType = entitySet.entityType) === null || _entitySet$entityType === void 0 ? void 0 : (_entitySet$entityType2 = _entitySet$entityType.navigationProperties) === null || _entitySet$entityType2 === void 0 ? void 0 : _entitySet$entityType2.filter(function (navigationProperty) {
+        var navigationProperty = entitySet === null || entitySet === void 0 ? void 0 : (_entitySet$entityType = entitySet.entityType) === null || _entitySet$entityType === void 0 ? void 0 : (_entitySet$entityType2 = _entitySet$entityType.navigationProperties) === null || _entitySet$entityType2 === void 0 ? void 0 : _entitySet$entityType2.filter(function (navProperty) {
           var _navigationRestrictio2;
 
-          return navigationProperty.name == (navigationRestriction === null || navigationRestriction === void 0 ? void 0 : (_navigationRestrictio2 = navigationRestriction.NavigationProperty) === null || _navigationRestrictio2 === void 0 ? void 0 : _navigationRestrictio2.value);
+          return navProperty.name == (navigationRestriction === null || navigationRestriction === void 0 ? void 0 : (_navigationRestrictio2 = navigationRestriction.NavigationProperty) === null || _navigationRestrictio2 === void 0 ? void 0 : _navigationRestrictio2.value);
         });
 
         if (navigationProperty[0]) {
@@ -80,7 +80,7 @@ sap.ui.define([], function () {
 
           // add all properties of the navigation property to the nonSortableProperties
           (_nonSortablePropertie2 = nonSortableProperties).push.apply(_nonSortablePropertie2, _toConsumableArray((_navigationProperty$ = navigationProperty[0].targetType) === null || _navigationProperty$ === void 0 ? void 0 : _navigationProperty$.entityProperties.map(function (property) {
-            return navigationProperty[0].name + "/" + property.name;
+            return "".concat(navigationProperty[0].name, "/").concat(property.name);
           })));
         }
       } else {
@@ -89,7 +89,7 @@ sap.ui.define([], function () {
         var nonSortableNavigationProperties = navigationRestriction === null || navigationRestriction === void 0 ? void 0 : (_navigationRestrictio3 = navigationRestriction.SortRestrictions) === null || _navigationRestrictio3 === void 0 ? void 0 : (_navigationRestrictio4 = _navigationRestrictio3.NonSortableProperties) === null || _navigationRestrictio4 === void 0 ? void 0 : _navigationRestrictio4.map(function (property) {
           var _navigationRestrictio5;
 
-          return (navigationRestriction === null || navigationRestriction === void 0 ? void 0 : (_navigationRestrictio5 = navigationRestriction.NavigationProperty) === null || _navigationRestrictio5 === void 0 ? void 0 : _navigationRestrictio5.value) + "/" + property.value;
+          return "".concat(navigationRestriction === null || navigationRestriction === void 0 ? void 0 : (_navigationRestrictio5 = navigationRestriction.NavigationProperty) === null || _navigationRestrictio5 === void 0 ? void 0 : _navigationRestrictio5.value, "/").concat(property.value);
         });
 
         if (nonSortableNavigationProperties) {
@@ -105,4 +105,4 @@ sap.ui.define([], function () {
   _exports.getNonSortablePropertiesRestrictions = getNonSortablePropertiesRestrictions;
   return _exports;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkVudGl0eVNldEhlbHBlci50cyJdLCJuYW1lcyI6WyJpc0VudGl0eVNldCIsImRhdGFPYmplY3QiLCJoYXNPd25Qcm9wZXJ0eSIsIl90eXBlIiwiZ2V0RmlsdGVyRXhwcmVzc2lvblJlc3RyaWN0aW9ucyIsImVudGl0eVNldCIsImFubm90YXRpb25zIiwiQ2FwYWJpbGl0aWVzIiwiRmlsdGVyUmVzdHJpY3Rpb25zIiwiRmlsdGVyRXhwcmVzc2lvblJlc3RyaWN0aW9ucyIsImdldE5vblNvcnRhYmxlUHJvcGVydGllc1Jlc3RyaWN0aW9ucyIsIm5vblNvcnRhYmxlUHJvcGVydGllcyIsIlNvcnRSZXN0cmljdGlvbnMiLCJTb3J0YWJsZSIsInB1c2giLCJlbnRpdHlUeXBlIiwiZW50aXR5UHJvcGVydGllcyIsIm1hcCIsInByb3BlcnR5IiwibmFtZSIsIk5vblNvcnRhYmxlUHJvcGVydGllcyIsInZhbHVlIiwiTmF2aWdhdGlvblJlc3RyaWN0aW9ucyIsIlJlc3RyaWN0ZWRQcm9wZXJ0aWVzIiwiZm9yRWFjaCIsIm5hdmlnYXRpb25SZXN0cmljdGlvbiIsIm5hdmlnYXRpb25Qcm9wZXJ0eSIsIm5hdmlnYXRpb25Qcm9wZXJ0aWVzIiwiZmlsdGVyIiwiTmF2aWdhdGlvblByb3BlcnR5IiwidGFyZ2V0VHlwZSIsIm5vblNvcnRhYmxlTmF2aWdhdGlvblByb3BlcnRpZXMiXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUNPLE1BQU1BLFdBQVcsR0FBRyxVQUFVQyxVQUFWLEVBQW9EO0FBQzlFLFdBQU9BLFVBQVUsSUFBSUEsVUFBVSxDQUFDQyxjQUFYLENBQTBCLE9BQTFCLENBQWQsSUFBb0RELFVBQVUsQ0FBQ0UsS0FBWCxLQUFxQixXQUFoRjtBQUNBLEdBRk07Ozs7QUFJQSxNQUFNQywrQkFBK0IsR0FBRyxVQUFVQyxTQUFWLEVBQWdDO0FBQUE7O0FBQzlFLFdBQU8sMEJBQUFBLFNBQVMsQ0FBQ0MsV0FBViwwR0FBdUJD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QyxDQUF4Qzs7QUFHQSxZQUFJVSwrQkFBSixFQUFxQztBQUFBOztBQUNwQyxvQ0FBQXBCLHFCQUFxQixFQUFDRyxJQUF0QixrREFBOEJpQiwrQkFBOUI7QUFDQTtBQUNEO0FBQ0QsS0F2QkQ7QUF3QkEsV0FBT3BCLHFCQUFQO0FBQ0EsR0FwQ00iLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEVudGl0eVNldCB9IGZyb20gXCJAc2FwLXV4L2Fubm90YXRpb24tY29udmVydGVyXCI7XG5pbXBvcnQgeyBOYXZpZ2F0aW9uUHJvcGVydHlQYXRoIH0gZnJvbSBcIkBzYXAtdXgvdm9jYWJ1bGFyaWVzLXR5cGVzXCI7XG5cbmV4cG9ydCBjb25zdCBpc0VudGl0eVNldCA9IGZ1bmN0aW9uIChkYXRhT2JqZWN0OiBhbnkpOiBkYXRhT2JqZWN0IGlzIEVudGl0eVNldCB7XG5cdHJldHVybiBkYXRhT2JqZWN0ICYmIGRhdGFPYmplY3QuaGFzT3duUHJvcGVydHkoXCJfdHlwZVwiKSAmJiBkYXRhT2JqZWN0Ll90eXBlID09PSBcIkVudGl0eVNldFwiO1xufTtcblxuZXhwb3J0IGNvbnN0IGdldEZpbHRlckV4cHJlc3Npb25SZXN0cmljdGlvbnMgPSBmdW5jdGlvbiAoZW50aXR5U2V0OiBFbnRpdHlTZXQpIHtcblx0cmV0dXJuIGVudGl0eVNldC5hbm5vdGF0aW9ucz8uQ2FwYWJpbGl0aWVzPy5GaWx0ZXJSZXN0cmljdGlvbnM/LkZpbHRlckV4cHJlc3Npb25SZXN0cmljdGlvbnMgfHwgW107XG59O1xuXG4vKipcbiAqIFJlYWRzIGFsbCBTb3J0UmVzdHJpY3Rpb25zIG9mIHRoZSBtYWluIGVudGl0eSBhbmQgdGhlIChmaXJzdCBsZXZlbCkgbmF2aWdhdGlvbiByZXN0cmljdGlvbnMuXG4gKiBUaGlzIGRvZXMgbm90IHdvcmsgZm9yIG1vcmUgdGhhbiBvbmUgbGV2ZWwgb2YgbmF2aWdhdGlvbi5cbiAqXG4gKiBAcGFyYW0ge0VudGl0eVNldH0gZW50aXR5U2V0IEVudGl0eSBzZXQgdG8gYmUgYW5hbHl6ZWRcbiAqIEByZXR1cm5zIHtzdHJpbmdbXX0gQXJyYXkgY29udGFpbmluZyB0aGUgcHJvcGVydHkgbmFtZXMgb2YgYWxsIG5vbi1zb3J0YWJsZSBwcm9wZXJ0aWVzXG4gKi9cbmV4cG9ydCBjb25zdCBnZXROb25Tb3J0YWJsZVByb3BlcnRpZXNSZXN0cmljdGlvbnMgPSBmdW5jdGlvbiAoZW50aXR5U2V0OiBFbnRpdHlTZXQgfCB1bmRlZmluZWQpOiBzdHJpbmdbXSB7XG5cdGxldCBub25Tb3J0YWJsZVByb3BlcnRpZXMgPSBbXTtcblx0Ly8gQ2hlY2sgYW5ub3RhdGlvbnMgZm9yIG1haW4gZW50aXR5XG5cdGlmIChlbnRpdHlTZXQ/LmFubm90YXRpb25zPy5DYXBhYmlsaXRpZXM/LlNvcnRSZXN0cmljdGlvbnM/LlNvcnRhYmxlID09PSBmYWxzZSkge1xuXHRcdC8vIGFkZCBhbGwgcHJvcGVydGllcyBvZiB0aGUgZW50aXR5IHRvIHRoZSBub25Tb3J0YWJsZVByb3BlcnRpZXNcblx0XHRub25Tb3J0YWJsZVByb3BlcnRpZXMucHVzaCguLi5lbnRpdHlTZXQuZW50aXR5VHlwZS5lbnRpdHlQcm9wZXJ0aWVzLm1hcCgocHJvcGVydHkpID0+IHByb3BlcnR5Lm5hbWUpKTtcblx0fSBlbHNlIHtcblx0XHRub25Tb3J0YWJsZVByb3BlcnRpZXMgPVxuXHRcdFx0ZW50aXR5U2V0Py5hbm5vdGF0aW9ucz8uQ2FwYWJpbGl0aWVzPy5Tb3J0UmVzdHJpY3Rpb25zPy5Ob25Tb3J0YWJsZVByb3BlcnRpZXM/Lm1hcCgocHJvcGVydHkpID0+IHByb3BlcnR5LnZhbHVlKSB8fCBbXTtcblx0fVxuXHQvLyBDaGVjayBmb3IgZXZlcnkgbmF2aWdhdGlvblJlc3RyaWN0aW9uIGlmIGl0IGhhcyBzb3J0UmVzdHJpY3Rpb25zXG5cdGVudGl0eVNldD8uYW5ub3RhdGlvbnM/LkNhcGFiaWxpdGllcz8uTmF2aWdhdGlvblJlc3RyaWN0aW9ucz8uUmVzdHJpY3RlZFByb3BlcnRpZXM/LmZvckVhY2goKG5hdmlnYXRpb25SZXN0cmljdGlvbikgPT4ge1xuXHRcdGlmIChuYXZpZ2F0aW9uUmVzdHJpY3Rpb24/LlNvcnRSZXN0cmljdGlvbnM/LlNvcnRhYmxlID09PSBmYWxzZSkge1xuXHRcdFx0Ly8gZmluZCBjb3JyZWN0IG5hdmlnYXRpb24gcHJvcGVydHlcblx0XHRcdGNvbnN0IG5hdmlnYXRpb25Qcm9wZXJ0eSA9IGVudGl0eVNldD8uZW50aXR5VHlwZT8ubmF2aWdhdGlvblByb3BlcnRpZXM/LmZpbHRlcihcblx0XHRcdFx0KG5hdmlnYXRpb25Qcm9wZXJ0eSkgPT5cblx0XHRcdFx0XHRuYXZpZ2F0aW9uUHJvcGVydHkubmFtZSA9PSAobmF2aWdhdGlvblJlc3RyaWN0aW9uPy5OYXZpZ2F0aW9uUHJvcGVydHkgYXMgTmF2aWdhdGlvblByb3BlcnR5UGF0aCk/LnZhbHVlXG5cdFx0XHQpO1xuXHRcdFx0aWYgKG5hdmlnYXRpb25Qcm9wZXJ0eVswXSkge1xuXHRcdFx0XHQvLyBhZGQgYWxsIHByb3BlcnRpZXMgb2YgdGhlIG5hdmlnYXRpb24gcHJvcGVydHkgdG8gdGhlIG5vblNvcnRhYmxlUHJvcGVydGllc1xuXHRcdFx0XHRub25Tb3J0YWJsZVByb3BlcnRpZXMucHVzaChcblx0XHRcdFx0XHQuLi5uYXZpZ2F0aW9uUHJvcGVydHlbMF0udGFyZ2V0VHlwZT8uZW50aXR5UHJvcGVydGllcy5tYXAoXG5cdFx0XHRcdFx0XHQocHJvcGVydHkpID0+IG5hdmlnYXRpb25Qcm9wZXJ0eVswXS5uYW1lICsgXCIvXCIgKyBwcm9wZXJ0eS5uYW1lXG5cdFx0XHRcdFx0KVxuXHRcdFx0XHQpO1xuXHRcdFx0fVxuXHRcdH0gZWxzZSB7XG5cdFx0XHRjb25zdCBub25Tb3J0YWJsZU5hdmlnYXRpb25Qcm9wZXJ0aWVzID0gbmF2aWdhdGlvblJlc3RyaWN0aW9uPy5Tb3J0UmVzdHJpY3Rpb25zPy5Ob25Tb3J0YWJsZVByb3BlcnRpZXM/Lm1hcChcblx0XHRcdFx0KHByb3BlcnR5KSA9PiAobmF2aWdhdGlvblJlc3RyaWN0aW9uPy5OYXZpZ2F0aW9uUHJvcGVydHkgYXMgTmF2aWdhdGlvblByb3BlcnR5UGF0aCk/LnZhbHVlICsgXCIvXCIgKyBwcm9wZXJ0eS52YWx1ZVxuXHRcdFx0KTtcblx0XHRcdGlmIChub25Tb3J0YWJsZU5hdmlnYXRpb25Qcm9wZXJ0aWVzKSB7XG5cdFx0XHRcdG5vblNvcnRhYmxlUHJvcGVydGllcy5wdXNoKC4uLm5vblNvcnRhYmxlTmF2aWdhdGlvblByb3BlcnRpZXMpO1xuXHRcdFx0fVxuXHRcdH1cblx0fSk7XG5cdHJldHVybiBub25Tb3J0YWJsZVByb3BlcnRpZXM7XG59O1xuIl19
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJpc0VudGl0eVNldCIsImRhdGFPYmplY3QiLCJoYXNPd25Qcm9wZXJ0eSIsIl90eXBlIiwiZ2V0RmlsdGVyRXhwcmVzc2lvblJlc3RyaWN0aW9ucyIsImVudGl0eVNldCIsImFubm90YXRpb25zIiwiQ2FwYWJpbGl0aWVzIiwiRmlsdGVyUmVzdHJpY3Rpb25zIiwiRmlsdGVyRXhwcmVzc2lvblJlc3RyaWN0aW9ucyIsImdldE5vblNvcnRhYmxlUHJvcGVydGllc1Jlc3RyaWN0aW9ucyIsIm5vblNvcnRhYmxlUHJvcGVydGllcyIsIlNvcnRSZXN0cmljdGlvbnMiLCJTb3J0YWJsZSIsInB1c2giLCJlbnRpdHlUeXBlIiwiZW50aXR5UHJvcGVydGllcyIsIm1hcCIsInByb3BlcnR5IiwibmFtZSIsIk5vblNvcnRhYmxlUHJvcGVydGllcyIsInZhbHVlIiwiTmF2aWdhdGlvblJlc3RyaWN0aW9ucyIsIlJlc3RyaWN0ZWRQcm9wZXJ0aWVzIiwiZm9yRWFjaCIsIm5hdmlnYXRpb25SZXN0cmljdGlvbiIsIm5hdmlnYXRpb25Qcm9wZXJ0eSIsIm5hdmlnYXRpb25Qcm9wZXJ0aWVzIiwiZmlsdGVyIiwibmF2UHJvcGVydHkiLCJOYXZpZ2F0aW9uUHJvcGVydHkiLCJ0YXJnZXRUeXBlIiwibm9uU29ydGFibGVOYXZpZ2F0aW9uUHJvcGVydGllcyJdLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXMiOlsiRW50aXR5U2V0SGVscGVyLnRzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB0eXBlIHsgRW50aXR5U2V0LCBOYXZpZ2F0aW9uUHJvcGVydHlQYXRoIH0gZnJvbSBcIkBzYXAtdXgvdm9jYWJ1bGFyaWVzLXR5cGVzXCI7XG5cbmV4cG9ydCBjb25zdCBpc0VudGl0eVNldCA9IGZ1bmN0aW9uIChkYXRhT2JqZWN0OiBhbnkpOiBkYXRhT2JqZWN0IGlzIEVudGl0eVNldCB7XG5cdHJldHVybiBkYXRhT2JqZWN0ICYmIGRhdGFPYmplY3QuaGFzT3duUHJvcGVydHkoXCJfdHlwZVwiKSAmJiBkYXRhT2JqZWN0Ll90eXBlID09PSBcIkVudGl0eVNldFwiO1xufTtcblxuZXhwb3J0IGNvbnN0IGdldEZpbHRlckV4cHJlc3Npb25SZXN0cmljdGlvbnMgPSBmdW5jdGlvbiAoZW50aXR5U2V0OiBFbnRpdHlTZXQpIHtcblx0cmV0dXJuIGVudGl0eVNldC5hbm5vdGF0aW9ucz8uQ2FwYWJpbGl0aWVzPy5GaWx0ZXJSZXN0cmljdGlvbnM/LkZpbHRlckV4cHJlc3Npb25SZXN0cmljdGlvbnMgfHwgW107XG59O1xuXG4vKipcbiAqIFJlYWRzIGFsbCBTb3J0UmVzdHJpY3Rpb25zIG9mIHRoZSBtYWluIGVudGl0eSBhbmQgdGhlIChmaXJzdCBsZXZlbCkgbmF2aWdhdGlvbiByZXN0cmljdGlvbnMuXG4gKiBUaGlzIGRvZXMgbm90IHdvcmsgZm9yIG1vcmUgdGhhbiBvbmUgbGV2ZWwgb2YgbmF2aWdhdGlvbi5cbiAqXG4gKiBAcGFyYW0gZW50aXR5U2V0IEVudGl0eSBzZXQgdG8gYmUgYW5hbHl6ZWRcbiAqIEByZXR1cm5zIEFycmF5IGNvbnRhaW5pbmcgdGhlIHByb3BlcnR5IG5hbWVzIG9mIGFsbCBub24tc29ydGFibGUgcHJvcGVydGllc1xuICovXG5leHBvcnQgY29uc3QgZ2V0Tm9uU29ydGFibGVQcm9wZXJ0aWVzUmVzdHJpY3Rpb25zID0gZnVuY3Rpb24gKGVudGl0eVNldDogRW50aXR5U2V0IHwgdW5kZWZpbmVkKTogc3RyaW5nW10ge1xuXHRsZXQgbm9uU29ydGFibGVQcm9wZXJ0aWVzID0gW107XG5cdC8vIENoZWNrIGFubm90YXRpb25zIGZvciBtYWluIGVudGl0eVxuXHRpZiAoZW50aXR5U2V0Py5hbm5vdGF0aW9ucz8uQ2FwYWJpbGl0aWVzPy5Tb3J0UmVzdHJpY3Rpb25zPy5Tb3J0YWJsZSA9PT0gZmFsc2UpIHtcblx0XHQvLyBhZGQgYWxsIHByb3BlcnRpZXMgb2YgdGhlIGVudGl0eSB0byB0aGUgbm9uU29ydGFibGVQcm9wZXJ0aWVzXG5cdFx0bm9uU29ydGFibGVQcm9wZXJ0aWVzLnB1c2goLi4uZW50aXR5U2V0LmVudGl0eVR5cGUuZW50aXR5UHJvcGVydGllcy5tYXAoKHByb3BlcnR5KSA9PiBwcm9wZXJ0eS5uYW1lKSk7XG5cdH0gZWxzZSB7XG5cdFx0bm9uU29ydGFibGVQcm9wZXJ0aWVzID1cblx0XHRcdGVudGl0eVNldD8uYW5ub3RhdGlvbnM/LkNhcGFiaWxpdGllcz8uU29ydFJlc3RyaWN0aW9ucz8uTm9uU29ydGFibGVQcm9wZXJ0aWVzPy5tYXAoKHByb3BlcnR5KSA9PiBwcm9wZXJ0eS52YWx1ZSkgfHwgW107XG5cdH1cblx0Ly8gQ2hlY2sgZm9yIGV2ZXJ5IG5hdmlnYXRpb25SZXN0cmljdGlvbiBpZiBpdCBoYXMgc29ydFJlc3RyaWN0aW9uc1xuXHRlbnRpdHlTZXQ/LmFubm90YXRpb25zPy5DYXBhYmlsaXRpZXM/Lk5hdmlnYXRpb25SZXN0cmljdGlvbnM/LlJlc3RyaWN0ZWRQcm9wZXJ0aWVzPy5mb3JFYWNoKChuYXZpZ2F0aW9uUmVzdHJpY3Rpb24pID0+IHtcblx0XHRpZiAobmF2aWdhdGlvblJlc3RyaWN0aW9uPy5Tb3J0UmVzdHJpY3Rpb25zPy5Tb3J0YWJsZSA9PT0gZmFsc2UpIHtcblx0XHRcdC8vIGZpbmQgY29ycmVjdCBuYXZpZ2F0aW9uIHByb3BlcnR5XG5cdFx0XHRjb25zdCBuYXZpZ2F0aW9uUHJvcGVydHkgPSBlbnRpdHlTZXQ/LmVudGl0eVR5cGU/Lm5hdmlnYXRpb25Qcm9wZXJ0aWVzPy5maWx0ZXIoXG5cdFx0XHRcdChuYXZQcm9wZXJ0eSkgPT4gbmF2UHJvcGVydHkubmFtZSA9PSAobmF2aWdhdGlvblJlc3RyaWN0aW9uPy5OYXZpZ2F0aW9uUHJvcGVydHkgYXMgTmF2aWdhdGlvblByb3BlcnR5UGF0aCk/LnZhbHVlXG5cdFx0XHQpO1xuXHRcdFx0aWYgKG5hdmlnYXRpb25Qcm9wZXJ0eVswXSkge1xuXHRcdFx0XHQvLyBhZGQgYWxsIHByb3BlcnRpZXMgb2YgdGhlIG5hdmlnYXRpb24gcHJvcGVydHkgdG8gdGhlIG5vblNvcnRhYmxlUHJvcGVydGllc1xuXHRcdFx0XHRub25Tb3J0YWJsZVByb3BlcnRpZXMucHVzaChcblx0XHRcdFx0XHQuLi5uYXZpZ2F0aW9uUHJvcGVydHlbMF0udGFyZ2V0VHlwZT8uZW50aXR5UHJvcGVydGllcy5tYXAoXG5cdFx0XHRcdFx0XHQocHJvcGVydHkpID0+IGAke25hdmlnYXRpb25Qcm9wZXJ0eVswXS5uYW1lfS8ke3Byb3BlcnR5Lm5hbWV9YFxuXHRcdFx0XHRcdClcblx0XHRcdFx0KTtcblx0XHRcdH1cblx0XHR9IGVsc2Uge1xuXHRcdFx0Y29uc3Qgbm9uU29ydGFibGVOYXZpZ2F0aW9uUHJvcGVydGllcyA9IG5hdmlnYXRpb25SZXN0cmljdGlvbj8uU29ydFJlc3RyaWN0aW9ucz8uTm9uU29ydGFibGVQcm9wZXJ0aWVzPy5tYXAoXG5cdFx0XHRcdChwcm9wZXJ0eSkgPT4gYCR7KG5hdmlnYXRpb25SZXN0cmljdGlvbj8uTmF2aWdhdGlvblByb3BlcnR5IGFzIE5hdmlnYXRpb25Qcm9wZXJ0eVBhdGgpPy52YWx1ZX0vJHtwcm9wZXJ0eS52YWx1ZX1gXG5cdFx0XHQpO1xuXHRcdFx0aWYgKG5vblNvcnRhYmxlTmF2aWdhdGlvblByb3BlcnRpZXMpIHtcblx0XHRcdFx0bm9uU29ydGFibGVQcm9wZXJ0aWVzLnB1c2goLi4ubm9uU29ydGFibGVOYXZpZ2F0aW9uUHJvcGVydGllcyk7XG5cdFx0XHR9XG5cdFx0fVxuXHR9KTtcblx0cmV0dXJuIG5vblNvcnRhYmxlUHJvcGVydGllcztcbn07XG4iXSwibWFwcGluZ3MiOiI7QUFBQTtBQUFBO0FBQUE7Ozs7Ozs7Ozs7Ozs7Ozs7OztFQUVPLElBQU1BLFdBQVcsR0FBRyxVQUFVQyxVQUFWLEVBQW9EO0lBQzlFLE9BQU9BLFVBQVUsSUFBSUEsVUFBVSxDQUFDQyxjQUFYLENBQTBCLE9BQTFCLENBQWQsSUFBb0RELFVBQVUsQ0FBQ0UsS0FBWCxLQUFxQixXQUFoRjtFQUNBLENBRk07Ozs7RUFJQSxJQUFNQywrQkFBK0IsR0FBRyxVQUFVQyxTQUFW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

package/src/sap/fe/core/templating/EntitySetHelper.ts

@@ -1,5 +1,4 @@
-import { EntitySet } from "@sap-ux/annotation-converter";
-import { NavigationPropertyPath } from "@sap-ux/vocabularies-types";
+import type { EntitySet, NavigationPropertyPath } from "@sap-ux/vocabularies-types";
 
 export const isEntitySet = function (dataObject: any): dataObject is EntitySet {
 	return dataObject && dataObject.hasOwnProperty("_type") && dataObject._type === "EntitySet";
@@ -13,8 +12,8 @@ export const getFilterExpressionRestrictions = function (entitySet: EntitySet) {
  * Reads all SortRestrictions of the main entity and the (first level) navigation restrictions.
  * This does not work for more than one level of navigation.
  *
- * @param {EntitySet} entitySet Entity set to be analyzed
- * @returns {string[]} Array containing the property names of all non-sortable properties
+ * @param entitySet Entity set to be analyzed
+ * @returns Array containing the property names of all non-sortable properties
  */
 export const getNonSortablePropertiesRestrictions = function (entitySet: EntitySet | undefined): string[] {
 	let nonSortableProperties = [];
@@ -31,20 +30,19 @@ export const getNonSortablePropertiesRestrictions = function (entitySet: EntityS
 		if (navigationRestriction?.SortRestrictions?.Sortable === false) {
 			// find correct navigation property
 			const navigationProperty = entitySet?.entityType?.navigationProperties?.filter(
-				(navigationProperty) =>
-					navigationProperty.name == (navigationRestriction?.NavigationProperty as NavigationPropertyPath)?.value
+				(navProperty) => navProperty.name == (navigationRestriction?.NavigationProperty as NavigationPropertyPath)?.value
 			);
 			if (navigationProperty[0]) {
 				// add all properties of the navigation property to the nonSortableProperties
 				nonSortableProperties.push(
 					...navigationProperty[0].targetType?.entityProperties.map(
-						(property) => navigationProperty[0].name + "/" + property.name
+						(property) => `${navigationProperty[0].name}/${property.name}`
 					)
 				);
 			}
 		} else {
 			const nonSortableNavigationProperties = navigationRestriction?.SortRestrictions?.NonSortableProperties?.map(
-				(property) => (navigationRestriction?.NavigationProperty as NavigationPropertyPath)?.value + "/" + property.value
+				(property) => `${(navigationRestriction?.NavigationProperty as NavigationPropertyPath)?.value}/${property.value}`
 			);
 			if (nonSortableNavigationProperties) {
 				nonSortableProperties.push(...nonSortableNavigationProperties);

package/src/sap/fe/core/templating/FieldControlHelper.js

@@ -2,49 +2,37 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/fe/core/helpers/BindingExpression"], function (BindingExpression) {
+sap.ui.define(["sap/fe/core/helpers/BindingToolkit"], function (BindingToolkit) {
   "use strict";
 
   var _exports = {};
-  var annotationExpression = BindingExpression.annotationExpression;
-  var or = BindingExpression.or;
-  var equal = BindingExpression.equal;
+  var or = BindingToolkit.or;
+  var getExpressionFromAnnotation = BindingToolkit.getExpressionFromAnnotation;
+  var equal = BindingToolkit.equal;
+  var constant = BindingToolkit.constant;
 
-  /**
-   * Create the binding expression to check if the property is non editable or not.
-   *
-   * @param {object} oTarget The target property or DataField
-   * @returns {ExpressionOrPrimitive<boolean>} The binding expression resolving to a Boolean being true if it's non editable
-   */
-  var isNonEditableExpression = function (oTarget) {
-    return or(isReadOnlyExpression(oTarget), isDisabledExpression(oTarget));
-  };
   /**
    * Create the binding expression to check if the property is read only or not.
    *
-   * @param {object} oTarget The target property or DataField
-   * @returns {ExpressionOrPrimitive<boolean>} The binding expression resolving to a Boolean being true if it's read only
+   * @param oTarget The target property or DataField
+   * @returns The binding expression resolving to a Boolean being true if it's read only
    */
-
-
-  _exports.isNonEditableExpression = isNonEditableExpression;
-
   var isReadOnlyExpression = function (oTarget) {
     var _oTarget$annotations, _oTarget$annotations$, _oTarget$annotations$2;
 
     var oFieldControlValue = oTarget === null || oTarget === void 0 ? void 0 : (_oTarget$annotations = oTarget.annotations) === null || _oTarget$annotations === void 0 ? void 0 : (_oTarget$annotations$ = _oTarget$annotations.Common) === null || _oTarget$annotations$ === void 0 ? void 0 : (_oTarget$annotations$2 = _oTarget$annotations$.FieldControl) === null || _oTarget$annotations$2 === void 0 ? void 0 : _oTarget$annotations$2.valueOf();
 
-    if (typeof oFieldControlValue === "object") {
-      return !!oFieldControlValue && or(equal(annotationExpression(oFieldControlValue), 1), equal(annotationExpression(oFieldControlValue), "1"));
+    if (typeof oFieldControlValue === "object" && !!oFieldControlValue) {
+      return or(equal(getExpressionFromAnnotation(oFieldControlValue), 1), equal(getExpressionFromAnnotation(oFieldControlValue), "1"));
     }
 
-    return oFieldControlValue === "Common.FieldControlType/ReadOnly";
+    return constant(oFieldControlValue === "Common.FieldControlType/ReadOnly");
   };
   /**
    * Create the binding expression to check if the property is disabled or not.
    *
-   * @param {object} oTarget The target property or DataField
-   * @returns {ExpressionOrPrimitive<boolean>} The binding expression resolving to a Boolean being true if it's disabled
+   * @param oTarget The target property or DataField
+   * @returns The binding expression resolving to a Boolean being true if it's disabled
    */
 
 
@@ -55,35 +43,48 @@ sap.ui.define(["sap/fe/core/helpers/BindingExpression"], function (BindingExpres
 
     var oFieldControlValue = oTarget === null || oTarget === void 0 ? void 0 : (_oTarget$annotations2 = oTarget.annotations) === null || _oTarget$annotations2 === void 0 ? void 0 : (_oTarget$annotations3 = _oTarget$annotations2.Common) === null || _oTarget$annotations3 === void 0 ? void 0 : (_oTarget$annotations4 = _oTarget$annotations3.FieldControl) === null || _oTarget$annotations4 === void 0 ? void 0 : _oTarget$annotations4.valueOf();
 
-    if (typeof oFieldControlValue === "object") {
-      return !!oFieldControlValue && or(equal(annotationExpression(oFieldControlValue), 0), equal(annotationExpression(oFieldControlValue), "0"));
+    if (typeof oFieldControlValue === "object" && !!oFieldControlValue) {
+      return or(equal(getExpressionFromAnnotation(oFieldControlValue), 0), equal(getExpressionFromAnnotation(oFieldControlValue), "0"));
     }
 
-    return oFieldControlValue === "Common.FieldControlType/Inapplicable";
+    return constant(oFieldControlValue === "Common.FieldControlType/Inapplicable");
   };
   /**
-   * Create the binding expression to check if the property is read only or not.
+   * Create the binding expression to check if the property is non editable or not.
    *
-   * @param {object} oTarget The target property or DataField
-   * @returns {ExpressionOrPrimitive<boolean>} The binding expression resolving to a Boolean being true if it's read only
+   * @param oTarget The target property or DataField
+   * @returns The binding expression resolving to a Boolean being true if it's non editable
    */
 
 
   _exports.isDisabledExpression = isDisabledExpression;
 
+  var isNonEditableExpression = function (oTarget) {
+    return or(isReadOnlyExpression(oTarget), isDisabledExpression(oTarget));
+  };
+  /**
+   * Create the binding expression to check if the property is read only or not.
+   *
+   * @param oTarget The target property or DataField
+   * @returns The binding expression resolving to a Boolean being true if it's read only
+   */
+
+
+  _exports.isNonEditableExpression = isNonEditableExpression;
+
   var isRequiredExpression = function (oTarget) {
     var _oTarget$annotations5, _oTarget$annotations6, _oTarget$annotations7;
 
     var oFieldControlValue = oTarget === null || oTarget === void 0 ? void 0 : (_oTarget$annotations5 = oTarget.annotations) === null || _oTarget$annotations5 === void 0 ? void 0 : (_oTarget$annotations6 = _oTarget$annotations5.Common) === null || _oTarget$annotations6 === void 0 ? void 0 : (_oTarget$annotations7 = _oTarget$annotations6.FieldControl) === null || _oTarget$annotations7 === void 0 ? void 0 : _oTarget$annotations7.valueOf();
 
-    if (typeof oFieldControlValue === "object") {
-      return !!oFieldControlValue && or(equal(annotationExpression(oFieldControlValue), 7), equal(annotationExpression(oFieldControlValue), "7"));
+    if (typeof oFieldControlValue === "object" && !!oFieldControlValue) {
+      return or(equal(getExpressionFromAnnotation(oFieldControlValue), 7), equal(getExpressionFromAnnotation(oFieldControlValue), "7"));
     }
 
-    return oFieldControlValue === "Common.FieldControlType/Mandatory";
+    return constant(oFieldControlValue === "Common.FieldControlType/Mandatory");
   };
 
   _exports.isRequiredExpression = isRequiredExpression;
   return _exports;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIkZpZWxkQ29udHJvbEhlbHBlci50cyJdLCJuYW1lcyI6WyJpc05vbkVkaXRhYmxlRXhwcmVzc2lvbiIsIm9UYXJnZXQiLCJvciIsImlzUmVhZE9ubHlFeHByZXNzaW9uIiwiaXNEaXNhYmxlZEV4cHJlc3Npb24iLCJvRmllbGRDb250cm9sVmFsdWUiLCJhbm5vdGF0aW9ucyIsIkNvbW1vbiIsIkZpZWxkQ29udHJvbCIsInZhbHVlT2YiLCJlcXVhbCIsImFubm90YXRpb25FeHByZXNzaW9uIiwiaXNSZXF1aXJlZEV4cHJlc3Npb24iXSwibWFwcGluZ3MiOiI7QUFBQTtBQUNBO0FBQ0E7Ozs7Ozs7OztBQUFBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNPLE1BQU1BLHVCQUF1QixHQUFHLFVBQVNDLE9BQVQsRUFBNEM7QUFDbEYsV0FBT0MsRUFBRSxDQUFDQyxvQkFBb0IsQ0FBQ0YsT0FBRCxDQUFyQixFQUFnQ0csb0JBQW9CLENBQUNILE9BQUQsQ0FBcEQsQ0FBVDtBQUNBLEdBRk07QUFJUDtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7Ozs7O0FBQ08sTUFBTUUsb0JBQW9CLEdBQUcsVUFBU0YsT0FBVCxFQUF1RDtBQUFBOztBQUMxRixRQUFNSSxrQkFBa0IsR0FBR0osT0FBSCxhQUFHQSxPQUFILCtDQUFHQSxPQUFPLENBQUVLLFdBQVosa0ZBQUcscUJBQXNCQyxNQUF6QixvRkFBRyxzQkFBOEJDLFlBQWpDLDJEQUFHLHVCQUE0Q0MsT0FBNUMsRUFBM0I7O0FBQ0EsUUFBSSxPQUFPSixrQkFBUCxLQUE4QixRQUFsQyxFQUE0QztBQUMzQyxhQUNDLENBQUMsQ0FBQ0Esa0JBQUYsSUFDQUgsRUFBRSxDQUNEUSxLQUFLLENBQUNDLG9CQUFvQixDQUFDTixrQkFBRCxDQUFyQixFQUE0RSxDQUE1RSxDQURKLEVBRURLLEtBQUssQ0FBQ0Msb0JBQW9CLENBQUNOLGtCQUFELENBQXJCLEVBQTRFLEdBQTVFLENBRkosQ0FGSDtBQU9BOztBQUNELFdBQU9BLGtCQUFrQixLQUFLLGtDQUE5QjtBQUNBLEdBWk07QUFjUDtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7Ozs7O0FBQ08sTUFBTUQsb0JBQW9CLEdBQUcsVUFBU0gsT0FBVCxFQUF1RDtBQUFBOztBQUMxRixRQUFNSSxrQkFBa0IsR0FBR0osT0FBSCxhQUFHQSxPQUFILGdEQUFHQSxPQUFPLENBQUVLLFdBQVosbUZBQUcsc0JBQXNCQyxNQUF6QixtRkFBRyxzQkFBOEJDLFlBQWpDLDBEQUFHLHNCQUE0Q0MsT0FBNUMsRUFBM0I7O0FBQ0EsUUFBSSxPQUFPSixrQkFBUCxLQUE4QixRQUFsQyxFQUE0QztBQUMzQyxhQUNDLENBQUMsQ0FBQ0Esa0JBQUYsSUFDQUgsRUFBRSxDQUNEUSxLQUFLLENBQUNDLG9CQUFvQixDQUFDTixrQkFBRCxDQUFyQixFQUE0RSxDQUE1RSxDQURKLEVBRURLLEtBQUssQ0FBQ0Msb0JBQW9CLENBQUNOLGtCQUFELENBQXJCLEVBQTRFLEdBQTVFLENBRkosQ0FGSDtBQU9BOztBQUNELFdBQU9BLGtCQUFrQixLQUFLLHNDQUE5QjtBQUNBLEdBWk07QUFjUDtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7Ozs7O0FBQ08sTUFBTU8sb0JBQW9CLEdBQUcsVUFBU1gsT0FBVCxFQUF1RDtBQUFBOztBQUMxRixRQUFNSSxrQkFBa0IsR0FBR0osT0FBSCxhQUFHQSxPQUFILGdEQUFHQSxPQUFPLENBQUVLLFdBQVosbUZBQUcsc0JBQXNCQyxNQUF6QixtRkFBRyxzQkFBOEJDLFlBQWpDLDBEQUFHLHNCQUE0Q0MsT0FBNUMsRUFBM0I7O0FBQ0EsUUFBSSxPQUFPSixrQkFBUCxLQUE4QixRQUFsQyxFQUE0QztBQUMzQyxhQUNDLENBQUMsQ0FBQ0Esa0JBQUYsSUFDQUgsRUFBRSxDQUNEUSxLQUFLLENBQUNDLG9CQUFvQixDQUFDTixrQkFBRCxDQUFyQixFQUE0RSxDQUE1RSxDQURKLEVBRURLLEtBQUssQ0FBQ0Msb0JBQW9CLENBQUNOLGtCQUFELENBQXJCLEVBQTRFLEdBQTVFLENBRkosQ0FGSDtBQU9BOztBQUNELFdBQU9BLGtCQUFrQixLQUFLLG1DQUE5QjtBQUNBLEdBWk0iLCJzb3VyY2VSb290IjoiLiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGVxdWFsLCBFeHByZXNzaW9uLCBFeHByZXNzaW9uT3JQcmltaXRpdmUsIG9yLCBhbm5vdGF0aW9uRXhwcmVzc2lvbiB9IGZyb20gXCJzYXAvZmUvY29yZS9oZWxwZXJzL0JpbmRpbmdFeHByZXNzaW9uXCI7XG5cbi8qKlxuICogQ3JlYXRlIHRoZSBiaW5kaW5nIGV4cHJlc3Npb24gdG8gY2hlY2sgaWYgdGhlIHByb3BlcnR5IGlzIG5vbiBlZGl0YWJsZSBvciBub3QuXG4gKlxuICogQHBhcmFtIHtvYmplY3R9IG9UYXJnZXQgVGhlIHRhcmdldCBwcm9wZXJ0eSBvciBEYXRhRmllbGRcbiAqIEByZXR1cm5zIHtFeHByZXNzaW9uT3JQcmltaXRpdmU8Ym9vbGVhbj59IFRoZSBiaW5kaW5nIGV4cHJlc3Npb24gcmVzb2x2aW5nIHRvIGEgQm9vbGVhbiBiZWluZyB0cnVlIGlmIGl0J3Mgbm9uIGVkaXRhYmxlXG4gKi9cbmV4cG9ydCBjb25zdCBpc05vbkVkaXRhYmxlRXhwcmVzc2lvbiA9IGZ1bmN0aW9uKG9UYXJnZXQ6IGFueSk6IEV4cHJlc3Npb248Ym9vbGVhbj4ge1xuXHRyZXR1cm4gb3IoaXNSZWFkT25seUV4cHJlc3Npb24ob1RhcmdldCksIGlzRGlzYWJsZWRFeHByZXNzaW9uKG9UYXJnZXQpKTtcbn07XG5cbi8qKlxuICogQ3JlYXRlIHRoZSBiaW5kaW5nIGV4cHJlc3Npb24gdG8gY2hlY2sgaWYgdGhlIHByb3BlcnR5IGlzIHJlYWQgb25seSBvciBub3QuXG4gKlxuICogQHBhcmFtIHtvYmplY3R9IG9UYXJnZXQgVGhlIHRhcmdldCBwcm9wZXJ0eSBvciBEYXRhRmllbGRcbiAqIEByZXR1cm5zIHtFeHByZXNzaW9uT3JQcmltaXRpdmU8Ym9vbGVhbj59IFRoZSBiaW5kaW5nIGV4cHJlc3Npb24gcmVzb2x2aW5nIHRvIGEgQm9vbGVhbiBiZWluZyB0cnVlIGlmIGl0J3MgcmVhZCBvbmx5XG4gKi9cbmV4cG9ydCBjb25zdCBpc1JlYWRPbmx5RXhwcmVzc2lvbiA9IGZ1bmN0aW9uKG9UYXJnZXQ6IGFueSk6IEV4cHJlc3Npb25PclByaW1pdGl2ZTxib29sZWFuPiB7XG5cdGNvbnN0IG9GaWVsZENvbnRyb2xWYWx1ZSA9IG9UYXJnZXQ/LmFubm90YXRpb25zPy5Db21tb24/LkZpZWxkQ29udHJvbD8udmFsdWVPZigpO1xuXHRpZiAodHlwZW9mIG9GaWVsZENvbnRyb2xWYWx1ZSA9PT0gXCJvYmplY3RcIikge1xuXHRcdHJldHVybiAoXG5cdFx0XHQhIW9GaWVsZENvbnRyb2xWYWx1ZSAmJlxuXHRcdFx0b3IoXG5cdFx0XHRcdGVxdWFsKGFubm90YXRpb25FeHByZXNzaW9uKG9GaWVsZENvbnRyb2xWYWx1ZSkgYXMgRXhwcmVzc2lvbk9yUHJpbWl0aXZlPG51bWJlcj4sIDEpLFxuXHRcdFx0XHRlcXVhbChhbm5vdGF0aW9uRXhwcmVzc2lvbihvRmllbGRDb250cm9sVmFsdWUpIGFzIEV4cHJlc3Npb25PclByaW1pdGl2ZTxzdHJpbmc+LCBcIjFcIilcblx0XHRcdClcblx0XHQpO1xuXHR9XG5cdHJldHVybiBvRmllbGRDb250cm9sVmFsdWUgPT09IFwiQ29tbW9uLkZpZWxkQ29udHJvbFR5cGUvUmVhZE9ubHlcIjtcbn07XG5cbi8qKlxuICogQ3JlYXRlIHRoZSBiaW5kaW5nIGV4cHJlc3Npb24gdG8gY2hlY2sgaWYgdGhlIHByb3BlcnR5IGlzIGRpc2FibGVkIG9yIG5vdC5cbiAqXG4gKiBAcGFyYW0ge29iamVjdH0gb1RhcmdldCBUaGUgdGFyZ2V0IHByb3BlcnR5IG9yIERhdGFGaWVsZFxuICogQHJldHVybnMge0V4cHJlc3Npb25PclByaW1pdGl2ZTxib29sZWFuPn0gVGhlIGJpbmRpbmcgZXhwcmVzc2lvbiByZXNvbHZpbmcgdG8gYSBCb29sZWFuIGJlaW5nIHRydWUgaWYgaXQncyBkaXNhYmxlZFxuICovXG5leHBvcnQgY29uc3QgaXNEaXNhYmxlZEV4cHJlc3Npb24gPSBmdW5jdGlvbihvVGFyZ2V0OiBhbnkpOiBFeHByZXNzaW9uT3JQcmltaXRpdmU8Ym9vbGVhbj4ge1xuXHRjb25zdCBvRmllbGRDb250cm9sVmFsdWUgPSBvVGFyZ2V0Py5hbm5vdGF0aW9ucz8uQ29tbW9uPy5GaWVsZENvbnRyb2w/LnZhbHVlT2YoKTtcblx0aWYgKHR5cGVvZiBvRmllbGRDb250cm9sVmFsdWUgPT09IFwib2JqZWN0XCIpIHtcblx0XHRyZXR1cm4gKFxuXHRcdFx0ISFvRmllbGRDb250cm9sVmFsdWUgJiZcblx0XHRcdG9yKFxuXHRcdFx0XHRlcXVhbChhbm5vdGF0aW9uRXhwcmVzc2lvbihvRmllbGRDb250cm9sVmFsdWUpIGFzIEV4cHJlc3Npb25PclByaW1pdGl2ZTxudW1iZXI+LCAwKSxcblx0XHRcdFx0ZXF1YWwoYW5ub3RhdGlvbkV4cHJlc3Npb24ob0ZpZWxkQ29udHJvbFZhbHVlKSBhcyBFeHByZXNzaW9uT3JQcmltaXRpdmU8c3RyaW5nPiwgXCIwXCIpXG5cdFx0XHQpXG5cdFx0KTtcblx0fVxuXHRyZXR1cm4gb0ZpZWxkQ29udHJvbFZhbHVlID09PSBcIkNvbW1vbi5GaWVsZENvbnRyb2xUeXBlL0luYXBwbGljYWJsZVwiO1xufTtcblxuLyoqXG4gKiBDcmVhdGUgdGhlIGJpbmRpbmcgZXhwcmVzc2lvbiB0byBjaGVjayBpZiB0aGUgcHJvcGVydHkgaXMgcmVhZCBvbmx5IG9yIG5vdC5cbiAqXG4gKiBAcGFyYW0ge29iamVjdH0gb1RhcmdldCBUaGUgdGFyZ2V0IHByb3BlcnR5IG9yIERhdGFGaWVsZFxuICogQHJldHVybnMge0V4cHJlc3Npb25PclByaW1pdGl2ZTxib29sZWFuPn0gVGhlIGJpbmRpbmcgZXhwcmVzc2lvbiByZXNvbHZpbmcgdG8gYSBCb29sZWFuIGJlaW5nIHRydWUgaWYgaXQncyByZWFkIG9ubHlcbiAqL1xuZXhwb3J0IGNvbnN0IGlzUmVxdWlyZWRFeHByZXNzaW9uID0gZnVuY3Rpb24ob1RhcmdldDogYW55KTogRXhwcmVzc2lvbk9yUHJpbWl0aXZlPGJvb2xlYW4+IHtcblx0Y29uc3Qgb0ZpZWxkQ29udHJvbFZhbHVlID0gb1RhcmdldD8uYW5ub3RhdGlvbnM/LkNvbW1vbj8uRmllbGRDb250cm9sPy52YWx1ZU9mKCk7XG5cdGlmICh0eXBlb2Ygb0ZpZWxkQ29udHJvbFZhbHVlID09PSBcIm9iamVjdFwiKSB7XG5cdFx0cmV0dXJuIChcblx0XHRcdCEhb0ZpZWxkQ29udHJvbFZhbHVlICYmXG5cdFx0XHRvcihcblx0XHRcdFx0ZXF1YWwoYW5ub3RhdGlvbkV4cHJlc3Npb24ob0ZpZWxkQ29udHJvbFZhbHVlKSBhcyBFeHByZXNzaW9uT3JQcmltaXRpdmU8bnVtYmVyPiwgNyksXG5cdFx0XHRcdGVxdWFsKGFubm90YXRpb25FeHByZXNzaW9uKG9GaWVsZENvbnRyb2xWYWx1ZSkgYXMgRXhwcmVzc2lvbk9yUHJpbWl0aXZlPHN0cmluZz4sIFwiN1wiKVxuXHRcdFx0KVxuXHRcdCk7XG5cdH1cblx0cmV0dXJuIG9GaWVsZENvbnRyb2xWYWx1ZSA9PT0gXCJDb21tb24uRmllbGRDb250cm9sVHlwZS9NYW5kYXRvcnlcIjtcbn07XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJpc1JlYWRPbmx5RXhwcmVzc2lvbiIsIm9UYXJnZXQiLCJvRmllbGRDb250cm9sVmFsdWUiLCJhbm5vdGF0aW9ucyIsIkNvbW1vbiIsIkZpZWxkQ29udHJvbCIsInZhbHVlT2YiLCJvciIsImVxdWFsIiwiZ2V0RXhwcmVzc2lvbkZyb21Bbm5vdGF0aW9uIiwiY29uc3RhbnQiLCJpc0Rpc2FibGVkRXhwcmVzc2lvbiIsImlzTm9uRWRpdGFibGVFeHByZXNzaW9uIiwiaXNSZXF1aXJlZEV4cHJlc3Npb24iXSwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzIjpbIkZpZWxkQ29udHJvbEhlbHBlci50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgdHlwZSB7IEJpbmRpbmdUb29sa2l0RXhwcmVzc2lvbiB9IGZyb20gXCJzYXAvZmUvY29yZS9oZWxwZXJzL0JpbmRpbmdUb29sa2l0XCI7XG5pbXBvcnQgeyBjb25zdGFudCwgZXF1YWwsIGdldEV4cHJlc3Npb25Gcm9tQW5ub3RhdGlvbiwgb3IgfSBmcm9tIFwic2FwL2ZlL2NvcmUvaGVscGVycy9CaW5kaW5nVG9vbGtpdFwiO1xuXG4vKipcbiAqIENyZWF0ZSB0aGUgYmluZGluZyBleHByZXNzaW9uIHRvIGNoZWNrIGlmIHRoZSBwcm9wZXJ0eSBpcyByZWFkIG9ubHkgb3Igbm90LlxuICpcbiAqIEBwYXJhbSBvVGFyZ2V0IFRoZSB0YXJnZXQgcHJvcGVydHkgb3IgRGF0YUZpZWxkXG4gKiBAcmV0dXJucyBUaGUgYmluZGluZyBleHByZXNzaW9uIHJlc29sdmluZyB0byBhIEJvb2xlYW4gYmVpbmcgdHJ1ZSBpZiBpdCdzIHJlYWQgb25seVxuICovXG5leHBvcnQgY29uc3QgaXNSZWFkT25seUV4cHJlc3Npb24gPSBmdW5jdGlvbiAob1RhcmdldDogYW55KTogQmluZGluZ1Rvb2xraXRFeHByZXNzaW9uPGJvb2xlYW4+IHtcblx0Y29uc3Qgb0ZpZWxkQ29udHJvbFZhbHVlID0gb1RhcmdldD8uYW5ub3RhdGlvbnM/LkNvbW1vbj8uRmllbGRDb250cm9sPy52YWx1ZU9mKCk7XG5cdGlmICh0eXBlb2Ygb0ZpZWxkQ29udHJvbFZhbHVlID09PSBcIm9iamVjdFwiICYmICEhb0ZpZWxkQ29udHJvbFZhbHVlKSB7XG5cdFx0cmV0dXJuIG9yKGVxdWFsKGdldEV4cHJlc3Npb25Gcm9tQW5ub3RhdGlvbihvRmllbGRDb250cm9sVmFsdWUpLCAxKSwgZXF1YWwoZ2V0RXhwcmVzc2lvbkZyb21Bbm5vdGF0aW9uKG9GaWVsZENvbnRyb2xWYWx1ZSksIFwiMVwiKSk7XG5cdH1cblx0cmV0dXJuIGNvbnN0YW50KG9GaWVsZENvbnRyb2xWYWx1ZSA9PT0gXCJDb21tb24uRmllbGRDb250cm9sVHlwZS9SZWFkT25seVwiKTtcbn07XG5cbi8qKlxuICogQ3JlYXRlIHRoZSBiaW5kaW5nIGV4cHJlc3Npb24gdG8gY2hlY2sgaWYgdGhlIHByb3BlcnR5IGlzIGRpc2FibGVkIG9yIG5vdC5cbiAqXG4gKiBAcGFyYW0gb1RhcmdldCBUaGUgdGFyZ2V0IHByb3BlcnR5IG9yIERhdGFGaWVsZFxuICogQHJldHVybnMgVGhlIGJpbmRpbmcgZXhwcmVzc2lvbiByZXNvbHZpbmcgdG8gYSBCb29sZWFuIGJlaW5nIHRydWUgaWYgaXQncyBkaXNhYmxlZFxuICovXG5leHBvcnQgY29uc3QgaXNEaXNhYmxlZEV4cHJlc3Npb24gPSBmdW5jdGlvbiAob1RhcmdldDogYW55KTogQmluZGluZ1Rvb2xraXRFeHByZXNzaW9uPGJvb2xlYW4+IHtcblx0Y29uc3Qgb0ZpZWxkQ29udHJvbFZhbHVlID0gb1RhcmdldD8uYW5ub3RhdGlvbnM/LkNvbW1vbj8uRmllbGRDb250cm9sPy52YWx1ZU9mKCk7XG5cdGlmICh0eXBlb2Ygb0ZpZWxkQ29udHJvbFZhbHVlID09PSBcIm9iamVjdFwiICYmICEhb0ZpZWxkQ29udHJvbFZhbHVlKSB7XG5cdFx0cmV0dXJuIG9yKGVxdWFsKGdldEV4cHJlc3Npb25Gcm9tQW5ub3RhdGlvbihvRmllbGRDb250cm9sVmFsdWUpLCAwKSwgZXF1YWwoZ2V0RXhwcmVzc2lvbkZyb21Bbm5vdGF0aW9uKG9GaWVsZENvbnRyb2xWYWx1ZSksIFwiMFwiKSk7XG5cdH1cblx0cmV0dXJuIGNvbnN0YW50KG9GaWVsZENvbnRyb2xWYWx1ZSA9PT0gXCJDb21tb24uRmllbGRDb250cm9sVHlwZS9JbmFwcGxpY2FibGVcIik7XG59O1xuXG4vKipcbiAqIENyZWF0ZSB0aGUgYmluZGluZyBleHByZXNzaW9uIHRvIGNoZWNrIGlmIHRoZSBwcm9wZXJ0eSBpcyBub24gZWRpdGFibGUgb3Igbm90LlxuICpcbiAqIEBwYXJhbSBvVGFyZ2V0IFRoZSB0YXJnZXQgcHJvcGVydHkgb3IgRGF0YUZpZWxkXG4gKiBAcmV0dXJucyBUaGUgYmluZGluZyBleHByZXNzaW9uIHJlc29sdmluZyB0byBhIEJvb2xlYW4gYmVpbmcgdHJ1ZSBpZiBpdCdzIG5vbiBlZGl0YWJsZVxuICovXG5leHBvcnQgY29uc3QgaXNOb25FZGl0YWJsZUV4cHJlc3Npb24gPSBmdW5jdGlvbiAob1RhcmdldDogYW55KTogQmluZGluZ1Rvb2xraXRFeHByZXNzaW9uPGJvb2xlYW4+IHtcblx0cmV0dXJuIG9yKGlzUmVhZE9ubHlFeHByZXNzaW9uKG9UYXJnZXQpLCBpc0Rpc2FibGVkRXhwcmVzc2lvbihvVGFyZ2V0KSk7XG59O1xuXG4vKipcbiAqIENyZWF0ZSB0aGUgYmluZGluZyBleHByZXNzaW9uIHRvIGNoZWNrIGlmIHRoZSBwcm9wZXJ0eSBpcyByZWFkIG9ubHkgb3Igbm90LlxuICpcbiAqIEBwYXJhbSBvVGFyZ2V0IFRoZSB0YXJnZXQgcHJvcGVydHkgb3IgRGF0YUZpZWxkXG4gKiBAcmV0dXJucyBUaGUgYmluZGluZyBleHByZXNzaW9uIHJlc29sdmluZyB0byBhIEJvb2xlYW4gYmVpbmcgdHJ1ZSBpZiBpdCdzIHJlYWQgb25seVxuICovXG5leHBvcnQgY29uc3QgaXNSZXF1aXJlZEV4cHJlc3Npb24gPSBmdW5jdGlvbiAob1RhcmdldDogYW55KTogQmluZGluZ1Rvb2xraXRFeHByZXNzaW9uPGJvb2xlYW4+IHtcblx0Y29uc3Qgb0ZpZWxkQ29udHJvbFZhbHVlID0gb1RhcmdldD8uYW5ub3RhdGlvbnM/LkNvbW1vbj8uRmllbGRDb250cm9sPy52YWx1ZU9mKCk7XG5cdGlmICh0eXBlb2Ygb0ZpZWxkQ29udHJvbFZhbHVlID09PSBcIm9iamVjdFwiICYmICEhb0ZpZWxkQ29udHJvbFZhbHVlKSB7XG5cdFx0cmV0dXJuIG9yKGVxdWFsKGdldEV4cHJlc3Npb25Gcm9tQW5ub3RhdGlvbihvRmllbGRDb250cm9sVmFsdWUpLCA3KSwgZXF1YWwoZ2V0RXhwcmVzc2lvbkZyb21Bbm5vdGF0aW9uKG9GaWVsZENvbnRyb2xWYWx1ZSksIFwiN1wiKSk7XG5cdH1cblx0cmV0dXJuIGNvbnN0YW50KG9GaWVsZENvbnRyb2xWYWx1ZSA9PT0gXCJDb21tb24uRmllbGRDb250cm9sVHlwZS9NYW5kYXRvcnlcIik7XG59O1xuIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFBQTtBQUFBOzs7Ozs7Ozs7O0VBR0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0VBQ08sSUFBTUEsb0JBQW9CLEdBQUcsVUFBVUMsT0FBVixFQUEyRDtJQUFBOztJQUM5RixJQUFNQyxrQkFBa0IsR0FBR0QsT0FBSCxhQUFHQSxPQUFILCtDQUFHQSxPQUFPLENBQUVFLFdBQVosa0ZBQUcscUJBQXNCQyxNQUF6QixvRkFBRyxzQkFBOEJDLFlBQWpDLDJEQUFHLHVCQUE0Q0MsT0FBNUMsRUFBM0I7O0lBQ0EsSUFBSSxPQUFPSixrQkFBUCxLQUE4QixRQUE5QixJQUEwQyxDQUFDLENBQUNBLGtCQUFoRCxFQUFvRTtNQUNuRSxPQUFPSyxFQUFFLENBQUNDLEtBQUssQ0FBQ0MsMkJBQTJCLENBQUNQLGtCQUFELENBQTVCLEVBQWtELENBQWxELENBQU4sRUFBNERNLEtBQUssQ0FBQ0MsMkJBQTJCLENBQUNQLGtCQUFELENBQTVCLEVBQWtELEdBQWxELENBQWpFLENBQVQ7SUFDQTs7SUFDRCxPQUFPUSxRQUFRLENBQUNSLGtCQUFrQixLQUFLLGtDQUF4QixDQUFmO0VBQ0EsQ0FOTTtFQVFQO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTs7Ozs7RUFDTyxJQUFNUyxvQkFBb0IsR0FBRyxVQUFVVixPQUFWLEVBQTJEO0lBQUE7O0lBQzlGLElBQU1DLGtCQUFrQixHQUFHRCxPQUFILGFBQUdBLE9BQUgsZ0RBQUdBLE9BQU8sQ0FBRUUsV0FBWixtRkFBRyxzQkFBc0JDLE1BQXpCLG1GQUFHLHNCQUE4QkMsWUFBakMsMERBQUcsc0JBQTRDQyxPQUE1QyxFQUEzQjs7SUFDQSxJQUFJLE9BQU9KLGtCQUFQLEtBQThCLFFBQTlCLElBQTBDLENBQUMsQ0FBQ0Esa0JBQWhELEVBQW9FO01BQ25FLE9BQU9LLEVBQUUsQ0FBQ0MsS0FBSyxDQUFDQywyQkFBMkIsQ0FBQ1Asa0JBQUQsQ0FBNUIsRUFBa0QsQ0FBbEQsQ0FBTixFQUE0RE0sS0FBSyxDQUFDQywyQkFBMkIsQ0FBQ1Asa0JBQUQsQ0FBNUIsRUFBa0QsR0FBbEQsQ0FBakUsQ0FBVDtJQUNBOztJQUNELE9BQU9RLFFBQVEsQ0FBQ1Isa0JBQWtCLEtBQUssc0NBQXhCLENBQWY7RUFDQSxDQU5NO0VBUVA7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBOzs7OztFQUNPLElBQU1VLHVCQUF1QixHQUFHLFVBQVVYLE9BQVYsRUFBMkQ7SUFDakcsT0FBT00sRUFBRSxDQUFDUCxvQkFBb0IsQ0FBQ0MsT0FBRCxDQUFyQixFQUFnQ1Usb0JBQW9CLENBQUNWLE9BQUQsQ0FBcEQsQ0FBVDtFQUNBLENBRk07RUFJUDtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7Ozs7O0VBQ08sSUFBTVksb0JBQW9CLEdBQUcsVUFBVVosT0FBVixFQUEyRDtJQUFBOztJQUM5RixJQUFNQyxrQkFBa0IsR0FBR0QsT0FBSCxhQUFHQSxPQUFILGdEQUFHQSxPQUFPLENBQUVFLFdBQVosbUZBQUcsc0JBQXNCQyxNQUF6QixtRkFBRyxzQkFBOEJDLFlBQWpDLDBEQUFHLHNCQUE0Q0MsT0FBNUMsRUFBM0I7O0lBQ0EsSUFBSSxPQUFPSixrQkFBUCxLQUE4QixRQUE5QixJQUEwQyxDQUFDLENBQUNBLGtCQUFoRCxFQUFvRTtNQUNuRSxPQUFPSyxFQUFFLENBQUNDLEtBQUssQ0FBQ0MsMkJBQTJCLENBQUNQLGtCQUFELENBQTVCLEVBQWtELENBQWxELENBQU4sRUFBNERNLEtBQUssQ0FBQ0MsMkJBQTJCLENBQUNQLGtCQUFELENBQTVCLEVBQWtELEdBQWxELENBQWpFLENBQVQ7SUFDQTs7SUFDRCxPQUFPUSxRQUFRLENBQUNSLGtCQUFrQixLQUFLLG1DQUF4QixDQUFmO0VBQ0EsQ0FOTSJ9

package/src/sap/fe/core/templating/FieldControlHelper.ts

@@ -1,71 +1,54 @@
-import { equal, Expression, ExpressionOrPrimitive, or, annotationExpression } from "sap/fe/core/helpers/BindingExpression";
+import type { BindingToolkitExpression } from "sap/fe/core/helpers/BindingToolkit";
+import { constant, equal, getExpressionFromAnnotation, or } from "sap/fe/core/helpers/BindingToolkit";
 
 /**
- * Create the binding expression to check if the property is non editable or not.
+ * Create the binding expression to check if the property is read only or not.
  *
- * @param {object} oTarget The target property or DataField
- * @returns {ExpressionOrPrimitive<boolean>} The binding expression resolving to a Boolean being true if it's non editable
+ * @param oTarget The target property or DataField
+ * @returns The binding expression resolving to a Boolean being true if it's read only
  */
-export const isNonEditableExpression = function(oTarget: any): Expression<boolean> {
-	return or(isReadOnlyExpression(oTarget), isDisabledExpression(oTarget));
+export const isReadOnlyExpression = function (oTarget: any): BindingToolkitExpression<boolean> {
+	const oFieldControlValue = oTarget?.annotations?.Common?.FieldControl?.valueOf();
+	if (typeof oFieldControlValue === "object" && !!oFieldControlValue) {
+		return or(equal(getExpressionFromAnnotation(oFieldControlValue), 1), equal(getExpressionFromAnnotation(oFieldControlValue), "1"));
+	}
+	return constant(oFieldControlValue === "Common.FieldControlType/ReadOnly");
 };
 
 /**
- * Create the binding expression to check if the property is read only or not.
+ * Create the binding expression to check if the property is disabled or not.
  *
- * @param {object} oTarget The target property or DataField
- * @returns {ExpressionOrPrimitive<boolean>} The binding expression resolving to a Boolean being true if it's read only
+ * @param oTarget The target property or DataField
+ * @returns The binding expression resolving to a Boolean being true if it's disabled
  */
-export const isReadOnlyExpression = function(oTarget: any): ExpressionOrPrimitive<boolean> {
+export const isDisabledExpression = function (oTarget: any): BindingToolkitExpression<boolean> {
 	const oFieldControlValue = oTarget?.annotations?.Common?.FieldControl?.valueOf();
-	if (typeof oFieldControlValue === "object") {
-		return (
-			!!oFieldControlValue &&
-			or(
-				equal(annotationExpression(oFieldControlValue) as ExpressionOrPrimitive<number>, 1),
-				equal(annotationExpression(oFieldControlValue) as ExpressionOrPrimitive<string>, "1")
-			)
-		);
+	if (typeof oFieldControlValue === "object" && !!oFieldControlValue) {
+		return or(equal(getExpressionFromAnnotation(oFieldControlValue), 0), equal(getExpressionFromAnnotation(oFieldControlValue), "0"));
 	}
-	return oFieldControlValue === "Common.FieldControlType/ReadOnly";
+	return constant(oFieldControlValue === "Common.FieldControlType/Inapplicable");
 };
 
 /**
- * Create the binding expression to check if the property is disabled or not.
+ * Create the binding expression to check if the property is non editable or not.
  *
- * @param {object} oTarget The target property or DataField
- * @returns {ExpressionOrPrimitive<boolean>} The binding expression resolving to a Boolean being true if it's disabled
+ * @param oTarget The target property or DataField
+ * @returns The binding expression resolving to a Boolean being true if it's non editable
  */
-export const isDisabledExpression = function(oTarget: any): ExpressionOrPrimitive<boolean> {
-	const oFieldControlValue = oTarget?.annotations?.Common?.FieldControl?.valueOf();
-	if (typeof oFieldControlValue === "object") {
-		return (
-			!!oFieldControlValue &&
-			or(
-				equal(annotationExpression(oFieldControlValue) as ExpressionOrPrimitive<number>, 0),
-				equal(annotationExpression(oFieldControlValue) as ExpressionOrPrimitive<string>, "0")
-			)
-		);
-	}
-	return oFieldControlValue === "Common.FieldControlType/Inapplicable";
+export const isNonEditableExpression = function (oTarget: any): BindingToolkitExpression<boolean> {
+	return or(isReadOnlyExpression(oTarget), isDisabledExpression(oTarget));
 };
 
 /**
  * Create the binding expression to check if the property is read only or not.
  *
- * @param {object} oTarget The target property or DataField
- * @returns {ExpressionOrPrimitive<boolean>} The binding expression resolving to a Boolean being true if it's read only
+ * @param oTarget The target property or DataField
+ * @returns The binding expression resolving to a Boolean being true if it's read only
  */
-export const isRequiredExpression = function(oTarget: any): ExpressionOrPrimitive<boolean> {
+export const isRequiredExpression = function (oTarget: any): BindingToolkitExpression<boolean> {
 	const oFieldControlValue = oTarget?.annotations?.Common?.FieldControl?.valueOf();
-	if (typeof oFieldControlValue === "object") {
-		return (
-			!!oFieldControlValue &&
-			or(
-				equal(annotationExpression(oFieldControlValue) as ExpressionOrPrimitive<number>, 7),
-				equal(annotationExpression(oFieldControlValue) as ExpressionOrPrimitive<string>, "7")
-			)
-		);
+	if (typeof oFieldControlValue === "object" && !!oFieldControlValue) {
+		return or(equal(getExpressionFromAnnotation(oFieldControlValue), 7), equal(getExpressionFromAnnotation(oFieldControlValue), "7"));
 	}
-	return oFieldControlValue === "Common.FieldControlType/Mandatory";
+	return constant(oFieldControlValue === "Common.FieldControlType/Mandatory");
 };