From b774db583c1eab0d83146e4f6cf6f08ee3361457 Mon Sep 17 00:00:00 2001
From: fe-dev <Dgerik2015@gmail.com>
Date: Thu, 31 Mar 2022 16:24:11 +0300
Subject: [PATCH 1/2] Fixed double time dialog with redirect

---
 ui-ngx/src/app/core/guards/confirm-on-exit.guard.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/core/guards/confirm-on-exit.guard.ts b/ui-ngx/src/app/core/guards/confirm-on-exit.guard.ts
index e9ce449b1f..9acc7f32b0 100644
--- a/ui-ngx/src/app/core/guards/confirm-on-exit.guard.ts
+++ b/ui-ngx/src/app/core/guards/confirm-on-exit.guard.ts
@@ -21,7 +21,7 @@ import { select, Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { AuthState } from '@core/auth/auth.models';
 import { selectAuth } from '@core/auth/auth.selectors';
-import { take } from 'rxjs/operators';
+import { map, take } from 'rxjs/operators';
 import { DialogService } from '@core/services/dialog.service';
 import { TranslateService } from '@ngx-translate/core';
 import { isDefined } from '../utils';
@@ -69,6 +69,13 @@ export class ConfirmOnExitGuard implements CanDeactivate<HasConfirmForm & HasDir
         return this.dialogService.confirm(
           this.translate.instant('confirm-on-exit.title'),
           this.translate.instant('confirm-on-exit.html-message')
+        ).pipe(
+          map((dialogResult) => {
+            if (dialogResult) {
+              component.confirmForm().markAsPristine();
+            }
+            return dialogResult;
+          })
         );
       }
     }

From 53e1654651589c9b9bed9a1b7f605dd5e277ad45 Mon Sep 17 00:00:00 2001
From: fe-dev <Dgerik2015@gmail.com>
Date: Thu, 31 Mar 2022 19:49:41 +0300
Subject: [PATCH 2/2] Fixed double time dialog with redirect

---
 ui-ngx/src/app/core/guards/confirm-on-exit.guard.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/core/guards/confirm-on-exit.guard.ts b/ui-ngx/src/app/core/guards/confirm-on-exit.guard.ts
index 9acc7f32b0..a2f70ca7bd 100644
--- a/ui-ngx/src/app/core/guards/confirm-on-exit.guard.ts
+++ b/ui-ngx/src/app/core/guards/confirm-on-exit.guard.ts
@@ -72,7 +72,11 @@ export class ConfirmOnExitGuard implements CanDeactivate<HasConfirmForm & HasDir
         ).pipe(
           map((dialogResult) => {
             if (dialogResult) {
-              component.confirmForm().markAsPristine();
+              if (component.confirmForm && component.confirmForm()) {
+                component.confirmForm().markAsPristine();
+              } else {
+                component.isDirty = false;
+              }
             }
             return dialogResult;
           })