diff --git a/web/src/app/shared/components/master-and-detail/master-and-detail.component.ts b/web/src/app/shared/components/master-and-detail/master-and-detail.component.ts index b387c5eae..4791751af 100644 --- a/web/src/app/shared/components/master-and-detail/master-and-detail.component.ts +++ b/web/src/app/shared/components/master-and-detail/master-and-detail.component.ts @@ -33,7 +33,7 @@ export class MasterAndDetailComponent implements OnInit { } backClicked(): void { - this.router.navigate(['../'], { relativeTo: this.route }); + this.router.navigate(['../'], { relativeTo: this.route, queryParamsHandling: 'merge' }); } private showDetails(event?: RouterEvent): boolean { diff --git a/web/src/app/shared/components/sidenav-list/sidenav-list.component.spec.ts b/web/src/app/shared/components/sidenav-list/sidenav-list.component.spec.ts index 3b40ceec9..6a8ecc960 100644 --- a/web/src/app/shared/components/sidenav-list/sidenav-list.component.spec.ts +++ b/web/src/app/shared/components/sidenav-list/sidenav-list.component.spec.ts @@ -75,7 +75,7 @@ describe('SidenavListComponent', () => { component.historyAccess = true; fixture.detectChanges(); const menuList = debugElement.queryAll(By.css('.navlist__item')); - expect(menuList.length).toBe(7); + expect(menuList.length).toBe(9); fixture.detectChanges(); }); diff --git a/web/src/app/workplace/components/task-list/task-list.component.ts b/web/src/app/workplace/components/task-list/task-list.component.ts index b2e41b163..b22a701c5 100644 --- a/web/src/app/workplace/components/task-list/task-list.component.ts +++ b/web/src/app/workplace/components/task-list/task-list.component.ts @@ -24,6 +24,9 @@ export class TaskListComponent implements OnInit { selectTask(taskId: string) { this.selectedId = taskId; this.selectedIdChange.emit(taskId); - this.router.navigate([{ outlets: { detail: `taskdetail/${this.selectedId}` } }], { relativeTo: this.route }); + this.router.navigate([{ outlets: { detail: `taskdetail/${this.selectedId}` } }], { + relativeTo: this.route, + queryParamsHandling: 'merge' + }); } } diff --git a/web/src/app/workplace/components/task/task.component.ts b/web/src/app/workplace/components/task/task.component.ts index 9696c6de1..7fbf6a37d 100644 --- a/web/src/app/workplace/components/task/task.component.ts +++ b/web/src/app/workplace/components/task/task.component.ts @@ -112,7 +112,8 @@ export class TaskComponent implements OnInit, OnDestroy { navigateBack() { this.router.navigate([{ outlets: { detail: `taskdetail/${this.task.taskId}` } }], { - relativeTo: this.route.parent + relativeTo: this.route.parent, + queryParamsHandling: 'merge' }); } diff --git a/web/src/app/workplace/components/taskdetails/taskdetails.component.ts b/web/src/app/workplace/components/taskdetails/taskdetails.component.ts index f975ccf4e..226feec95 100644 --- a/web/src/app/workplace/components/taskdetails/taskdetails.component.ts +++ b/web/src/app/workplace/components/taskdetails/taskdetails.component.ts @@ -53,7 +53,7 @@ export class TaskdetailsComponent implements OnInit, OnDestroy { this.currentId = params.id; // redirect if user enters through a deep-link if (!this.currentWorkbasket && this.currentId === 'new-task') { - this.router.navigate(['']); + this.router.navigate([''], { queryParamsHandling: 'merge' }); } this.getTask(); }); @@ -99,7 +99,10 @@ export class TaskdetailsComponent implements OnInit, OnDestroy { } openTask() { - this.router.navigate([{ outlets: { detail: `task/${this.currentId}` } }], { relativeTo: this.route.parent }); + this.router.navigate([{ outlets: { detail: `task/${this.currentId}` } }], { + relativeTo: this.route.parent, + queryParamsHandling: 'merge' + }); } workOnTaskDisabled(): boolean { @@ -118,7 +121,7 @@ export class TaskdetailsComponent implements OnInit, OnDestroy { () => { this.taskService.publishTaskDeletion(); this.task = null; - this.router.navigate(['taskana/workplace/tasks']); + this.router.navigate(['taskana/workplace/tasks'], { queryParamsHandling: 'merge' }); }, (error) => { this.notificationService.triggerError(NOTIFICATION_TYPES.DELETE_ERR_2, error); @@ -133,7 +136,7 @@ export class TaskdetailsComponent implements OnInit, OnDestroy { backClicked(): void { delete this.task; this.taskService.selectTask(this.task); - this.router.navigate(['./'], { relativeTo: this.route.parent }); + this.router.navigate(['./'], { relativeTo: this.route.parent, queryParamsHandling: 'merge' }); } ngOnDestroy(): void { @@ -188,7 +191,7 @@ export class TaskdetailsComponent implements OnInit, OnDestroy { this.task = task; this.taskService.selectTask(this.task); this.taskService.publishUpdatedTask(task); - this.router.navigate([`../${task.taskId}`], { relativeTo: this.route }); + this.router.navigate([`../${task.taskId}`], { relativeTo: this.route, queryParamsHandling: 'merge' }); }, () => { this.requestInProgressService.setRequestInProgress(false);