@sapui5/sap.fe.core 1.136.1 → 1.136.3

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

@@ -6,8 +6,7 @@ import CommonUtils from "sap/fe/core/CommonUtils";
 import type PageController from "sap/fe/core/PageController";
 import BaseControllerExtension from "sap/fe/core/controllerextensions/BaseControllerExtension";
 import messageHandling from "sap/fe/core/controllerextensions/messageHandler/messageHandling";
-import BeforeActionDialog from "sap/fe/core/controls/inlineEditFlow/BeforeActionDialog";
-import BeforeNavigationDialog, { type DIALOGRESULT } from "sap/fe/core/controls/inlineEditFlow/BeforeNavigationDialog";
+import InlineEditExitDialog, { type DIALOGRESULT } from "sap/fe/core/controls/inlineEditFlow/InlineEditExitDialog";
 import * as MetaModelConverter from "sap/fe/core/converters/MetaModelConverter";
 import { isProperty } from "sap/fe/core/helpers/TypeGuards";
 import { type DataModelObjectPath } from "sap/fe/core/templating/DataModelPathHelper";
@@ -273,6 +272,25 @@ export default class InlineEditFlow extends BaseControllerExtension {
 	 */
 	@methodOverride("routing")
 	async onBeforeNavigation(): Promise<boolean> {
+		try {
+			await this.onBeforeAnyEditFlowAction();
+			return false;
+		} catch (e) {
+			return true;
+		}
+	}
+
+	/**
+	 * Method to open the dialog before navigation.
+	 * @returns Promise that returns the dialog choice once the user has clicked on ok or cancel
+	 */
+	async openInlineEditExitDialogAndWaitForResult(): Promise<DIALOGRESULT> {
+		return new Promise<DIALOGRESULT>((resolve) => {
+			new InlineEditExitDialog(this.base.getView(), resolve).open();
+		});
+	}
+
+	async onBeforeAnyEditFlowAction(): Promise<void> {
 		if (this.inlineEditControls.length > 0) {
 			// there are controls in inline edit we need to prevent the navigation and show the dialog
 			this.preventFieldGroupChangeHandler = true;
@@ -283,13 +301,13 @@ export default class InlineEditFlow extends BaseControllerExtension {
 			if (!this.base.getView().getModel().hasPendingChanges(CommonUtils.INLINEEDIT_UPDATEGROUPID)) {
 				// fields are in inline edit and there are no pending changes. We need to show the dialog
 				this.inlineEditEnd();
-				return false;
+				return;
 			}
 			try {
 				if (this.patchPromise) {
 					await this.patchPromise;
 				} else {
-					const dialogResult = await this.openInlineEditBeforeNavigationDialogAndWaitForResult();
+					const dialogResult = await this.openInlineEditExitDialogAndWaitForResult();
 					if (dialogResult === "Save") {
 						// we save and wait for the patchPromise
 						await this.inlineEditSave();
@@ -297,58 +315,26 @@ export default class InlineEditFlow extends BaseControllerExtension {
 							// if after saves there are still changes this means save has failed. we need to cancel navigation
 							this.focusHandling(this.inlineEditControls[0]);
 							this.reactivateFieldGroupChangeHandler();
-							return true;
+							throw new Error("unsave change prevent execution");
 						}
 					} else if (dialogResult === "Cancel") {
 						this.focusHandling(this.inlineEditControls[0]);
 						this.reactivateFieldGroupChangeHandler();
-						return true;
+						throw new Error("cancel was chosen");
 					} else {
 						// we discard the changes
 						this.inlineEditDiscard();
 					}
 					this.reactivateFieldGroupChangeHandler();
-					return false;
+					return;
 				}
 			} catch (e) {
 				this.focusHandling(this.inlineEditControls[0]);
 				this.reactivateFieldGroupChangeHandler();
-				return true;
+				return Promise.reject();
 			}
 		}
-		return false;
-	}
-
-	/**
-	 * Method to open the dialog before navigation.
-	 * @returns Promise that returns the dialog choice once the user has clicked on ok or cancel
-	 */
-	async openInlineEditBeforeNavigationDialogAndWaitForResult(): Promise<DIALOGRESULT> {
-		return new Promise<DIALOGRESULT>((resolve) => {
-			new BeforeNavigationDialog(this.base.getView(), resolve).open();
-		});
-	}
-
-	/**
-	 * Method to ensure we leave inline edit before any standard edit flowaction.
-	 * @returns Promise that reject and triggers save or discard if we are in inline edit
-	 */
-	async onBeforeAnyEditFlowAction(): Promise<void> {
-		if (this.inlineEditControls.length > 0) {
-			if (this.abortTimerBeforeSave) {
-				this.abortTimerBeforeSave();
-				this.abortTimerBeforeSave = undefined;
-			}
-			if (!this.base.getView().getModel().hasPendingChanges(CommonUtils.INLINEEDIT_UPDATEGROUPID)) {
-				// fields are in inline edit and there are no pending changes. We don't need to show the dialog
-				this.inlineEditEnd();
-				return Promise.resolve();
-			}
-			new BeforeActionDialog(this.base.getView()).open();
-			// there are controls in inline edit we need to prevent the action and show the dialog
-			return Promise.reject();
-		}
-		return Promise.resolve();
+		return;
 	}
 
 	/**