@sapui5/sap.fe.macros 1.142.0 → 1.142.1

package/src/sap/fe/macros/table/MdcTableTemplate.tsx

@@ -5,6 +5,7 @@ import type {
 	DataField,
 	DataFieldForAction,
 	DataFieldForAnnotation,
+	DataFieldTypes,
 	DataPoint,
 	FieldGroup,
 	LineItem,
@@ -90,6 +91,7 @@ import ContextMenuSetting from "sap/m/plugins/ContextMenuSetting";
 import CopyProvider from "sap/m/plugins/CopyProvider";
 import DataStateIndicator from "sap/m/plugins/DataStateIndicator";
 import type Control from "sap/ui/core/Control";
+import type CustomData from "sap/ui/core/CustomData";
 import type UI5Element from "sap/ui/core/Element";
 import Library from "sap/ui/core/Lib";
 import type { TitleLevel } from "sap/ui/core/library";
@@ -852,7 +854,6 @@ function getActionCommand(
 			onExecuteAction: parameters.handlerProvider.getDataFieldForActionButtonPressHandler(
 				dataField as DataFieldForAction,
 				action,
-				undefined,
 				forContextMenu
 			),
 			onExecuteIBN: parameters.handlerProvider.getDataFieldForIBNPressHandler(action, false),
@@ -1138,6 +1139,7 @@ function getCreationTemplate(
  * @param tableDefinition The table definition
  * @param column The column definition
  * @param dataFieldContext The data field context
+ * @param dataFieldObjectPath The data field object path
  * @param collection The collection context
  * @param enableAnalytics Whether analytics are enabled
  * @param tableType The type of the table
@@ -1150,6 +1152,7 @@ function getCreationTemplate(
  * @param showEmptyIndicator Whether to show the empty indicator
  * @param className
  * @param handlerProvider The handler provider
+ * @param isConnectedField Indicates if the field is a connected field
  * @returns The XML string representing the field.
  */
 export function getMacroFieldTemplate(
@@ -1157,6 +1160,7 @@ export function getMacroFieldTemplate(
 	tableDefinition: TableVisualization,
 	column: AnnotationTableColumn,
 	dataFieldContext: Context,
+	dataFieldObjectPath: DataModelObjectPath<DataFieldAbstractTypes>,
 	collection: Context,
 	enableAnalytics: boolean | undefined,
 	tableType: TableType,
@@ -1212,6 +1216,19 @@ export function getMacroFieldTemplate(
 		isAnalyticalAggregatedRow: tableDefinition.control.analyticalConfiguration?.aggregationOnLeafLevel,
 		reactiveAreaMode: reactiveAreaMode
 	};
+	let customData: CustomData | undefined;
+
+	// In case we display a property with TextOnly text arragement in a non-analytical table, we still load the original property (using custom data)
+	// to make sure intent-based navigation can use the value of the original property an not just its text representation.
+	// For analytical tables, this is done by adding the original property as a context-defining property for the text property in the table converter (getExtensionInfoFromEntityType)
+	if (
+		tableDefinition.enableAnalytics !== true &&
+		(
+			dataFieldObjectPath.targetObject as DataFieldTypes | undefined
+		)?.Value?.$target?.annotations?.Common?.Text?.annotations?.UI?.TextArrangement?.valueOf() === "UI.TextArrangementType/TextOnly"
+	) {
+		customData = createCustomData("extraProperty", `{${(dataFieldObjectPath.targetObject as DataFieldTypes).Value.path}}`);
+	}
 	return (
 		<Field
 			vhIdPrefix={generate([tableId, "TableValueHelp"])}
@@ -1228,7 +1245,8 @@ export function getMacroFieldTemplate(
 			disableStrictHandling={column.disableStrictHandling}
 		>
 			{{
-				formatOptions: <FieldFormatOptions {...formatOptions} />
+				formatOptions: <FieldFormatOptions {...formatOptions} />,
+				customData
 			}}
 		</Field>
 	);
@@ -1332,7 +1350,7 @@ function getColumnContentTemplate(
 			.createBindingContext(dataFieldContext.getPath() + "/Target/$AnnotationPath/Data");
 		const fieldGroupCollectionLength = fieldGroup.Data.length - 1;
 
-		const items = fieldGroup.Data.map((fieldGroupDataField: DataFieldAbstractTypes, fieldGroupDataFieldIdx: number) => {
+		const items = fieldGroup.Data.map((_fieldGroupDataField: DataFieldAbstractTypes, fieldGroupDataFieldIdx: number) => {
 			const fieldGroupDataFieldContext = dataFieldCollectionContext
 				.getModel()
 				.createBindingContext(dataFieldCollectionContext.getPath() + "/" + fieldGroupDataFieldIdx);
@@ -1363,6 +1381,7 @@ function getColumnContentTemplate(
 									tableDefinition,
 									column,
 									fieldGroupDataFieldContext,
+									fieldGroupDataFieldOP,
 									collection,
 									enableAnalytics,
 									tableType,
@@ -1392,6 +1411,7 @@ function getColumnContentTemplate(
 					tableDefinition,
 					column,
 					fieldGroupDataFieldContext,
+					fieldGroupDataFieldOP,
 					collection,
 					enableAnalytics,
 					tableType,
@@ -1447,11 +1467,13 @@ function getColumnContentTemplate(
 			const connectedFieldsElementContext = dataFieldContext
 				.getModel()
 				.createBindingContext(`${connectedFieldsContext.getPath()}/${(connectedFieldsElement as DataField)?.Value?.path}`);
+			const connectedFieldsElementOP = getInvolvedDataModelObjects<DataFieldAbstractTypes>(connectedFieldsElementContext);
 			const fieldTemplate = getMacroFieldTemplate(
 				tableId,
 				tableDefinition,
 				column,
 				connectedFieldsElementContext,
+				connectedFieldsElementOP,
 				collection,
 				enableAnalytics,
 				tableType,
@@ -1548,6 +1570,7 @@ function getColumnContentTemplate(
 			tableDefinition,
 			column,
 			dataFieldContext,
+			dataFieldOP,
 			collection,
 			enableAnalytics,
 			tableType,
@@ -1854,7 +1877,10 @@ export function getMDCTableTemplate(tableProperties: TableBlockProperties, param
 		{ key: "updatablePropertyPath", value: updatablePropertyPath || "" },
 		{ key: "exportRequestSize", value: tableProperties.tableDefinition.control.exportRequestSize }
 	];
-
+	let rowPressHandler;
+	if (tableType === "ResponsiveTable") {
+		rowPressHandler = parameters.handlerProvider.rowPress ? parameters.handlerProvider.noop : undefined;
+	}
 	return (
 		<MDCTable
 			core:require={getCoreRequire(tableProperties.tableDefinition)}
@@ -1867,6 +1893,7 @@ export function getMDCTableTemplate(tableProperties: TableBlockProperties, param
 			busyIndicatorDelay={0}
 			enableExport={tableProperties.tableDefinition.control.enableExport}
 			delegate={JSON.parse(delegate)}
+			rowPress={rowPressHandler}
 			beforeOpenContextMenu={parameters.handlerProvider.beforeOpenContextMenu}
 			autoBindOnInit={tableProperties.useBasicSearch || !tableProperties.filterBar}
 			selectionMode={tableProperties.tableDefinition.annotation.selectionMode || "None"}