From a63994440df471b7607b03bfdb30ad34552e455e Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Thu, 25 Jul 2019 09:38:13 +0100
Subject: [PATCH] Add pagination to UI

---
 .../admin/bulk_product_update.js.coffee       | 39 ++++++++++++-------
 .../spree/admin/products/index.html.haml      |  3 ++
 .../admin/products/index/_actions.html.haml   | 14 +++++--
 3 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee
index 58d3260cf2..2cd9bc2eb2 100644
--- a/app/assets/javascripts/admin/bulk_product_update.js.coffee
+++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee
@@ -1,13 +1,18 @@
-angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout, $http, $window, BulkProducts, DisplayProperties, dataFetcher, DirtyProducts, VariantUnitManager, StatusMessage, producers, Taxons, SpreeApiAuth, Columns, tax_categories) ->
-  $scope.loading = true
-  $scope.loadingAllPages = true
-
+angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout, $filter, $http, $window, BulkProducts, DisplayProperties, DirtyProducts, VariantUnitManager, StatusMessage, producers, Taxons, SpreeApiAuth, Columns, tax_categories, RequestMonitor) ->
   $scope.StatusMessage = StatusMessage
 
   $scope.columns = Columns.columns
 
   $scope.variant_unit_options = VariantUnitManager.variantUnitOptions()
 
+  $scope.RequestMonitor = RequestMonitor
+  $scope.pagination = BulkProducts.pagination
+  $scope.per_page_options = [
+    {id: 15, name: t('js.admin.orders.index.per_page', results: 15)},
+    {id: 50, name: t('js.admin.orders.index.per_page', results: 50)},
+    {id: 100, name: t('js.admin.orders.index.per_page', results: 100)}
+  ]
+
   $scope.filterableColumns = [
     { name: t("label_producers"),       db_column: "producer_name" },
     { name: t("name"),           db_column: "name" }
@@ -31,9 +36,6 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
   $scope.categoryFilter = "0"
   $scope.importDateFilter = "0"
   $scope.products = BulkProducts.products
-  $scope.filteredProducts = []
-  $scope.currentFilters = []
-  $scope.limit = 15
   $scope.query = ""
   $scope.DisplayProperties = DisplayProperties
 
@@ -46,16 +48,23 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
       $scope.api_error_msg = message
 
   $scope.$watchCollection '[query, producerFilter, categoryFilter, importDateFilter]', ->
-    $scope.limit = 15 # Reset limit whenever searching
+    $scope.page = 1 # Reset page when changing filters for new search
+
+  $scope.changePage = (newPage) ->
+    $scope.page = newPage
+    $scope.fetchProducts()
 
   $scope.fetchProducts = ->
-    $scope.loading = true
-    $scope.loadingAllPages = true
-    BulkProducts.fetch($scope.currentFilters, ->
-      $scope.loadingAllPages = false
-    ).then ->
+    params = {
+      'q[name_cont]': $scope.query,
+      'q[supplier_id_eq]': $scope.producerFilter,
+      'q[primary_taxon_id_eq]': $scope.categoryFilter,
+      import_date: $scope.importDateFilter,
+      page: $scope.page,
+      per_page: $scope.per_page
+    }
+    RequestMonitor.load(BulkProducts.fetch(params).$promise).then ->
       $scope.resetProducts()
-      $scope.loading = false
 
   $timeout ->
     if $scope.showLatestImport
@@ -101,7 +110,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
 
   $scope.toggleShowAllVariants = ->
     showVariants = !DisplayProperties.showVariants 0
-    $scope.filteredProducts.forEach (product) ->
+    $scope.products.forEach (product) ->
       DisplayProperties.setShowVariants product.id, showVariants
     DisplayProperties.setShowVariants 0, showVariants
 
diff --git a/app/views/spree/admin/products/index.html.haml b/app/views/spree/admin/products/index.html.haml
index 50927a1ff9..3f913d3895 100644
--- a/app/views/spree/admin/products/index.html.haml
+++ b/app/views/spree/admin/products/index.html.haml
@@ -8,3 +8,6 @@
   = render 'spree/admin/products/index/actions'
   = render 'spree/admin/products/index/indicators'
   = render 'spree/admin/products/index/products'
+
+  %div{'ng-show' => "!RequestMonitor.loading && products.length > 0" }
+    = render partial: 'admin/shared/angular_pagination'
diff --git a/app/views/spree/admin/products/index/_actions.html.haml b/app/views/spree/admin/products/index/_actions.html.haml
index 4a0878bd5c..5b9f6424e2 100644
--- a/app/views/spree/admin/products/index/_actions.html.haml
+++ b/app/views/spree/admin/products/index/_actions.html.haml
@@ -1,3 +1,11 @@
-.controls.sixteen.columns.alpha{ 'ng-hide' => 'loading || products.length == 0' }
-  .thirteen.columns
-  %columns-dropdown{ action: "#{controller_name}_#{action_name}" }
+.controls.sixteen.columns.alpha{ 'ng-hide' => 'RequestMonitor.loading || products.length == 0' }
+  .ten.columns.alpha.index-controls
+    .per-page{'ng-show' => '!RequestMonitor.loading && products.length > 0'}
+      %input.per-page-select.ofn-select2{type: 'number', data: 'per_page_options', 'ng-model' => 'per_page', 'ng-change' => 'fetchResults()'}
+
+      %span.per-page-feedback
+        {{ 'spree.admin.orders.index.results_found' | t:{number: pagination.results} }}
+        {{ 'spree.admin.orders.index.viewing' | t:{start: ((pagination.page -1) * pagination.per_page) +1, end: ((pagination.page -1) * pagination.per_page) + products.length} }}
+
+  .six.columns.omega
+    %columns-dropdown{ action: "#{controller_name}_#{action_name}" }