@sapui5/sap.fe.core 1.102.2 → 1.104.1

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,13 @@ 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 ODataMetaModel from "sap/ui/model/odata/v4/ODataMetaModel";
+import type { CoreEx, ODataListBinding, V4Context } from "types/extension_types";
 
 const CreationMode = FELibrary.CreationMode;
 const ProgrammingModel = FELibrary.ProgrammingModel;
@@ -71,7 +71,7 @@ class TransactionHelper {
 				return ProgrammingModel.NonDraft;
 			}
 		}
-		return this.sProgrammingModel as typeof ProgrammingModel;
+		return this.sProgrammingModel;
 	}
 
 	/**
@@ -79,16 +79,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,22 +108,22 @@ 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,
+		oMainListBinding: ODataListBinding,
 		mInParameters: { data?: any; busyMode?: string | undefined; keepTransientContextOnFailed?: any; inactive?: boolean } | undefined,
 		oResourceBundle: any,
 		messageHandler: any,
@@ -143,18 +143,18 @@ class TransactionHelper {
 				: 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;
 		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;
@@ -176,7 +176,7 @@ class TransactionHelper {
 		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);
@@ -187,12 +187,7 @@ class TransactionHelper {
 				{
 					contexts: oMainListBinding.getHeaderContext(),
 					showActionParameterDialog: true,
-					label: this._getSpecificCreateActionDialogLabel(
-						oMetaModel,
-						sMetaPath,
-						sNewAction,
-						oResourceBundleCore as ResourceBundle
-					),
+					label: this._getSpecificCreateActionDialogLabel(oMetaModel, sMetaPath, sNewAction, oResourceBundleCore),
 					bindingParameters: mBindingParameters,
 					parentControl: mParameters.parentControl,
 					bIsCreateAction: true
@@ -213,16 +208,16 @@ class TransactionHelper {
 				if (bFunctionOnNavProp) {
 					sFunctionPath =
 						oMainListBinding.getContext() &&
-						oMetaModel.getMetaPath(oMainListBinding.getContext().getPath()) + "/" + sFunctionName;
+						`${oMetaModel.getMetaPath(oMainListBinding.getContext().getPath())}/${sFunctionName}`;
 					oFunctionContext = oMainListBinding.getContext();
 				} else {
 					sFunctionPath =
 						oMainListBinding.getHeaderContext() &&
-						oMetaModel.getMetaPath(oMainListBinding.getHeaderContext().getPath()) + "/" + sFunctionName;
+						`${oMetaModel.getMetaPath(oMainListBinding.getHeaderContext().getPath())}/${sFunctionName}`;
 					oFunctionContext = oMainListBinding.getHeaderContext();
 				}
 			}
-			const oFunction = sFunctionPath && oMetaModel.createBindingContext(sFunctionPath);
+			const oFunction = sFunctionPath && (oMetaModel.createBindingContext(sFunctionPath) as any);
 			if (oFunction && oFunction.getObject() && oFunction.getObject()[0].$IsBound) {
 				oCreationPromise = operations.callBoundFunction(sFunctionName, oFunctionContext, oModel);
 			} else {
@@ -238,7 +233,7 @@ class TransactionHelper {
 					}
 				})
 				.catch(function (oError: any) {
-					Log.error("Error while executing the function " + sFunctionName, oError);
+					Log.error(`Error while executing the function ${sFunctionName}`, oError);
 					throw oError;
 				})
 				.then(function (oData: any) {
@@ -249,7 +244,7 @@ class TransactionHelper {
 					if (aNonComputedVisibleKeyFields.length > 0) {
 						const oTransientListBinding = oModel.bindList(oMainListBinding.getPath(), oMainListBinding.getContext(), [], [], {
 							$$updateGroupId: "submitLater"
-						});
+						}) as ODataListBinding;
 						oTransientListBinding.refreshInternal = function () {
 							/* */
 						};
@@ -328,25 +323,22 @@ class TransactionHelper {
 	 *
 	 * @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);
 				}
 			}
@@ -354,14 +346,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;
+				});
 			})
 		);
 	}
@@ -388,7 +375,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
@@ -396,12 +383,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)
 			);
 		}
 	}
@@ -410,17 +392,17 @@ 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) {
+	deleteDocument(vInContexts: V4Context, mParameters: any, oResourceBundle: any, messageHandler: any) {
 		let fnReject: Function,
 			fnResolve: Function,
 			aDeletableContexts: any[] = [],
@@ -431,15 +413,18 @@ 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) {
@@ -455,13 +440,20 @@ 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"),
+											title: oResourceBundleCore.getText("C_COMMON_DELETE"),
 											onClose: fnReject
 										}
 									);
@@ -472,35 +464,76 @@ 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();
+							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 sKeyValue = sKey ? oLineContextData[sKey] : undefined;
+								const sDescription =
+									mParameters.description && mParameters.description.path
+										? oLineContextData[mParameters.description.path]
+										: undefined;
+								if (sTitle) {
+									if (sDescription) {
+										aParams = [sTitle + " ", sDescription];
+									} else {
+										aParams = [sTitle, ""];
+									}
+									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;
@@ -512,7 +545,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
 							);
@@ -520,7 +553,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 (
@@ -532,13 +565,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
@@ -550,31 +583,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]
 							);
@@ -583,7 +609,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]
 							);
@@ -601,24 +627,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
 									);
 								}
@@ -626,31 +652,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]
+									);
 							}
 						}
 					}
@@ -682,7 +705,7 @@ class TransactionHelper {
 						})
 					]
 				});
-				const sTitle = oResourceBundleCore.getText("C_COMMON_OBJECT_PAGE_DELETE");
+				const sTitle = oResourceBundleCore.getText("C_COMMON_DELETE");
 				const fnConfirm = function () {
 					bDialogConfirmed = true;
 					BusyLocker.lock(that.oLockObject);
@@ -745,7 +768,7 @@ 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();
@@ -790,14 +813,14 @@ 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) {
+	editDocument(oContext: V4Context, oView: View, messageHandler: any) {
 		// eslint-disable-next-line @typescript-eslint/no-this-alias
 		const that = this;
 		const sProgrammingModel = this.getProgrammingModel(oContext);
@@ -841,18 +864,18 @@ class TransactionHelper {
 	 *
 	 * @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,
+		oContext: V4Context,
 		mInParameters: { cancelButton: any; skipDiscardPopover: boolean } | undefined,
 		oResourceBundle: any,
 		messageHandler: any
@@ -874,7 +897,7 @@ class TransactionHelper {
 			.then(function (sPModel: any) {
 				sProgrammingModel = sPModel;
 				if (sPModel === ProgrammingModel.Draft) {
-					const draftDataContext = oModel.bindContext(oParamsContext.getPath() + "/DraftAdministrativeData").getBoundContext();
+					const draftDataContext = oModel.bindContext(`${oParamsContext.getPath()}/DraftAdministrativeData`).getBoundContext();
 					if (!that._bIsModified) {
 						return draftDataContext.requestObject().then(function (draftAdminData: any) {
 							if (draftAdminData) {
@@ -903,6 +926,8 @@ class TransactionHelper {
 				// 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) {
@@ -912,7 +937,7 @@ class TransactionHelper {
 								oDeletePromise = draft.deleteDraft(oParamsContext);
 								return oDeletePromise;
 							} else {
-								let oActiveContext = oModel.bindContext(oParamsContext.getPath() + "/SiblingEntity").getBoundContext();
+								let oActiveContext = oModel.bindContext(`${oParamsContext.getPath()}/SiblingEntity`).getBoundContext();
 								return oActiveContext
 									.requestCanonicalPath()
 									.then(
@@ -926,7 +951,6 @@ class TransactionHelper {
 										},
 										function () {
 											draft.deleteDraft(oParamsContext);
-											return;
 										}
 									)
 									.then(function () {
@@ -944,14 +968,14 @@ class TransactionHelper {
 							}
 						});
 					case ProgrammingModel.Sticky:
-						return sticky.discardDocument(oContext).then(function (oContext: any) {
-							if (oContext) {
-								if (oContext.hasPendingChanges()) {
-									oContext.getBinding().resetChanges();
+						return sticky.discardDocument(oContext).then(function (discardedContext: any) {
+							if (discardedContext) {
+								if (discardedContext.hasPendingChanges()) {
+									discardedContext.getBinding().resetChanges();
 								}
 								if (!that._bCreateMode) {
-									oContext.refresh();
-									return oContext;
+									discardedContext.refresh();
+									return discardedContext;
 								}
 							}
 							return false;
@@ -983,16 +1007,16 @@ class TransactionHelper {
 	 *
 	 * @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) {
+	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);
@@ -1007,8 +1031,7 @@ class TransactionHelper {
 		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);
+			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"));
@@ -1023,9 +1046,7 @@ class TransactionHelper {
 						: CommonUtils.getTranslatedText("C_TRANSACTION_HELPER_OBJECT_SAVED", oResourceBundle)
 				);
 				that._bIsModified = false;
-				return messageHandler.showMessageDialog().then(function () {
-					return oActiveDocument;
-				});
+				return oActiveDocument;
 			})
 			.catch(function (err: any) {
 				if (aBindings && aBindings.length > 0) {
@@ -1052,19 +1073,19 @@ 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) {
 		mParameters = getParameters(mParameters);
 		// eslint-disable-next-line @typescript-eslint/no-this-alias
@@ -1130,7 +1151,7 @@ class TransactionHelper {
 					const oDialogFragment = XMLTemplateProcessor.loadTemplate(sFragmentName, "fragment");
 					const oMetaModel = oModel.getMetaModel();
 					const sCanonicalPath = mParameters.contexts[0].getCanonicalPath();
-					const sEntitySet = sCanonicalPath.substr(0, sCanonicalPath.indexOf("(")) + "/";
+					const sEntitySet = `${sCanonicalPath.substr(0, sCanonicalPath.indexOf("("))}/`;
 					const oDialogLabelModel = new JSONModel({
 						title: mParameters.label
 					});
@@ -1233,9 +1254,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
 	 */
@@ -1273,13 +1294,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
 	 */
@@ -1365,10 +1387,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;
 	}
@@ -1383,6 +1405,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) {
@@ -1397,6 +1420,23 @@ 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,
@@ -1423,10 +1463,13 @@ class TransactionHelper {
 				oEntitySetContext = oMetaModel.createBindingContext(sPath),
 				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;
+			const aRequiredProperties = CommonUtils.getRequiredPropertiesFromInsertRestrictions(sMetaPath, oMetaModel);
+			const oRequiredPropertyPathsCtxModel = new JSONModel(aRequiredProperties);
+			const oRequiredPropertyPathsCtx = oRequiredPropertyPathsCtxModel.createBindingContext("/") as Context;
 			return Promise.resolve(
 				XMLPreprocessor.process(
 					oFragment,
@@ -1434,16 +1477,18 @@ class TransactionHelper {
 					{
 						bindingContexts: {
 							entitySet: oEntitySetContext,
-							fields: oImmutableCtx
+							fields: oImmutableCtx,
+							requiredProperties: oRequiredPropertyPathsCtx
 						},
 						models: {
 							entitySet: oEntitySetContext.getModel(),
 							fields: oImmutableCtx.getModel(),
-							metaModel: oMetaModel
+							metaModel: oMetaModel,
+							requiredProperties: oRequiredPropertyPathsCtxModel
 						}
 					}
 				)
-			).then(function (oFragment: any) {
+			).then(function (oNewFragment: any) {
 				let aFormElements: any[] = [];
 				const mFieldValueMap: any = {};
 				let oCreateButton: Button;
@@ -1454,25 +1499,28 @@ class TransactionHelper {
 								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) {
 								const sFieldId = oField.getId();
 								if (sFieldId in mFieldValueMap) {
 									return Promise.resolve(mFieldValueMap[sFieldId])
 										.then(function (vValue: any) {
-											return oField.getValueState() === ValueState.Error ? undefined : vValue;
+											return oField.getValue() === "" ? undefined : vValue;
 										})
 										.catch(function () {
 											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) {
+								if (Array.isArray(vValue)) {
+									vValue = vValue[0];
+								}
 								return vValue !== undefined && vValue !== null && vValue !== "";
 							});
 						})
@@ -1507,7 +1555,7 @@ class TransactionHelper {
 					}
 				};
 				return Fragment.load({
-					definition: oFragment,
+					definition: oNewFragment,
 					controller: oController
 				}).then(function (oDialogContent: any) {
 					oDialog = new Dialog({
@@ -1517,8 +1565,8 @@ class TransactionHelper {
 							text: CommonUtils.getTranslatedText("C_TRANSACTION_HELPER_SAPFE_ACTION_CREATE_BUTTON", oResourceBundle),
 							type: "Emphasized",
 							press: function (oEvent: any) {
-								const oCreateButton = oEvent.getSource();
-								oCreateButton.setEnabled(false);
+								const createButton = oEvent.getSource();
+								createButton.setEnabled(false);
 								BusyLocker.lock(oDialog);
 								mParameters.bIsCreateDialog = true;
 								return Promise.all(
@@ -1563,8 +1611,8 @@ class TransactionHelper {
 									})
 									.finally(function () {
 										BusyLocker.unlock(oDialog);
-										oCreateButton.setEnabled(true);
-										return messageHandler.showMessages();
+										createButton.setEnabled(true);
+										messageHandler.showMessages();
 									});
 							}
 						},
@@ -1644,8 +1692,8 @@ class TransactionHelper {
 							.then(undefined, function () {
 								Log.trace("transient creation context deleted");
 							})
-							.catch(function (oError: any) {
-								Log.trace("transient creation context deletion error", oError);
+							.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
@@ -1671,14 +1719,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;
 
@@ -1689,8 +1737,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;
@@ -1708,14 +1756,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,
@@ -1723,15 +1771,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;
@@ -1740,7 +1788,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"))
 		);
 	}