@sapui5/sap.fe.core 1.100.0 → 1.102.0

package/src/sap/fe/core/{TransactionHelper.ts → controllerextensions/editFlow/TransactionHelper.ts}

@@ -1,32 +1,35 @@
-import draft from "sap/fe/core/actions/draft";
-import sticky from "sap/fe/core/actions/sticky";
-import operations from "sap/fe/core/actions/operations";
-import JSONModel from "sap/ui/model/json/JSONModel";
-import Popover from "sap/m/Popover";
-import VBox from "sap/m/VBox";
-import CheckBox from "sap/m/CheckBox";
-import Text from "sap/m/Text";
-import Button from "sap/m/Button";
-import MessageToast from "sap/m/MessageToast";
-import Dialog from "sap/m/Dialog";
+import 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 CommonUtils from "sap/fe/core/CommonUtils";
-import BusyLocker from "sap/fe/core/BusyLocker";
-import XMLPreprocessor from "sap/ui/core/util/XMLPreprocessor";
-import XMLTemplateProcessor from "sap/ui/core/XMLTemplateProcessor";
-import Fragment from "sap/ui/core/Fragment";
-import MessageBox from "sap/m/MessageBox";
+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 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 FELibrary from "sap/fe/core/library";
+import Button from "sap/m/Button";
+import CheckBox from "sap/m/CheckBox";
+import Dialog from "sap/m/Dialog";
+import MessageBox from "sap/m/MessageBox";
+import MessageToast from "sap/m/MessageToast";
+import Popover from "sap/m/Popover";
+import Text from "sap/m/Text";
+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 messageHandling from "sap/fe/core/actions/messageHandling";
-import AppComponent from "sap/fe/core/AppComponent";
-import ResourceBundle from "sap/base/i18n/ResourceBundle";
-import ODataMetaModel from "sap/ui/model/odata/v4/ODataMetaModel";
 import View from "sap/ui/core/mvc/View";
-import FPMHelper from "sap/fe/core/helpers/FPMHelper";
-
+import XMLPreprocessor from "sap/ui/core/util/XMLPreprocessor";
+import XMLTemplateProcessor from "sap/ui/core/XMLTemplateProcessor";
 import 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";
+
 const CreationMode = FELibrary.CreationMode;
 const ProgrammingModel = FELibrary.ProgrammingModel;
 const ValueState = coreLibrary.ValueState;
@@ -50,7 +53,7 @@ class TransactionHelper {
 		this._oAppComponent = oAppComponent;
 		this.oLockObject = oLockObject;
 	}
-	getProgrammingModel(oContext: any): typeof ProgrammingModel {
+	getProgrammingModel(oContext?: any): typeof ProgrammingModel {
 		if (!this.sProgrammingModel && oContext) {
 			let sPath;
 			if (oContext.isA("sap.ui.model.odata.v4.Context")) {
@@ -110,6 +113,7 @@ class TransactionHelper {
 	 * @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 oResourceBundle
 	 * @param messageHandler
 	 * @param bFromCopyPaste
@@ -120,7 +124,7 @@ class TransactionHelper {
 	 */
 	createDocument(
 		oMainListBinding: any,
-		mInParameters: { data?: any; busyMode?: string | undefined; keepTransientContextOnFailed?: any } | undefined,
+		mInParameters: { data?: any; busyMode?: string | undefined; keepTransientContextOnFailed?: any; inactive?: boolean } | undefined,
 		oResourceBundle: any,
 		messageHandler: any,
 		bFromCopyPaste: boolean = false,
@@ -131,9 +135,7 @@ class TransactionHelper {
 			oModel = oMainListBinding.getModel(),
 			oMetaModel = oModel.getMetaModel(),
 			sMetaPath = oMetaModel.getMetaPath(oMainListBinding.getHeaderContext().getPath()),
-			sCreateHash = this._getAppComponent()
-				.getRouterProxy()
-				.getHash(),
+			sCreateHash = this._getAppComponent().getRouterProxy().getHash(),
 			oComponentData = this._getAppComponent().getComponentData(),
 			oStartupParameters = (oComponentData && oComponentData.startupParameters) || {},
 			sNewAction = !oMainListBinding.isRelative()
@@ -178,7 +180,7 @@ class TransactionHelper {
 		}
 		mParameters.beforeCreateCallBack = bFromCopyPaste ? null : mParameters.beforeCreateCallBack;
 		BusyLocker.lock(this.oLockObject, sBusyPath);
-		const oResourceBundleCore = sap.ui.getCore().getLibraryResourceBundle("sap.fe.core");
+		const oResourceBundleCore = (Core as CoreEx).getLibraryResourceBundle("sap.fe.core");
 		if (sNewAction) {
 			oCreationPromise = this.callAction(
 				sNewAction,
@@ -228,18 +230,18 @@ class TransactionHelper {
 			}
 
 			oCreationPromise = oCreationPromise
-				.then(function(oContext: any) {
+				.then(function (oContext: any) {
 					if (oContext) {
 						return oContext.getObject();
 					} else {
 						return undefined;
 					}
 				})
-				.catch(function(oError: any) {
+				.catch(function (oError: any) {
 					Log.error("Error while executing the function " + sFunctionName, oError);
 					throw oError;
 				})
-				.then(function(oData: any) {
+				.then(function (oData: any) {
 					mParameters.data = oData ? Object.assign({}, oData, mParameters.data) : mParameters.data;
 					if (mParameters.data) {
 						delete mParameters.data["@odata.context"];
@@ -248,7 +250,7 @@ class TransactionHelper {
 						const oTransientListBinding = oModel.bindList(oMainListBinding.getPath(), oMainListBinding.getContext(), [], [], {
 							$$updateGroupId: "submitLater"
 						});
-						oTransientListBinding.refreshInternal = function() {
+						oTransientListBinding.refreshInternal = function () {
 							/* */
 						};
 						oNewDocumentContext = oTransientListBinding.create(mParameters.data, true);
@@ -270,19 +272,26 @@ class TransactionHelper {
 						} else {
 							onBeforeCreatePromise = Promise.resolve();
 						}
-						return onBeforeCreatePromise.then(function() {
-							oNewDocumentContext = oMainListBinding.create(mParameters.data, true, mParameters.createAtEnd);
-							return that.onAfterCreateCompletion(oMainListBinding, oNewDocumentContext, mParameters);
+						return onBeforeCreatePromise.then(function () {
+							oNewDocumentContext = oMainListBinding.create(
+								mParameters.data,
+								true,
+								mParameters.createAtEnd,
+								mParameters.inactive
+							);
+							if (!mParameters.inactive) {
+								return that.onAfterCreateCompletion(oMainListBinding, oNewDocumentContext, mParameters);
+							}
 						});
 					}
 				})
-				.catch(function(oError: any) {
+				.catch(function (oError: any) {
 					Log.error("Error while creating the new document", oError);
 					throw oError;
 				});
 		}
 		return oCreationPromise
-			.then(function(oResult: any) {
+			.then(function (oResult: any) {
 				if (!oMainListBinding.isRelative()) {
 					// the create mode shall currently only be set on creating a root document
 					that._bCreateMode = true;
@@ -292,12 +301,12 @@ class TransactionHelper {
 				if (oResult && oResult.bConsiderDocumentModified) {
 					that.handleDocumentModifications();
 				}
-				return messageHandler.showMessageDialog().then(function() {
+				return messageHandler.showMessageDialog().then(function () {
 					return oNewDocumentContext;
 				});
 			})
-			.catch(function(oError: any) {
-				return messageHandler.showMessageDialog().then(function() {
+			.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
@@ -310,7 +319,7 @@ class TransactionHelper {
 					return Promise.reject(oError);
 				});
 			})
-			.finally(function() {
+			.finally(function () {
 				BusyLocker.unlock(that.oLockObject, sBusyPath);
 			});
 	}
@@ -327,7 +336,7 @@ class TransactionHelper {
 		if (!bFindActiveContexts) {
 			return Promise.resolve();
 		}
-		const activeContexts = aContexts.reduce(function(aResult: any, oContext: any) {
+		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")) {
@@ -344,12 +353,12 @@ class TransactionHelper {
 			return aResult;
 		}, []);
 		return Promise.all(
-			activeContexts.map(function(oContext: any) {
+			activeContexts.map(function (oContext: any) {
 				return oContext.requestCanonicalPath().then(
-					function() {
+					function () {
 						return oContext;
 					},
-					function() {
+					function () {
 						return;
 					}
 				);
@@ -363,7 +372,7 @@ class TransactionHelper {
 				//if unsaved objects are not deleted then we need to set the enabled to true and update the model data for next deletion
 				oInternalModelContext.setProperty("deleteEnabled", true);
 				const obj = Object.assign(oInternalModelContext.getObject(), {});
-				obj.selectedContexts = obj.selectedContexts.filter(function(element: any) {
+				obj.selectedContexts = obj.selectedContexts.filter(function (element: any) {
 					return obj.deletableContexts.indexOf(element) === -1;
 				});
 				obj.deletableContexts = [];
@@ -422,17 +431,18 @@ class TransactionHelper {
 			bDialogConfirmed = false;
 		// eslint-disable-next-line @typescript-eslint/no-this-alias
 		const that = this,
-			oResourceBundleCore = sap.ui.getCore().getLibraryResourceBundle("sap.fe.core") as ResourceBundle;
+			oResourceBundleCore = (Core as CoreEx).getLibraryResourceBundle("sap.fe.core") as ResourceBundle;
 		let aParams;
 		let oDeleteMessage: any = {
 			title: oResourceBundleCore.getText("C_COMMON_OBJECT_PAGE_DELETE")
 		};
+		messageHandling.removeBoundTransitionMessages();
 		BusyLocker.lock(this.oLockObject);
 		if (!Array.isArray(vContexts)) {
 			vContexts = [vContexts];
 		}
 		Promise.resolve(this.getProgrammingModel(vContexts[0]))
-			.then(function(sProgrammingModel: any) {
+			.then(function (sProgrammingModel: any) {
 				if (mParameters) {
 					if (!mParameters.numberOfSelectedContexts) {
 						if (sProgrammingModel === ProgrammingModel.Draft) {
@@ -658,7 +668,7 @@ class TransactionHelper {
 						new CheckBox({
 							text: oDeleteMessage.checkBoxText,
 							selected: true,
-							select: function(oEvent: any) {
+							select: function (oEvent: any) {
 								const selected = oEvent.getSource().getSelected();
 								if (selected) {
 									aDeletableContexts = vContexts.concat(mParameters.unSavedContexts);
@@ -673,7 +683,7 @@ class TransactionHelper {
 					]
 				});
 				const sTitle = oResourceBundleCore.getText("C_COMMON_OBJECT_PAGE_DELETE");
-				const fnConfirm = function() {
+				const fnConfirm = function () {
 					bDialogConfirmed = true;
 					BusyLocker.lock(that.oLockObject);
 					const aContexts = aDeletableContexts;
@@ -685,31 +695,31 @@ class TransactionHelper {
 					}
 					return onBeforeDeletePromise
 						.then(that.findActiveDraftRootContexts.bind(that, aContexts, mParameters.bFindActiveContexts))
-						.then(function(activeContexts: any) {
+						.then(function (activeContexts: any) {
 							//make sure to fetch the active contexts before deleting the drafts
 							return Promise.all(
-								aContexts.map(function(oContext: any) {
+								aContexts.map(function (oContext: any) {
 									//delete the draft
 									return draft.deleteDraft(oContext);
 								})
 							)
-								.catch(function(oError: any) {
-									return messageHandler.showMessages().then(function() {
+								.catch(function (oError: any) {
+									return messageHandler.showMessages().then(function () {
 										// re-throw error to enforce rejecting the general promise
 										throw oError;
 									});
 								})
-								.then(function() {
+								.then(function () {
 									const checkBox = {
 										"isCheckBoxVisible": isCheckBoxVisible,
 										"isCheckBoxSelected": isCheckBoxSelected
 									};
 									if (activeContexts && activeContexts.length) {
 										return Promise.all(
-											activeContexts.map(function(oContext: any) {
+											activeContexts.map(function (oContext: any) {
 												return oContext.delete();
 											})
-										).then(function() {
+										).then(function () {
 											that.afterDeleteProcess(mParameters, checkBox, aContexts, oResourceBundle);
 											return messageHandler.showMessageDialog().then(fnResolve);
 										});
@@ -719,10 +729,10 @@ class TransactionHelper {
 									}
 								});
 						})
-						.catch(function() {
+						.catch(function () {
 							fnReject();
 						})
-						.finally(function() {
+						.finally(function () {
 							BusyLocker.unlock(that.oLockObject);
 						});
 				};
@@ -736,18 +746,18 @@ class TransactionHelper {
 					beginButton: new Button({
 						text: oResourceBundleCore.getText("C_COMMON_OBJECT_PAGE_DELETE"),
 						type: "Emphasized",
-						press: function() {
+						press: function () {
 							oDialog.close();
 							return fnConfirm();
 						}
 					}),
 					endButton: new Button({
-						text: CommonUtils.getTranslatedText("C_COMMON_OBJECT_PAGE_CANCEL", oResourceBundle),
-						press: function() {
+						text: CommonUtils.getTranslatedText("C_COMMON_DIALOG_CANCEL", oResourceBundle),
+						press: function () {
 							oDialog.close();
 						}
 					}),
-					afterClose: function() {
+					afterClose: function () {
 						oDialog.destroy();
 						// if dialog is closed unconfirmed (e.g. via "Cancel" or Escape button), ensure to reject promise
 						if (!bDialogConfirmed) {
@@ -762,14 +772,14 @@ class TransactionHelper {
 					oDialog.open();
 				}
 			})
-			.finally(function() {
+			.finally(function () {
 				BusyLocker.unlock(that.oLockObject);
 			})
-			.catch(function() {
+			.catch(function () {
 				Log.warning("Couldn't get Programming model");
 				fnReject();
 			});
-		return new Promise(function(resolve: (value: any) => void, reject: (reason?: any) => void) {
+		return new Promise(function (resolve: (value: any) => void, reject: (reason?: any) => void) {
 			fnReject = reject;
 			fnResolve = resolve;
 		});
@@ -810,18 +820,18 @@ class TransactionHelper {
 			return Promise.reject(new Error("Edit is only allowed for draft or sticky session supported services"));
 		}
 		return oEditPromise
-			.then(function(oNewContext: any) {
+			.then(function (oNewContext: any) {
 				that._bCreateMode = false;
-				return messageHandler.showMessageDialog().then(function() {
+				return messageHandler.showMessageDialog().then(function () {
 					return oNewContext;
 				});
 			})
-			.catch(function(err: any) {
-				return messageHandler.showMessages().then(function() {
+			.catch(function (err: any) {
+				return messageHandler.showMessages().then(function () {
 					return Promise.reject(err);
 				});
 			})
-			.finally(function() {
+			.finally(function () {
 				BusyLocker.unlock(that.oLockObject);
 			});
 	}
@@ -860,12 +870,12 @@ class TransactionHelper {
 			oModel = oParamsContext.getModel();
 		let onBeforeCancelPromise, sCanonicalPath: string;
 		return Promise.resolve(this.getProgrammingModel(oContext))
-			.then(function(sPModel: any) {
+			.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) {
+						return draftDataContext.requestObject().then(function (draftAdminData: any) {
 							if (draftAdminData) {
 								that._bIsModified = !(draftAdminData.CreationDateTime === draftAdminData.LastChangeDateTime);
 							}
@@ -873,14 +883,14 @@ class TransactionHelper {
 					}
 				}
 			})
-			.then(function() {
+			.then(function () {
 				if (!mParameters.skipDiscardPopover) {
 					return that._showDiscardPopover(oCancelButton, that._bIsModified, oResourceBundle);
 				} else {
 					return Promise.resolve();
 				}
 			})
-			.then(function() {
+			.then(function () {
 				if (mParameters.beforeCancelCallBack) {
 					onBeforeCancelPromise = mParameters.beforeCancelCallBack({ context: oContext });
 				} else {
@@ -888,11 +898,11 @@ class TransactionHelper {
 				}
 				return onBeforeCancelPromise;
 			})
-			.then(function() {
+			.then(function () {
 				// eslint-disable-next-line default-case
 				switch (sProgrammingModel) {
 					case ProgrammingModel.Draft:
-						return oParamsContext.requestObject("HasActiveEntity").then(function(bHasActiveEntity: any) {
+						return oParamsContext.requestObject("HasActiveEntity").then(function (bHasActiveEntity: any) {
 							let oDeletePromise;
 							if (!bHasActiveEntity) {
 								if (oParamsContext && oParamsContext.hasPendingChanges()) {
@@ -905,7 +915,7 @@ class TransactionHelper {
 								return oActiveContext
 									.requestCanonicalPath()
 									.then(
-										function(sPath: any) {
+										function (sPath: any) {
 											sCanonicalPath = sPath;
 											if (oParamsContext && oParamsContext.hasPendingChanges()) {
 												oParamsContext.getBinding().resetChanges();
@@ -913,12 +923,12 @@ class TransactionHelper {
 											oDeletePromise = draft.deleteDraft(oParamsContext);
 											return oDeletePromise;
 										},
-										function() {
+										function () {
 											draft.deleteDraft(oParamsContext);
 											return;
 										}
 									)
-									.then(function() {
+									.then(function () {
 										//oParamsContext.delete() in the previous promise doesnt return anything upon success.
 										if (!sCanonicalPath) {
 											return;
@@ -933,7 +943,7 @@ class TransactionHelper {
 							}
 						});
 					case ProgrammingModel.Sticky:
-						return sticky.discardDocument(oContext).then(function(oContext: any) {
+						return sticky.discardDocument(oContext).then(function (oContext: any) {
 							if (oContext) {
 								if (oContext.hasPendingChanges()) {
 									oContext.getBinding().resetChanges();
@@ -949,21 +959,21 @@ class TransactionHelper {
 						return Promise.reject("Cancel document only allowed for draft or sticky session supported services");
 				}
 			})
-			.then(function(context: any) {
+			.then(function (context: any) {
 				that._bIsModified = false;
 				// remove existing bound transition messages
 				messageHandler.removeTransitionMessages();
 				// show unbound messages
-				return messageHandler.showMessages().then(function() {
+				return messageHandler.showMessages().then(function () {
 					return context;
 				});
 			})
-			.catch(function(err: any) {
-				return messageHandler.showMessages().then(function() {
+			.catch(function (err: any) {
+				return messageHandler.showMessages().then(function () {
 					return Promise.reject(err);
 				});
 			})
-			.finally(function() {
+			.finally(function () {
 				BusyLocker.unlock(that.oLockObject);
 			});
 	}
@@ -996,13 +1006,14 @@ class TransactionHelper {
 		if (sProgrammingModel === ProgrammingModel.Draft) {
 			oSavePromise = draft.activateDocument(oContext, this._getAppComponent(), {});
 		} else if (sProgrammingModel === ProgrammingModel.Sticky) {
-			oSavePromise = sticky.activateDocument(oContext);
+			const bEnableStrictHandling = UriParameters.fromQuery(window.location.search).get("sap-fe-save-strict-mode") === "true";
+			oSavePromise = sticky.activateDocument(oContext, bEnableStrictHandling);
 		} else {
 			BusyLocker.unlock(that.oLockObject);
 			return Promise.reject(new Error("Save is only allowed for draft or sticky session supported services"));
 		}
 		return oSavePromise
-			.then(function(oActiveDocument: any) {
+			.then(function (oActiveDocument: any) {
 				const bNewObject =
 					that.sProgrammingModel === ProgrammingModel.Sticky ? that._bCreateMode : !oContext.getObject().HasActiveEntity;
 				MessageToast.show(
@@ -1011,25 +1022,25 @@ class TransactionHelper {
 						: CommonUtils.getTranslatedText("C_TRANSACTION_HELPER_OBJECT_SAVED", oResourceBundle)
 				);
 				that._bIsModified = false;
-				return messageHandler.showMessageDialog().then(function() {
+				return messageHandler.showMessageDialog().then(function () {
 					return oActiveDocument;
 				});
 			})
-			.catch(function(err: any) {
+			.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) {
+					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 messageHandler.showMessages().then(function () {
 					return Promise.reject(err);
 				});
 			})
-			.finally(function() {
+			.finally(function () {
 				BusyLocker.unlock(that.oLockObject);
 			});
 	}
@@ -1084,21 +1095,21 @@ class TransactionHelper {
 		const oAppComponent = that._getAppComponent();
 		const mSideEffectsParameters = oAppComponent.getSideEffectsService().getODataActionSideEffects(sActionName, oContext) || {};
 		if (oContext && oModel) {
-			oPromise = new Promise<void>(function(resolve, reject) {
+			oPromise = new Promise<void>(function (resolve, reject) {
 				let oApplicableContextDialog: Dialog;
 				const oController = {
-					onClose: function() {
+					onClose: function () {
 						// User cancels action
 						oApplicableContextDialog.close();
 						resolve();
 					},
-					onContinue: function() {
+					onContinue: function () {
 						// Users continues the action with the bound contexts
 						oApplicableContextDialog.close();
 						resolve(mParameters.applicableContext);
 					}
 				};
-				const fnOpenAndFillDialog = function() {
+				const fnOpenAndFillDialog = function () {
 					let oDialogContent;
 					const nNotApplicable = mParameters.notApplicableContext.length,
 						aNotApplicableItems = [];
@@ -1139,10 +1150,10 @@ class TransactionHelper {
 							}
 						)
 					)
-						.then(function(oFragment: any) {
+						.then(function (oFragment: any) {
 							return Fragment.load({ definition: oFragment, controller: oController });
 						})
-						.then(function(oPopover: any) {
+						.then(function (oPopover: any) {
 							oApplicableContextDialog = oPopover;
 							mParameters.parentControl.addDependent(oPopover);
 							fnOpenAndFillDialog();
@@ -1151,7 +1162,7 @@ class TransactionHelper {
 				} else {
 					resolve(mParameters.contexts);
 				}
-			}).then(function(contextToProcess: any) {
+			}).then(function (contextToProcess: any) {
 				if (contextToProcess) {
 					return operations.callBoundAction(sActionName, contextToProcess, oModel, oAppComponent, {
 						invocationGrouping: mParameters.invocationGrouping,
@@ -1160,14 +1171,15 @@ class TransactionHelper {
 						mBindingParameters: mBindingParameters,
 						entitySetName: mParameters.entitySetName,
 						additionalSideEffect: mSideEffectsParameters,
-						onSubmitted: function() {
+						onSubmitted: function () {
 							messageHandler.removeTransitionMessages();
 							BusyLocker.lock(that.oLockObject);
 						},
-						onResponse: function() {
+						onResponse: function () {
 							BusyLocker.unlock(that.oLockObject);
 						},
 						parentControl: mParameters.parentControl,
+						controlId: mParameters.controlId,
 						internalModelContext: mParameters.internalModelContext,
 						operationAvailableMap: mParameters.operationAvailableMap,
 						bIsCreateAction: mParameters.bIsCreateAction,
@@ -1187,10 +1199,10 @@ class TransactionHelper {
 				showActionParameterDialog: true,
 				bindingParameters: mBindingParameters,
 				entitySetName: mParameters.entitySetName,
-				onSubmitted: function() {
+				onSubmitted: function () {
 					BusyLocker.lock(that.oLockObject);
 				},
-				onResponse: function() {
+				onResponse: function () {
 					BusyLocker.unlock(that.oLockObject);
 				},
 				parentControl: mParameters.parentControl,
@@ -1201,14 +1213,14 @@ class TransactionHelper {
 			});
 		}
 		return oPromise
-			.then(function(oResult: any) {
+			.then(function (oResult: any) {
 				// Succeeded
-				return that._handleActionResponse(messageHandler, mParameters, sActionName).then(function() {
+				return that._handleActionResponse(messageHandler, mParameters, sActionName).then(function () {
 					return oResult;
 				});
 			})
-			.catch(function(err: any) {
-				return that._handleActionResponse(messageHandler, mParameters, sActionName).then(function() {
+			.catch(function (err: any) {
+				return that._handleActionResponse(messageHandler, mParameters, sActionName).then(function () {
 					return Promise.reject(err);
 				});
 			});
@@ -1244,11 +1256,11 @@ class TransactionHelper {
 	 * @final
 	 */
 	handleValidationError() {
-		const oMessageManager = (sap.ui.getCore() as any).getMessageManager(),
+		const oMessageManager = Core.getMessageManager(),
 			errorToRemove = oMessageManager
 				.getMessageModel()
 				.getData()
-				.filter(function(error: any) {
+				.filter(function (error: any) {
 					// only needs to handle validation messages, technical and persistent errors needs not to be checked here.
 					if (error.validation) {
 						return error;
@@ -1276,13 +1288,13 @@ class TransactionHelper {
 		const that = this;
 		that._bContinueDiscard = false;
 		// to be implemented
-		return new Promise<void>(function(resolve, reject) {
+		return new Promise<void>(function (resolve, reject) {
 			if (!oCancelButton) {
 				reject("Cancel button not found");
 			}
 			//Show popover only when data is changed.
 			if (bIsModified) {
-				const fnOnAfterDiscard = function() {
+				const fnOnAfterDiscard = function () {
 					oCancelButton.setEnabled(true);
 					if (that._bContinueDiscard) {
 						resolve();
@@ -1300,7 +1312,7 @@ class TransactionHelper {
 						oButton = new Button({
 							text: CommonUtils.getTranslatedText("C_TRANSACTION_HELPER_DRAFT_DISCARD_BUTTON", oResourceBundle),
 							width: "100%",
-							press: function() {
+							press: function () {
 								that.handleValidationError();
 								that._bContinueDiscard = true;
 								that._oPopover.close();
@@ -1315,7 +1327,7 @@ class TransactionHelper {
 								items: [oText, oButton]
 							})
 						],
-						beforeOpen: function() {
+						beforeOpen: function () {
 							// make sure to NOT trigger multiple cancel flows
 							oCancelButton.setEnabled(false);
 							that._oPopover.setInitialFocus(oButton);
@@ -1359,6 +1371,32 @@ class TransactionHelper {
 	_getAppComponent() {
 		return this._oAppComponent;
 	}
+
+	_onFieldChange(oEvent: any, oCreateButton: any, messageHandler: any, fnValidateRequiredProperties: Function) {
+		messageHandler.removeTransitionMessages();
+		const oField = oEvent.getSource();
+		const oFieldPromise = oEvent.getParameter("promise");
+		if (oFieldPromise) {
+			return oFieldPromise
+				.then(function (value: any) {
+					// 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) {
+					if (value !== "") {
+						//disabling the continue button in case of invalid value in field
+						oCreateButton.setEnabled(false);
+					} else {
+						// validating all the fields in case of empty value in field
+						oField.setValue(value);
+						fnValidateRequiredProperties();
+					}
+				});
+		}
+	}
+
 	_launchDialogWithKeyFields(
 		oListBinding: any,
 		oTransientListBinding: any,
@@ -1373,7 +1411,7 @@ class TransactionHelper {
 		let oDialog: Dialog;
 		const oParentControl = mParameters.parentControl,
 			bSuccess = false;
-		return new Promise(function(resolve: (value: any) => void, reject: (reason?: any) => void) {
+		return new Promise(function (resolve: (value: any) => void, reject: (reason?: any) => void) {
 			const sFragmentName = "sap/fe/core/controls/NonComputedVisibleKeyFieldsDialog";
 			const oFragment = XMLTemplateProcessor.loadTemplate(sFragmentName, "fragment"),
 				oResourceBundle = oParentControl.getController().oResourceBundle,
@@ -1404,42 +1442,43 @@ class TransactionHelper {
 						}
 					}
 				)
-			).then(function(oFragment: any) {
+			).then(function (oFragment: any) {
 				let aFormElements: any[] = [];
 				const mFieldValueMap: any = {};
 				let oCreateButton: Button;
-				const validateRequiredProperties = function() {
+				const validateRequiredProperties = function () {
 					return Promise.all(
 						aFormElements
-							.map(function(oFormElement: any) {
+							.map(function (oFormElement: any) {
 								return oFormElement.getFields()[0];
 							})
-							.filter(function(oField: any) {
-								return oField.getRequired();
+							.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() !== "");
 							})
-							.map(function(oField: any) {
+							.map(function (oField: any) {
 								const sFieldId = oField.getId();
 								if (sFieldId in mFieldValueMap) {
 									return Promise.resolve(mFieldValueMap[sFieldId])
-										.then(function(vValue: any) {
-											return vValue;
+										.then(function (vValue: any) {
+											return oField.getValueState() === ValueState.Error ? undefined : vValue;
 										})
-										.catch(function() {
+										.catch(function () {
 											return undefined;
 										});
 								}
 								return oField.getValueState() === ValueState.Error ? undefined : oField.getValue();
 							})
 					)
-						.then(function(aResults: any[]) {
-							return aResults.every(function(vValue: any) {
+						.then(function (aResults: any[]) {
+							return aResults.every(function (vValue: any) {
 								return vValue !== undefined && vValue !== null && vValue !== "";
 							});
 						})
-						.catch(function() {
+						.catch(function () {
 							return false;
 						})
-						.then(function(bEnabled: boolean) {
+						.then(function (bEnabled: boolean) {
 							oCreateButton.setEnabled(bEnabled);
 						});
 				};
@@ -1450,24 +1489,16 @@ class TransactionHelper {
     									liveChange is not fired when value is added from valuehelp.
     									value validation is not done for create button enablement.
     								*/
-					handleChange: function(oEvent: any) {
-						messageHandler.removeTransitionMessages();
-						const oField = oEvent.getSource();
+					handleChange: function (oEvent: any) {
 						const sFieldId = oEvent.getParameter("id");
-						const oFieldPromise = oEvent.getParameter("promise");
-						if (oFieldPromise) {
-							mFieldValueMap[sFieldId] = oFieldPromise.then(function() {
-								return oField.getValue();
-							});
-						}
-						validateRequiredProperties();
+						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) {
+					handleLiveChange: function (oEvent: any) {
 						const sFieldId = oEvent.getParameter("id");
 						const vValue = oEvent.getParameter("value");
 						mFieldValueMap[sFieldId] = vValue;
@@ -1477,28 +1508,28 @@ class TransactionHelper {
 				return Fragment.load({
 					definition: oFragment,
 					controller: oController
-				}).then(function(oDialogContent: any) {
+				}).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) {
+							press: function (oEvent: any) {
 								const oCreateButton = oEvent.getSource();
 								oCreateButton.setEnabled(false);
 								BusyLocker.lock(oDialog);
 								mParameters.bIsCreateDialog = true;
 								return Promise.all(
-									Object.keys(mFieldValueMap).map(function(sKey: string) {
-										return mFieldValueMap[sKey].then(function(oValue: any) {
+									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[]) {
+									.then(function (aValues: any[]) {
 										let onBeforeCreatePromise;
 										if (mParameters.beforeCreateCallBack) {
 											onBeforeCreatePromise = mParameters.beforeCreateCallBack({
@@ -1510,7 +1541,7 @@ class TransactionHelper {
 										}
 										return onBeforeCreatePromise;
 									})
-									.then(function() {
+									.then(function () {
 										const oPromise = that.onAfterCreateCompletion(
 											oTransientListBinding,
 											oTransientContext,
@@ -1519,17 +1550,17 @@ class TransactionHelper {
 										oModel.submitBatch("submitLater");
 										return oPromise;
 									})
-									.then(function(oResponse: any) {
+									.then(function (oResponse: any) {
 										if (!oResponse || (oResponse && oResponse.bKeepDialogOpen !== true)) {
 											oDialog.setBindingContext(null as any);
 											oDialog.close();
 											resolve(oResponse);
 										}
 									})
-									.catch(function(oError: any) {
+									.catch(function (oError: any) {
 										reject(oError);
 									})
-									.finally(function() {
+									.finally(function () {
 										BusyLocker.unlock(oDialog);
 										oCreateButton.setEnabled(true);
 										return messageHandler.showMessages();
@@ -1538,11 +1569,11 @@ class TransactionHelper {
 						},
 						endButton: {
 							text: CommonUtils.getTranslatedText("C_COMMON_ACTION_PARAMETER_DIALOG_CANCEL", oResourceBundle),
-							press: function() {
+							press: function () {
 								oDialog.close();
 							}
 						},
-						afterClose: function() {
+						afterClose: function () {
 							// show footer as per UX guidelines when dialog is not open
 							(oDialog.getBindingContext("internal") as InternalModelContext)?.setProperty("isCreateDialogOpen", false);
 							oDialog.destroy();
@@ -1572,14 +1603,14 @@ class TransactionHelper {
 						mParameters.createAction,
 						mParameters.data
 					)
-						.then(function() {
+						.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() {
+						.catch(function (oError: any) {
+							return messageHandler.showMessages().then(function () {
 								return Promise.reject(oError);
 							});
 						});
@@ -1589,14 +1620,14 @@ class TransactionHelper {
 	}
 	onAfterCreateCompletion(oListBinding: any, oNewDocumentContext: any, mParameters: any) {
 		let fnResolve: Function, fnReject: Function;
-		const oPromise = new Promise(function(resolve, reject) {
+		const oPromise = new Promise(function (resolve, reject) {
 			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 = function (oEvent: any) {
 			const oContext = oEvent.getParameter("context"),
 				bSuccess = oEvent.getParameter("success");
 			if (oContext === oNewDocumentContext) {
@@ -1609,10 +1640,10 @@ class TransactionHelper {
 						// this is needed to avoid console errors TO be checked with model colleagues
 						oContext
 							.created()
-							.then(undefined, function() {
+							.then(undefined, function () {
 								Log.trace("transient creation context deleted");
 							})
-							.catch(function(oError: any) {
+							.catch(function (oError: any) {
 								Log.trace("transient creation context deletion error", oError);
 							});
 						if (!mParameters.bIsCreateDialog) {
@@ -1690,11 +1721,11 @@ class TransactionHelper {
 		sNewAction: string,
 		oResourceBundleCore: ResourceBundle
 	) {
-		const fnGetLabelFromLineItemAnnotation = function() {
+		const fnGetLabelFromLineItemAnnotation = function () {
 			if (oMetaModel && oMetaModel.getObject(sMetaPath + "/@com.sap.vocabularies.UI.v1.LineItem")) {
 				const iLineItemIndex = oMetaModel
 					.getObject(sMetaPath + "/@com.sap.vocabularies.UI.v1.LineItem")
-					.findIndex(function(oLineItem: any) {
+					.findIndex(function (oLineItem: any) {
 						const aLineItemAction = oLineItem.Action ? oLineItem.Action.split("(") : undefined;
 						return aLineItemAction ? aLineItemAction[0] === sNewAction : false;
 					});