@sap/open.fe 1.99.0 → 1.100.0

package/packages/sap.fe.macros/test/sap/fe/macros/jest/FilterUtils.spec.js

@@ -7,9 +7,20 @@ sap.ui.define(
 		"sap/fe/core/converters/MetaModelConverter",
 		"sap/fe/core/converters/ConverterContext",
 		"sap/fe/test/FeMocks",
-		"sap/ui/model/json/JSONModel"
+		"sap/ui/model/json/JSONModel",
+		"sap/ui/mdc/p13n/StateUtil"
 	],
-	function(FilterUtils, FilterBarConverter, DelegateUtil, CommonUtils, MetaModelConverter, ConverterContext, FeMocks, JSONModel) {
+	function(
+		FilterUtils,
+		FilterBarConverter,
+		DelegateUtil,
+		CommonUtils,
+		MetaModelConverter,
+		ConverterContext,
+		FeMocks,
+		JSONModel,
+		StateUtil
+	) {
 		describe("FilterUtils", () => {
 			afterAll(async function() {
 				jest.restoreAllMocks();
@@ -49,19 +60,21 @@ sap.ui.define(
 				contextLocation: ""
 			});
 			jest.spyOn(ConverterContext, "createConverterContextForMacro").mockReturnValue({});
-			jest.spyOn(FilterBarConverter, "getSelectionFields").mockReturnValue([
-				{
-					key: "SalesOrder",
-					availability: "Default",
-					annotationPath: "/SalesOrderManage/SalesOrder",
-					caseSensitive: true,
-					conditionPath: "SalesOrder",
-					group: "",
-					groupLabel: "",
-					isParameter: false,
-					label: "Sales Order No."
-				}
-			]);
+			jest.spyOn(FilterBarConverter, "getSelectionFields").mockReturnValue({
+				selectionFields: [
+					{
+						key: "SalesOrder",
+						availability: "Default",
+						annotationPath: "/SalesOrderManage/SalesOrder",
+						caseSensitive: true,
+						conditionPath: "SalesOrder",
+						group: "",
+						groupLabel: "",
+						isParameter: false,
+						label: "Sales Order No."
+					}
+				]
+			});
 			it("getConvertedFields", async () => {
 				expect(FilterUtils.getConvertedFilterFields(mockFilterControl)).toEqual([
 					{
@@ -127,6 +140,107 @@ sap.ui.define(
 				test("no filter bar", () => {
 					expect(FilterUtils.setFilterValues()).toBeDefined();
 				});
+				it("with semanticDates", async () => {
+					const oFilterControl = {
+						getEngine: jest.fn().mockReturnValue({
+							applyState: jest.fn().mockReturnValue("")
+						})
+					};
+					const oExpectedClearFilterValue = {
+						"filter": {
+							"sDateProperty": []
+						}
+					};
+					const oExpectedValue = {
+						"filter": {
+							"sDateProperty": [
+								{
+									"isEmpty": null,
+									"operator": "LASTWEEK",
+									"validated": undefined,
+									"values": []
+								}
+							]
+						}
+					};
+					jest.spyOn(StateUtil, "applyExternalState").mockImplementation(() => {
+						return Promise.resolve();
+					});
+					jest.spyOn(StateUtil.applyExternalState, "bind").mockImplementation(() => {
+						return "";
+					});
+					FilterUtils.setFilterValues(oFilterControl, "sDateProperty", "LASTWEEK");
+					expect(StateUtil.applyExternalState).toBeCalledWith(oFilterControl, oExpectedClearFilterValue);
+					expect(StateUtil.applyExternalState.bind).toBeCalledWith(StateUtil, oFilterControl, oExpectedValue);
+				});
+
+				it("with EQ operator", async () => {
+					const oFilterControl = {
+						getEngine: jest.fn().mockReturnValue({
+							applyState: jest.fn().mockReturnValue("")
+						})
+					};
+					const oExpectedClearFilterValue = {
+						"filter": {
+							"sDateProperty": []
+						}
+					};
+					const oExpectedValue = {
+						"filter": {
+							"sDateProperty": [
+								{
+									"isEmpty": null,
+									"operator": "EQ",
+									"validated": "NotValidated",
+									"values": ["2022-02-01"]
+								}
+							]
+						}
+					};
+					jest.spyOn(StateUtil, "applyExternalState").mockImplementation(() => {
+						return Promise.resolve();
+					});
+					jest.spyOn(StateUtil.applyExternalState, "bind").mockImplementation(() => {
+						return "";
+					});
+					FilterUtils.setFilterValues(oFilterControl, "sDateProperty", "EQ", "2022-02-01");
+					expect(StateUtil.applyExternalState).toBeCalledWith(oFilterControl, oExpectedClearFilterValue);
+					expect(StateUtil.applyExternalState.bind).toBeCalledWith(StateUtil, oFilterControl, oExpectedValue);
+				});
+
+				it("with undefined value and operator as '=3'", async () => {
+					const oFilterControl = {
+						getEngine: jest.fn().mockReturnValue({
+							applyState: jest.fn().mockReturnValue("")
+						})
+					};
+					const oExpectedClearFilterValue = {
+						"filter": {
+							"sDateProperty": []
+						}
+					};
+					const oExpectedValue = {
+						"filter": {
+							"sDateProperty": [
+								{
+									"isEmpty": null,
+									"operator": "EQ",
+									"validated": "NotValidated",
+									"values": ["3"]
+								}
+							]
+						}
+					};
+					jest.spyOn(StateUtil, "applyExternalState").mockImplementation(() => {
+						return Promise.resolve();
+					});
+					jest.spyOn(StateUtil.applyExternalState, "bind").mockImplementation(() => {
+						return "";
+					});
+					FilterUtils.setFilterValues(oFilterControl, "sDateProperty", "=3");
+					expect(StateUtil.applyExternalState).toBeCalledWith(oFilterControl, oExpectedClearFilterValue);
+					expect(StateUtil.applyExternalState.bind).toBeCalledWith(StateUtil, oFilterControl, oExpectedValue);
+				});
 			});
 		});
 	}

package/packages/sap.fe.macros/test/sap/fe/macros/jest/MacroAPI.spec.js

@@ -9,26 +9,10 @@ sap.ui.define(["sap/m/Button", "sap/m/Page", "sap/fe/macros/MacroAPI", "sap/fe/c
   var EventHandler = ClassSupport.EventHandler;
   var APIClass = ClassSupport.APIClass;
 
-  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-  function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-  function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
   function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
   function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-  function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
-
-  function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
-  function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-  function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
   function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
 
   describe("Macro API", function () {
@@ -41,40 +25,30 @@ sap.ui.define(["sap/m/Button", "sap/m/Page", "sap/fe/macros/MacroAPI", "sap/fe/c
       var MyDependentMacro = (_dec = APIClass("myMacro", true), _dec(_class = (_class2 = /*#__PURE__*/function (_MacroAPI) {
         _inherits(MyDependentMacro, _MacroAPI);
 
-        var _super = _createSuper(MyDependentMacro);
-
         function MyDependentMacro() {
-          _classCallCheck(this, MyDependentMacro);
-
-          return _super.apply(this, arguments);
+          return _MacroAPI.apply(this, arguments) || this;
         }
 
-        _createClass(MyDependentMacro, [{
-          key: "doSomething",
-          value: function doSomething() {
-            return true;
-          }
-        }]);
+        var _proto = MyDependentMacro.prototype;
+
+        _proto.doSomething = function doSomething() {
+          return true;
+        };
 
         return MyDependentMacro;
       }(MacroAPI), (_applyDecoratedDescriptor(_class2.prototype, "doSomething", [EventHandler], Object.getOwnPropertyDescriptor(_class2.prototype, "doSomething"), _class2.prototype)), _class2)) || _class);
       var MyNormalMacro = (_dec2 = APIClass("myNormalMacro"), _dec2(_class3 = (_class4 = /*#__PURE__*/function (_MacroAPI2) {
         _inherits(MyNormalMacro, _MacroAPI2);
 
-        var _super2 = _createSuper(MyNormalMacro);
-
         function MyNormalMacro() {
-          _classCallCheck(this, MyNormalMacro);
-
-          return _super2.apply(this, arguments);
+          return _MacroAPI2.apply(this, arguments) || this;
         }
 
-        _createClass(MyNormalMacro, [{
-          key: "doSomething",
-          value: function doSomething() {
-            return true;
-          }
-        }]);
+        var _proto2 = MyNormalMacro.prototype;
+
+        _proto2.doSomething = function doSomething() {
+          return true;
+        };
 
         return MyNormalMacro;
       }(MacroAPI), (_applyDecoratedDescriptor(_class4.prototype, "doSomething", [EventHandler], Object.getOwnPropertyDescriptor(_class4.prototype, "doSomething"), _class4.prototype)), _class4)) || _class3);
@@ -102,4 +76,4 @@ sap.ui.define(["sap/m/Button", "sap/m/Page", "sap/fe/macros/MacroAPI", "sap/fe/c
     });
   });
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIk1hY3JvQVBJLnNwZWMudHMiXSwibmFtZXMiOlsiZGVzY3JpYmUiLCJpdCIsIm9QYWdlIiwiUGFnZSIsIm9CdXR0b24iLCJCdXR0b24iLCJhZGRDb250ZW50IiwiTXlEZXBlbmRlbnRNYWNybyIsIkFQSUNsYXNzIiwiTWFjcm9BUEkiLCJFdmVudEhhbmRsZXIiLCJNeU5vcm1hbE1hY3JvIiwibmV3TWFjcm9JbnN0YW5jZSIsIm5ld01hY3JvSW5zdGFuY2UyIiwiZGVwTWFjcm9JbnN0YW5jZSIsImRlcE1hY3JvSW5zdGFuY2UyIiwiZXhwZWN0IiwiZG9Tb21ldGhpbmciLCJ0b0JlIiwibXlFdmVudCIsIk1vY2tFdmVudCIsIm15QXBpIiwiZ2V0QVBJIiwiYWRkRGVwZW5kZW50IiwibXlOb3JtYWxBcGkiLCJjb250ZW50Il0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFJQUEsRUFBQUEsUUFBUSxDQUFDLFdBQUQsRUFBYyxZQUFNO0FBQzNCQyxJQUFBQSxFQUFFLENBQUMsOEJBQUQsRUFBaUMsWUFBTTtBQUFBOztBQUN4QyxVQUFNQyxLQUFLLEdBQUcsSUFBSUMsSUFBSixFQUFkO0FBQ0EsVUFBTUMsT0FBTyxHQUFHLElBQUlDLE1BQUosRUFBaEI7QUFDQUgsTUFBQUEsS0FBSyxDQUFDSSxVQUFOLENBQWlCRixPQUFqQjtBQUh3QyxVQUtsQ0csZ0JBTGtDLFdBSXZDQyxRQUFRLENBQUMsU0FBRCxFQUFZLElBQVosQ0FKK0I7QUFBQTs7QUFBQTs7QUFBQTtBQUFBOztBQUFBO0FBQUE7O0FBQUE7QUFBQTtBQUFBLGlCQU12Qyx1QkFDYztBQUNiLG1CQUFPLElBQVA7QUFDQTtBQVRzQzs7QUFBQTtBQUFBLFFBS1RDLFFBTFMsaUVBTXRDQyxZQU5zQztBQUFBLFVBYWxDQyxhQWJrQyxZQVl2Q0gsUUFBUSxDQUFDLGVBQUQsQ0FaK0I7QUFBQTs7QUFBQTs7QUFBQTtBQUFBOztBQUFBO0FBQUE7O0FBQUE7QUFBQTtBQUFBLGlCQWN2Qyx1QkFDYztBQUNiLG1CQUFPLElBQVA7QUFDQTtBQWpCc0M7O0FBQUE7QUFBQSxRQWFaQyxRQWJZLGlFQWN0Q0MsWUFkc0M7QUFvQnhDLFVBQU1FLGdCQUFnQixHQUFHLElBQUlELGFBQUosRUFBekI7QUFDQSxVQUFNRSxpQkFBaUIsR0FBRyxJQUFJRixhQUFKLEVBQTFCO0FBQ0EsVUFBTUcsZ0JBQWdCLEdBQUcsSUFBSVAsZ0JBQUosRUFBekI7QUFDQSxVQUFNUSxpQkFBaUIsR0FBRyxJQUFJUixnQkFBSixFQUExQjtBQUNBUyxNQUFBQSxNQUFNLENBQUNGLGdCQUFnQixDQUFDRyxXQUFqQixFQUFELENBQU4sQ0FBdUNDLElBQXZDLENBQTRDLElBQTVDO0FBRUEsVUFBTUMsT0FBTyxHQUFJLElBQUlDLFNBQUosQ0FBYyxFQUFkLEVBQWtCaEIsT0FBbEIsQ0FBakI7QUFDQSxVQUFJaUIsS0FBSyxHQUFHZCxnQkFBZ0IsQ0FBQ2UsTUFBakIsQ0FBd0JILE9BQXhCLENBQVosQ0EzQndDLENBNkJ4Qzs7QUFDQUgsTUFBQUEsTUFBTSxDQUFDSyxLQUFELENBQU4sQ0FBY0gsSUFBZCxDQUFtQkgsaUJBQW5CLEVBOUJ3QyxDQStCeEM7O0FBQ0FiLE1BQUFBLEtBQUssQ0FBQ3FCLFlBQU4sQ0FBbUJULGdCQUFuQjtBQUNBTyxNQUFBQSxLQUFLLEdBQUdkLGdCQUFnQixDQUFDZSxNQUFqQixDQUF3QkgsT0FBeEIsQ0FBUjtBQUNBSCxNQUFBQSxNQUFNLENBQUNLLEtBQUQsQ0FBTixDQUFjSCxJQUFkLENBQW1CSixnQkFBbkI7QUFFQSxVQUFJVSxXQUFXLEdBQUdiLGFBQWEsQ0FBQ1csTUFBZCxDQUFxQkgsT0FBckIsQ0FBbEIsQ0FwQ3dDLENBcUN4Qzs7QUFDQUgsTUFBQUEsTUFBTSxDQUFDUSxXQUFELENBQU4sQ0FBb0JOLElBQXBCLENBQXlCTCxpQkFBekIsRUF0Q3dDLENBdUN4Qzs7QUFDQVgsTUFBQUEsS0FBSyxDQUFDSSxVQUFOLENBQWlCTSxnQkFBakI7QUFDQUEsTUFBQUEsZ0JBQWdCLENBQUNhLE9BQWpCLEdBQTJCckIsT0FBM0I7QUFDQW9CLE1BQUFBLFdBQVcsR0FBR2IsYUFBYSxDQUFDVyxNQUFkLENBQXFCSCxPQUFyQixDQUFkO0FBQ0FILE1BQUFBLE1BQU0sQ0FBQ1EsV0FBRCxDQUFOLENBQW9CTixJQUFwQixDQUF5Qk4sZ0JBQXpCO0FBQ0EsS0E1Q0MsQ0FBRjtBQTZDQSxHQTlDTyxDQUFSIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgQnV0dG9uIGZyb20gXCJzYXAvbS9CdXR0b25cIjtcbmltcG9ydCBQYWdlIGZyb20gXCJzYXAvbS9QYWdlXCI7XG5pbXBvcnQgTWFjcm9BUEkgZnJvbSBcInNhcC9mZS9tYWNyb3MvTWFjcm9BUElcIjtcbmltcG9ydCB7IEFQSUNsYXNzLCBFdmVudEhhbmRsZXIgfSBmcm9tIFwic2FwL2ZlL2NvcmUvaGVscGVycy9DbGFzc1N1cHBvcnRcIjtcbmltcG9ydCB7IE1vY2tFdmVudCB9IGZyb20gXCJzYXAvZmUvdGVzdC9VSTVNb2NrSGVscGVyXCI7XG5cbmRlc2NyaWJlKFwiTWFjcm8gQVBJXCIsICgpID0+IHtcblx0aXQoXCJjYW4gaG9vayBpdHNlbGYgYW5kIGJlIGZvdW5kXCIsICgpID0+IHtcblx0XHRjb25zdCBvUGFnZSA9IG5ldyBQYWdlKCk7XG5cdFx0Y29uc3Qgb0J1dHRvbiA9IG5ldyBCdXR0b24oKTtcblx0XHRvUGFnZS5hZGRDb250ZW50KG9CdXR0b24pO1xuXHRcdEBBUElDbGFzcyhcIm15TWFjcm9cIiwgdHJ1ZSlcblx0XHRjbGFzcyBNeURlcGVuZGVudE1hY3JvIGV4dGVuZHMgTWFjcm9BUEkge1xuXHRcdFx0QEV2ZW50SGFuZGxlclxuXHRcdFx0ZG9Tb21ldGhpbmcoKSB7XG5cdFx0XHRcdHJldHVybiB0cnVlO1xuXHRcdFx0fVxuXHRcdH1cblxuXHRcdEBBUElDbGFzcyhcIm15Tm9ybWFsTWFjcm9cIilcblx0XHRjbGFzcyBNeU5vcm1hbE1hY3JvIGV4dGVuZHMgTWFjcm9BUEkge1xuXHRcdFx0QEV2ZW50SGFuZGxlclxuXHRcdFx0ZG9Tb21ldGhpbmcoKSB7XG5cdFx0XHRcdHJldHVybiB0cnVlO1xuXHRcdFx0fVxuXHRcdH1cblxuXHRcdGNvbnN0IG5ld01hY3JvSW5zdGFuY2UgPSBuZXcgTXlOb3JtYWxNYWNybygpO1xuXHRcdGNvbnN0IG5ld01hY3JvSW5zdGFuY2UyID0gbmV3IE15Tm9ybWFsTWFjcm8oKTtcblx0XHRjb25zdCBkZXBNYWNyb0luc3RhbmNlID0gbmV3IE15RGVwZW5kZW50TWFjcm8oKTtcblx0XHRjb25zdCBkZXBNYWNyb0luc3RhbmNlMiA9IG5ldyBNeURlcGVuZGVudE1hY3JvKCk7XG5cdFx0ZXhwZWN0KGRlcE1hY3JvSW5zdGFuY2UuZG9Tb21ldGhpbmcoKSkudG9CZSh0cnVlKTtcblxuXHRcdGNvbnN0IG15RXZlbnQgPSAobmV3IE1vY2tFdmVudCh7fSwgb0J1dHRvbiBhcyBhbnkpIGFzIGFueSkgYXMgVUk1RXZlbnQ7XG5cdFx0bGV0IG15QXBpID0gTXlEZXBlbmRlbnRNYWNyby5nZXRBUEkobXlFdmVudCk7XG5cblx0XHQvLyBCeSBkZWZhdWx0IHdlIGZpbmQgdGhlIGxhc3QgY3JlYXRlZCBvbmUgd2hpY2ggaXMgbm90IGNvcnJlY3QgaW4gb3VyIGNhc2Vcblx0XHRleHBlY3QobXlBcGkpLnRvQmUoZGVwTWFjcm9JbnN0YW5jZTIpO1xuXHRcdC8vIElmIHdlIGFkZCB0aGUgQVBJIGFzIGRlcGVuZGVudCBpdCB3aWxsIGJlIGZvdW5kICFcblx0XHRvUGFnZS5hZGREZXBlbmRlbnQoZGVwTWFjcm9JbnN0YW5jZSk7XG5cdFx0bXlBcGkgPSBNeURlcGVuZGVudE1hY3JvLmdldEFQSShteUV2ZW50KTtcblx0XHRleHBlY3QobXlBcGkpLnRvQmUoZGVwTWFjcm9JbnN0YW5jZSk7XG5cblx0XHRsZXQgbXlOb3JtYWxBcGkgPSBNeU5vcm1hbE1hY3JvLmdldEFQSShteUV2ZW50KTtcblx0XHQvLyBCeSBkZWZhdWx0IHdlIGZpbmQgdGhlIGxhc3QgY3JlYXRlZCBvbmUgd2hpY2ggaXMgbm90IGNvcnJlY3QgaW4gb3VyIGNhc2Vcblx0XHRleHBlY3QobXlOb3JtYWxBcGkpLnRvQmUobmV3TWFjcm9JbnN0YW5jZTIpO1xuXHRcdC8vIElmIHdlIGFkZCB0aGUgQVBJIGFzIGRlcGVuZGVudCBpdCB3aWxsIGJlIGZvdW5kICFcblx0XHRvUGFnZS5hZGRDb250ZW50KG5ld01hY3JvSW5zdGFuY2UpO1xuXHRcdG5ld01hY3JvSW5zdGFuY2UuY29udGVudCA9IG9CdXR0b247XG5cdFx0bXlOb3JtYWxBcGkgPSBNeU5vcm1hbE1hY3JvLmdldEFQSShteUV2ZW50KTtcblx0XHRleHBlY3QobXlOb3JtYWxBcGkpLnRvQmUobmV3TWFjcm9JbnN0YW5jZSk7XG5cdH0pO1xufSk7XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIk1hY3JvQVBJLnNwZWMudHMiXSwibmFtZXMiOlsiZGVzY3JpYmUiLCJpdCIsIm9QYWdlIiwiUGFnZSIsIm9CdXR0b24iLCJCdXR0b24iLCJhZGRDb250ZW50IiwiTXlEZXBlbmRlbnRNYWNybyIsIkFQSUNsYXNzIiwiZG9Tb21ldGhpbmciLCJNYWNyb0FQSSIsIkV2ZW50SGFuZGxlciIsIk15Tm9ybWFsTWFjcm8iLCJuZXdNYWNyb0luc3RhbmNlIiwibmV3TWFjcm9JbnN0YW5jZTIiLCJkZXBNYWNyb0luc3RhbmNlIiwiZGVwTWFjcm9JbnN0YW5jZTIiLCJleHBlY3QiLCJ0b0JlIiwibXlFdmVudCIsIk1vY2tFdmVudCIsIm15QXBpIiwiZ2V0QVBJIiwiYWRkRGVwZW5kZW50IiwibXlOb3JtYWxBcGkiLCJjb250ZW50Il0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7Ozs7Ozs7Ozs7OztBQUlBQSxFQUFBQSxRQUFRLENBQUMsV0FBRCxFQUFjLFlBQU07QUFDM0JDLElBQUFBLEVBQUUsQ0FBQyw4QkFBRCxFQUFpQyxZQUFNO0FBQUE7O0FBQ3hDLFVBQU1DLEtBQUssR0FBRyxJQUFJQyxJQUFKLEVBQWQ7QUFDQSxVQUFNQyxPQUFPLEdBQUcsSUFBSUMsTUFBSixFQUFoQjtBQUNBSCxNQUFBQSxLQUFLLENBQUNJLFVBQU4sQ0FBaUJGLE9BQWpCO0FBSHdDLFVBS2xDRyxnQkFMa0MsV0FJdkNDLFFBQVEsQ0FBQyxTQUFELEVBQVksSUFBWixDQUorQjtBQUFBOztBQUFBO0FBQUE7QUFBQTs7QUFBQTs7QUFBQSxlQU92Q0MsV0FQdUMsR0FNdkMsdUJBQ2M7QUFDYixpQkFBTyxJQUFQO0FBQ0EsU0FUc0M7O0FBQUE7QUFBQSxRQUtUQyxRQUxTLGlFQU10Q0MsWUFOc0M7QUFBQSxVQWFsQ0MsYUFia0MsWUFZdkNKLFFBQVEsQ0FBQyxlQUFELENBWitCO0FBQUE7O0FBQUE7QUFBQTtBQUFBOztBQUFBOztBQUFBLGdCQWV2Q0MsV0FmdUMsR0FjdkMsdUJBQ2M7QUFDYixpQkFBTyxJQUFQO0FBQ0EsU0FqQnNDOztBQUFBO0FBQUEsUUFhWkMsUUFiWSxpRUFjdENDLFlBZHNDO0FBb0J4QyxVQUFNRSxnQkFBZ0IsR0FBRyxJQUFJRCxhQUFKLEVBQXpCO0FBQ0EsVUFBTUUsaUJBQWlCLEdBQUcsSUFBSUYsYUFBSixFQUExQjtBQUNBLFVBQU1HLGdCQUFnQixHQUFHLElBQUlSLGdCQUFKLEVBQXpCO0FBQ0EsVUFBTVMsaUJBQWlCLEdBQUcsSUFBSVQsZ0JBQUosRUFBMUI7QUFDQVUsTUFBQUEsTUFBTSxDQUFDRixnQkFBZ0IsQ0FBQ04sV0FBakIsRUFBRCxDQUFOLENBQXVDUyxJQUF2QyxDQUE0QyxJQUE1QztBQUVBLFVBQU1DLE9BQU8sR0FBSSxJQUFJQyxTQUFKLENBQWMsRUFBZCxFQUFrQmhCLE9BQWxCLENBQWpCO0FBQ0EsVUFBSWlCLEtBQUssR0FBR2QsZ0JBQWdCLENBQUNlLE1BQWpCLENBQXdCSCxPQUF4QixDQUFaLENBM0J3QyxDQTZCeEM7O0FBQ0FGLE1BQUFBLE1BQU0sQ0FBQ0ksS0FBRCxDQUFOLENBQWNILElBQWQsQ0FBbUJGLGlCQUFuQixFQTlCd0MsQ0ErQnhDOztBQUNBZCxNQUFBQSxLQUFLLENBQUNxQixZQUFOLENBQW1CUixnQkFBbkI7QUFDQU0sTUFBQUEsS0FBSyxHQUFHZCxnQkFBZ0IsQ0FBQ2UsTUFBakIsQ0FBd0JILE9BQXhCLENBQVI7QUFDQUYsTUFBQUEsTUFBTSxDQUFDSSxLQUFELENBQU4sQ0FBY0gsSUFBZCxDQUFtQkgsZ0JBQW5CO0FBRUEsVUFBSVMsV0FBVyxHQUFHWixhQUFhLENBQUNVLE1BQWQsQ0FBcUJILE9BQXJCLENBQWxCLENBcEN3QyxDQXFDeEM7O0FBQ0FGLE1BQUFBLE1BQU0sQ0FBQ08sV0FBRCxDQUFOLENBQW9CTixJQUFwQixDQUF5QkosaUJBQXpCLEVBdEN3QyxDQXVDeEM7O0FBQ0FaLE1BQUFBLEtBQUssQ0FBQ0ksVUFBTixDQUFpQk8sZ0JBQWpCO0FBQ0FBLE1BQUFBLGdCQUFnQixDQUFDWSxPQUFqQixHQUEyQnJCLE9BQTNCO0FBQ0FvQixNQUFBQSxXQUFXLEdBQUdaLGFBQWEsQ0FBQ1UsTUFBZCxDQUFxQkgsT0FBckIsQ0FBZDtBQUNBRixNQUFBQSxNQUFNLENBQUNPLFdBQUQsQ0FBTixDQUFvQk4sSUFBcEIsQ0FBeUJMLGdCQUF6QjtBQUNBLEtBNUNDLENBQUY7QUE2Q0EsR0E5Q08sQ0FBUiIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IEJ1dHRvbiBmcm9tIFwic2FwL20vQnV0dG9uXCI7XG5pbXBvcnQgUGFnZSBmcm9tIFwic2FwL20vUGFnZVwiO1xuaW1wb3J0IE1hY3JvQVBJIGZyb20gXCJzYXAvZmUvbWFjcm9zL01hY3JvQVBJXCI7XG5pbXBvcnQgeyBBUElDbGFzcywgRXZlbnRIYW5kbGVyIH0gZnJvbSBcInNhcC9mZS9jb3JlL2hlbHBlcnMvQ2xhc3NTdXBwb3J0XCI7XG5pbXBvcnQgeyBNb2NrRXZlbnQgfSBmcm9tIFwic2FwL2ZlL3Rlc3QvVUk1TW9ja0hlbHBlclwiO1xuaW1wb3J0IEV2ZW50IGZyb20gXCJzYXAvdWkvYmFzZS9FdmVudFwiO1xuZGVzY3JpYmUoXCJNYWNybyBBUElcIiwgKCkgPT4ge1xuXHRpdChcImNhbiBob29rIGl0c2VsZiBhbmQgYmUgZm91bmRcIiwgKCkgPT4ge1xuXHRcdGNvbnN0IG9QYWdlID0gbmV3IFBhZ2UoKTtcblx0XHRjb25zdCBvQnV0dG9uID0gbmV3IEJ1dHRvbigpO1xuXHRcdG9QYWdlLmFkZENvbnRlbnQob0J1dHRvbik7XG5cdFx0QEFQSUNsYXNzKFwibXlNYWNyb1wiLCB0cnVlKVxuXHRcdGNsYXNzIE15RGVwZW5kZW50TWFjcm8gZXh0ZW5kcyBNYWNyb0FQSSB7XG5cdFx0XHRARXZlbnRIYW5kbGVyXG5cdFx0XHRkb1NvbWV0aGluZygpIHtcblx0XHRcdFx0cmV0dXJuIHRydWU7XG5cdFx0XHR9XG5cdFx0fVxuXG5cdFx0QEFQSUNsYXNzKFwibXlOb3JtYWxNYWNyb1wiKVxuXHRcdGNsYXNzIE15Tm9ybWFsTWFjcm8gZXh0ZW5kcyBNYWNyb0FQSSB7XG5cdFx0XHRARXZlbnRIYW5kbGVyXG5cdFx0XHRkb1NvbWV0aGluZygpIHtcblx0XHRcdFx0cmV0dXJuIHRydWU7XG5cdFx0XHR9XG5cdFx0fVxuXG5cdFx0Y29uc3QgbmV3TWFjcm9JbnN0YW5jZSA9IG5ldyBNeU5vcm1hbE1hY3JvKCk7XG5cdFx0Y29uc3QgbmV3TWFjcm9JbnN0YW5jZTIgPSBuZXcgTXlOb3JtYWxNYWNybygpO1xuXHRcdGNvbnN0IGRlcE1hY3JvSW5zdGFuY2UgPSBuZXcgTXlEZXBlbmRlbnRNYWNybygpO1xuXHRcdGNvbnN0IGRlcE1hY3JvSW5zdGFuY2UyID0gbmV3IE15RGVwZW5kZW50TWFjcm8oKTtcblx0XHRleHBlY3QoZGVwTWFjcm9JbnN0YW5jZS5kb1NvbWV0aGluZygpKS50b0JlKHRydWUpO1xuXG5cdFx0Y29uc3QgbXlFdmVudCA9IChuZXcgTW9ja0V2ZW50KHt9LCBvQnV0dG9uIGFzIGFueSkgYXMgYW55KSBhcyBFdmVudDtcblx0XHRsZXQgbXlBcGkgPSBNeURlcGVuZGVudE1hY3JvLmdldEFQSShteUV2ZW50KTtcblxuXHRcdC8vIEJ5IGRlZmF1bHQgd2UgZmluZCB0aGUgbGFzdCBjcmVhdGVkIG9uZSB3aGljaCBpcyBub3QgY29ycmVjdCBpbiBvdXIgY2FzZVxuXHRcdGV4cGVjdChteUFwaSkudG9CZShkZXBNYWNyb0luc3RhbmNlMik7XG5cdFx0Ly8gSWYgd2UgYWRkIHRoZSBBUEkgYXMgZGVwZW5kZW50IGl0IHdpbGwgYmUgZm91bmQgIVxuXHRcdG9QYWdlLmFkZERlcGVuZGVudChkZXBNYWNyb0luc3RhbmNlKTtcblx0XHRteUFwaSA9IE15RGVwZW5kZW50TWFjcm8uZ2V0QVBJKG15RXZlbnQpO1xuXHRcdGV4cGVjdChteUFwaSkudG9CZShkZXBNYWNyb0luc3RhbmNlKTtcblxuXHRcdGxldCBteU5vcm1hbEFwaSA9IE15Tm9ybWFsTWFjcm8uZ2V0QVBJKG15RXZlbnQpO1xuXHRcdC8vIEJ5IGRlZmF1bHQgd2UgZmluZCB0aGUgbGFzdCBjcmVhdGVkIG9uZSB3aGljaCBpcyBub3QgY29ycmVjdCBpbiBvdXIgY2FzZVxuXHRcdGV4cGVjdChteU5vcm1hbEFwaSkudG9CZShuZXdNYWNyb0luc3RhbmNlMik7XG5cdFx0Ly8gSWYgd2UgYWRkIHRoZSBBUEkgYXMgZGVwZW5kZW50IGl0IHdpbGwgYmUgZm91bmQgIVxuXHRcdG9QYWdlLmFkZENvbnRlbnQobmV3TWFjcm9JbnN0YW5jZSk7XG5cdFx0bmV3TWFjcm9JbnN0YW5jZS5jb250ZW50ID0gb0J1dHRvbjtcblx0XHRteU5vcm1hbEFwaSA9IE15Tm9ybWFsTWFjcm8uZ2V0QVBJKG15RXZlbnQpO1xuXHRcdGV4cGVjdChteU5vcm1hbEFwaSkudG9CZShuZXdNYWNyb0luc3RhbmNlKTtcblx0fSk7XG59KTtcbiJdfQ==

package/packages/sap.fe.macros/test/sap/fe/macros/jest/MacroAPI.spec.ts

@@ -3,7 +3,7 @@ import Page from "sap/m/Page";
 import MacroAPI from "sap/fe/macros/MacroAPI";
 import { APIClass, EventHandler } from "sap/fe/core/helpers/ClassSupport";
 import { MockEvent } from "sap/fe/test/UI5MockHelper";
-
+import Event from "sap/ui/base/Event";
 describe("Macro API", () => {
 	it("can hook itself and be found", () => {
 		const oPage = new Page();
@@ -31,7 +31,7 @@ describe("Macro API", () => {
 		const depMacroInstance2 = new MyDependentMacro();
 		expect(depMacroInstance.doSomething()).toBe(true);
 
-		const myEvent = (new MockEvent({}, oButton as any) as any) as UI5Event;
+		const myEvent = (new MockEvent({}, oButton as any) as any) as Event;
 		let myApi = MyDependentMacro.getAPI(myEvent);
 
 		// By default we find the last created one which is not correct in our case

package/packages/sap.fe.macros/test/sap/fe/macros/jest/RetrieveTextFromValueList.spec.js

@@ -0,0 +1,119 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+ *      (c) Copyright 2009-2021 SAP SE. All rights reserved
+ */
+sap.ui.define(["sap/fe/macros/field/FieldRuntime", "sap/fe/macros/CommonHelper", "sap/fe/test/UI5MockHelper"], function (FieldRuntime, CommonHelper, UI5MockHelper) {
+  "use strict";
+
+  var MockContext = UI5MockHelper.MockContext;
+  var MockModel = UI5MockHelper.MockModel;
+  var MockMetaModel = UI5MockHelper.MockMetaModel;
+  var MockListBinding = UI5MockHelper.MockListBinding;
+
+  describe("FieldRuntime", function () {
+    describe("retrieveTextFromValueList", function () {
+      var isA = jest.fn();
+      var mockModel = new MockModel();
+      var mockMetadata = {
+        "myProperty": {
+          $kind: "Property"
+        },
+        "myProperty@sapui.name": "myProperty"
+      };
+      var mockMetaModel = new MockMetaModel(mockMetadata);
+      var mockListBinding = new MockListBinding();
+      var mockListContext = new MockContext();
+      var mockMetadataWithText = {
+        "myProperty": {
+          $kind: "Property"
+        },
+        "myProperty@sapui.name": "myProperty",
+        "/myCollection/myValueHelpProperty@com.sap.vocabularies.Common.v1.Text": {
+          "$Path": "myValueHelpPropertyText"
+        }
+      };
+      var mockMetaModelWithText = new MockMetaModel(mockMetadataWithText);
+      var mValueListInfo = {
+        "": {
+          "$model": mockModel,
+          "CollectionPath": "myCollection",
+          "Parameters": [{
+            "$Type": "com.sap.vocabularies.Common.v1.ValueListParameterInOut",
+            "LocalDataProperty": {
+              "$PropertyPath": "myProperty"
+            },
+            "ValueListProperty": "myValueHelpProperty"
+          }, {
+            "$Type": "com.sap.vocabularies.Common.v1.ValueListParameterDisplayOnly",
+            "ValueListProperty": "myValueHelpPropertyText"
+          }]
+        }
+      };
+      var sPropertyValue = "myValue";
+      var sPropertyFullPath = "myProperty";
+      var sDisplayFormat = "ValueDescription";
+      beforeAll(function () {
+        isA.mockReturnValue(true);
+        mockMetaModel.requestValueListInfo = jest.fn();
+        mockModel.setMetaModel(mockMetaModel);
+        CommonHelper.setMetaModel(mockMetaModel);
+      });
+      test("Field value is still not resolved", {
+        "references": [{
+          "type": "JIRA",
+          "ID": "FIORITECHP1-21176"
+        }]
+      }, function () {
+        isA.mockReturnValueOnce(false);
+        var returnValue = FieldRuntime.retrieveTextFromValueList("", sPropertyFullPath, sDisplayFormat);
+        expect(returnValue).toBe("");
+      });
+      test("Inconsistent value help annotation", function () {
+        var returnValue = FieldRuntime.retrieveTextFromValueList("", sPropertyFullPath, sDisplayFormat);
+        expect(returnValue).toBe("");
+      });
+      test("Consistent value help but without text annotation", function () {
+        mockMetaModel.requestValueListInfo.mockResolvedValueOnce(mValueListInfo);
+        var returnValuePromise = FieldRuntime.retrieveTextFromValueList(sPropertyValue, sPropertyFullPath, sDisplayFormat);
+        expect(returnValuePromise).resolves.toBe(undefined);
+      });
+      test("Consistent value help and text annotation with display format 'DescriptionValue' ", function () {
+        mockMetaModelWithText.requestValueListInfo = jest.fn();
+        CommonHelper.getMetaModel(undefined, undefined).requestValueListInfo.mockResolvedValueOnce(mValueListInfo);
+        mockModel.setMetaModel(mockMetaModelWithText);
+        mockModel.bindList.mockReturnValueOnce(mockListBinding);
+        mockListBinding.requestContexts.mockResolvedValueOnce([mockListContext]);
+        mockListContext.getObject.mockReturnValueOnce({
+          "myValueHelpPropertyText": "myDescription"
+        });
+        var returnValuePromise = FieldRuntime.retrieveTextFromValueList(sPropertyValue, sPropertyFullPath, "DescriptionValue");
+        return expect(returnValuePromise).resolves.toBe("myDescription (myValue)");
+      });
+      test("Consistent value help and text annotation with display format 'ValueDescription ", function () {
+        mockMetaModelWithText.requestValueListInfo = jest.fn();
+        CommonHelper.getMetaModel(undefined, undefined).requestValueListInfo.mockResolvedValueOnce(mValueListInfo);
+        mockModel.setMetaModel(mockMetaModelWithText);
+        mockModel.bindList.mockReturnValueOnce(mockListBinding);
+        mockListBinding.requestContexts.mockResolvedValueOnce([mockListContext]);
+        mockListContext.getObject.mockReturnValueOnce({
+          "myValueHelpPropertyText": "myDescription"
+        });
+        var returnValuePromise = FieldRuntime.retrieveTextFromValueList(sPropertyValue, sPropertyFullPath, "ValueDescription");
+        return expect(returnValuePromise).resolves.toBe("myValue (myDescription)");
+      });
+      test("Consistent value help and text annotation with display format 'Description ", function () {
+        mockMetaModelWithText.requestValueListInfo = jest.fn();
+        CommonHelper.getMetaModel(undefined, undefined).requestValueListInfo.mockResolvedValueOnce(mValueListInfo);
+        mockModel.setMetaModel(mockMetaModelWithText);
+        mockModel.bindList.mockReturnValueOnce(mockListBinding);
+        mockListBinding.requestContexts.mockResolvedValueOnce([mockListContext]);
+        mockListContext.getObject.mockReturnValueOnce({
+          "myValueHelpPropertyText": "myDescription"
+        });
+        var returnValuePromise = FieldRuntime.retrieveTextFromValueList(sPropertyValue, sPropertyFullPath, "Description");
+        return expect(returnValuePromise).resolves.toBe("myDescription");
+      });
+    });
+  });
+}, false);
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["RetrieveTextFromValueList.spec.ts"],"names":["describe","isA","jest","fn","mockModel","MockModel","mockMetadata","$kind","mockMetaModel","MockMetaModel","mockListBinding","MockListBinding","mockListContext","MockContext","mockMetadataWithText","mockMetaModelWithText","mValueListInfo","sPropertyValue","sPropertyFullPath","sDisplayFormat","beforeAll","mockReturnValue","requestValueListInfo","setMetaModel","CommonHelper","test","mockReturnValueOnce","returnValue","FieldRuntime","retrieveTextFromValueList","expect","toBe","mockResolvedValueOnce","returnValuePromise","resolves","undefined","getMetaModel","bindList","requestContexts","getObject"],"mappings":"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","sourceRoot":".","sourcesContent":["import { FieldRuntime } from \"sap/fe/macros/field\";\nimport { CommonHelper } from \"sap/fe/macros\";\nimport { MockListBinding, MockMetaModel, MockModel, MockContext } from \"sap/fe/test/UI5MockHelper\";\nimport ODataListBinding from \"sap/ui/model/odata/v4/ODataListBinding\";\n\ndescribe(\"FieldRuntime\", function() {\n\tdescribe(\"retrieveTextFromValueList\", function() {\n\t\tconst isA = jest.fn();\n\t\tconst mockModel = new MockModel();\n\t\tconst mockMetadata = {\n\t\t\t\"myProperty\": { $kind: \"Property\" },\n\t\t\t\"myProperty@sapui.name\": \"myProperty\"\n\t\t};\n\t\tconst mockMetaModel = new MockMetaModel(mockMetadata);\n\t\tconst mockListBinding = new MockListBinding();\n\t\tconst mockListContext = new MockContext();\n\t\tconst mockMetadataWithText = {\n\t\t\t\"myProperty\": { $kind: \"Property\" },\n\t\t\t\"myProperty@sapui.name\": \"myProperty\",\n\t\t\t\"/myCollection/myValueHelpProperty@com.sap.vocabularies.Common.v1.Text\": { \"$Path\": \"myValueHelpPropertyText\" }\n\t\t};\n\t\tconst mockMetaModelWithText = new MockMetaModel(mockMetadataWithText);\n\t\tconst mValueListInfo = {\n\t\t\t\"\": {\n\t\t\t\t\"$model\": mockModel,\n\t\t\t\t\"CollectionPath\": \"myCollection\",\n\t\t\t\t\"Parameters\": [\n\t\t\t\t\t{\n\t\t\t\t\t\t\"$Type\": \"com.sap.vocabularies.Common.v1.ValueListParameterInOut\",\n\t\t\t\t\t\t\"LocalDataProperty\": { \"$PropertyPath\": \"myProperty\" },\n\t\t\t\t\t\t\"ValueListProperty\": \"myValueHelpProperty\"\n\t\t\t\t\t},\n\t\t\t\t\t{\n\t\t\t\t\t\t\"$Type\": \"com.sap.vocabularies.Common.v1.ValueListParameterDisplayOnly\",\n\t\t\t\t\t\t\"ValueListProperty\": \"myValueHelpPropertyText\"\n\t\t\t\t\t}\n\t\t\t\t]\n\t\t\t}\n\t\t};\n\n\t\tconst sPropertyValue = \"myValue\";\n\t\tconst sPropertyFullPath = \"myProperty\";\n\t\tconst sDisplayFormat = \"ValueDescription\";\n\n\t\tbeforeAll(() => {\n\t\t\tisA.mockReturnValue(true);\n\t\t\tmockMetaModel.requestValueListInfo = jest.fn();\n\t\t\tmockModel.setMetaModel(mockMetaModel);\n\t\t\tCommonHelper.setMetaModel(mockMetaModel);\n\t\t});\n\n\t\ttest(\n\t\t\t\"Field value is still not resolved\",\n\t\t\t{\n\t\t\t\t\"references\": [\n\t\t\t\t\t{\n\t\t\t\t\t\t\"type\": \"JIRA\",\n\t\t\t\t\t\t\"ID\": \"FIORITECHP1-21176\"\n\t\t\t\t\t}\n\t\t\t\t]\n\t\t\t},\n\t\t\tfunction() {\n\t\t\t\tisA.mockReturnValueOnce(false);\n\t\t\t\tconst returnValue = FieldRuntime.retrieveTextFromValueList(\"\", sPropertyFullPath, sDisplayFormat);\n\t\t\t\texpect(returnValue).toBe(\"\");\n\t\t\t}\n\t\t);\n\n\t\ttest(\"Inconsistent value help annotation\", () => {\n\t\t\tconst returnValue = FieldRuntime.retrieveTextFromValueList(\"\", sPropertyFullPath, sDisplayFormat);\n\t\t\texpect(returnValue).toBe(\"\");\n\t\t});\n\n\t\ttest(\"Consistent value help but without text annotation\", function() {\n\t\t\tmockMetaModel.requestValueListInfo.mockResolvedValueOnce(mValueListInfo);\n\t\t\tconst returnValuePromise = FieldRuntime.retrieveTextFromValueList(sPropertyValue, sPropertyFullPath, sDisplayFormat);\n\t\t\texpect(returnValuePromise).resolves.toBe(undefined);\n\t\t});\n\n\t\ttest(\"Consistent value help and text annotation with display format 'DescriptionValue' \", function() {\n\t\t\tmockMetaModelWithText.requestValueListInfo = jest.fn();\n\t\t\tCommonHelper.getMetaModel(undefined, undefined).requestValueListInfo.mockResolvedValueOnce(mValueListInfo);\n\t\t\tmockModel.setMetaModel(mockMetaModelWithText);\n\t\t\tmockModel.bindList.mockReturnValueOnce(mockListBinding as any);\n\t\t\tmockListBinding.requestContexts.mockResolvedValueOnce([mockListContext as any]);\n\t\t\tmockListContext.getObject.mockReturnValueOnce({ \"myValueHelpPropertyText\": \"myDescription\" });\n\t\t\tconst returnValuePromise = FieldRuntime.retrieveTextFromValueList(sPropertyValue, sPropertyFullPath, \"DescriptionValue\");\n\t\t\treturn expect(returnValuePromise).resolves.toBe(\"myDescription (myValue)\");\n\t\t});\n\n\t\ttest(\"Consistent value help and text annotation with display format 'ValueDescription \", function() {\n\t\t\tmockMetaModelWithText.requestValueListInfo = jest.fn();\n\t\t\tCommonHelper.getMetaModel(undefined, undefined).requestValueListInfo.mockResolvedValueOnce(mValueListInfo);\n\t\t\tmockModel.setMetaModel(mockMetaModelWithText);\n\t\t\tmockModel.bindList.mockReturnValueOnce(mockListBinding as any);\n\t\t\tmockListBinding.requestContexts.mockResolvedValueOnce([mockListContext as any]);\n\t\t\tmockListContext.getObject.mockReturnValueOnce({ \"myValueHelpPropertyText\": \"myDescription\" });\n\t\t\tconst returnValuePromise = FieldRuntime.retrieveTextFromValueList(sPropertyValue, sPropertyFullPath, \"ValueDescription\");\n\t\t\treturn expect(returnValuePromise).resolves.toBe(\"myValue (myDescription)\");\n\t\t});\n\n\t\ttest(\"Consistent value help and text annotation with display format 'Description \", function() {\n\t\t\tmockMetaModelWithText.requestValueListInfo = jest.fn();\n\t\t\tCommonHelper.getMetaModel(undefined, undefined).requestValueListInfo.mockResolvedValueOnce(mValueListInfo);\n\t\t\tmockModel.setMetaModel(mockMetaModelWithText);\n\t\t\tmockModel.bindList.mockReturnValueOnce(mockListBinding as any);\n\t\t\tmockListBinding.requestContexts.mockResolvedValueOnce([mockListContext as any]);\n\t\t\tmockListContext.getObject.mockReturnValueOnce({ \"myValueHelpPropertyText\": \"myDescription\" });\n\t\t\tconst returnValuePromise = FieldRuntime.retrieveTextFromValueList(sPropertyValue, sPropertyFullPath, \"Description\");\n\t\t\treturn expect(returnValuePromise).resolves.toBe(\"myDescription\");\n\t\t});\n\t});\n});\n"]}

package/packages/sap.fe.macros/test/sap/fe/macros/jest/RetrieveTextFromValueList.spec.ts

@@ -0,0 +1,113 @@
+import { FieldRuntime } from "sap/fe/macros/field";
+import { CommonHelper } from "sap/fe/macros";
+import { MockListBinding, MockMetaModel, MockModel, MockContext } from "sap/fe/test/UI5MockHelper";
+import ODataListBinding from "sap/ui/model/odata/v4/ODataListBinding";
+
+describe("FieldRuntime", function() {
+	describe("retrieveTextFromValueList", function() {
+		const isA = jest.fn();
+		const mockModel = new MockModel();
+		const mockMetadata = {
+			"myProperty": { $kind: "Property" },
+			"myProperty@sapui.name": "myProperty"
+		};
+		const mockMetaModel = new MockMetaModel(mockMetadata);
+		const mockListBinding = new MockListBinding();
+		const mockListContext = new MockContext();
+		const mockMetadataWithText = {
+			"myProperty": { $kind: "Property" },
+			"myProperty@sapui.name": "myProperty",
+			"/myCollection/myValueHelpProperty@com.sap.vocabularies.Common.v1.Text": { "$Path": "myValueHelpPropertyText" }
+		};
+		const mockMetaModelWithText = new MockMetaModel(mockMetadataWithText);
+		const mValueListInfo = {
+			"": {
+				"$model": mockModel,
+				"CollectionPath": "myCollection",
+				"Parameters": [
+					{
+						"$Type": "com.sap.vocabularies.Common.v1.ValueListParameterInOut",
+						"LocalDataProperty": { "$PropertyPath": "myProperty" },
+						"ValueListProperty": "myValueHelpProperty"
+					},
+					{
+						"$Type": "com.sap.vocabularies.Common.v1.ValueListParameterDisplayOnly",
+						"ValueListProperty": "myValueHelpPropertyText"
+					}
+				]
+			}
+		};
+
+		const sPropertyValue = "myValue";
+		const sPropertyFullPath = "myProperty";
+		const sDisplayFormat = "ValueDescription";
+
+		beforeAll(() => {
+			isA.mockReturnValue(true);
+			mockMetaModel.requestValueListInfo = jest.fn();
+			mockModel.setMetaModel(mockMetaModel);
+			CommonHelper.setMetaModel(mockMetaModel);
+		});
+
+		test(
+			"Field value is still not resolved",
+			{
+				"references": [
+					{
+						"type": "JIRA",
+						"ID": "FIORITECHP1-21176"
+					}
+				]
+			},
+			function() {
+				isA.mockReturnValueOnce(false);
+				const returnValue = FieldRuntime.retrieveTextFromValueList("", sPropertyFullPath, sDisplayFormat);
+				expect(returnValue).toBe("");
+			}
+		);
+
+		test("Inconsistent value help annotation", () => {
+			const returnValue = FieldRuntime.retrieveTextFromValueList("", sPropertyFullPath, sDisplayFormat);
+			expect(returnValue).toBe("");
+		});
+
+		test("Consistent value help but without text annotation", function() {
+			mockMetaModel.requestValueListInfo.mockResolvedValueOnce(mValueListInfo);
+			const returnValuePromise = FieldRuntime.retrieveTextFromValueList(sPropertyValue, sPropertyFullPath, sDisplayFormat);
+			expect(returnValuePromise).resolves.toBe(undefined);
+		});
+
+		test("Consistent value help and text annotation with display format 'DescriptionValue' ", function() {
+			mockMetaModelWithText.requestValueListInfo = jest.fn();
+			CommonHelper.getMetaModel(undefined, undefined).requestValueListInfo.mockResolvedValueOnce(mValueListInfo);
+			mockModel.setMetaModel(mockMetaModelWithText);
+			mockModel.bindList.mockReturnValueOnce(mockListBinding as any);
+			mockListBinding.requestContexts.mockResolvedValueOnce([mockListContext as any]);
+			mockListContext.getObject.mockReturnValueOnce({ "myValueHelpPropertyText": "myDescription" });
+			const returnValuePromise = FieldRuntime.retrieveTextFromValueList(sPropertyValue, sPropertyFullPath, "DescriptionValue");
+			return expect(returnValuePromise).resolves.toBe("myDescription (myValue)");
+		});
+
+		test("Consistent value help and text annotation with display format 'ValueDescription ", function() {
+			mockMetaModelWithText.requestValueListInfo = jest.fn();
+			CommonHelper.getMetaModel(undefined, undefined).requestValueListInfo.mockResolvedValueOnce(mValueListInfo);
+			mockModel.setMetaModel(mockMetaModelWithText);
+			mockModel.bindList.mockReturnValueOnce(mockListBinding as any);
+			mockListBinding.requestContexts.mockResolvedValueOnce([mockListContext as any]);
+			mockListContext.getObject.mockReturnValueOnce({ "myValueHelpPropertyText": "myDescription" });
+			const returnValuePromise = FieldRuntime.retrieveTextFromValueList(sPropertyValue, sPropertyFullPath, "ValueDescription");
+			return expect(returnValuePromise).resolves.toBe("myValue (myDescription)");
+		});
+
+		test("Consistent value help and text annotation with display format 'Description ", function() {
+			mockMetaModelWithText.requestValueListInfo = jest.fn();
+			CommonHelper.getMetaModel(undefined, undefined).requestValueListInfo.mockResolvedValueOnce(mValueListInfo);
+			mockModel.setMetaModel(mockMetaModelWithText);
+			mockModel.bindList.mockReturnValueOnce(mockListBinding as any);
+			mockListBinding.requestContexts.mockResolvedValueOnce([mockListContext as any]);
+			mockListContext.getObject.mockReturnValueOnce({ "myValueHelpPropertyText": "myDescription" });
+			const returnValuePromise = FieldRuntime.retrieveTextFromValueList(sPropertyValue, sPropertyFullPath, "Description");
+			return expect(returnValuePromise).resolves.toBe("myDescription");
+		});
+	});
+});