@sapui5/sap.fe.core 1.102.3 → 1.105.0

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

@@ -1,7 +1,6 @@
-import ResourceBundle from "sap/base/i18n/ResourceBundle";
+import type ResourceBundle from "sap/base/i18n/ResourceBundle";
 import Log from "sap/base/Log";
-import UriParameters from "sap/base/util/UriParameters";
-import AppComponent from "sap/fe/core/AppComponent";
+import type AppComponent from "sap/fe/core/AppComponent";
 import CommonUtils from "sap/fe/core/CommonUtils";
 import BusyLocker from "sap/fe/core/controllerextensions/BusyLocker";
 import draft from "sap/fe/core/controllerextensions/editFlow/draft";
@@ -9,7 +8,8 @@ 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 FPMHelper from "sap/fe/core/helpers/FPMHelper";
-import ModelHelper, { InternalModelContext } from "sap/fe/core/helpers/ModelHelper";
+import type { InternalModelContext } from "sap/fe/core/helpers/ModelHelper";
+import ModelHelper from "sap/fe/core/helpers/ModelHelper";
 import FELibrary from "sap/fe/core/library";
 import Button from "sap/m/Button";
 import CheckBox from "sap/m/CheckBox";
@@ -22,13 +22,16 @@ import VBox from "sap/m/VBox";
 import Core from "sap/ui/core/Core";
 import Fragment from "sap/ui/core/Fragment";
 import coreLibrary from "sap/ui/core/library";
-import View from "sap/ui/core/mvc/View";
+import type View from "sap/ui/core/mvc/View";
 import XMLPreprocessor from "sap/ui/core/util/XMLPreprocessor";
 import XMLTemplateProcessor from "sap/ui/core/XMLTemplateProcessor";
-import Context from "sap/ui/model/Context";
+import type Context from "sap/ui/model/Context";
 import JSONModel from "sap/ui/model/json/JSONModel";
-import ODataMetaModel from "sap/ui/model/odata/v4/ODataMetaModel";
-import { CoreEx } from "types/extension_types";
+import type ODataV4Context from "sap/ui/model/odata/v4/Context";
+import type ODataMetaModel from "sap/ui/model/odata/v4/ODataMetaModel";
+import type ODataModel from "sap/ui/model/odata/v4/ODataModel";
+import type { CoreEx, ODataListBinding, V4Context } from "types/extension_types";
+import toES6Promise from "../../helpers/ToES6Promise";
 
 const CreationMode = FELibrary.CreationMode;
 const ProgrammingModel = FELibrary.ProgrammingModel;
@@ -71,7 +74,7 @@ class TransactionHelper {
 				return ProgrammingModel.NonDraft;
 			}
 		}
-		return this.sProgrammingModel as typeof ProgrammingModel;
+		return this.sProgrammingModel;
 	}
 
 	/**
@@ -79,16 +82,16 @@ class TransactionHelper {
 	 *
 	 * @memberof sap.fe.core.TransactionHelper
 	 * @static
-	 * @param {sap.ui.model.odata.v4.Context} oContext Context of the document to be validated
-	 * @param {object} [mParameters] Can contain the following attributes:
-	 * * @param {object} [mParameters.data] A map of data that should be validated
-	 * * @param {string} [mParameters.customValidationFunction] A string representing the path to the validation function
-	 * @param {object} oView Contains the object of the current view
-	 * @returns {Promise} Promise resolves with result of the custom validation function
+	 * @param oContext Context of the document to be validated
+	 * @param [mParameters] Can contain the following attributes:
+	 * @param [mParameters.data] A map of data that should be validated
+	 * @param [mParameters.customValidationFunction] A string representing the path to the validation function
+	 * @param oView Contains the object of the current view
+	 * @returns Promise resolves with result of the custom validation function
 	 * @ui5-restricted
 	 * @final
 	 */
-	validateDocument(oContext: any, mParameters: any, oView: View): Promise<any> {
+	validateDocument(oContext: V4Context, mParameters: any, oView: View): Promise<any> {
 		const sCustomValidationFunction = mParameters && mParameters.customValidationFunction;
 		if (sCustomValidationFunction) {
 			const sModule = sCustomValidationFunction.substring(0, sCustomValidationFunction.lastIndexOf(".") || -1).replace(/\./gi, "/"),
@@ -108,31 +111,30 @@ class TransactionHelper {
 	 *
 	 * @memberof sap.fe.core.TransactionHelper
 	 * @static
-	 * @param {sap.ui.model.odata.v4.ODataListBinding} oMainListBinding OData V4 ListBinding object
-	 * @param {object} [mInParameters] Optional, can contain the following attributes:
-	 * @param {map} [mInParameters.data] A map of data that should be sent within the POST
-	 * @param {string} [mInParameters.busyMode] Global (default), Local, None TODO: to be refactored
-	 * @param {map} [mInParameters.keepTransientContextOnFailed] If set, the context stays in the list if the POST failed and POST will be repeated with the next change
-	 * @param {map} [mInParameters.inactive] If set, the context is set as inactive for empty rows
+	 * @param oMainListBinding OData V4 ListBinding object
+	 * @param [mInParameters] Optional, can contain the following attributes:
+	 * @param [mInParameters.data] A map of data that should be sent within the POST
+	 * @param [mInParameters.busyMode] Global (default), Local, None TODO: to be refactored
+	 * @param [mInParameters.keepTransientContextOnFailed] If set, the context stays in the list if the POST failed and POST will be repeated with the next change
+	 * @param [mInParameters.inactive] If set, the context is set as inactive for empty rows
 	 * @param oResourceBundle
 	 * @param messageHandler
 	 * @param bFromCopyPaste
 	 * @param oView The current view
-	 * @returns {Promise} Promise resolves with new binding context
+	 * @returns Promise resolves with new binding context
 	 * @ui5-restricted
 	 * @final
 	 */
-	createDocument(
-		oMainListBinding: any,
+	async createDocument(
+		oMainListBinding: ODataListBinding,
 		mInParameters: { data?: any; busyMode?: string | undefined; keepTransientContextOnFailed?: any; inactive?: boolean } | undefined,
 		oResourceBundle: any,
 		messageHandler: any,
 		bFromCopyPaste: boolean = false,
 		oView: any
-	) {
+	): Promise<ODataV4Context> {
 		// eslint-disable-next-line @typescript-eslint/no-this-alias
-		const that = this,
-			oModel = oMainListBinding.getModel(),
+		const oModel = oMainListBinding.getModel(),
 			oMetaModel = oModel.getMetaModel(),
 			sMetaPath = oMetaModel.getMetaPath(oMainListBinding.getHeaderContext().getPath()),
 			sCreateHash = this._getAppComponent().getRouterProxy().getHash(),
@@ -141,20 +143,19 @@ class TransactionHelper {
 			sNewAction = !oMainListBinding.isRelative()
 				? this._getNewAction(oStartupParameters, sCreateHash, oMetaModel, sMetaPath)
 				: undefined;
-		let oCreationPromise;
 		const mBindingParameters: any = { "$$patchWithoutSideEffects": true };
-		const sMessagesPath = oMetaModel.getObject(sMetaPath + "/@com.sap.vocabularies.Common.v1.Messages/$Path");
+		const sMessagesPath = oMetaModel.getObject(`${sMetaPath}/@com.sap.vocabularies.Common.v1.Messages/$Path`);
 		let sBusyPath = "/busy";
 		let sFunctionName =
-			oMetaModel.getObject(sMetaPath + "@com.sap.vocabularies.Common.v1.DefaultValuesFunction") ||
+			oMetaModel.getObject(`${sMetaPath}@com.sap.vocabularies.Common.v1.DefaultValuesFunction`) ||
 			oMetaModel.getObject(
-				ModelHelper.getTargetEntitySet(oMetaModel.getContext(sMetaPath)) + "@com.sap.vocabularies.Common.v1.DefaultValuesFunction"
+				`${ModelHelper.getTargetEntitySet(oMetaModel.getContext(sMetaPath))}@com.sap.vocabularies.Common.v1.DefaultValuesFunction`
 			);
 		let bFunctionOnNavProp;
-		let oNewDocumentContext: any;
+		let oNewDocumentContext: ODataV4Context | undefined;
 		if (sFunctionName) {
 			if (
-				oMetaModel.getObject(sMetaPath + "@com.sap.vocabularies.Common.v1.DefaultValuesFunction") &&
+				oMetaModel.getObject(`${sMetaPath}@com.sap.vocabularies.Common.v1.DefaultValuesFunction`) &&
 				ModelHelper.getTargetEntitySet(oMetaModel.getContext(sMetaPath)) !== sMetaPath
 			) {
 				bFunctionOnNavProp = true;
@@ -167,176 +168,158 @@ class TransactionHelper {
 		}
 		const mParameters = getParameters(mInParameters);
 		if (!oMainListBinding) {
-			return Promise.reject("Binding required for new document creation");
+			throw new Error("Binding required for new document creation");
 		}
 		const sProgrammingModel = this.getProgrammingModel(oMainListBinding);
 		if (sProgrammingModel !== ProgrammingModel.Draft && sProgrammingModel !== ProgrammingModel.Sticky) {
-			return Promise.reject("Create document only allowed for draft or sticky session supported services");
+			throw new Error("Create document only allowed for draft or sticky session supported services");
 		}
 		if (mParameters.busyMode === "Local") {
 			// in case of local busy mode we use the list binding name
 			// there's no APY yet so we have to use the .sId TODO provide a public method?
-			sBusyPath = "/busyLocal/" + oMainListBinding.sId;
+			sBusyPath = `/busyLocal/${oMainListBinding.sId}`;
 		}
 		mParameters.beforeCreateCallBack = bFromCopyPaste ? null : mParameters.beforeCreateCallBack;
 		BusyLocker.lock(this.oLockObject, sBusyPath);
 		const oResourceBundleCore = (Core as CoreEx).getLibraryResourceBundle("sap.fe.core");
-		if (sNewAction) {
-			oCreationPromise = this.callAction(
-				sNewAction,
-				{
-					contexts: oMainListBinding.getHeaderContext(),
-					showActionParameterDialog: true,
-					label: this._getSpecificCreateActionDialogLabel(
-						oMetaModel,
-						sMetaPath,
-						sNewAction,
-						oResourceBundleCore as ResourceBundle
-					),
-					bindingParameters: mBindingParameters,
-					parentControl: mParameters.parentControl,
-					bIsCreateAction: true
-				},
-				null,
-				messageHandler
-			);
-		} else {
-			const bIsNewPageCreation =
-				mParameters.creationMode !== CreationMode.CreationRow && mParameters.creationMode !== CreationMode.Inline;
-			const aNonComputedVisibleKeyFields = bIsNewPageCreation
-				? CommonUtils.getNonComputedVisibleFields(oMetaModel, sMetaPath, oView)
-				: [];
-			sFunctionName = bFromCopyPaste ? null : sFunctionName;
-			let sFunctionPath, oFunctionContext;
-			if (sFunctionName) {
-				//bound to the source entity:
-				if (bFunctionOnNavProp) {
-					sFunctionPath =
-						oMainListBinding.getContext() &&
-						oMetaModel.getMetaPath(oMainListBinding.getContext().getPath()) + "/" + sFunctionName;
-					oFunctionContext = oMainListBinding.getContext();
-				} else {
-					sFunctionPath =
-						oMainListBinding.getHeaderContext() &&
-						oMetaModel.getMetaPath(oMainListBinding.getHeaderContext().getPath()) + "/" + sFunctionName;
-					oFunctionContext = oMainListBinding.getHeaderContext();
-				}
-			}
-			const oFunction = sFunctionPath && oMetaModel.createBindingContext(sFunctionPath);
-			if (oFunction && oFunction.getObject() && oFunction.getObject()[0].$IsBound) {
-				oCreationPromise = operations.callBoundFunction(sFunctionName, oFunctionContext, oModel);
-			} else {
-				oCreationPromise = operations.callFunctionImport(sFunctionName, oModel);
-			}
+		let oResult: any;
 
-			oCreationPromise = oCreationPromise
-				.then(function (oContext: any) {
-					if (oContext) {
-						return oContext.getObject();
+		try {
+			if (sNewAction) {
+				oResult = await this.callAction(
+					sNewAction,
+					{
+						contexts: oMainListBinding.getHeaderContext(),
+						showActionParameterDialog: true,
+						label: this._getSpecificCreateActionDialogLabel(oMetaModel, sMetaPath, sNewAction, oResourceBundleCore),
+						bindingParameters: mBindingParameters,
+						parentControl: mParameters.parentControl,
+						bIsCreateAction: true
+					},
+					null,
+					messageHandler
+				);
+			} else {
+				const bIsNewPageCreation =
+					mParameters.creationMode !== CreationMode.CreationRow && mParameters.creationMode !== CreationMode.Inline;
+				const aNonComputedVisibleKeyFields = bIsNewPageCreation
+					? CommonUtils.getNonComputedVisibleFields(oMetaModel, sMetaPath, oView)
+					: [];
+				sFunctionName = bFromCopyPaste ? null : sFunctionName;
+				let sFunctionPath, oFunctionContext;
+				if (sFunctionName) {
+					//bound to the source entity:
+					if (bFunctionOnNavProp) {
+						sFunctionPath =
+							oMainListBinding.getContext() &&
+							`${oMetaModel.getMetaPath(oMainListBinding.getContext().getPath())}/${sFunctionName}`;
+						oFunctionContext = oMainListBinding.getContext();
 					} else {
-						return undefined;
+						sFunctionPath =
+							oMainListBinding.getHeaderContext() &&
+							`${oMetaModel.getMetaPath(oMainListBinding.getHeaderContext().getPath())}/${sFunctionName}`;
+						oFunctionContext = oMainListBinding.getHeaderContext();
+					}
+				}
+				const oFunction = sFunctionPath && (oMetaModel.createBindingContext(sFunctionPath) as any);
+
+				try {
+					let oData: any;
+					try {
+						const oContext =
+							oFunction && oFunction.getObject() && oFunction.getObject()[0].$IsBound
+								? await operations.callBoundFunction(sFunctionName, oFunctionContext, oModel)
+								: await operations.callFunctionImport(sFunctionName, oModel);
+						if (oContext) {
+							oData = oContext.getObject();
+						}
+					} catch (oError: any) {
+						Log.error(`Error while executing the function ${sFunctionName}`, oError);
+						throw oError;
 					}
-				})
-				.catch(function (oError: any) {
-					Log.error("Error while executing the function " + sFunctionName, oError);
-					throw oError;
-				})
-				.then(function (oData: any) {
 					mParameters.data = oData ? Object.assign({}, oData, mParameters.data) : mParameters.data;
 					if (mParameters.data) {
 						delete mParameters.data["@odata.context"];
 					}
 					if (aNonComputedVisibleKeyFields.length > 0) {
-						return that
-							._launchDialogWithKeyFields(oMainListBinding, aNonComputedVisibleKeyFields, oModel, mParameters, messageHandler)
-							.then((oResult) => {
-								oNewDocumentContext = oResult.newContext;
-								return oResult;
-							});
+						oResult = await this._launchDialogWithKeyFields(
+							oMainListBinding,
+							aNonComputedVisibleKeyFields,
+							oModel,
+							mParameters,
+							messageHandler
+						);
+						oNewDocumentContext = oResult.newContext;
 					} else {
-						let onBeforeCreatePromise;
 						if (mParameters.beforeCreateCallBack) {
-							onBeforeCreatePromise = mParameters.beforeCreateCallBack({
-								contextPath: oMainListBinding && oMainListBinding.getPath()
-							});
-						} else {
-							onBeforeCreatePromise = Promise.resolve();
-						}
-						return onBeforeCreatePromise.then(function () {
-							oNewDocumentContext = oMainListBinding.create(
-								mParameters.data,
-								true,
-								mParameters.createAtEnd,
-								mParameters.inactive
+							await toES6Promise(
+								mParameters.beforeCreateCallBack({
+									contextPath: oMainListBinding && oMainListBinding.getPath()
+								})
 							);
-							if (!mParameters.inactive) {
-								return that.onAfterCreateCompletion(oMainListBinding, oNewDocumentContext, mParameters);
-							}
-						});
+						}
+
+						oNewDocumentContext = oMainListBinding.create(
+							mParameters.data,
+							true,
+							mParameters.createAtEnd,
+							mParameters.inactive
+						);
+						if (!mParameters.inactive) {
+							oResult = await this.onAfterCreateCompletion(oMainListBinding, oNewDocumentContext, mParameters);
+						}
 					}
-				})
-				.catch(function (oError: any) {
+				} catch (oError: any) {
 					Log.error("Error while creating the new document", oError);
 					throw oError;
-				});
-		}
-		return oCreationPromise
-			.then(function (oResult: any) {
-				if (!oMainListBinding.isRelative()) {
-					// the create mode shall currently only be set on creating a root document
-					that._bCreateMode = true;
-				}
-				oNewDocumentContext = oNewDocumentContext || (oResult && oResult.response);
-				// TODO: where does this one coming from???
-				if (oResult && oResult.bConsiderDocumentModified) {
-					that.handleDocumentModifications();
 				}
-				return messageHandler.showMessageDialog().then(function () {
-					return oNewDocumentContext;
-				});
-			})
-			.catch(function (oError: any) {
-				return messageHandler.showMessageDialog().then(function () {
-					// for instance, on cancel of create dialog, the promise is rejected
-					// a return here would restore the promise chain and result in errors while routing
-					// solution -  reject here as well
-					if (oError && oError.bDeleteTransientContext && oNewDocumentContext?.isTransient()) {
-						// This is a workaround suggested by model as Context.delete results in an error
-						// TODO: remove the $direct once model resolves this issue
-						// this line shows the expected console error Uncaught (in promise) Error: Request canceled: POST Travel; group: submitLater
-						oNewDocumentContext.delete("$direct");
-					}
-					return Promise.reject(oError);
-				});
-			})
-			.finally(function () {
-				BusyLocker.unlock(that.oLockObject, sBusyPath);
-			});
+			}
+
+			if (!oMainListBinding.isRelative()) {
+				// the create mode shall currently only be set on creating a root document
+				this._bCreateMode = true;
+			}
+			oNewDocumentContext = oNewDocumentContext || (oResult && oResult.response);
+			// TODO: where does this one coming from???
+			if (oResult && oResult.bConsiderDocumentModified) {
+				this.handleDocumentModifications();
+			}
+			await messageHandler.showMessageDialog();
+			return oNewDocumentContext!;
+		} catch (oError: any) {
+			await messageHandler.showMessageDialog();
+			if (oError && oError.bDeleteTransientContext && oNewDocumentContext?.isTransient()) {
+				// This is a workaround suggested by model as Context.delete results in an error
+				// TODO: remove the $direct once model resolves this issue
+				// this line shows the expected console error Uncaught (in promise) Error: Request canceled: POST Travel; group: submitLater
+				oNewDocumentContext.delete("$direct");
+			}
+			throw oError;
+		} finally {
+			BusyLocker.unlock(this.oLockObject, sBusyPath);
+		}
 	}
 	/**
 	 * Find the active contexts of the documents, only for the draft roots.
 	 *
 	 * @memberof sap.fe.core.TransactionHelper
 	 * @static
-	 * @param {sap.ui.model.odata.v4.Context[]} aContexts Contexts Either one context or an array with contexts to be deleted
+	 * @param aContexts Contexts Either one context or an array with contexts to be deleted
 	 * @param bFindActiveContexts
-	 * @returns {Array} Array of the active contexts
+	 * @returns Array of the active contexts
 	 */
-	findActiveDraftRootContexts(aContexts: any[], bFindActiveContexts: any) {
+	findActiveDraftRootContexts(aContexts: V4Context[], bFindActiveContexts: any) {
 		if (!bFindActiveContexts) {
 			return Promise.resolve();
 		}
 		const activeContexts = aContexts.reduce(function (aResult: any, oContext: any) {
 			const oMetaModel = oContext.getModel().getMetaModel();
 			const sMetaPath = oMetaModel.getMetaPath(oContext.getPath());
-			if (oMetaModel.getObject(sMetaPath + "@com.sap.vocabularies.Common.v1.DraftRoot")) {
+			if (oMetaModel.getObject(`${sMetaPath}@com.sap.vocabularies.Common.v1.DraftRoot`)) {
 				const bIsActiveEntity = oContext.getObject().IsActiveEntity,
 					bHasActiveEntity = oContext.getObject().HasActiveEntity;
 				if (!bIsActiveEntity && bHasActiveEntity) {
-					const oActiveContext = oContext
-						.getModel()
-						.bindContext(oContext.getPath() + "/SiblingEntity")
-						.getBoundContext();
+					const oActiveContext = oContext.getModel().bindContext(`${oContext.getPath()}/SiblingEntity`).getBoundContext();
 					aResult.push(oActiveContext);
 				}
 			}
@@ -344,14 +327,9 @@ class TransactionHelper {
 		}, []);
 		return Promise.all(
 			activeContexts.map(function (oContext: any) {
-				return oContext.requestCanonicalPath().then(
-					function () {
-						return oContext;
-					},
-					function () {
-						return;
-					}
-				);
+				return oContext.requestCanonicalPath().then(function () {
+					return oContext;
+				});
 			})
 		);
 	}
@@ -378,7 +356,7 @@ class TransactionHelper {
 		if (aContexts.length === 1) {
 			MessageToast.show(
 				CommonUtils.getTranslatedText(
-					"C_TRANSACTION_HELPER_OBJECT_PAGE_DELETE_TOAST_SINGULAR",
+					"C_TRANSACTION_HELPER_DELETE_TOAST_SINGULAR",
 					oResourceBundle,
 					null,
 					mParameters.entitySetName
@@ -386,12 +364,7 @@ class TransactionHelper {
 			);
 		} else {
 			MessageToast.show(
-				CommonUtils.getTranslatedText(
-					"C_TRANSACTION_HELPER_OBJECT_PAGE_DELETE_TOAST_PLURAL",
-					oResourceBundle,
-					null,
-					mParameters.entitySetName
-				)
+				CommonUtils.getTranslatedText("C_TRANSACTION_HELPER_DELETE_TOAST_PLURAL", oResourceBundle, null, mParameters.entitySetName)
 			);
 		}
 	}
@@ -400,20 +373,18 @@ class TransactionHelper {
 	 *
 	 * @memberof sap.fe.core.TransactionHelper
 	 * @static
-	 * @param {sap.ui.model.odata.v4.Context} vContexts Contexts Either one context or an array with contexts to be deleted
-	 * @param {object} mParameters Optional, can contain the following attributes:
-	 * @param {string} mParameters.title Title of the object to be deleted
-	 * @param {string} mParameters.description Description of the object to be deleted
-	 * @param {integer} mParameters.numberOfSelectedContexts Number of objects selected
-	 * @param {boolean} mParameters.noDialog To disable the confirmation dialog
+	 * @param vInContexts Contexts Either one context or an array with contexts to be deleted
+	 * @param mParameters Optional, can contain the following attributes:
+	 * @param mParameters.title Title of the object to be deleted
+	 * @param mParameters.description Description of the object to be deleted
+	 * @param mParameters.numberOfSelectedContexts Number of objects selected
+	 * @param mParameters.noDialog To disable the confirmation dialog
 	 * @param oResourceBundle
 	 * @param messageHandler
-	 * @returns {Promise}
+	 * @returns A Promise resolved once the document are deleted
 	 */
-	deleteDocument(vContexts: any, mParameters: any, oResourceBundle: any, messageHandler: any) {
-		let fnReject: Function,
-			fnResolve: Function,
-			aDeletableContexts: any[] = [],
+	deleteDocument(vInContexts: V4Context, mParameters: any, oResourceBundle: any, messageHandler: any) {
+		let aDeletableContexts: any[] = [],
 			isCheckBoxVisible = false,
 			isLockedTextVisible = false,
 			cannotBeDeletedTextVisible = false,
@@ -421,18 +392,23 @@ class TransactionHelper {
 			bDialogConfirmed = false;
 		// eslint-disable-next-line @typescript-eslint/no-this-alias
 		const that = this,
-			oResourceBundleCore = (Core as CoreEx).getLibraryResourceBundle("sap.fe.core") as ResourceBundle;
+			oResourceBundleCore = (Core as CoreEx).getLibraryResourceBundle("sap.fe.core");
 		let aParams;
 		let oDeleteMessage: any = {
-			title: oResourceBundleCore.getText("C_COMMON_OBJECT_PAGE_DELETE")
+			title: oResourceBundleCore.getText("C_COMMON_DELETE")
 		};
 		messageHandling.removeBoundTransitionMessages();
 		BusyLocker.lock(this.oLockObject);
-		if (!Array.isArray(vContexts)) {
-			vContexts = [vContexts];
+		let vContexts: V4Context[];
+		if (Array.isArray(vInContexts)) {
+			vContexts = vInContexts;
+		} else {
+			vContexts = [vInContexts];
 		}
-		Promise.resolve(this.getProgrammingModel(vContexts[0]))
-			.then(function (sProgrammingModel: any) {
+
+		return new Promise<void>((resolve, reject) => {
+			try {
+				const sProgrammingModel = this.getProgrammingModel(vContexts[0]);
 				if (mParameters) {
 					if (!mParameters.numberOfSelectedContexts) {
 						if (sProgrammingModel === ProgrammingModel.Draft) {
@@ -445,14 +421,21 @@ class TransactionHelper {
 									oContextData.DraftAdministrativeData.InProcessByUser &&
 									!oContextData.DraftAdministrativeData.DraftIsCreatedByMe
 								) {
+									let sLockedUser = "";
+									const draftAdminData = oContextData && oContextData.DraftAdministrativeData;
+									if (draftAdminData) {
+										sLockedUser = draftAdminData["InProcessByUser"];
+									}
+									aParams = [sLockedUser];
 									MessageBox.show(
 										CommonUtils.getTranslatedText(
-											"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_SINGLE_OBJECT_LOCKED",
-											oResourceBundle
+											"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_SINGLE_OBJECT_LOCKED",
+											oResourceBundle,
+											aParams
 										),
 										{
-											title: oResourceBundleCore.getText("C_COMMON_OBJECT_PAGE_DELETE"),
-											onClose: fnReject
+											title: oResourceBundleCore.getText("C_COMMON_DELETE"),
+											onClose: reject
 										}
 									);
 									return;
@@ -462,35 +445,72 @@ class TransactionHelper {
 						mParameters = getParameters(mParameters);
 						if (mParameters.title) {
 							if (mParameters.description) {
-								aParams = [mParameters.title, mParameters.description];
+								aParams = [mParameters.title + " ", mParameters.description];
 							} else {
 								aParams = [mParameters.title, ""];
 							}
 							oDeleteMessage.text = CommonUtils.getTranslatedText(
-								"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTINFO",
+								"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTINFO",
 								oResourceBundle,
 								aParams,
 								mParameters.entitySetName
 							);
 						} else {
 							oDeleteMessage.text = CommonUtils.getTranslatedText(
-								"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTTITLE_SINGULAR",
+								"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTTITLE_SINGULAR",
 								oResourceBundle
 							);
 						}
 						aDeletableContexts = vContexts;
 					} else {
 						oDeleteMessage = {
-							title: oResourceBundleCore.getText("C_COMMON_OBJECT_PAGE_DELETE")
+							title: oResourceBundleCore.getText("C_COMMON_DELETE")
 						};
 						if (mParameters.numberOfSelectedContexts === 1 && mParameters.numberOfSelectedContexts === vContexts.length) {
 							aDeletableContexts = vContexts;
-							oDeleteMessage.text = CommonUtils.getTranslatedText(
-								"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTTITLE_SINGULAR",
-								oResourceBundle,
-								null,
-								mParameters.entitySetName
-							);
+							const oLineContextData = vContexts[0].getObject();
+							const oTable = mParameters.parentControl;
+							const sKey = oTable && oTable.getParent().getIdentifierColumn();
+							if (sKey) {
+								const sKeyValue = sKey ? oLineContextData[sKey] : undefined;
+								const sDescription =
+									mParameters.description && mParameters.description.path
+										? oLineContextData[mParameters.description.path]
+										: undefined;
+								if (sKeyValue) {
+									if (sDescription) {
+										aParams = [sKeyValue + " ", sDescription];
+									} else {
+										aParams = [sKeyValue, ""];
+									}
+									oDeleteMessage.text = CommonUtils.getTranslatedText(
+										"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTINFO",
+										oResourceBundle,
+										aParams,
+										mParameters.entitySetName
+									);
+								} else if (sKeyValue) {
+									aParams = [sKeyValue, ""];
+									oDeleteMessage.text = CommonUtils.getTranslatedText(
+										"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTINFO",
+										oResourceBundle,
+										aParams,
+										mParameters.entitySetName
+									);
+								} else {
+									oDeleteMessage.text = CommonUtils.getTranslatedText(
+										"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTTITLE_SINGULAR",
+										oResourceBundle
+									);
+								}
+							} else {
+								oDeleteMessage.text = CommonUtils.getTranslatedText(
+									"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTTITLE_SINGULAR",
+									oResourceBundle,
+									null,
+									mParameters.entitySetName
+								);
+							}
 						} else if (mParameters.numberOfSelectedContexts === 1 && mParameters.unSavedContexts.length === 1) {
 							//only one unsaved object
 							aDeletableContexts = mParameters.unSavedContexts;
@@ -502,7 +522,7 @@ class TransactionHelper {
 							}
 							aParams = [sLastChangedByUser];
 							oDeleteMessage.text = CommonUtils.getTranslatedText(
-								"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_UNSAVED_CHANGES",
+								"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_UNSAVED_CHANGES",
 								oResourceBundle,
 								aParams
 							);
@@ -510,7 +530,7 @@ class TransactionHelper {
 							//only multiple unsaved objects
 							aDeletableContexts = mParameters.unSavedContexts;
 							oDeleteMessage.text = CommonUtils.getTranslatedText(
-								"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_UNSAVED_CHANGES_MULTIPLE_OBJECTS",
+								"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_UNSAVED_CHANGES_MULTIPLE_OBJECTS",
 								oResourceBundle
 							);
 						} else if (
@@ -522,13 +542,13 @@ class TransactionHelper {
 							oDeleteMessage.text =
 								aDeletableContexts.length === 1
 									? CommonUtils.getTranslatedText(
-											"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTTITLE_SINGULAR",
+											"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTTITLE_SINGULAR",
 											oResourceBundle,
 											null,
 											mParameters.entitySetName
 									  )
 									: CommonUtils.getTranslatedText(
-											"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTTITLE_PLURAL",
+											"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTTITLE_PLURAL",
 											oResourceBundle,
 											null,
 											mParameters.entitySetName
@@ -540,31 +560,24 @@ class TransactionHelper {
 							oDeleteMessage.text =
 								aDeletableContexts.length === 1
 									? CommonUtils.getTranslatedText(
-											"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTTITLE_SINGULAR_NON_DELETABLE",
+											"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTTITLE_SINGULAR_NON_DELETABLE",
 											oResourceBundle,
 											null,
 											mParameters.entitySetName
 									  )
 									: CommonUtils.getTranslatedText(
-											"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTTITLE_PLURAL_NON_DELETABLE",
+											"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTTITLE_PLURAL_NON_DELETABLE",
 											oResourceBundle,
-											null,
+											[aDeletableContexts.length],
 											mParameters.entitySetName
 									  );
-							oDeleteMessage.nonDeletableText = CommonUtils.getTranslatedText(
-								"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTINFO_AND_FEW_OBJECTS_NON_DELETABLE",
-								oResourceBundle,
-								[
-									mParameters.numberOfSelectedContexts - vContexts.concat(mParameters.unSavedContexts).length,
-									mParameters.numberOfSelectedContexts
-								]
-							);
+							oDeleteMessage.nonDeletableText = that._getNonDeletableText(mParameters, vContexts, oResourceBundle);
 						}
 						if (mParameters.lockedContexts.length == 1) {
 							//setting the locked text if locked objects exist
 							isLockedTextVisible = true;
 							oDeleteMessage.nonDeletableText = CommonUtils.getTranslatedText(
-								"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTINFO_AND_ONE_OBJECT_LOCKED",
+								"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTINFO_AND_ONE_OBJECT_LOCKED",
 								oResourceBundle,
 								[mParameters.numberOfSelectedContexts]
 							);
@@ -573,7 +586,7 @@ class TransactionHelper {
 							//setting the locked text if locked objects exist
 							isLockedTextVisible = true;
 							oDeleteMessage.nonDeletableText = CommonUtils.getTranslatedText(
-								"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTINFO_AND_FEW_OBJECTS_LOCKED",
+								"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTINFO_AND_FEW_OBJECTS_LOCKED",
 								oResourceBundle,
 								[mParameters.lockedContexts.length, mParameters.numberOfSelectedContexts]
 							);
@@ -591,24 +604,24 @@ class TransactionHelper {
 								aDeletableContexts = mParameters.unSavedContexts;
 								if (mParameters.unSavedContexts.length === 1) {
 									oDeleteMessage.text = CommonUtils.getTranslatedText(
-										"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_UNSAVED_AND_FEW_OBJECTS_LOCKED_SINGULAR",
+										"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_UNSAVED_AND_FEW_OBJECTS_LOCKED_SINGULAR",
 										oResourceBundle
 									);
 								} else {
 									oDeleteMessage.text = CommonUtils.getTranslatedText(
-										"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_UNSAVED_AND_FEW_OBJECTS_LOCKED_PLURAL",
+										"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_UNSAVED_AND_FEW_OBJECTS_LOCKED_PLURAL",
 										oResourceBundle
 									);
 								}
 							} else {
 								if (mParameters.unSavedContexts.length === 1) {
 									oDeleteMessage.checkBoxText = CommonUtils.getTranslatedText(
-										"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTINFO_AND_FEW_OBJECTS_UNSAVED_SINGULAR",
+										"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTINFO_AND_FEW_OBJECTS_UNSAVED_SINGULAR",
 										oResourceBundle
 									);
 								} else {
 									oDeleteMessage.checkBoxText = CommonUtils.getTranslatedText(
-										"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTINFO_AND_FEW_OBJECTS_UNSAVED_PLURAL",
+										"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTINFO_AND_FEW_OBJECTS_UNSAVED_PLURAL",
 										oResourceBundle
 									);
 								}
@@ -616,31 +629,28 @@ class TransactionHelper {
 							}
 						}
 						if (cannotBeDeletedTextVisible && isLockedTextVisible) {
+							//if non-deletable objects exist along with deletable objects
+							const sNonDeletableContextText = that._getNonDeletableText(mParameters, vContexts, oResourceBundle);
 							//if both locked and non-deletable objects exist along with deletable objects
 							if (mParameters.unSavedContexts.length > 1) {
-								oDeleteMessage.nonDeletableText = CommonUtils.getTranslatedText(
-									"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTINFO_AND_FEW_OBJECTS_LOCKED_AND_NON_DELETABLE",
-									oResourceBundle,
-									[
-										mParameters.numberOfSelectedContexts -
-											vContexts.concat(mParameters.unSavedContexts).length -
-											mParameters.lockedContexts.length,
-										mParameters.lockedContexts.length,
-										mParameters.numberOfSelectedContexts
-									]
-								);
+								oDeleteMessage.nonDeletableText =
+									sNonDeletableContextText +
+									" " +
+									CommonUtils.getTranslatedText(
+										"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTINFO_AND_FEW_OBJECTS_LOCKED",
+										oResourceBundle,
+										[mParameters.lockedContexts.length, mParameters.numberOfSelectedContexts]
+									);
 							}
 							if (mParameters.unSavedContexts.length == 1) {
-								oDeleteMessage.nonDeletableText = CommonUtils.getTranslatedText(
-									"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTINFO_AND_ONE_OBJECT_LOCKED_AND_NON_DELETABLE",
-									oResourceBundle,
-									[
-										mParameters.numberOfSelectedContexts -
-											vContexts.concat(mParameters.unSavedContexts).length -
-											mParameters.lockedContexts.length,
-										mParameters.numberOfSelectedContexts
-									]
-								);
+								oDeleteMessage.nonDeletableText =
+									sNonDeletableContextText +
+									" " +
+									CommonUtils.getTranslatedText(
+										"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTINFO_AND_ONE_OBJECT_LOCKED",
+										oResourceBundle,
+										[mParameters.numberOfSelectedContexts]
+									);
 							}
 						}
 					}
@@ -672,60 +682,55 @@ class TransactionHelper {
 						})
 					]
 				});
-				const sTitle = oResourceBundleCore.getText("C_COMMON_OBJECT_PAGE_DELETE");
-				const fnConfirm = function () {
+				const sTitle = oResourceBundleCore.getText("C_COMMON_DELETE");
+				const fnConfirm = async function () {
 					bDialogConfirmed = true;
 					BusyLocker.lock(that.oLockObject);
 					const aContexts = aDeletableContexts;
-					let onBeforeDeletePromise;
-					if (mParameters.beforeDeleteCallBack) {
-						onBeforeDeletePromise = mParameters.beforeDeleteCallBack({ contexts: aContexts });
-					} else {
-						onBeforeDeletePromise = Promise.resolve();
-					}
-					return onBeforeDeletePromise
-						.then(that.findActiveDraftRootContexts.bind(that, aContexts, mParameters.bFindActiveContexts))
-						.then(function (activeContexts: any) {
-							//make sure to fetch the active contexts before deleting the drafts
-							return Promise.all(
+
+					try {
+						if (mParameters.beforeDeleteCallBack) {
+							await mParameters.beforeDeleteCallBack({ contexts: aContexts });
+						}
+						const activeContexts = await that.findActiveDraftRootContexts(aContexts, mParameters.bFindActiveContexts);
+
+						try {
+							await Promise.all(
 								aContexts.map(function (oContext: any) {
 									//delete the draft
 									const bEnableStrictHandling = aContexts.length === 1 ? true : false;
-									return draft.deleteDraft(oContext, bEnableStrictHandling);
+									return draft.deleteDraft(oContext, that._oAppComponent, bEnableStrictHandling);
 								})
-							)
-								.catch(function (oError: any) {
-									return messageHandler.showMessages().then(function () {
-										// re-throw error to enforce rejecting the general promise
-										throw oError;
-									});
+							);
+						} catch (oError: any) {
+							await messageHandler.showMessages();
+							// re-throw error to enforce rejecting the general promise
+							throw oError;
+						}
+						const checkBox = {
+							"isCheckBoxVisible": isCheckBoxVisible,
+							"isCheckBoxSelected": isCheckBoxSelected
+						};
+						if (activeContexts && activeContexts.length) {
+							await Promise.all(
+								activeContexts.map(function (oContext: any) {
+									return oContext.delete();
 								})
-								.then(function () {
-									const checkBox = {
-										"isCheckBoxVisible": isCheckBoxVisible,
-										"isCheckBoxSelected": isCheckBoxSelected
-									};
-									if (activeContexts && activeContexts.length) {
-										return Promise.all(
-											activeContexts.map(function (oContext: any) {
-												return oContext.delete();
-											})
-										).then(function () {
-											that.afterDeleteProcess(mParameters, checkBox, aContexts, oResourceBundle);
-											return messageHandler.showMessageDialog().then(fnResolve);
-										});
-									} else {
-										that.afterDeleteProcess(mParameters, checkBox, aContexts, oResourceBundle);
-										return messageHandler.showMessageDialog().then(fnResolve);
-									}
-								});
-						})
-						.catch(function () {
-							fnReject();
-						})
-						.finally(function () {
-							BusyLocker.unlock(that.oLockObject);
-						});
+							);
+
+							that.afterDeleteProcess(mParameters, checkBox, aContexts, oResourceBundle);
+							await messageHandler.showMessageDialog();
+							resolve();
+						} else {
+							that.afterDeleteProcess(mParameters, checkBox, aContexts, oResourceBundle);
+							await messageHandler.showMessageDialog();
+							resolve();
+						}
+					} catch (oError: any) {
+						reject();
+					} finally {
+						BusyLocker.unlock(that.oLockObject);
+					}
 				};
 				const oDialog = new Dialog({
 					title: sTitle,
@@ -735,11 +740,11 @@ class TransactionHelper {
 						? [oNonDeletableMessageTextControl, oDeleteMessageTextControl]
 						: oDeleteMessageTextControl,
 					beginButton: new Button({
-						text: oResourceBundleCore.getText("C_COMMON_OBJECT_PAGE_DELETE"),
+						text: oResourceBundleCore.getText("C_COMMON_DELETE"),
 						type: "Emphasized",
 						press: function () {
 							oDialog.close();
-							return fnConfirm();
+							fnConfirm();
 						}
 					}),
 					endButton: new Button({
@@ -752,27 +757,19 @@ class TransactionHelper {
 						oDialog.destroy();
 						// if dialog is closed unconfirmed (e.g. via "Cancel" or Escape button), ensure to reject promise
 						if (!bDialogConfirmed) {
-							fnReject();
+							reject();
 						}
 					}
 				} as any);
 				if (mParameters.noDialog) {
-					return fnConfirm();
+					fnConfirm();
 				} else {
 					oDialog.addStyleClass("sapUiContentPadding");
 					oDialog.open();
 				}
-			})
-			.finally(function () {
+			} finally {
 				BusyLocker.unlock(that.oLockObject);
-			})
-			.catch(function () {
-				Log.warning("Couldn't get Programming model");
-				fnReject();
-			});
-		return new Promise(function (resolve: (value: any) => void, reject: (reason?: any) => void) {
-			fnReject = reject;
-			fnResolve = resolve;
+			}
 		});
 	}
 	/**
@@ -780,260 +777,210 @@ class TransactionHelper {
 	 *
 	 * @memberof sap.fe.core.TransactionHelper
 	 * @static
-	 * @param {sap.ui.model.odata.v4.Context} oContext Context of the active document
-	 * @param {object} oView Current view
+	 * @param oContext Context of the active document
+	 * @param oView Current view
 	 * @param messageHandler
-	 * @returns {Promise} Promise resolves with the new draft context in case of draft programming model
+	 * @returns Promise resolves with the new draft context in case of draft programming model
 	 * @ui5-restricted
 	 * @final
 	 */
-	editDocument(oContext: any, oView: object, messageHandler: any) {
+	async editDocument(oContext: V4Context, oView: View, messageHandler: any): Promise<V4Context> {
 		// eslint-disable-next-line @typescript-eslint/no-this-alias
 		const that = this;
 		const sProgrammingModel = this.getProgrammingModel(oContext);
-		let oEditPromise;
 		if (!oContext) {
-			return Promise.reject(new Error("Binding context to active document is required"));
+			throw new Error("Binding context to active document is required");
+		}
+		if (sProgrammingModel !== ProgrammingModel.Draft && sProgrammingModel !== ProgrammingModel.Sticky) {
+			throw new Error("Edit is only allowed for draft or sticky session supported services");
 		}
 		this._bIsModified = false;
 		BusyLocker.lock(that.oLockObject);
 		// before triggering the edit action we'll have to remove all bound transition messages
 		messageHandler.removeTransitionMessages();
-		if (sProgrammingModel === ProgrammingModel.Draft) {
-			oEditPromise = draft.createDraftFromActiveDocument(oContext, this._getAppComponent(), {
-				bPreserveChanges: true,
-				oView: oView
-			} as any);
-		} else if (sProgrammingModel === ProgrammingModel.Sticky) {
-			oEditPromise = sticky.editDocumentInStickySession(oContext, this._getAppComponent());
-		} else {
+
+		try {
+			const oNewContext: V4Context =
+				sProgrammingModel === ProgrammingModel.Draft
+					? await draft.createDraftFromActiveDocument(oContext, this._getAppComponent(), {
+							bPreserveChanges: true,
+							oView: oView
+					  } as any)
+					: await sticky.editDocumentInStickySession(oContext, this._getAppComponent());
+
+			this._bCreateMode = false;
+			await messageHandler.showMessageDialog();
+			return oNewContext;
+		} catch (err: any) {
+			await messageHandler.showMessages({ concurrentEditFlag: true });
+			throw err;
+		} finally {
 			BusyLocker.unlock(that.oLockObject);
-			return Promise.reject(new Error("Edit is only allowed for draft or sticky session supported services"));
 		}
-		return oEditPromise
-			.then(function (oNewContext: any) {
-				that._bCreateMode = false;
-				return messageHandler.showMessageDialog().then(function () {
-					return oNewContext;
-				});
-			})
-			.catch(function (err: any) {
-				return messageHandler.showMessages({ concurrentEditFlag: true }).then(function () {
-					return Promise.reject(err);
-				});
-			})
-			.finally(function () {
-				BusyLocker.unlock(that.oLockObject);
-			});
 	}
 	/**
 	 * Cancel 'edit' mode of a document.
 	 *
 	 * @memberof sap.fe.core.TransactionHelper
 	 * @static
-	 * @param {sap.ui.model.odata.v4.Context} oContext Context of the document to be canceled or deleted
-	 * @param {object} [mInParameters] Optional, can contain the following attributes:
-	 * @param {sap.m.Button} mInParameters.cancelButton Cancel Button of the discard popover (mandatory for now)
-	 * @param {boolean} mInParameters.skipDiscardPopover Optional, supresses the discard popover incase of draft applications while navigating out of OP
+	 * @param oContext Context of the document to be canceled or deleted
+	 * @param [mInParameters] Optional, can contain the following attributes:
+	 * @param mInParameters.cancelButton Cancel Button of the discard popover (mandatory for now)
+	 * @param mInParameters.skipDiscardPopover Optional, supresses the discard popover incase of draft applications while navigating out of OP
 	 * @param oResourceBundle
 	 * @param messageHandler
-	 * @returns {Promise} Promise resolves with ???
+	 * @returns Promise resolves with ???
 	 * @ui5-restricted
 	 * @final
 	 */
-	cancelDocument(
-		oContext: any,
+	async cancelDocument(
+		oContext: V4Context,
 		mInParameters: { cancelButton: any; skipDiscardPopover: boolean } | undefined,
 		oResourceBundle: any,
 		messageHandler: any
-	) {
-		// eslint-disable-next-line @typescript-eslint/no-this-alias
-		const that = this;
-		let sProgrammingModel: typeof ProgrammingModel;
+	): Promise<V4Context | boolean> {
 		//context must always be passed - mandatory parameter
 		if (!oContext) {
-			return Promise.reject("No context exists. Pass a meaningful context");
+			throw new Error("No context exists. Pass a meaningful context");
 		}
-		BusyLocker.lock(that.oLockObject);
+		BusyLocker.lock(this.oLockObject);
 		const mParameters = getParameters(mInParameters);
-		const oParamsContext = oContext,
-			oCancelButton = mParameters.cancelButton,
-			oModel = oParamsContext.getModel();
-		let onBeforeCancelPromise, sCanonicalPath: string;
-		return Promise.resolve(this.getProgrammingModel(oContext))
-			.then(function (sPModel: any) {
-				sProgrammingModel = sPModel;
-				if (sPModel === ProgrammingModel.Draft) {
-					const draftDataContext = oModel.bindContext(oParamsContext.getPath() + "/DraftAdministrativeData").getBoundContext();
-					if (!that._bIsModified) {
-						return draftDataContext.requestObject().then(function (draftAdminData: any) {
-							if (draftAdminData) {
-								that._bIsModified = !(draftAdminData.CreationDateTime === draftAdminData.LastChangeDateTime);
-							}
-						});
+		const oModel = oContext.getModel();
+		const sProgrammingModel = this.getProgrammingModel(oContext);
+
+		try {
+			let returnedValue: V4Context | boolean = false;
+
+			if (sProgrammingModel === ProgrammingModel.Draft) {
+				const draftDataContext = oModel.bindContext(`${oContext.getPath()}/DraftAdministrativeData`).getBoundContext();
+				if (!this._bIsModified) {
+					const draftAdminData = await draftDataContext.requestObject();
+					if (draftAdminData) {
+						this._bIsModified = !(draftAdminData.CreationDateTime === draftAdminData.LastChangeDateTime);
 					}
 				}
-			})
-			.then(function () {
-				if (!mParameters.skipDiscardPopover) {
-					return that._showDiscardPopover(oCancelButton, that._bIsModified, oResourceBundle);
-				} else {
-					return Promise.resolve();
-				}
-			})
-			.then(function () {
-				if (mParameters.beforeCancelCallBack) {
-					onBeforeCancelPromise = mParameters.beforeCancelCallBack({ context: oContext });
-				} else {
-					onBeforeCancelPromise = Promise.resolve();
-				}
-				return onBeforeCancelPromise;
-			})
-			.then(function () {
-				// eslint-disable-next-line default-case
-				switch (sProgrammingModel) {
-					case ProgrammingModel.Draft:
-						return oParamsContext.requestObject("HasActiveEntity").then(function (bHasActiveEntity: any) {
-							let oDeletePromise;
-							if (!bHasActiveEntity) {
-								if (oParamsContext && oParamsContext.hasPendingChanges()) {
-									oParamsContext.getBinding().resetChanges();
-								}
-								oDeletePromise = draft.deleteDraft(oParamsContext);
-								return oDeletePromise;
-							} else {
-								let oActiveContext = oModel.bindContext(oParamsContext.getPath() + "/SiblingEntity").getBoundContext();
-								return oActiveContext
-									.requestCanonicalPath()
-									.then(
-										function (sPath: any) {
-											sCanonicalPath = sPath;
-											if (oParamsContext && oParamsContext.hasPendingChanges()) {
-												oParamsContext.getBinding().resetChanges();
-											}
-											oDeletePromise = draft.deleteDraft(oParamsContext);
-											return oDeletePromise;
-										},
-										function () {
-											draft.deleteDraft(oParamsContext);
-											return;
-										}
-									)
-									.then(function () {
-										//oParamsContext.delete() in the previous promise doesnt return anything upon success.
-										if (!sCanonicalPath) {
-											return;
-										}
-										if (oActiveContext.getPath() !== sCanonicalPath) {
-											// the active context is using the sibling entity - this path is not accessible anymore as we deleted the draft
-											// document - therefore we need to create a new context with the canonical path
-											oActiveContext = oModel.bindContext(sCanonicalPath).getBoundContext();
-										}
-										return oActiveContext;
-									});
-							}
-						});
-					case ProgrammingModel.Sticky:
-						return sticky.discardDocument(oContext).then(function (oContext: any) {
-							if (oContext) {
-								if (oContext.hasPendingChanges()) {
-									oContext.getBinding().resetChanges();
-								}
-								if (!that._bCreateMode) {
-									oContext.refresh();
-									return oContext;
-								}
+			}
+			if (!mParameters.skipDiscardPopover) {
+				await this._showDiscardPopover(mParameters.cancelButton, this._bIsModified, oResourceBundle);
+			}
+			if (mParameters.beforeCancelCallBack) {
+				await mParameters.beforeCancelCallBack({ context: oContext });
+			}
+			switch (sProgrammingModel) {
+				case ProgrammingModel.Draft:
+					const bHasActiveEntity = await oContext.requestObject("HasActiveEntity");
+					if (!bHasActiveEntity) {
+						if (oContext && oContext.hasPendingChanges()) {
+							oContext.getBinding().resetChanges();
+						}
+						returnedValue = await draft.deleteDraft(oContext, this._oAppComponent);
+					} else {
+						const oSiblingContext = oModel.bindContext(`${oContext.getPath()}/SiblingEntity`).getBoundContext();
+						try {
+							const sCanonicalPath = await oSiblingContext.requestCanonicalPath();
+							if (oContext && oContext.hasPendingChanges()) {
+								oContext.getBinding().resetChanges();
 							}
-							return false;
-						});
-					default:
-						return Promise.reject("Cancel document only allowed for draft or sticky session supported services");
-				}
-			})
-			.then(function (context: any) {
-				that._bIsModified = false;
-				// remove existing bound transition messages
-				messageHandler.removeTransitionMessages();
-				// show unbound messages
-				return messageHandler.showMessages().then(function () {
-					return context;
-				});
-			})
-			.catch(function (err: any) {
-				return messageHandler.showMessages().then(function () {
-					return Promise.reject(err);
-				});
-			})
-			.finally(function () {
-				BusyLocker.unlock(that.oLockObject);
-			});
+							returnedValue = oModel.bindContext(sCanonicalPath).getBoundContext();
+						} finally {
+							await draft.deleteDraft(oContext, this._oAppComponent);
+						}
+					}
+					break;
+
+				case ProgrammingModel.Sticky:
+					const discardedContext = await sticky.discardDocument(oContext);
+					if (discardedContext) {
+						if (discardedContext.hasPendingChanges()) {
+							discardedContext.getBinding().resetChanges();
+						}
+						if (!this._bCreateMode) {
+							discardedContext.refresh();
+							returnedValue = discardedContext;
+						}
+					}
+					break;
+
+				default:
+					throw new Error("Cancel document only allowed for draft or sticky session supported services");
+			}
+
+			this._bIsModified = false;
+			// remove existing bound transition messages
+			messageHandler.removeTransitionMessages();
+			// show unbound messages
+			await messageHandler.showMessages();
+			return returnedValue;
+		} catch (err: any) {
+			await messageHandler.showMessages();
+			throw err;
+		} finally {
+			BusyLocker.unlock(this.oLockObject);
+		}
 	}
+
 	/**
 	 * Saves the document.
 	 *
 	 * @memberof sap.fe.core.TransactionHelper
 	 * @static
-	 * @param {sap.ui.model.odata.v4.Context} oContext Context of the document to be saved
+	 * @param oContext Context of the document to be saved
 	 * @param oResourceBundle
 	 * @param bExecuteSideEffectsOnError
 	 * @param aBindings
 	 * @param messageHandler
-	 * @returns {Promise} Promise resolves with ???
+	 * @returns Promise resolves with ???
 	 * @ui5-restricted
 	 * @final
 	 */
-	saveDocument(oContext: any, oResourceBundle: any, bExecuteSideEffectsOnError: any, aBindings: any, messageHandler: any) {
-		// eslint-disable-next-line @typescript-eslint/no-this-alias
-		const that = this;
-		const sProgrammingModel = this.getProgrammingModel(oContext);
-		let oSavePromise;
+	async saveDocument(
+		oContext: V4Context,
+		oResourceBundle: any,
+		bExecuteSideEffectsOnError: any,
+		aBindings: any,
+		messageHandler: any
+	): Promise<V4Context> {
 		if (!oContext) {
 			return Promise.reject(new Error("Binding context to draft document is required"));
 		}
+		const sProgrammingModel = this.getProgrammingModel(oContext);
+		if (sProgrammingModel !== ProgrammingModel.Sticky && sProgrammingModel !== ProgrammingModel.Draft) {
+			throw new Error("Save is only allowed for draft or sticky session supported services");
+		}
 		// in case of saving / activating the bound transition messages shall be removed before the PATCH/POST
 		// is sent to the backend
 		messageHandler.removeTransitionMessages();
-		BusyLocker.lock(that.oLockObject);
-		if (sProgrammingModel === ProgrammingModel.Draft) {
-			oSavePromise = draft.activateDocument(oContext, this._getAppComponent(), {});
-		} else if (sProgrammingModel === ProgrammingModel.Sticky) {
-			const bEnableStrictHandling = UriParameters.fromQuery(window.location.search).get("sap-fe-save-strict-mode") === "true";
-			oSavePromise = sticky.activateDocument(oContext, bEnableStrictHandling);
-		} else {
-			BusyLocker.unlock(that.oLockObject);
-			return Promise.reject(new Error("Save is only allowed for draft or sticky session supported services"));
-		}
-		return oSavePromise
-			.then(function (oActiveDocument: any) {
-				const bNewObject =
-					that.sProgrammingModel === ProgrammingModel.Sticky ? that._bCreateMode : !oContext.getObject().HasActiveEntity;
-				MessageToast.show(
-					bNewObject
-						? CommonUtils.getTranslatedText("C_TRANSACTION_HELPER_OBJECT_CREATED", oResourceBundle)
-						: CommonUtils.getTranslatedText("C_TRANSACTION_HELPER_OBJECT_SAVED", oResourceBundle)
-				);
-				that._bIsModified = false;
-				return messageHandler.showMessageDialog().then(function () {
-					return oActiveDocument;
-				});
-			})
-			.catch(function (err: any) {
-				if (aBindings && aBindings.length > 0) {
-					/* The sideEffects are executed only for table items in transient state */
-					aBindings.forEach(function (oListBinding: any) {
-						if (!CommonUtils.hasTransientContext(oListBinding) && bExecuteSideEffectsOnError) {
-							const oAppComponent = that._getAppComponent();
-							oAppComponent.getSideEffectsService().requestSideEffectsForNavigationProperty(oListBinding.getPath(), oContext);
-						}
-					});
-				}
-				return messageHandler.showMessages().then(function () {
-					return Promise.reject(err);
+
+		try {
+			BusyLocker.lock(this.oLockObject);
+			const oActiveDocument =
+				sProgrammingModel === ProgrammingModel.Draft
+					? await draft.activateDocument(oContext, this._getAppComponent(), {}, messageHandler)
+					: await sticky.activateDocument(oContext, this._getAppComponent());
+
+			const bNewObject = sProgrammingModel === ProgrammingModel.Sticky ? this._bCreateMode : !oContext.getObject().HasActiveEntity;
+			MessageToast.show(
+				bNewObject
+					? CommonUtils.getTranslatedText("C_TRANSACTION_HELPER_OBJECT_CREATED", oResourceBundle)
+					: CommonUtils.getTranslatedText("C_TRANSACTION_HELPER_OBJECT_SAVED", oResourceBundle)
+			);
+			this._bIsModified = false;
+			return oActiveDocument;
+		} catch (err: any) {
+			if (aBindings && aBindings.length > 0) {
+				/* The sideEffects are executed only for table items in transient state */
+				aBindings.forEach((oListBinding: any) => {
+					if (!CommonUtils.hasTransientContext(oListBinding) && bExecuteSideEffectsOnError) {
+						const oAppComponent = this._getAppComponent();
+						oAppComponent.getSideEffectsService().requestSideEffectsForNavigationProperty(oListBinding.getPath(), oContext);
+					}
 				});
-			})
-			.finally(function () {
-				BusyLocker.unlock(that.oLockObject);
-			});
+			}
+			await messageHandler.showMessages();
+			throw err;
+		} finally {
+			BusyLocker.unlock(this.oLockObject);
+		}
 	}
 	/**
 	 * Calls a bound or unbound action.
@@ -1042,27 +989,27 @@ class TransactionHelper {
 	 * @static
 	 * @name sap.fe.core.TransactionHelper.callAction
 	 * @memberof sap.fe.core.TransactionHelper
-	 * @param {string} sActionName The name of the action to be called
-	 * @param {map} [mParameters] Contains the following attributes:
-	 * @param {sap.ui.model.odata.v4.Context} [mParameters.contexts] Mandatory for a bound action: Either one context or an array with contexts for which the action is to be called
-	 * @param {sap.ui.model.odata.v4.ODataModel} [mParameters.model] Mandatory for an unbound action: An instance of an OData V4 model
-	 * @param {string} [mParameters.invocationGrouping] Mode how actions are to be called: 'ChangeSet' to put all action calls into one changeset, 'Isolated' to put them into separate changesets
-	 * @param {string} [mParameters.label] A human-readable label for the action
-	 * @param {boolean} [mParameters.bGetBoundContext] If specified, the action promise returns the bound context
-	 * @param {object} oView Contains the object of the current view
+	 * @param sActionName The name of the action to be called
+	 * @param [mParameters] Contains the following attributes:
+	 * @param [mParameters.contexts] Mandatory for a bound action: Either one context or an array with contexts for which the action is to be called
+	 * @param [mParameters.model] Mandatory for an unbound action: An instance of an OData V4 model
+	 * @param [mParameters.invocationGrouping] Mode how actions are to be called: 'ChangeSet' to put all action calls into one changeset, 'Isolated' to put them into separate changesets
+	 * @param [mParameters.label] A human-readable label for the action
+	 * @param [mParameters.bGetBoundContext] If specified, the action promise returns the bound context
+	 * @param oView Contains the object of the current view
 	 * @param messageHandler
-	 * @returns {Promise} Promise resolves with an array of response objects (TODO: to be changed)
+	 * @returns Promise resolves with an array of response objects (TODO: to be changed)
 	 * @ui5-restricted
 	 * @final
-	 **/
-	callAction(sActionName: string, mParameters: any, oView: View | null, messageHandler: any) {
+	 */
+	async callAction(sActionName: string, mParameters: any, oView: View | null, messageHandler: any): Promise<any> {
 		mParameters = getParameters(mParameters);
 		// eslint-disable-next-line @typescript-eslint/no-this-alias
 		const that = this;
-		let oContext, oModel: any, oPromise;
+		let oContext, oModel: any;
 		const mBindingParameters = mParameters.bindingParameters;
 		if (!sActionName) {
-			return Promise.reject("Provide name of action to be executed");
+			throw new Error("Provide name of action to be executed");
 		}
 		// action imports are not directly obtained from the metaModel by it is present inside the entityContainer
 		// and the acions it refers to present outside the entitycontainer, hence to obtain kind of the action
@@ -1079,28 +1026,20 @@ class TransactionHelper {
 			oModel = mParameters.model;
 		}
 		if (!oModel) {
-			return Promise.reject("Pass a context for a bound action or pass the model for an unbound action");
+			throw new Error("Pass a context for a bound action or pass the model for an unbound action");
 		}
 		// get the binding parameters $select and $expand for the side effect on this action
 		// also gather additional property paths to be requested such as text associations
 		const oAppComponent = that._getAppComponent();
 		const mSideEffectsParameters = oAppComponent.getSideEffectsService().getODataActionSideEffects(sActionName, oContext) || {};
-		if (oContext && oModel) {
-			oPromise = new Promise<void>(function (resolve, reject) {
-				let oApplicableContextDialog: Dialog;
-				const oController = {
-					onClose: function () {
-						// User cancels action
-						oApplicableContextDialog.close();
-						resolve();
-					},
-					onContinue: function () {
-						// Users continues the action with the bound contexts
-						oApplicableContextDialog.close();
-						resolve(mParameters.applicableContext);
-					}
-				};
-				const fnOpenAndFillDialog = function () {
+
+		const displayUnapplicableContextsDialog = (): Promise<V4Context[] | void> => {
+			if (!mParameters.notApplicableContext || mParameters.notApplicableContext.length === 0) {
+				return Promise.resolve(mParameters.contexts);
+			}
+
+			return new Promise(async (resolve, reject) => {
+				const fnOpenAndFillDialog = function (oDlg: Dialog) {
 					let oDialogContent;
 					const nNotApplicable = mParameters.notApplicableContext.length,
 						aNotApplicableItems = [];
@@ -1110,52 +1049,76 @@ class TransactionHelper {
 					}
 					const oNotApplicableItemsModel = new JSONModel(aNotApplicableItems);
 					const oTotals = new JSONModel({ total: nNotApplicable, label: mParameters.label });
-					oApplicableContextDialog.setModel(oNotApplicableItemsModel, "notApplicable");
-					oApplicableContextDialog.setModel(oTotals, "totals");
-					oApplicableContextDialog.open();
+					oDlg.setModel(oNotApplicableItemsModel, "notApplicable");
+					oDlg.setModel(oTotals, "totals");
+					oDlg.open();
 				};
-				if (mParameters.notApplicableContext && mParameters.notApplicableContext.length >= 1) {
-					// Show the contexts that are not applicable and will not therefore be processed
-					const sFragmentName = "sap.fe.core.controls.ActionPartial";
-					const oDialogFragment = XMLTemplateProcessor.loadTemplate(sFragmentName, "fragment");
-					const oMetaModel = oModel.getMetaModel();
-					const sCanonicalPath = mParameters.contexts[0].getCanonicalPath();
-					const sEntitySet = sCanonicalPath.substr(0, sCanonicalPath.indexOf("(")) + "/";
-					const oDialogLabelModel = new JSONModel({
-						title: mParameters.label
-					});
-					Promise.resolve(
-						XMLPreprocessor.process(
-							oDialogFragment,
-							{ name: sFragmentName },
-							{
-								bindingContexts: {
-									entityType: oMetaModel.createBindingContext(sEntitySet),
-									label: oDialogLabelModel.createBindingContext("/")
-								},
-								models: {
-									entityType: oMetaModel,
-									metaModel: oMetaModel,
-									label: oDialogLabelModel
-								}
+				// Show the contexts that are not applicable and will not therefore be processed
+				const sFragmentName = "sap.fe.core.controls.ActionPartial";
+				const oDialogFragment = XMLTemplateProcessor.loadTemplate(sFragmentName, "fragment");
+				const oMetaModel = oModel.getMetaModel();
+				const sCanonicalPath = mParameters.contexts[0].getCanonicalPath();
+				const sEntitySet = `${sCanonicalPath.substr(0, sCanonicalPath.indexOf("("))}/`;
+				const oDialogLabelModel = new JSONModel({
+					title: mParameters.label
+				});
+
+				try {
+					const oFragment = await XMLPreprocessor.process(
+						oDialogFragment,
+						{ name: sFragmentName },
+						{
+							bindingContexts: {
+								entityType: oMetaModel.createBindingContext(sEntitySet),
+								label: oDialogLabelModel.createBindingContext("/")
+							},
+							models: {
+								entityType: oMetaModel,
+								metaModel: oMetaModel,
+								label: oDialogLabelModel
 							}
-						)
-					)
-						.then(function (oFragment: any) {
-							return Fragment.load({ definition: oFragment, controller: oController });
-						})
-						.then(function (oPopover: any) {
-							oApplicableContextDialog = oPopover;
-							mParameters.parentControl.addDependent(oPopover);
-							fnOpenAndFillDialog();
-						})
-						.catch(reject);
-				} else {
-					resolve(mParameters.contexts);
+						}
+					);
+					// eslint-disable-next-line prefer-const
+					let oDialog: Dialog;
+					const oController = {
+						onClose: function () {
+							// User cancels action
+							oDialog.close();
+							resolve();
+						},
+						onContinue: function () {
+							// Users continues the action with the bound contexts
+							oDialog.close();
+							resolve(mParameters.applicableContext);
+						}
+					};
+					oDialog = (await Fragment.load({ definition: oFragment, controller: oController })) as Dialog;
+					oController.onClose = function () {
+						// User cancels action
+						oDialog.close();
+						resolve();
+					};
+					oController.onContinue = function () {
+						// Users continues the action with the bound contexts
+						oDialog.close();
+						resolve(mParameters.applicableContext);
+					};
+
+					mParameters.parentControl.addDependent(oDialog);
+					fnOpenAndFillDialog(oDialog);
+				} catch (oError) {
+					reject(oError);
 				}
-			}).then(function (contextToProcess: any) {
+			});
+		};
+
+		try {
+			let oResult: any;
+			if (oContext && oModel) {
+				const contextToProcess = await displayUnapplicableContextsDialog();
 				if (contextToProcess) {
-					return operations.callBoundAction(sActionName, contextToProcess, oModel, oAppComponent, {
+					oResult = await operations.callBoundAction(sActionName, contextToProcess, oModel, oAppComponent, {
 						invocationGrouping: mParameters.invocationGrouping,
 						label: mParameters.label,
 						showActionParameterDialog: true,
@@ -1177,44 +1140,38 @@ class TransactionHelper {
 						bGetBoundContext: mParameters.bGetBoundContext,
 						bObjectPage: mParameters.bObjectPage,
 						messageHandler: messageHandler,
-						defaultValuesExtensionFunction: mParameters.defaultValuesExtensionFunction
+						defaultValuesExtensionFunction: mParameters.defaultValuesExtensionFunction,
+						selectedItems: mParameters.contexts
 					});
 				} else {
-					return null;
+					oResult = null;
 				}
-			});
-		} else {
-			// TODO: confirm if action import needs side effects.
-			oPromise = operations.callActionImport(sActionName, oModel, oAppComponent, {
-				label: mParameters.label,
-				showActionParameterDialog: true,
-				bindingParameters: mBindingParameters,
-				entitySetName: mParameters.entitySetName,
-				onSubmitted: function () {
-					BusyLocker.lock(that.oLockObject);
-				},
-				onResponse: function () {
-					BusyLocker.unlock(that.oLockObject);
-				},
-				parentControl: mParameters.parentControl,
-				internalModelContext: mParameters.internalModelContext,
-				operationAvailableMap: mParameters.operationAvailableMap,
-				messageHandler: messageHandler,
-				bObjectPage: mParameters.bObjectPage
-			});
-		}
-		return oPromise
-			.then(function (oResult: any) {
-				// Succeeded
-				return that._handleActionResponse(messageHandler, mParameters, sActionName).then(function () {
-					return oResult;
-				});
-			})
-			.catch(function (err: any) {
-				return that._handleActionResponse(messageHandler, mParameters, sActionName).then(function () {
-					return Promise.reject(err);
+			} else {
+				oResult = await operations.callActionImport(sActionName, oModel, oAppComponent, {
+					label: mParameters.label,
+					showActionParameterDialog: true,
+					bindingParameters: mBindingParameters,
+					entitySetName: mParameters.entitySetName,
+					onSubmitted: function () {
+						BusyLocker.lock(that.oLockObject);
+					},
+					onResponse: function () {
+						BusyLocker.unlock(that.oLockObject);
+					},
+					parentControl: mParameters.parentControl,
+					internalModelContext: mParameters.internalModelContext,
+					operationAvailableMap: mParameters.operationAvailableMap,
+					messageHandler: messageHandler,
+					bObjectPage: mParameters.bObjectPage
 				});
-			});
+			}
+
+			await this._handleActionResponse(messageHandler, mParameters, sActionName);
+			return oResult;
+		} catch (err: any) {
+			await this._handleActionResponse(messageHandler, mParameters, sActionName);
+			throw err;
+		}
 	}
 	/**
 	 * Handles messages for action call.
@@ -1223,9 +1180,9 @@ class TransactionHelper {
 	 * @name sap.fe.core.TransactionHelper#_handleActionResponse
 	 * @memberof sap.fe.core.TransactionHelper
 	 * @param messageHandler
-	 * @param {object} mParameters Parameters to be considered for the action.
-	 * @param {string} sActionName The name of the action to be called
-	 * @returns {Promise} Promise after message dialog is opened if required.
+	 * @param mParameters Parameters to be considered for the action.
+	 * @param sActionName The name of the action to be called
+	 * @returns Promise after message dialog is opened if required.
 	 * @ui5-restricted
 	 * @final
 	 */
@@ -1263,13 +1220,14 @@ class TransactionHelper {
 	 * Shows a popover if it needs to be shown.
 	 * TODO: Popover is shown if user has modified any data.
 	 * TODO: Popover is shown if there's a difference from draft admin data.
+	 *
 	 * @static
 	 * @name sap.fe.core.TransactionHelper._showDiscardPopover
 	 * @memberof sap.fe.core.TransactionHelper
-	 * @param {sap.ui.core.Control} oCancelButton The control which will open the popover
+	 * @param oCancelButton The control which will open the popover
 	 * @param bIsModified
 	 * @param oResourceBundle
-	 * @returns {Promise} Promise resolves if user confirms discard, rejects if otherwise, rejects if no control passed to open popover
+	 * @returns Promise resolves if user confirms discard, rejects if otherwise, rejects if no control passed to open popover
 	 * @ui5-restricted
 	 * @final
 	 */
@@ -1355,10 +1313,10 @@ class TransactionHelper {
 	 * @private
 	 * @name sap.fe.core.TransactionHelper._getOwnerComponent
 	 * @memberof sap.fe.core.TransactionHelper
-	 * @returns {sap.fe.core.AppComponent} The app component
+	 * @returns The app component
 	 * @ui5-restricted
 	 * @final
-	 **/
+	 */
 	_getAppComponent() {
 		return this._oAppComponent;
 	}
@@ -1373,6 +1331,7 @@ class TransactionHelper {
 					// Setting value of field as '' in case of value help and validating other fields
 					oField.setValue(value);
 					fnValidateRequiredProperties();
+
 					return oField.getValue();
 				})
 				.catch(function (value: any) {
@@ -1387,245 +1346,249 @@ class TransactionHelper {
 				});
 		}
 	}
+	_getNonDeletableText(mParameters: any, vContexts: any, oResourceBundle: any) {
+		const aNonDeletableContexts = mParameters.numberOfSelectedContexts - vContexts.concat(mParameters.unSavedContexts).length;
+		return aNonDeletableContexts === 1
+			? CommonUtils.getTranslatedText(
+					"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTINFO_AND_ONE_OBJECT_NON_DELETABLE",
+					oResourceBundle,
+					[mParameters.numberOfSelectedContexts]
+			  )
+			: CommonUtils.getTranslatedText(
+					"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTINFO_AND_FEW_OBJECTS_NON_DELETABLE",
+					oResourceBundle,
+					[
+						mParameters.numberOfSelectedContexts - vContexts.concat(mParameters.unSavedContexts).length,
+						mParameters.numberOfSelectedContexts
+					]
+			  );
+	}
 
-	_launchDialogWithKeyFields(oListBinding: any, mFields: any, oModel: any, mParameters: any, messageHandler: any) {
-		// eslint-disable-next-line @typescript-eslint/no-this-alias
-		const that = this;
+	_launchDialogWithKeyFields(oListBinding: ODataListBinding, mFields: any, oModel: ODataModel, mParameters: any, messageHandler: any) {
 		let oDialog: Dialog;
 		const oParentControl = mParameters.parentControl,
 			bSuccess = false;
 
-		// Create a fake (transient) listBinding and context, just for the binding context of the dialog
+		// Crate a fake (transient) listBinding and context, just for the binding context of the dialog
 		const oTransientListBinding = oModel.bindList(oListBinding.getPath(), oListBinding.getContext(), [], [], {
 			$$updateGroupId: "submitLater"
-		});
+		}) as ODataListBinding;
 		oTransientListBinding.refreshInternal = function () {
 			/* */
 		};
 		const oTransientContext = oTransientListBinding.create(mParameters.data, true);
 
-		return new Promise(function (resolve: (value: any) => void, reject: (reason?: any) => void) {
+		return new Promise(async (resolve, reject) => {
 			const sFragmentName = "sap/fe/core/controls/NonComputedVisibleKeyFieldsDialog";
 			const oFragment = XMLTemplateProcessor.loadTemplate(sFragmentName, "fragment"),
 				oResourceBundle = oParentControl.getController().oResourceBundle,
 				oMetaModel = oModel.getMetaModel(),
 				aImmutableFields: any[] = [],
-				oAppComponent = that._getAppComponent(),
-				sPath = oListBinding.isRelative() ? oListBinding.getResolvedPath() : oListBinding.getPath(),
-				oEntitySetContext = oMetaModel.createBindingContext(sPath),
+				oAppComponent = this._getAppComponent(),
+				sPath = (oListBinding.isRelative() ? oListBinding.getResolvedPath() : oListBinding.getPath()) as string,
+				oEntitySetContext = oMetaModel.createBindingContext(sPath) as Context,
 				sMetaPath = oMetaModel.getMetaPath(sPath);
 			for (const i in mFields) {
-				aImmutableFields.push(oMetaModel.createBindingContext(sMetaPath + "/" + mFields[i]));
+				aImmutableFields.push(oMetaModel.createBindingContext(`${sMetaPath}/${mFields[i]}`));
 			}
 			const oImmutableCtxModel = new JSONModel(aImmutableFields);
 			const oImmutableCtx = oImmutableCtxModel.createBindingContext("/") as Context;
-			return Promise.resolve(
-				XMLPreprocessor.process(
-					oFragment,
-					{ name: sFragmentName },
-					{
-						bindingContexts: {
-							entitySet: oEntitySetContext,
-							fields: oImmutableCtx
-						},
-						models: {
-							entitySet: oEntitySetContext.getModel(),
-							fields: oImmutableCtx.getModel(),
-							metaModel: oMetaModel
-						}
+			const aRequiredProperties = CommonUtils.getRequiredPropertiesFromInsertRestrictions(sMetaPath, oMetaModel);
+			const oRequiredPropertyPathsCtxModel = new JSONModel(aRequiredProperties);
+			const oRequiredPropertyPathsCtx = oRequiredPropertyPathsCtxModel.createBindingContext("/") as Context;
+			const oNewFragment = await XMLPreprocessor.process(
+				oFragment,
+				{ name: sFragmentName },
+				{
+					bindingContexts: {
+						entitySet: oEntitySetContext,
+						fields: oImmutableCtx,
+						requiredProperties: oRequiredPropertyPathsCtx
+					},
+					models: {
+						entitySet: oEntitySetContext.getModel(),
+						fields: oImmutableCtx.getModel(),
+						metaModel: oMetaModel,
+						requiredProperties: oRequiredPropertyPathsCtxModel
 					}
-				)
-			).then(function (oFragment: any) {
-				let aFormElements: any[] = [];
-				const mFieldValueMap: any = {};
-				let oCreateButton: Button;
-				const validateRequiredProperties = function () {
-					return Promise.all(
+				}
+			);
+
+			let aFormElements: any[] = [];
+			const mFieldValueMap: any = {};
+			// eslint-disable-next-line prefer-const
+			let oCreateButton: Button;
+
+			const validateRequiredProperties = async function () {
+				let bEnabled = false;
+				try {
+					const aResults = await Promise.all(
 						aFormElements
 							.map(function (oFormElement: any) {
 								return oFormElement.getFields()[0];
 							})
 							.filter(function (oField: any) {
-								// The continue button should remain disabled in case of error in any field of the create dialog
-								return oField.getRequired() || (oField.getValueState() === ValueState.Error && oField.getValue() !== "");
+								// The continue button should remain disabled in case of empty required fields.
+								return oField.getRequired() || oField.getValueState() === ValueState.Error;
 							})
-							.map(function (oField: any) {
+							.map(async function (oField: any) {
 								const sFieldId = oField.getId();
 								if (sFieldId in mFieldValueMap) {
-									return Promise.resolve(mFieldValueMap[sFieldId])
-										.then(function (vValue: any) {
-											return oField.getValueState() === ValueState.Error ? undefined : vValue;
-										})
-										.catch(function () {
-											return undefined;
-										});
+									try {
+										const vValue = await mFieldValueMap[sFieldId];
+										return oField.getValue() === "" ? undefined : vValue;
+									} catch (err) {
+										return undefined;
+									}
 								}
-								return oField.getValueState() === ValueState.Error ? undefined : oField.getValue();
+								return oField.getValue() === "" ? undefined : oField.getValue();
 							})
-					)
-						.then(function (aResults: any[]) {
-							return aResults.every(function (vValue: any) {
-								return vValue !== undefined && vValue !== null && vValue !== "";
-							});
-						})
-						.catch(function () {
-							return false;
-						})
-						.then(function (bEnabled: boolean) {
-							oCreateButton.setEnabled(bEnabled);
-						});
-				};
-				const oController = {
-					/*
-    									fired on focus out from field or on selecting a value from the valuehelp.
-    									the create button is enabled when a value is added.
-    									liveChange is not fired when value is added from valuehelp.
-    									value validation is not done for create button enablement.
-    								*/
-					handleChange: function (oEvent: any) {
-						const sFieldId = oEvent.getParameter("id");
-						mFieldValueMap[sFieldId] = that._onFieldChange(oEvent, oCreateButton, messageHandler, validateRequiredProperties);
-					},
-					/*
-    									fired on key press. the create button is enabled when a value is added.
-    									liveChange is not fired when value is added from valuehelp.
-    									value validation is not done for create button enablement.
-    								*/
-					handleLiveChange: function (oEvent: any) {
-						const sFieldId = oEvent.getParameter("id");
-						const vValue = oEvent.getParameter("value");
-						mFieldValueMap[sFieldId] = vValue;
-						validateRequiredProperties();
-					}
-				};
-				return Fragment.load({
-					definition: oFragment,
-					controller: oController
-				}).then(function (oDialogContent: any) {
-					oDialog = new Dialog({
-						title: CommonUtils.getTranslatedText("C_TRANSACTION_HELPER_SAPFE_ACTION_CREATE", oResourceBundle),
-						content: [oDialogContent],
-						beginButton: {
-							text: CommonUtils.getTranslatedText("C_TRANSACTION_HELPER_SAPFE_ACTION_CREATE_BUTTON", oResourceBundle),
-							type: "Emphasized",
-							press: function (oEvent: any) {
-								const oCreateButton = oEvent.getSource();
-								let oNewDocumentContext: any;
-								oCreateButton.setEnabled(false);
-								BusyLocker.lock(oDialog);
-								mParameters.bIsCreateDialog = true;
-								return Promise.all(
-									Object.keys(mFieldValueMap).map(function (sKey: string) {
-										return mFieldValueMap[sKey].then(function (oValue: any) {
-											const oDialogValue: any = {};
-											oDialogValue[sKey] = oValue;
-											return oDialogValue;
-										});
-									})
-								)
-									.then(function (aValues: any[]) {
-										let onBeforeCreatePromise;
-										if (mParameters.beforeCreateCallBack) {
-											onBeforeCreatePromise = mParameters.beforeCreateCallBack({
-												contextPath: oListBinding && oListBinding.getPath(),
-												createParameters: aValues
-											});
-										} else {
-											onBeforeCreatePromise = Promise.resolve();
-										}
-										return onBeforeCreatePromise;
-									})
-									.then(function () {
-										const transientData = oTransientContext.getObject();
-										const createData: any = {};
-										Object.keys(transientData).forEach(function (sPropertyPath: string) {
-											const oProperty = oMetaModel.getObject(`${sMetaPath}/${sPropertyPath}`);
-											// ensure navigation properties are not part of the payload, deep create not supported
-											if (oProperty && oProperty.$kind === "NavigationProperty") {
-												return;
-											}
-											createData[sPropertyPath] = transientData[sPropertyPath];
-										});
-										oNewDocumentContext = oListBinding.create(
-											createData,
-											true,
-											mParameters.createAtEnd,
-											mParameters.inactive
-										);
-
-										const oPromise = that.onAfterCreateCompletion(oListBinding, oNewDocumentContext, mParameters);
+					);
+					bEnabled = aResults.every(function (vValue: any) {
+						if (Array.isArray(vValue)) {
+							vValue = vValue[0];
+						}
+						return vValue !== undefined && vValue !== null && vValue !== "";
+					});
+				} catch (err) {
+					bEnabled = false;
+				}
+				oCreateButton.setEnabled(bEnabled);
+			};
+			const oController = {
+				/*
+									fired on focus out from field or on selecting a value from the valuehelp.
+									the create button is enabled when a value is added.
+									liveChange is not fired when value is added from valuehelp.
+									value validation is not done for create button enablement.
+								*/
+				handleChange: (oEvent: any) => {
+					const sFieldId = oEvent.getParameter("id");
+					mFieldValueMap[sFieldId] = this._onFieldChange(oEvent, oCreateButton, messageHandler, validateRequiredProperties);
+				},
+				/*
+									fired on key press. the create button is enabled when a value is added.
+									liveChange is not fired when value is added from valuehelp.
+									value validation is not done for create button enablement.
+								*/
+				handleLiveChange: (oEvent: any) => {
+					const sFieldId = oEvent.getParameter("id");
+					const vValue = oEvent.getParameter("value");
+					mFieldValueMap[sFieldId] = vValue;
+					validateRequiredProperties();
+				}
+			};
 
-										return oPromise;
-									})
-									.then(function (oResponse: any) {
-										if (!oResponse || (oResponse && oResponse.bKeepDialogOpen !== true)) {
-											oResponse = oResponse ?? {};
-											oDialog.setBindingContext(null as any);
-											oDialog.close();
-											oResponse.newContext = oNewDocumentContext;
-											resolve(oResponse);
-										}
-									})
-									.catch(function (oError: any) {
-										reject(oError);
+			const oDialogContent: any = await Fragment.load({
+				definition: oNewFragment,
+				controller: oController
+			});
+			oDialog = new Dialog({
+				title: CommonUtils.getTranslatedText("C_TRANSACTION_HELPER_SAPFE_ACTION_CREATE", oResourceBundle),
+				content: [oDialogContent],
+				beginButton: {
+					text: CommonUtils.getTranslatedText("C_TRANSACTION_HELPER_SAPFE_ACTION_CREATE_BUTTON", oResourceBundle),
+					type: "Emphasized",
+					press: async (oEvent: any) => {
+						const createButton = oEvent.getSource();
+						createButton.setEnabled(false);
+						BusyLocker.lock(oDialog);
+						mParameters.bIsCreateDialog = true;
+						try {
+							const aValues = await Promise.all(
+								Object.keys(mFieldValueMap).map(async function (sKey: string) {
+									const oValue = await mFieldValueMap[sKey];
+									const oDialogValue: any = {};
+									oDialogValue[sKey] = oValue;
+									return oDialogValue;
+								})
+							);
+							if (mParameters.beforeCreateCallBack) {
+								await toES6Promise(
+									mParameters.beforeCreateCallBack({
+										contextPath: oListBinding && oListBinding.getPath(),
+										createParameters: aValues
 									})
-									.finally(function () {
-										BusyLocker.unlock(oDialog);
-										oCreateButton.setEnabled(true);
-										return messageHandler.showMessages();
-									});
+								);
 							}
-						},
-						endButton: {
-							text: CommonUtils.getTranslatedText("C_COMMON_ACTION_PARAMETER_DIALOG_CANCEL", oResourceBundle),
-							press: function () {
+							const transientData = oTransientContext.getObject();
+							const createData: any = {};
+							Object.keys(transientData).forEach(function (sPropertyPath: string) {
+								const oProperty = oMetaModel.getObject(`${sMetaPath}/${sPropertyPath}`);
+								// ensure navigation properties are not part of the payload, deep create not supported
+								if (oProperty && oProperty.$kind === "NavigationProperty") {
+									return;
+								}
+								createData[sPropertyPath] = transientData[sPropertyPath];
+							});
+							const oNewDocumentContext = oListBinding.create(
+								createData,
+								true,
+								mParameters.createAtEnd,
+								mParameters.inactive
+							);
+
+							const oPromise = this.onAfterCreateCompletion(oListBinding, oNewDocumentContext, mParameters);
+							let oResponse: any = await oPromise;
+							if (!oResponse || (oResponse && oResponse.bKeepDialogOpen !== true)) {
+								oResponse = oResponse ?? {};
+								oDialog.setBindingContext(null as any);
 								oDialog.close();
+								oResponse.newContext = oNewDocumentContext;
+								resolve(oResponse);
 							}
-						},
-						afterClose: function () {
-							// show footer as per UX guidelines when dialog is not open
-							(oDialog.getBindingContext("internal") as InternalModelContext)?.setProperty("isCreateDialogOpen", false);
-							oDialog.destroy();
-							oTransientListBinding.destroy();
-							if (!bSuccess) {
-								reject({
-									bDeleteTransientContext: true,
-									navigateBackFromTransientState: true
-								});
-							}
+						} catch (oError: any) {
+							reject(oError);
+						} finally {
+							BusyLocker.unlock(oDialog);
+							createButton.setEnabled(true);
+							messageHandler.showMessages();
 						}
-					} as any);
-					aFormElements = oDialogContent
-						.getAggregation("form")
-						.getAggregation("formContainers")[0]
-						.getAggregation("formElements");
-					if (oParentControl && oParentControl.addDependent) {
-						// if there is a parent control specified add the dialog as dependent
-						oParentControl.addDependent(oDialog);
 					}
-					oCreateButton = oDialog.getBeginButton();
-					oDialog.setBindingContext(oTransientContext);
-					return CommonUtils.setUserDefaults(
-						oAppComponent,
-						aImmutableFields,
-						oTransientContext,
-						false,
-						mParameters.createAction,
-						mParameters.data
-					)
-						.then(function () {
-							validateRequiredProperties();
-							// footer must not be visible when the dialog is open as per UX guidelines
-							(oDialog.getBindingContext("internal") as InternalModelContext).setProperty("isCreateDialogOpen", true);
-							oDialog.open();
-						})
-						.catch(function (oError: any) {
-							return messageHandler.showMessages().then(function () {
-								return Promise.reject(oError);
-							});
+				},
+				endButton: {
+					text: CommonUtils.getTranslatedText("C_COMMON_ACTION_PARAMETER_DIALOG_CANCEL", oResourceBundle),
+					press: function () {
+						oDialog.close();
+					}
+				},
+				afterClose: function () {
+					// show footer as per UX guidelines when dialog is not open
+					(oDialog.getBindingContext("internal") as InternalModelContext)?.setProperty("isCreateDialogOpen", false);
+					oDialog.destroy();
+					oTransientListBinding.destroy();
+					if (!bSuccess) {
+						reject({
+							bDeleteTransientContext: true,
+							navigateBackFromTransientState: true
 						});
-				});
-			});
+					}
+				}
+			} as any);
+			aFormElements = oDialogContent?.getAggregation("form").getAggregation("formContainers")[0].getAggregation("formElements");
+			if (oParentControl && oParentControl.addDependent) {
+				// if there is a parent control specified add the dialog as dependent
+				oParentControl.addDependent(oDialog);
+			}
+			oCreateButton = oDialog.getBeginButton();
+			oDialog.setBindingContext(oTransientContext);
+			try {
+				await CommonUtils.setUserDefaults(
+					oAppComponent,
+					aImmutableFields,
+					oTransientContext,
+					false,
+					mParameters.createAction,
+					mParameters.data
+				);
+				validateRequiredProperties();
+				// footer must not be visible when the dialog is open as per UX guidelines
+				(oDialog.getBindingContext("internal") as InternalModelContext).setProperty("isCreateDialogOpen", true);
+				oDialog.open();
+			} catch (oError: any) {
+				await messageHandler.showMessages();
+				throw oError;
+			}
 		});
 	}
 	onAfterCreateCompletion(oListBinding: any, oNewDocumentContext: any, mParameters: any) {
@@ -1685,14 +1648,14 @@ class TransactionHelper {
 	 * @private
 	 * @name sap.fe.core.TransactionHelper._getNewAction
 	 * @memberof sap.fe.core.TransactionHelper
-	 * @param {object} oStartupParameters Startup parameters of the application
-	 * @param {string} sCreateHash Hash to be checked for action type
-	 * @param {object} oMetaModel The MetaModel used to check for NewAction parameter
-	 * @param {string} sMetaPath The MetaPath
-	 * @returns {string} The name of the action
+	 * @param oStartupParameters Startup parameters of the application
+	 * @param sCreateHash Hash to be checked for action type
+	 * @param oMetaModel The MetaModel used to check for NewAction parameter
+	 * @param sMetaPath The MetaPath
+	 * @returns The name of the action
 	 * @ui5-restricted
 	 * @final
-	 **/
+	 */
 	_getNewAction(oStartupParameters: any, sCreateHash: string, oMetaModel: ODataMetaModel, sMetaPath: string) {
 		let sNewAction;
 
@@ -1703,8 +1666,8 @@ class TransactionHelper {
 		} else {
 			sNewAction =
 				oMetaModel && oMetaModel.getObject !== undefined
-					? oMetaModel.getObject(sMetaPath + "@com.sap.vocabularies.Session.v1.StickySessionSupported/NewAction") ||
-					  oMetaModel.getObject(sMetaPath + "@com.sap.vocabularies.Common.v1.DraftRoot/NewAction")
+					? oMetaModel.getObject(`${sMetaPath}@com.sap.vocabularies.Session.v1.StickySessionSupported/NewAction`) ||
+					  oMetaModel.getObject(`${sMetaPath}@com.sap.vocabularies.Common.v1.DraftRoot/NewAction`)
 					: undefined;
 		}
 		return sNewAction;
@@ -1722,14 +1685,14 @@ class TransactionHelper {
 	 * @private
 	 * @name sap.fe.core.TransactionHelper._getSpecificCreateActionDialogLabel
 	 * @memberof sap.fe.core.TransactionHelper
-	 * @param {object} oMetaModel The MetaModel used to check for the NewAction parameter
-	 * @param {string} sMetaPath The MetaPath
-	 * @param {string} sNewAction Contains the name of the action to be executed
-	 * @param {object} oResourceBundleCore ResourceBundle to access the default Create label
-	 * @returns {string} The label for the Create Action Dialog
+	 * @param oMetaModel The MetaModel used to check for the NewAction parameter
+	 * @param sMetaPath The MetaPath
+	 * @param sNewAction Contains the name of the action to be executed
+	 * @param oResourceBundleCore ResourceBundle to access the default Create label
+	 * @returns The label for the Create Action Dialog
 	 * @ui5-restricted
 	 * @final
-	 **/
+	 */
 	_getSpecificCreateActionDialogLabel(
 		oMetaModel: ODataMetaModel,
 		sMetaPath: string,
@@ -1737,15 +1700,15 @@ class TransactionHelper {
 		oResourceBundleCore: ResourceBundle
 	) {
 		const fnGetLabelFromLineItemAnnotation = function () {
-			if (oMetaModel && oMetaModel.getObject(sMetaPath + "/@com.sap.vocabularies.UI.v1.LineItem")) {
+			if (oMetaModel && oMetaModel.getObject(`${sMetaPath}/@com.sap.vocabularies.UI.v1.LineItem`)) {
 				const iLineItemIndex = oMetaModel
-					.getObject(sMetaPath + "/@com.sap.vocabularies.UI.v1.LineItem")
+					.getObject(`${sMetaPath}/@com.sap.vocabularies.UI.v1.LineItem`)
 					.findIndex(function (oLineItem: any) {
 						const aLineItemAction = oLineItem.Action ? oLineItem.Action.split("(") : undefined;
 						return aLineItemAction ? aLineItemAction[0] === sNewAction : false;
 					});
 				return iLineItemIndex > -1
-					? oMetaModel.getObject(sMetaPath + "/@com.sap.vocabularies.UI.v1.LineItem")[iLineItemIndex].Label
+					? oMetaModel.getObject(`${sMetaPath}/@com.sap.vocabularies.UI.v1.LineItem`)[iLineItemIndex].Label
 					: undefined;
 			} else {
 				return undefined;
@@ -1754,7 +1717,7 @@ class TransactionHelper {
 
 		return (
 			fnGetLabelFromLineItemAnnotation() ||
-			(oMetaModel && oMetaModel.getObject(sMetaPath + "/" + sNewAction + "@com.sap.vocabularies.Common.v1.Label")) ||
+			(oMetaModel && oMetaModel.getObject(`${sMetaPath}/${sNewAction}@com.sap.vocabularies.Common.v1.Label`)) ||
 			(oResourceBundleCore && oResourceBundleCore.getText("C_TRANSACTION_HELPER_SAPFE_ACTION_CREATE"))
 		);
 	}