cleanre logic on canDeactive() (#479)

bcgov · Feb 1, 2025 · f0b1465 · f0b1465
1 parent 1e0b643
commit f0b1465
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/client/wfprev-war/src/main/angular/src/app/services/util/can-deactive.guard.ts b/client/wfprev-war/src/main/angular/src/app/services/util/can-deactive.guard.ts
@@ -10,7 +10,14 @@ export interface CanComponentDeactivate {
   providedIn: 'root'
 })
 export class CanDeactivateGuard implements CanDeactivate<CanComponentDeactivate> {
-  canDeactivate(component: CanComponentDeactivate) {
-    return component?.canDeactivate ? component?.canDeactivate() : true;
+  canDeactivate(component: CanComponentDeactivate): Observable<boolean> | Promise<boolean> | boolean {
+    // If the component doesn't have canDeactivate, allow navigation
+    if (!component?.canDeactivate) {
+      return true;
+    }
+
+    // Call canDeactivate() and return its result, ensuring undefined/null are treated as true
+    return component.canDeactivate() ?? true;
   }
+
 }