@sapui5/sap.fe.core 1.102.2 → 1.104.1

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

@@ -1,5 +1,5 @@
 import Log from "sap/base/Log";
-import AppComponent from "sap/fe/core/AppComponent";
+import type AppComponent from "sap/fe/core/AppComponent";
 import CommonUtils from "sap/fe/core/CommonUtils";
 import BusyLocker from "sap/fe/core/controllerextensions/BusyLocker";
 import { send } from "sap/fe/core/controllerextensions/collaboration/ActivitySync";
@@ -16,18 +16,18 @@ import {
 } from "sap/fe/core/helpers/ClassSupport";
 import EditState from "sap/fe/core/helpers/EditState";
 import FELibrary from "sap/fe/core/library";
-import PageController from "sap/fe/core/PageController";
+import type PageController from "sap/fe/core/PageController";
 import Button from "sap/m/Button";
 import Dialog from "sap/m/Dialog";
 import Text from "sap/m/Text";
 import ControllerExtension from "sap/ui/core/mvc/ControllerExtension";
 import OverrideExecution from "sap/ui/core/mvc/OverrideExecution";
-import View from "sap/ui/core/mvc/View";
-import Table from "sap/ui/mdc/Table";
-import JSONModel from "sap/ui/model/json/JSONModel";
-import Model from "sap/ui/model/Model";
-import Context from "sap/ui/model/odata/v4/Context";
-import ODataListBinding from "sap/ui/model/odata/v4/ODataListBinding";
+import type View from "sap/ui/core/mvc/View";
+import type Table from "sap/ui/mdc/Table";
+import type JSONModel from "sap/ui/model/json/JSONModel";
+import type Model from "sap/ui/model/Model";
+import type Context from "sap/ui/model/odata/v4/Context";
+import type ODataListBinding from "sap/ui/model/odata/v4/ODataListBinding";
 
 const ProgrammingModel = FELibrary.ProgrammingModel,
 	DraftStatus = FELibrary.DraftStatus,
@@ -81,10 +81,9 @@ class InternalEditFlow extends ControllerExtension {
 		let aFinalContexts: any[] = [];
 		return this.syncTask()
 			.then(function () {
-				const onBeforeCreatePromise = beforeCreateCallBack
+				return beforeCreateCallBack
 					? beforeCreateCallBack({ contextPath: oListBinding && oListBinding.getPath() })
 					: Promise.resolve();
-				return onBeforeCreatePromise;
 			})
 			.then(() => {
 				const oModel = oListBinding.getModel(),
@@ -92,7 +91,7 @@ class InternalEditFlow extends ControllerExtension {
 				let sMetaPath: string;
 
 				if (oListBinding.getContext()) {
-					sMetaPath = oMetaModel.getMetaPath(oListBinding.getContext().getPath() + "/" + oListBinding.getPath());
+					sMetaPath = oMetaModel.getMetaPath(`${oListBinding.getContext().getPath()}/${oListBinding.getPath()}`);
 				} else {
 					sMetaPath = oMetaModel.getMetaPath(oListBinding.getPath());
 				}
@@ -112,7 +111,7 @@ class InternalEditFlow extends ControllerExtension {
 
 					// Remove navigation properties as we don't support deep create
 					for (const sPropertyPath in mPropertyValues) {
-						const oProperty = oMetaModel.getObject(sMetaPath + "/" + sPropertyPath);
+						const oProperty = oMetaModel.getObject(`${sMetaPath}/${sPropertyPath}`);
 						if (oProperty && oProperty.$kind !== "NavigationProperty" && mPropertyValues[sPropertyPath]) {
 							mParameters.data[sPropertyPath] = mPropertyValues[sPropertyPath];
 						}
@@ -176,6 +175,13 @@ class InternalEditFlow extends ControllerExtension {
 		const oListBinding = oTable.getRowBinding() as any;
 		mParameters.bFindActiveContexts = true;
 		BusyLocker.lock(oLockObject);
+
+		// Check if a displayed view can be impacted by the deletion, i.e. if there's an OP displaying a deleted object.
+		// We have to check this before the contexts are deleted (after, the contexts are invalid)
+		const navigateBackFromContext = aContexts.find((context: any) => {
+			return oRoutingListener.isCurrentStateImpactedBy(context);
+		});
+
 		return this.deleteDocumentTransaction(aContexts, mParameters)
 			.then(() => {
 				let oResult;
@@ -214,13 +220,9 @@ class InternalEditFlow extends ControllerExtension {
 					aContexts.map((context: Context) => context.getPath())
 				);
 
-				// Finally, check if the current state can be impacted by the deletion, i.e. if there's
-				// an OP displaying a deleted object. If yes navigate back to dismiss the OP
-				for (let index = 0; index < aContexts.length; index++) {
-					if (oRoutingListener.isCurrentStateImpactedBy(aContexts[index])) {
-						oRoutingListener.navigateBackFromContext(aContexts[index]);
-						break;
-					}
+				// Navigate back from a deleted context if needed
+				if (navigateBackFromContext) {
+					oRoutingListener.navigateBackFromContext(navigateBackFromContext);
 				}
 
 				return oResult;
@@ -245,52 +247,45 @@ class InternalEditFlow extends ControllerExtension {
 
 	@publicExtension()
 	@finalExtension()
-	computeEditMode(oContext: any) {
+	async computeEditMode(oContext: any): Promise<void> {
 		const sCustomAction = this.getInternalModel().getProperty("/sCustomAction");
-		return Promise.resolve(
-			(() => {
-				const sProgrammingModel = this.getProgrammingModel(oContext);
-
-				if (sProgrammingModel === ProgrammingModel.Draft) {
-					this.setDraftStatus(DraftStatus.Clear);
-
-					return oContext
-						.requestObject("IsActiveEntity")
-						.then((bIsActiveEntity: any) => {
-							if (bIsActiveEntity === false) {
-								// in case the document is draft set it in edit mode
-								this.setEditMode(EditMode.Editable);
-								return oContext.requestObject("HasActiveEntity").then((bHasActiveEntity: any) => {
-									this.setEditMode(undefined, !bHasActiveEntity);
-								});
-							} else {
-								// active document, stay on display mode
-								this.setEditMode(EditMode.Display, false);
-							}
-						})
-						.catch(function (oError: any) {
-							Log.error("Error while determining the editMode for draft", oError);
-							throw oError;
-						});
-				} else if (sProgrammingModel === ProgrammingModel.Sticky) {
-					if (sCustomAction && sCustomAction !== "" && this._hasNewActionForSticky(oContext, this.getView(), sCustomAction)) {
-						this.getTransactionHelper()._bCreateMode = true;
-						this.getTransactionHelper().handleDocumentModifications();
-						this.setEditMode(EditMode.Editable, true);
-						EditState.setEditStateDirty();
-						this.handleStickyOn(oContext);
-						this.getInternalModel().setProperty("/sCustomAction", "");
-					}
+		const sProgrammingModel = this.getProgrammingModel(oContext);
+
+		if (sProgrammingModel === ProgrammingModel.Draft) {
+			try {
+				this.setDraftStatus(DraftStatus.Clear);
+
+				const bIsActiveEntity = await oContext.requestObject("IsActiveEntity");
+				if (bIsActiveEntity === false) {
+					// in case the document is draft set it in edit mode
+					this.setEditMode(EditMode.Editable);
+					const bHasActiveEntity = await oContext.requestObject("HasActiveEntity");
+					this.setEditMode(undefined, !bHasActiveEntity);
+				} else {
+					// active document, stay on display mode
+					this.setEditMode(EditMode.Display, false);
 				}
-			})()
-		);
+			} catch (oError: any) {
+				Log.error("Error while determining the editMode for draft", oError);
+				throw oError;
+			}
+		} else if (sProgrammingModel === ProgrammingModel.Sticky) {
+			if (sCustomAction && sCustomAction !== "" && this._hasNewActionForSticky(oContext, this.getView(), sCustomAction)) {
+				this.getTransactionHelper()._bCreateMode = true;
+				this.getTransactionHelper().handleDocumentModifications();
+				this.setEditMode(EditMode.Editable, true);
+				EditState.setEditStateDirty();
+				this.handleStickyOn(oContext);
+				this.getInternalModel().setProperty("/sCustomAction", "");
+			}
+		}
 	}
 
 	/**
 	 * Sets the edit mode.
 	 *
-	 * @param {string} sEditMode
-	 * @param {boolean} bCreationMode CreateMode flag to identify the creation mode
+	 * @param sEditMode
+	 * @param bCreationMode CreateMode flag to identify the creation mode
 	 */
 	@publicExtension()
 	@finalExtension()
@@ -347,9 +342,8 @@ class InternalEditFlow extends ControllerExtension {
 	 * @name sap.fe.core.controllerextensions.EditFlow#syncTask
 	 * @memberof sap.fe.core.controllerextensions.EditFlow
 	 * @static
-	 * @param {Promise|Function} [vTask] Optional, a promise or function to be executed synchronously
-	 * @returns {Promise} Promise resolves once the task is completed
-	 *
+	 * @param [vTask] Optional, a promise or function to be executed synchronously
+	 * @returns Promise resolves once the task is completed
 	 * @ui5-restricted
 	 * @final
 	 */
@@ -366,7 +360,7 @@ class InternalEditFlow extends ControllerExtension {
 		}
 
 		this._pTasks = this._pTasks || Promise.resolve();
-		if (!!fnNewTask) {
+		if (fnNewTask) {
 			this._pTasks = this._pTasks.then(fnNewTask).catch(function () {
 				return Promise.resolve();
 			});
@@ -413,7 +407,7 @@ class InternalEditFlow extends ControllerExtension {
 	 * Handles the create event: shows messages and in case of a draft, updates the draft indicator.
 	 *
 	 * @memberof sap.fe.core.controllerextensions.EditFlow
-	 * @param {object} oBinding OData list binding object
+	 * @param oBinding OData list binding object
 	 */
 	@publicExtension()
 	@finalExtension()
@@ -459,10 +453,10 @@ class InternalEditFlow extends ControllerExtension {
 
 	/**
 	 * Creates a new promise to wait for an action to be executed
+	 *
 	 * @function
 	 * @name _createActionPromise
 	 * @memberof sap.fe.core.controllerextensions.EditFlow
-	 *
 	 * @returns {Function} The resolver function which can be used to externally resolve the promise
 	 */
 
@@ -485,8 +479,7 @@ class InternalEditFlow extends ControllerExtension {
 	 * @function
 	 * @name _getCurrentActionPromise
 	 * @memberof sap.fe.core.controllerextensions.EditFlow
-	 *
-	 * @returns {Promise} Returns the promise
+	 * @returns Returns the promise
 	 */
 	@publicExtension()
 	@finalExtension()
@@ -504,9 +497,9 @@ class InternalEditFlow extends ControllerExtension {
 	 * @function
 	 * @name getActionResponseDataAndKeys
 	 * @memberof sap.fe.core.controllerextensions.EditFlow
-	 * @param {string} sActionName The name of the action that is executed
-	 * @param {object} oResponse The bound action's response data or response context
-	 * @returns {object} Object with data and names of the key fields of the response
+	 * @param sActionName The name of the action that is executed
+	 * @param oResponse The bound action's response data or response context
+	 * @returns Object with data and names of the key fields of the response
 	 */
 	@publicExtension()
 	@finalExtension()
@@ -634,7 +627,6 @@ class InternalEditFlow extends ControllerExtension {
 
 	/**
 	 * @description Method to display a 'discard' popover when exiting a sticky session.
-	 *
 	 * @function
 	 * @name onBackNavigationInSession
 	 * @memberof sap.fe.core.controllerextensions.InternalEditFlow
@@ -678,7 +670,7 @@ class InternalEditFlow extends ControllerExtension {
 
 			const oMetaModel = oView.getModel().getMetaModel(),
 				sMetaPath = oContext.getPath().substring(0, oContext.getPath().indexOf("(")),
-				oStickySession = oMetaModel.getObject(sMetaPath + "@com.sap.vocabularies.Session.v1.StickySessionSupported");
+				oStickySession = oMetaModel.getObject(`${sMetaPath}@com.sap.vocabularies.Session.v1.StickySessionSupported`);
 
 			if (oStickySession && oStickySession.NewAction && oStickySession.NewAction === sCustomAction) {
 				return true;
@@ -754,15 +746,13 @@ class InternalEditFlow extends ControllerExtension {
 	}
 
 	_attachSessionTimeout(oContext: any, i18nModel: Model) {
-		const that = this;
-
-		return function fnHandleSessionTimeout() {
+		return () => {
 			try {
 				if (oContext === undefined) {
 					throw new Error("Context missing for function fnHandleSessionTimeout");
 				}
 				// remove transient messages since we will showing our own message
-				that.getMessageHandler().removeTransitionMessages();
+				this.getMessageHandler().removeTransitionMessages();
 
 				const oDialog = new Dialog({
 					title: "{sap.fe.i18n>C_EDITFLOW_OBJECT_PAGE_SESSION_EXPIRED_DIALOG_TITLE}",
@@ -771,10 +761,10 @@ class InternalEditFlow extends ControllerExtension {
 					beginButton: new Button({
 						text: "{sap.fe.i18n>C_COMMON_DIALOG_OK}",
 						type: "Emphasized",
-						press: function () {
+						press: () => {
 							// remove sticky handling after navigation since session has already been terminated
-							that.handleStickyOff();
-							that.getRoutingListener().navigateBackFromContext(oContext);
+							this.handleStickyOff();
+							this.getRoutingListener().navigateBackFromContext(oContext);
 						}
 					}),
 					afterClose: function () {
@@ -783,7 +773,7 @@ class InternalEditFlow extends ControllerExtension {
 				});
 				oDialog.addStyleClass("sapUiContentPadding");
 				oDialog.setModel(i18nModel, "sap.fe.i18n");
-				that.getView().addDependent(oDialog);
+				this.getView().addDependent(oDialog);
 				oDialog.open();
 			} catch (error) {
 				Log.info(error as any);