TSK-647 - [UI] Add pagination or infite scrolling to distribution targets lists in order to avoid loading the whole workbasket list.

web/package.json

@@ -35,6 +35,7 @@
     "material-design-icons": "3.0.1",
     "ng2-charts": "1.6.0",
     "ngx-bootstrap": "3.0.1",
+    "ngx-infinite-scroll": "6.0.1",
     "node-sass": "4.9.2",
     "popper.js": "1.14.3",
     "rxjs": "6.2.2",

web/src/app/administration/administration.module.ts

@@ -6,6 +6,7 @@ import {AngularSvgIconModule} from 'angular-svg-icon';
 import {AlertModule, TypeaheadModule} from 'ngx-bootstrap';
 import {SharedModule} from 'app/shared/shared.module';
 import {AdministrationRoutingModule} from './administration-routing.module';
+import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 /**
  * Components
  */
@@ -39,7 +40,8 @@ const MODULES = [
   AlertModule,
   SharedModule,
   AdministrationRoutingModule,
-  TypeaheadModule
+  TypeaheadModule,
+  InfiniteScrollModule
 ];
 
 const DECLARATIONS = [

web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.html

@@ -12,10 +12,13 @@
 			<span *ngIf="!workbasket.workbasketId" class="badge warning"> {{badgeMessage}}</span>
 		</h4>
 	</div>
-	<div class="panel-body">
+	<div #panelBody class="panel-body">
-		<taskana-dual-list id="dual-list-Left" header="Available distribution targets" [(distributionTargets)]="distributionTargetsLeft"
+    <div class="dual-list list-left col-xs-12 col-md-5-6 container">
-		 [distributionTargetsSelected]="distributionTargetsSelected" (performDualListFilter)="performFilter($event)" [side]="side.LEFT"
+      <taskana-dual-list #dualListLeft id="dual-list-Left" header="Available distribution targets" [(distributionTargets)]="distributionTargetsLeft"
-		 [requestInProgress]="requestInProgressLeft" class="dual-list list-left col-xs-12 col-md-5-6 container"></taskana-dual-list>
+      [distributionTargetsSelected]="distributionTargetsSelected" (performDualListFilter)="performFilter($event)" (scrolling)="onScroll($event)" [side]="side.LEFT"
+      [requestInProgress]="requestInProgressLeft" [loadingItems]="loadingItems" [(allSelected)]="selectAllLeft"></taskana-dual-list>
+    </div>
+
 		<div class="hidden-xs hidden-sm col-md-1 list-arrows text-center button-margin-top">
 			<button (click)="moveDistributionTargets(side.LEFT)" [disabled]="requestInProgressLeft || requestInProgressRight"
 			 class="btn btn-default move-right" data-toggle="tooltip" title="Move to selected distribution targets">
@@ -36,8 +39,10 @@
 			 <span class="material-icons md-20 blue">expand_less</span>
 			</button>
     </div>
-		<taskana-dual-list id="dual-list-right" header="Selected distribution targets" [(distributionTargets)]="distributionTargetsRight"
+    <div class="dual-list list-right col-xs-12 col-md-5-6 container">
-		 [distributionTargetsSelected]="distributionTargetsSelected" (performDualListFilter)="performFilter($event)"
+      <taskana-dual-list #dualListRight id="dual-list-right" header="Selected distribution targets" [(distributionTargets)]="distributionTargetsRight"
-		 [requestInProgress]="requestInProgressRight" [side]="side.RIGHT" class="dual-list list-right col-xs-12 col-md-5-6 container"></taskana-dual-list>
+      [distributionTargetsSelected]="distributionTargetsSelected" (performDualListFilter)="performFilter($event)" [requestInProgress]="requestInProgressRight"
+      [side]="side.RIGHT" [(allSelected)]="selectAllRight"></taskana-dual-list>
+    </div>
 	</div>
 </div>

web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.spec.ts

@@ -22,6 +22,7 @@ import { DualListComponent } from './dual-list/dual-list.component';
 import { DistributionTargetsComponent, Side } from './distribution-targets.component';
 import { LinksWorkbasketSummary } from 'app/models/links-workbasket-summary';
 import { configureTests } from 'app/app.test.configuration';
+import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 
 describe('DistributionTargetsComponent', () => {
 	let component: DistributionTargetsComponent;
@@ -33,7 +34,7 @@ describe('DistributionTargetsComponent', () => {
 	beforeEach(done => {
 		const configure = (testBed: TestBed) => {
 			testBed.configureTestingModule({
-				imports: [AngularSvgIconModule, HttpClientModule],
+				imports: [AngularSvgIconModule, HttpClientModule, InfiniteScrollModule],
 				declarations: [DistributionTargetsComponent, DualListComponent],
 				providers: [WorkbasketService, AlertService, SavingWorkbasketService, ErrorModalService, RequestInProgressService,
 				]
@@ -72,10 +73,10 @@ describe('DistributionTargetsComponent', () => {
 		expect(component).toBeTruthy();
 	});
 
-
 	it('should clone distribution target selected on init', () => {
 		expect(component.distributionTargetsClone).toBeDefined();
   });
+
 	it('should clone distribution target left and distribution target right lists on init', () => {
 		expect(component.distributionTargetsLeft).toBeDefined();
 		expect(component.distributionTargetsRight).toBeDefined();
@@ -92,6 +93,7 @@ describe('DistributionTargetsComponent', () => {
 		})
 		expect(repeteadElemens).toBeFalsy();
   });
+
 	it('should filter left list and keep selected elements as selected', () => {
 		component.performFilter({ filterBy: new FilterModel({
       name: 'someName', owner: 'someOwner', description: 'someDescription', key: 'someKey'}), side: Side.LEFT });
@@ -103,6 +105,7 @@ describe('DistributionTargetsComponent', () => {
 		expect(component.distributionTargetsRight.length).toBe(1);
 		expect(component.distributionTargetsRight[0].workbasketId).toBe('id2');
   });
+
 	it('should reset distribution target and distribution target selected on reset', () => {
 		component.distributionTargetsLeft.push(
 			new WorkbasketSummary('id4', '', '', '', '', '', '', '', '', '', '', '', false, new Links({ 'href': 'someurl' })));

web/src/app/administration/workbasket/details/distribution-targets/distribution-targets.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input, OnDestroy, SimpleChanges, OnChanges } from '@angular/core';
+import { Component, Input, OnDestroy, SimpleChanges, OnChanges, ViewChild, ElementRef } from '@angular/core';
 import { Subscription } from 'rxjs';
 
 import { Workbasket } from 'app/models/workbasket';
@@ -14,6 +14,10 @@ import { AlertService } from 'app/services/alert/alert.service';
 import { SavingWorkbasketService, SavingInformation } from 'app/administration/services/saving-workbaskets/saving-workbaskets.service';
 import { ErrorModalService } from 'app/services/errorModal/error-modal.service';
 import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service';
+import { TaskanaQueryParameters } from 'app/shared/util/query-parameters';
+import { Page } from 'app/models/page';
+import { OrientationService } from 'app/services/orientation/orientation.service';
+import { Orientation } from 'app/models/orientation';
 
 export enum Side {
 	LEFT,
@@ -38,6 +42,7 @@ export class DistributionTargetsComponent implements OnChanges, OnDestroy {
 	workbasketSubscription: Subscription;
 	workbasketFilterSubscription: Subscription;
   savingDistributionTargetsSubscription: Subscription;
+  orientationSubscription: Subscription;
 
 	distributionTargetsSelectedResource: WorkbasketDistributionTargetsResource;
 	distributionTargetsLeft: Array<WorkbasketSummary>;
@@ -48,16 +53,25 @@ export class DistributionTargetsComponent implements OnChanges, OnDestroy {
 
 	requestInProgressLeft = false;
   requestInProgressRight = false;
+  loadingItems = false;
 	modalErrorMessage: string;
 	side = Side;
   private initialized = false;
+  page: Page;
+  cards: number;
+  selectAllLeft = false;
+  selectAllRight = false;
+
+  @ViewChild('panelBody')
+  private panelBody: ElementRef;
 
 	constructor(
 		private workbasketService: WorkbasketService,
 		private alertService: AlertService,
 		private savingWorkbaskets: SavingWorkbasketService,
 		private errorModalService: ErrorModalService,
-		private requestInProgressService: RequestInProgressService) { }
+    private requestInProgressService: RequestInProgressService,
+    private orientationService: OrientationService) { }
 
 	ngOnChanges(changes: SimpleChanges): void {
 		if (!this.initialized && changes.active && changes.active.currentValue === 'distributionTargets') {
@@ -67,52 +81,31 @@ export class DistributionTargetsComponent implements OnChanges, OnDestroy {
 			this.setBadge();
 		}
 	}
-
+  onScroll(side: Side) {
-	private init() {
+    if (side === this.side.LEFT && this.page.totalPages > TaskanaQueryParameters.page) {
-		this.initialized = true;
+      this.loadingItems = true;
-		this.onRequest(undefined);
+      this.getNextPage(side);
-		if (!this.workbasket._links.distributionTargets) {
-			return;
     }
-		this.distributionTargetsSubscription = this.workbasketService.getWorkBasketsDistributionTargets(
-			this.workbasket._links.distributionTargets.href).subscribe(
-				(distributionTargetsSelectedResource: WorkbasketDistributionTargetsResource) => {
-					this.distributionTargetsSelectedResource = distributionTargetsSelectedResource;
-					this.distributionTargetsSelected = distributionTargetsSelectedResource._embedded ?
-						distributionTargetsSelectedResource._embedded.distributionTargets : [];
-					this.distributionTargetsSelectedClone = Object.assign([], this.distributionTargetsSelected);
-					this.workbasketSubscription = this.workbasketService.getWorkBasketsSummary(true,
-						undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined,
-						undefined, undefined, undefined, true).subscribe(
-							(distributionTargetsAvailable: WorkbasketSummaryResource) => {
-								this.distributionTargetsLeft = Object.assign([], distributionTargetsAvailable._embedded.workbaskets);
-								this.distributionTargetsRight = Object.assign([], distributionTargetsAvailable._embedded.workbaskets);
-								this.distributionTargetsClone = Object.assign([], distributionTargetsAvailable._embedded.workbaskets);
-								this.onRequest(undefined, true);
-							});
-				});
-
-		this.savingDistributionTargetsSubscription = this.savingWorkbaskets.triggeredDistributionTargetsSaving()
-			.subscribe((savingInformation: SavingInformation) => {
-				if (this.action === ACTION.COPY) {
-					this.distributionTargetsSelectedResource._links.self.href = savingInformation.url;
-					this.onSave();
-				}
-			});
-
   }
 
 	moveDistributionTargets(side: number) {
 		if (side === Side.LEFT) {
+      const itemsLeft = this.distributionTargetsLeft.length;
+      const itemsRight = this.distributionTargetsRight.length;
 			const itemsSelected = this.getSelectedItems(this.distributionTargetsLeft, this.distributionTargetsRight)
 			this.distributionTargetsSelected = this.distributionTargetsSelected.concat(itemsSelected);
       this.distributionTargetsRight = this.distributionTargetsRight.concat(itemsSelected);
+      if (((itemsLeft - itemsSelected.length) <= TaskanaQueryParameters.pageSize) && ((itemsLeft + itemsRight) < this.page.totalElements)) {
+        this.getNextPage(side);
+      }
 		} else {
 			const itemsSelected = this.getSelectedItems(this.distributionTargetsRight, this.distributionTargetsLeft);
 			this.distributionTargetsSelected = this.removeSeletedItems(this.distributionTargetsSelected, itemsSelected);
 			this.distributionTargetsRight = this.removeSeletedItems(this.distributionTargetsRight, itemsSelected);
       this.distributionTargetsLeft = this.distributionTargetsLeft.concat(itemsSelected);
     }
+
+    this.uncheckSelectAll(side);
 	}
 
 	onSave() {
@@ -158,6 +151,90 @@ export class DistributionTargetsComponent implements OnChanges, OnDestroy {
 			});
   }
 
+  ngOnDestroy(): void {
+		if (this.distributionTargetsSubscription) { this.distributionTargetsSubscription.unsubscribe(); }
+		if (this.workbasketSubscription) { this.workbasketSubscription.unsubscribe(); }
+		if (this.workbasketFilterSubscription) { this.workbasketFilterSubscription.unsubscribe(); }
+    if (this.savingDistributionTargetsSubscription) { this.savingDistributionTargetsSubscription.unsubscribe(); }
+    if (this.orientationSubscription) { this.orientationSubscription.unsubscribe(); }
+	}
+
+  private init() {
+		this.onRequest(undefined);
+		if (!this.workbasket._links.distributionTargets) {
+			return;
+		}
+		this.distributionTargetsSubscription = this.workbasketService.getWorkBasketsDistributionTargets(
+			this.workbasket._links.distributionTargets.href).subscribe(
+				(distributionTargetsSelectedResource: WorkbasketDistributionTargetsResource) => {
+					this.distributionTargetsSelectedResource = distributionTargetsSelectedResource;
+					this.distributionTargetsSelected = distributionTargetsSelectedResource._embedded ?
+						distributionTargetsSelectedResource._embedded.distributionTargets : [];
+          this.distributionTargetsSelectedClone = Object.assign([], this.distributionTargetsSelected);
+          TaskanaQueryParameters.page = 1;
+          this.calculateNumberItemsList();
+          this.getWorkbaskets();
+				});
+
+		this.savingDistributionTargetsSubscription = this.savingWorkbaskets.triggeredDistributionTargetsSaving()
+			.subscribe((savingInformation: SavingInformation) => {
+				if (this.action === ACTION.COPY) {
+					this.distributionTargetsSelectedResource._links.self.href = savingInformation.url;
+					this.onSave();
+				}
+			});
+
+    this.orientationSubscription = this.orientationService.getOrientation().subscribe((orientation: Orientation) => {
+      this.calculateNumberItemsList();
+      this.getWorkbaskets();
+    });
+  }
+
+  private calculateNumberItemsList() {
+    if (this.panelBody) {
+      const cardHeight = 72;
+      this.cards = this.orientationService.calculateNumberItemsList(this.panelBody.nativeElement.offsetHeight, cardHeight, 100, true) + 1;
+    }
+  }
+
+  private getNextPage(side: Side) {
+    TaskanaQueryParameters.page = TaskanaQueryParameters.page + 1;
+    this.getWorkbaskets(side);
+  }
+
+  private getWorkbaskets(side?: Side) {
+    if (!this.distributionTargetsLeft) {
+      this.distributionTargetsLeft = [];
+    }
+    if (!this.distributionTargetsRight) {
+      this.distributionTargetsRight = [];
+    }
+    if (this.distributionTargetsSelected && !this.initialized) {
+      this.initialized = true;
+      TaskanaQueryParameters.pageSize = this.cards + this.distributionTargetsSelected.length;
+    }
+
+    this.workbasketSubscription = this.workbasketService.getWorkBasketsSummary(true,
+      undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined,
+      undefined, undefined, undefined, false).subscribe(
+        (distributionTargetsAvailable: WorkbasketSummaryResource) => {
+          if (TaskanaQueryParameters.page === 1) {
+            this.distributionTargetsLeft = [];
+            this.page = distributionTargetsAvailable.page;
+          }
+          if (side === this.side.LEFT) {
+            this.distributionTargetsLeft.push(...distributionTargetsAvailable._embedded.workbaskets);
+          } else if (side === this.side.RIGHT) {
+            this.distributionTargetsRight = Object.assign([], distributionTargetsAvailable._embedded.workbaskets);
+          } else {
+            this.distributionTargetsLeft.push(...distributionTargetsAvailable._embedded.workbaskets);
+            this.distributionTargetsRight = Object.assign([], distributionTargetsAvailable._embedded.workbaskets);
+            this.distributionTargetsClone = Object.assign([], distributionTargetsAvailable._embedded.workbaskets);
+          }
+          this.onRequest(undefined, true);
+        });
+  }
+
 	private setBadge() {
 		if (this.action === ACTION.COPY) {
 			this.badgeMessage = `Copying workbasket: ${this.workbasket.key}`;
@@ -178,6 +255,9 @@ export class DistributionTargetsComponent implements OnChanges, OnDestroy {
 	}
 
 	private onRequest(side: Side = undefined, finished: boolean = false) {
+    if (this.loadingItems) {
+      this.loadingItems = false;
+    }
 		if (finished) {
 			side === undefined ? (this.requestInProgressLeft = false, this.requestInProgressRight = false) :
 				side === Side.LEFT ? this.requestInProgressLeft = false : this.requestInProgressRight = false;
@@ -195,13 +275,8 @@ export class DistributionTargetsComponent implements OnChanges, OnDestroy {
 		return distributionTargetsSelelected;
   }
 
-	ngOnDestroy(): void {
+  private uncheckSelectAll(side: number) {
-		if (this.distributionTargetsSubscription) { this.distributionTargetsSubscription.unsubscribe(); }
+    if (side === Side.LEFT && this.selectAllLeft) { this.selectAllLeft = false; }
-		if (this.workbasketSubscription) { this.workbasketSubscription.unsubscribe(); }
+    if (side === Side.RIGHT && this.selectAllRight) { this.selectAllRight = false; }
-		if (this.workbasketFilterSubscription) { this.workbasketFilterSubscription.unsubscribe(); }
-		if (this.savingDistributionTargetsSubscription) { this.savingDistributionTargetsSubscription.unsubscribe(); }
-
   }
-
 }
-

web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.html

@@ -1,25 +1,25 @@
 <div id="dual-list-Left" class="dual-list list-left col-xs-12 col-md-5-6 container">
-	<div class="row">
+	<div class="row header">
 		<div class="col-xs-2">
-			<button (click)="toggleDtl = !toggleDtl; selectAll(toggleDtl);" class="btn btn-default no-style" title="Toggle select all">
+			<button (click)="allSelected = !allSelected; selectAll(allSelected);" class="btn btn-default btn-sm no-style" title="Select all">
-				<span class="material-icons md-20 blue ">{{toggleDtl ? 'check_box': 'check_box_outline_blank'}}</span>
+				<span class="material-icons md-20 blue ">{{allSelected ? 'check_box': 'check_box_outline_blank'}}</span>
 			</button>
 		</div>
 		<div class="col-xs-7">
 			<h5>{{header}}</h5>
 		</div>
 		<div class="pull-right">
-			<button class="btn btn-default" type="button" id="collapsedMenufilterWb" aria-expanded="false" (click)="toolbarState=!toolbarState"
+			<button class="btn btn-default btn-sm" type="button" id="collapsedMenufilterWb" aria-expanded="false" (click)="changeToolbarState(!toolbarState)"
 			 data-toggle="tooltip" title="Filter">
 				<span class="material-icons md-20 blue ">{{!toolbarState? 'search' : 'expand_less'}}</span>
 			</button>
 		</div>
 	</div>
-	<div [@toggleDown]="toolbarState" class="row">
+	<div [@toggleDown]="toolbarState">
-		<taskana-filter class="col-xs-12" (performFilter)="performAvailableFilter($event)"></taskana-filter>
+		<taskana-filter (performFilter)="performAvailableFilter($event)"></taskana-filter>
 	</div>
 	<taskana-spinner [isRunning]="requestInProgress" positionClass="centered-spinner" class="floating"></taskana-spinner>
-	<div>
+  <div infiniteScroll [infiniteScrollDistance]="1" [infiniteScrollThrottle]="50" (scrolled)="onScroll()" [scrollWindow]="false" class="infinite-scroll">
 		<ul class="list-group">
 			<li class="list-group-item" *ngFor="let distributionTarget of distributionTargets | selectWorkbaskets: distributionTargetsSelected: side"
 			 [class.selected]="distributionTarget.selected" type="text" (click)="distributionTarget.selected = !distributionTarget.selected">
@@ -35,6 +35,9 @@
 						<dd>{{distributionTarget.owner}} &nbsp;</dd>
 					</dl>
 				</div>
+      </li>
+      <li class="list-group-item" *ngIf="loadingItems">
+        <taskana-spinner [isRunning]="loadingItems" positionClass="centered-spinner" class="floating"></taskana-spinner>
       </li>
 		</ul>
 	</div>

web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.scss

@@ -8,14 +8,14 @@ $selected-item: #e3f3f5;
     -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
     box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
     & .row {
-        padding: 3px 0px 0px 3px;
+        padding: 0px 0px 0px 3px;
     }
     & .row:first {
         border-top: 1px solid #ddd;
     }
 
     & div.pull-right {
-        margin-right: 18px;
+        margin-right: 17px;
     }
 
     & >.list-group {
@@ -29,13 +29,28 @@ $selected-item: #e3f3f5;
     }
 
     overflow-x: hidden;
-    overflow-y: auto;
+    overflow-y: hidden;
 
     @media screen and (max-width: 991px){
-        max-height: 33vh;   
+      height: calc((100vh - 241px) / 2);
+      min-height: 120px;
+      margin-bottom: 0;
     }
-    max-height: 75vh;
+    max-height: calc(100vh - 194px);
+    margin-bottom: 2px;
+}
 
+.infinite-scroll {
+  overflow-y: scroll;
+  height: calc(100vh - 233px);
+  @media screen and (max-width: 991px){
+    height: calc((100vh - 315px) / 2);
+    min-height: 83px;
+  }
+}
+
+.header {
+  margin: 2px -15px 1px -15px;
 }
 
 .list-group {
@@ -96,4 +111,3 @@ li.list-group-item:hover, {
     text-decoration: none;
     background-color: #f5f5f5;
 }
-

web/src/app/administration/workbasket/details/distribution-targets/dual-list/dual-list.component.ts

@@ -13,19 +13,19 @@ import { expandDown } from 'app/shared/animations/expand.animation';
 export class DualListComponent implements OnInit {
 
 	@Input() distributionTargets: Array<WorkbasketSummary>;
-	@Output() distributionTargetsChange = new EventEmitter<Array<WorkbasketSummary>>();
 	@Input() distributionTargetsSelected: Array<WorkbasketSummary>;
 	@Output() performDualListFilter = new EventEmitter<{ filterBy: FilterModel, side: Side }>();
   @Input() requestInProgress = false;
+  @Input() loadingItems ? = false;
 	@Input() side: Side;
   @Input() header: string;
+  @Output() scrolling = new EventEmitter<Side>();
+  @Input() allSelected;
+  @Output() allSelectedChange = new EventEmitter<boolean>();
 
 	sideNumber = 0;
-	toggleDtl = false;
   toolbarState = false;
 
-	constructor() { }
-
 	ngOnInit() {
     this.sideNumber = this.side === Side.LEFT ? 0 : 1;
 	}
@@ -34,9 +34,19 @@ export class DualListComponent implements OnInit {
 		this.distributionTargets.forEach((element: any) => {
 			element.selected = selected;
     });
+    this.allSelectedChange.emit(this.allSelected);
+  }
+
+  onScroll() {
+    this.scrolling.emit(this.side);
   }
 
 	performAvailableFilter(filterModel: FilterModel) {
     this.performDualListFilter.emit({ filterBy: filterModel, side: this.side });
   }
+
+  changeToolbarState(state: boolean) {
+    this.toolbarState = state;
+  }
+
 }

web/src/app/administration/workbasket/details/workbasket-details.component.spec.ts

@@ -30,6 +30,7 @@ import { WorkbasketInformationComponent } from './information/workbasket-informa
 import { AccessItemsComponent } from './access-items/access-items.component';
 import { DistributionTargetsComponent } from './distribution-targets/distribution-targets.component';
 import { DualListComponent } from './distribution-targets//dual-list/dual-list.component';
+import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 
 @Component({
 	selector: 'taskana-dummy-detail',
@@ -55,7 +56,8 @@ describe('WorkbasketDetailsComponent', () => {
 	beforeEach(done => {
 		const configure = (testBed: TestBed) => {
 			testBed.configureTestingModule({
-				imports: [RouterTestingModule.withRoutes(routes), FormsModule, AngularSvgIconModule, HttpClientModule, ReactiveFormsModule],
+        imports: [RouterTestingModule.withRoutes(routes), FormsModule, AngularSvgIconModule, HttpClientModule, ReactiveFormsModule,
+          InfiniteScrollModule],
 				declarations: [WorkbasketDetailsComponent, WorkbasketInformationComponent,
 					AccessItemsComponent,
 					DistributionTargetsComponent, DualListComponent, DummyDetailComponent],

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

@@ -37,4 +37,4 @@
   </ng-template>
 </div>
 <taskana-pagination [(page)]="workbasketsResource !== undefined ? workbasketsResource.page : workbasketsResource"
-  [type]="type" (changePage)="changePage($event)"></taskana-pagination>
+  [type]="type" [numberOfItems]="workbaskets.length" (changePage)="changePage($event)"></taskana-pagination>

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

@@ -27,6 +27,7 @@ export class WorkbasketListComponent implements OnInit, OnDestroy {
   pageSelected = 1;
   pageSize = 9;
   type = 'workbaskets';
+  cards: number = this.pageSize;
 
   sort: SortingModel = new SortingModel();
   filterBy: FilterModel = new FilterModel({name: '', owner: '', type: '', description: '', key: ''});
@@ -62,7 +63,7 @@ export class WorkbasketListComponent implements OnInit, OnDestroy {
     });
     this.orientationSubscription = this.orientationService.getOrientation().subscribe((orientation: Orientation) => {
       this.refreshWorkbasketList();
-    })
+    });
   }
 
   selectWorkbasket(id: string) {
@@ -86,16 +87,13 @@ export class WorkbasketListComponent implements OnInit, OnDestroy {
   }
 
   refreshWorkbasketList() {
-    const toolbarSize = this.toolbarElement.nativeElement.offsetHeight;
+    this.cards = this.orientationService.calculateNumberItemsList(
-    const cardHeight = 72;
+      window.innerHeight, 72, 170 + this.toolbarElement.nativeElement.offsetHeight, false);
-    const unusedHeight = 145;
-    const totalHeight = window.innerHeight;
-    const cards = Math.round((totalHeight - (unusedHeight + toolbarSize)) / cardHeight);
-    cards > 0 ? TaskanaQueryParameters.pageSize = cards : TaskanaQueryParameters.pageSize = 1;
     this.performRequest();
   }
 
   private performRequest(): void {
+    TaskanaQueryParameters.pageSize = this.cards;
     this.requestInProgress = true;
     this.workbaskets = [];
     this.workbasketServiceSubscription = this.workbasketService.getWorkBasketsSummary(

web/src/app/services/orientation/orientation.service.ts

@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Orientation } from 'app/models/orientation';
 import { BehaviorSubject ,  Observable } from 'rxjs';
+import { TaskanaQueryParameters } from 'app/shared/util/query-parameters';
 
 @Injectable()
 export class OrientationService {
@@ -33,6 +34,13 @@ export class OrientationService {
     }
   }
 
+  calculateNumberItemsList(heightContainer: number, cardHeight: number, unusedHeight: number, doubleList = false): number {
+    let cards = Math.round((heightContainer - unusedHeight) / cardHeight);
+    if (doubleList && window.innerWidth < 992) { cards = Math.floor(cards / 2); }
+    cards > 0 ? TaskanaQueryParameters.pageSize = cards : TaskanaQueryParameters.pageSize = 1;
+    return cards;
+  }
+
   private detectOrientation(): Orientation {
     if (window.innerHeight > window.innerWidth) {
       return Orientation.portrait;

web/src/app/shared/filter/filter.component.html

@@ -2,7 +2,7 @@
   <div *ngIf="filterTypeIsWorkbasket(); else tasktype">
     <div class="row">
       <div class="dropdown col-xs-2">
-        <button class="btn btn-default" data-toggle="dropdown" type="button" id="dropdownMenufilter" data-toggle="dropdown"
+        <button class="btn btn-default btn-sm" data-toggle="dropdown" type="button" id="dropdownMenufilter" data-toggle="dropdown"
           aria-haspopup="true" aria-expanded="true">
           <taskana-icon-type [type]="filter.filterParams?.type"></taskana-icon-type>
         </button>
@@ -16,30 +16,30 @@
         </ul>
       </div>
       <div class="col-xs-4">
-        <input type="text" [(ngModel)]="filter.filterParams.name" (keyup.enter)="search()" class="form-control" id="display-name-filter"
+        <input type="text" [(ngModel)]="filter.filterParams.name" (keyup.enter)="search()" class="form-control input-sm" id="display-name-filter"
           placeholder="Filter name">
       </div>
       <div class="col-xs-4">
-        <input type="text" [(ngModel)]="filter.filterParams.key" (keyup.enter)="search()" class="form-control" id="display-key-filter"
+        <input type="text" [(ngModel)]="filter.filterParams.key" (keyup.enter)="search()" class="form-control input-sm" id="display-key-filter"
           placeholder="Filter key">
       </div>
-      <button (click)="clear(); search()" type="button" class="btn btn-default pull-right margin-right"
+      <button (click)="clear(); search()" type="button" class="btn btn-default btn-sm pull-right margin-right"
         data-toggle="tooltip" title="Clear">
         <span class="material-icons md-20 blue">clear</span>
       </button>
     </div>
     <div class="row">
       <div class="col-xs-8 col-xs-offset-2">
-        <input type="text" [(ngModel)]="filter.filterParams.description" (keyup.enter)="search()" class="form-control"
+        <input type="text" [(ngModel)]="filter.filterParams.description" (keyup.enter)="search()" class="form-control input-sm"
           id="display-name-description" placeholder="Filter description">
       </div>
     </div>
     <div class="row">
       <div class="col-xs-8 col-xs-offset-2">
-        <input type="text" [(ngModel)]="filter.filterParams.owner" (keyup.enter)="search()" class="form-control" id="display-name-owner"
+        <input type="text" [(ngModel)]="filter.filterParams.owner" (keyup.enter)="search()" class="form-control input-sm" id="display-name-owner"
           placeholder="Filter owner">
       </div>
-      <button (click)="search()" type="button" class="btn btn-default pull-right margin-right" data-toggle="tooltip"
+      <button (click)="search()" type="button" class="btn btn-default btn-sm pull-right margin-right" data-toggle="tooltip"
         title="Search">
         <span class="material-icons md-20 blue ">search</span>
       </button>

web/src/app/shared/pagination/pagination.component.html

@@ -3,8 +3,7 @@
     <a (click)="changeToPage(1)" aria-label="First">
       First</a>
   </li>
-	<li *ngFor="let pageNumber of page?.totalPages |
+  <li *ngFor="let pageNumber of page?.totalPages | spreadNumber: page?.number: maxPagesAvailable">
-				spreadNumber:  page?.number: maxPagesAvailable:  page?.totalPages">
     <a *ngIf="pageNumber + 1 !== page?.number" (click)="changeToPage(pageNumber+1)">{{pageNumber + 1}}</a>
     <a *ngIf="pageNumber + 1 === page?.number" class="pagination">
       <input [(ngModel)]="pageSelected" (keyup.enter)="changeToPage(pageSelected)" type="text" (blur)="changeToPage(pageSelected)">

web/src/app/shared/pagination/pagination.component.scss

@@ -31,6 +31,6 @@ ul.pagination{
 }
 
 .footer{
-    margin: 5px 5px 0 0;
+    margin: 0 5px 0 0;
     color: $blue;
 }

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

@@ -97,19 +97,22 @@ describe('PaginationComponent', () => {
 	it('should getPagesTextToShow return 7 of 13 with size < totalElements', () => {
     component.page = new Page(7, 13, 3, 2);
     component.type = 'workbaskets';
-		expect(component.getPagesTextToShow()).toBe('7 of 13 workbaskets');
+    component.numberOfItems = 5;
+		expect(component.getPagesTextToShow()).toBe(component.numberOfItems.toString().concat(' of 13 workbaskets'));
 	});
 
 	it('should getPagesTextToShow return 6 of 6 with size > totalElements', () => {
     component.page = new Page(7, 6, 3, 2);
     component.type = 'tasks';
-		expect(component.getPagesTextToShow()).toBe('6 of 6 tasks');
+    component.numberOfItems = 6;
+		expect(component.getPagesTextToShow()).toBe(component.numberOfItems.toString().concat(' of 6 tasks'));
 	});
 
 	it('should getPagesTextToShow return  of  with totalElements = 0', () => {
     component.page = new Page(7, 0, 0, 0);
     component.type = 'workbaskets';
-		expect(component.getPagesTextToShow()).toBe('0 of 0 workbaskets');
+    component.numberOfItems = 0;
+		expect(component.getPagesTextToShow()).toBe(component.numberOfItems.toString().concat(' of 0 workbaskets'));
 	});
 
 });

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

@@ -14,7 +14,7 @@ import { Page } from 'app/models/page';
   templateUrl: './pagination.component.html',
   styleUrls: ['./pagination.component.scss']
 })
-export class PaginationComponent implements OnInit, OnChanges {
+export class PaginationComponent implements OnChanges {
   @Input()
   page: Page;
   @Input()
@@ -23,6 +23,8 @@ export class PaginationComponent implements OnInit, OnChanges {
   workbasketsResourceChange = new EventEmitter<Page>();
   @Output()
   changePage = new EventEmitter<number>();
+  @Input()
+  numberOfItems: number;
   previousPageSelected = 1;
   pageSelected = 1;
   maxPagesAvailable = 8;
@@ -30,13 +32,11 @@ export class PaginationComponent implements OnInit, OnChanges {
   constructor() {}
 
   ngOnChanges(changes: SimpleChanges): void {
-    if (changes.page.currentValue !== undefined) {
+    if (changes.page && changes.page.currentValue !== undefined) {
       this.pageSelected = changes.page.currentValue.number;
     }
   }
 
-  ngOnInit() {}
-
   changeToPage(page) {
     if (page < 1) {
       page = this.pageSelected = 1;
@@ -47,6 +47,8 @@ export class PaginationComponent implements OnInit, OnChanges {
     if (this.previousPageSelected !== page) {
       this.changePage.emit(page);
       this.previousPageSelected = page;
+      this.page.number = page;
+      this.pageSelected = page;
     }
   }
 
@@ -54,14 +56,7 @@ export class PaginationComponent implements OnInit, OnChanges {
     if (!this.page) {
       return '';
     }
-    let text = this.page.totalElements + '';
+    const text = this.numberOfItems + '';
-    if (
-      this.page &&
-      this.page.totalElements &&
-      this.page.totalElements >= this.page.size
-    ) {
-      text = this.page.size + '';
-    }
     return `${text} of ${this.page.totalElements} ${this.type}`;
   }
 }

web/src/app/shared/pipes/selectedWorkbasket/seleted-workbasket.pipe.ts

@@ -1,4 +1,5 @@
 import { Pipe, PipeTransform } from '@angular/core';
+import { TaskanaQueryParameters } from 'app/shared/util/query-parameters';
 
 @Pipe({ name: 'selectWorkbaskets' })
 export class SelectWorkBasketPipe implements PipeTransform {
@@ -18,6 +19,9 @@ export class SelectWorkBasketPipe implements PipeTransform {
                 originArray.splice(index, 1);
             }
         }
+        if (originArray.length > TaskanaQueryParameters.pageSize) {
+          originArray.slice(0, TaskanaQueryParameters.pageSize);
+        }
         returnArray = originArray;
         return returnArray;
     }

web/src/app/shared/pipes/spreadNumber/spread-number.ts

@@ -2,7 +2,7 @@ import { Pipe, PipeTransform } from '@angular/core';
 
 @Pipe({ name: 'spreadNumber' })
 export class SpreadNumberPipe implements PipeTransform {
-    transform(value: number, currentIndex: number, maxArrayElements: number, maxPageNumber: number): number[] {
+    transform(maxPageNumber: number, currentIndex: number, maxArrayElements: number): number[] {
         const returnArray = new Array();
         if (maxPageNumber <= 5) {
             for (let i = 0; i < maxPageNumber; i++) {

web/src/app/workplace/tasklist/tasklist.component.html

@@ -44,5 +44,5 @@
     </ng-template>
   </div>
 </div>
-<taskana-pagination *ngIf="tasks && tasks.length > 0" [(page)]="tasksPageInformation" [type]="type" (changePage)="changePage($event)"></taskana-pagination>
+<taskana-pagination [numberOfItems]="tasks.length" *ngIf="tasks && tasks.length > 0" [(page)]="tasksPageInformation" [type]="type" (changePage)="changePage($event)"></taskana-pagination>
 <taskana-code></taskana-code>