@sapui5/sap.fe.core 1.102.1 → 1.102.4

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

@@ -247,22 +247,12 @@ class TransactionHelper {
 						delete mParameters.data["@odata.context"];
 					}
 					if (aNonComputedVisibleKeyFields.length > 0) {
-						const oTransientListBinding = oModel.bindList(oMainListBinding.getPath(), oMainListBinding.getContext(), [], [], {
-							$$updateGroupId: "submitLater"
-						});
-						oTransientListBinding.refreshInternal = function () {
-							/* */
-						};
-						oNewDocumentContext = oTransientListBinding.create(mParameters.data, true);
-						return that._launchDialogWithKeyFields(
-							oMainListBinding,
-							oTransientListBinding,
-							oNewDocumentContext,
-							aNonComputedVisibleKeyFields,
-							oModel,
-							mParameters,
-							messageHandler
-						);
+						return that
+							._launchDialogWithKeyFields(oMainListBinding, aNonComputedVisibleKeyFields, oModel, mParameters, messageHandler)
+							.then((oResult) => {
+								oNewDocumentContext = oResult.newContext;
+								return oResult;
+							});
 					} else {
 						let onBeforeCreatePromise;
 						if (mParameters.beforeCreateCallBack) {
@@ -310,7 +300,7 @@ class TransactionHelper {
 					// 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()) {
+					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
@@ -828,7 +818,7 @@ class TransactionHelper {
 				});
 			})
 			.catch(function (err: any) {
-				return messageHandler.showMessages().then(function () {
+				return messageHandler.showMessages({ concurrentEditFlag: true }).then(function () {
 					return Promise.reject(err);
 				});
 			})
@@ -1398,20 +1388,22 @@ class TransactionHelper {
 		}
 	}
 
-	_launchDialogWithKeyFields(
-		oListBinding: any,
-		oTransientListBinding: any,
-		oTransientContext: any,
-		mFields: any,
-		oModel: any,
-		mParameters: any,
-		messageHandler: any
-	) {
+	_launchDialogWithKeyFields(oListBinding: any, mFields: any, oModel: any, mParameters: any, messageHandler: any) {
 		// eslint-disable-next-line @typescript-eslint/no-this-alias
 		const that = this;
 		let oDialog: Dialog;
 		const oParentControl = mParameters.parentControl,
 			bSuccess = false;
+
+		// Create a fake (transient) listBinding and context, just for the binding context of the dialog
+		const oTransientListBinding = oModel.bindList(oListBinding.getPath(), oListBinding.getContext(), [], [], {
+			$$updateGroupId: "submitLater"
+		});
+		oTransientListBinding.refreshInternal = function () {
+			/* */
+		};
+		const oTransientContext = oTransientListBinding.create(mParameters.data, true);
+
 		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"),
@@ -1518,6 +1510,7 @@ class TransactionHelper {
 							type: "Emphasized",
 							press: function (oEvent: any) {
 								const oCreateButton = oEvent.getSource();
+								let oNewDocumentContext: any;
 								oCreateButton.setEnabled(false);
 								BusyLocker.lock(oDialog);
 								mParameters.bIsCreateDialog = true;
@@ -1543,18 +1536,33 @@ class TransactionHelper {
 										return onBeforeCreatePromise;
 									})
 									.then(function () {
-										const oPromise = that.onAfterCreateCompletion(
-											oTransientListBinding,
-											oTransientContext,
-											mParameters
+										const transientData = oTransientContext.getObject();
+										const createData: any = {};
+										Object.keys(transientData).forEach(function (sPropertyPath: string) {
+											const oProperty = oMetaModel.getObject(`${sMetaPath}/${sPropertyPath}`);
+											// ensure navigation properties are not part of the payload, deep create not supported
+											if (oProperty && oProperty.$kind === "NavigationProperty") {
+												return;
+											}
+											createData[sPropertyPath] = transientData[sPropertyPath];
+										});
+										oNewDocumentContext = oListBinding.create(
+											createData,
+											true,
+											mParameters.createAtEnd,
+											mParameters.inactive
 										);
-										oModel.submitBatch("submitLater");
+
+										const oPromise = that.onAfterCreateCompletion(oListBinding, oNewDocumentContext, mParameters);
+
 										return oPromise;
 									})
 									.then(function (oResponse: any) {
 										if (!oResponse || (oResponse && oResponse.bKeepDialogOpen !== true)) {
+											oResponse = oResponse ?? {};
 											oDialog.setBindingContext(null as any);
 											oDialog.close();
+											oResponse.newContext = oNewDocumentContext;
 											resolve(oResponse);
 										}
 									})
@@ -1578,6 +1586,7 @@ class TransactionHelper {
 							// 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,
@@ -1620,48 +1629,53 @@ class TransactionHelper {
 		});
 	}
 	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 (oError: any) {
-								Log.trace("transient creation context deletion error", oError);
-							});
-						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.