@sap/open.fe 1.99.0 → 1.100.0

package/packages/sap.fe.macros/test/sap/fe/macros/jest/field/FieldTemplating.spec.ts

@@ -7,20 +7,25 @@ import {
 	getDisplayStyle,
 	getSemanticObjectExpressionToResolve,
 	getSemanticObjects,
-	isUsedInNavigationWithQuickViewFacets
+	isUsedInNavigationWithQuickViewFacets,
+	getMultipleLinesForDataField,
+	getBindingForDraftAdminBlockInline,
+	_getDraftAdministrativeDataType
 } from "sap/fe/macros/field/FieldTemplating";
 import { formatWithTypeInformation } from "sap/fe/core/templating/UIFormatters";
 import path from "path";
 import { compileCDS, getMetaModel, getDataModelObjectPathForProperty, evaluateBindingWithModel } from "sap/fe/test/JestTemplatingHelper";
 import { convertTypes } from "sap/fe/core/converters/MetaModelConverter";
-import { AnyAnnotation, EntitySet, EntityType, Property } from "@sap-ux/annotation-converter";
+import { AnyAnnotation, ConverterOutput, EntitySet, EntityType, Property } from "@sap-ux/annotation-converter";
 import { bindingExpression, compileBinding, ifElse } from "sap/fe/core/helpers/BindingExpression";
 import { LineItem } from "@sap-ux/vocabularies-types";
 import { DataModelObjectPath } from "sap/fe/core/templating/DataModelPathHelper";
 import { getInvolvedDataModelObjects } from "sap/fe/core/converters/MetaModelConverter";
+import { MockContext, MockModel } from "sap/fe/test/UI5MockHelper";
+import ResourceModel from "sap/fe/macros/ResourceModel";
 
 describe("Field Templating Testing", () => {
-	let convertedTypes;
+	let convertedTypes: ConverterOutput;
 	let metaModel: any;
 	let entitySet: EntitySet;
 	let entityType: EntityType;
@@ -55,13 +60,16 @@ describe("Field Templating Testing", () => {
 			]
 		},
 		() => {
-			const textSimpleBinding = getValueBinding(getDataModelObjectPathForProperty(entitySet, properties["textBinding"]), {});
+			const textSimpleBinding = getValueBinding(
+				getDataModelObjectPathForProperty(entitySet, convertedTypes, properties["textBinding"]),
+				{}
+			);
 			expect(textSimpleBinding).toEqual(
 				"{path: 'textBinding', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}"
 			);
 
 			const textDeleteFormatterBinding = getValueBinding(
-				getDataModelObjectPathForProperty(entitySet, properties["textBinding"]),
+				getDataModelObjectPathForProperty(entitySet, convertedTypes, properties["textBinding"]),
 				{ textMaxLines: "10" },
 				true, //ignoreUnit, it doesn't have unit, so doesn't matter. Tested a few lines later.
 				true
@@ -69,7 +77,7 @@ describe("Field Templating Testing", () => {
 			expect(textDeleteFormatterBinding).toEqual("{textBinding}");
 
 			const textBindingParametter = getValueBinding(
-				getDataModelObjectPathForProperty(entitySet, properties["textBinding"]),
+				getDataModelObjectPathForProperty(entitySet, convertedTypes, properties["textBinding"]),
 				{ textMaxLines: "10" },
 				true,
 				true,
@@ -78,7 +86,7 @@ describe("Field Templating Testing", () => {
 			expect(textBindingParametter).toEqual("{path: 'textBinding', parameters: {$$noPatch: true}}");
 
 			const textTypeAny = getValueBinding(
-				getDataModelObjectPathForProperty(entitySet, properties["textBinding"]),
+				getDataModelObjectPathForProperty(entitySet, convertedTypes, properties["textBinding"]),
 				{},
 				false,
 				false,
@@ -89,11 +97,14 @@ describe("Field Templating Testing", () => {
 				"{path: 'textBinding', type: 'sap.ui.model.odata.type.String', targetType: 'any', formatOptions: {parseKeepsEmptyString: true}}"
 			);
 
-			const emailSimpleBinding = getValueBinding(getDataModelObjectPathForProperty(entitySet, properties["emailBinding"]), {});
+			const emailSimpleBinding = getValueBinding(
+				getDataModelObjectPathForProperty(entitySet, convertedTypes, properties["emailBinding"]),
+				{}
+			);
 			expect(emailSimpleBinding).toEqual("{path: 'emailBinding', type: 'sap.fe.core.type.Email'}");
 
 			const unitWithCurrencyBindingSimpleBinding = getValueBinding(
-				getDataModelObjectPathForProperty(entitySet, properties["UnitWithCurrencyBinding"]),
+				getDataModelObjectPathForProperty(entitySet, convertedTypes, properties["UnitWithCurrencyBinding"]),
 				{}
 			);
 			expect(unitWithCurrencyBindingSimpleBinding).toMatchInlineSnapshot(
@@ -101,7 +112,7 @@ describe("Field Templating Testing", () => {
 			);
 
 			const unitWithCurrencyBindingIgnoreUnit = getValueBinding(
-				getDataModelObjectPathForProperty(entitySet, properties["UnitWithCurrencyBinding"]),
+				getDataModelObjectPathForProperty(entitySet, convertedTypes, properties["UnitWithCurrencyBinding"]),
 				{},
 				true
 			);
@@ -110,7 +121,7 @@ describe("Field Templating Testing", () => {
 			);
 
 			const unitWithCurrencyDescriptionBinding = getValueBinding(
-				getDataModelObjectPathForProperty(entitySet, properties["UnitWithCurrencyBinding"]),
+				getDataModelObjectPathForProperty(entitySet, convertedTypes, properties["UnitWithCurrencyBinding"]),
 				{},
 				false,
 				false,
@@ -136,7 +147,11 @@ describe("Field Templating Testing", () => {
 		},
 		() => {
 			const entitySetLineItem = entitySet.entityType.annotations.UI?.LineItem as LineItem;
-			const dataModelObjectPathForProperty = getDataModelObjectPathForProperty(entitySet, entitySetLineItem[1] as AnyAnnotation);
+			const dataModelObjectPathForProperty = getDataModelObjectPathForProperty(
+				entitySet,
+				convertedTypes,
+				entitySetLineItem[1] as AnyAnnotation
+			);
 			const formatOptions = {
 				valueFormat: "DescriptionValue",
 				textAlignMode: "Form",
@@ -144,7 +159,7 @@ describe("Field Templating Testing", () => {
 			} as FieldFormatOptions;
 
 			const dataFieldConverted = getValueBinding(
-				getDataModelObjectPathForProperty(entitySet, properties["propertyNoTextWithVH"]),
+				getDataModelObjectPathForProperty(entitySet, convertedTypes, properties["propertyNoTextWithVH"]),
 				{}
 			);
 
@@ -177,7 +192,7 @@ describe("Field Templating Testing", () => {
 
 		// TextOnly
 		const textOnlyBinding = getBindingWithTextArrangement(
-			getDataModelObjectPathForProperty(entitySet, properties["textOnly"]),
+			getDataModelObjectPathForProperty(entitySet, convertedTypes, properties["textOnly"]),
 			bindingExpression("textOnly")
 		);
 		expect(textOnlyBinding).toMatchSnapshot();
@@ -186,7 +201,7 @@ describe("Field Templating Testing", () => {
 
 		// No text arrangement
 		const noTextBinding = getBindingWithTextArrangement(
-			getDataModelObjectPathForProperty(entitySet, properties["noText"]),
+			getDataModelObjectPathForProperty(entitySet, convertedTypes, properties["noText"]),
 			bindingExpression("noText")
 		);
 		expect(noTextBinding).toMatchSnapshot();
@@ -195,7 +210,7 @@ describe("Field Templating Testing", () => {
 
 		// TextFirst
 		const textFirstBinding = getBindingWithTextArrangement(
-			getDataModelObjectPathForProperty(entitySet, properties["textFirst"]),
+			getDataModelObjectPathForProperty(entitySet, convertedTypes, properties["textFirst"]),
 			bindingExpression("textFirst")
 		);
 		expect(textFirstBinding).toMatchSnapshot();
@@ -207,7 +222,7 @@ describe("Field Templating Testing", () => {
 
 		// TextLast
 		const textLastBinding = getBindingWithTextArrangement(
-			getDataModelObjectPathForProperty(entitySet, properties["textLast"]),
+			getDataModelObjectPathForProperty(entitySet, convertedTypes, properties["textLast"]),
 			bindingExpression("textLast")
 		);
 		expect(textLastBinding).toMatchSnapshot();
@@ -219,7 +234,7 @@ describe("Field Templating Testing", () => {
 	});
 
 	it("#addTextArrangementToBindingExpression", () => {
-		const fullContext = getDataModelObjectPathForProperty(entitySet);
+		const fullContext = getDataModelObjectPathForProperty(entitySet, convertedTypes);
 
 		const otherModelBinding = addTextArrangementToBindingExpression(bindingExpression("textLast", "otherModel"), fullContext);
 		expect(otherModelBinding).toMatchSnapshot();
@@ -282,26 +297,31 @@ describe("Field Templating Testing", () => {
 		const entitySetLineItem = entitySet.entityType.annotations.UI?.LineItem as LineItem;
 		let dataModelObjectPathForProperty = getDataModelObjectPathForProperty(
 			entitySet,
+			convertedTypes,
 			entitySetLineItem[1] as AnyAnnotation // staticHiddenProp
 		);
 		expect(getVisibleExpression(dataModelObjectPathForProperty)).toEqual("false");
 		dataModelObjectPathForProperty = getDataModelObjectPathForProperty(
 			entitySet,
+			convertedTypes,
 			entitySetLineItem[2] as AnyAnnotation // dynamicHiddenProp
 		);
 		expect(getVisibleExpression(dataModelObjectPathForProperty)).toEqual("{= %{isHidden} !== true}");
 		dataModelObjectPathForProperty = getDataModelObjectPathForProperty(
 			entitySet,
+			convertedTypes,
 			entitySetLineItem[3] as AnyAnnotation // textFirst with dataField statically hidden
 		);
 		expect(getVisibleExpression(dataModelObjectPathForProperty)).toEqual("false");
 		dataModelObjectPathForProperty = getDataModelObjectPathForProperty(
 			entitySet,
+			convertedTypes,
 			entitySetLineItem[4] as AnyAnnotation // textOnly with dataField dynamically hidden
 		);
 		expect(getVisibleExpression(dataModelObjectPathForProperty)).toEqual("{= %{isHidden} !== true}");
 		dataModelObjectPathForProperty = getDataModelObjectPathForProperty(
 			entitySet,
+			convertedTypes,
 			entitySetLineItem[5] as AnyAnnotation // dynamicHiddenProp2 with dynamic datafield hidden
 		);
 		expect(getVisibleExpression(dataModelObjectPathForProperty)).toEqual("{= %{isHidden2} !== true && %{isHidden} !== true}");
@@ -310,6 +330,7 @@ describe("Field Templating Testing", () => {
 		);
 		dataModelObjectPathForProperty = getDataModelObjectPathForProperty(
 			entitySet,
+			convertedTypes,
 			entitySetLineItem[6] as AnyAnnotation // hiddenWith11Nav with dynamic datafield hidden
 		);
 		expect(getVisibleExpression(dataModelObjectPathForProperty)).toEqual(
@@ -317,16 +338,19 @@ describe("Field Templating Testing", () => {
 		);
 		dataModelObjectPathForProperty = getDataModelObjectPathForProperty(
 			entitySet,
+			convertedTypes,
 			entitySetLineItem[7] as AnyAnnotation // hiddenWith1NNav with dynamic datafield hidden -> Doesn't make sense and model will complain but heh :(
 		);
 		expect(getVisibleExpression(dataModelObjectPathForProperty)).toEqual("{= %{isHidden2} !== true && %{_Elements/isHidden} !== true}");
 		dataModelObjectPathForProperty = getDataModelObjectPathForProperty(
 			entitySet,
+			convertedTypes,
 			entitySetLineItem[8] as AnyAnnotation // Data Field For Action
 		);
 		expect(getVisibleExpression(dataModelObjectPathForProperty)).toEqual("true");
 		dataModelObjectPathForProperty = getDataModelObjectPathForProperty(
 			entitySet,
+			convertedTypes,
 			entitySetLineItem[9] as AnyAnnotation // DataFieldForAnnotation -> data point visible
 		);
 		expect(getVisibleExpression(dataModelObjectPathForProperty)).toEqual("true");
@@ -335,16 +359,19 @@ describe("Field Templating Testing", () => {
 		);
 		dataModelObjectPathForProperty = getDataModelObjectPathForProperty(
 			entitySet,
+			convertedTypes,
 			entitySetLineItem[10] as AnyAnnotation // DataFieldForAnnotation -> data point dynamic visible
 		);
 		expect(getVisibleExpression(dataModelObjectPathForProperty)).toEqual("{= %{isHidden} !== true}");
 		dataModelObjectPathForProperty = getDataModelObjectPathForProperty(
 			entitySet,
+			convertedTypes,
 			entitySetLineItem[11] as AnyAnnotation // noHiddenProp
 		);
 		expect(getVisibleExpression(dataModelObjectPathForProperty)).toEqual("true");
 		dataModelObjectPathForProperty = getDataModelObjectPathForProperty(
 			entitySet,
+			convertedTypes,
 			entitySetLineItem[12] as AnyAnnotation // DataFieldForAnnotation -> FieldGroup -> Data
 		);
 		expect(getVisibleExpression(dataModelObjectPathForProperty)).toEqual("true");
@@ -403,4 +430,45 @@ describe("Field Templating Testing", () => {
 		const oProperty: Property = oDataModelPath?.targetObject.Value.$target;
 		expect(isUsedInNavigationWithQuickViewFacets(oDataModelPath as DataModelObjectPath, oProperty as Property)).toEqual(false);
 	});
+
+	it("getMultipleLinesForDataField", () => {
+		const oThis = {
+			wrap: "undefined", // or true/false
+			editMode: "dummyEditMode"
+		};
+
+		expect(getMultipleLinesForDataField(oThis, "Edm.String", false)).toEqual(false);
+
+		oThis.editMode = "{= %{ui>/isEditable} ? 'Editable' : 'Display'}";
+		expect(getMultipleLinesForDataField(oThis, "Edm.String", true)).toEqual("true");
+
+		oThis.editMode = "Display";
+		expect(getMultipleLinesForDataField(oThis, "Edm.String", true)).toEqual(true);
+
+		expect(getMultipleLinesForDataField(oThis, "dummyPropertyType", true)).toEqual(true);
+
+		oThis.wrap = "false";
+		expect(getMultipleLinesForDataField(oThis, "Edm.String", true)).toEqual(false);
+	});
+
+	it("getBindingForDraftAdminBlockInline", async () => {
+		let result;
+		const sEntityType = "fakeEntity";
+		const mockContext = new MockContext({});
+		const mockModel = new MockModel();
+		mockContext.getModel.mockReturnValue(mockModel as any);
+		mockModel.requestObject.mockReturnValue(Promise.resolve({}));
+		result = await getBindingForDraftAdminBlockInline(mockContext, sEntityType);
+		expect(result).toEqual(
+			"{= %{HasDraftEntity} ? (%{DraftAdministrativeData/InProcessByUser} || %{DraftAdministrativeData/LastChangedByUser}) : ''}"
+		);
+
+		mockModel.requestObject.mockReturnValue(
+			Promise.resolve({ InProcessByUserDescription: "fake", LastChangedByUserDescription: "fake" })
+		);
+		result = await getBindingForDraftAdminBlockInline(mockContext, sEntityType);
+		expect(result).toEqual(
+			"{= %{HasDraftEntity} ? (%{DraftAdministrativeData/InProcessByUserDescription} || %{DraftAdministrativeData/InProcessByUser} || %{DraftAdministrativeData/LastChangedByUserDescription} || %{DraftAdministrativeData/LastChangedByUser}) : ''}"
+		);
+	});
 });

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

@@ -1,14 +1,30 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Don't show labels: Amount 1`] = `undefined`;
+exports[`check table column width calculation for Properties with ValueHelp - Table mode = ReadOnly: Property::StringWithValueHelp 1`] = `
+Object {
+  "widthCalculation": Object {
+    "gap": 0,
+  },
+}
+`;
+
+exports[`check table column width calculation for Properties with ValueHelp: Property::StringWithValueHelp 1`] = `
+Object {
+  "widthCalculation": Object {
+    "gap": 4,
+  },
+}
+`;
+
+exports[`check table column width calculation for fieldGroups / Unit properties - Don't show labels: Amount 1`] = `undefined`;
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Don't show labels: Amount2 1`] = `undefined`;
+exports[`check table column width calculation for fieldGroups / Unit properties - Don't show labels: Amount2 1`] = `undefined`;
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Don't show labels: Amount3 1`] = `undefined`;
+exports[`check table column width calculation for fieldGroups / Unit properties - Don't show labels: Amount3 1`] = `undefined`;
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Don't show labels: Amount4 1`] = `undefined`;
+exports[`check table column width calculation for fieldGroups / Unit properties - Don't show labels: Amount4 1`] = `undefined`;
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Don't show labels: DataFieldForAnnotation::FieldGroup::GFieldButton 1`] = `
+exports[`check table column width calculation for fieldGroups / Unit properties - Don't show labels: DataFieldForAnnotation::FieldGroup::GFieldButton 1`] = `
 Object {
   "widthCalculation": Object {
     "minWidth": 34,
@@ -17,7 +33,7 @@ Object {
 }
 `;
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Don't show labels: DataFieldForAnnotation::FieldGroup::GFieldProgress 1`] = `
+exports[`check table column width calculation for fieldGroups / Unit properties - Don't show labels: DataFieldForAnnotation::FieldGroup::GFieldProgress 1`] = `
 Object {
   "widthCalculation": Object {
     "minWidth": 11,
@@ -26,7 +42,7 @@ Object {
 }
 `;
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Don't show labels: DataFieldForAnnotation::FieldGroup::GFieldRating 1`] = `
+exports[`check table column width calculation for fieldGroups / Unit properties - Don't show labels: DataFieldForAnnotation::FieldGroup::GFieldRating 1`] = `
 Object {
   "widthCalculation": Object {
     "minWidth": 11,
@@ -35,7 +51,7 @@ Object {
 }
 `;
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Don't show labels: DataFieldForAnnotation::FieldGroup::GFieldTextArrangementTextFirst 1`] = `
+exports[`check table column width calculation for fieldGroups / Unit properties - Don't show labels: DataFieldForAnnotation::FieldGroup::GFieldTextArrangementTextFirst 1`] = `
 Object {
   "widthCalculation": Object {
     "minWidth": 42,
@@ -44,7 +60,7 @@ Object {
 }
 `;
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Don't show labels: DataFieldForAnnotation::FieldGroup::GFieldTextArrangementTextLast 1`] = `
+exports[`check table column width calculation for fieldGroups / Unit properties - Don't show labels: DataFieldForAnnotation::FieldGroup::GFieldTextArrangementTextLast 1`] = `
 Object {
   "widthCalculation": Object {
     "minWidth": 41,
@@ -53,27 +69,31 @@ Object {
 }
 `;
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Don't show labels: DataFieldForAnnotation::FieldGroup::GFieldTextArrangementTextOnly 1`] = `
+exports[`check table column width calculation for fieldGroups / Unit properties - Don't show labels: DataFieldForAnnotation::FieldGroup::GFieldTextArrangementTextOnly 1`] = `
 Object {
   "widthCalculation": Object {
-    "excludeProperties": "Property::code_textOnly",
+    "excludeProperties": Array [
+      "Property::code_textOnly",
+    ],
     "minWidth": 19,
     "verticalArrangement": true,
   },
 }
 `;
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Don't show labels: DataFieldForAnnotation::FieldGroup::GFieldTextArrangementTextSeparate 1`] = `
+exports[`check table column width calculation for fieldGroups / Unit properties - Don't show labels: DataFieldForAnnotation::FieldGroup::GFieldTextArrangementTextSeparate 1`] = `
 Object {
   "widthCalculation": Object {
-    "excludeProperties": "Property::StringProp",
+    "excludeProperties": Array [
+      "Property::StringProp",
+    ],
     "minWidth": 26,
     "verticalArrangement": true,
   },
 }
 `;
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Don't show labels: Property::Amount 1`] = `
+exports[`check table column width calculation for fieldGroups / Unit properties - Don't show labels: Property::Amount 1`] = `
 Object {
   "widthCalculation": Object {
     "gap": 6,
@@ -81,7 +101,7 @@ Object {
 }
 `;
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Don't show labels: Property::Amount2 1`] = `
+exports[`check table column width calculation for fieldGroups / Unit properties - Don't show labels: Property::Amount2 1`] = `
 Object {
   "widthCalculation": Object {
     "gap": 4,
@@ -89,7 +109,7 @@ Object {
 }
 `;
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Don't show labels: Property::Amount3 1`] = `
+exports[`check table column width calculation for fieldGroups / Unit properties - Don't show labels: Property::Amount3 1`] = `
 Object {
   "widthCalculation": Object {
     "gap": 6,
@@ -97,7 +117,7 @@ Object {
 }
 `;
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Don't show labels: Property::Amount4 1`] = `
+exports[`check table column width calculation for fieldGroups / Unit properties - Don't show labels: Property::Amount4 1`] = `
 Object {
   "widthCalculation": Object {
     "gap": 8,
@@ -105,7 +125,7 @@ Object {
 }
 `;
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Show labels: DataFieldForAnnotation::FieldGroup::GFieldButton 1`] = `
+exports[`check table column width calculation for fieldGroups / Unit properties - Show labels: DataFieldForAnnotation::FieldGroup::GFieldButton 1`] = `
 Object {
   "widthCalculation": Object {
     "minWidth": 34,
@@ -114,7 +134,7 @@ Object {
 }
 `;
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Show labels: DataFieldForAnnotation::FieldGroup::GFieldProgress 1`] = `
+exports[`check table column width calculation for fieldGroups / Unit properties - Show labels: DataFieldForAnnotation::FieldGroup::GFieldProgress 1`] = `
 Object {
   "widthCalculation": Object {
     "minWidth": 23,
@@ -123,16 +143,16 @@ Object {
 }
 `;
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Show labels: DataFieldForAnnotation::FieldGroup::GFieldRating 1`] = `
+exports[`check table column width calculation for fieldGroups / Unit properties - Show labels: DataFieldForAnnotation::FieldGroup::GFieldRating 1`] = `
 Object {
   "widthCalculation": Object {
-    "minWidth": 24.875,
+    "minWidth": 25,
     "verticalArrangement": true,
   },
 }
 `;
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Show labels: DataFieldForAnnotation::FieldGroup::GFieldTextArrangementTextFirst 1`] = `
+exports[`check table column width calculation for fieldGroups / Unit properties - Show labels: DataFieldForAnnotation::FieldGroup::GFieldTextArrangementTextFirst 1`] = `
 Object {
   "widthCalculation": Object {
     "minWidth": 72,
@@ -141,7 +161,7 @@ Object {
 }
 `;
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Show labels: DataFieldForAnnotation::FieldGroup::GFieldTextArrangementTextLast 1`] = `
+exports[`check table column width calculation for fieldGroups / Unit properties - Show labels: DataFieldForAnnotation::FieldGroup::GFieldTextArrangementTextLast 1`] = `
 Object {
   "widthCalculation": Object {
     "minWidth": 71,
@@ -150,20 +170,24 @@ Object {
 }
 `;
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Show labels: DataFieldForAnnotation::FieldGroup::GFieldTextArrangementTextOnly 1`] = `
+exports[`check table column width calculation for fieldGroups / Unit properties - Show labels: DataFieldForAnnotation::FieldGroup::GFieldTextArrangementTextOnly 1`] = `
 Object {
   "widthCalculation": Object {
-    "excludeProperties": "Property::code_textOnly",
+    "excludeProperties": Array [
+      "Property::code_textOnly",
+    ],
     "minWidth": 48,
     "verticalArrangement": true,
   },
 }
 `;
 
-exports[`check table column width calculation for fieldGroups and with Unit properties Show labels: DataFieldForAnnotation::FieldGroup::GFieldTextArrangementTextSeparate 1`] = `
+exports[`check table column width calculation for fieldGroups / Unit properties - Show labels: DataFieldForAnnotation::FieldGroup::GFieldTextArrangementTextSeparate 1`] = `
 Object {
   "widthCalculation": Object {
-    "excludeProperties": "Property::StringProp",
+    "excludeProperties": Array [
+      "Property::StringProp",
+    ],
     "minWidth": 59,
     "verticalArrangement": true,
   },