From 7c887382b5cfb41d2147a433fc72ef263a77c1a1 Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Fri, 10 May 2019 11:53:39 +0300
Subject: [PATCH] Fixes the pagination on Dataset listing.

---
 .../app/ui/dataset/listing/dataset-listing.component.html  | 2 +-
 .../app/ui/dataset/listing/dataset-listing.component.ts    | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html
index ed2627c75..7bd45b073 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html
+++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.html
@@ -23,7 +23,7 @@
 								[showDivider]="i != (listingItems.length - 1)" (onClick)="rowClicked($event)">
 							</app-dataset-listing-item-component>
 						</div>
-						<mat-paginator #paginator [length]="totalCount" [pageSizeOptions]="[10, 25, 100]" class="mt-2">
+						<mat-paginator #paginator [length]="totalCount" [pageSizeOptions]="[10, 25, 100]" (page)="pageThisEvent()" class="mt-2">
 						</mat-paginator>
 					</div>
 				</div>
diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts
index 731f33635..1b9468eef 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.ts
@@ -73,6 +73,7 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB
 	}
 
 	refresh() {
+		if (this._paginator.pageSize === undefined) this._paginator.pageSize = 10;
 		const startIndex = this._paginator.pageIndex * this._paginator.pageSize;
 		let fields: Array<string> = new Array();
 		if (this.sort && this.sort.active) { fields = this.sort.direction === 'asc' ? ['+' + this.sort.active] : ['-' + this.sort.active]; }
@@ -90,6 +91,10 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB
 		});
 	}
 
+	pageThisEvent(event) {
+		this.refresh();
+	}
+
 	rowClicked(dataset: DatasetListingModel) {
 		this.router.navigate(['/datasets/edit/' + dataset.id]);
 	}
@@ -113,4 +118,4 @@ export class DatasetListingComponent extends BaseComponent implements OnInit, IB
 			.pipe(takeUntil(this._destroyed))
 			.subscribe();
 	}
-}
\ No newline at end of file
+}