Add fix for search field not working on back button click (#1291)

valtimo-platform · Nov 27, 2024 · bca8d5e · bca8d5e
1 parent facbfb3
commit bca8d5e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 25 deletions.
diff --git a/projects/valtimo/dossier/src/lib/components/dossier-detail/dossier-detail.component.ts b/projects/valtimo/dossier/src/lib/components/dossier-detail/dossier-detail.component.ts
@@ -66,6 +66,7 @@ import {
   switchMap,
   take,
   tap,
+  Subscription,
 } from 'rxjs';
 import {
   DOSSIER_DETAIL_DEFAULT_DISPLAY_SIZE,
@@ -275,7 +276,7 @@ export class DossierDetailComponent
   private _pendingTab: TabImpl;
   private _observer!: ResizeObserver;
   private _tabsInit = false;
-  private _prevQueryParams: Params | undefined | null;
+  private readonly _subscriptions = new Subscription();
 
   constructor(
     private readonly breadcrumbService: BreadcrumbService,
@@ -314,13 +315,14 @@ export class DossierDetailComponent
     this.pageTitleService.disableReset();
     this.iconService.registerAll([ChevronDown16]);
     this.setDocumentStyle();
-    this.handleBackNavigation();
+    this.enableResetOnBackNavigation();
   }
 
   public ngOnDestroy(): void {
     this.breadcrumbService.clearSecondBreadcrumb();
     this.pageTitleService.enableReset();
     this.removeDocumentStyle();
+    this._subscriptions.unsubscribe();
   }
 
   public getAllAssociatedProcessDefinitions(): void {
@@ -580,25 +582,18 @@ export class DossierDetailComponent
     this.renderer.removeClass(this.htmlDocument.getElementsByTagName('html')[0], 'html--fixed');
   }
 
-  private handleBackNavigation(): void {
-    this._prevQueryParams =
-      this.router.lastSuccessfulNavigation?.previousNavigation?.extras.queryParams;
-
-    this.router.events
-      .pipe(
-        filter(event => event instanceof NavigationStart && event.navigationTrigger === 'popstate'),
-        take(1)
-      )
-      .subscribe(() => {
-        this.pageTitleService.enableReset();
-
-        if (!this._prevQueryParams) return;
-
-        this.router.navigate([`dossiers/${this.documentDefinitionName}`], {
-          queryParams: this._prevQueryParams,
-          replaceUrl: true,
-        });
-      });
+  private enableResetOnBackNavigation(): void {
+    this._subscriptions.add(
+      this.router.events
+        .pipe(
+          filter(
+            event => event instanceof NavigationStart && event.navigationTrigger === 'popstate'
+          )
+        )
+        .subscribe(() => {
+          this.pageTitleService.enableReset();
+        })
+    );
   }
 
   private handleNoTaskProcessLink(isAdmin: boolean): void {

diff --git a/projects/valtimo/dossier/src/lib/components/dossier-list/dossier-list.component.ts b/projects/valtimo/dossier/src/lib/components/dossier-list/dossier-list.component.ts
@@ -504,9 +504,7 @@ export class DossierListComponent implements OnInit, OnDestroy {
         `/dossiers/${documentDefinitionName}`,
         this.route.snapshot.queryParams
       );
-      this.router.navigate([`/dossiers/${documentDefinitionName}/document/${item.id}`], {
-        replaceUrl: true,
-      });
+      this.router.navigate([`/dossiers/${documentDefinitionName}/document/${item.id}`]);
     });
   }
 

diff --git a/projects/valtimo/dossier/src/lib/models/tabs.model.ts b/projects/valtimo/dossier/src/lib/models/tabs.model.ts
@@ -106,8 +106,8 @@ export class TabLoaderImpl implements TabLoader<TabImpl> {
         this._router.navigate([`${urlBeforeDocumentId}${currentDocumentId}/${nextTab.name}`], {
           ...(nextTab.name === 'documents' && {
             queryParams,
-            replaceUrl: true,
           }),
+          replaceUrl: true,
         });
       });
   }