From 1676d34af62e381ef5fdb7aa0c18daaf96ff5e4e Mon Sep 17 00:00:00 2001
From: Arik Fraimovich <arik@arikfr.com>
Date: Sun, 5 Aug 2018 17:57:55 +0300
Subject: [PATCH] Fix: make sure paginator component reflects current page
 number.

---
 client/app/components/paginator.js          |  7 ++-----
 client/app/lib/pagination/live-paginator.js | 13 ++-----------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/client/app/components/paginator.js b/client/app/components/paginator.js
index cd55b419b..124b180df 100644
--- a/client/app/components/paginator.js
+++ b/client/app/components/paginator.js
@@ -1,9 +1,6 @@
 class PaginatorCtrl {
-  constructor() {
-    this.page = this.paginator.page;
-  }
   pageChanged() {
-    this.paginator.setPage(this.page);
+    this.paginator.setPage(this.paginator.page);
   }
 }
 
@@ -13,7 +10,7 @@ export default function init(ngModule) {
 <div class="paginator-container" ng-if="$ctrl.paginator.totalCount > $ctrl.paginator.itemsPerPage">
   <ul uib-pagination total-items="$ctrl.paginator.totalCount"
                      items-per-page="$ctrl.paginator.itemsPerPage"
-                     ng-model="$ctrl.page"
+                     ng-model="$ctrl.paginator.page"
                      max-size="6"
                      class="pagination"
                      boundary-link-numbers="true"
diff --git a/client/app/lib/pagination/live-paginator.js b/client/app/lib/pagination/live-paginator.js
index b914045b6..86ff2dff4 100644
--- a/client/app/lib/pagination/live-paginator.js
+++ b/client/app/lib/pagination/live-paginator.js
@@ -1,9 +1,6 @@
 export default class LivePaginator {
   constructor(rowsFetcher, {
-    page = 1,
-    itemsPerPage = 20,
-    orderByField,
-    orderByReverse = false,
+    page = 1, itemsPerPage = 20, orderByField, orderByReverse = false,
   } = {}) {
     this.page = page;
     this.itemsPerPage = itemsPerPage;
@@ -14,13 +11,7 @@ export default class LivePaginator {
   }
 
   fetchPage(page) {
-    this.rowsFetcher(
-      page,
-      this.itemsPerPage,
-      this.orderByField,
-      this.orderByReverse,
-      this,
-    );
+    this.rowsFetcher(page, this.itemsPerPage, this.orderByField, this.orderByReverse, this);
   }
 
   setPage(page, pageSize) {