@sapui5/sap.fe.core 1.135.0 → 1.136.0

package/src/sap/fe/core/converters/controls/Common/table/Columns.ts

@@ -99,6 +99,7 @@ import type { DefaultTypeForEdmType } from "sap/fe/core/type/EDM";
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import tableFormatters from "sap/fe/macros/formatters/TableFormatter";
 import type Control from "sap/ui/core/Control";
+import type { MDCTablePropertyInfo as PropertyInfo, VisualSettings } from "sap/ui/mdc/Table";
 
 // Custom Column from Manifest
 type ManifestDefinedCustomColumn = CustomDefinedTableColumn & {
@@ -118,7 +119,7 @@ type BaseTableColumn = ConfigurableObject & {
 	horizontalAlign?: HorizontalAlign;
 	availability?: AvailabilityType;
 	isNavigable?: boolean;
-	caseSensitive: boolean;
+	caseSensitive?: boolean;
 	label?: string;
 	tooltip?: string;
 };
@@ -174,6 +175,7 @@ export type PropertyTypeFormatOptions = Partial<{
 	parseAsString: boolean;
 	emptyString: string;
 	parseKeepsEmptyString: boolean;
+	style: string;
 }>;
 
 export type PropertyTypeConfig = {
@@ -185,85 +187,47 @@ export type PropertyTypeConfig = {
 	className?: keyof typeof DefaultTypeForEdmType;
 };
 
-export type ColumnExportSettings = Partial<{
-	template: string;
-	label: string;
-	wrap: boolean;
-	type: string;
-	inputFormat: string;
-	format: string;
-	scale: number;
-	delimiter: boolean;
-	unit: string;
-	unitProperty: string;
-	timezone: string;
-	timezoneProperty: string;
-	utc: boolean;
-	dataPointTargetValue: string;
-	isCurrency: boolean;
-	property: string[];
-	width: number;
-	autoScale: boolean;
-}>;
+export type ColumnExportSettings = PropertyInfo["exportSettings"] & {
+	dataPointTargetValue?: string;
+	isCurrency?: boolean;
+};
 
 // Properties for Annotation Columns
-export type AnnotationTableColumn = AnnotationTableColumnForOverride & {
-	name: string;
-	propertyInfos?: string[];
-	annotationPath: string;
-	relativePath: string;
-	label?: string;
-	tooltip?: string;
-	groupLabel?: string;
-	group?: string;
-	FieldGroupHiddenExpressions?: CompiledBindingToolkitExpression;
-	showDataFieldsLabel?: boolean;
-	required?: CompiledBindingToolkitExpression;
-	isKey?: boolean;
-	isGroupable?: boolean;
-	unit?: string;
-	unitText?: string;
-	timezoneText?: string;
-	timezone?: string;
-	semanticObjectPath?: string;
-	sortable: boolean;
-	filterable?: boolean;
-	exportSettings?: ColumnExportSettings | null;
-	textArrangement?: {
-		textProperty: string;
-		mode: DisplayMode;
+export type AnnotationTableColumn = PropertyInfo &
+	AnnotationTableColumnForOverride & {
+		name: string;
+		annotationPath: string;
+		relativePath: string;
+		tooltip?: string;
+		groupLabel?: string;
+		group?: string;
+		FieldGroupHiddenExpressions?: CompiledBindingToolkitExpression;
+		showDataFieldsLabel?: boolean;
+		required?: CompiledBindingToolkitExpression;
+		isGroupable?: boolean;
+		unitText?: string;
+		timezoneText?: string;
+		timezone?: string;
+		semanticObjectPath?: string;
+		textArrangement?: {
+			textProperty: string;
+			mode: DisplayMode;
+		};
+		additionalPropertyInfos?: string[];
+		typeConfig?: PropertyTypeConfig;
+		isPartOfLineItem?: boolean; // temporary indicator to only allow filtering on navigation properties when they're part of a line item
+		isPartOfCustomColumn?: boolean;
+		additionalLabels?: string[];
+		exportDataPointTargetValue?: string;
+		extension?: ExtensionForAnalytics;
+		isMultiValue?: boolean;
+		descriptionProperty?: string;
+		mode?: DisplayMode;
+		valueProperty?: string;
 	};
-	additionalPropertyInfos?: string[];
-	visualSettings?: VisualSettings;
-	typeConfig?: PropertyTypeConfig;
-	isPartOfLineItem?: boolean; // temporary indicator to only allow filtering on navigation properties when they're part of a line item
-	isPartOfCustomColumn?: boolean;
-	additionalLabels?: string[];
-	exportDataPointTargetValue?: string;
-	aggregatable?: boolean;
-	extension?: ExtensionForAnalytics;
-	isMultiValue?: boolean;
-};
 
-export type ExtensionForAnalytics = {
+export type ExtensionForAnalytics = PropertyInfo["extension"] & {
 	additionalProperties?: string[];
-	technicallyGroupable?: boolean;
-	technicallyAggregatable?: boolean;
-};
-
-export type VisualSettings = {
-	widthCalculation?: WidthCalculation;
-};
-
-type WidthCalculation = null | {
-	minWidth?: number;
-	maxWidth?: number;
-	defaultWidth?: number;
-	truncateLabel?: boolean;
-	gap?: number;
-	// only relevant for complex types
-	excludeProperties?: string[];
-	verticalArrangement?: boolean;
 };
 
 export type TableColumn = CustomBasedTableColumn | AnnotationTableColumn | ComputedTableColumn;
@@ -577,13 +541,12 @@ const getColumnDefinitionFromProperty = function (
 	relatedPropertiesInfo?: ComplexPropertyInfo,
 	relativePathForMultiValue?: string
 ): AnnotationTableColumn {
-	let name, key;
 	const semanticObjectAnnotationPath = getSemanticObjectPath(converterContext, property);
 	const isHidden = isReferencePropertyStaticallyHidden(property);
 	const groupPath: string | undefined = property.name ? _sliceAtSlash(property.name, true, false) : undefined;
 	const isGroup: boolean = groupPath != property.name;
 	const label = getLabel(property, isGroup);
-	const dataType: string | undefined = getDataFieldDataType(property);
+	const dataType = getDataFieldDataType(property);
 	const propertyTypeConfig = getTypeConfig(property, dataType);
 	const isAPropertyFromTextOnlyAnnotation = displayModeOfDescriptionPropertiesMap[relativePath] === "Description";
 	const sortable =
@@ -594,26 +557,24 @@ const getColumnDefinitionFromProperty = function (
 		formatOptions: propertyTypeConfig.formatOptions,
 		constraints: propertyTypeConfig.constraints
 	};
-	let exportSettings: ColumnExportSettings | null = null;
+	let exportSettings: PropertyInfo["exportSettings"] = null;
 	if (_isExportableColumn(property)) {
 		exportSettings = createColumnExportSettings(property, relatedPropertiesInfo);
 	}
 	const availability: AvailabilityType =
-		!availableForAdaptation || isHidden || displayModeOfDescriptionPropertiesMap[relativePath] ? "Hidden" : "Adaptation";
+		!isHidden && (availableForAdaptation || displayModeOfDescriptionPropertiesMap[relativePath]) ? "Adaptation" : "Hidden";
 	const collectedNavigationPropertyLabels: string[] | undefined = _getCollectedNavigationPropertyLabels(relativePath, converterContext);
 	if (relativePathForMultiValue) {
-		name = relativePathForMultiValue;
-		key = "DataField::" + replaceSpecialChars(relativePathForMultiValue);
 		relativePath = relativePathForMultiValue;
-	} else {
-		name = useDataFieldPrefix ? relativePath : `Property::${relativePath}`;
-		key = (useDataFieldPrefix ? "DataField::" : "Property::") + replaceSpecialChars(relativePath);
 	}
+	const name = useDataFieldPrefix ? relativePath : `Property::${relativePath}`;
+	const key = (useDataFieldPrefix ? "DataField::" : "Property::") + replaceSpecialChars(relativePath);
 
 	const column: AnnotationTableColumn = {
 		key: key,
 		type: ColumnType.Annotation,
-		label: label,
+		dataType: dataType ?? property.type,
+		label: label ?? property.name,
 		groupLabel: isGroup ? getLabel(property) : undefined,
 		group: isGroup ? groupPath : undefined,
 		annotationPath: fullPropertyPath,
@@ -1507,7 +1468,7 @@ const getColumnsFromAnnotations = function (
 		annotationColumns: AnnotationTableColumn[] = [],
 		columnsToBeCreated: Record<string, Property> = {},
 		displayModeOfDescriptionPropertiesMap: Record<string, DisplayMode> = {},
-		restrictionsOnProperties = getRestrictionsOnProperties(converterContext.getEntitySet()),
+		restrictionsOnProperties = getRestrictionsOnProperties(converterContext),
 		tableManifestSettings: TableManifestConfiguration = converterContext.getManifestControlConfiguration(visualizationPath),
 		defaultCreationMode =
 			converterContext.getManifestWrapper().getSapFeManifestConfiguration()?.macros?.table?.defaultCreationMode ===
@@ -1528,7 +1489,7 @@ const getColumnsFromAnnotations = function (
 			if (!_isValidColumn(dataField)) {
 				return;
 			}
-			let exportSettings: ColumnExportSettings | null = null;
+			let exportSettings: PropertyInfo["exportSettings"] = null;
 			const semanticObjectAnnotationPath =
 				isDataFieldTypes(dataField) && dataField.Value?.$target?.fullyQualifiedName
 					? getSemanticObjectPath(converterContext, dataField)
@@ -1540,7 +1501,7 @@ const getColumnsFromAnnotations = function (
 			const additionalPropertyNames: string[] = Object.keys(relatedPropertiesInfo.additionalProperties);
 			const groupPath: string | undefined = relativePath ? _sliceAtSlash(relativePath, true, false) : undefined;
 			const isGroup: boolean = groupPath != relativePath;
-			const sLabel: string | undefined = getLabel(dataField, isGroup);
+			const label = getLabel(dataField, isGroup);
 			const name = _getAnnotationColumnName(dataField);
 			const isFieldGroupColumn: boolean = groupPath ? groupPath.includes(`@${UIAnnotationTerms.FieldGroup}`) : false;
 			const showDataFieldsLabel: boolean | undefined = isFieldGroupColumn
@@ -1600,7 +1561,7 @@ const getColumnsFromAnnotations = function (
 			const column: AnnotationTableColumn = {
 				key: KeyHelper.generateKeyFromDataField(dataField),
 				type: ColumnType.Annotation,
-				label: sLabel,
+				label: label ?? name,
 				groupLabel: isGroup ? getLabel(dataField) : undefined,
 				group: isGroup ? groupPath : undefined,
 				FieldGroupHiddenExpressions: fieldGroupHiddenExpressions,
@@ -1621,12 +1582,13 @@ const getColumnsFromAnnotations = function (
 				formatOptions: formatOptions,
 				caseSensitive: isFilteringCaseSensitive(converterContext),
 				typeConfig: typeConfig,
-				visualSettings: visualSettings,
+				visualSettings: visualSettings as PropertyInfo["visualSettings"],
 				timezoneText: exportSettings?.timezone,
 				isPartOfLineItem: true,
+				dataType: dataType ?? ("Edm.String" as keyof typeof DefaultTypeForEdmType),
 				isMultiValue
 			};
-			const tooltip = _getTooltip(dataField) ?? sLabel;
+			const tooltip = _getTooltip(dataField) ?? label;
 			if (tooltip) {
 				column.tooltip = tooltip;
 			}
@@ -1689,13 +1651,13 @@ const getColumnsFromAnnotations = function (
  * @returns The columns from the annotations
  */
 const _getPropertyNames = function (
-	properties: string[] | undefined,
+	properties: string[] | string | undefined,
 	annotationColumns: AnnotationTableColumn[],
 	converterContext: ConverterContext<PageContextPathTarget>,
 	entityType: EntityType
 ): string[] | undefined {
 	let matchedProperties: string[] | undefined;
-	if (properties) {
+	if (Array.isArray(properties)) {
 		matchedProperties = properties.map(function (propertyPath) {
 			const annotationColumn = annotationColumns.find(function (annotationColumn) {
 				return annotationColumn.relativePath === propertyPath && annotationColumn.propertyInfos === undefined;
@@ -1859,8 +1821,11 @@ const isRequiredColumn = function (
 	return undefined;
 };
 
-const _appendCustomTemplate = function (properties: string[] | undefined, exportProperties: string[] | undefined): string | undefined {
-	if (exportProperties?.length) {
+const _appendCustomTemplate = function (
+	properties: string[] | undefined,
+	exportProperties: string[] | string | undefined
+): string | undefined {
+	if (Array.isArray(exportProperties)) {
 		properties = exportProperties;
 	}
 	if (properties) {
@@ -1904,7 +1869,7 @@ const getColumnsFromManifest = function (
 		return manifestColumn.type === undefined && !!manifestColumn.template;
 	}
 	function _updateLinkedPropertiesOnCustomColumns(propertyInfos: string[], annotationTableColumns: AnnotationTableColumn[]): void {
-		const restrictionsOnProperties = getRestrictionsOnProperties(converterContext.getEntitySet());
+		const restrictionsOnProperties = getRestrictionsOnProperties(converterContext);
 		propertyInfos.forEach((property) => {
 			annotationTableColumns.forEach((prop) => {
 				if (prop.name === property) {