From fa18c29dc54c4d005c10b2875b27d80f7964e6fb Mon Sep 17 00:00:00 2001
From: Kyle Baley <kyle@baley.org>
Date: Tue, 1 Oct 2019 14:25:35 -0500
Subject: [PATCH 1/2] Fix issue with unarchiving more than 50 items at a time
 Fix paging issue when unarchiving/archiving all displayed items in a list

---
 src/ServicePulse.Host/app/js/views/archive/controller.js       | 3 ++-
 src/ServicePulse.Host/app/js/views/archive/view.html           | 2 +-
 .../app/js/views/failed_messages/controller.js                 | 1 +
 src/ServicePulse.Host/app/js/views/failed_messages/view.html   | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/ServicePulse.Host/app/js/views/archive/controller.js b/src/ServicePulse.Host/app/js/views/archive/controller.js
index 0debba3a72..1e43772ad0 100644
--- a/src/ServicePulse.Host/app/js/views/archive/controller.js
+++ b/src/ServicePulse.Host/app/js/views/archive/controller.js
@@ -68,7 +68,7 @@
 
                 vm.archives = vm.archives.concat(exgroups);
                 vm.allMessagesLoaded = (vm.archives.length >= vm.total);
-                vm.page++;
+                vm.sort.page++;
             }
 
             vm.loadingData = false;
@@ -156,6 +156,7 @@
                     // We are going to have to wait for service control to tell us the job has been done
                     // group.workflow_state = createWorkflowState('success', message);
                     notifier.notify('RestoreFromArchiveRequestAccepted');
+                    $scope.$emit('list:updated');
 
                 }, function (message) {
                     // group.workflow_state = createWorkflowState('error', message);
diff --git a/src/ServicePulse.Host/app/js/views/archive/view.html b/src/ServicePulse.Host/app/js/views/archive/view.html
index 6b16c7a230..c37fb7a26e 100644
--- a/src/ServicePulse.Host/app/js/views/archive/view.html
+++ b/src/ServicePulse.Host/app/js/views/archive/view.html
@@ -45,7 +45,7 @@
 
         <no-data ng-show="vm.archives.length === 0 && !vm.loadingData" title="message failures" message="There are currently no archived messages"></no-data>
 
-        <div class="row" ng-show="vm.archives.length > 0" infinite-scroll="vm.loadMoreResults(vm.selectedExceptionGroup)" infinite-scroll-distance="0" infinite-scroll-disabled="vm.disableLoadingData" class="clearfix">
+        <div class="row" ng-show="vm.archives.length > 0" infinite-scroll="vm.loadMoreResults(vm.selectedExceptionGroup)" infinite-scroll-distance="0" infinite-scroll-listen-for-event="list:updated" infinite-scroll-disabled="vm.disableLoadingData" class="clearfix">
 
             <div class="col-sm-12 no-mobile-side-padding" ng-repeat="message in vm.archives">
 
diff --git a/src/ServicePulse.Host/app/js/views/failed_messages/controller.js b/src/ServicePulse.Host/app/js/views/failed_messages/controller.js
index 55a978bb39..1b6efdece3 100644
--- a/src/ServicePulse.Host/app/js/views/failed_messages/controller.js
+++ b/src/ServicePulse.Host/app/js/views/failed_messages/controller.js
@@ -153,6 +153,7 @@
                     vm.failedMessages = vm.failedMessages.filter(function(item) {
                         return !item.selected;
                     });
+                    $scope.$emit("list:updated");
                 });
         };
 
diff --git a/src/ServicePulse.Host/app/js/views/failed_messages/view.html b/src/ServicePulse.Host/app/js/views/failed_messages/view.html
index e984d8ad83..691968f149 100644
--- a/src/ServicePulse.Host/app/js/views/failed_messages/view.html
+++ b/src/ServicePulse.Host/app/js/views/failed_messages/view.html
@@ -68,7 +68,7 @@ <h3 class="active group-title group-message-count">{{vm.selectedExceptionGroup.c
                 </div>
             </div>
 
-            <div ng-show="vm.failedMessages.length > 0" infinite-scroll="vm.loadMoreResults(vm.selectedExceptionGroup, true)" infinite-scroll-distance="0" infinite-scroll-disabled="vm.disableLoadingData" class="clearfix">
+            <div ng-show="vm.failedMessages.length > 0" infinite-scroll="vm.loadMoreResults(vm.selectedExceptionGroup, true)" infinite-scroll-distance="0" infinite-scroll-listen-for-event="list:updated" infinite-scroll-disabled="vm.disableLoadingData" class="clearfix">
                 <div class="col-sm-12 no-mobile-side-padding">
                     <div class="row box repeat-item failed-message" ng-repeat="message in vm.failedMessages">
 

From 8d864ac914cbbf5a5ff58393f00636308fae9a16 Mon Sep 17 00:00:00 2001
From: WilliamBZA <WilliamBZA@users.noreply.github.com>
Date: Wed, 2 Oct 2019 13:44:58 +0200
Subject: [PATCH 2/2] Add line

---
 .../app/js/views/failed_messages/controller.js                 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ServicePulse.Host/app/js/views/failed_messages/controller.js b/src/ServicePulse.Host/app/js/views/failed_messages/controller.js
index 1b6efdece3..b1240b19cf 100644
--- a/src/ServicePulse.Host/app/js/views/failed_messages/controller.js
+++ b/src/ServicePulse.Host/app/js/views/failed_messages/controller.js
@@ -153,6 +153,7 @@
                     vm.failedMessages = vm.failedMessages.filter(function(item) {
                         return !item.selected;
                     });
+
                     $scope.$emit("list:updated");
                 });
         };
@@ -273,4 +274,4 @@
 
     angular.module('sc')
         .controller('failedMessagesController', controller);
-})(window, window.angular);
\ No newline at end of file
+})(window, window.angular);