@sapui5/sap.fe.core 1.99.0 → 1.100.0

package/src/sap/fe/core/converters/controls/Common/Table.ts

@@ -15,7 +15,8 @@ import {
 	PropertyPath,
 	SelectionVariantType,
 	SelectOptionType,
-	UIAnnotationTypes
+	UIAnnotationTypes,
+	FieldGroupType
 } from "@sap-ux/vocabularies-types";
 import {
 	ActionType,
@@ -23,6 +24,7 @@ import {
 	CreationMode,
 	FormatOptionsType,
 	HorizontalAlign,
+	Importance,
 	ManifestTableColumn,
 	NavigationSettingsConfiguration,
 	NavigationTargetConfiguration,
@@ -101,10 +103,10 @@ import { AggregationHelper } from "../../helpers/Aggregation";
 import { DisplayMode, EDM_TYPE_MAPPING, getDisplayMode } from "sap/fe/core/templating/DisplayModeFormatter";
 import { getMessageTypeFromCriticalityType } from "./Criticality";
 import { FilterFunctions } from "@sap-ux/vocabularies-types/dist/generated/Capabilities";
+import { SemanticKey } from "@sap-ux/vocabularies-types/types/generated/Common";
 import { getNonSortablePropertiesRestrictions } from "sap/fe/core/templating/EntitySetHelper";
 import {
 	generateStandardActionsContext,
-	isExternalCreateConfigured,
 	StandardActionConfigType,
 	getDeleteVisibility,
 	getStandardActionCreate,
@@ -116,7 +118,8 @@ import {
 	getCreateVisibility,
 	isInDisplayMode,
 	getMassEditVisibility,
-	getRestrictions
+	getRestrictions,
+	getCreationRow
 } from "./table/StandardActions";
 
 export type TableAnnotationConfiguration = {
@@ -147,7 +150,7 @@ export type TableAnnotationConfiguration = {
 	aggregateConditions?: string;
 
 	/** Create new entries */
-	create: CreateBehaviour | CreateBehaviourExternal;
+	create: CreateBehavior | CreateBehaviorExternal;
 	title: string;
 	searchable: boolean;
 };
@@ -155,9 +158,9 @@ export type TableAnnotationConfiguration = {
 /**
  * New entries are created within the app (default case)
  */
-type CreateBehaviour = {
+type CreateBehavior = {
 	mode: CreationMode;
-	append: Boolean;
+	append: boolean;
 	newAction?: string;
 	navigateToTarget?: string;
 };
@@ -165,7 +168,7 @@ type CreateBehaviour = {
 /**
  * New entries are created by navigating to some target
  */
-type CreateBehaviourExternal = {
+type CreateBehaviorExternal = {
 	mode: "External";
 	outbound: string;
 	outboundDetail: NavigationTargetConfiguration["outboundDetail"];
@@ -235,6 +238,7 @@ export type BaseTableColumn = ConfigurableObject & {
 	sortable: boolean;
 	horizontalAlign?: HorizontalAlign;
 	formatOptions: FormatOptionsType;
+	importance: string;
 };
 
 export type CustomTableColumn = BaseTableColumn & {
@@ -267,6 +271,8 @@ export type AnnotationTableColumn = BaseTableColumn & {
 		delimiter?: boolean;
 		trueValue?: boolean;
 		falseValue?: boolean;
+		unit?: string;
+		unitProperty?: string;
 	};
 	isDataPointFakeTargetProperty?: boolean;
 	textArrangement?: {
@@ -388,6 +394,7 @@ export function getTableColumns(
 
 	return insertCustomElements(annotationColumns, manifestColumns, {
 		width: "overwrite",
+		importance: "overwrite",
 		isNavigable: "overwrite",
 		availability: "overwrite",
 		settings: "overwrite",
@@ -719,7 +726,7 @@ function getCurrentEntitySetUpdatablePath(converterContext: ConverterContext): s
 	const restrictions = getRestrictions(converterContext);
 	const entitySet = converterContext.getEntitySet();
 	const updatable = restrictions.isUpdatable;
-	const isOnlyDynamicOnCurrentEntity: any = updatable.isOnlyCurrentEntityExpression && !isConstant(updatable.expression);
+	const isOnlyDynamicOnCurrentEntity: any = !isConstant(updatable.expression) && updatable.navigationExpression._type === "Unresolvable";
 	const updatablePropertyPath = (entitySet?.annotations.Capabilities?.UpdateRestrictions?.Updatable as any)?.path;
 
 	return isOnlyDynamicOnCurrentEntity ? (updatablePropertyPath as string) : "";
@@ -966,7 +973,7 @@ export function getSelectionMode(
 	);
 	let isParentDeletable, parentEntitySetDeletable;
 	if (converterContext.getTemplateType() === TemplateType.ObjectPage) {
-		isParentDeletable = isPathDeletable(converterContext.getDataModelObjectPath(), undefined);
+		isParentDeletable = isPathDeletable(converterContext.getDataModelObjectPath());
 		parentEntitySetDeletable = isParentDeletable ? compileBinding(isParentDeletable, true) : isParentDeletable;
 	}
 
@@ -1218,7 +1225,7 @@ function _getCreationBehaviour(
 	const navigation = navigationSettings?.create || navigationSettings?.detail;
 
 	// cross-app
-	if (isExternalCreateConfigured(navigationSettings) && navigation) {
+	if (navigation?.outbound && navigation.outboundDetail && navigationSettings?.create) {
 		return {
 			mode: "External",
 			outbound: navigation.outbound as string,
@@ -1378,6 +1385,13 @@ export const getColumnsFromEntityType = function(
 					wrap: relatedPropertiesInfo.exportSettingsWrapping
 				};
 
+				if (relatedPropertiesInfo.exportUnitName) {
+					columnInfo.exportSettings.unitProperty = relatedPropertiesInfo.exportUnitName;
+					columnInfo.exportSettings.type = "Currency"; // Force to a currency because there's a unitProperty (otherwise the value isn't properly formatted when exported)
+				} else if (relatedPropertiesInfo.exportUnitString) {
+					columnInfo.exportSettings.unit = relatedPropertiesInfo.exportUnitString;
+				}
+
 				// Collect information of related columns to be created.
 				relatedPropertyNames.forEach(name => {
 					columnsToBeCreated[name] = relatedPropertiesInfo.properties[name];
@@ -1404,8 +1418,8 @@ export const getColumnsFromEntityType = function(
  * @param {string} fullPropertyPath The full path to the target property
  * @param {string} relativePath The relative path to the target property based on the context
  * @param {boolean} useDataFieldPrefix Should be prefixed with "DataField::", else it will be prefixed with "Property::"
- * @param {boolean} availableForAdaptation Decides whether column should be available for adaptation
- * @param {string[]} nonSortableColumns The array of all non sortable column names
+ * @param {boolean} availableForAdaptation Decides whether the column should be available for adaptation
+ * @param {string[]} nonSortableColumns The array of all non-sortable column names
  * @param {AggregationHelper} aggregationHelper The aggregationHelper for the entity
  * @param {ConverterContext} converterContext The converter context
  * @returns {AnnotationTableColumn} The annotation column definition
@@ -1438,7 +1452,7 @@ const getColumnDefinitionFromProperty = function(
 				oConstraints: propertyTypeConfig.constraints
 		  }
 		: undefined;
-	const exportSettings = isDataPointFakeProperty
+	const exportSettings: any = isDataPointFakeProperty
 		? {
 				template: getTargetValueOnDataPoint(property)
 		  }
@@ -1451,6 +1465,17 @@ const getColumnDefinitionFromProperty = function(
 				falseValue: property.type === "Edm.Boolean" ? "No" : undefined
 		  };
 
+	if (!isDataPointFakeProperty) {
+		const oUnitProperty = getAssociatedCurrencyProperty(property) || getAssociatedUnitProperty(property);
+		const sUnitText = property?.annotations?.Measures?.ISOCurrency || property?.annotations?.Measures?.Unit;
+		if (oUnitProperty) {
+			exportSettings.unitProperty = oUnitProperty.name;
+			exportSettings.type = "Currency"; // Force to a currency because there's a unitProperty (otherwise the value isn't properly formatted when exported)
+		} else if (sUnitText) {
+			exportSettings.unit = `${sUnitText}`;
+		}
+	}
+
 	const oColumn: any = {
 		key: key,
 		isGroupable: !isDataPointFakeProperty && !isHidden ? aggregationHelper.isPropertyGroupable(property) : false,
@@ -1497,7 +1522,6 @@ const _isValidColumn = function(dataField: DataFieldAbstractTypes) {
 			return !!dataField.Inline;
 		case UIAnnotationTypes.DataFieldWithAction:
 		case UIAnnotationTypes.DataFieldWithIntentBasedNavigation:
-			return false;
 		case UIAnnotationTypes.DataField:
 		case UIAnnotationTypes.DataFieldWithUrl:
 		case UIAnnotationTypes.DataFieldForAnnotation:
@@ -1562,7 +1586,7 @@ export const _getVisibleExpression = function(
 			or(not(isAnalyticalGroupHeaderExpanded), isAnalyticalLeaf)
 		]
 	);
-	return returnExpression ? (expression as BindingExpression<string>) : compileBinding(expression);
+	return returnExpression ? ((expression as any) as BindingExpression<string>) : compileBinding(expression);
 };
 
 /**
@@ -1587,7 +1611,7 @@ const _getFieldGroupHiddenExpressions = function(
 			);
 		});
 		return compileBinding(
-			ifElse(or(...(aFieldGroupHiddenExpressions as ExpressionOrPrimitive<boolean>[])), constant(true), constant(false))
+			ifElse(or(...((aFieldGroupHiddenExpressions as any) as ExpressionOrPrimitive<boolean>[])), constant(true), constant(false))
 		);
 	} else {
 		return undefined;
@@ -1653,7 +1677,12 @@ const _getTooltip = function(source: DataFieldAbstractTypes | Property): string
 		return undefined;
 	}
 };
-
+export function getRowStatusVisibility(): Expression<boolean> {
+	return formatResult(
+		[bindingExpression(`semanticKeyHasDraftIndicator`, "internal"), bindingExpression(`filteredMessages`, "internal")],
+		tableFormatters.getErrorStatusTextVisibilityFormatter
+	);
+}
 /**
  * Creates a PropertyInfo for each identified property consumed by a LineItem.
  *
@@ -1790,6 +1819,8 @@ const _getRelativePath = function(dataField: DataFieldAbstractTypes): string {
 		case UIAnnotationTypes.DataField:
 		case UIAnnotationTypes.DataFieldWithNavigationPath:
 		case UIAnnotationTypes.DataFieldWithUrl:
+		case UIAnnotationTypes.DataFieldWithIntentBasedNavigation:
+		case UIAnnotationTypes.DataFieldWithAction:
 			relativePath = (dataField as DataField)?.Value?.path;
 			break;
 
@@ -1888,13 +1919,72 @@ function getDefaultDraftIndicatorForColumn(name: string, semanticKeys: any[]) {
 	if (bSemanticKeyFound) {
 		return {
 			hasDraftIndicator: true,
-			semantickeys: aSemanticKeyValues
+			semantickeys: aSemanticKeyValues,
+			objectStatusTextVisibility: compileBinding(getRowStatusVisibility())
 		};
 	} else {
 		return {};
 	}
 }
 
+/**
+ * Returns the importance value for an annotation column.
+ * If it is not set explicitly via annotations, the default annotation importance is returned.
+ *
+ * @param lineItem
+ * @param semanticKeys
+ * @returns {Importance} The importance value
+ */
+function _getAnnotationImportance(lineItem: DataFieldAbstractTypes, semanticKeys: SemanticKey): Importance {
+	switch (lineItem.annotations?.UI?.Importance) {
+		case "UI.ImportanceType/High":
+			return Importance.High;
+		case "UI.ImportanceType/Medium":
+			return Importance.Medium;
+		case "UI.ImportanceType/Low":
+			return Importance.Low;
+		default:
+			return _getDefaultAnnotationImportance(lineItem, semanticKeys);
+	}
+}
+
+/**
+ * Returns the default importance value for an annotation column as inferred by semantic key configurations.
+ *
+ * @param lineItem
+ * @param semanticKeys
+ * @returns {Importance} The importance value
+ */
+function _getDefaultAnnotationImportance(lineItem: DataFieldAbstractTypes, semanticKeys: SemanticKey): Importance {
+	//Check if semanticKeys are defined at the EntitySet level
+	if (!semanticKeys || semanticKeys.length === 0) {
+		return Importance.None;
+	}
+
+	if (lineItem.$Type === UIAnnotationTypes.DataFieldForAnnotation) {
+		const targetDataField = (lineItem as DataFieldForAnnotation).Target?.$target;
+
+		//If a FieldGroup contains a semanticKey, importance set to High
+		if (targetDataField.$Type === UIAnnotationTypes.FieldGroupType) {
+			return ((targetDataField as unknown) as FieldGroupType).Data.some((dataField: DataFieldAbstractTypes) => {
+				return (
+					dataField.$Type !== UIAnnotationTypes.DataFieldForAnnotation &&
+					((dataField as unknown) as DataFieldTypes).Value &&
+					((dataField as unknown) as DataFieldTypes).Value.path &&
+					semanticKeys.find(semanticKey => semanticKey.value === ((dataField as unknown) as DataFieldTypes).Value.path)
+				);
+			})
+				? Importance.High
+				: Importance.None;
+		}
+	}
+
+	//If current field is a semanticKey, importance set to High
+	return semanticKeys.find(semanticKey => semanticKey.value === (lineItem as DataFieldTypes).Value?.path)
+		? Importance.High
+		: Importance.None;
+}
+
 /**
  * Returns line items from metadata annotations.
  *
@@ -1914,7 +2004,7 @@ const getColumnsFromAnnotations = function(
 		nonSortableColumns: string[] = getNonSortablePropertiesRestrictions(converterContext.getEntitySet()),
 		tableManifestSettings: TableManifestConfiguration = converterContext.getManifestControlConfiguration(visualizationPath),
 		tableType: TableType = tableManifestSettings?.tableSettings?.type || "ResponsiveTable";
-	const semanticKeys = converterContext.getAnnotationsByTerm("Common", "com.sap.vocabularies.Common.v1.SemanticKey", [
+	const semanticKeys: SemanticKey = converterContext.getAnnotationsByTerm("Common", "com.sap.vocabularies.Common.v1.SemanticKey", [
 		converterContext.getEntityType()
 	])[0];
 	if (lineItemAnnotation) {
@@ -1952,7 +2042,7 @@ const getColumnsFromAnnotations = function(
 			) {
 				fieldGroupHiddenExpressions = _getFieldGroupHiddenExpressions(lineItem, formatOptions);
 			}
-			const exportSettings = {
+			const exportSettings: any = {
 				template: relatedPropertiesInfo.exportSettingsTemplate,
 				wrap: relatedPropertiesInfo.exportSettingsWrapping,
 				type: dataType ? _getExportDataType(dataType, relatedPropertyNames.length > 1) : undefined,
@@ -1961,6 +2051,13 @@ const getColumnsFromAnnotations = function(
 				trueValue: dataType === "Edm.Boolean" ? "Yes" : undefined,
 				falseValue: dataType === "Edm.Boolean" ? "No" : undefined
 			};
+
+			if (relatedPropertiesInfo.exportUnitName) {
+				exportSettings.unitProperty = relatedPropertiesInfo.exportUnitName;
+				exportSettings.type = "Currency"; // Force to a currency because there's a unitProperty (otherwise the value isn't properly formatted when exported)
+			} else if (relatedPropertiesInfo.exportUnitString) {
+				exportSettings.unit = relatedPropertiesInfo.exportUnitString;
+			}
 			const propertyTypeConfig = dataType && getTypeConfig(lineItem, dataType);
 			const oTypeConfig = propertyTypeConfig
 				? {
@@ -1977,7 +2074,7 @@ const getColumnsFromAnnotations = function(
 				// In case of text arrangement annotation with display mode as text only, exclude text property from the width calculation
 				visualSettings = {
 					widthCalculation: {
-						excludeProperties: "Property::" + relatedPropertiesInfo.visualSettingsToBeExcluded
+						excludeProperties: ["Property::" + relatedPropertiesInfo.visualSettingsToBeExcluded]
 					}
 				};
 			} else if (!dataType || !oTypeConfig) {
@@ -2015,6 +2112,7 @@ const getColumnsFromAnnotations = function(
 				additionalPropertyInfos: additionalPropertyNames.length > 0 ? additionalPropertyNames : undefined,
 				exportSettings: exportSettings,
 				width: lineItem.annotations?.HTML5?.CssDefaults?.width || widthOverride || undefined,
+				importance: _getAnnotationImportance(lineItem, semanticKeys),
 				isNavigable: true,
 				formatOptions: formatOptions,
 				exportContactProperty: relatedPropertiesInfo.exportSettingsContactProperty,
@@ -2158,7 +2256,7 @@ const getColumnsFromManifest = function(
 			converterContext,
 			entityType
 		);
-		if (!manifestColumn?.template && !isAnnotationColumn) {
+		if (!manifestColumn?.template && manifestColumn?.type !== "Slot" && !isAnnotationColumn) {
 			const Message = "The annotation column '" + key + "' referenced in the manifest is not found";
 			converterContext
 				.getDiagnostics()
@@ -2176,6 +2274,7 @@ const getColumnsFromManifest = function(
 				name: "CustomColumn::" + key,
 				header: manifestColumn.header,
 				width: manifestColumn.width || undefined,
+				importance: _getManifestOrDefaultValue(manifestColumn?.importance, Importance.None, isAnnotationColumn),
 				horizontalAlign: _getManifestOrDefaultValue(manifestColumn?.horizontalAlign, HorizontalAlign.Begin, isAnnotationColumn),
 				type: manifestColumn.type === "Slot" ? ColumnType.Slot : ColumnType.Default,
 				availability: _getManifestOrDefaultValue(manifestColumn?.availability, AvailabilityType.Default, isAnnotationColumn),
@@ -2188,10 +2287,14 @@ const getColumnsFromManifest = function(
 				settings: manifestColumn.settings,
 				sortable: false,
 				propertyInfos: propertyInfos,
-				formatOptions: {
-					...getDefaultFormatOptionsForTable(),
-					...manifestColumn.formatOptions
-				},
+				formatOptions: _getManifestOrDefaultValue(
+					manifestColumn.formatOptions,
+					{
+						...getDefaultFormatOptionsForTable(),
+						...manifestColumn.formatOptions
+					},
+					isAnnotationColumn
+				),
 				exportSettings: {
 					template: propertyInfos ? _appendCustomTemplate(propertyInfos) : undefined,
 					fieldLabel: propertyInfos ? manifestColumn.header : undefined,
@@ -2407,9 +2510,10 @@ export function getTableAnnotationConfiguration(
 	const targetCapabilities = getCapabilityRestriction(converterContext);
 	const navigationTargetPath = getNavigationTargetPath(converterContext, navigationPropertyPath);
 	const navigationSettings = pageManifestSettings.getNavigationConfiguration(navigationTargetPath);
+	const creationBehaviour = _getCreationBehaviour(lineItemAnnotation, tableManifestConfiguration, converterContext, navigationSettings);
 	const standardActionsContext = generateStandardActionsContext(
 		converterContext,
-		navigationSettings,
+		creationBehaviour.mode as CreationMode,
 		tableManifestConfiguration,
 		viewConfiguration
 	);
@@ -2437,14 +2541,14 @@ export function getTableAnnotationConfiguration(
 		threshold = presentationVariantAnnotation.MaxItems.valueOf() as number;
 	}
 
-	const creationBehaviour = _getCreationBehaviour(lineItemAnnotation, tableManifestConfiguration, converterContext, navigationSettings);
 	const variantManagement: VariantManagementType = pageManifestSettings.getVariantManagement();
 	const isSearchable = isPathSearchable(converterContext.getDataModelObjectPath());
 	const standardActions = {
 		create: getStandardActionCreate(converterContext, standardActionsContext),
 		"delete": getStandardActionDelete(converterContext, standardActionsContext),
 		paste: getStandardActionPaste(converterContext, standardActionsContext, isInsertUpdateTemplated),
-		massEdit: getStandardActionMassEdit(converterContext, standardActionsContext)
+		massEdit: getStandardActionMassEdit(converterContext, standardActionsContext),
+		creationRow: getCreationRow(converterContext, standardActionsContext)
 	};
 
 	return {
@@ -2615,6 +2719,7 @@ function _getTableType(
 	}
 	return tableType;
 }
+
 function _getFilters(
 	tableSettings: TableManifestSettingsConfiguration,
 	quickFilterPaths: { annotationPath: string }[],