@sapui5/sap.fe.core 1.121.1 → 1.121.3

package/src/sap/fe/core/controllerextensions/EditFlow.ts

@@ -2099,7 +2099,7 @@ class EditFlow extends BaseControllerExtension {
 
 		try {
 			await this.syncTask();
-			const oResponse = await transactionHelper.callAction(
+			let oResponse = await transactionHelper.callAction(
 				sActionName,
 				mParameters,
 				this.getView(),
@@ -2166,11 +2166,30 @@ class EditFlow extends BaseControllerExtension {
 						? _fnValidContexts(mParameters.contexts, mParameters.applicableContexts)[0]
 						: mParameters.contexts;
 					const sActionContextMetaPath = oActionContext && oMetaModel.getMetaPath(oActionContext.getPath());
+
 					if (sContextMetaPath != undefined && sContextMetaPath === sActionContextMetaPath) {
 						if (oActionContext?.getPath() !== context.getPath()) {
 							this.getInternalRouting().navigateForwardToContext(context, {
 								checkNoHashChange: true
 							});
+
+							// If the action returns a draft context, we already take care during navigation to either create a new
+							// (full screen) or to use the list binding context after refresh (and not the return value context).
+							// If the draft is discarded or activated, having the context still as dependent context cause issues
+							// (e.g. if a side effect is triggered). Therefore, we destroy the return value context here,
+							// and to be compatible we return a new context with the same path.
+							if (
+								this.getProgrammingModel(context) === ProgrammingModel.Draft &&
+								context.getProperty("IsActiveEntity") === false
+							) {
+								const returnContext = context.getModel().bindContext(context.getPath()).getBoundContext();
+								if (Array.isArray(oResponse)) {
+									(oResponse[0] as PromiseFulfilledResult<ODataV4Context>).value = returnContext;
+								} else {
+									oResponse = returnContext;
+								}
+								context.getBinding().destroy();
+							}
 						} else {
 							Log.info("Navigation to the same context is not allowed");
 						}