diff --git a/app/components/createService/includes/resources-placement.html b/app/components/createService/includes/resources-placement.html
index 17fc9b6a9..8ff522dc3 100644
--- a/app/components/createService/includes/resources-placement.html
+++ b/app/components/createService/includes/resources-placement.html
@@ -8,7 +8,7 @@
Memory reservation
diff --git a/app/components/endpoints/endpointsController.js b/app/components/endpoints/endpointsController.js
index 8a33f34b4..01c205663 100644
--- a/app/components/endpoints/endpointsController.js
+++ b/app/components/endpoints/endpointsController.js
@@ -1,14 +1,10 @@
angular.module('endpoints', [])
-.controller('EndpointsController', ['$scope', '$state', '$filter', 'EndpointService', 'EndpointProvider', 'Notifications', 'Pagination',
-function ($scope, $state, $filter, EndpointService, EndpointProvider, Notifications, Pagination) {
+.controller('EndpointsController', ['$scope', '$state', '$filter', 'EndpointService', 'Notifications',
+function ($scope, $state, $filter, EndpointService, Notifications) {
$scope.state = {
uploadInProgress: false,
- selectedItemCount: 0,
- pagination_count: Pagination.getPaginationCount('endpoints'),
actionInProgress: false
};
- $scope.sortType = 'Name';
- $scope.sortReverse = true;
$scope.formValues = {
Name: '',
@@ -17,32 +13,6 @@ function ($scope, $state, $filter, EndpointService, EndpointProvider, Notificati
SecurityFormData: new EndpointSecurityFormData()
};
- $scope.order = function(sortType) {
- $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false;
- $scope.sortType = sortType;
- };
-
- $scope.changePaginationCount = function() {
- Pagination.setPaginationCount('endpoints', $scope.state.pagination_count);
- };
-
- $scope.selectItems = function (allSelected) {
- angular.forEach($scope.state.filteredEndpoints, function (endpoint) {
- if (endpoint.Checked !== allSelected) {
- endpoint.Checked = allSelected;
- $scope.selectItem(endpoint);
- }
- });
- };
-
- $scope.selectItem = function (item) {
- if (item.Checked) {
- $scope.state.selectedItemCount++;
- } else {
- $scope.state.selectedItemCount--;
- }
- };
-
$scope.addEndpoint = function() {
var name = $scope.formValues.Name;
var URL = $filter('stripprotocol')($scope.formValues.URL);
@@ -75,17 +45,24 @@ function ($scope, $state, $filter, EndpointService, EndpointProvider, Notificati
});
};
- $scope.removeAction = function () {
- angular.forEach($scope.endpoints, function (endpoint) {
- if (endpoint.Checked) {
- EndpointService.deleteEndpoint(endpoint.Id).then(function success(data) {
- Notifications.success('Endpoint deleted', endpoint.Name);
- var index = $scope.endpoints.indexOf(endpoint);
- $scope.endpoints.splice(index, 1);
- }, function error(err) {
- Notifications.error('Failure', err, 'Unable to remove endpoint');
- });
- }
+ $scope.removeAction = function (selectedItems) {
+ var actionCount = selectedItems.length;
+ angular.forEach(selectedItems, function (endpoint) {
+ EndpointService.deleteEndpoint(endpoint.Id)
+ .then(function success() {
+ Notifications.success('Endpoint successfully removed', endpoint.Name);
+ var index = $scope.endpoints.indexOf(endpoint);
+ $scope.endpoints.splice(index, 1);
+ })
+ .catch(function error(err) {
+ Notifications.error('Failure', err, 'Unable to remove endpoint');
+ })
+ .finally(function final() {
+ --actionCount;
+ if (actionCount === 0) {
+ $state.reload();
+ }
+ });
});
};
diff --git a/app/components/events/events.html b/app/components/events/events.html
index 1170728be..415a89500 100644
--- a/app/components/events/events.html
+++ b/app/components/events/events.html
@@ -8,66 +8,12 @@
-
-
-
-
- Items per page:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/app/components/images/imagesController.js b/app/components/images/imagesController.js
index 496393a50..2ae3b4324 100644
--- a/app/components/images/imagesController.js
+++ b/app/components/images/imagesController.js
@@ -1,46 +1,15 @@
angular.module('images', [])
-.controller('ImagesController', ['$scope', '$state', 'ImageService', 'Notifications', 'Pagination', 'ModalService',
-function ($scope, $state, ImageService, Notifications, Pagination, ModalService) {
+.controller('ImagesController', ['$scope', '$state', 'ImageService', 'Notifications', 'ModalService',
+function ($scope, $state, ImageService, Notifications, ModalService) {
$scope.state = {
- pagination_count: Pagination.getPaginationCount('images'),
- actionInProgress: false,
- selectedItemCount: 0
+ actionInProgress: false
};
- $scope.sortType = 'RepoTags';
- $scope.sortReverse = true;
-
$scope.formValues = {
Image: '',
Registry: ''
};
- $scope.order = function(sortType) {
- $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false;
- $scope.sortType = sortType;
- };
-
- $scope.changePaginationCount = function() {
- Pagination.setPaginationCount('images', $scope.state.pagination_count);
- };
-
- $scope.selectItems = function (allSelected) {
- angular.forEach($scope.state.filteredImages, function (image) {
- if (image.Checked !== allSelected) {
- image.Checked = allSelected;
- $scope.selectItem(image);
- }
- });
- };
-
- $scope.selectItem = function (item) {
- if (item.Checked) {
- $scope.state.selectedItemCount++;
- } else {
- $scope.state.selectedItemCount--;
- }
- };
-
$scope.pullImage = function() {
var image = $scope.formValues.Image;
var registry = $scope.formValues.Registry;
@@ -59,33 +28,38 @@ function ($scope, $state, ImageService, Notifications, Pagination, ModalService)
});
};
- $scope.confirmRemovalAction = function (force) {
+ $scope.confirmRemovalAction = function (selectedItems, force) {
ModalService.confirmImageForceRemoval(function (confirmed) {
if(!confirmed) { return; }
- $scope.removeAction(force);
+ $scope.removeAction(selectedItems, force);
});
};
- $scope.removeAction = function (force) {
- force = !!force;
- angular.forEach($scope.images, function (i) {
- if (i.Checked) {
- ImageService.deleteImage(i.Id, force)
- .then(function success(data) {
- Notifications.success('Image deleted', i.Id);
- var index = $scope.images.indexOf(i);
- $scope.images.splice(index, 1);
- })
- .catch(function error(err) {
- Notifications.error('Failure', err, 'Unable to remove image');
- });
- }
+ $scope.removeAction = function (selectedItems, force) {
+ var actionCount = selectedItems.length;
+ angular.forEach(selectedItems, function (image) {
+ ImageService.deleteImage(image.Id, force)
+ .then(function success() {
+ Notifications.success('Image successfully removed', image.Id);
+ var index = $scope.images.indexOf(image);
+ $scope.images.splice(index, 1);
+ })
+ .catch(function error(err) {
+ Notifications.error('Failure', err, 'Unable to remove image');
+ })
+ .finally(function final() {
+ --actionCount;
+ if (actionCount === 0) {
+ $state.reload();
+ }
+ });
});
};
- function fetchImages() {
+ function initView() {
var endpointProvider = $scope.applicationState.endpoint.mode.provider;
var apiVersion = $scope.applicationState.endpoint.apiVersion;
+
ImageService.images(true)
.then(function success(data) {
$scope.images = data;
@@ -96,5 +70,5 @@ function ($scope, $state, ImageService, Notifications, Pagination, ModalService)
});
}
- fetchImages();
+ initView();
}]);
diff --git a/app/components/networks/networks.html b/app/components/networks/networks.html
index 0c30c2d4b..932c080e6 100644
--- a/app/components/networks/networks.html
+++ b/app/components/networks/networks.html
@@ -8,6 +8,18 @@
+
+
diff --git a/app/components/networks/networksController.js b/app/components/networks/networksController.js
index d3a95b33a..2d7ef9bd1 100644
--- a/app/components/networks/networksController.js
+++ b/app/components/networks/networksController.js
@@ -1,54 +1,25 @@
angular.module('networks', [])
-.controller('NetworksController', ['$scope', '$state', 'Network', 'NetworkService', 'Notifications', 'Pagination',
-function ($scope, $state, Network, NetworkService, Notifications, Pagination) {
- $scope.state = {};
- $scope.state.pagination_count = Pagination.getPaginationCount('networks');
- $scope.state.selectedItemCount = 0;
- $scope.state.advancedSettings = false;
- $scope.sortType = 'Name';
- $scope.sortReverse = false;
+.controller('NetworksController', ['$scope', '$state', 'NetworkService', 'Notifications',
+function ($scope, $state, NetworkService, Notifications) {
- $scope.changePaginationCount = function() {
- Pagination.setPaginationCount('networks', $scope.state.pagination_count);
- };
-
- $scope.order = function(sortType) {
- $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false;
- $scope.sortType = sortType;
- };
-
- $scope.selectItems = function(allSelected) {
- angular.forEach($scope.state.filteredNetworks, function (network) {
- if (network.Checked !== allSelected) {
- network.Checked = allSelected;
- $scope.selectItem(network);
- }
- });
- };
-
- $scope.selectItem = function (item) {
- if (item.Checked) {
- $scope.state.selectedItemCount++;
- } else {
- $scope.state.selectedItemCount--;
- }
- };
-
- $scope.removeAction = function () {
- angular.forEach($scope.networks, function (network) {
- if (network.Checked) {
- Network.remove({id: network.Id}, function (d) {
- if (d.message) {
- Notifications.error('Error', d, 'Unable to remove network');
- } else {
- Notifications.success('Network removed', network.Id);
- var index = $scope.networks.indexOf(network);
- $scope.networks.splice(index, 1);
- }
- }, function (e) {
- Notifications.error('Failure', e, 'Unable to remove network');
- });
- }
+ $scope.removeAction = function (selectedItems) {
+ var actionCount = selectedItems.length;
+ angular.forEach(selectedItems, function (network) {
+ NetworkService.remove(network.Id)
+ .then(function success() {
+ Notifications.success('Network successfully removed', network.Name);
+ var index = $scope.networks.indexOf(network);
+ $scope.networks.splice(index, 1);
+ })
+ .catch(function error(err) {
+ Notifications.error('Failure', err, 'Unable to remove network');
+ })
+ .finally(function final() {
+ --actionCount;
+ if (actionCount === 0) {
+ $state.reload();
+ }
+ });
});
};
diff --git a/app/components/node/node.html b/app/components/node/node.html
index b773d7bcd..909013aab 100644
--- a/app/components/node/node.html
+++ b/app/components/node/node.html
@@ -150,7 +150,7 @@
There are no engine labels for this node.
-
+
@@ -161,7 +161,7 @@
| {{ engineLabel.key }} |
- {{ engineLabel.value }} |
+ {{ engineLabel.value }} |
@@ -232,69 +232,12 @@
-
-
-
-
- Items per page:
-
-
-
-
-
-
-
-
+
+
diff --git a/app/components/node/nodeController.js b/app/components/node/nodeController.js
index e572219a1..cc43cb764 100644
--- a/app/components/node/nodeController.js
+++ b/app/components/node/nodeController.js
@@ -1,28 +1,15 @@
// @@OLD_SERVICE_CONTROLLER: this service should be rewritten to use services.
// See app/components/templates/templatesController.js as a reference.
angular.module('node', [])
-.controller('NodeController', ['$scope', '$state', '$transition$', 'LabelHelper', 'Node', 'NodeHelper', 'Task', 'Pagination', 'Notifications',
-function ($scope, $state, $transition$, LabelHelper, Node, NodeHelper, Task, Pagination, Notifications) {
+.controller('NodeController', ['$scope', '$state', '$transition$', 'LabelHelper', 'Node', 'NodeHelper', 'Task', 'Notifications',
+function ($scope, $state, $transition$, LabelHelper, Node, NodeHelper, Task, Notifications) {
- $scope.state = {};
- $scope.state.pagination_count = Pagination.getPaginationCount('node_tasks');
$scope.loading = true;
$scope.tasks = [];
- $scope.sortType = 'Status';
- $scope.sortReverse = false;
var originalNode = {};
var editedKeys = [];
- $scope.order = function(sortType) {
- $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false;
- $scope.sortType = sortType;
- };
-
- $scope.changePaginationCount = function() {
- Pagination.setPaginationCount('node_tasks', $scope.state.pagination_count);
- };
-
$scope.updateNodeAttribute = function updateNodeAttribute(node, key) {
editedKeys.push(key);
};
diff --git a/app/components/registries/registries.html b/app/components/registries/registries.html
index caa3935db..946f84d4a 100644
--- a/app/components/registries/registries.html
+++ b/app/components/registries/registries.html
@@ -70,82 +70,12 @@
-
-
-
- Items per page:
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/app/components/registries/registriesController.js b/app/components/registries/registriesController.js
index 4357cf972..b5b65f5c1 100644
--- a/app/components/registries/registriesController.js
+++ b/app/components/registries/registriesController.js
@@ -1,14 +1,10 @@
angular.module('registries', [])
-.controller('RegistriesController', ['$q', '$scope', '$state', 'RegistryService', 'DockerHubService', 'ModalService', 'Notifications', 'Pagination',
-function ($q, $scope, $state, RegistryService, DockerHubService, ModalService, Notifications, Pagination) {
+.controller('RegistriesController', ['$q', '$scope', '$state', 'RegistryService', 'DockerHubService', 'ModalService', 'Notifications', 'PaginationService',
+function ($q, $scope, $state, RegistryService, DockerHubService, ModalService, Notifications, PaginationService) {
$scope.state = {
- selectedItemCount: 0,
- pagination_count: Pagination.getPaginationCount('registries'),
actionInProgress: false
};
- $scope.sortType = 'Name';
- $scope.sortReverse = true;
$scope.updateDockerHub = function() {
var dockerhub = $scope.dockerhub;
@@ -25,56 +21,34 @@ function ($q, $scope, $state, RegistryService, DockerHubService, ModalService, N
});
};
- $scope.order = function(sortType) {
- $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false;
- $scope.sortType = sortType;
- };
-
- $scope.changePaginationCount = function() {
- Pagination.setPaginationCount('endpoints', $scope.state.pagination_count);
- };
-
- $scope.selectItems = function (allSelected) {
- angular.forEach($scope.state.filteredRegistries, function (registry) {
- if (registry.Checked !== allSelected) {
- registry.Checked = allSelected;
- $scope.selectItem(registry);
- }
- });
- };
-
- $scope.selectItem = function (item) {
- if (item.Checked) {
- $scope.state.selectedItemCount++;
- } else {
- $scope.state.selectedItemCount--;
- }
- };
-
- $scope.removeAction = function() {
+ $scope.removeAction = function(selectedItems) {
ModalService.confirmDeletion(
'Do you want to remove the selected registries?',
function onConfirm(confirmed) {
if(!confirmed) { return; }
- removeRegistries();
+ deleteSelectedRegistries(selectedItems);
}
);
};
- function removeRegistries() {
- var registries = $scope.registries;
- angular.forEach(registries, function (registry) {
- if (registry.Checked) {
- RegistryService.deleteRegistry(registry.Id)
- .then(function success(data) {
- var index = registries.indexOf(registry);
- registries.splice(index, 1);
- Notifications.success('Registry deleted', registry.Name);
- })
- .catch(function error(err) {
- Notifications.error('Failure', err, 'Unable to remove registry');
- });
- }
+ function deleteSelectedRegistries(selectedItems) {
+ var actionCount = selectedItems.length;
+ angular.forEach(selectedItems, function (registry) {
+ RegistryService.deleteRegistry(registry.Id)
+ .then(function success() {
+ Notifications.success('Registry successfully removed', registry.Name);
+ var index = $scope.registries.indexOf(registry);
+ $scope.registries.splice(index, 1);
+ })
+ .catch(function error(err) {
+ Notifications.error('Failure', err, 'Unable to remove registry');
+ })
+ .finally(function final() {
+ --actionCount;
+ if (actionCount === 0) {
+ $state.reload();
+ }
+ });
});
}
diff --git a/app/components/secrets/secrets.html b/app/components/secrets/secrets.html
index 3586364af..6ac1313b8 100644
--- a/app/components/secrets/secrets.html
+++ b/app/components/secrets/secrets.html
@@ -8,73 +8,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/app/components/secrets/secretsController.js b/app/components/secrets/secretsController.js
index 7c176c741..6bc5ca81d 100644
--- a/app/components/secrets/secretsController.js
+++ b/app/components/secrets/secretsController.js
@@ -1,47 +1,25 @@
angular.module('secrets', [])
-.controller('SecretsController', ['$scope', '$state', 'SecretService', 'Notifications', 'Pagination',
-function ($scope, $state, SecretService, Notifications, Pagination) {
- $scope.state = {};
- $scope.state.selectedItemCount = 0;
- $scope.state.pagination_count = Pagination.getPaginationCount('secrets');
- $scope.sortType = 'Name';
- $scope.sortReverse = false;
+.controller('SecretsController', ['$scope', '$state', 'SecretService', 'Notifications',
+function ($scope, $state, SecretService, Notifications) {
- $scope.order = function (sortType) {
- $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false;
- $scope.sortType = sortType;
- };
-
- $scope.selectItems = function (allSelected) {
- angular.forEach($scope.state.filteredSecrets, function (secret) {
- if (secret.Checked !== allSelected) {
- secret.Checked = allSelected;
- $scope.selectItem(secret);
- }
- });
- };
-
- $scope.selectItem = function (item) {
- if (item.Checked) {
- $scope.state.selectedItemCount++;
- } else {
- $scope.state.selectedItemCount--;
- }
- };
-
- $scope.removeAction = function () {
- angular.forEach($scope.secrets, function (secret) {
- if (secret.Checked) {
- SecretService.remove(secret.Id)
- .then(function success() {
- Notifications.success('Secret deleted', secret.Id);
- var index = $scope.secrets.indexOf(secret);
- $scope.secrets.splice(index, 1);
- })
- .catch(function error(err) {
- Notifications.error('Failure', err, 'Unable to remove secret');
- });
- }
+ $scope.removeAction = function (selectedItems) {
+ var actionCount = selectedItems.length;
+ angular.forEach(selectedItems, function (secret) {
+ SecretService.remove(secret.Id)
+ .then(function success() {
+ Notifications.success('Secret successfully removed', secret.Name);
+ var index = $scope.secrets.indexOf(secret);
+ $scope.secrets.splice(index, 1);
+ })
+ .catch(function error(err) {
+ Notifications.error('Failure', err, 'Unable to remove secret');
+ })
+ .finally(function final() {
+ --actionCount;
+ if (actionCount === 0) {
+ $state.reload();
+ }
+ });
});
};
diff --git a/app/components/service/includes/resources.html b/app/components/service/includes/resources.html
index e24de75b5..9d7f610f6 100644
--- a/app/components/service/includes/resources.html
+++ b/app/components/service/includes/resources.html
@@ -38,7 +38,7 @@
-
+
|
@@ -53,7 +53,7 @@
|
-
+
|
diff --git a/app/components/service/includes/tasks.html b/app/components/service/includes/tasks.html
index 3dd131b9e..2cf7fdbaf 100644
--- a/app/components/service/includes/tasks.html
+++ b/app/components/service/includes/tasks.html
@@ -1,71 +1,10 @@
-
-
-
- Items per page:
-
-
-
-
-
-
-
-
-
-
-
-
-
+
|
|
|
diff --git a/app/components/service/serviceController.js b/app/components/service/serviceController.js
index 5633d2911..6c3ea83c6 100644
--- a/app/components/service/serviceController.js
+++ b/app/components/service/serviceController.js
@@ -1,12 +1,9 @@
angular.module('service', [])
-.controller('ServiceController', ['$q', '$scope', '$transition$', '$state', '$location', '$timeout', '$anchorScroll', 'ServiceService', 'ConfigService', 'ConfigHelper', 'SecretService', 'ImageService', 'SecretHelper', 'Service', 'ServiceHelper', 'LabelHelper', 'TaskService', 'NodeService', 'Notifications', 'Pagination', 'ModalService',
-function ($q, $scope, $transition$, $state, $location, $timeout, $anchorScroll, ServiceService, ConfigService, ConfigHelper, SecretService, ImageService, SecretHelper, Service, ServiceHelper, LabelHelper, TaskService, NodeService, Notifications, Pagination, ModalService) {
+.controller('ServiceController', ['$q', '$scope', '$transition$', '$state', '$location', '$timeout', '$anchorScroll', 'ServiceService', 'ConfigService', 'ConfigHelper', 'SecretService', 'ImageService', 'SecretHelper', 'Service', 'ServiceHelper', 'LabelHelper', 'TaskService', 'NodeService', 'Notifications', 'ModalService',
+function ($q, $scope, $transition$, $state, $location, $timeout, $anchorScroll, ServiceService, ConfigService, ConfigHelper, SecretService, ImageService, SecretHelper, Service, ServiceHelper, LabelHelper, TaskService, NodeService, Notifications, ModalService) {
$scope.state = {};
- $scope.state.pagination_count = Pagination.getPaginationCount('service_tasks');
$scope.tasks = [];
- $scope.sortType = 'Updated';
- $scope.sortReverse = true;
$scope.availableImages = [];
$scope.lastVersion = 0;
@@ -14,15 +11,6 @@ function ($q, $scope, $transition$, $state, $location, $timeout, $anchorScroll,
var originalService = {};
var previousServiceValues = [];
- $scope.order = function (sortType) {
- $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false;
- $scope.sortType = sortType;
- };
-
- $scope.changePaginationCount = function() {
- Pagination.setPaginationCount('service_tasks', $scope.state.pagination_count);
- };
-
$scope.renameService = function renameService(service) {
updateServiceAttribute(service, 'Name', service.newServiceName || service.name);
service.EditName = false;
@@ -320,7 +308,7 @@ function ($q, $scope, $transition$, $state, $location, $timeout, $anchorScroll,
service.LimitMemoryBytes = service.LimitMemoryBytes / 1024 / 1024 || 0;
service.ReservationMemoryBytes = service.ReservationMemoryBytes / 1024 / 1024 || 0;
}
-
+
function transformDurations(service) {
service.RestartDelay = service.RestartDelay / 1000000000 || 5;
service.RestartWindow = service.RestartWindow / 1000000000 || 0;
diff --git a/app/components/services/services.html b/app/components/services/services.html
index 662f6b625..3c23ac6cd 100644
--- a/app/components/services/services.html
+++ b/app/components/services/services.html
@@ -8,133 +8,15 @@
-
-
-
-
- Items per page:
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/app/components/services/servicesController.js b/app/components/services/servicesController.js
index f3c6a82ca..e2223da48 100644
--- a/app/components/services/servicesController.js
+++ b/app/components/services/servicesController.js
@@ -1,80 +1,50 @@
angular.module('services', [])
-.controller('ServicesController', ['$q', '$scope', '$transition$', '$state', 'Service', 'ServiceService', 'ServiceHelper', 'Notifications', 'Pagination', 'Task', 'Node', 'NodeHelper', 'ModalService', 'ResourceControlService',
-function ($q, $scope, $transition$, $state, Service, ServiceService, ServiceHelper, Notifications, Pagination, Task, Node, NodeHelper, ModalService, ResourceControlService) {
- $scope.state = {};
- $scope.state.selectedItemCount = 0;
- $scope.state.pagination_count = Pagination.getPaginationCount('services');
- $scope.sortType = 'Name';
- $scope.sortReverse = false;
+.controller('ServicesController', ['$q', '$scope', '$state', 'Service', 'ServiceService', 'ServiceHelper', 'Notifications', 'Task', 'Node', 'NodeHelper', 'ModalService',
+function ($q, $scope, $state, Service, ServiceService, ServiceHelper, Notifications, Task, Node, NodeHelper, ModalService) {
- $scope.changePaginationCount = function() {
- Pagination.setPaginationCount('services', $scope.state.pagination_count);
- };
-
- $scope.order = function (sortType) {
- $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false;
- $scope.sortType = sortType;
- };
-
- $scope.selectItem = function (item) {
- if (item.Checked) {
- $scope.state.selectedItemCount++;
- } else {
- $scope.state.selectedItemCount--;
- }
- };
-
- $scope.scaleService = function scaleService(service) {
+ $scope.scaleAction = function scaleService(service) {
var config = ServiceHelper.serviceToConfig(service.Model);
config.Mode.Replicated.Replicas = service.Replicas;
- Service.update({ id: service.Id, version: service.Version }, config, function (data) {
+ ServiceService.update(service, config)
+ .then(function success(data) {
Notifications.success('Service successfully scaled', 'New replica count: ' + service.Replicas);
$state.reload();
- }, function (e) {
+ })
+ .catch(function error(err) {
+ Notifications.error('Failure', err, 'Unable to scale service');
service.Scale = false;
service.Replicas = service.ReplicaCount;
- Notifications.error('Failure', e, 'Unable to scale service');
});
};
- $scope.removeAction = function() {
+ $scope.removeAction = function(selectedItems) {
ModalService.confirmDeletion(
'Do you want to remove the selected service(s)? All the containers associated to the selected service(s) will be removed too.',
function onConfirm(confirmed) {
if(!confirmed) { return; }
- removeServices();
+ removeServices(selectedItems);
}
);
};
- function removeServices() {
- angular.forEach($scope.services, function (service) {
- if (service.Checked) {
- ServiceService.remove(service)
- .then(function success(data) {
- Notifications.success('Service successfully deleted');
- var index = $scope.services.indexOf(service);
- $scope.services.splice(index, 1);
- })
- .catch(function error(err) {
- Notifications.error('Failure', err, 'Unable to remove service');
- });
- }
- });
- }
-
- function mapUsersToServices(users) {
- angular.forEach($scope.services, function (service) {
- if (service.Metadata) {
- var serviceRC = service.Metadata.ResourceControl;
- if (serviceRC && serviceRC.OwnerId !== $scope.user.ID) {
- angular.forEach(users, function (user) {
- if (serviceRC.OwnerId === user.Id) {
- service.Owner = user.Username;
- }
- });
+ function removeServices(services) {
+ var actionCount = services.length;
+ angular.forEach(services, function (service) {
+ ServiceService.remove(service)
+ .then(function success() {
+ Notifications.success('Service successfully removed', service.Name);
+ var index = $scope.services.indexOf(service);
+ $scope.services.splice(index, 1);
+ })
+ .catch(function error(err) {
+ Notifications.error('Failure', err, 'Unable to remove service');
+ })
+ .finally(function final() {
+ --actionCount;
+ if (actionCount === 0) {
+ $state.reload();
}
- }
+ });
});
}
diff --git a/app/components/sidebar/sidebar.html b/app/components/sidebar/sidebar.html
index dd1b0d293..7cfde6625 100644
--- a/app/components/sidebar/sidebar.html
+++ b/app/components/sidebar/sidebar.html
@@ -48,7 +48,7 @@
-