diff --git a/src/ServicePulse.Host.Tests/tests/js/views/failed_messages/controller.spec.js b/src/ServicePulse.Host.Tests/tests/js/views/failed_messages/controller.spec.js index 62bad145af..e30fc759f3 100644 --- a/src/ServicePulse.Host.Tests/tests/js/views/failed_messages/controller.spec.js +++ b/src/ServicePulse.Host.Tests/tests/js/views/failed_messages/controller.spec.js @@ -66,56 +66,4 @@ expect(controller.selectedIds.length).toEqual(0); }); }); - - describe('when loading the data with infinite scroll', - function() { - var controller, serviceControlService, root, deferred, getFailedMessageSpy; - - beforeEach(inject(function ($rootScope, notifyService, $q) { - root = $rootScope; - this.notifyService = notifyService; - serviceControlService = { getExceptionGroups: function () { }, getFailedMessages: function(){ } }; - deferred = $q.defer(); - spyOn(serviceControlService, 'getExceptionGroups').and.callFake(function () { - - return deferred.promise; - }); - - getFailedMessageSpy = spyOn(serviceControlService, 'getFailedMessages').and.callFake(function () { - return deferred.promise; - }); - - controller = $controller('failedMessagesController', - { - $scope: root, - $timeout: null, - $interval: function(){}, - $location: null, - sharedDataService: { getstats: function() { return { number_of_pending_retries: 0 }; } }, - notifyService: notifyService, - serviceControlService: serviceControlService, - failedMessageGroupsService: null - }); - })); - - it('no load happens when initial load is in progress', - function () { - expect(getFailedMessageSpy).toHaveBeenCalledTimes(1); - - controller.loadMoreResults(controller.selectedExceptionGroup, true); - - expect(getFailedMessageSpy).toHaveBeenCalledTimes(1); - }); - - it('load happens when initial load is done', - function () { - root.$apply(function () { deferred.resolve({data: []}) }); - expect(getFailedMessageSpy).toHaveBeenCalledTimes(1); - - controller.loadMoreResults(controller.selectedExceptionGroup, true); - - expect(getFailedMessageSpy).toHaveBeenCalledTimes(2); - }); - - }); }); \ No newline at end of file diff --git a/src/ServicePulse.Host.Tests/tests/js/views/pending_retries/controller.spec.js b/src/ServicePulse.Host.Tests/tests/js/views/pending_retries/controller.spec.js index c043507219..b77e34821f 100644 --- a/src/ServicePulse.Host.Tests/tests/js/views/pending_retries/controller.spec.js +++ b/src/ServicePulse.Host.Tests/tests/js/views/pending_retries/controller.spec.js @@ -17,7 +17,7 @@ $httpBackend.whenGET('http://localhost:33333/api/errors/queues/addresses').respond(null); $httpBackend.whenGET('http://localhost:33333/api/redirects').respond(null); - pendingRetryService = { retryPendingRetriedMessages: function () { } }; + pendingRetryService = { retryPendingRetriedMessages: function () { }, getPendingRetryMessages: function(){ return {then: function(){}}} }; controller = $controller('pendingRetriesController', { $scope: $scope, $timeout: null, @@ -40,7 +40,7 @@ controller.pendingRetryMessages = [{ id: 1, submittedForRetrial: false, selected: true }, { id: 2, submittedForRetrial: false, selected: false }, { id: 3, submittedForRetrial: false, selected: true }]; controller.selectedIds = [1, 3]; controller.retrySelected(); - + root.$apply(function () { deferred.resolve('Remote call result') }); expect(controller.selectedIds.length).toEqual(0); @@ -58,13 +58,13 @@ var $scope, controller, pendingRetryService, root, $httpBackend; beforeEach(inject(function ($rootScope, $injector) { - $scope = {}; + $scope = { }; root = $rootScope; $httpBackend = $injector.get('$httpBackend'); $httpBackend.whenGET('http://localhost:33333/api/errors/queues/addresses').respond(null); $httpBackend.whenGET('http://localhost:33333/api/redirects').respond(null); - pendingRetryService = { retryAllMessages: function () { } }; + pendingRetryService = { retryAllMessages: function () { }, getPendingRetryMessages: function(){ return {then: function(){}}} }; controller = $controller('pendingRetriesController', { $scope: $scope, $timeout: null, @@ -113,7 +113,7 @@ $httpBackend = $injector.get('$httpBackend'); $httpBackend.whenGET('http://localhost:33333/api/errors/queues/addresses').respond(null); $httpBackend.whenGET('http://localhost:33333/api/redirects').respond(null); - pendingRetryService = { markAsResolvedMessages: function () { } }; + pendingRetryService = { markAsResolvedMessages: function () { }, getPendingRetryMessages: function(){ return {then: function(){}}} }; controller = $controller('pendingRetriesController', { $scope: $scope, $timeout: null, @@ -158,7 +158,7 @@ $httpBackend = $injector.get('$httpBackend'); $httpBackend.whenGET('http://localhost:33333/api/errors/queues/addresses').respond(null); $httpBackend.whenGET('http://localhost:33333/api/redirects').respond(null); - pendingRetryService = { markAsResolvedAllMessages: function () { } }; + pendingRetryService = { markAsResolvedAllMessages: function () { }, getPendingRetryMessages: function(){ return {then: function(){}}} }; controller = $controller('pendingRetriesController', { $scope: $scope, $timeout: null, @@ -218,7 +218,7 @@ var message = { retried: true, number_of_processing_attempts: 1 }; var result = controller.noStatusPresent(message); - + expect(result).toEqual(false); })); diff --git a/src/ServicePulse.Host/app/js/app.js b/src/ServicePulse.Host/app/js/app.js index ab8d3fee30..9cf331ed72 100644 --- a/src/ServicePulse.Host/app/js/app.js +++ b/src/ServicePulse.Host/app/js/app.js @@ -11,7 +11,6 @@ 'toaster', 'toastService', 'ui.bootstrap', - 'infinite-scroll', 'services', 'ui.particular', 'ui.particular.reindexingstatus', diff --git a/src/ServicePulse.Host/app/js/views/archive/archive-view.html b/src/ServicePulse.Host/app/js/views/archive/archive-view.html index 1977fb739f..55fe7d75ec 100644 --- a/src/ServicePulse.Host/app/js/views/archive/archive-view.html +++ b/src/ServicePulse.Host/app/js/views/archive/archive-view.html @@ -59,7 +59,7 @@

{{vm.total | number}} message -
+
@@ -96,5 +96,11 @@

{{vm.total | number}} message

+
+
+
+
    +
    +
    diff --git a/src/ServicePulse.Host/app/js/views/archive/controller.js b/src/ServicePulse.Host/app/js/views/archive/controller.js index 689d0e3f4a..e07dd6a89d 100644 --- a/src/ServicePulse.Host/app/js/views/archive/controller.js +++ b/src/ServicePulse.Host/app/js/views/archive/controller.js @@ -26,10 +26,15 @@ vm.selectedArchiveGroup = { 'id': $routeParams.groupId ? $routeParams.groupId : undefined, 'title': 'All deleted messages', 'count': 0, 'initialLoad': true }; + vm.pager = { + page: 1, + total: 1, + perPage: 50 + }; + vm.sort = { sortby: 'modified', direction: 'desc', - page: 1, start: undefined, end: undefined, buttonText: function () { @@ -66,9 +71,9 @@ return nObj; }); - vm.archives = vm.archives.concat(exgroups); + vm.selectedIds = []; + vm.archives = exgroups; vm.allMessagesLoaded = (vm.archives.length >= vm.total); - vm.sort.page++; } vm.loadingData = false; @@ -93,9 +98,9 @@ vm.configuration = sharedDataService.getConfiguration(); vm.error_retention_period = moment.duration(vm.configuration.data_retention.error_retention_period).asHours(); - vm.total = 1; + vm.pager.total = 1; vm.archives = []; - vm.sort.page = 1; + vm.pager.page = 1; var selectedArchiveGroup = getSelectedArchiveGroup(); @@ -209,8 +214,8 @@ vm.selectedIds = []; vm.archives = []; vm.allMessagesLoaded = false; - vm.total = 1; - vm.page = 1; + vm.pager.total = 1; + vm.pager.page = 1; vm.loadMoreResults(); }; @@ -258,7 +263,7 @@ }; vm.loadMoreResults = function () { - vm.allMessagesLoaded = vm.archives.length >= vm.total; + vm.allMessagesLoaded = vm.archives.length >= vm.pager.total; if (vm.allMessagesLoaded || vm.loadingData) { return; @@ -269,13 +274,13 @@ archivedMessageService.getArchivedMessages( vm.selectedArchiveGroup.id, vm.sort.sortby, - vm.sort.page, + vm.pager.page, vm.sort.direction, vm.sort.start, vm.sort.end).then(function (response) { notifier.notify('InitialLoadComplete'); - vm.total = response.total; + vm.pager.total = response.total; processLoadedMessages(response.data); }); }; diff --git a/src/ServicePulse.Host/app/js/views/custom_checks/customChecks.controller.js b/src/ServicePulse.Host/app/js/views/custom_checks/customChecks.controller.js index 907b225f9e..c7995b4768 100644 --- a/src/ServicePulse.Host/app/js/views/custom_checks/customChecks.controller.js +++ b/src/ServicePulse.Host/app/js/views/custom_checks/customChecks.controller.js @@ -7,12 +7,15 @@ serviceControlService, notifyService) { - $scope.model = { data: [], total: 0 }; + $scope.model = { data: []}; $scope.loadingData = false; - $scope.disableLoadingData = false; $scope.reloadCount = 0; - var page = 1; + $scope.pager = { + page: 1, + total: 1, + perPage: 25 + } $scope.loadMoreResults = function () { if ($scope.loadingData) { @@ -20,7 +23,7 @@ } $scope.loadingData = true; - load(page++, $scope.reloadCount); + load($scope.pager.page, $scope.reloadCount); }; $scope.dismiss = function (row) { @@ -31,13 +34,13 @@ notifier.subscribe($scope, reloadData, 'CustomChecksUpdated'); function reloadData() { - page = 1; + $scope.pager.page = 1; + $scope.pager.total = 1; $scope.loadingData = true; - $scope.model = { data: [], total: 0 }; - $scope.disableLoadingData = false; + $scope.model = { data: [] }; $scope.reloadCount++; - load(page, $scope.reloadCount); + load($scope.pager.page, $scope.reloadCount); } function load(page, reloadCount) { @@ -50,12 +53,8 @@ $scope.loadingData = false; - $scope.model.data = $scope.model.data.concat(response.data); - $scope.model.total = response.total; - - if ($scope.model.data.length >= $scope.model.total) { - $scope.disableLoadingData = true; - } + $scope.model.data = response.data; + $scope.pager.total = response.total; }); } } diff --git a/src/ServicePulse.Host/app/js/views/custom_checks/customChecks.html b/src/ServicePulse.Host/app/js/views/custom_checks/customChecks.html index 0694406045..994a0d3e3c 100644 --- a/src/ServicePulse.Host/app/js/views/custom_checks/customChecks.html +++ b/src/ServicePulse.Host/app/js/views/custom_checks/customChecks.html @@ -18,11 +18,11 @@

    Custom checks

    - +
    -
    +
    @@ -48,6 +48,13 @@

    Custom checks

    + +
    +
    +
    +
      +
      +
      \ No newline at end of file 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 a5f4e23279..78bb02e894 100644 --- a/src/ServicePulse.Host/app/js/views/failed_messages/controller.js +++ b/src/ServicePulse.Host/app/js/views/failed_messages/controller.js @@ -34,14 +34,18 @@ vm.selectedIds = []; vm.multiselection = {}; vm.sortButtonText = ''; - vm.allMessagesLoaded = false; vm.loadingData = false; vm.lastAction = selectActions.Selection; - vm.page = 1; - vm.total = vm.stats.number_of_failed_messages; + vm.pager = { + page: 1, + total: parseInt(vm.stats.number_of_failed_messages), + perPage: 50 + } + // vm.page = 1; + // vm.total = parseInt(vm.stats.number_of_failed_messages); notifier.subscribe($scope, function (event, data) { - vm.total = data; + vm.pager.total = parseInt(data); }, 'MessageFailuresUpdated'); var setSortButtonText = function(sort, direction) { @@ -60,10 +64,8 @@ nObj.panel = 0; return nObj; }); - - vm.failedMessages = vm.failedMessages.concat(exgroups); - vm.allMessagesLoaded = (vm.failedMessages.length >= vm.selectedExceptionGroup.count); - vm.page++; + vm.selectedIds = []; + vm.failedMessages = exgroups; } vm.loadingData = false; @@ -96,7 +98,7 @@ vm.failedMessages = []; vm.selectedIds = []; - vm.page = 1; + vm.pager.page = 1; vm.sort = defaultSort.sort; vm.direction = defaultSort.direction; @@ -277,8 +279,7 @@ vm.failedMessages = []; vm.selectedExceptionGroup = group; - vm.allMessagesLoaded = false; - vm.page = 1; + vm.pager.page = 1; vm.loadMoreResults(group, sort, direction); }; @@ -287,14 +288,9 @@ selectGroupInternal(group, sort, direction, true); }; - vm.loadMoreResults = function(group, isInfiniteScrolling) { - vm.allMessagesLoaded = vm.failedMessages.length >= group.count; - - if (!group.initialLoad && (vm.allMessagesLoaded || vm.loadingData)) { - return; - } + vm.loadMoreResults = function(group) { - if (group.initialLoad && isInfiniteScrolling) { + if (vm.loadingData) { return; } @@ -304,9 +300,9 @@ var loadPromise; if (allExceptionsGroupSelected) { - loadPromise = serviceControlService.getFailedMessages(vm.sort, vm.page, vm.direction); + loadPromise = serviceControlService.getFailedMessages(vm.sort, vm.pager.page, vm.direction); } else { - loadPromise = serviceControlService.getFailedMessagesForExceptionGroup(group.id, vm.sort, vm.page, vm.direction); + loadPromise = serviceControlService.getFailedMessagesForExceptionGroup(group.id, vm.sort, vm.pager.page, vm.direction); } loadPromise.then(function (response) { @@ -314,6 +310,7 @@ group.count = response.total; } + vm.pager.total = parseInt(response.total); processLoadedMessages(response.data); if (group.initialLoad) { diff --git a/src/ServicePulse.Host/app/js/views/failed_messages/failed-messages-view.html b/src/ServicePulse.Host/app/js/views/failed_messages/failed-messages-view.html index fd695934b2..779828d20c 100644 --- a/src/ServicePulse.Host/app/js/views/failed_messages/failed-messages-view.html +++ b/src/ServicePulse.Host/app/js/views/failed_messages/failed-messages-view.html @@ -64,7 +64,7 @@

      {{vm.selectedExceptionGroup.c -
      +
      @@ -103,6 +103,12 @@

      {{vm.selectedExceptionGroup.c

      +
      +
      +
      +
        +
        +
        \ No newline at end of file diff --git a/src/ServicePulse.Host/app/js/views/pending_retries/controller.js b/src/ServicePulse.Host/app/js/views/pending_retries/controller.js index 78d1f4d74c..9e051de91c 100644 --- a/src/ServicePulse.Host/app/js/views/pending_retries/controller.js +++ b/src/ServicePulse.Host/app/js/views/pending_retries/controller.js @@ -31,6 +31,13 @@ buttonText: 'All Pending Retries' }; + vm.pager = { + page: 1, + total: 1, + perPage: 50 + + }; + notifier.subscribe($scope, function (event, updatedTotalMessages) { if (vm.total !== updatedTotalMessages) { vm.total = updatedTotalMessages; @@ -107,9 +114,8 @@ return fillRedirect(nObj); }); - vm.pendingRetryMessages = vm.pendingRetryMessages.concat(exgroups); - vm.allMessagesLoaded = (vm.pendingRetryMessages.length >= vm.total); - vm.page++; + vm.selectedIds = []; + vm.pendingRetryMessages = exgroups; } vm.loadingData = false; }; @@ -118,13 +124,13 @@ vm.pendingRetryMessages = []; vm.selectedIds = []; vm.multiselection = {}; - vm.page = 1; + vm.pager.page = 1; vm.filter = { searchPhrase: undefined }; vm.filter.start = vm.filter.end = undefined; vm.total = sharedDataService.getstats().number_of_pending_retries; - vm.filteredTotal = vm.total; + vm.pager.total = vm.total; vm.sort = "time_of_failure"; vm.direction = "asc"; setSortButtonText(vm.sort, vm.direction); @@ -212,7 +218,7 @@ vm.retryAllConfirmationMessage = function() { if (!vm.isQueueFilterEmpty()) { - return "Are you sure you want to retry " + vm.filteredTotal + " out of " + vm.total + " previously retried messages? If the selected messages were processed in the meanwhile, then duplicate messages will be produced."; + return "Are you sure you want to retry " + vm.pager.total + " out of " + vm.total + " previously retried messages? If the selected messages were processed in the meanwhile, then duplicate messages will be produced."; } return "Bulk retry of messages can only be done for one queue at the time to avoid producing unwanted message duplicates."; @@ -239,7 +245,8 @@ vm.searchPhraseChanged = function() { vm.pendingRetryMessages = []; - vm.page = 1; + vm.pager.page = 1; + vm.pager.total = 1; vm.selectedIds = []; vm.multiselection = {}; vm.pendingRetryMessages.forEach(function (item) { @@ -257,7 +264,7 @@ vm.onSelect = function() { vm.pendingRetryMessages = []; - vm.page = 1; + vm.pager.page = 1; vm.loadMoreResults(); }; @@ -271,8 +278,7 @@ setSortButtonText(sort, direction); vm.pendingRetryMessages = []; - vm.allMessagesLoaded = false; - vm.page = 1; + vm.pager.page = 1; vm.loadTotalBasedOnFilters(); vm.loadMoreResults(sort, direction); @@ -313,20 +319,18 @@ vm.loadTotalBasedOnFilters = function() { pendingRetryService.getTotalPendingRetryMessages(vm.filter.searchPhrase ? vm.filter.searchPhrase.physical_address : '', vm.filter.start, vm.filter.end).then(function(response) { - vm.filteredTotal = response.total; + vm.pager.total = response.total; }); }; vm.loadMoreResults = function() { - vm.allMessagesLoaded = vm.pendingRetryMessages.length >= vm.total; - - if (vm.allMessagesLoaded || vm.loadingData) { + if (vm.loadingData) { return; } vm.loadingData = true; - pendingRetryService.getPendingRetryMessages(vm.filter.searchPhrase ? vm.filter.searchPhrase.physical_address : '', vm.sort, vm.page, vm.direction, vm.filter.start, vm.filter.end).then(function(response) { + pendingRetryService.getPendingRetryMessages(vm.filter.searchPhrase ? vm.filter.searchPhrase.physical_address : '', vm.sort, vm.pager.page, vm.direction, vm.filter.start, vm.filter.end).then(function(response) { processLoadedMessages(response.data); }); }; diff --git a/src/ServicePulse.Host/app/js/views/pending_retries/pending-retries-view.html b/src/ServicePulse.Host/app/js/views/pending_retries/pending-retries-view.html index c4dd65c792..b5d4aa7be2 100644 --- a/src/ServicePulse.Host/app/js/views/pending_retries/pending-retries-view.html +++ b/src/ServicePulse.Host/app/js/views/pending_retries/pending-retries-view.html @@ -118,7 +118,7 @@ -
        +
        @@ -154,5 +154,12 @@
        + +
        +
        +
        +
          +
          +
          \ No newline at end of file diff --git a/src/ServicePulse.Host/app/modules/shell/shell.js b/src/ServicePulse.Host/app/modules/shell/shell.js index 95da3fa1bf..4fc8482505 100644 --- a/src/ServicePulse.Host/app/modules/shell/shell.js +++ b/src/ServicePulse.Host/app/modules/shell/shell.js @@ -11,7 +11,6 @@ require('jquery-csv'); require('zeroclipboard'); require('moment'); require('moment-duration-format'); -require('ng-infinite-scroll'); require('angularjs-toaster'); require('signalr'); require('ui-select'); diff --git a/src/ServicePulse.Host/app/modules/shell/views/events-view.html b/src/ServicePulse.Host/app/modules/shell/views/events-view.html index a674357f35..3d99ac1b53 100644 --- a/src/ServicePulse.Host/app/modules/shell/views/events-view.html +++ b/src/ServicePulse.Host/app/modules/shell/views/events-view.html @@ -65,7 +65,7 @@

          Events

          -
            +
              diff --git a/src/ServicePulse.Host/package-lock.json b/src/ServicePulse.Host/package-lock.json index f3a53398d5..70d1780d62 100644 --- a/src/ServicePulse.Host/package-lock.json +++ b/src/ServicePulse.Host/package-lock.json @@ -4348,11 +4348,6 @@ "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==", "dev": true }, - "ng-infinite-scroll": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/ng-infinite-scroll/-/ng-infinite-scroll-1.3.0.tgz", - "integrity": "sha1-wumNj9E0sFJaTSz1jJXZtYN1URI=" - }, "ngstorage": { "version": "git://github.com/gsklee/ngStorage.git#3cd5ffaff77bebda910b94ca2a657ac44f4aac79", "from": "git://github.com/gsklee/ngStorage.git#0.3.10" diff --git a/src/ServicePulse.Host/package.json b/src/ServicePulse.Host/package.json index 76fe7da2ff..0be2ae0fec 100644 --- a/src/ServicePulse.Host/package.json +++ b/src/ServicePulse.Host/package.json @@ -19,7 +19,6 @@ "jquery-csv": "^1.0.21", "moment": "^2.19.3", "moment-duration-format": "^1.3.0", - "ng-infinite-scroll": "^1.3.0", "ngstorage": "git://github.com/gsklee/ngStorage#0.3.10", "rx": "^4.1.0", "signalr": "^2.2.1",