@sapui5/sap.fe.core 1.136.0 → 1.136.1

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

@@ -26,7 +26,8 @@ import {
 	ifElse,
 	not,
 	or,
-	pathInModel
+	pathInModel,
+	setUpConstraints
 } from "sap/fe/base/BindingToolkit";
 import type ConverterContext from "sap/fe/core/converters/ConverterContext";
 import type {
@@ -100,6 +101,7 @@ import type { DefaultTypeForEdmType } from "sap/fe/core/type/EDM";
 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";
+import type SimpleType from "sap/ui/model/SimpleType";
 
 // Custom Column from Manifest
 type ManifestDefinedCustomColumn = CustomDefinedTableColumn & {
@@ -161,7 +163,7 @@ type AnnotationTableColumnForOverride = BaseTableColumn & {
 	exportSettings?: ColumnExportSettings | null;
 };
 
-type PropertyTypeConstraints = Partial<{
+export type PropertyTypeConstraints = Partial<{
 	scale: number;
 	precision: number;
 	maxLength: number;
@@ -180,9 +182,9 @@ export type PropertyTypeFormatOptions = Partial<{
 
 export type PropertyTypeConfig = {
 	type?: string;
-	constraints: PropertyTypeConstraints;
-	formatOptions: PropertyTypeFormatOptions;
-	typeInstance?: unknown;
+	constraints?: PropertyTypeConstraints;
+	formatOptions?: PropertyTypeFormatOptions;
+	typeInstance?: SimpleType;
 	baseType?: string;
 	className?: keyof typeof DefaultTypeForEdmType;
 };
@@ -463,8 +465,6 @@ export const getColumnsFromEntityType = function (
 					columnsToBeCreated[name] = relatedPropertiesInfo.properties[name].annotationProperty;
 				});
 			}
-			// update Property Label when it's referenced only once in a column, new label will be the label of the column
-			updatePropertyLabel(annotationColumns, columnsToBeCreated, columnInfo);
 			if (additionalPropertyNames.length > 0) {
 				columnInfo.additionalPropertyInfos = additionalPropertyNames;
 				// Create columns for additional properties identified for ALP use case.
@@ -551,7 +551,7 @@ const getColumnDefinitionFromProperty = function (
 	const isAPropertyFromTextOnlyAnnotation = displayModeOfDescriptionPropertiesMap[relativePath] === "Description";
 	const sortable =
 		(!isHidden || isAPropertyFromTextOnlyAnnotation) && !restrictionsOnProperties?.nonSortableProperties.includes(relativePath);
-	const filterable = !isAPropertyFromTextOnlyAnnotation && !restrictionsOnProperties?.nonFilterableProperties.includes(relativePath);
+	const filterable = !restrictionsOnProperties?.nonFilterableProperties.includes(relativePath);
 	const typeConfig = {
 		className: property.type || dataType,
 		formatOptions: propertyTypeConfig.formatOptions,
@@ -561,8 +561,7 @@ const getColumnDefinitionFromProperty = function (
 	if (_isExportableColumn(property)) {
 		exportSettings = createColumnExportSettings(property, relatedPropertiesInfo);
 	}
-	const availability: AvailabilityType =
-		!isHidden && (availableForAdaptation || displayModeOfDescriptionPropertiesMap[relativePath]) ? "Adaptation" : "Hidden";
+	const availability = !isHidden && availableForAdaptation ? "Adaptation" : "Hidden";
 	const collectedNavigationPropertyLabels: string[] | undefined = _getCollectedNavigationPropertyLabels(relativePath, converterContext);
 	if (relativePathForMultiValue) {
 		relativePath = relativePathForMultiValue;
@@ -699,33 +698,6 @@ const removeUndefinedFromExportSettings = function (exportSettings: ColumnExport
 	return exportSettings;
 };
 
-/**
- * Update property label in case it's only referenced in one column. The label of the column must be used instead of the property label.
- * This update also is applied for the tooltip as it is based on the column's label.
- * @param annotationColumns The array of columns created based on LineItem annotations.
- * @param columnsToBeCreated The columns to be created
- * @param columnInfo The column definition
- * @param columnName The name of the column
- */
-function updatePropertyLabel(
-	annotationColumns: AnnotationTableColumn[],
-	columnsToBeCreated: Record<string, Property>,
-	columnInfo: AnnotationTableColumn,
-	columnName?: string
-): void {
-	const linkedAnnotationColumns = annotationColumns.filter(
-		(col) => col.propertyInfos?.includes(columnInfo.relativePath) || (columnName && col.propertyInfos?.includes(columnName))
-	);
-	if (
-		linkedAnnotationColumns?.length === 1 &&
-		(columnsToBeCreated[columnInfo.relativePath] || (columnName && columnsToBeCreated[columnName])) &&
-		linkedAnnotationColumns[0].propertyInfos?.length === 1
-	) {
-		columnInfo.label = linkedAnnotationColumns[0].label;
-		columnInfo.tooltip = linkedAnnotationColumns[0].tooltip;
-	}
-}
-
 /**
  * Returns Boolean true for exportable columns, false for non exportable columns.
  * @param source The dataField or property to be evaluated
@@ -989,7 +961,6 @@ const _createRelatedColumns = function (
 				newNameRelativeTargetPath
 			);
 			computeHiddenOnRelatedColumns(existingColumns, name, column);
-			updatePropertyLabel(existingColumns, columnsToBeCreated, column, name);
 			relatedColumns.push(column);
 			relatedPropertyNameMap[name] = newNameRelativeTargetPath ?? name;
 		} else if (relatedColumn === undefined) {
@@ -1008,7 +979,6 @@ const _createRelatedColumns = function (
 				tableCreationMode
 			);
 			computeHiddenOnRelatedColumns(existingColumns, name, column);
-			updatePropertyLabel(existingColumns, columnsToBeCreated, column);
 			relatedColumns.push(column);
 		} else if (relatedColumn.annotationPath !== annotationPath || relatedColumn.propertyInfos) {
 			// Case 2: The existing column points to a LineItem (or)
@@ -1031,7 +1001,6 @@ const _createRelatedColumns = function (
 					tableCreationMode
 				);
 				computeHiddenOnRelatedColumns(existingColumns, name, column);
-				updatePropertyLabel(existingColumns, columnsToBeCreated, column);
 				relatedColumns.push(column);
 				relatedPropertyNameMap[name] = newName;
 			} else if (
@@ -1040,28 +1009,6 @@ const _createRelatedColumns = function (
 			) {
 				relatedPropertyNameMap[name] = newName;
 			}
-		} else if (
-			displayModeOfDescriptionPropertiesMap[name] === "Description" &&
-			!relatedColumn.filterable &&
-			!restrictionsOnProperties?.nonFilterableProperties.includes(name)
-		) {
-			// Case 4: The column is a referenced text only property. Set it to hidden, non sortable nor groupable.
-			// Case 5: The column isn't already available for filtering as it could be referenced on another column (e.g. text first).
-			restrictionsOnProperties?.nonSortableProperties.push(name);
-			const column = getColumnDefinitionFromProperty(
-				property,
-				annotationPath,
-				name,
-				false,
-				false,
-				aggregationHelper,
-				converterContext,
-				{},
-				restrictionsOnProperties,
-				tableCreationMode
-			);
-			column.isGroupable = false;
-			relatedColumns.push(column);
 		}
 	});
 	// The property 'name' has been prefixed with 'Property::' for uniqueness.
@@ -1547,7 +1494,7 @@ const getColumnsFromAnnotations = function (
 					...formatOptions,
 					...propertyTypeConfig?.formatOptions
 				},
-				constraints: { ...propertyTypeConfig?.constraints }
+				constraints: propertyTypeConfig?.constraints
 			};
 			const visualSettings: VisualSettings = {};
 			if (!dataType || !typeConfig) {
@@ -2231,61 +2178,46 @@ function createPropertyAnnotatedTextOnly(
 	}
 }
 
-export function getTypeConfig(oProperty: Property | DataFieldAbstractTypes | undefined, dataType: string | undefined): PropertyTypeConfig {
-	let oTargetMapping;
-	if (isProperty(oProperty)) {
-		oTargetMapping = isTypeDefinition(oProperty.targetType)
-			? EDM_TYPE_MAPPING[oProperty.targetType.underlyingType]
-			: EDM_TYPE_MAPPING[oProperty.type];
+/**
+ * Retrieves the property type configuration based on the provided property or data type.
+ * @param property The property or data field to determine the type configuration for.
+ * @param dataType The data type to use for type configuration if not determined from the property.
+ * @returns The property type configuration object.
+ */
+export function getTypeConfig(property: Property | DataFieldAbstractTypes | undefined, dataType?: string): PropertyTypeConfig {
+	let targetMapping,
+		formatOptions: PropertyTypeFormatOptions | undefined = {};
+	if (isProperty(property)) {
+		targetMapping = isTypeDefinition(property.targetType)
+			? EDM_TYPE_MAPPING[property.targetType.underlyingType]
+			: EDM_TYPE_MAPPING[property.type];
 	}
-	if (oTargetMapping === undefined && dataType !== undefined) {
-		oTargetMapping = EDM_TYPE_MAPPING[dataType];
+	if (!targetMapping && dataType !== undefined) {
+		targetMapping = EDM_TYPE_MAPPING[dataType];
 	}
 	const propertyTypeConfig: PropertyTypeConfig = {
-		type: oTargetMapping?.type,
-		constraints: {},
-		formatOptions: {}
+		type: targetMapping?.type
 	};
-	if (isProperty(oProperty) && oTargetMapping !== undefined) {
-		propertyTypeConfig.constraints = {
-			scale: oTargetMapping.constraints?.$Scale ? oProperty.scale : undefined,
-			precision: oTargetMapping.constraints?.$Precision ? oProperty.precision : undefined,
-			maxLength: oTargetMapping.constraints?.$MaxLength ? oProperty.maxLength : undefined,
-			nullable: oTargetMapping.constraints?.$Nullable ? oProperty.nullable : undefined,
-			minimum:
-				oTargetMapping.constraints?.["@Org.OData.Validation.V1.Minimum/$Decimal"] &&
-				!isNaN(oProperty.annotations?.Validation?.Minimum)
-					? `${oProperty.annotations?.Validation?.Minimum}`
-					: undefined,
-			maximum:
-				oTargetMapping.constraints?.["@Org.OData.Validation.V1.Maximum/$Decimal"] &&
-				!isNaN(oProperty.annotations?.Validation?.Maximum)
-					? `${oProperty.annotations?.Validation?.Maximum}`
-					: undefined,
-			isDigitSequence:
-				propertyTypeConfig.type === "sap.ui.model.odata.type.String" &&
-				oTargetMapping.constraints?.[`@${CommonAnnotationTerms.IsDigitSequence}`] &&
-				oProperty.annotations?.Common?.IsDigitSequence
-					? true
-					: undefined
-		};
+	if (targetMapping && isProperty(property)) {
+		const constraints = setUpConstraints(targetMapping, property);
+		if (Object.keys(constraints).length) {
+			propertyTypeConfig.constraints = constraints;
+		}
 	}
-	propertyTypeConfig.formatOptions = {
-		parseAsString:
+	if (propertyTypeConfig.type !== "sap.ui.model.odata.type.Stream") {
+		if (
 			propertyTypeConfig?.type?.indexOf("sap.ui.model.odata.type.Int") === 0 ||
 			propertyTypeConfig?.type?.indexOf("sap.ui.model.odata.type.Double") === 0
-				? false
-				: undefined,
-		emptyString:
-			propertyTypeConfig?.type?.indexOf("sap.ui.model.odata.type.Int") === 0 ||
-			propertyTypeConfig?.type?.indexOf("sap.ui.model.odata.type.Double") === 0
-				? ""
-				: undefined,
-		parseKeepsEmptyString:
-			propertyTypeConfig.type === "sap.ui.model.odata.type.String" && propertyTypeConfig.constraints.nullable === false
-				? true
-				: undefined
-	};
+		) {
+			formatOptions = { parseAsString: false, emptyString: "" };
+		}
+		if (propertyTypeConfig.type === "sap.ui.model.odata.type.String" && propertyTypeConfig.constraints?.nullable === false) {
+			formatOptions = { parseKeepsEmptyString: true };
+		}
+	}
+	if (Object.keys(formatOptions).length) {
+		propertyTypeConfig.formatOptions = formatOptions;
+	}
 	return propertyTypeConfig;
 }