TSK-1804: Workbasket list now resets to page 1 when filtering

web/src/app/administration/components/workbasket-list/workbasket-list.component.html

@@ -61,5 +61,6 @@
         [type]="type"
         [expanded]="expanded"
         [numberOfItems]="(workbasketsSummary$ | async)?.length"
+        [resetPaging]="resetPagingSubject.asObservable()"
         (changePage)="changePage($event)">
 </taskana-shared-pagination>

web/src/app/administration/components/workbasket-list/workbasket-list.component.ts

@@ -4,7 +4,6 @@ import { Observable, Subject } from 'rxjs';
 import { WorkbasketSummaryRepresentation } from 'app/shared/models/workbasket-summary-representation';
 import { WorkbasketSummary } from 'app/shared/models/workbasket-summary';
 import { Direction, Sorting, WorkbasketQuerySortParameter } from 'app/shared/models/sorting';
-import { Orientation } from 'app/shared/models/orientation';
 
 import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
 import { OrientationService } from 'app/shared/services/orientation/orientation.service';
@@ -46,26 +45,21 @@ export class WorkbasketListComponent implements OnInit, OnDestroy {
   requestInProgress: boolean;
   requestInProgressLocal = false;
 
+  resetPagingSubject = new Subject<null>();
+
   @Input() expanded: boolean;
-
-  @ViewChild('wbToolbar', { static: true })
-  private toolbarElement: ElementRef;
-
   @Select(WorkbasketSelectors.workbasketsSummary)
   workbasketsSummary$: Observable<WorkbasketSummary[]>;
-
   @Select(WorkbasketSelectors.workbasketsSummaryRepresentation)
   workbasketsSummaryRepresentation$: Observable<WorkbasketSummaryRepresentation>;
-
   @Select(WorkbasketSelectors.selectedWorkbasket)
   selectedWorkbasket$: Observable<Workbasket>;
-
   @Select(FilterSelectors.getWorkbasketListFilter)
   getWorkbasketListFilter$: Observable<WorkbasketQueryFilterParameter>;
-
   destroy$ = new Subject<void>();
-
   @ViewChild('workbasket') workbasketList: MatSelectionList;
+  @ViewChild('wbToolbar', { static: true })
+  private toolbarElement: ElementRef;
 
   constructor(
     private store: Store,
@@ -99,21 +93,21 @@ export class WorkbasketListComponent implements OnInit, OnDestroy {
     this.workbasketService
       .workbasketSavedTriggered()
       .pipe(takeUntil(this.destroy$))
-      .subscribe((value) => {
+      .subscribe(() => {
         this.performRequest();
       });
 
     this.orientationService
       .getOrientation()
       .pipe(takeUntil(this.destroy$))
-      .subscribe((orientation: Orientation) => {
+      .subscribe(() => {
         this.refreshWorkbasketList();
       });
 
     this.importExportService
       .getImportingFinished()
       .pipe(takeUntil(this.destroy$))
-      .subscribe((value: Boolean) => {
+      .subscribe(() => {
         this.refreshWorkbasketList();
       });
 
@@ -128,7 +122,7 @@ export class WorkbasketListComponent implements OnInit, OnDestroy {
     this.workbasketService
       .getWorkbasketActionToolbarExpansion()
       .pipe(takeUntil(this.destroy$))
-      .subscribe((value) => {
+      .subscribe(() => {
         this.requestInProgressService.setRequestInProgress(true);
         setTimeout(() => {
           this.refreshWorkbasketList();
@@ -169,7 +163,8 @@ export class WorkbasketListComponent implements OnInit, OnDestroy {
     const domain = this.filterBy.domain;
     this.filterBy = { ...filterBy };
     this.filterBy.domain = domain;
-    this.performRequest();
+    this.resetPagingSubject.next(null);
+    // this.performRequest();
   }
 
   changePage(page) {

web/src/app/shared/components/pagination/pagination.component.ts

@@ -11,6 +11,8 @@ import {
 } from '@angular/core';
 import { Page } from 'app/shared/models/page';
 import { MatPaginator } from '@angular/material/paginator';
+import { Observable, Subject } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
 
 @Component({
   selector: 'taskana-shared-pagination',
@@ -30,6 +32,9 @@ export class PaginationComponent implements OnInit, OnChanges {
   @Input()
   expanded: boolean = true;
 
+  @Input()
+  resetPaging: Observable<null>;
+
   @Output()
   changePage = new EventEmitter<number>();
 
@@ -38,6 +43,8 @@ export class PaginationComponent implements OnInit, OnChanges {
 
   @ViewChild('pagination') paginationWrapper: ElementRef;
 
+  destroy$ = new Subject<void>();
+
   hasItems = true;
   pageSelected = 1;
   pageNumbers: number[];
@@ -45,6 +52,7 @@ export class PaginationComponent implements OnInit, OnChanges {
 
   ngOnInit() {
     this.changeLabel();
+    if (this.resetPaging) this.resetPaging.pipe(takeUntil(this.destroy$)).subscribe(() => this.goToPage(1));
   }
 
   ngOnChanges(changes: SimpleChanges): void {
@@ -123,4 +131,9 @@ export class PaginationComponent implements OnInit, OnChanges {
     input.focus();
     input.select();
   }
+
+  ngOnDestroy() {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
 }