@sap/open.fe 1.99.0 → 1.100.0

package/packages/sap.fe.macros/test/sap/fe/macros/jest/table/delegates/__snapshots__/TableDelegate.spec.ts.snap

@@ -1,5 +1,26 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Table Delegate Table Delegate - _fetchCustomPropertyInfo() - Testing Custom Columns 1`] = `
+Object {
+  "description": "MockedHeader",
+  "exportSettings": Object {
+    "template": undefined,
+  },
+  "filterable": false,
+  "group": null,
+  "groupLabel": null,
+  "label": "MockedHeader",
+  "maxLength": undefined,
+  "name": "CustomColumn::CustomColumnMocked",
+  "path": "CustomColumn::CustomColumnMocked",
+  "precision": undefined,
+  "scale": undefined,
+  "sortable": false,
+  "type": "Edm.String",
+  "visible": true,
+}
+`;
+
 exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for Readonly Table 1`] = `
 Object {
   "caseSensitive": true,
@@ -277,7 +298,8 @@ Object {
     "inputFormat": undefined,
     "scale": "variable",
     "trueValue": undefined,
-    "type": "Number",
+    "type": "Currency",
+    "unitProperty": "Currency",
   },
   "filterable": true,
   "group": null,
@@ -360,7 +382,7 @@ Object {
   "visible": false,
   "visualSettings": Object {
     "widthCalculation": Object {
-      "gap": 0.1,
+      "gap": 1,
     },
   },
 }
@@ -417,7 +439,7 @@ Object {
   "visible": false,
   "visualSettings": Object {
     "widthCalculation": Object {
-      "gap": 0.1,
+      "gap": 1,
     },
   },
 }
@@ -471,7 +493,7 @@ Object {
   "visible": false,
   "visualSettings": Object {
     "widthCalculation": Object {
-      "gap": 0.1,
+      "gap": 1,
     },
   },
 }
@@ -528,6 +550,7 @@ Object {
     "scale": "variable",
     "trueValue": undefined,
     "type": "Number",
+    "unit": "EURO",
   },
   "filterable": true,
   "group": null,
@@ -575,7 +598,8 @@ Object {
     "inputFormat": undefined,
     "scale": "variable",
     "trueValue": undefined,
-    "type": "Number",
+    "type": "Currency",
+    "unitProperty": "Unit",
   },
   "filterable": true,
   "group": null,
@@ -624,6 +648,7 @@ Object {
     "scale": "variable",
     "trueValue": undefined,
     "type": "Number",
+    "unit": "Kilogram",
   },
   "filterable": true,
   "group": null,
@@ -1146,9 +1171,10 @@ Object {
     "delimiter": false,
     "falseValue": undefined,
     "inputFormat": undefined,
-    "template": "{0}  {1}",
+    "template": undefined,
     "trueValue": undefined,
-    "type": "String",
+    "type": "Currency",
+    "unitProperty": "Currency",
     "wrap": undefined,
   },
   "group": null,
@@ -1227,7 +1253,7 @@ Object {
   "visible": true,
   "visualSettings": Object {
     "widthCalculation": Object {
-      "gap": 0.1,
+      "gap": 1,
     },
   },
 }
@@ -1280,7 +1306,7 @@ Object {
   "visible": true,
   "visualSettings": Object {
     "widthCalculation": Object {
-      "gap": 0.1,
+      "gap": 1,
     },
   },
 }
@@ -1332,7 +1358,7 @@ Object {
   "visible": true,
   "visualSettings": Object {
     "widthCalculation": Object {
-      "gap": 0.1,
+      "gap": 1,
     },
   },
 }
@@ -1423,6 +1449,7 @@ Object {
     "template": "{0}",
     "trueValue": undefined,
     "type": "Number",
+    "unit": "EURO",
     "wrap": undefined,
   },
   "group": null,
@@ -1464,9 +1491,10 @@ Object {
     "delimiter": false,
     "falseValue": undefined,
     "inputFormat": undefined,
-    "template": "{0}  {1}",
+    "template": undefined,
     "trueValue": undefined,
-    "type": "String",
+    "type": "Currency",
+    "unitProperty": "Unit",
     "wrap": undefined,
   },
   "group": null,
@@ -1512,6 +1540,7 @@ Object {
     "template": "{0}",
     "trueValue": undefined,
     "type": "Number",
+    "unit": "Kilogram",
     "wrap": undefined,
   },
   "group": null,
@@ -1578,7 +1607,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 1`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 1`] = `
 Object {
   "caseSensitive": true,
   "description": "String property",
@@ -1624,7 +1653,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 2`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 2`] = `
 Object {
   "caseSensitive": true,
   "description": "Stream property",
@@ -1658,7 +1687,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 3`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 3`] = `
 Object {
   "caseSensitive": true,
   "description": "Hidden string property",
@@ -1704,7 +1733,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 4`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 4`] = `
 Object {
   "caseSensitive": true,
   "description": "Decimal property",
@@ -1753,7 +1782,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 5`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 5`] = `
 Object {
   "caseSensitive": true,
   "description": "Double property",
@@ -1799,7 +1828,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 6`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 6`] = `
 Object {
   "caseSensitive": true,
   "description": "Integer64 property",
@@ -1845,7 +1874,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 7`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 7`] = `
 Object {
   "caseSensitive": true,
   "description": "Total Amount",
@@ -1855,7 +1884,8 @@ Object {
     "inputFormat": undefined,
     "scale": "variable",
     "trueValue": undefined,
-    "type": "Number",
+    "type": "Currency",
+    "unitProperty": "Currency",
   },
   "filterable": true,
   "group": null,
@@ -1893,7 +1923,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 8`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 8`] = `
 Object {
   "caseSensitive": true,
   "description": "Shipping date",
@@ -1944,7 +1974,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 9`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 9`] = `
 Object {
   "caseSensitive": true,
   "description": "Creation date timestamp",
@@ -2001,7 +2031,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 10`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 10`] = `
 Object {
   "caseSensitive": true,
   "description": "Usage Start Time",
@@ -2055,7 +2085,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 11`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 11`] = `
 Object {
   "caseSensitive": true,
   "description": "Is overdue",
@@ -2095,7 +2125,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 12`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 12`] = `
 Object {
   "caseSensitive": true,
   "description": "Amount2",
@@ -2106,6 +2136,7 @@ Object {
     "scale": "variable",
     "trueValue": undefined,
     "type": "Number",
+    "unit": "EURO",
   },
   "filterable": true,
   "group": null,
@@ -2143,7 +2174,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 13`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 13`] = `
 Object {
   "caseSensitive": true,
   "description": "Amount3",
@@ -2153,7 +2184,8 @@ Object {
     "inputFormat": undefined,
     "scale": "variable",
     "trueValue": undefined,
-    "type": "Number",
+    "type": "Currency",
+    "unitProperty": "Unit",
   },
   "filterable": true,
   "group": null,
@@ -2191,7 +2223,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 14`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 14`] = `
 Object {
   "caseSensitive": true,
   "description": "Amount4",
@@ -2202,6 +2234,7 @@ Object {
     "scale": "variable",
     "trueValue": undefined,
     "type": "Number",
+    "unit": "Kilogram",
   },
   "filterable": true,
   "group": null,
@@ -2239,7 +2272,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 15`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 15`] = `
 Object {
   "caseSensitive": true,
   "description": "Rating as Rating Indicator",
@@ -2285,7 +2318,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 16`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 16`] = `
 Object {
   "caseSensitive": true,
   "description": "Requested Quantity",
@@ -2331,7 +2364,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 17`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 17`] = `
 Object {
   "caseSensitive": true,
   "description": "Requested Quantity",
@@ -2377,7 +2410,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 18`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 18`] = `
 Object {
   "description": "Rating as Rating Indicator",
   "exportSettings": Object {
@@ -2422,7 +2455,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 19`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 19`] = `
 Object {
   "description": "ID",
   "exportSettings": Object {
@@ -2466,7 +2499,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 20`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 20`] = `
 Object {
   "description": "String in datafield",
   "exportSettings": Object {
@@ -2510,7 +2543,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 21`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 21`] = `
 Object {
   "description": "Stream property",
   "exportSettings": Object {
@@ -2541,7 +2574,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 22`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 22`] = `
 Object {
   "description": "Hidden string property",
   "exportSettings": Object {
@@ -2585,7 +2618,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 23`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 23`] = `
 Object {
   "description": "Decimal property",
   "exportSettings": Object {
@@ -2629,7 +2662,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 24`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 24`] = `
 Object {
   "description": "Double property",
   "exportSettings": Object {
@@ -2673,7 +2706,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 25`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 25`] = `
 Object {
   "description": "Integer64 property",
   "exportSettings": Object {
@@ -2717,16 +2750,17 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 26`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 26`] = `
 Object {
   "description": "Total Amount",
   "exportSettings": Object {
     "delimiter": false,
     "falseValue": undefined,
     "inputFormat": undefined,
-    "template": "{0}  {1}",
+    "template": undefined,
     "trueValue": undefined,
-    "type": "String",
+    "type": "Currency",
+    "unitProperty": "Currency",
     "wrap": undefined,
   },
   "group": null,
@@ -2762,7 +2796,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 27`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 27`] = `
 Object {
   "description": "Shipping date",
   "exportSettings": Object {
@@ -2811,7 +2845,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 28`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 28`] = `
 Object {
   "description": "Creation date timestamp",
   "exportSettings": Object {
@@ -2864,7 +2898,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 29`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 29`] = `
 Object {
   "description": "Usage Start Time",
   "exportSettings": Object {
@@ -2916,7 +2950,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 30`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 30`] = `
 Object {
   "description": "Is overdue",
   "exportSettings": Object {
@@ -2953,7 +2987,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 31`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 31`] = `
 Object {
   "caseSensitive": true,
   "description": "An Action",
@@ -2991,7 +3025,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 32`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 32`] = `
 Object {
   "description": "Amount2",
   "exportSettings": Object {
@@ -3001,6 +3035,7 @@ Object {
     "template": "{0}",
     "trueValue": undefined,
     "type": "Number",
+    "unit": "EURO",
     "wrap": undefined,
   },
   "group": null,
@@ -3035,16 +3070,17 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 33`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 33`] = `
 Object {
   "description": "Amount3",
   "exportSettings": Object {
     "delimiter": false,
     "falseValue": undefined,
     "inputFormat": undefined,
-    "template": "{0}  {1}",
+    "template": undefined,
     "trueValue": undefined,
-    "type": "String",
+    "type": "Currency",
+    "unitProperty": "Unit",
     "wrap": undefined,
   },
   "group": null,
@@ -3080,7 +3116,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 34`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 34`] = `
 Object {
   "description": "Amount4",
   "exportSettings": Object {
@@ -3090,6 +3126,7 @@ Object {
     "template": "{0}",
     "trueValue": undefined,
     "type": "Number",
+    "unit": "Kilogram",
     "wrap": undefined,
   },
   "group": null,
@@ -3124,7 +3161,7 @@ Object {
 }
 `;
 
-exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos forEditable Table 35`] = `
+exports[`Table Delegate Table Delegate - _fetchPropertyInfo() - Testing different combinations of simple and complex property infos for editable Table 35`] = `
 Object {
   "caseSensitive": true,
   "description": "Target Value",

package/packages/sap.fe.macros/test/sap/fe/macros/jest/tsx/TestTSX.spec.tsx

@@ -1,5 +1,6 @@
 import { xml } from "sap/fe/macros/MacroRuntime";
-import { HBox, VBox } from "sap/m";
+import VBox from "sap/m/VBox";
+import HBox from "sap/m/HBox";
 
 const VFTemplate = () => (
 	<VBox>

package/packages/sap.fe.macros/test/sap/fe/macros/qunit/index.json

@@ -111,11 +111,6 @@
 		"group": ["macros"],
 		"module": "./macros/ValueListHelper.qunit"
 	},
-	{
-		"name": "FormTemplatingTs",
-		"group": ["macros"],
-		"module": "./macros/FormTemplatingTs.qunit"
-	},
 	{
 		"name": "AnalyticalTableDelegate",
 		"group": ["macros"],

package/packages/sap.fe.macros/test/sap/fe/macros/qunit/macros/FieldHelper.qunit.js

@@ -15,104 +15,6 @@ sap.ui.define(
 		"use strict";
 		var sandbox = sinon.sandbox.create();
 
-		QUnit.module("Unit Test for getImportance");
-
-		QUnit.test("Unit test to check getImportance ", function(assert) {
-			[
-				{
-					oDataField: { "$Type": "com.sap.vocabularies.UI.v1.DataField", "Value": { "$Path": "ID" } },
-					aSemanticKeys: [{ "$PropertyPath": "ID" }],
-					aFieldGroupData: "",
-					expectedValue: "High",
-					sMessage: "with DataField, semantic key and NO importance"
-				},
-				{
-					oDataField: {
-						"@com.sap.vocabularies.UI.v1.Importance": { "$EnumMember": "com.sap.vocabularies.UI.v1.ImportanceType/Low" },
-						"$Type": "com.sap.vocabularies.UI.v1.DataField",
-						"Value": { "$Path": "ID" }
-					},
-					aSemanticKeys: [{ "$PropertyPath": "ID" }],
-					aFieldGroupData: "",
-					expectedValue: "Low",
-					sMessage: "with DataField, semantic key and importance"
-				},
-				{
-					oDataField: { "$Type": "com.sap.vocabularies.UI.v1.DataField", "Value": { "$Path": "ID" } },
-					aSemanticKeys: [],
-					aFieldGroupData: "",
-					expectedValue: "None",
-					sMessage: "with DataField, NO semantic key and NO importance"
-				},
-				{
-					oDataField: {
-						"$Type": "com.sap.vocabularies.UI.v1.DataFieldForAnnotation",
-						"Target": {
-							"$AnnotationPath": "_CreditLimitDetails/@com.sap.vocabularies.UI.v1.Chart#RadialCriticalityPathHidden"
-						},
-						"Label": "Credit Limit Details"
-					},
-					aSemanticKeys: [],
-					aFieldGroupData: "",
-					expectedValue: "None",
-					sMessage: "with DataFieldForAnnotation, NO semantic key and NO importance"
-				},
-				{
-					oDataField: {
-						"$Type": "com.sap.vocabularies.UI.v1.DataFieldForAnnotation",
-						"Target": {
-							"$AnnotationPath": "_CreditLimitDetails/@com.sap.vocabularies.UI.v1.Chart#RadialCriticalityPathHidden"
-						},
-						"Label": "Credit Limit Details"
-					},
-					aSemanticKeys: [{ "$PropertyPath": "ID" }],
-					aFieldGroupData: "",
-					expectedValue: "None",
-					sMessage: "with DataFieldForAnnotation (no FieldGroup), NO semantic key and NO importance"
-				},
-				{
-					oDataField: {
-						"@com.sap.vocabularies.UI.v1.Importance": { "$EnumMember": "com.sap.vocabularies.UI.v1.ImportanceType/Low" },
-						"$Type": "com.sap.vocabularies.UI.v1.DataFieldForAnnotation",
-						"Target": { "$AnnotationPath": "@com.sap.vocabularies.UI.v1.FieldGroup#multipleActionFields" },
-						"Label": "Sold-To Party"
-					},
-					aSemanticKeys: [{ "$PropertyPath": "ID" }],
-					aFieldGroupData: [
-						{ "$Type": "com.sap.vocabularies.UI.v1.DataField", "Value": { "$Path": "SoldToParty" } },
-						{
-							"$Type": "com.sap.vocabularies.UI.v1.DataFieldForAnnotation",
-							"Target": { "$AnnotationPath": "@com.sap.vocabularies.UI.v1.DataPoint#Rating" }
-						},
-						{ "$Type": "com.sap.vocabularies.UI.v1.DataField", "Value": { "$Path": "ID" } }
-					],
-					expectedValue: "Low",
-					sMessage: "with DataFieldForAnnotation (FieldGroup), semantic key used inthe FieldGroup and importance defined"
-				},
-				{
-					oDataField: {
-						"$Type": "com.sap.vocabularies.UI.v1.DataFieldForAnnotation",
-						"Target": { "$AnnotationPath": "@com.sap.vocabularies.UI.v1.FieldGroup#multipleActionFields" },
-						"Label": "Sold-To Party"
-					},
-					aSemanticKeys: [{ "$PropertyPath": "ID" }],
-					aFieldGroupData: [
-						{ "$Type": "com.sap.vocabularies.UI.v1.DataField", "Value": { "$Path": "SoldToParty" } },
-						{
-							"$Type": "com.sap.vocabularies.UI.v1.DataFieldForAnnotation",
-							"Target": { "$AnnotationPath": "@com.sap.vocabularies.UI.v1.DataPoint#Rating" }
-						},
-						{ "$Type": "com.sap.vocabularies.UI.v1.DataField", "Value": { "$Path": "ID" } }
-					],
-					expectedValue: "High",
-					sMessage: "with DataFieldForAnnotation (FieldGroup), semantic key used inthe FieldGroup and NO importance defined"
-				}
-			].forEach(function(oProperty) {
-				var actualValue = FieldHelper.getImportance(oProperty.oDataField, oProperty.aSemanticKeys, oProperty.aFieldGroupData);
-				assert.equal(actualValue, oProperty.expectedValue, "Unit test to check getImportance " + oProperty.sMessage + ": ok");
-			});
-		});
-
 		QUnit.module("Unit Test for isNotAlwaysHidden");
 
 		QUnit.test("Unit test to check isNotAlwaysHidden ", function(assert) {
@@ -1568,7 +1470,7 @@ sap.ui.define(
 						"DATE,FROM,TO,DATERANGE,TODAY,YESTERDAY,TOMORROW,TODAYFROMTO,LASTDAYS,NEXTDAYS,THISWEEK," +
 						"LASTWEEK,LASTWEEKS,NEXTWEEK,NEXTWEEKS,SPECIFICMONTH,THISMONTH,LASTMONTH,LASTMONTHS,NEXTMONTH,NEXTMONTHS," +
 						"THISQUARTER,LASTQUARTER,LASTQUARTERS,NEXTQUARTER,NEXTQUARTERS,QUARTER1,QUARTER2," +
-						"QUARTER3,QUARTER4,THISYEAR,LASTYEAR,LASTYEARS,NEXTYEAR,NEXTYEARS,YEARTODATE",
+						"QUARTER3,QUARTER4,THISYEAR,LASTYEAR,LASTYEARS,NEXTYEAR,NEXTYEARS,YEARTODATE,DATETOYEAR",
 					sMessage: "Edm.Date and Single Range"
 				},
 				{

package/packages/sap.fe.macros/test/sap/fe/macros/qunit/macros/FormElementTemplating.qunit.js

@@ -63,7 +63,7 @@ sap.ui.define(
 								MacroDataPointObjectStatus: {
 									// unittest:id
 									"text":
-										"{path: 'PropertyDecimal', type: 'sap.ui.model.odata.type.Decimal', constraints: {scale: 1, precision: 4}}"
+										"{path: 'PropertyDecimal', type: 'sap.ui.model.odata.type.Decimal', formatOptions: {preserveDecimals: false}, constraints: {scale: 1, precision: 4}}"
 								}
 							}
 						}