MOBILE-4686 user-menu: Fix routes with canLeave cannot leave

moodlehq · Oct 21, 2024 · 667b361 · 667b361
1 parent 8ea6c00
commit 667b361
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.ts b/src/core/features/mainmenu/components/user-menu/user-menu.ts
@@ -208,7 +208,7 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
      * @param event Click event
      */
     async logout(event: Event): Promise<void> {
-        if (CoreNavigator.currentRouteCanBlockLeave()) {
+        if (!CoreNavigator.currentRouteCanBlockLeave()) {
             await CoreDomUtils.showAlert(undefined, Translate.instant('core.cannotlogoutpageblocks'));
 
             return;
@@ -242,7 +242,7 @@ export class CoreMainMenuUserMenuComponent implements OnInit, OnDestroy {
      * @param event Click event
      */
     async switchAccounts(event: Event): Promise<void> {
-        if (CoreNavigator.currentRouteCanBlockLeave()) {
+        if (!CoreNavigator.currentRouteCanBlockLeave()) {
             await CoreDomUtils.showAlert(undefined, Translate.instant('core.cannotlogoutpageblocks'));
 
             return;

diff --git a/src/core/services/navigator.ts b/src/core/services/navigator.ts
@@ -726,7 +726,13 @@ export class CoreNavigatorService {
      * @returns Whether the current route page can block leaving the route.
      */
     currentRouteCanBlockLeave(): boolean {
-        return !!this.getCurrentRoute().snapshot?.routeConfig?.canDeactivate?.length;
+        const canDeactivate = this.getCurrentRoute().snapshot?.routeConfig?.canDeactivate;
+
+        if (!canDeactivate?.length) {
+            return true;
+        }
+
+        return canDeactivate.every(method => typeof method === 'function' && method());
     }
 
     /**