@sapui5/sap.fe.core 1.95.0 → 1.98.0

package/src/sap/fe/core/TransactionHelper.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[
@@ -76,7 +76,13 @@ sap.ui.define(
 			},
 			getProgrammingModel: function(oContext) {
 				if (!this.sProgrammingModel && oContext) {
-					if (ModelHelper.isDraftSupported(oContext.getModel().getMetaModel(), oContext.getPath())) {
+					var sPath;
+					if (oContext.isA("sap.ui.model.odata.v4.Context")) {
+						sPath = oContext.getPath();
+					} else {
+						sPath = oContext.isRelative() ? oContext.getResolvedPath() : oContext.getPath();
+					}
+					if (ModelHelper.isDraftSupported(oContext.getModel().getMetaModel(), sPath)) {
 						this.sProgrammingModel = ProgrammingModel.Draft;
 					} else if (ModelHelper.isStickySessionSupported(oContext.getModel().getMetaModel())) {
 						this.sProgrammingModel = ProgrammingModel.Sticky;
@@ -93,9 +99,8 @@ sap.ui.define(
 			 *
 			 * @memberof sap.fe.core.TransactionHelper
 			 * @static
-			 * @param {sap.ui.model.odata.v4.ODataListBinding} oMainListBinding OData v4 ListBinding object
+			 * @param {sap.ui.model.odata.v4.ODataListBinding} oMainListBinding OData V4 ListBinding object
 			 * @param {object} [mParameters] Optional, can contain the following attributes:
-			 * @param {boolean} [mParameters.refreshList] If the list shall be refreshed immediately after creating the instance
 			 * @param {map} [mParameters.data] A map of data that should be sent within the POST
 			 * @param {string} [mParameters.busyMode] Global (default), Local, None TODO: to be refactored
 			 * @param {map} [mParameters.keepTransientContextOnFailed] If set, the context stays in the list if the POST failed and POST will be repeated with the next change
@@ -109,14 +114,17 @@ sap.ui.define(
 			createDocument: function(oMainListBinding, mParameters, oResourceBundle, messageHandler, bFromCopyPaste) {
 				var oNewDocumentContext,
 					that = this,
-					bSkipRefresh,
 					oModel = oMainListBinding.getModel(),
 					oMetaModel = oModel.getMetaModel(),
 					sMetaPath = oMetaModel.getMetaPath(oMainListBinding.getHeaderContext().getPath()),
-					sNewAction =
-						!oMainListBinding.isRelative() &&
-						(oMetaModel.getObject(sMetaPath + "@com.sap.vocabularies.Session.v1.StickySessionSupported/NewAction") ||
-							oMetaModel.getObject(sMetaPath + "@com.sap.vocabularies.Common.v1.DraftRoot/NewAction")),
+					sCreateHash = this._getAppComponent()
+						.getRouterProxy()
+						.getHash(),
+					oComponentData = this._getAppComponent().getComponentData(),
+					oStartupParameters = (oComponentData && oComponentData.startupParameters) || {},
+					sNewAction = !oMainListBinding.isRelative()
+						? this._getNewAction(oStartupParameters, sCreateHash, oMetaModel, sMetaPath)
+						: undefined,
 					oCreationPromise,
 					mBindingParameters = { "$$patchWithoutSideEffects": true },
 					sMessagesPath = oMetaModel.getObject(sMetaPath + "/@com.sap.vocabularies.Common.v1.Messages/$Path"),
@@ -127,7 +135,18 @@ sap.ui.define(
 						oMetaModel.getObject(
 							ModelHelper.getTargetEntitySet(oMetaModel.getContext(sMetaPath)) +
 								"@com.sap.vocabularies.Common.v1.DefaultValuesFunction"
-						);
+						),
+					bFunctionOnNavProp;
+				if (sFunctionName) {
+					if (
+						oMetaModel.getObject(sMetaPath + "@com.sap.vocabularies.Common.v1.DefaultValuesFunction") &&
+						ModelHelper.getTargetEntitySet(oMetaModel.getContext(sMetaPath)) !== sMetaPath
+					) {
+						bFunctionOnNavProp = true;
+					} else {
+						bFunctionOnNavProp = false;
+					}
+				}
 				if (sMessagesPath) {
 					mBindingParameters["$select"] = sMessagesPath;
 				}
@@ -145,7 +164,6 @@ sap.ui.define(
 					sBusyPath = "/busyLocal/" + oMainListBinding.sId;
 				}
 				BusyLocker.lock(this.oLockObject, sBusyPath);
-				bSkipRefresh = !mParameters.refreshList;
 				var oResourceBundleCore = sap.ui.getCore().getLibraryResourceBundle("sap.fe.core");
 				if (sNewAction) {
 					oCreationPromise = this.callAction(
@@ -153,7 +171,7 @@ sap.ui.define(
 						{
 							contexts: oMainListBinding.getHeaderContext(),
 							showActionParameterDialog: true,
-							label: oResourceBundleCore.getText("C_TRANSACTION_HELPER_SAPFE_ACTION_CREATE"),
+							label: this._getSpecificCreateActionDialogLabel(oMetaModel, sMetaPath, sNewAction, oResourceBundleCore),
 							bindingParameters: mBindingParameters,
 							parentControl: mParameters.parentControl,
 							bIsCreateAction: true
@@ -168,8 +186,29 @@ sap.ui.define(
 						? CommonUtils.getNonComputedVisibleFields(oMetaModel, sMetaPath)
 						: [];
 					sFunctionName = bFromCopyPaste ? null : sFunctionName;
-					oCreationPromise = operations
-						.callFunctionImport(sFunctionName, oModel)
+					var sFunctionPath, oFunctionContext;
+					if (sFunctionName) {
+						//bound to the source entity:
+						if (bFunctionOnNavProp) {
+							sFunctionPath =
+								oMainListBinding.getContext() &&
+								oMetaModel.getMetaPath(oMainListBinding.getContext().getPath()) + "/" + sFunctionName;
+							oFunctionContext = oMainListBinding.getContext();
+						} else {
+							sFunctionPath =
+								oMainListBinding.getHeaderContext() &&
+								oMetaModel.getMetaPath(oMainListBinding.getHeaderContext().getPath()) + "/" + sFunctionName;
+							oFunctionContext = oMainListBinding.getHeaderContext();
+						}
+					}
+					var oFunction = sFunctionPath && oMetaModel.createBindingContext(sFunctionPath);
+					if (oFunction && oFunction.getObject() && oFunction.getObject()[0].$IsBound) {
+						oCreationPromise = operations.callBoundFunction(sFunctionName, oFunctionContext, oModel);
+					} else {
+						oCreationPromise = operations.callFunctionImport(sFunctionName, oModel);
+					}
+
+					oCreationPromise = oCreationPromise
 						.then(function(oContext) {
 							if (oContext) {
 								return oContext.getObject();
@@ -178,7 +217,7 @@ sap.ui.define(
 							}
 						})
 						.catch(function(oError) {
-							Log.error("Error while calling function Import " + sFunctionName, oError);
+							Log.error("Error while executing the function " + sFunctionName, oError);
 							throw oError;
 						})
 						.then(function(oData) {
@@ -197,7 +236,7 @@ sap.ui.define(
 									}
 								);
 								oTransientListBinding.refreshInternal = function() {};
-								oNewDocumentContext = oTransientListBinding.create(mParameters.data, bSkipRefresh);
+								oNewDocumentContext = oTransientListBinding.create(mParameters.data, true);
 								return that._launchDialogWithKeyFields(
 									oMainListBinding,
 									oTransientListBinding,
@@ -205,11 +244,10 @@ sap.ui.define(
 									aNonComputedVisibleKeyFields,
 									oModel,
 									mParameters,
-									messageHandler,
-									sFunctionName
+									messageHandler
 								);
 							} else {
-								oNewDocumentContext = oMainListBinding.create(mParameters.data, bSkipRefresh, mParameters.createAtEnd);
+								oNewDocumentContext = oMainListBinding.create(mParameters.data, true, mParameters.createAtEnd);
 								return that.onAfterCreateCompletion(
 									oMainListBinding,
 									oNewDocumentContext,
@@ -403,22 +441,13 @@ sap.ui.define(
 								}
 								mParameters = getParameters(mParameters);
 								if (mParameters.title) {
-									if (mParameters.description) {
-										aParams = [mParameters.title, mParameters.description];
-										oDeleteMessage.text = CommonUtils.getTranslatedText(
-											"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTINFO",
-											oResourceBundle,
-											aParams,
-											mParameters.entitySetName
-										);
-									} else {
-										oDeleteMessage.text = CommonUtils.getTranslatedText(
-											"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTTITLE_SINGULAR",
-											oResourceBundle,
-											null,
-											mParameters.entitySetName
-										);
-									}
+									aParams = [mParameters.title, mParameters.description];
+									oDeleteMessage.text = CommonUtils.getTranslatedText(
+										"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTINFO",
+										oResourceBundle,
+										aParams,
+										mParameters.entitySetName
+									);
 								} else {
 									oDeleteMessage.text = CommonUtils.getTranslatedText(
 										"C_TRANSACTION_HELPER_OBJECT_PAGE_CONFIRM_DELETE_WITH_OBJECTTITLE_SINGULAR",
@@ -628,8 +657,14 @@ sap.ui.define(
 							bDialogConfirmed = true;
 							BusyLocker.lock(that.oLockObject);
 							var aContexts = aDeletableContexts;
-							return that
-								.findActiveDraftRootContexts(aContexts, mParameters.bFindActiveContexts)
+							var onBeforeDeletePromise;
+							if (mParameters.beforeDeleteCallBack) {
+								onBeforeDeletePromise = mParameters.beforeDeleteCallBack({ contexts: aContexts });
+							} else {
+								onBeforeDeletePromise = Promise.resolve();
+							}
+							return onBeforeDeletePromise
+								.then(that.findActiveDraftRootContexts.bind(that, aContexts, mParameters.bFindActiveContexts))
 								.then(function(activeContexts) {
 									//make sure to fetch the active contexts before deleting the drafts
 									return Promise.all(
@@ -639,7 +674,7 @@ sap.ui.define(
 										})
 									)
 										.catch(function(oError) {
-											return messageHandler.showMessageDialog().then(function() {
+											return messageHandler.showMessages().then(function() {
 												// re-throw error to enforce rejecting the general promise
 												throw oError;
 											});
@@ -763,7 +798,7 @@ sap.ui.define(
 						});
 					})
 					.catch(function(err) {
-						return messageHandler.showMessageDialog().then(function() {
+						return messageHandler.showMessages().then(function() {
 							return Promise.reject(err);
 						});
 					})
@@ -779,7 +814,7 @@ sap.ui.define(
 			 * @param {sap.ui.model.odata.v4.Context} oContext Context of the document to be canceled or deleted
 			 * @param {object} [mParameters] Optional, can contain the following attributes:
 			 * @param {sap.m.Button} mParameters.cancelButton Cancel Button of the discard popover (mandatory for now)
-			 * @param {boolean} mParameters.bSkipDiscardPopover Optional, supresses the discard popover incase of draft applications while navigating out of OP
+			 * @param {boolean} mParameters.skipDiscardPopover Optional, supresses the discard popover incase of draft applications while navigating out of OP
 			 * @param oResourceBundle
 			 * @param messageHandler
 			 * @returns {Promise} Promise resolves with ???
@@ -798,6 +833,7 @@ sap.ui.define(
 				var oParamsContext = oContext,
 					oCancelButton = mParameters.cancelButton,
 					oModel = oParamsContext.getModel(),
+					onBeforeCancelPromise,
 					sCanonicalPath;
 				return Promise.resolve(this.getProgrammingModel(oContext))
 					.then(function(sPModel) {
@@ -816,12 +852,20 @@ sap.ui.define(
 						}
 					})
 					.then(function() {
-						if (!mParameters.bSkipDiscardPopover) {
+						if (!mParameters.skipDiscardPopover) {
 							return that._showDiscardPopover(oCancelButton, that._bIsModified, oResourceBundle);
 						} else {
 							return Promise.resolve();
 						}
 					})
+					.then(function() {
+						if (mParameters.beforeCancelCallBack) {
+							onBeforeCancelPromise = mParameters.beforeCancelCallBack({ context: oContext });
+						} else {
+							onBeforeCancelPromise = Promise.resolve();
+						}
+						return onBeforeCancelPromise;
+					})
 					.then(function() {
 						// eslint-disable-next-line default-case
 						switch (sProgrammingModel) {
@@ -890,12 +934,12 @@ sap.ui.define(
 						// remove existing bound transition messages
 						messageHandler.removeTransitionMessages();
 						// show unbound messages
-						return messageHandler.showMessageDialog().then(function() {
+						return messageHandler.showMessages().then(function() {
 							return context;
 						});
 					})
 					.catch(function(err) {
-						return messageHandler.showMessageDialog().then(function() {
+						return messageHandler.showMessages().then(function() {
 							return Promise.reject(err);
 						});
 					})
@@ -962,7 +1006,7 @@ sap.ui.define(
 								}
 							});
 						}
-						return messageHandler.showMessageDialog().then(function() {
+						return messageHandler.showMessages().then(function() {
 							return Promise.reject(err);
 						});
 					})
@@ -971,7 +1015,7 @@ sap.ui.define(
 					});
 			},
 			/**
-			 * Calls a bound/unbound action.
+			 * Calls a bound or unbound action.
 			 *
 			 * @function
 			 * @static
@@ -979,9 +1023,9 @@ sap.ui.define(
 			 * @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 shall 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 (TODO: create enum)
+			 * @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
@@ -1170,7 +1214,7 @@ sap.ui.define(
 				if (aTransientMessages.length > 0 && mParameters && mParameters.internalModelContext) {
 					mParameters.internalModelContext.setProperty("sActionName", mParameters.label ? mParameters.label : sActionName);
 				}
-				return messageHandler.showMessageDialog();
+				return messageHandler.showMessages();
 			},
 			/**
 			 * Handles validation errors for the 'discard' action.
@@ -1304,8 +1348,7 @@ sap.ui.define(
 				mFields,
 				oModel,
 				mParameters,
-				messageHandler,
-				sFunctionName
+				messageHandler
 			) {
 				var that = this,
 					oDialog,
@@ -1318,8 +1361,9 @@ sap.ui.define(
 						oMetaModel = oModel.getMetaModel(),
 						aImmutableFields = [],
 						oAppComponent = that._getAppComponent(),
-						oEntitySetContext = oMetaModel.createBindingContext(oListBinding.getPath()),
-						sMetaPath = oMetaModel.getMetaPath(oListBinding.getPath());
+						sPath = oListBinding.isRelative() ? oListBinding.getResolvedPath() : oListBinding.getPath(),
+						oEntitySetContext = oMetaModel.createBindingContext(sPath),
+						sMetaPath = oMetaModel.getMetaPath(sPath);
 					for (var i in mFields) {
 						aImmutableFields.push(oMetaModel.createBindingContext(sMetaPath + "/" + mFields[i]));
 					}
@@ -1448,7 +1492,7 @@ sap.ui.define(
 											.finally(function() {
 												BusyLocker.unlock(oDialog);
 												oCreateButton.setEnabled(true);
-												return messageHandler.showMessageDialog();
+												return messageHandler.showMessages();
 											});
 									}
 								},
@@ -1458,15 +1502,6 @@ sap.ui.define(
 										oDialog.close();
 									}
 								},
-								beforeOpen: function() {
-									if (sFunctionName) {
-										for (var i = 0; i < Object.keys(mParameters.data).length; i++) {
-											if (mParameters.data && mFields.indexOf(Object.keys(mParameters.data)[i]) > -1) {
-												oTransientContext.setProperty(mFields[i], mParameters.data[mFields[i]]);
-											}
-										}
-									}
-								},
 								afterClose: function() {
 									// show footer as per UX guidelines when dialog is not open
 									oDialog.getBindingContext("internal").setProperty("isCreateDialogOpen", false);
@@ -1488,7 +1523,14 @@ sap.ui.define(
 							}
 							oCreateButton = oDialog.getBeginButton();
 							oDialog.setBindingContext(oTransientContext);
-							return CommonUtils.setUserDefaults(oAppComponent, aImmutableFields, oTransientContext)
+							return CommonUtils.setUserDefaults(
+								oAppComponent,
+								aImmutableFields,
+								oTransientContext,
+								undefined,
+								mParameters.createAction,
+								mParameters.data
+							)
 								.then(function() {
 									validateRequiredProperties();
 									// footer must not be visible when the dialog is open as per UX guidelines
@@ -1496,7 +1538,7 @@ sap.ui.define(
 									oDialog.open();
 								})
 								.catch(function(oError) {
-									return messageHandler.showMessageDialog().then(function() {
+									return messageHandler.showMessages().then(function() {
 										return Promise.reject(oError);
 									});
 								});
@@ -1542,6 +1584,82 @@ sap.ui.define(
 				};
 				oListBinding.attachCreateCompleted(fnCreateCompleted, this);
 				return oPromise;
+			},
+			/**
+			 * Retrieves the name of the NewAction to be executed.
+			 *
+			 * @function
+			 * @static
+			 * @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
+			 * @ui5-restricted
+			 * @final
+			 **/
+			_getNewAction: function(oStartupParameters, sCreateHash, oMetaModel, sMetaPath) {
+				var sNewAction;
+
+				if (oStartupParameters && oStartupParameters.preferredMode && sCreateHash.indexOf("i-action=createWith") > -1) {
+					var sPreferredMode = oStartupParameters.preferredMode[0];
+					sNewAction =
+						sPreferredMode.indexOf("createWith:") > -1 ? sPreferredMode.substr(sPreferredMode.lastIndexOf(":") + 1) : undefined;
+				} 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")
+							: undefined;
+				}
+				return sNewAction;
+			},
+			/**
+			 * Retrieves the label for the title of a specific create action dialog, e.g. Create Sales Order from Quotation.
+			 *
+			 * The following priority is applied:
+			 * 1. label of line-item annotation.
+			 * 2. label annotated in the action.
+			 * 3. "Create" as a constant from i18n.
+			 *
+			 * @function
+			 * @static
+			 * @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
+			 * @ui5-restricted
+			 * @final
+			 **/
+			_getSpecificCreateActionDialogLabel: function(oMetaModel, sMetaPath, sNewAction, oResourceBundleCore) {
+				var fnGetLabelFromLineItemAnnotation = function() {
+					if (oMetaModel && oMetaModel.getObject(sMetaPath + "/@com.sap.vocabularies.UI.v1.LineItem")) {
+						var iLineItemIndex = oMetaModel
+							.getObject(sMetaPath + "/@com.sap.vocabularies.UI.v1.LineItem")
+							.findIndex(function(oLineItem) {
+								var 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
+							: undefined;
+					} else {
+						return undefined;
+					}
+				};
+
+				return (
+					fnGetLabelFromLineItemAnnotation() ||
+					(oMetaModel && oMetaModel.getObject(sMetaPath + "/" + sNewAction + "@com.sap.vocabularies.Common.v1.Label")) ||
+					(oResourceBundleCore && oResourceBundleCore.getText("C_TRANSACTION_HELPER_SAPFE_ACTION_CREATE"))
+				);
 			}
 		});
 	}

package/src/sap/fe/core/actions/draft.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides static functions for the draft programming model
@@ -75,6 +75,21 @@ sap.ui.define(
 			PREPARE: "PreparationAction"
 		};
 
+		/**
+		 * Static functions for the draft programming model
+		 *
+		 * @namespace
+		 * @alias sap.fe.core.actions.draft
+		 * @private
+		 * @experimental This module is only for experimental use! <br/><b>This is only a POC and maybe deleted</b>
+		 * @since 1.54.0
+		 */
+		var draft = {
+			createDraftFromActiveDocument: createDraftFromActiveDocument,
+			activateDocument: activateDocument,
+			deleteDraft: deleteDraft
+		};
+
 		/**
 		 * Determines action name for a draft operation.
 		 *
@@ -134,23 +149,49 @@ sap.ui.define(
 				var oOptions = { $$inheritExpandSelect: true };
 				var oOperation = createOperation(oContext, draftOperations.EDIT, oOptions);
 				oOperation.setParameter("PreserveChanges", bPreserveChanges);
-				var oEditPromise = oOperation.execute("direct").then(function(oDraftDocumentContext) {
-					return oDraftDocumentContext;
-				});
-				oOperation.getModel().submitBatch("direct");
+				var sGroupId = "direct";
+				var oEditPromise = oOperation
+					.execute(sGroupId, undefined, fnOnStrictHandlingFailed.bind(draft, oContext, sGroupId))
+					.then(function(oDraftDocumentContext) {
+						return oDraftDocumentContext;
+					});
+				oOperation.getModel().submitBatch(sGroupId);
 				return oEditPromise;
 			} else {
-				throw new Error("The edit action cannot be executed on a draft document");
+				throw new Error("You cannot edit this draft document");
+			}
+		}
+
+		function fnOnStrictHandlingFailed(oContext, sGroupId, aMessages) {
+			if (aMessages.length === 1) {
+				var sMessage = aMessages[0].message,
+					dialogPromise = new Promise(function(resolve) {
+						sap.ui.require(["sap/m/MessageBox"], function(MessageBox) {
+							MessageBox.warning(sMessage, {
+								title: "Warning",
+								actions: [MessageBox.Action.OK, MessageBox.Action.CANCEL],
+								onClose: function(sAction) {
+									if (sAction === MessageBox.Action.OK) {
+										resolve(true);
+										oContext.getModel().submitBatch(sGroupId);
+									} else {
+										resolve(false);
+									}
+								}
+							});
+						});
+					});
+				return dialogPromise;
 			}
 		}
 
 		/**
-		 * Activates a draft document. The draft will replace the sibling entity and will be deleted by the backend.
+		 * Activates a draft document. The draft will replace the sibling entity and will be deleted by the back end.
 		 *
 		 * @function
 		 * @param {sap.ui.model.odata.v4.Context} oContext context for which the action should be performed
 		 * @param {object} oAppComponent The AppComponent
-		 * @param {string} [sGroupId] the optional batch group where we want to execute the operation in
+		 * @param {string} [sGroupId] The optional batch group in which the operation is to be executed
 		 * @returns {Promise.<sap.ui.model.odata.v4.Context>} Resolve function returns the context of the operation
 		 * @private
 		 * @ui5-restricted
@@ -166,7 +207,7 @@ sap.ui.define(
 			if (!oContext.getProperty("IsActiveEntity")) {
 				var oOperation = createOperation(oContext, draftOperations.ACTIVATION, { $$inheritExpandSelect: true });
 				return oOperation
-					.execute(sGroupId, bIgnoreEtag)
+					.execute(sGroupId, bIgnoreEtag, fnOnStrictHandlingFailed.bind(draft, oContext, sGroupId)) //3rd parameter<------
 					.then(function(oActiveDocumentContext) {
 						return oActiveDocumentContext;
 					})
@@ -563,20 +604,6 @@ sap.ui.define(
 				return executeDraftDiscardAction(oContext);
 			}
 		}
-		/**
-		 * Static functions for the draft programming model
-		 *
-		 * @namespace
-		 * @alias sap.fe.core.actions.draft
-		 * @private
-		 * @experimental This module is only for experimental use! <br/><b>This is only a POC and maybe deleted</b>
-		 * @since 1.54.0
-		 */
-		var draft = {
-			createDraftFromActiveDocument: createDraftFromActiveDocument,
-			activateDocument: activateDocument,
-			deleteDraft: deleteDraft
-		};
 
 		return draft;
 	}