@sapui5/sap.fe.core 1.141.2 → 1.142.1

package/src/sap/fe/core/converters/annotations/DataField.ts

@@ -2,6 +2,7 @@ import type { AnnotationTerm, Decimal, PathAnnotationExpression, PrimitiveType,
 import type { Contact } from "@sap-ux/vocabularies-types/vocabularies/Communication";
 import { CommunicationAnnotationTypes } from "@sap-ux/vocabularies-types/vocabularies/Communication";
 import type {
+	ConnectedFields,
 	DataField,
 	DataFieldAbstractTypes,
 	DataFieldForAction,
@@ -41,7 +42,7 @@ import {
 import { enhanceDataModelPath, getContextRelativeTargetObjectPath, type DataModelObjectPath } from "../../templating/DataModelPathHelper";
 import type { DisplayMode } from "../../templating/UIFormatters";
 import type ConverterContext from "../ConverterContext";
-import { isReferencePropertyStaticallyHidden } from "../helpers/DataFieldHelper";
+import { getConnectedFieldsData, getConnectedFieldsSeparator, isReferencePropertyStaticallyHidden } from "../helpers/DataFieldHelper";
 
 export type ComplexPropertyInfo = {
 	properties: Record<string, { annotationProperty: Property; displayModeOfPropertyUsedAsDescription?: DisplayMode }>;
@@ -124,6 +125,16 @@ export function hasFieldGroupTarget(dataFieldForAnnotation: DataFieldForAnnotati
 	return isAnnotationOfType<FieldGroup>(dataFieldTarget, UIAnnotationTypes.FieldGroupType);
 }
 
+/**
+ * Determines if the dataFieldForAnnotation points to a connectedFields annotation.
+ * @param dataFieldForAnnotation The dataFieldForAnnotation being processed
+ * @returns True if the dataFieldForAnnotation points to a connectedFields annotation.
+ */
+export function hasConnectedFieldsTarget(dataFieldForAnnotation: DataFieldForAnnotation | ReferenceFacet): boolean {
+	const dataFieldTarget = dataFieldForAnnotation.Target.$target;
+	return isAnnotationOfType<ConnectedFields>(dataFieldTarget, UIAnnotationTypes.ConnectedFieldsType);
+}
+
 /**
  * Determines if the dataFieldForAnnotation is a field group.
  * @param dataFieldForAnnotation The dataFieldForAnnotation being processed
@@ -374,8 +385,10 @@ export function collectRelatedProperties(
 		exportSettings: {}
 	},
 	addUnitInTemplate = false,
-	isAnnotatedAsHidden = false
+	isAnnotatedAsHidden = false,
+	connectedFieldsSeparator: string | undefined = undefined
 ): ComplexPropertyInfo {
+	const isPartOfaConnectedFields = !!connectedFieldsSeparator;
 	if (path && property) {
 		let valueIndex: number;
 		/* EXTERNALID */
@@ -385,7 +398,12 @@ export function collectRelatedProperties(
 		if (isAnnotatedAsHidden) {
 			// Collect underlying property
 			valueIndex = _setRelatedPropertiesAndGetIndex(relatedProperties, path, property);
-			_appendTemplate(relatedProperties, `{${valueIndex}}`);
+			_appendTemplate(
+				relatedProperties,
+				isPartOfaConnectedFields && relatedProperties.exportSettings?.template
+					? `${connectedFieldsSeparator}{${valueIndex}}`
+					: `{${valueIndex}}`
+			);
 			return relatedProperties;
 		}
 		const navigationPathPrefix = _getNavigationPathPrefix(path);
@@ -406,8 +424,11 @@ export function collectRelatedProperties(
 
 		if (relatedProperties.exportSettings?.template) {
 			// FieldGroup use-case. Need to add each Field in new line.
-			_appendTemplate(relatedProperties, "\n");
-			relatedProperties.exportSettings.wrap = true;
+			// ConnectedFields use-case. Need to add the separator between the Fields that stay on the same line.
+			_appendTemplate(relatedProperties, isPartOfaConnectedFields ? connectedFieldsSeparator : "\n");
+			if (!connectedFieldsSeparator) {
+				relatedProperties.exportSettings.wrap = true;
+			}
 		}
 
 		// The text arrangement will be considered only if the text property is groupable
@@ -420,7 +441,7 @@ export function collectRelatedProperties(
 				const pathForText = externalIdPath ? externalIdPath : path;
 				const propertyForText = externalIdProperty ? externalIdProperty : property;
 				// Check for Text Arrangement.
-				const displayMode = getDisplayMode(propertyForText, propertyDataModelObjectPath);
+				const displayMode = getDisplayMode(propertyForText, propertyDataModelObjectPath.targetEntityType);
 				let descriptionIndex: number;
 				switch (displayMode) {
 					case "Description":
@@ -430,7 +451,12 @@ export function collectRelatedProperties(
 							textProperty,
 							"Description"
 						);
-						_appendTemplate(relatedProperties, `{${descriptionIndex}}`);
+						_appendTemplate(
+							relatedProperties,
+							isPartOfaConnectedFields && relatedProperties.exportSettings?.template
+								? `${connectedFieldsSeparator}{${descriptionIndex}}`
+								: `{${descriptionIndex}}`
+						);
 						break;
 
 					case "ValueDescription":
@@ -441,7 +467,12 @@ export function collectRelatedProperties(
 							textProperty,
 							"ValueDescription"
 						);
-						_appendTemplate(relatedProperties, `{${valueIndex}} ({${descriptionIndex}})`);
+						_appendTemplate(
+							relatedProperties,
+							isPartOfaConnectedFields && relatedProperties.exportSettings?.template
+								? `${connectedFieldsSeparator}{${valueIndex}} ({${descriptionIndex}})`
+								: `{${valueIndex}} ({${descriptionIndex}})`
+						);
 						break;
 
 					case "DescriptionValue":
@@ -452,17 +483,32 @@ export function collectRelatedProperties(
 							textProperty,
 							"DescriptionValue"
 						);
-						_appendTemplate(relatedProperties, `{${descriptionIndex}} ({${valueIndex}})`);
+						_appendTemplate(
+							relatedProperties,
+							isPartOfaConnectedFields && relatedProperties.exportSettings?.template
+								? `${connectedFieldsSeparator}{${descriptionIndex}} ({${valueIndex}})`
+								: `{${descriptionIndex}} ({${valueIndex}})`
+						);
 						break;
 					default:
 						valueIndex = _setRelatedPropertiesAndGetIndex(relatedProperties, pathForText, propertyForText);
-						_appendTemplate(relatedProperties, `{${valueIndex}}`);
+						_appendTemplate(
+							relatedProperties,
+							isPartOfaConnectedFields && relatedProperties.exportSettings?.template
+								? `${connectedFieldsSeparator}{${valueIndex}}`
+								: `{${valueIndex}}`
+						);
 						break;
 				}
 			} else {
 				// Collect underlying property
 				valueIndex = _setRelatedPropertiesAndGetIndex(relatedProperties, path, property);
-				_appendTemplate(relatedProperties, `{${valueIndex}}`);
+				_appendTemplate(
+					relatedProperties,
+					isPartOfaConnectedFields && relatedProperties.exportSettings?.template
+						? `${connectedFieldsSeparator}{${valueIndex}}`
+						: `{${valueIndex}}`
+				);
 			}
 		} else {
 			// Check for field containing Currency Or Unit Properties or Timezone
@@ -481,6 +527,7 @@ export function collectRelatedProperties(
 					addUnitInTemplate,
 					propertyDataModelObjectPath,
 					currencyOrUoMProperty,
+					isPartOfaConnectedFields,
 					currencyProperty
 				);
 			} else if (timezoneProperty && timezoneAnnotation?.$target) {
@@ -498,12 +545,17 @@ export function collectRelatedProperties(
 					navigationPathPrefix ? navigationPathPrefix + contactPropertyPath : contactPropertyPath,
 					contactProperty
 				);
-				_appendTemplate(relatedProperties, `{${valueIndex}}`);
+				_appendTemplate(
+					relatedProperties,
+					isPartOfaConnectedFields && relatedProperties.exportSettings?.template
+						? `${connectedFieldsSeparator}{${valueIndex}}`
+						: `{${valueIndex}}`
+				);
 			} else if (!ignoreSelf) {
 				// Collect underlying property
 				valueIndex = _setRelatedPropertiesAndGetIndex(relatedProperties, path, property);
 				_appendTemplate(relatedProperties, `{${valueIndex}}`);
-				if (currencyOrUnitAnnotation) {
+				if (!isPartOfaConnectedFields && currencyOrUnitAnnotation) {
 					relatedProperties.exportSettings.unit = `${currencyOrUnitAnnotation}`; // Hard-coded currency/unit
 					if (property?.annotations?.Measures?.ISOCurrency) {
 						relatedProperties.exportSettings.isCurrency = true;
@@ -523,7 +575,12 @@ export function collectRelatedProperties(
 			// Collect underlying property if not collected already.
 			// This is to ensure that additionalProperties are made available only to complex property infos.
 			valueIndex = _setRelatedPropertiesAndGetIndex(relatedProperties, path, property);
-			_appendTemplate(relatedProperties, `{${valueIndex}}`);
+			_appendTemplate(
+				relatedProperties,
+				isPartOfaConnectedFields && relatedProperties.exportSettings?.template
+					? `${connectedFieldsSeparator}{${valueIndex}}`
+					: `{${valueIndex}}`
+			);
 		}
 	}
 	return relatedProperties;
@@ -629,6 +686,7 @@ function collectCurrencyOrUnitProperties(
 	addUnitInTemplate: boolean,
 	propertyDataModelObjectPath: DataModelObjectPath<Property>,
 	currencyOrUoMProperty: Property,
+	isPartOfaConnectedFields: boolean,
 	currencyProperty?: Property
 ): void {
 	const property = propertyDataModelObjectPath.targetObject;
@@ -646,10 +704,12 @@ function collectCurrencyOrUnitProperties(
 		} else {
 			relatedProperties.exportSettings.unitProperty = unitOrCurrencyRelativePath;
 		}
-		if (currencyProperty) {
+		if (currencyProperty && !isPartOfaConnectedFields) {
 			relatedProperties.exportSettings.isCurrency = true;
 		}
-		relatedProperties.exportSettings.scale = property.scale;
+		if (!isPartOfaConnectedFields) {
+			relatedProperties.exportSettings.scale = property.scale;
+		}
 	}
 }
 
@@ -672,7 +732,8 @@ export function collectRelatedPropertiesRecursively(
 		additionalProperties: {},
 		exportSettings: {}
 	},
-	isEmbedded = false
+	isEmbedded = false,
+	connectedFieldsSeparator: string | undefined = undefined
 ): ComplexPropertyInfo {
 	let isStaticallyHidden = false;
 	switch (dataField?.$Type) {
@@ -692,7 +753,8 @@ export function collectRelatedPropertiesRecursively(
 					tableType,
 					relatedProperties,
 					isEmbedded,
-					isStaticallyHidden
+					isStaticallyHidden,
+					connectedFieldsSeparator
 				);
 				const navigationPathPrefix = _getNavigationPathPrefix(property.path);
 				relatedProperties = _collectAdditionalPropertiesForAnalyticalTable(
@@ -721,7 +783,19 @@ export function collectRelatedPropertiesRecursively(
 						);
 					});
 					break;
-
+				case UIAnnotationTypes.ConnectedFieldsType:
+					connectedFieldsSeparator = getConnectedFieldsSeparator(dataField.Target.$target);
+					getConnectedFieldsData(dataField.Target.$target).forEach((innerDataField: DataFieldAbstractTypes) => {
+						relatedProperties = collectRelatedPropertiesRecursively(
+							innerDataField,
+							converterContext,
+							tableType,
+							relatedProperties,
+							true,
+							connectedFieldsSeparator
+						);
+					});
+					break;
 				case UIAnnotationTypes.DataPointType:
 					isStaticallyHidden = isReferencePropertyStaticallyHidden(dataField);
 					relatedProperties = collectRelatedProperties(