Reverse routing & confirmation fix

Author: Gid733

eform-client/src/app/modules/cases/components/case-edit-confirmation/case-edit-confirmation.component.html

@@ -14,7 +14,7 @@ <h4>{{'If you leave before saving your changes will be lost'}}.</h4>
         <button class="btn btn-danger" (click)="confirmationClicked(false)">
           {{ 'Leave' | translate }}
         </button>
-        <button class="btn btn-accent text-black-50" (click)="frame.hide()">{{'Cancel' | translate}}</button>
+        <button class="btn btn-accent text-black-50" (click)="cancelExit()">{{'Cancel' | translate}}</button>
       </div>
     </div>
   </div>

eform-client/src/app/modules/cases/components/case-edit-confirmation/case-edit-confirmation.component.ts

@@ -25,4 +25,8 @@ export class CaseEditConfirmationComponent implements OnInit {
     this.frame.hide();
   }
 
+  cancelExit() {
+    this.frame.hide();
+    this.navigateAwaySelection$.next(false);
+  }
 }

eform-client/src/app/modules/cases/components/case-edit/case-edit.component.ts

@@ -81,11 +81,7 @@ export class CaseEditComponent implements OnInit, OnDestroy {
         this.spinnerStatus = false;
         this.isNoSaveExitAllowed = true;
         if (this.isSaveClicked) {
-          if (!this.reverseRoute) {
-            this.router.navigate(['/cases/', this.currentTemplate.id]).then();
-          } else {
-            this.router.navigate([this.reverseRoute]);
-          }
+          this.navigateToReverse();
         }
       }
       this.spinnerStatus = false;
@@ -115,11 +111,20 @@ export class CaseEditComponent implements OnInit, OnDestroy {
       this.saveCase();
     } else {
       this.isNoSaveExitAllowed = true;
-      this.router.navigate([this.reverseRoute]).then();
+      this.navigateToReverse();
+    }
+  }
+
+  navigateToReverse() {
+    if (!this.reverseRoute) {
+      this.router.navigate(['/cases/', this.currentTemplate.id]).then();
+    } else {
+      this.router.navigate([this.reverseRoute]);
     }
   }
 
   canDeactivate(): Observable<boolean> | boolean {
+    debugger;
     if (!this.isNoSaveExitAllowed) {
       this.caseConfirmation.show();
       return this.caseConfirmation.navigateAwaySelection$;