Skip to content

Fix issue with unarchiving more than 50 items at a time #786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 3, 2019
Merged

Fix issue with unarchiving more than 50 items at a time #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa18c29
Fix issue with unarchiving more than 50 items at a time
kbaley Oct 1, 2019
8d864ac
Add line
WilliamBZA Oct 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/ServicePulse.Host/app/js/views/archive/controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/ServicePulse.Host/app/js/views/archive/view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">

Expand Down
4 changes: 3 additions & 1 deletion src/ServicePulse.Host/app/js/views/failed_messages/controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@
vm.failedMessages = vm.failedMessages.filter(function(item) {
return !item.selected;
});

$scope.$emit("list:updated");
});
};

Expand Down Expand Up @@ -272,4 +274,4 @@

angular.module('sc')
.controller('failedMessagesController', controller);
})(window, window.angular);
})(window, window.angular);
2 changes: 1 addition & 1 deletion src/ServicePulse.Host/app/js/views/failed_messages/view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">

Expand Down