@sapui5/sap.fe.core 1.108.2 → 1.110.0

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

@@ -49,7 +49,7 @@ export type StandardActionsContext = {
 	collectionPath: string;
 	hiddenAnnotation: {
 		create: BindingToolkitExpression<boolean>;
-		"delete": BindingToolkitExpression<boolean>;
+		delete: BindingToolkitExpression<boolean>;
 		update: BindingToolkitExpression<boolean>;
 	};
 	creationMode: CreationMode;
@@ -82,7 +82,7 @@ export function generateStandardActionsContext(
 		collectionPath: getTargetObjectPath(converterContext.getDataModelObjectPath()),
 		hiddenAnnotation: {
 			create: isActionAnnotatedHidden(converterContext, AnnotationHiddenProperty.CreateHidden),
-			"delete": isActionAnnotatedHidden(converterContext, AnnotationHiddenProperty.DeleteHidden),
+			delete: isActionAnnotatedHidden(converterContext, AnnotationHiddenProperty.DeleteHidden),
 			update: isActionAnnotatedHidden(converterContext, AnnotationHiddenProperty.UpdateHidden)
 		},
 		creationMode: creationMode,
@@ -177,15 +177,15 @@ export function getRestrictions(converterContext: ConverterContext): StandardAct
 	const restrictionsDef = [
 		{
 			key: "isInsertable",
-			"function": isPathInsertable
+			function: isPathInsertable
 		},
 		{
 			key: "isUpdatable",
-			"function": isPathUpdatable
+			function: isPathUpdatable
 		},
 		{
 			key: "isDeletable",
-			"function": isPathDeletable
+			function: isPathDeletable
 		}
 	];
 	const result: Record<string, ExpressionRestrictionsType> = {};
@@ -441,8 +441,7 @@ export function getDeleteVisibility(
 
 	//Delete Button is visible:
 	// 	 Prerequisites:
-	//	 - If we're not on multiple visualizations configuration or ALP
-	//
+	//	 - If we're not on ALP
 	//   - If restrictions on deletable set to false -> not visible
 	//   - Otherwise
 	//			- If UI.DeleteHidden is true -> not visible
@@ -453,7 +452,7 @@ export function getDeleteVisibility(
 	//	 	 		 	- Otherwise, delete is visible
 
 	return ifElse(
-		or(standardActionsContext.isViewWithMultipleVisualizations, converterContext.getTemplateType() === TemplateType.AnalyticalListPage),
+		converterContext.getTemplateType() === TemplateType.AnalyticalListPage,
 		false,
 		ifElse(
 			and(isConstant(pathDeletableExpression), equal(pathDeletableExpression, false)),
@@ -554,7 +553,8 @@ export function getCreationRowEnablement(
 			}
 			const navigationProperties = converterContext.getDataModelObjectPath().navigationProperties;
 			if (navigationProperties) {
-				const partner = navigationProperties[navigationProperties.length - 1].partner;
+				const lastNav = navigationProperties[navigationProperties.length - 1];
+				const partner = lastNav._type === "NavigationProperty" && lastNav.partner;
 				if (partner) {
 					path = `${partner}/${path}`;
 				}
@@ -622,6 +622,9 @@ export function getDeleteEnablement(
 	const numberOfSelectedContexts = pathInModel("numberOfSelectedContexts", "internal");
 	const numberOfDeletableContexts = pathInModel("deletableContexts", "internal");
 	const numberOfUnSavedContexts = pathInModel("unSavedContexts", "internal");
+	const draftsWithDeletableActive = pathInModel("draftsWithDeletableActive", "internal");
+	const createModeContexts = pathInModel("createModeContexts", "internal");
+	const draftsWithNonDeletableActive = pathInModel("draftsWithNonDeletableActive", "internal");
 
 	return and(
 		deleteVisibility,
@@ -630,6 +633,9 @@ export function getDeleteEnablement(
 			and(
 				or(
 					and(notEqual(numberOfDeletableContexts, undefined), greaterThan(length(numberOfDeletableContexts), 0)),
+					and(notEqual(draftsWithDeletableActive, undefined), greaterThan(length(draftsWithDeletableActive), 0)),
+					and(notEqual(createModeContexts, undefined), greaterThan(length(createModeContexts), 0)),
+					and(notEqual(draftsWithNonDeletableActive, undefined), greaterThan(length(draftsWithNonDeletableActive), 0)),
 					and(notEqual(numberOfUnSavedContexts, undefined), greaterThan(length(numberOfUnSavedContexts), 0))
 				),
 				pathInModel("deleteEnabled", "internal")