@sapui5/sap.fe.core 1.98.0 → 1.99.0

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

@@ -1,12 +1,12 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(
 	[
 		"sap/ui/core/mvc/ControllerExtension",
 		"sap/ui/core/mvc/OverrideExecution",
-		"sap/fe/core/actions/sticky",
 		"sap/base/Log",
 		"sap/m/Text",
 		"sap/m/Button",
@@ -25,7 +25,6 @@ sap.ui.define(
 	function(
 		ControllerExtension,
 		OverrideExecution,
-		sticky,
 		Log,
 		Text,
 		Button,
@@ -58,7 +57,7 @@ sap.ui.define(
 			DraftStatus = FELibrary.DraftStatus,
 			EditMode = FELibrary.EditMode;
 
-		var Extension = ControllerExtension.extend("sap.fe.core.controllerextensions.EditFlow", {
+		return ControllerExtension.extend("sap.fe.core.controllerextensions.EditFlow", {
 			metadata: {
 				methods: {
 					editDocument: { "public": true, "final": true },
@@ -269,7 +268,7 @@ sap.ui.define(
 						(mParameters.creationMode !== CreationMode.Inline &&
 							mParameters.creationMode !== CreationMode.CreationRow &&
 							mParameters.creationMode !== CreationMode.External),
-					oExecFunctionFromManifestPromise = Promise.resolve([]),
+					oExecCustomValidation = Promise.resolve([]),
 					oAppComponent = CommonUtils.getAppComponent(this.getView());
 				oAppComponent.getRouterProxy().removeIAppStateKey();
 
@@ -285,27 +284,17 @@ sap.ui.define(
 				}
 
 				if (mParameters.creationMode === CreationMode.CreationRow && mParameters.creationRow) {
+					var oCreationRowObjects = mParameters.creationRow.getBindingContext().getObject();
+					delete oCreationRowObjects["@$ui5.context.isTransient"];
 					oTable = mParameters.creationRow.getParent();
-					// get custom validation function from manifest
-					var sCustomValidationFunction = oTable.getCreationRow().data("customValidationFunction");
-					if (sCustomValidationFunction) {
-						var sModule = sCustomValidationFunction
-								.substring(0, sCustomValidationFunction.lastIndexOf(".") || -1)
-								.replace(/\./gi, "/"),
-							sFunctionName = sCustomValidationFunction.substring(
-								sCustomValidationFunction.lastIndexOf(".") + 1,
-								sCustomValidationFunction.length
-							),
-							oCreationRowObjects = mParameters.creationRow.getBindingContext().getObject();
-						delete oCreationRowObjects["@$ui5.context.isTransient"];
-						oExecFunctionFromManifestPromise = FPMHelper.validationWrapper(
-							sModule,
-							sFunctionName,
-							oCreationRowObjects,
-							that.base.getView(),
-							oTable.getBindingContext("internal")
-						);
-					}
+					oExecCustomValidation = transactionHelper.validateDocument(
+						oTable.getBindingContext(),
+						{
+							data: oCreationRowObjects,
+							customValidationFunction: oTable.getCreationRow().data("customValidationFunction")
+						},
+						that.base.getView()
+					);
 
 					// disableAddRowButtonForEmptyData is set to false in manifest converter (Table.ts) if customValidationFunction exists
 					if (oTable.getCreationRow().data("disableAddRowButtonForEmptyData") === "true") {
@@ -420,7 +409,7 @@ sap.ui.define(
 				}
 
 				bShouldBusyLock && BusyLocker.lock(oLockObject);
-				return this._syncTask(oExecFunctionFromManifestPromise)
+				return this._syncTask(oExecCustomValidation)
 					.then(function(aValidationMessages) {
 						if (aValidationMessages.length > 0) {
 							createCustomValidationMessages(aValidationMessages);
@@ -476,7 +465,11 @@ sap.ui.define(
 										}
 									}
 									var sMetaPath = oMetaModel.getMetaPath(oListBinding.getHeaderContext().getPath());
-									var aNonComputedVisibleKeyFields = CommonUtils.getNonComputedVisibleFields(oMetaModel, sMetaPath);
+									var aNonComputedVisibleKeyFields = CommonUtils.getNonComputedVisibleFields(
+										oMetaModel,
+										sMetaPath,
+										that.getView()
+									);
 									if (aNonComputedVisibleKeyFields.length > 0) {
 										return CreationMode.Deferred;
 									}
@@ -525,21 +518,15 @@ sap.ui.define(
 										if (!mParameters.parentControl) {
 											mParameters.parentControl = that.getView();
 										}
-										return that.base.editFlow
-											.onBeforeCreate({ contextPath: oListBinding.getPath() })
-											.then(
-												transactionHelper.createDocument.bind(
-													transactionHelper,
-													oListBinding,
-													mParameters,
-													oResourceBundle,
-													that._getMessageHandler()
-												)
-											)
-											.catch(function(oError) {
-												Log.error("Error while creating the document", oError);
-												return Promise.reject();
-											});
+										mParameters.beforeCreateCallBack = that.base.editFlow.onBeforeCreate;
+										return transactionHelper.createDocument(
+											oListBinding,
+											mParameters,
+											oResourceBundle,
+											that._getMessageHandler(),
+											false,
+											that.getView()
+										);
 									});
 								}
 
@@ -583,7 +570,7 @@ sap.ui.define(
 										});
 										break;
 									case CreationMode.Inline:
-										oNavigation = handleSideEffects(oListBinding, oCreation);
+										handleSideEffects(oListBinding, oCreation);
 										that._syncTask(oCreation);
 										break;
 									case CreationMode.CreationRow:
@@ -706,7 +693,8 @@ sap.ui.define(
 			 * This function is meant to be individually overridden by consuming controllers, but not to be called directly.
 			 * The override execution is: {@link sap.ui.core.mvc.OverrideExecution.After}.
 			 * @param {map} [mParameters] Object containing the parameters passed to onBeforeCreate
-			 * @param {string} [mParameters.contextPath] Path pointing to the context on which 'Create' action is triggered
+			 * @param {string} [mParameters.contextPath] Path pointing to the context on which Create action is triggered
+			 * @param {Array} [mParameters.createParameters] Array of values that are filled in the Action Parameter Dialog
 			 * @returns {Promise} A promise to be returned by the overridden method. If resolved, the 'Create' action is triggered. If rejected, the 'Create' action is not triggered.
 			 * @memberof sap.fe.core.controllerextensions.EditFlow
 			 * @alias sap.fe.core.controllerextensions.EditFlow#onBeforeCreate
@@ -1213,6 +1201,7 @@ sap.ui.define(
 					 */
 						if (mParameters.contexts) {
 							EditState.setEditStateDirty();
+							that._getInternalModel().setProperty("/sCustomAction", sActionName);
 						}
 						if (mParameters.isNavigable) {
 							var vContext = oResponse;
@@ -1498,140 +1487,31 @@ sap.ui.define(
 			},
 
 			_handleStickyOn: function(oContext) {
-				var that = this,
-					oAppComponent = CommonUtils.getAppComponent(this.getView());
-
-				if (!oAppComponent.getRouterProxy().hasNavigationGuard()) {
-					var sHashTracker = oAppComponent.getRouterProxy().getHash(),
-						oInternalModel = this._getInternalModel();
-
-					// Set a guard in the RouterProxy
-					// A timeout is necessary, as with deferred creation the hashChanger is not updated yet with
-					// the new hash, and the guard cannot be found in the managed history of the router proxy
-					setTimeout(function() {
-						oAppComponent.getRouterProxy().setNavigationGuard();
-					}, 0);
-
-					// Setting back navigation on shell service, to get the dicard message box in case of sticky
-					oAppComponent.getShellServices().setBackNavigation(that._onBackNavigationInSession.bind(that));
-
-					this.fnDirtyStateProvider = function(oNavigationContext) {
-						var sTargetHash = oNavigationContext.innerAppRoute,
-							oRouterProxy = oAppComponent.getRouterProxy(),
-							bDirty,
-							bSessionON = oInternalModel.getProperty("/sessionOn");
-
-						if (!bSessionON) {
-							// If the sticky session was terminated before hand.
-							// Eexample in case of navigating away from application using IBN.
-							return;
-						}
-
-						if (!oRouterProxy.isNavigationFinalized()) {
-							// If navigation is currently happening in RouterProxy, it's a transient state
-							// (not dirty)
-							bDirty = false;
-							sHashTracker = sTargetHash;
-						} else if (sHashTracker === sTargetHash) {
-							// the hash didn't change so either the user attempts to refresh or to leave the app
-							bDirty = true;
-						} else if (oRouterProxy.checkHashWithGuard(sTargetHash) || oRouterProxy.isGuardCrossAllowedByUser()) {
-							// the user attempts to navigate within the root object
-							// or crossing the guard has already been allowed by the RouterProxy
-							sHashTracker = sTargetHash;
-							bDirty = false;
-						} else {
-							// the user attempts to navigate within the app, for example back to the list report
-							bDirty = true;
-						}
-
-						if (bDirty) {
-							// the FLP doesn't call the dirty state provider anymore once it's dirty, as they can't
-							// change this due to compatibility reasons we set it back to not-dirty
-							setTimeout(function() {
-								oAppComponent.getShellServices().setDirtyFlag(false);
-							}, 0);
-						}
-
-						return bDirty;
-					};
-
-					oAppComponent.getShellServices().registerDirtyStateProvider(this.fnDirtyStateProvider);
-
-					var i18nModel = this.getView().getModel("sap.fe.i18n");
-
-					this.fnHandleSessionTimeout = function() {
-						// remove transient messages since we will showing our own message
-						that._getMessageHandler().removeTransitionMessages();
-
-						var oDialog = new Dialog({
-							title: "{sap.fe.i18n>C_EDITFLOW_OBJECT_PAGE_SESSION_EXPIRED_DIALOG_TITLE}",
-							state: "Warning",
-							content: new Text({ text: "{sap.fe.i18n>C_EDITFLOW_OBJECT_PAGE_SESSION_EXPIRED_DIALOG_MESSAGE}" }),
-							beginButton: new Button({
-								text: "{sap.fe.i18n>C_COMMON_DIALOG_OK}",
-								type: "Emphasized",
-								press: function() {
-									// remove sticky handling after navigation since session has already been terminated
-									that._handleStickyOff();
-									that._getRoutingListener().navigateBackFromContext(oContext);
-								}
-							}),
-							afterClose: function() {
-								oDialog.destroy();
-							}
-						});
-						oDialog.addStyleClass("sapUiContentPadding");
-						oDialog.setModel(i18nModel, "sap.fe.i18n");
-						that.getView().addDependent(oDialog);
-						oDialog.open();
-					};
-					// handle session timeout
-					this.getView()
-						.getModel()
-						.attachSessionTimeout(this.fnHandleSessionTimeout);
-
-					this._fnStickyDiscardAfterNavigation = function() {
-						var sCurrentHash = oAppComponent.getRouterProxy().getHash();
-						// either current hash is empty so the user left the app or he navigated away from the object
-						if (!sCurrentHash || !oAppComponent.getRouterProxy().checkHashWithGuard(sCurrentHash)) {
-							that._discardStickySession(oContext);
-						}
-					};
-					oAppComponent.getRoutingService().attachRouteMatched(this._fnStickyDiscardAfterNavigation);
-				}
+				return this.base
+					.getView()
+					.getController()
+					._editFlow.handleStickyOn(oContext);
 			},
 
 			_handleStickyOff: function() {
-				var oAppComponent = CommonUtils.getAppComponent(this.getView());
-
-				if (oAppComponent.getRouterProxy) {
-					// If we have exited from the app, CommonUtils.getAppComponent doesn't return a
-					// sap.fe.core.AppComponent, hence the 'if' above
-					oAppComponent.getRouterProxy().discardNavigationGuard();
-				}
-
-				if (this.fnDirtyStateProvider) {
-					oAppComponent.getShellServices().deregisterDirtyStateProvider(this.fnDirtyStateProvider);
-					this.fnDirtyStateProvider = null;
-				}
-
-				if (this.getView().getModel() && this.fnHandleSessionTimeout) {
-					this.getView()
-						.getModel()
-						.detachSessionTimeout(this.fnHandleSessionTimeout);
-				}
-
-				oAppComponent.getRoutingService().detachRouteMatched(this._fnStickyDiscardAfterNavigation);
-				this._fnStickyDiscardAfterNavigation = null;
+				return this.base
+					.getView()
+					.getController()
+					._editFlow.handleStickyOff();
+			},
 
-				this._setEditMode(EditMode.Display, false);
+			_onBackNavigationInSession: function() {
+				return this.base
+					.getView()
+					.getController()
+					._editFlow.onBackNavigationInSession();
+			},
 
-				if (oAppComponent) {
-					// If we have exited from the app, CommonUtils.getAppComponent doesn't return a
-					// sap.fe.core.AppComponent, hence the 'if' above
-					oAppComponent.getShellServices().setBackNavigation();
-				}
+			_discardStickySession: function(oContext) {
+				return this.base
+					.getView()
+					.getController()
+					._editFlow.discardStickySession(oContext);
 			},
 
 			_handleNewContext: function(oContext, bEditable, bRecreateContext, bDraftNavigation, bForceFocus) {
@@ -1689,41 +1569,6 @@ sap.ui.define(
 				});
 			},
 
-			/**
-			 * @description Method to display a 'discard' popover when exiting a sticky session.
-			 *
-			 * @function
-			 * @name _onBackNavigationInSession
-			 * @memberof sap.fe.core.controllerextensions.EditFlow
-			 */
-			_onBackNavigationInSession: function() {
-				var that = this,
-					oView = that.getView(),
-					oAppComponent = CommonUtils.getAppComponent(oView),
-					oRouterProxy = oAppComponent.getRouterProxy();
-
-				if (oRouterProxy.checkIfBackIsOutOfGuard()) {
-					var oBindingContext = oView && oView.getBindingContext();
-
-					CommonUtils.processDataLossConfirmation(
-						function() {
-							that._discardStickySession(oBindingContext);
-							history.back();
-						},
-						oView,
-						that._getProgrammingModel(oBindingContext)
-					);
-
-					return;
-				}
-				history.back();
-			},
-
-			_discardStickySession: function(oContext) {
-				sticky.discardDocument(oContext);
-				this._handleStickyOff();
-			},
-
 			/**
 			 * @function
 			 * @name _refreshListIfRequired
@@ -1823,7 +1668,5 @@ sap.ui.define(
 				});
 			}
 		});
-
-		return Extension;
 	}
 );

package/src/sap/fe/core/controllerextensions/IntentBasedNavigation.js

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(["sap/ui/core/mvc/ControllerExtension", "sap/ui/core/mvc/OverrideExecution"], function(
 	ControllerExtension,