@sapui5/sap.fe.core 1.103.0 → 1.106.0

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

@@ -6,6 +6,7 @@ import BusyLocker from "sap/fe/core/controllerextensions/BusyLocker";
 import draft from "sap/fe/core/controllerextensions/editFlow/draft";
 import operations from "sap/fe/core/controllerextensions/editFlow/operations";
 import sticky from "sap/fe/core/controllerextensions/editFlow/sticky";
+import type MessageHandler from "sap/fe/core/controllerextensions/MessageHandler";
 import messageHandling from "sap/fe/core/controllerextensions/messageHandler/messageHandling";
 import FPMHelper from "sap/fe/core/helpers/FPMHelper";
 import type { InternalModelContext } from "sap/fe/core/helpers/ModelHelper";
@@ -27,8 +28,11 @@ import XMLPreprocessor from "sap/ui/core/util/XMLPreprocessor";
 import XMLTemplateProcessor from "sap/ui/core/XMLTemplateProcessor";
 import type Context from "sap/ui/model/Context";
 import JSONModel from "sap/ui/model/json/JSONModel";
+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;
@@ -122,17 +126,16 @@ class TransactionHelper {
 	 * @ui5-restricted
 	 * @final
 	 */
-	createDocument(
+	async createDocument(
 		oMainListBinding: ODataListBinding,
 		mInParameters: { data?: any; busyMode?: string | undefined; keepTransientContextOnFailed?: any; inactive?: boolean } | undefined,
 		oResourceBundle: any,
-		messageHandler: any,
+		messageHandler: MessageHandler,
 		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,7 +144,6 @@ 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`);
 		let sBusyPath = "/busy";
@@ -151,7 +153,7 @@ class TransactionHelper {
 				`${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`) &&
@@ -167,11 +169,11 @@ 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
@@ -181,142 +183,122 @@ class TransactionHelper {
 		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),
-					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) as any);
-			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) {
-						const oTransientListBinding = oModel.bindList(oMainListBinding.getPath(), oMainListBinding.getContext(), [], [], {
-							$$updateGroupId: "submitLater"
-						}) as ODataListBinding;
-						oTransientListBinding.refreshInternal = function () {
-							/* */
-						};
-						oNewDocumentContext = oTransientListBinding.create(mParameters.data, true);
-						return that._launchDialogWithKeyFields(
+						oResult = await this._launchDialogWithKeyFields(
 							oMainListBinding,
-							oTransientListBinding,
-							oNewDocumentContext,
 							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.
@@ -402,10 +384,8 @@ class TransactionHelper {
 	 * @param messageHandler
 	 * @returns A Promise resolved once the document are deleted
 	 */
-	deleteDocument(vInContexts: V4Context, mParameters: any, oResourceBundle: any, messageHandler: any) {
-		let fnReject: Function,
-			fnResolve: Function,
-			aDeletableContexts: any[] = [],
+	deleteDocument(vInContexts: V4Context, mParameters: any, oResourceBundle: any, messageHandler: MessageHandler) {
+		let aDeletableContexts: any[] = [],
 			isCheckBoxVisible = false,
 			isLockedTextVisible = false,
 			cannotBeDeletedTextVisible = false,
@@ -418,7 +398,6 @@ class TransactionHelper {
 		let oDeleteMessage: any = {
 			title: oResourceBundleCore.getText("C_COMMON_DELETE")
 		};
-		messageHandling.removeBoundTransitionMessages();
 		BusyLocker.lock(this.oLockObject);
 		let vContexts: V4Context[];
 		if (Array.isArray(vInContexts)) {
@@ -426,8 +405,10 @@ class TransactionHelper {
 		} 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) {
@@ -454,7 +435,7 @@ class TransactionHelper {
 										),
 										{
 											title: oResourceBundleCore.getText("C_COMMON_DELETE"),
-											onClose: fnReject
+											onClose: reject
 										}
 									);
 									return;
@@ -464,7 +445,7 @@ 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, ""];
 							}
@@ -477,7 +458,9 @@ class TransactionHelper {
 						} else {
 							oDeleteMessage.text = CommonUtils.getTranslatedText(
 								"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTTITLE_SINGULAR",
-								oResourceBundle
+								oResourceBundle,
+								null,
+								mParameters.entitySetName
 							);
 						}
 						aDeletableContexts = vContexts;
@@ -488,23 +471,19 @@ class TransactionHelper {
 						if (mParameters.numberOfSelectedContexts === 1 && mParameters.numberOfSelectedContexts === vContexts.length) {
 							aDeletableContexts = vContexts;
 							const oLineContextData = vContexts[0].getObject();
-							if (mParameters.title && mParameters.title.path) {
-								const sTitle = oLineContextData[mParameters.title.path];
-								const sKey = CommonUtils.getKeys(
-									that._oAppComponent.getMetaModel(),
-									vContexts[0].getPath(),
-									mParameters.entitySetName
-								);
+							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 (sTitle) {
+								if (sKeyValue) {
 									if (sDescription) {
-										aParams = [sTitle, sDescription + " "];
+										aParams = [sKeyValue + " ", sDescription];
 									} else {
-										aParams = [sTitle, ""];
+										aParams = [sKeyValue, ""];
 									}
 									oDeleteMessage.text = CommonUtils.getTranslatedText(
 										"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTINFO",
@@ -523,7 +502,9 @@ class TransactionHelper {
 								} else {
 									oDeleteMessage.text = CommonUtils.getTranslatedText(
 										"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTTITLE_SINGULAR",
-										oResourceBundle
+										oResourceBundle,
+										null,
+										mParameters.entitySetName
 									);
 								}
 							} else {
@@ -600,7 +581,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_ONE_OBJECT_LOCKED",
+								"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTINFO_AND_ONE_OBJECT_LOCKED",
 								oResourceBundle,
 								[mParameters.numberOfSelectedContexts]
 							);
@@ -609,7 +590,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]
 							);
@@ -660,7 +641,7 @@ class TransactionHelper {
 									sNonDeletableContextText +
 									" " +
 									CommonUtils.getTranslatedText(
-										"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTINFO_AND_FEW_OBJECTS_LOCKED_AND_NON_DELETABLE",
+										"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTINFO_AND_FEW_OBJECTS_LOCKED",
 										oResourceBundle,
 										[mParameters.lockedContexts.length, mParameters.numberOfSelectedContexts]
 									);
@@ -670,7 +651,7 @@ class TransactionHelper {
 									sNonDeletableContextText +
 									" " +
 									CommonUtils.getTranslatedText(
-										"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTINFO_AND_ONE_OBJECT_LOCKED_AND_NON_DELETABLE",
+										"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTINFO_AND_ONE_OBJECT_LOCKED",
 										oResourceBundle,
 										[mParameters.numberOfSelectedContexts]
 									);
@@ -706,58 +687,54 @@ class TransactionHelper {
 					]
 				});
 				const sTitle = oResourceBundleCore.getText("C_COMMON_DELETE");
-				const fnConfirm = function () {
+				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
-									return draft.deleteDraft(oContext);
+									const bEnableStrictHandling = aContexts.length === 1 ? true : false;
+									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,
@@ -770,8 +747,9 @@ class TransactionHelper {
 						text: oResourceBundleCore.getText("C_COMMON_DELETE"),
 						type: "Emphasized",
 						press: function () {
+							messageHandling.removeBoundTransitionMessages();
 							oDialog.close();
-							return fnConfirm();
+							fnConfirm();
 						}
 					}),
 					endButton: new Button({
@@ -784,27 +762,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;
+			}
 		});
 	}
 	/**
@@ -819,44 +789,39 @@ class TransactionHelper {
 	 * @ui5-restricted
 	 * @final
 	 */
-	editDocument(oContext: V4Context, oView: View, messageHandler: any) {
+	async editDocument(oContext: V4Context, oView: View, messageHandler: MessageHandler): 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.
@@ -873,134 +838,90 @@ class TransactionHelper {
 	 * @ui5-restricted
 	 * @final
 	 */
-	cancelDocument(
+	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;
+		messageHandler: MessageHandler
+	): 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);
-							}
-						});
-					}
-				}
-			})
-			.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();
+		const oModel = oContext.getModel();
+		const sProgrammingModel = this.getProgrammingModel(oContext);
+
+		try {
+			let returnedValue: V4Context | boolean = false;
+
+			if (sProgrammingModel === ProgrammingModel.Draft && !this._bIsModified) {
+				const draftDataContext = oModel.bindContext(`${oContext.getPath()}/DraftAdministrativeData`).getBoundContext();
+				const draftAdminData = await draftDataContext.requestObject();
+				if (draftAdminData) {
+					this._bIsModified = !(draftAdminData.CreationDateTime === draftAdminData.LastChangeDateTime);
 				}
-				return onBeforeCancelPromise;
-			})
-			.then(function () {
-				// eslint-disable-next-line default-case
-				switch (sProgrammingModel) {
-					case ProgrammingModel.Draft:
-						// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-						// @ts-ignore
-						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);
-										}
-									)
-									.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 (discardedContext: any) {
-							if (discardedContext) {
-								if (discardedContext.hasPendingChanges()) {
-									discardedContext.getBinding().resetChanges();
-								}
-								if (!that._bCreateMode) {
-									discardedContext.refresh();
-									return discardedContext;
-								}
+			}
+			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.
 	 *
@@ -1015,55 +936,54 @@ class TransactionHelper {
 	 * @ui5-restricted
 	 * @final
 	 */
-	saveDocument(oContext: V4Context, 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: MessageHandler
+	): 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) {
-			oSavePromise = sticky.activateDocument(oContext);
-		} 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 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.
@@ -1085,14 +1005,14 @@ class TransactionHelper {
 	 * @ui5-restricted
 	 * @final
 	 */
-	callAction(sActionName: string, mParameters: any, oView: View | null, messageHandler: any) {
+	async callAction(sActionName: string, mParameters: any, oView: View | null, messageHandler: MessageHandler): 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
@@ -1109,28 +1029,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 = [];
@@ -1140,52 +1052,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,
@@ -1207,44 +1143,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.
@@ -1259,7 +1189,7 @@ class TransactionHelper {
 	 * @ui5-restricted
 	 * @final
 	 */
-	_handleActionResponse(messageHandler: any, mParameters: any, sActionName: string) {
+	_handleActionResponse(messageHandler: MessageHandler, mParameters: any, sActionName: string) {
 		const aTransientMessages = messageHandling.getMessages(true, true);
 		if (aTransientMessages.length > 0 && mParameters && mParameters.internalModelContext) {
 			mParameters.internalModelContext.setProperty("sActionName", mParameters.label ? mParameters.label : sActionName);
@@ -1394,7 +1324,7 @@ class TransactionHelper {
 		return this._oAppComponent;
 	}
 
-	_onFieldChange(oEvent: any, oCreateButton: any, messageHandler: any, fnValidateRequiredProperties: Function) {
+	_onFieldChange(oEvent: any, oCreateButton: any, messageHandler: MessageHandler, fnValidateRequiredProperties: Function) {
 		messageHandler.removeTransitionMessages();
 		const oField = oEvent.getSource();
 		const oFieldPromise = oEvent.getParameter("promise");
@@ -1404,6 +1334,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) {
@@ -1424,10 +1355,7 @@ class TransactionHelper {
 			? CommonUtils.getTranslatedText(
 					"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTINFO_AND_ONE_OBJECT_NON_DELETABLE",
 					oResourceBundle,
-					[
-						mParameters.numberOfSelectedContexts - vContexts.concat(mParameters.unSavedContexts).length,
-						mParameters.numberOfSelectedContexts
-					]
+					[mParameters.numberOfSelectedContexts]
 			  )
 			: CommonUtils.getTranslatedText(
 					"C_TRANSACTION_HELPER_CONFIRM_DELETE_WITH_OBJECTINFO_AND_FEW_OBJECTS_NON_DELETABLE",
@@ -1440,28 +1368,34 @@ class TransactionHelper {
 	}
 
 	_launchDialogWithKeyFields(
-		oListBinding: any,
-		oTransientListBinding: any,
-		oTransientContext: any,
+		oListBinding: ODataListBinding,
 		mFields: any,
-		oModel: any,
+		oModel: ODataModel,
 		mParameters: any,
-		messageHandler: any
+		messageHandler: MessageHandler
 	) {
-		// eslint-disable-next-line @typescript-eslint/no-this-alias
-		const that = this;
 		let oDialog: Dialog;
 		const oParentControl = mParameters.parentControl,
 			bSuccess = false;
-		return new Promise(function (resolve: (value: any) => void, reject: (reason?: any) => void) {
+
+		// 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(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]}`));
@@ -1471,243 +1405,249 @@ class TransactionHelper {
 			const aRequiredProperties = CommonUtils.getRequiredPropertiesFromInsertRestrictions(sMetaPath, oMetaModel);
 			const oRequiredPropertyPathsCtxModel = new JSONModel(aRequiredProperties);
 			const oRequiredPropertyPathsCtx = oRequiredPropertyPathsCtxModel.createBindingContext("/") as Context;
-			return Promise.resolve(
-				XMLPreprocessor.process(
-					oFragment,
-					{ name: sFragmentName },
-					{
-						bindingContexts: {
-							entitySet: oEntitySetContext,
-							fields: oImmutableCtx,
-							requiredProperties: oRequiredPropertyPathsCtx
-						},
-						models: {
-							entitySet: oEntitySetContext.getModel(),
-							fields: oImmutableCtx.getModel(),
-							metaModel: oMetaModel,
-							requiredProperties: oRequiredPropertyPathsCtxModel
-						}
+			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 (oNewFragment: 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: oNewFragment,
-					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 createButton = oEvent.getSource();
-								createButton.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 oPromise = that.onAfterCreateCompletion(
-											oTransientListBinding,
-											oTransientContext,
-											mParameters
-										);
-										oModel.submitBatch("submitLater");
-										return oPromise;
-									})
-									.then(function (oResponse: any) {
-										if (!oResponse || (oResponse && oResponse.bKeepDialogOpen !== true)) {
-											oDialog.setBindingContext(null as any);
-											oDialog.close();
-											resolve(oResponse);
-										}
-									})
-									.catch(function (oError: any) {
-										reject(oError);
+					);
+					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();
+				}
+			};
+
+			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);
-										createButton.setEnabled(true);
-										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();
-							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) {
-		let fnResolve: Function, fnReject: Function;
-		const oPromise = new Promise(function (resolve, reject) {
+		let fnResolve: Function;
+		const oPromise = new Promise<boolean>((resolve) => {
 			fnResolve = resolve;
-			fnReject = reject;
 		});
-		// eslint-disable-next-line @typescript-eslint/no-this-alias
-		const that = this;
-		// Workaround suggested by OData model v4 colleagues
-		const fnCreateCompleted = function (oEvent: any) {
+
+		const fnCreateCompleted = (oEvent: any) => {
 			const oContext = oEvent.getParameter("context"),
 				bSuccess = oEvent.getParameter("success");
 			if (oContext === oNewDocumentContext) {
-				oListBinding.detachCreateCompleted(fnCreateCompleted, that);
-				if (!bSuccess) {
-					const oError: any = { bDeleteTransientContext: false };
-					if (!mParameters.keepTransientContextOnFailed) {
-						// the context is deleted
+				oListBinding.detachCreateCompleted(fnCreateCompleted, this);
+				fnResolve(bSuccess);
+			}
+		};
+		const fnSafeContextCreated = () => {
+			oNewDocumentContext
+				.created()
+				.then(undefined, function () {
+					Log.trace("transient creation context deleted");
+				})
+				.catch(function (contextError: any) {
+					Log.trace("transient creation context deletion error", contextError);
+				});
+		};
 
-						// this is needed to avoid console errors TO be checked with model colleagues
-						oContext
-							.created()
-							.then(undefined, function () {
-								Log.trace("transient creation context deleted");
-							})
-							.catch(function (contextError: any) {
-								Log.trace("transient creation context deletion error", contextError);
-							});
-						if (!mParameters.bIsCreateDialog) {
-							// if current state is transient (...), browser will come back to previous state
-							oError.navigateBackFromTransientState = true;
-							oError.bDeleteTransientContext = true;
-							fnReject(oError);
-						}
+		oListBinding.attachCreateCompleted(fnCreateCompleted, this);
+
+		return oPromise.then((bSuccess: boolean) => {
+			if (!bSuccess) {
+				const oError: any = { bDeleteTransientContext: false };
+				if (!mParameters.keepTransientContextOnFailed) {
+					// Cancel the pending POST and delete the context in the listBinding
+					fnSafeContextCreated(); // To avoid a 'request cancelled' error in the console
+					oListBinding.resetChanges();
+					oListBinding.getModel().resetChanges(oListBinding.getUpdateGroupId());
+
+					if (!mParameters.bIsCreateDialog) {
+						// if current state is transient (...), browser will come back to previous state
+						oError.navigateBackFromTransientState = true;
+						oError.bDeleteTransientContext = true;
+						throw oError;
 					}
-					fnResolve({ bKeepDialogOpen: true });
-				} else {
-					return oContext.created().then(fnResolve);
 				}
+				return { bKeepDialogOpen: true };
+			} else {
+				return oNewDocumentContext.created();
 			}
-		};
-		oListBinding.attachCreateCompleted(fnCreateCompleted, this);
-		return oPromise;
+		});
 	}
 	/**
 	 * Retrieves the name of the NewAction to be executed.