@hmcts/ccd-case-ui-toolkit 7.2.54-3455-rc1 → 7.2.54-3455-rc2

package/fesm2022/hmcts-ccd-case-ui-toolkit.mjs

@@ -11,7 +11,7 @@ import { NG_VALUE_ACCESSOR, NG_VALIDATORS, FormArray, FormGroup, FormControl, Va
 import { BehaviorSubject, throwError, Subject, EMPTY, Observable, skip, of, combineLatest, timer, forkJoin, fromEvent, Subscription } from 'rxjs';
 import * as i1$2 from '@angular/common/http';
 import { HttpErrorResponse, HttpHeaders, HttpParams } from '@angular/common/http';
-import { distinctUntilChanged, catchError, map, publish, refCount, switchMap, debounceTime, take, delay, finalize, timeout, mergeMap, retryWhen, tap, delayWhen, publishReplay, first, filter, takeUntil } from 'rxjs/operators';
+import { distinctUntilChanged, catchError, map, publish, refCount, switchMap, debounceTime, take, delay, finalize, timeout, mergeMap, retryWhen, tap, delayWhen, publishReplay, first, takeUntil, filter } from 'rxjs/operators';
 import { polling } from 'rx-polling-hmcts';
 import { Type, Exclude, Expose, plainToClassFromExist, plainToClass } from 'class-transformer';
 import moment from 'moment';
@@ -9252,9 +9252,6 @@ class CaseEditComponent {
     error;
     callbackErrorsSubject = new Subject();
     validPageList = [];
-    pageRefreshAcknowledged = false;
-    backButtonDuringRefresh = false;
-    backSubscription;
     constructor(fb, caseNotifier, router, route, fieldsUtils, fieldsPurger, registrarService, wizardFactory, sessionStorageService, windowsService, formValueService, formErrorService, loadingService, validPageListCaseFieldsService, workAllocationService, alertService, abstractConfig, cookieService) {
         this.fb = fb;
         this.caseNotifier = caseNotifier;
@@ -9279,9 +9276,7 @@ class CaseEditComponent {
         this.wizard = this.wizardFactory.create(this.eventTrigger);
         this.initialUrl = this.sessionStorageService.getItem('eventUrl');
         this.isPageRefreshed = JSON.parse(this.sessionStorageService.getItem('isPageRefreshed'));
-        // check whether user selected back button instead of ok button on the browser alert on page refresh
-        this.monitorBackButtonDuringRefresh();
-        void this.checkPageRefresh();
+        this.checkPageRefresh();
         this.form = this.fb.group({
             data: new FormGroup({}),
             event: this.fb.group({
@@ -9299,36 +9294,12 @@ class CaseEditComponent {
         if (this.callbackErrorsSubject) {
             this.callbackErrorsSubject.unsubscribe();
         }
-        this.backSubscription?.unsubscribe();
     }
-    monitorBackButtonDuringRefresh() {
-        if (!this.router?.events) {
-            return;
-        }
-        this.backSubscription = this.router.events
-            .pipe(filter(e => e instanceof NavigationStart && e.navigationTrigger === 'popstate'))
-            .subscribe(() => {
-            if (this.isPageRefreshed && !this.pageRefreshAcknowledged) {
-                this.backButtonDuringRefresh = true;
-            }
-        });
-    }
-    async checkPageRefresh() {
-        const targetUrl = this.initialUrl; // keep before removal
-        this.pageRefreshAcknowledged = false;
+    checkPageRefresh() {
         if (this.isPageRefreshed && this.initialUrl) {
             this.sessionStorageService.removeItem('eventUrl');
-            // Optional: prevent user from navigating back before OK
-            const blockPopstate = (ev) => {
-                // force forward to target
-                this.router.navigateByUrl(targetUrl, { replaceUrl: true });
-            };
-            window.addEventListener('popstate', blockPopstate, { once: true });
-            await this.windowsService.alert(CaseEditComponent.ALERT_MESSAGE);
-            this.pageRefreshAcknowledged = true;
-            this.backButtonDuringRefresh = false;
-            await this.router.navigateByUrl(targetUrl, { replaceUrl: true });
-            window.removeEventListener('popstate', blockPopstate);
+            this.windowsService.alert(CaseEditComponent.ALERT_MESSAGE);
+            this.router.navigate([this.initialUrl], { relativeTo: this.route });
             return true;
         }
         // if the url contains /submit there is the potential that the user has gone straight to the submit page
@@ -9336,9 +9307,10 @@ class CaseEditComponent {
         if (this.router.url.indexOf('/submit') !== -1 && !this.initialUrl) {
             // we only want to check if the user has done this if there is a multi-page journey
             if (this.eventTrigger.wizard_pages && this.eventTrigger.wizard_pages.length > 0) {
+                console.log('User has navigated to the end of an event journey directly, reset their journey');
                 const firstPage = this.eventTrigger.wizard_pages.reduce((min, page) => page.order < min.order ? page : min, this.eventTrigger.wizard_pages[0]);
-                await this.windowsService.alert(CaseEditComponent.ALERT_MESSAGE);
-                await this.router.navigate([firstPage ? firstPage.id : 'submit'], { relativeTo: this.route });
+                this.windowsService.alert(CaseEditComponent.ALERT_MESSAGE);
+                this.router.navigate([firstPage ? firstPage.id : 'submit'], { relativeTo: this.route });
             }
         }
         return false;
@@ -9432,7 +9404,7 @@ class CaseEditComponent {
         }
         const eventId = this.getEventId(form);
         const caseId = this.getCaseId(caseDetails);
-        const userId = userInfo?.id ? userInfo?.id : userInfo?.uid;
+        const userId = userInfo.id ? userInfo.id : userInfo.uid;
         const eventDetails = { eventId, caseId, userId, assignNeeded };
         if (this.taskExistsForThisEvent(taskInSessionStorage, taskEventCompletionInfo, eventDetails)) {
             this.abstractConfig.logMessage(`task exist for this event for caseId and eventId as ${caseId} ${eventId}`);