@sapui5/sap.fe.core 1.136.1 → 1.138.0

package/src/sap/fe/core/controllerextensions/editFlow/TransactionHelper.ts

@@ -1,4 +1,4 @@
-import type { Action, Action as EdmAction, EntitySet, NavigationProperty } from "@sap-ux/vocabularies-types";
+import type { Action as EdmAction, EntitySet, NavigationProperty } from "@sap-ux/vocabularies-types";
 import type { LineItem } from "@sap-ux/vocabularies-types/vocabularies/UI";
 import Log from "sap/base/Log";
 import type AppComponent from "sap/fe/core/AppComponent";
@@ -12,11 +12,9 @@ import type MessageHandler from "sap/fe/core/controllerextensions/MessageHandler
 import type { BindContextParameters } from "sap/fe/core/controllerextensions/editFlow/draft";
 import draft from "sap/fe/core/controllerextensions/editFlow/draft";
 import UiModelConstants from "sap/fe/core/controllerextensions/editFlow/editFlowConstants";
-import operations from "sap/fe/core/controllerextensions/editFlow/operations";
 import sticky from "sap/fe/core/controllerextensions/editFlow/sticky";
 import messageHandling from "sap/fe/core/controllerextensions/messageHandler/messageHandling";
 import * as MetaModelConverter from "sap/fe/core/converters/MetaModelConverter";
-import { convertTypes } from "sap/fe/core/converters/MetaModelConverter";
 import { isDataFieldForAction } from "sap/fe/core/converters/annotations/DataField";
 import type { DeleteOption, DeleteParameters } from "sap/fe/core/helpers/DeleteHelper";
 import deleteHelper from "sap/fe/core/helpers/DeleteHelper";
@@ -26,7 +24,7 @@ import type { InternalModelContext } from "sap/fe/core/helpers/ModelHelper";
 import ModelHelper from "sap/fe/core/helpers/ModelHelper";
 import PromiseKeeper from "sap/fe/core/helpers/PromiseKeeper";
 import toES6Promise from "sap/fe/core/helpers/ToES6Promise";
-import { isNavigationProperty } from "sap/fe/core/helpers/TypeGuards";
+import { isAction, isFulfilled, isNavigationProperty } from "sap/fe/core/helpers/TypeGuards";
 import FELibrary from "sap/fe/core/library";
 import Button from "sap/m/Button";
 import Dialog from "sap/m/Dialog";
@@ -54,6 +52,7 @@ import type ODataMetaModel from "sap/ui/model/odata/v4/ODataMetaModel";
 import type ODataModel from "sap/ui/model/odata/v4/ODataModel";
 import ActionRuntime from "../../ActionRuntime";
 import type { OperationResult } from "./operations/ODataOperation";
+import ODataOperation from "./operations/ODataOperation";
 import Operation from "./operations/Operation";
 import actionHelper from "./operations/actionHelper";
 
@@ -94,6 +93,7 @@ export type TransactionDeleteParameters = DeleteParameters & {
 	title?: string;
 	noDialog?: boolean;
 };
+
 export type EditTransactionExecutionDetails = {
 	existingDraftReused?: boolean; // true if an existing draft was returned, instead of returning a new one
 };
@@ -155,11 +155,12 @@ class TransactionHelper {
 	}
 
 	/**
-	 * Retrieves defatul values from the DefaultValue function.
+	 * Retrieves default values from the DefaultValue function.
 	 * @param listBinding The list binding to be used for creation
+	 * @param appComponent The app component
 	 * @returns A promise with an object containing the default values (or undefined if there's no default value function)
 	 */
-	private async getDataFromDefaultValueFunction(listBinding: ODataListBinding): Promise<object | undefined> {
+	private async getDataFromDefaultValueFunction(listBinding: ODataListBinding, appComponent: AppComponent): Promise<object | undefined> {
 		const model = listBinding.getModel();
 		const metaModel = model.getMetaModel();
 		const metaContext = metaModel.getMetaContext(listBinding.getResolvedPath() as string);
@@ -169,26 +170,64 @@ class TransactionHelper {
 			?.DefaultValuesFunction;
 		const defaultFuncOnTargetEntitySet = (listBindingObjectPath.targetEntitySet as EntitySet | undefined)?.annotations.Common
 			?.DefaultValuesFunction;
-		const defaultFunctionName = defaultFuncOnTargetObject ?? defaultFuncOnTargetEntitySet;
+		const defaultFunctionName = (defaultFuncOnTargetObject ?? defaultFuncOnTargetEntitySet)?.toString();
 
 		if (!defaultFunctionName) {
 			// No default value function
 			return undefined;
 		}
-
 		const functionOnNavProp = isNavigationProperty(listBindingObjectPath.targetObject) && defaultFuncOnTargetObject !== undefined;
-		const defaultFunctionContext = functionOnNavProp ? listBinding.getContext() : listBinding.getHeaderContext();
+		let defaultFunctionContext;
+
+		if (functionOnNavProp) {
+			// If the path is a deep navigation, derive the correct parent context
+			const bindingPath = listBinding.getPath();
+			const context = listBinding.getContext();
+			if (bindingPath?.startsWith("/")) {
+				defaultFunctionContext = context;
+			} else if (bindingPath && context && bindingPath.includes("/")) {
+				// Extract the first part of the navigation path (e.g., _ToHeader/_ToItems → _ToHeader)
+				const firstNav = bindingPath.split("/")[0];
+
+				// Build the full path to the correct context for the function call
+				const parentPath = `${context.getPath()}/${firstNav}`;
+
+				// Create a new binding context for this path
+				defaultFunctionContext = model.bindContext(parentPath).getBoundContext();
+			} else {
+				// Fallback to the current context if no navigation found
+				defaultFunctionContext = context;
+			}
+		} else {
+			// If not a navigation property, use the header context (root object page context)
+			defaultFunctionContext = listBinding.getHeaderContext();
+		}
+		//const defaultFunctionContext = functionOnNavProp ? listBinding.getContext() : listBinding.getHeaderContext();
 		if (!defaultFunctionContext) {
 			return undefined;
 		}
-		const defaultFunctionPath = `${metaModel.getMetaPath(defaultFunctionContext.getPath())}/${defaultFunctionName}`;
 
-		const defaultFunctionObjectPath = MetaModelConverter.getInvolvedDataModelObjects(metaModel.getMetaContext(defaultFunctionPath));
-		const defaultFunctionResult = (defaultFunctionObjectPath.targetObject as Action)?.isBound
-			? await operations.callBoundFunction(defaultFunctionName.toString(), defaultFunctionContext, model)
-			: ((await operations.callFunctionImport(defaultFunctionName.toString(), model)) as ODataV4Context);
+		const operation =
+			Operation.getOperationFromName(defaultFunctionName, model, defaultFunctionContext) ??
+			Operation.getOperationFromName(defaultFunctionName, model);
+		if (!operation) {
+			return undefined;
+		}
 
-		return defaultFunctionResult.getObject();
+		const isAnAction = isAction(operation);
+		const result = await new ODataOperation(
+			operation,
+			{
+				appComponent,
+				model,
+				contexts: isAnAction ? [defaultFunctionContext] : []
+			},
+			{
+				enhance$select: false,
+				groupId: isAnAction ? "functionGroup" : "functionImport"
+			}
+		).execute();
+		return result.filter(isFulfilled)[0]?.value.boundContext.getObject();
 	}
 
 	/**
@@ -543,7 +582,7 @@ class TransactionHelper {
 			let newDocumentContext: ODataV4Context | undefined;
 			const initialData = parameters.data;
 			if (!fromCopyPaste) {
-				const defaultValueFunctionData = await this.getDataFromDefaultValueFunction(mainListBinding);
+				const defaultValueFunctionData = await this.getDataFromDefaultValueFunction(mainListBinding, appComponent);
 				parameters.data = Object.assign({}, defaultValueFunctionData, parameters.data);
 			}
 			if (parameters.data) {
@@ -605,7 +644,7 @@ class TransactionHelper {
 	 * @param appComponent The appComponent
 	 * @param resourceModel The resource model to load text resources
 	 * @param messageHandler The message handler extension
-	 * @returns A Promise resolved once the documents are deleted
+	 * @returns A promise resolved to true once the documents are deleted, or to false if the deletion was canceled by the user.
 	 */
 	async deleteDocument(
 		contexts: ODataV4Context | ODataV4Context[],
@@ -613,173 +652,186 @@ class TransactionHelper {
 		appComponent: AppComponent,
 		resourceModel: ResourceModel,
 		messageHandler: MessageHandler
-	): Promise<void> {
+	): Promise<boolean> {
 		// delete document lock
 		this.busyLock(appComponent);
 
 		const contextsToDelete = Array.isArray(contexts) ? [...contexts] : [contexts];
 		const firstContext = (mParameters.selectedContexts ?? contextsToDelete)[0];
 
-		return new Promise<void>((resolve, reject) => {
-			try {
-				const draftEnabled = this._isDraftEnabled(mParameters.selectedContexts || contextsToDelete);
-				const items: Control[] = [];
-				let options: DeleteOption[] = [];
-				let unSavedContext: Context | undefined;
-				// items(texts) and options(checkBoxes and single default option) for confirm dialog.
-				if (mParameters) {
-					mParameters = getParameters(mParameters);
-					mParameters.entitySetName = this.getCollectionNameFromContext(firstContext);
-					if (!mParameters.numberOfSelectedContexts) {
-						// non-Table
-						if (draftEnabled) {
-							// Check if 1 of the drafts is locked by another user
-							const lockedContext = contextsToDelete.find((context) => {
-								const contextData = context.getObject();
-								return (
-									contextData.IsActiveEntity === true &&
-									contextData.HasDraftEntity === true &&
-									contextData.DraftAdministrativeData &&
-									contextData.DraftAdministrativeData.InProcessByUser &&
-									!contextData.DraftAdministrativeData.DraftIsCreatedByMe
-								);
+		try {
+			const draftEnabled = this._isDraftEnabled(mParameters.selectedContexts || contextsToDelete);
+			const items: Control[] = [];
+			let options: DeleteOption[] = [];
+			let unSavedContext: Context | undefined;
+			// items(texts) and options(checkBoxes and single default option) for confirm dialog.
+			if (mParameters) {
+				mParameters = getParameters(mParameters);
+				mParameters.entitySetName = this.getCollectionNameFromContext(firstContext);
+				if (!mParameters.numberOfSelectedContexts) {
+					// non-Table
+					if (draftEnabled) {
+						// Check if 1 of the drafts is locked by another user
+						const lockedContext = contextsToDelete.find((context) => {
+							const contextData = context.getObject();
+							return (
+								contextData.IsActiveEntity === true &&
+								contextData.HasDraftEntity === true &&
+								contextData.DraftAdministrativeData &&
+								contextData.DraftAdministrativeData.InProcessByUser &&
+								!contextData.DraftAdministrativeData.DraftIsCreatedByMe
+							);
+						});
+						if (lockedContext) {
+							// Show message box with the name of the locking user and return
+							await this.showDeleMessageLockedObjet(lockedContext, resourceModel);
+							return false; // No deletion happened
+						} else {
+							unSavedContext = contextsToDelete.find((context) => {
+								const { IsActiveEntity, HasDraftEntity, DraftAdministrativeData } = context.getObject() || {};
+								return IsActiveEntity === true && HasDraftEntity === true && !!DraftAdministrativeData?.InProcessByUser;
 							});
-							if (lockedContext) {
-								// Show message box with the name of the locking user and return
-								const lockingUserName = lockedContext.getObject().DraftAdministrativeData.InProcessByUser;
-								MessageBox.show(
-									resourceModel.getText("C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_SINGLE_OBJECT_LOCKED", [
-										lockingUserName
-									]),
-									{
-										title: resourceModel.getText("C_COMMON_DELETE"),
-										onClose: reject
-									}
-								);
-								return;
-							} else {
-								unSavedContext = contextsToDelete.find((context) => {
-									const { IsActiveEntity, HasDraftEntity, DraftAdministrativeData } = context.getObject() || {};
-									return IsActiveEntity === true && HasDraftEntity === true && !!DraftAdministrativeData?.InProcessByUser;
-								});
-							}
 						}
-						let nonTableTxt = "";
-						if (unSavedContext) {
-							const unSavedContextUser = unSavedContext.getObject().DraftAdministrativeData.InProcessByUser;
+					}
+					let nonTableTxt = "";
+					if (unSavedContext) {
+						const unSavedContextUser = unSavedContext.getObject().DraftAdministrativeData.InProcessByUser;
+						nonTableTxt = resourceModel.getText(
+							"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_UNSAVED_CHANGES",
+							[unSavedContextUser],
+							mParameters.entitySetName
+						);
+					} else if (mParameters.title) {
+						if (mParameters.description) {
 							nonTableTxt = resourceModel.getText(
-								"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_UNSAVED_CHANGES",
-								[unSavedContextUser],
+								"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTINFO",
+								[mParameters.title, mParameters.description],
 								mParameters.entitySetName
 							);
-						} else if (mParameters.title) {
-							if (mParameters.description) {
-								nonTableTxt = resourceModel.getText(
-									"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTINFO",
-									[mParameters.title, mParameters.description],
-									mParameters.entitySetName
-								);
-							} else {
-								nonTableTxt = resourceModel.getText(
-									"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTTITLE_ONLY",
-									[mParameters.title],
-									mParameters.entitySetName
-								);
-							}
 						} else {
 							nonTableTxt = resourceModel.getText(
-								"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTTITLE_SINGULAR",
-								undefined,
+								"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTTITLE_ONLY",
+								[mParameters.title],
 								mParameters.entitySetName
 							);
 						}
-						options.push({
-							type: DeleteOptionTypes.deletableContexts,
-							contexts: contextsToDelete,
-							text: nonTableTxt,
-							selected: true,
-							control: DeleteDialogContentControl.TEXT
-						});
 					} else {
-						// Table
-						let totalDeletable = contextsToDelete.length;
-
-						if (draftEnabled) {
-							totalDeletable +=
-								(mParameters.draftsWithNonDeletableActive?.length ?? 0) +
-								(mParameters.draftsWithDeletableActive?.length ?? 0) +
-								(mParameters.unSavedContexts?.length ?? 0);
-							deleteHelper.updateDraftOptionsForDeletableTexts(
-								mParameters,
-								contextsToDelete,
-								totalDeletable,
-								resourceModel,
-								items,
-								options
-							);
-						} else {
-							const nonDeletableText = deleteHelper.getNonDeletableText(mParameters, totalDeletable, resourceModel);
-							if (nonDeletableText) {
-								items.push(nonDeletableText);
-							}
-						}
-
-						const optionsDeletableTexts = deleteHelper.getOptionsForDeletableTexts(
+						nonTableTxt = resourceModel.getText(
+							"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTTITLE_SINGULAR",
+							undefined,
+							mParameters.entitySetName
+						);
+					}
+					options.push({
+						type: DeleteOptionTypes.deletableContexts,
+						contexts: contextsToDelete,
+						text: nonTableTxt,
+						selected: true,
+						control: DeleteDialogContentControl.TEXT
+					});
+				} else {
+					// Table
+					let totalDeletable = contextsToDelete.length;
+
+					if (draftEnabled) {
+						totalDeletable +=
+							(mParameters.draftsWithNonDeletableActive?.length ?? 0) +
+							(mParameters.draftsWithDeletableActive?.length ?? 0) +
+							(mParameters.unSavedContexts?.length ?? 0);
+						deleteHelper.updateDraftOptionsForDeletableTexts(
 							mParameters,
 							contextsToDelete,
-							resourceModel
+							totalDeletable,
+							resourceModel,
+							items,
+							options
 						);
-						options = [...options, ...optionsDeletableTexts];
+					} else {
+						const nonDeletableText = deleteHelper.getNonDeletableText(mParameters, totalDeletable, resourceModel);
+						if (nonDeletableText) {
+							items.push(nonDeletableText);
+						}
 					}
+
+					const optionsDeletableTexts = deleteHelper.getOptionsForDeletableTexts(mParameters, contextsToDelete, resourceModel);
+					options = [...options, ...optionsDeletableTexts];
 				}
+			}
 
-				const commonBinding = firstContext.getBinding() as Binding;
-				let bindingType: "Tree" | "Analytical" | undefined;
-				if (commonBinding.isA<ODataListBinding>("sap.ui.model.odata.v4.ODataListBinding")) {
-					if (this.isListBindingHierarchical(commonBinding)) {
-						bindingType = "Tree";
-					} else if (this.isListBindingAnalytical(commonBinding)) {
-						bindingType = "Analytical";
-					}
+			const commonBinding = firstContext.getBinding() as Binding;
+			let bindingType: "Tree" | "Analytical" | undefined;
+			if (commonBinding.isA<ODataListBinding>("sap.ui.model.odata.v4.ODataListBinding")) {
+				if (this.isListBindingHierarchical(commonBinding)) {
+					bindingType = "Tree";
+				} else if (this.isListBindingAnalytical(commonBinding)) {
+					bindingType = "Analytical";
 				}
+			}
 
-				// Content of Delete Dialog
-				deleteHelper.updateContentForDeleteDialog(options, items);
-				const fnConfirm = async (): Promise<void> => {
-					messageHandling.removeBoundTransitionMessages();
-					this.busyLock(appComponent);
+			// Confirm the deletion if needed
+			deleteHelper.updateContentForDeleteDialog(options, items);
+			if (mParameters.noDialog !== true && mParameters.silentMode !== true) {
+				const confirmed = await this.showDeleteConfirmationDialog(items, mParameters, resourceModel);
+				if (!confirmed) {
+					return false;
+				}
+			}
 
-					try {
-						await deleteHelper.deleteConfirmHandler(
-							options,
-							mParameters,
-							messageHandler,
-							resourceModel,
-							appComponent,
-							draftEnabled,
-							bindingType
-						);
-						resolve();
-					} catch (oError: unknown) {
-						reject();
-					} finally {
-						this.busyUnlock(appComponent);
-					}
-				};
+			// Proceed with the deletion
+			messageHandling.removeBoundTransitionMessages();
+			await deleteHelper.deleteConfirmHandler(
+				options,
+				mParameters,
+				messageHandler,
+				resourceModel,
+				appComponent,
+				draftEnabled,
+				bindingType
+			);
 
-				const dialog = this.createDeleteDialog(items, mParameters, resourceModel, fnConfirm, reject);
+			return true;
+		} finally {
+			// delete document unlock
+			this.busyUnlock(appComponent);
+		}
+	}
 
-				if (mParameters.noDialog === true || mParameters.silentMode === true) {
-					fnConfirm();
-				} else {
-					dialog.addStyleClass("sapUiContentPadding");
-					dialog.open();
-				}
-			} finally {
-				// delete document unlock
-				this.busyUnlock(appComponent);
+	/**
+	 * Shows an error message when trying to delee a locked object.
+	 * @param lockedContext
+	 * @param resourceModel
+	 * @returns A promise that resolves when the message box is closed
+	 */
+	private async showDeleMessageLockedObjet(lockedContext: ODataV4Context, resourceModel: ResourceModel): Promise<void> {
+		const lockingUserName = lockedContext.getObject().DraftAdministrativeData.InProcessByUser;
+		const promiseKeeper = new PromiseKeeper<void>();
+		MessageBox.show(resourceModel.getText("C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_SINGLE_OBJECT_LOCKED", [lockingUserName]), {
+			title: resourceModel.getText("C_COMMON_DELETE"),
+			onClose: () => {
+				promiseKeeper.resolve();
 			}
 		});
+
+		return promiseKeeper.promise;
+	}
+
+	/**
+	 * Shows the dialog to confirm the object deletion.
+	 * @param items
+	 * @param parameters
+	 * @param resourceModel
+	 * @returns True if the user accepted the deletion, false otherwise
+	 */
+	private async showDeleteConfirmationDialog(
+		items: Control[],
+		parameters: Partial<{ parentControl: Control | undefined; entitySetName: string }>,
+		resourceModel: ResourceModel
+	): Promise<boolean> {
+		const promiseKeeper = new PromiseKeeper<boolean>();
+		const dialog = this.createDeleteDialog(items, parameters, resourceModel, promiseKeeper);
+		dialog.addStyleClass("sapUiContentPadding");
+		dialog.open();
+		return promiseKeeper.promise;
 	}
 
 	/**
@@ -789,16 +841,14 @@ class TransactionHelper {
 	 * @param parameters.parentControl Parent control of the delete button if any
 	 * @param parameters.entitySetName Name of the current entitySet
 	 * @param resourceModel The resource model to load text resources
-	 * @param fnConfirm Function executed upon the validation of the deletion
-	 * @param fnReject Function executed if the dialog is closed via Cancel or Escape button
+	 * @param promiseKeeper
 	 * @returns The created delete confirmation dialog
 	 */
 	createDeleteDialog(
 		items: Control[],
 		parameters: Partial<{ parentControl: Control | undefined; entitySetName: string }>,
 		resourceModel: ResourceModel,
-		fnConfirm: Function,
-		fnReject: Function
+		promiseKeeper: PromiseKeeper<boolean>
 	): Dialog {
 		let dialogConfirmed = false;
 		const vBox = new VBox({ items: items });
@@ -820,7 +870,6 @@ class TransactionHelper {
 				press: function (): void {
 					dialogConfirmed = true;
 					dialog.close();
-					fnConfirm();
 				}
 			}),
 			endButton: new Button({
@@ -832,9 +881,7 @@ class TransactionHelper {
 			afterClose: function (): void {
 				dialog.destroy();
 				// if dialog is closed unconfirmed (e.g. via "Cancel" or Escape button), ensure to reject promise
-				if (!dialogConfirmed) {
-					fnReject();
-				}
+				promiseKeeper.resolve(dialogConfirmed);
 			}
 		});
 		return dialog;
@@ -1146,14 +1193,8 @@ class TransactionHelper {
 			let oResult: PromiseSettledResult<OperationResult>[];
 			if (contextToProcess && mParameters.contexts) {
 				const contexts = Array.isArray(mParameters.contexts) ? mParameters.contexts : [mParameters.contexts]; // Ensure that contexts is an array (for static actions it's not an we need to fix it)
-
-				const metaModel = oModel.getMetaModel(),
-					actionPath = `${metaModel.getMetaPath(contexts[0].getPath())}/${sActionName}`,
-					boundAction = metaModel.createBindingContext(`${actionPath}/@$ui5.overload/0`)!;
-
-				const convertedTypes = convertTypes(oModel.getMetaModel());
-				const convertedAction = convertedTypes.resolvePath<EdmAction | undefined>(boundAction.getPath()).target;
-				if (!convertedAction) {
+				const convertedAction = Operation.getOperationFromName(sActionName, oModel, contexts[0]);
+				if (!isAction(convertedAction)) {
 					throw new Error("Unknown bound action");
 				}
 				oResult = await new Operation(appComponent, oModel, convertedAction, {
@@ -1194,17 +1235,21 @@ class TransactionHelper {
 					defaultValuesExtensionFunction: mParameters.defaultValuesExtensionFunction
 				}).execute();
 			} else {
-				oResult = await operations.callActionImport(sActionName, oModel, appComponent, {
+				const convertedActionImport = Operation.getOperationFromName(sActionName, oModel);
+				if (!convertedActionImport || isAction(convertedActionImport)) {
+					throw new Error("Unknown action import");
+				}
+				oResult = await new Operation(appComponent, oModel, convertedActionImport.action, {
 					parameterValues: mParameters.parameterValues as Record<string, string | boolean | number | MultiValueFieldItem[]>[],
 					label: mParameters.label,
 					skipParameterDialog: mParameters.skipParameterDialog,
 					bindingParameters: mParameters.bindingParameters,
 					entitySetName: mParameters.entitySetName,
 					oDataEvents: {
-						onODataSubmit: () => {
+						onODataSubmit: (): void => {
 							this.busyLock(appComponent);
 						},
-						onODataResponse: () => {
+						onODataResponse: (): void => {
 							this.busyUnlock(appComponent);
 						}
 					},
@@ -1213,7 +1258,7 @@ class TransactionHelper {
 					},
 					messageHandler: messageHandler,
 					view: mParameters.view as FEView
-				});
+				}).execute();
 			}
 
 			if (messageHandler) {
@@ -1331,6 +1376,7 @@ class TransactionHelper {
 
 			// Create the content of the popover
 			const title = new Text({
+				id: "DraftDiscardMessage",
 				text: resourceModel.getText("C_TRANSACTION_HELPER_DRAFT_DISCARD_MESSAGE")
 			});
 			const confirmButton = new Button({
@@ -1342,6 +1388,7 @@ class TransactionHelper {
 					confirmationPopover.close();
 				}
 			});
+			confirmButton.addAriaLabelledBy(title);
 			confirmationPopover.addContent(new VBox({ items: [title, confirmButton] }));
 
 			// Attach handler
@@ -1349,6 +1396,7 @@ class TransactionHelper {
 				confirmationPopover.setInitialFocus(confirmButton);
 			});
 			confirmationPopover.attachAfterClose(() => {
+				confirmationPopover.destroyContent();
 				cancelButton.setEnabled(true);
 				if (confirmationPopover.data("continueDiscard")) {
 					resolve();