@sapui5/sap.fe.core 1.136.10 → 1.136.11

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

@@ -29,6 +29,7 @@ import {
 	getExpressionFromAnnotation,
 	ifElse,
 	isConstant,
+	isExpressionStaticallyResolvable,
 	not,
 	or,
 	pathInModel,
@@ -1231,8 +1232,7 @@ export function getSelectionMode(
 	visualizationPath: string,
 	converterContext: ConverterContext<PageContextPathTarget>,
 	isEntitySet: boolean,
-	targetCapabilities: TableCapabilityRestriction,
-	deleteButtonVisibilityExpression?: BindingToolkitExpression<boolean>,
+	deleteButtonVisibilityExpression: BindingToolkitExpression<boolean>,
 	massEditVisibilityExpression: BindingToolkitExpression<boolean> = constant(false),
 	cutButtonVisibilityExpression: BindingToolkitExpression<boolean> = constant(false)
 ): string | undefined {
@@ -1240,25 +1240,30 @@ export function getSelectionMode(
 	const tableType = tableManifestSettings.tableSettings?.type;
 	let selectionMode = tableManifestSettings.tableSettings?.selectionMode;
 
-	// The collapse/Expand action of a tree table is a bound action, as a result, a tree table should always have a selection mode to "Multi" when no selectionMode has been set in the manifest
+	// NEW: derive deletable from path expression instead of targetCapabilities.isDeletable
+	let pathDeletableExpression = isPathDeletable(converterContext.getDataModelObjectPath());
+	if (!isExpressionStaticallyResolvable(pathDeletableExpression)) {
+		// dynamic (depends on path/singleton) -> treat as "potentially deletable"
+		pathDeletableExpression = constant(true);
+	}
+	const deletableStaticFalse = isConstant(pathDeletableExpression) && pathDeletableExpression.value === false;
+
+	// TreeTable: default to Multi if not set
 	if (tableType === "TreeTable" && !selectionMode) {
 		return SelectionMode.Multi;
 	}
 
 	// If the selection mode is forced to 'None' in the manifest/macro table parameters, we keep it unless here is a delete button
 	if (!lineItemAnnotation || selectionMode === SelectionMode.None) {
-		if (targetCapabilities.isDeletable && deleteButtonVisibilityExpression) {
-			return compileExpression(ifElse(deleteButtonVisibilityExpression, constant(SelectionMode.Multi), constant(SelectionMode.None)));
-		}
-		return SelectionMode.None;
+		return compileExpression(ifElse(deleteButtonVisibilityExpression, constant(SelectionMode.Multi), constant(SelectionMode.None)));
 	}
 	if (selectionMode === SelectionMode.ForceMulti) {
 		return SelectionMode.Multi;
 	} else if (selectionMode === SelectionMode.ForceSingle) {
 		return SelectionMode.Single;
 	}
-	let aHiddenBindingExpressions: BindingToolkitExpression<boolean>[] = [],
-		aVisibleBindingExpressions: BindingToolkitExpression<boolean>[] = [];
+	let hiddenBindingExpressions: BindingToolkitExpression<boolean>[] = [],
+		visibleBindingExpressions: BindingToolkitExpression<boolean>[] = [];
 	const manifestActions = getActionsFromManifest(
 		converterContext.getManifestControlConfiguration<TableManifestConfiguration>(visualizationPath).actions,
 		converterContext,
@@ -1271,11 +1276,11 @@ export function getSelectionMode(
 		isParentDeletable = isPathDeletable(converterContext.getDataModelObjectPath());
 		parentEntitySetDeletable = isParentDeletable ? compileExpression(isParentDeletable, true) : isParentDeletable;
 	}
-	const bMassEditEnabled: boolean = !isConstant(massEditVisibilityExpression) || massEditVisibilityExpression.value !== false;
+	const massEditEnabled: boolean = !isConstant(massEditVisibilityExpression) || massEditVisibilityExpression.value !== false;
 	if (!selectionMode || selectionMode === SelectionMode.Auto) {
 		selectionMode = SelectionMode.Multi;
 	}
-	if (bMassEditEnabled) {
+	if (massEditEnabled) {
 		// Override default selection mode when mass edit is visible
 		selectionMode = selectionMode === SelectionMode.Single ? SelectionMode.Single : SelectionMode.Multi;
 	}
@@ -1285,25 +1290,24 @@ export function getSelectionMode(
 	) {
 		return selectionMode;
 	}
-	aHiddenBindingExpressions = getUIHiddenExpForActionsRequiringContext(
+	hiddenBindingExpressions = getUIHiddenExpForActionsRequiringContext(
 		lineItemAnnotation,
 		converterContext.getEntityType(),
 		converterContext.getDataModelObjectPath()
 	);
-	aVisibleBindingExpressions = getVisibleExpForCustomActionsRequiringContext(manifestActions.actions);
+	visibleBindingExpressions = getVisibleExpForCustomActionsRequiringContext(manifestActions.actions);
 	// No action requiring a context:
 	if (
-		aHiddenBindingExpressions.length === 0 &&
-		aVisibleBindingExpressions.length === 0 &&
-		(cutButtonVisibilityExpression || deleteButtonVisibilityExpression || bMassEditEnabled)
+		hiddenBindingExpressions.length === 0 &&
+		visibleBindingExpressions.length === 0 &&
+		(cutButtonVisibilityExpression || deleteButtonVisibilityExpression || massEditEnabled)
 	) {
 		if (!isEntitySet) {
-			// Example: OP case
-			if (targetCapabilities.isDeletable || parentEntitySetDeletable !== "false" || bMassEditEnabled) {
-				// Building expression for delete and mass edit
+			// OP case:
+			if (!deletableStaticFalse || parentEntitySetDeletable !== "false" || massEditEnabled) {
 				const buttonVisibilityExpression = or(
 					cutButtonVisibilityExpression || true,
-					deleteButtonVisibilityExpression || true, // default delete visibility as true
+					deleteButtonVisibilityExpression,
 					massEditVisibilityExpression
 				);
 				return compileExpression(
@@ -1314,23 +1318,19 @@ export function getSelectionMode(
 					ifElse(cutButtonVisibilityExpression, constant(SelectionMode.Single), constant(SelectionMode.None))
 				);
 			}
-			// EntitySet deletable:
-		} else if (bMassEditEnabled) {
-			// example: LR scenario
-			return selectionMode;
-		} else if (targetCapabilities.isDeletable && deleteButtonVisibilityExpression) {
-			return compileExpression(ifElse(deleteButtonVisibilityExpression, constant(selectionMode), constant(SelectionMode.None)));
-			// EntitySet not deletable:
 		} else {
-			return SelectionMode.None;
+			// EntitySet case:
+			return compileExpression(
+				ifElse(or(massEditEnabled, deleteButtonVisibilityExpression), constant(selectionMode), constant(SelectionMode.None))
+			);
 		}
 		// There are actions requiring a context:
 	} else if (!isEntitySet) {
-		// Example: OP case
-		if (targetCapabilities.isDeletable || parentEntitySetDeletable !== "false" || bMassEditEnabled) {
+		// OP case:
+		if (!deletableStaticFalse || parentEntitySetDeletable !== "false" || massEditEnabled) {
 			// Use selectionMode in edit mode if delete is enabled or mass edit is visible
 			const editModebuttonVisibilityExpression = ifElse(
-				bMassEditEnabled && !targetCapabilities.isDeletable,
+				massEditEnabled && deletableStaticFalse,
 				massEditVisibilityExpression,
 				constant(true)
 			);
@@ -1339,7 +1339,7 @@ export function getSelectionMode(
 					and(UI.IsEditable, editModebuttonVisibilityExpression),
 					constant(selectionMode),
 					ifElse(
-						or(...aHiddenBindingExpressions.concat(aVisibleBindingExpressions)),
+						or(...hiddenBindingExpressions.concat(visibleBindingExpressions)),
 						constant(selectionMode),
 						constant(SelectionMode.None)
 					)
@@ -1348,23 +1348,23 @@ export function getSelectionMode(
 		} else {
 			return compileExpression(
 				ifElse(
-					or(...aHiddenBindingExpressions.concat(aVisibleBindingExpressions)),
+					or(...hiddenBindingExpressions.concat(visibleBindingExpressions)),
 					constant(selectionMode),
 					constant(SelectionMode.None)
 				)
 			);
 		}
-		//EntitySet deletable:
-	} else if (targetCapabilities.isDeletable || bMassEditEnabled) {
-		// Example: LR scenario
-		return selectionMode;
-		//EntitySet not deletable:
+		// EntitySet
 	} else {
 		return compileExpression(
 			ifElse(
-				or(...aHiddenBindingExpressions.concat(aVisibleBindingExpressions), massEditVisibilityExpression),
+				or(massEditEnabled, deleteButtonVisibilityExpression),
 				constant(selectionMode),
-				constant(SelectionMode.None)
+				ifElse(
+					or(...hiddenBindingExpressions.concat(visibleBindingExpressions), massEditVisibilityExpression),
+					constant(selectionMode),
+					constant(SelectionMode.None)
+				)
 			)
 		);
 	}
@@ -2113,14 +2113,12 @@ export function getTableAnnotationConfiguration(
 	const hasAbsolutePath = navigationPropertyPath.length === 0;
 	const p13nMode = getP13nMode(visualizationPath, converterContext, tableManifestConfiguration);
 	const id = navigationPropertyPath ? getTableID(visualizationPath) : getTableID(converterContext.getContextPath(), "LineItem");
-	const targetCapabilities = getCapabilityRestriction(converterContext);
 	const navigationTargetPath = getNavigationTargetPath(converterContext, navigationPropertyPath);
 	const selectionMode = getSelectionMode(
 		lineItemAnnotation,
 		visualizationPath,
 		converterContext,
 		hasAbsolutePath,
-		targetCapabilities,
 		standardActionsConfiguration.deleteButtonVisibilityExpression,
 		standardActionsConfiguration.massEditButtonVisibilityExpression,
 		standardActionsConfiguration.cutButtonVisibilityExpression
@@ -2397,10 +2395,12 @@ function _useEnabledExpression(dataField: DataFieldForActionTypes, sEntityType:
 function updateTreeTableManifestConfiguration(
 	tableConfiguration: TableControlConfiguration,
 	tableSettings: TableManifestSettingsConfiguration,
-	converterContext: ConverterContext
+	converterContext: ConverterContext,
+	lineItemAnnotation: LineItem | undefined
 ): void {
 	const dataModelObjectPath = converterContext.getDataModelObjectPath();
-	tableConfiguration.hierarchyQualifier = tableSettings.hierarchyQualifier;
+	const entityType = converterContext.getAnnotationEntityType(lineItemAnnotation);
+	tableConfiguration.hierarchyQualifier = getHierarchyQualifier(entityType, tableSettings);
 	const hierarchyParentNavigationPropertyPath = getHierarchyParentNavigationPropertyPath(
 		dataModelObjectPath,
 		tableConfiguration.hierarchyQualifier!
@@ -2478,6 +2478,26 @@ function getOptimisticBatchSettingsFromManifest(tableManifestSettings: TableMani
 	return tableManifestSettings?.tableSettings?.disableRequestCache;
 }
 
+function getHierarchyQualifier(entityType: EntityType, tableSettings: TableManifestSettingsConfiguration): string | undefined {
+	if (tableSettings.hierarchyQualifier) {
+		return tableSettings.hierarchyQualifier;
+	}
+	const aggregationAnnotations = entityType.annotations?.Aggregation;
+	const hierarchyAnnotations = entityType.annotations?.Hierarchy;
+	// We only check the hierarchyQualifier from the manifest when the tree table is specifically set, otherwise we get it from the annotations
+	// if both annotations have the same qualifier, use it
+	// If there is no qualifier or different qualifiers, the hierarchyQualifier remains undefined
+	// Note: In case of multiple hierarchies with the same qualifier, the first one found will be used
+	const qualifiedName =
+		hierarchyAnnotations &&
+		Object.keys(hierarchyAnnotations).find(
+			(key) => key.includes("RecursiveHierarchy#") && aggregationAnnotations && Object.keys(aggregationAnnotations).includes(key)
+		);
+	if (qualifiedName) {
+		return (hierarchyAnnotations as Record<string, { qualifier?: string }>)[qualifiedName]?.qualifier;
+	}
+}
+
 /**
  * Gets the settings coming from the manifest related to the mass edit dialog.
  * @param tableSettings The table configuration
@@ -2644,7 +2664,7 @@ export function getTableManifestConfiguration(
 	tableConfiguration.selectionChange = tableSettings.selectionChange;
 	tableConfiguration.rowPress = tableSettings.rowPress;
 	if (tableType === "TreeTable") {
-		updateTreeTableManifestConfiguration(tableConfiguration, tableSettings, converterContext);
+		updateTreeTableManifestConfiguration(tableConfiguration, tableSettings, converterContext, lineItemAnnotation);
 	}
 
 	if (tableSettings.headerVisible !== undefined) {