From bdb23a8dd2363f4139040b760c3f1a556481b615 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 6 Dec 2017 12:04:02 +0100 Subject: [PATCH] feat(UX): replace tables with datatables (#1460) --- app/__module.js | 1 + app/components/configs/configs.html | 76 +---- app/components/configs/configsController.js | 64 ++-- app/components/container/container.html | 102 ++---- .../container/containerController.js | 13 +- .../containerStats/containerStats.html | 51 +-- .../containerStatsController.js | 17 +- app/components/containers/containers.html | 160 ++-------- .../containers/containersController.js | 294 +++++++----------- .../createContainer/createcontainer.html | 6 +- .../includes/resources-placement.html | 8 +- app/components/dashboard/dashboard.html | 2 +- app/components/endpoints/endpoints.html | 101 +----- .../endpoints/endpointsController.js | 63 ++-- app/components/events/events.html | 68 +--- app/components/events/eventsController.js | 17 +- app/components/images/images.html | 115 +------ app/components/images/imagesController.js | 78 ++--- app/components/networks/networks.html | 14 +- app/components/networks/networksController.js | 69 ++-- app/components/node/node.html | 75 +---- app/components/node/nodeController.js | 17 +- app/components/registries/registries.html | 84 +---- .../registries/registriesController.js | 70 ++--- app/components/secrets/secrets.html | 76 +---- app/components/secrets/secretsController.js | 62 ++-- .../service/includes/resources.html | 4 +- app/components/service/includes/tasks.html | 77 +---- app/components/service/service.html | 2 +- app/components/service/serviceController.js | 18 +- app/components/services/services.html | 138 +------- app/components/services/servicesController.js | 84 ++--- app/components/sidebar/sidebar.html | 2 +- app/components/stack/stack.html | 27 +- app/components/stack/stackController.js | 7 +- app/components/stacks/stacks.html | 88 +----- app/components/stacks/stacksController.js | 76 ++--- app/components/swarm/swarm.html | 185 +---------- app/components/swarm/swarmController.js | 17 +- app/components/team/team.html | 8 +- app/components/team/teamController.js | 12 +- app/components/teams/teams.html | 69 +--- app/components/teams/teamsController.js | 75 ++--- .../templates/templatesController.js | 4 +- app/components/users/users.html | 93 +----- app/components/users/usersController.js | 69 ++-- app/components/volumes/volumes.html | 120 +------ app/components/volumes/volumesController.js | 79 ++--- .../porAccessControlPanel.html | 2 +- .../porAccessManagementController.js | 12 +- .../serviceList/por-service-list.js | 8 - .../serviceList/porServiceList.html | 98 ------ app/directives/serviceList/porServiceList.js | 21 -- app/directives/slider/por-slider.js | 12 - app/directives/taskList/por-task-list.js | 8 - app/directives/taskList/porTaskList.html | 78 ----- app/directives/taskList/porTaskList.js | 19 -- app/directives/ui/__module.js | 1 + .../common/genericDatatableController.js | 65 ++++ .../configs-datatable/configsDatatable.html | 108 +++++++ .../configs-datatable/configsDatatable.js | 15 + .../containerNetworksDatatable.html | 82 +++++ .../containerNetworksDatatable.js | 16 + .../containerProcessesDatatable.html | 61 ++++ .../containerProcessesDatatable.js | 14 + .../containersDatatable.html | 254 +++++++++++++++ .../containersDatatable.js | 24 ++ .../containersDatatableController.js | 171 ++++++++++ app/directives/ui/datatables/datatable.css | 244 +++++++++++++++ .../ui/datatables/datatableService.js | 37 +++ .../endpointsDatatable.html | 99 ++++++ .../endpoints-datatable/endpointsDatatable.js | 16 + .../events-datatable/eventsDatatable.html | 81 +++++ .../events-datatable/eventsDatatable.js | 13 + .../images-datatable/imagesDatatable.html | 144 +++++++++ .../images-datatable/imagesDatatable.js | 15 + .../imagesDatatableController.js | 102 ++++++ .../networks-datatable/networksDatatable.html | 148 +++++++++ .../networks-datatable/networksDatatable.js | 15 + .../nodeTasksDatatable.html | 97 ++++++ .../nodeTasksDatatable.js | 13 + .../nodes-datatable/nodesDatatable.html | 116 +++++++ .../nodes-datatable/nodesDatatable.js | 15 + .../nodes-ss-datatable/nodesSSDatatable.html | 105 +++++++ .../nodes-ss-datatable/nodesSSDatatable.js | 13 + .../registriesDatatable.html | 104 +++++++ .../registriesDatatable.js | 15 + .../secrets-datatable/secretsDatatable.html | 108 +++++++ .../secrets-datatable/secretsDatatable.js | 15 + .../services-datatable/servicesDatatable.html | 157 ++++++++++ .../services-datatable/servicesDatatable.js | 17 + .../stackServicesDatatable.html | 105 +++++++ .../stackServicesDatatable.js | 15 + .../stacks-datatable/stacksDatatable.html | 103 ++++++ .../stacks-datatable/stacksDatatable.js | 16 + .../stacksDatatableController.js | 65 ++++ .../tasks-datatable/tasksDatatable.html | 97 ++++++ .../tasks-datatable/tasksDatatable.js | 15 + .../teams-datatable/teamsDatatable.html | 84 +++++ .../teams-datatable/teamsDatatable.js | 14 + .../users-datatable/usersDatatable.html | 110 +++++++ .../users-datatable/usersDatatable.js | 14 + .../volumes-datatable/volumesDatatable.html | 149 +++++++++ .../volumes-datatable/volumesDatatable.js | 15 + .../volumesDatatableController.js | 102 ++++++ .../porSlider.html => ui/slider/slider.html} | 0 app/directives/ui/slider/slider.js | 12 + .../slider/sliderController.js} | 5 +- app/filters/filters.js | 2 +- app/models/docker/container.js | 2 + app/models/docker/network.js | 2 + app/models/docker/volume.js | 2 + app/routes.js | 3 + app/services/docker/containerService.js | 34 +- app/services/docker/networkService.js | 5 +- app/services/docker/serviceService.js | 4 + app/services/entityListService.js | 15 - app/services/lineChart.js | 55 ---- app/services/localStorage.js | 32 +- app/services/pagination.js | 30 +- gruntfile.js | 2 +- 121 files changed, 4123 insertions(+), 2701 deletions(-) delete mode 100644 app/directives/serviceList/por-service-list.js delete mode 100644 app/directives/serviceList/porServiceList.html delete mode 100644 app/directives/serviceList/porServiceList.js delete mode 100644 app/directives/slider/por-slider.js delete mode 100644 app/directives/taskList/por-task-list.js delete mode 100644 app/directives/taskList/porTaskList.html delete mode 100644 app/directives/taskList/porTaskList.js create mode 100644 app/directives/ui/__module.js create mode 100644 app/directives/ui/datatables/common/genericDatatableController.js create mode 100644 app/directives/ui/datatables/configs-datatable/configsDatatable.html create mode 100644 app/directives/ui/datatables/configs-datatable/configsDatatable.js create mode 100644 app/directives/ui/datatables/container-networks-datatable/containerNetworksDatatable.html create mode 100644 app/directives/ui/datatables/container-networks-datatable/containerNetworksDatatable.js create mode 100644 app/directives/ui/datatables/container-processes-datatable/containerProcessesDatatable.html create mode 100644 app/directives/ui/datatables/container-processes-datatable/containerProcessesDatatable.js create mode 100644 app/directives/ui/datatables/containers-datatable/containersDatatable.html create mode 100644 app/directives/ui/datatables/containers-datatable/containersDatatable.js create mode 100644 app/directives/ui/datatables/containers-datatable/containersDatatableController.js create mode 100644 app/directives/ui/datatables/datatable.css create mode 100644 app/directives/ui/datatables/datatableService.js create mode 100644 app/directives/ui/datatables/endpoints-datatable/endpointsDatatable.html create mode 100644 app/directives/ui/datatables/endpoints-datatable/endpointsDatatable.js create mode 100644 app/directives/ui/datatables/events-datatable/eventsDatatable.html create mode 100644 app/directives/ui/datatables/events-datatable/eventsDatatable.js create mode 100644 app/directives/ui/datatables/images-datatable/imagesDatatable.html create mode 100644 app/directives/ui/datatables/images-datatable/imagesDatatable.js create mode 100644 app/directives/ui/datatables/images-datatable/imagesDatatableController.js create mode 100644 app/directives/ui/datatables/networks-datatable/networksDatatable.html create mode 100644 app/directives/ui/datatables/networks-datatable/networksDatatable.js create mode 100644 app/directives/ui/datatables/node-tasks-datatable/nodeTasksDatatable.html create mode 100644 app/directives/ui/datatables/node-tasks-datatable/nodeTasksDatatable.js create mode 100644 app/directives/ui/datatables/nodes-datatable/nodesDatatable.html create mode 100644 app/directives/ui/datatables/nodes-datatable/nodesDatatable.js create mode 100644 app/directives/ui/datatables/nodes-ss-datatable/nodesSSDatatable.html create mode 100644 app/directives/ui/datatables/nodes-ss-datatable/nodesSSDatatable.js create mode 100644 app/directives/ui/datatables/registries-datatable/registriesDatatable.html create mode 100644 app/directives/ui/datatables/registries-datatable/registriesDatatable.js create mode 100644 app/directives/ui/datatables/secrets-datatable/secretsDatatable.html create mode 100644 app/directives/ui/datatables/secrets-datatable/secretsDatatable.js create mode 100644 app/directives/ui/datatables/services-datatable/servicesDatatable.html create mode 100644 app/directives/ui/datatables/services-datatable/servicesDatatable.js create mode 100644 app/directives/ui/datatables/stack-services-datatable/stackServicesDatatable.html create mode 100644 app/directives/ui/datatables/stack-services-datatable/stackServicesDatatable.js create mode 100644 app/directives/ui/datatables/stacks-datatable/stacksDatatable.html create mode 100644 app/directives/ui/datatables/stacks-datatable/stacksDatatable.js create mode 100644 app/directives/ui/datatables/stacks-datatable/stacksDatatableController.js create mode 100644 app/directives/ui/datatables/tasks-datatable/tasksDatatable.html create mode 100644 app/directives/ui/datatables/tasks-datatable/tasksDatatable.js create mode 100644 app/directives/ui/datatables/teams-datatable/teamsDatatable.html create mode 100644 app/directives/ui/datatables/teams-datatable/teamsDatatable.js create mode 100644 app/directives/ui/datatables/users-datatable/usersDatatable.html create mode 100644 app/directives/ui/datatables/users-datatable/usersDatatable.js create mode 100644 app/directives/ui/datatables/volumes-datatable/volumesDatatable.html create mode 100644 app/directives/ui/datatables/volumes-datatable/volumesDatatable.js create mode 100644 app/directives/ui/datatables/volumes-datatable/volumesDatatableController.js rename app/directives/{slider/porSlider.html => ui/slider/slider.html} (100%) create mode 100644 app/directives/ui/slider/slider.js rename app/directives/{slider/porSliderController.js => ui/slider/sliderController.js} (84%) delete mode 100644 app/services/entityListService.js delete mode 100644 app/services/lineChart.js diff --git a/app/__module.js b/app/__module.js index 54ab077ce..9e02e45c8 100644 --- a/app/__module.js +++ b/app/__module.js @@ -9,6 +9,7 @@ angular.module('portainer', [ 'LocalStorageModule', 'angular-jwt', 'angular-google-analytics', + 'ui', 'angular-loading-bar', 'portainer.templates', 'portainer.filters', diff --git a/app/components/configs/configs.html b/app/components/configs/configs.html index 07093c63d..ab2c0cea4 100644 --- a/app/components/configs/configs.html +++ b/app/components/configs/configs.html @@ -8,73 +8,13 @@
-
- - - - -
- - Add config -
-
- -
- - -
- - - - - - - - - - - - - - - - - - - - - -
- - - - Name - - - - - - Created at - - - - - - Ownership - - - -
{{ config.Name }}{{ config.CreatedAt | getisodate }} - - - {{ config.ResourceControl.Ownership ? config.ResourceControl.Ownership : config.ResourceControl.Ownership = 'public' }} - -
Loading...
No configs available.
-
- -
-
- - +
+
diff --git a/app/components/configs/configsController.js b/app/components/configs/configsController.js index d777aaf61..908a59002 100644 --- a/app/components/configs/configsController.js +++ b/app/components/configs/configsController.js @@ -1,47 +1,25 @@ angular.module('configs', []) -.controller('ConfigsController', ['$scope', '$stateParams', '$state', 'ConfigService', 'Notifications', 'Pagination', -function ($scope, $stateParams, $state, ConfigService, Notifications, Pagination) { - $scope.state = {}; - $scope.state.selectedItemCount = 0; - $scope.state.pagination_count = Pagination.getPaginationCount('configs'); - $scope.sortType = 'Name'; - $scope.sortReverse = false; - - $scope.order = function (sortType) { - $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false; - $scope.sortType = sortType; - }; - - $scope.selectItems = function (allSelected) { - angular.forEach($scope.state.filteredConfigs, function (config) { - if (config.Checked !== allSelected) { - config.Checked = allSelected; - $scope.selectItem(config); - } - }); - }; - - $scope.selectItem = function (item) { - if (item.Checked) { - $scope.state.selectedItemCount++; - } else { - $scope.state.selectedItemCount--; - } - }; - - $scope.removeAction = function () { - angular.forEach($scope.configs, function (config) { - if (config.Checked) { - ConfigService.remove(config.Id) - .then(function success() { - Notifications.success('Config deleted', config.Id); - var index = $scope.configs.indexOf(config); - $scope.configs.splice(index, 1); - }) - .catch(function error(err) { - Notifications.error('Failure', err, 'Unable to remove config'); - }); - } +.controller('ConfigsController', ['$scope', '$state', 'ConfigService', 'Notifications', +function ($scope, $state, ConfigService, Notifications) { + + $scope.removeAction = function (selectedItems) { + var actionCount = selectedItems.length; + angular.forEach(selectedItems, function (config) { + ConfigService.remove(config.Id) + .then(function success() { + Notifications.success('Config successfully removed', config.Name); + var index = $scope.configs.indexOf(config); + $scope.configs.splice(index, 1); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to remove config'); + }) + .finally(function final() { + --actionCount; + if (actionCount === 0) { + $state.reload(); + } + }); }); }; diff --git a/app/components/container/container.html b/app/components/container/container.html index f640b0cd6..08843a9f7 100644 --- a/app/components/container/container.html +++ b/app/components/container/container.html @@ -12,20 +12,20 @@
- - - - - - - + + + + + + +
- - +
@@ -84,10 +84,10 @@
- Stats - Logs - Console - Inspect + Stats + Logs + Console + Inspect
@@ -270,70 +270,16 @@
-
- - -
- Items per page: - -
- - - - - - - - - - - - - - - - - - - - - - -
Network NameIP AddressGatewayMacAddressActions
{{ key }}{{ value.IPAddress || '-' }}{{ value.Gateway || '-' }}{{ value.MacAddress || '-' }} - -
No networks connected.
-
- -
-
-
- -
- -
- -
-
- -
-
-
- - +
+
diff --git a/app/components/container/containerController.js b/app/components/container/containerController.js index 767028df7..3df165542 100644 --- a/app/components/container/containerController.js +++ b/app/components/container/containerController.js @@ -1,21 +1,18 @@ angular.module('container', []) -.controller('ContainerController', ['$q', '$scope', '$state','$transition$', '$filter', 'Container', 'ContainerCommit', 'ContainerHelper', 'ContainerService', 'ImageHelper', 'Network', 'NetworkService', 'Notifications', 'Pagination', 'ModalService', 'ResourceControlService', 'RegistryService', 'ImageService', -function ($q, $scope, $state, $transition$, $filter, Container, ContainerCommit, ContainerHelper, ContainerService, ImageHelper, Network, NetworkService, Notifications, Pagination, ModalService, ResourceControlService, RegistryService, ImageService) { +.controller('ContainerController', ['$q', '$scope', '$state','$transition$', '$filter', 'Container', 'ContainerCommit', 'ContainerHelper', 'ContainerService', 'ImageHelper', 'Network', 'NetworkService', 'Notifications', 'ModalService', 'ResourceControlService', 'RegistryService', 'ImageService', +function ($q, $scope, $state, $transition$, $filter, Container, ContainerCommit, ContainerHelper, ContainerService, ImageHelper, Network, NetworkService, Notifications, ModalService, ResourceControlService, RegistryService, ImageService) { $scope.activityTime = 0; $scope.portBindings = []; + $scope.config = { Image: '', Registry: '' }; + $scope.state = { recreateContainerInProgress: false, joinNetworkInProgress: false, - leaveNetworkInProgress: false, - pagination_count: Pagination.getPaginationCount('container_networks') - }; - - $scope.changePaginationCount = function() { - Pagination.setPaginationCount('container_networks', $scope.state.pagination_count); + leaveNetworkInProgress: false }; var update = function () { diff --git a/app/components/containerStats/containerStats.html b/app/components/containerStats/containerStats.html index c95dcfafa..f6702d680 100644 --- a/app/components/containerStats/containerStats.html +++ b/app/components/containerStats/containerStats.html @@ -51,7 +51,6 @@
- @@ -81,49 +80,13 @@
+
- - -
- Items per page: - -
- - - - - - - - - - - - - - - - - - - -
- - {{ title }} - - - -
{{ procInfo }}
Loading...
No processes available.
-
- -
- - +
diff --git a/app/components/containerStats/containerStatsController.js b/app/components/containerStats/containerStatsController.js index 53f324c3d..9faf4751b 100644 --- a/app/components/containerStats/containerStatsController.js +++ b/app/components/containerStats/containerStatsController.js @@ -1,25 +1,12 @@ angular.module('containerStats', []) -.controller('ContainerStatsController', ['$q', '$scope', '$transition$', '$document', '$interval', 'ContainerService', 'ChartService', 'Notifications', 'Pagination', -function ($q, $scope, $transition$, $document, $interval, ContainerService, ChartService, Notifications, Pagination) { +.controller('ContainerStatsController', ['$q', '$scope', '$transition$', '$document', '$interval', 'ContainerService', 'ChartService', 'Notifications', +function ($q, $scope, $transition$, $document, $interval, ContainerService, ChartService, Notifications) { $scope.state = { refreshRate: '5', networkStatsUnavailable: false }; - $scope.state.pagination_count = Pagination.getPaginationCount('stats_processes'); - $scope.sortType = 'CMD'; - $scope.sortReverse = false; - - $scope.order = function (sortType) { - $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false; - $scope.sortType = sortType; - }; - - $scope.changePaginationCount = function() { - Pagination.setPaginationCount('stats_processes', $scope.state.pagination_count); - }; - $scope.$on('$destroy', function() { stopRepeater(); }); diff --git a/app/components/containers/containers.html b/app/components/containers/containers.html index d8bfcd681..da72b72de 100644 --- a/app/components/containers/containers.html +++ b/app/components/containers/containers.html @@ -7,145 +7,23 @@ Containers -
- - -
- Items per page: - -
- - -
-
- - - - - - - -
- Add container -
-
- - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - State - - - - - - Name - - - - - - - - - Stack - - - - - - Image - - - - - - IP Address - - - - - - Host IP - - - - - - Published Ports - - - - - - Ownership - - - -
- {{ container.Status }} - {{ container.Status }} - {{ container|swarmcontainername|truncate: truncate_size}}{{ container|containername|truncate: truncate_size}}{{ container.StackName ? container.StackName : '-' }}{{ container.Image | hideshasum }}{{ container.IP ? container.IP : '-' }}{{ container.hostIP }} - - {{p.public}}:{{ p.private }} - - - - - - - {{ container.ResourceControl.Ownership ? container.ResourceControl.Ownership : container.ResourceControl.Ownership = 'public' }} - -
Loading...
No containers available.
-
- -
-
- - +
+
+ +
diff --git a/app/components/containers/containersController.js b/app/components/containers/containersController.js index 420eedc1d..988aaa991 100644 --- a/app/components/containers/containersController.js +++ b/app/components/containers/containersController.js @@ -1,219 +1,108 @@ angular.module('containers', []) - .controller('ContainersController', ['$q', '$scope', '$state', '$filter', 'Container', 'ContainerService', 'ContainerHelper', 'SystemService', 'Notifications', 'Pagination', 'EntityListService', 'ModalService', 'ResourceControlService', 'EndpointProvider', 'LocalStorage', - function ($q, $scope, $state, $filter, Container, ContainerService, ContainerHelper, SystemService, Notifications, Pagination, EntityListService, ModalService, ResourceControlService, EndpointProvider, LocalStorage) { - $scope.state = {}; - $scope.state.pagination_count = Pagination.getPaginationCount('containers'); - $scope.state.displayAll = LocalStorage.getFilterContainerShowAll(); - $scope.state.displayIP = false; - $scope.sortType = 'State'; - $scope.sortReverse = false; - $scope.state.selectedItemCount = 0; - $scope.truncate_size = 40; - $scope.showMore = true; - - $scope.order = function (sortType) { - $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false; - $scope.sortType = sortType; - }; - $scope.PublicURL = EndpointProvider.endpointPublicURL(); - - $scope.changePaginationCount = function() { - Pagination.setPaginationCount('containers', $scope.state.pagination_count); + .controller('ContainersController', ['$q', '$scope', '$state', '$filter', '$transition$', 'ContainerService', 'SystemService', 'Notifications', 'ModalService', 'EndpointProvider', + function ($q, $scope, $state, $filter, $transition$, ContainerService, SystemService, Notifications, ModalService, EndpointProvider) { + $scope.state = { + publicURL: EndpointProvider.endpointPublicURL() }; - $scope.cleanAssociatedVolumes = false; - - var update = function (data) { - $scope.state.selectedItemCount = 0; - Container.query(data, function (d) { - var containers = d; - $scope.containers = containers.map(function (container) { - var model = new ContainerViewModel(container); - model.Status = $filter('containerstatus')(model.Status); - - EntityListService.rememberPreviousSelection($scope.containers, model, function onSelect(model){ - $scope.selectItem(model); - }); - - if (model.IP) { - $scope.state.displayIP = true; - } - if ($scope.applicationState.endpoint.mode.provider === 'DOCKER_SWARM') { - model.hostIP = $scope.swarm_hosts[_.split(container.Names[0], '/')[1]]; - } - return model; - }); - updateSelectionFlags(); - }, function (e) { - Notifications.error('Failure', e, 'Unable to retrieve containers'); - $scope.containers = []; - }); + $scope.startAction = function(selectedItems) { + var successMessage = 'Container successfully started'; + var errorMessage = 'Unable to start container'; + executeActionOnContainerList(selectedItems, ContainerService.startContainer, successMessage, errorMessage); }; - var batch = function (items, action, msg) { - var counter = 0; - var complete = function () { - counter = counter - 1; - if (counter === 0) { - update({all: $scope.state.displayAll ? 1 : 0}); - } - }; - angular.forEach(items, function (c) { - if (c.Checked) { - counter = counter + 1; - if (action === Container.start) { - action({id: c.Id}, {}, function (d) { - Notifications.success('Container ' + msg, c.Id); - complete(); - }, function (e) { - Notifications.error('Failure', e, 'Unable to start container'); - complete(); - }); - } - else if (action === Container.remove) { - ContainerService.remove(c, $scope.cleanAssociatedVolumes) - .then(function success() { - var index = items.indexOf(c); - items.splice(index, 1); - Notifications.success('Container successfully removed'); - complete(); - }) - .catch(function error(err) { - Notifications.error('Failure', err, 'Unable to remove container'); - complete(); - }); - } - else if (action === Container.pause) { - action({id: c.Id}, function (d) { - if (d.message) { - Notifications.success('Container is already paused', c.Id); - } else { - Notifications.success('Container ' + msg, c.Id); - } - complete(); - }, function (e) { - Notifications.error('Failure', e, 'Unable to pause container'); - complete(); - }); - } - else { - action({id: c.Id}, function (d) { - Notifications.success('Container ' + msg, c.Id); - complete(); - }, function (e) { - Notifications.error('Failure', e, 'An error occured'); - complete(); - }); - } - } - }); + $scope.stopAction = function(selectedItems) { + var successMessage = 'Container successfully stopped'; + var errorMessage = 'Unable to stop container'; + executeActionOnContainerList(selectedItems, ContainerService.stopContainer, successMessage, errorMessage); }; - $scope.selectItems = function (allSelected) { - angular.forEach($scope.state.filteredContainers, function (container) { - if (container.Checked !== allSelected) { - container.Checked = allSelected; - toggleItemSelection(container); - } - }); - updateSelectionFlags(); + $scope.restartAction = function(selectedItems) { + var successMessage = 'Container successfully restarted'; + var errorMessage = 'Unable to restart container'; + executeActionOnContainerList(selectedItems, ContainerService.restartContainer, successMessage, errorMessage); }; - $scope.selectItem = function (item) { - toggleItemSelection(item); - updateSelectionFlags(); + $scope.killAction = function(selectedItems) { + var successMessage = 'Container successfully killed'; + var errorMessage = 'Unable to kill container'; + executeActionOnContainerList(selectedItems, ContainerService.killContainer, successMessage, errorMessage); }; - $scope.toggleGetAll = function () { - LocalStorage.storeFilterContainerShowAll($scope.state.displayAll); - update({all: $scope.state.displayAll ? 1 : 0}); + $scope.pauseAction = function(selectedItems) { + var successMessage = 'Container successfully paused'; + var errorMessage = 'Unable to pause container'; + executeActionOnContainerList(selectedItems, ContainerService.pauseContainer, successMessage, errorMessage); }; - $scope.startAction = function () { - batch($scope.containers, Container.start, 'Started'); + $scope.resumeAction = function(selectedItems) { + var successMessage = 'Container successfully resumed'; + var errorMessage = 'Unable to resume container'; + executeActionOnContainerList(selectedItems, ContainerService.resumeContainer, successMessage, errorMessage); }; - $scope.stopAction = function () { - batch($scope.containers, Container.stop, 'Stopped'); - }; - - $scope.restartAction = function () { - batch($scope.containers, Container.restart, 'Restarted'); - }; - - $scope.killAction = function () { - batch($scope.containers, Container.kill, 'Killed'); - }; - - $scope.pauseAction = function () { - batch($scope.containers, Container.pause, 'Paused'); - }; - - $scope.unpauseAction = function () { - batch($scope.containers, Container.unpause, 'Unpaused'); - }; - - $scope.removeAction = function () { - batch($scope.containers, Container.remove, 'Removed'); - }; - - - $scope.truncateMore = function(size) { - $scope.truncate_size = 80; - $scope.showMore = false; - }; - - $scope.confirmRemoveAction = function () { + $scope.confirmRemoveAction = function(selectedItems) { var isOneContainerRunning = false; - angular.forEach($scope.containers, function (c) { - if (c.Checked && c.State === 'running') { + for (var i = 0; i < selectedItems.length; i++) { + var container = selectedItems[i]; + if (container.State === 'running') { isOneContainerRunning = true; - return; + break; } - }); + } + var title = 'You are about to remove one or more container.'; if (isOneContainerRunning) { - title = 'You are about to remove one or more running containers.'; + title = 'You are about to remove one or more running container.'; } - ModalService.confirmContainerDeletion( - title, - function (result) { + + ModalService.confirmContainerDeletion(title, function (result) { if(!result) { return; } - $scope.cleanAssociatedVolumes = false; + var cleanVolumes = false; if (result[0]) { - $scope.cleanAssociatedVolumes = true; + cleanVolumes = true; } - $scope.removeAction(); + removeAction(selectedItems, cleanVolumes); } ); }; - function toggleItemSelection(item) { - if (item.Checked) { - $scope.state.selectedItemCount++; - } else { - $scope.state.selectedItemCount--; - } + function executeActionOnContainerList(containers, action, successMessage, errorMessage) { + var actionCount = containers.length; + angular.forEach(containers, function (container) { + action(container.Id) + .then(function success() { + Notifications.success(successMessage, container.Names[0]); + }) + .catch(function error(err) { + Notifications.error('Failure', err, errorMessage); + }) + .finally(function final() { + --actionCount; + if (actionCount === 0) { + $state.transitionTo($state.current, { selectedContainers: containers }, { reload: true }); + } + }); + }); } - function updateSelectionFlags() { - $scope.state.noStoppedItemsSelected = true; - $scope.state.noRunningItemsSelected = true; - $scope.state.noPausedItemsSelected = true; - $scope.containers.forEach(function(container) { - if(!container.Checked) { - return; - } - - if(container.Status === 'paused') { - $scope.state.noPausedItemsSelected = false; - } else if(container.Status === 'stopped' || - container.Status === 'created') { - $scope.state.noStoppedItemsSelected = false; - } else if(container.Status === 'running') { - $scope.state.noRunningItemsSelected = false; - } - } ); + function removeAction(containers, cleanVolumes) { + var actionCount = containers.length; + angular.forEach(containers, function (container) { + ContainerService.remove(container, cleanVolumes) + .then(function success() { + Notifications.success('Container successfully removed', container.Names[0]); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to remove container'); + }) + .finally(function final() { + --actionCount; + if (actionCount === 0) { + $state.reload(); + } + }); + }); } function retrieveSwarmHostsInfo(data) { @@ -231,17 +120,42 @@ angular.module('containers', []) return swarm_hosts; } + function assignContainers(containers, provider) { + var previouslySelectedContainers = $transition$.params().selectedContainers || []; + $scope.containers = containers.map(function (container) { + container.Status = $filter('containerstatus')(container.Status); + if (provider === 'DOCKER_SWARM') { + container.hostIP = $scope.swarm_hosts[_.split(container.Names[0], '/')[1]]; + } + + var previousContainer = _.find(previouslySelectedContainers, function(item) { + return item.Id === container.Id; + }); + + if (previousContainer && previousContainer.Checked) { + container.Checked = true; + } + + return container; + }); + } + function initView() { var provider = $scope.applicationState.endpoint.mode.provider; - $q.when(provider !== 'DOCKER_SWARM' || SystemService.info()) + + $q.all({ + swarm: provider !== 'DOCKER_SWARM' || SystemService.info(), + containers: ContainerService.containers(1) + }) .then(function success(data) { if (provider === 'DOCKER_SWARM') { - $scope.swarm_hosts = retrieveSwarmHostsInfo(data); + $scope.swarm_hosts = retrieveSwarmHostsInfo(data.swarm); } - update({all: $scope.state.displayAll ? 1 : 0}); + assignContainers(data.containers, provider); }) .catch(function error(err) { - Notifications.error('Failure', err, 'Unable to retrieve cluster information'); + Notifications.error('Failure', err, 'Unable to retrieve containers'); + $scope.containers = []; }); } diff --git a/app/components/createContainer/createcontainer.html b/app/components/createContainer/createcontainer.html index 32b329c94..8c9098368 100644 --- a/app/components/createContainer/createcontainer.html +++ b/app/components/createContainer/createcontainer.html @@ -523,7 +523,7 @@ Memory reservation
- +
@@ -541,7 +541,7 @@ Memory limit
- +
@@ -559,7 +559,7 @@ CPU limit
- +

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

- +
@@ -26,7 +26,7 @@ Memory limit
- +
@@ -44,7 +44,7 @@ CPU reservation
- +

@@ -59,7 +59,7 @@ CPU limit

- +

diff --git a/app/components/dashboard/dashboard.html b/app/components/dashboard/dashboard.html index fd192f0c4..b961e1266 100644 --- a/app/components/dashboard/dashboard.html +++ b/app/components/dashboard/dashboard.html @@ -78,7 +78,7 @@

- Go to cluster visualizer + Go to cluster visualizer
diff --git a/app/components/endpoints/endpoints.html b/app/components/endpoints/endpoints.html index 921a00397..743befc91 100644 --- a/app/components/endpoints/endpoints.html +++ b/app/components/endpoints/endpoints.html @@ -67,93 +67,26 @@
- +
-
- - - - -
-
- -
-
- - -
- Items per page: - -
- - -
- -
-
- -
- - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - Name - - - - - - URL - - - -
{{ endpoint.Name }}{{ endpoint.URL | stripprotocol }} - - Edit - - - Manage access - -
Loading...
No endpoints available.
-
- -
-
+ +
+ +
+
+ +
+
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: - -
- - -
- -
- - -
- - - - - - - - - - - - - - - -
- - Date - - - - - - Category - - - - - - Details - - - -
{{ event.Time|getisodatefromtimestamp }}{{ event.Type }}{{ event.Details }}
-
- -
-
- - +
+
diff --git a/app/components/events/eventsController.js b/app/components/events/eventsController.js index dc2f2ac31..997624c08 100644 --- a/app/components/events/eventsController.js +++ b/app/components/events/eventsController.js @@ -1,19 +1,6 @@ angular.module('events', []) -.controller('EventsController', ['$scope', 'Notifications', 'SystemService', 'Pagination', -function ($scope, Notifications, SystemService, Pagination) { - $scope.state = {}; - $scope.state.pagination_count = Pagination.getPaginationCount('events'); - $scope.sortType = 'Time'; - $scope.sortReverse = true; - - $scope.order = function(sortType) { - $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false; - $scope.sortType = sortType; - }; - - $scope.changePaginationCount = function() { - Pagination.setPaginationCount('events', $scope.state.pagination_count); - }; +.controller('EventsController', ['$scope', 'Notifications', 'SystemService', +function ($scope, Notifications, SystemService) { function initView() { var from = moment().subtract(24, 'hour').unix(); diff --git a/app/components/images/images.html b/app/components/images/images.html index 793da3767..942bdbe4a 100644 --- a/app/components/images/images.html +++ b/app/components/images/images.html @@ -41,112 +41,13 @@
-
- - -
- Items per page: - -
- - -
-
- - - -
-
-
- -
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - Id - - - - - - Tags - - - - - - Size - - - - - - Created - - - -
- {{ image.Id|truncate:20}} - Unused - - {{ tag }} - {{ image.VirtualSize|humansize }}{{ image.Created|getisodatefromtimestamp }}
Loading...
No images available.
-
- -
-
- - +
+
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: - -
- - - - - - - - - - - - - - - - - - - - - -
Id - - Status - - - - - - Slot - - - - - - Image - - - - - - Last update - - - -
{{ task.Id }}{{ task.Status.State }}{{ task.Slot ? task.Slot : '-' }}{{ task.Spec.ContainerSpec.Image | hideshasum }}{{ task.Updated | getisodate }}
-
- -
- - +
+
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: - -
- - -
- - Add registry -
-
- -
- - -
- - - - - - - - - - - - - - - - - - - - - - - -
- - - - Name - - - - - - URL - - - -
- {{ registry.Name }} - - - - {{ registry.URL }} - - Manage access - -
Loading...
No registries available.
-
- -
-
- - +
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 @@
-
- - - - -
- - Add secret -
-
- -
- - -
- - - - - - - - - - - - - - - - - - - - - -
- - - - Name - - - - - - Created at - - - - - - Ownership - - - -
{{ secret.Name }}{{ secret.CreatedAt | getisodate }} - - - {{ secret.ResourceControl.Ownership ? secret.ResourceControl.Ownership : secret.ResourceControl.Ownership = 'public' }} - -
Loading...
No secrets available.
-
- -
-
- - +
+
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: - -
- - -
- -
- - - - - - - - - - - - - - - - - - - - - -
Id - - Status - - - - - - Slot - - - - - - Node - - - - - - Last update - - - -
{{ task.Id }}{{ task.Status.State }}{{ task.Slot }}{{ task.NodeId | tasknodename: nodes }}{{ task.Updated | getisodate }}
-
- -
- - +
- diff --git a/app/components/service/service.html b/app/components/service/service.html index b5d1a8d90..4715f5323 100644 --- a/app/components/service/service.html +++ b/app/components/service/service.html @@ -75,7 +75,7 @@
- Logs + Logs
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: - -
- - -
- - Add service -
-
- -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - Name - - - - - - Stack - - - - - - Image - - - - - - Scheduling mode - - - - - - Published Ports - - - - - - Updated at - - - - - - Ownership - - - -
{{ service.Name }}{{ service.StackName ? service.StackName : '-' }}{{ service.Image | hideshasum }} - {{ service.Mode }} - {{ service.Running }} - / - {{ service.Replicas }} - - Scale - - - - - - - - - {{ p.PublishedPort }}:{{ p.TargetPort }} - - - - - {{ service.UpdatedAt|getisodate }} - - - - {{ service.ResourceControl.Ownership ? service.ResourceControl.Ownership : service.ResourceControl.Ownership = 'public' }} - -
Loading...
No services available.
-
- -
-
- - +
+
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 @@
  • Secrets
    • -
  • +
  • Events
  • diff --git a/app/components/stack/stack.html b/app/components/stack/stack.html index 07561503e..970f8c294 100644 --- a/app/components/stack/stack.html +++ b/app/components/stack/stack.html @@ -18,8 +18,31 @@ - - +
    +
    + +
    +
    + +
    +
    + +
    +
    diff --git a/app/components/stack/stackController.js b/app/components/stack/stackController.js index 63efdfeeb..5484ba82d 100644 --- a/app/components/stack/stackController.js +++ b/app/components/stack/stackController.js @@ -1,9 +1,10 @@ angular.module('stack', []) -.controller('StackController', ['$q', '$scope', '$state', '$stateParams', '$document', 'StackService', 'NodeService', 'ServiceService', 'TaskService', 'ServiceHelper', 'CodeMirrorService', 'Notifications', 'FormHelper', -function ($q, $scope, $state, $stateParams, $document, StackService, NodeService, ServiceService, TaskService, ServiceHelper, CodeMirrorService, Notifications, FormHelper) { +.controller('StackController', ['$q', '$scope', '$state', '$stateParams', '$document', 'StackService', 'NodeService', 'ServiceService', 'TaskService', 'ServiceHelper', 'CodeMirrorService', 'Notifications', 'FormHelper', 'EndpointProvider', +function ($q, $scope, $state, $stateParams, $document, StackService, NodeService, ServiceService, TaskService, ServiceHelper, CodeMirrorService, Notifications, FormHelper, EndpointProvider) { $scope.state = { - actionInProgress: false + actionInProgress: false, + publicURL: EndpointProvider.endpointPublicURL() }; $scope.deployStack = function () { diff --git a/app/components/stacks/stacks.html b/app/components/stacks/stacks.html index 503d4e6cd..ee72ffddf 100644 --- a/app/components/stacks/stacks.html +++ b/app/components/stacks/stacks.html @@ -7,7 +7,7 @@ Stacks -
    +
    @@ -27,7 +27,7 @@ Display external stacks
    @@ -39,81 +39,13 @@
    - - -
    - Items per page: - -
    -     - -
    - - Add stack -
    -
    - -
    -     - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - Name - - - - - - Ownership - - - -
    - - {{ stack.Name }} - - - {{ stack.Name }} - - - - - {{ stack.ResourceControl.Ownership ? stack.ResourceControl.Ownership : stack.ResourceControl.Ownership = 'public' }} - -
    Loading...
    No stacks available.
    -
    - -
    -
    -     - +
    diff --git a/app/components/stacks/stacksController.js b/app/components/stacks/stacksController.js index 9217a4ea1..40a54b074 100644 --- a/app/components/stacks/stacksController.js +++ b/app/components/stacks/stacksController.js @@ -1,63 +1,39 @@ angular.module('stacks', []) -.controller('StacksController', ['$scope', 'Notifications', 'Pagination', 'StackService', 'ModalService', -function ($scope, Notifications, Pagination, StackService, ModalService) { - $scope.state = {}; - $scope.state.selectedItemCount = 0; - $scope.state.pagination_count = Pagination.getPaginationCount('stacks'); - $scope.sortType = 'Name'; - $scope.sortReverse = false; - $scope.state.DisplayInformationPanel = false; - $scope.state.DisplayExternalStacks = true; - - $scope.changePaginationCount = function() { - Pagination.setPaginationCount('stacks', $scope.state.pagination_count); +.controller('StacksController', ['$scope', '$state', 'Notifications', 'StackService', 'ModalService', +function ($scope, $state, Notifications, StackService, ModalService) { + $scope.state = { + displayInformationPanel: false, + displayExternalStacks: true }; - $scope.order = function (sortType) { - $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false; - $scope.sortType = sortType; - }; - - $scope.selectItems = function (allSelected) { - angular.forEach($scope.state.filteredStacks, function (stack) { - if (stack.Id && stack.Checked !== allSelected) { - stack.Checked = allSelected; - $scope.selectItem(stack); - } - }); - }; - - $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 stack(s)? Associated services will be removed as well.', function onConfirm(confirmed) { if(!confirmed) { return; } - deleteSelectedStacks(); + deleteSelectedStacks(selectedItems); } ); }; - function deleteSelectedStacks() { - angular.forEach($scope.stacks, function (stack) { - if (stack.Checked) { - StackService.remove(stack) - .then(function success() { - Notifications.success('Stack deleted', stack.Name); - var index = $scope.stacks.indexOf(stack); - $scope.stacks.splice(index, 1); - }) - .catch(function error(err) { - Notifications.error('Failure', err, 'Unable to remove stack ' + stack.Name); - }); - } + function deleteSelectedStacks(stacks) { + var actionCount = stacks.length; + angular.forEach(stacks, function (stack) { + StackService.remove(stack) + .then(function success() { + Notifications.success('Stack successfully removed', stack.Name); + var index = $scope.stacks.indexOf(stack); + $scope.stacks.splice(index, 1); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to remove stack ' + stack.Name); + }) + .finally(function final() { + --actionCount; + if (actionCount === 0) { + $state.reload(); + } + }); }); } @@ -68,7 +44,7 @@ function ($scope, Notifications, Pagination, StackService, ModalService) { for (var i = 0; i < stacks.length; i++) { var stack = stacks[i]; if (stack.External) { - $scope.state.DisplayInformationPanel = true; + $scope.state.displayInformationPanel = true; break; } } diff --git a/app/components/swarm/swarm.html b/app/components/swarm/swarm.html index 30c2fe519..3a5029fc7 100644 --- a/app/components/swarm/swarm.html +++ b/app/components/swarm/swarm.html @@ -8,7 +8,7 @@
    -
    +
    @@ -60,7 +60,7 @@
    - Go to cluster visualizer + Go to cluster visualizer
    @@ -72,173 +72,20 @@
    -
    - - -
    - Items per page: - -
    -     - - - - - - - - - - - - - - - - - - - - - - -
    - - Name - - - - - - CPU - - - - - - Memory - - - - - - IP - - - - - - Engine - - - - - - Status - - - -
    {{ node.name }}{{ node.cpu }}{{ node.memory }}{{ node.ip }}{{ node.version }}{{ node.status }}
    -
    - -
    -     -     +
    +
    -
    - - -
    - Items per page: - -
    -     - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Name - - - - - - Role - - - - - - CPU - - - - - - Memory - - - - - - Engine - - - - - - IP Address - - - - - - Status - - - -
    - {{ node.Hostname }} - {{ node.Hostname }} - {{ node.Role }}{{ node.CPUs / 1000000000 }}{{ node.Memory|humansize }}{{ node.EngineVersion }}{{ node.Addr }}{{ node.Status }}
    -
    - -
    -     -     +
    +
    diff --git a/app/components/swarm/swarmController.js b/app/components/swarm/swarmController.js index e117cd06a..be346ba2a 100644 --- a/app/components/swarm/swarmController.js +++ b/app/components/swarm/swarmController.js @@ -1,25 +1,12 @@ angular.module('swarm', []) -.controller('SwarmController', ['$q', '$scope', 'SystemService', 'NodeService', 'Pagination', 'Notifications', 'StateManager', 'Authentication', -function ($q, $scope, SystemService, NodeService, Pagination, Notifications, StateManager, Authentication) { - $scope.state = {}; - $scope.state.pagination_count = Pagination.getPaginationCount('swarm_nodes'); - $scope.sortType = 'Spec.Role'; - $scope.sortReverse = false; +.controller('SwarmController', ['$q', '$scope', 'SystemService', 'NodeService', 'Notifications', 'StateManager', 'Authentication', +function ($q, $scope, SystemService, NodeService, Notifications, StateManager, Authentication) { $scope.info = {}; $scope.docker = {}; $scope.swarm = {}; $scope.totalCPU = 0; $scope.totalMemory = 0; - $scope.order = function(sortType) { - $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false; - $scope.sortType = sortType; - }; - - $scope.changePaginationCount = function() { - Pagination.setPaginationCount('swarm_nodes', $scope.state.pagination_count); - }; - function extractSwarmInfo(info) { // Swarm info is available in SystemStatus object var systemStatus = info.SystemStatus; diff --git a/app/components/team/team.html b/app/components/team/team.html index 17a1a2798..f933f8786 100644 --- a/app/components/team/team.html +++ b/app/components/team/team.html @@ -76,7 +76,7 @@ {{ user.Username }} - Add + Add @@ -143,7 +143,7 @@ {{ user.Username }} - Remove + Remove @@ -151,8 +151,8 @@ {{ user.TeamRole }} - Leader - Member + Leader + Member diff --git a/app/components/team/teamController.js b/app/components/team/teamController.js index d174fa5cb..faf152e2e 100644 --- a/app/components/team/teamController.js +++ b/app/components/team/teamController.js @@ -1,10 +1,10 @@ angular.module('team', []) -.controller('TeamController', ['$q', '$scope', '$state', '$transition$', 'TeamService', 'UserService', 'TeamMembershipService', 'ModalService', 'Notifications', 'Pagination', 'Authentication', -function ($q, $scope, $state, $transition$, TeamService, UserService, TeamMembershipService, ModalService, Notifications, Pagination, Authentication) { +.controller('TeamController', ['$q', '$scope', '$state', '$transition$', 'TeamService', 'UserService', 'TeamMembershipService', 'ModalService', 'Notifications', 'PaginationService', 'Authentication', +function ($q, $scope, $state, $transition$, TeamService, UserService, TeamMembershipService, ModalService, Notifications, PaginationService, Authentication) { $scope.state = { - pagination_count_users: Pagination.getPaginationCount('team_available_users'), - pagination_count_members: Pagination.getPaginationCount('team_members') + pagination_count_users: PaginationService.getPaginationLimit('team_available_users'), + pagination_count_members: PaginationService.getPaginationLimit('team_members') }; $scope.sortTypeUsers = 'Username'; $scope.sortReverseUsers = true; @@ -18,7 +18,7 @@ function ($q, $scope, $state, $transition$, TeamService, UserService, TeamMember }; $scope.changePaginationCountUsers = function() { - Pagination.setPaginationCount('team_available_users', $scope.state.pagination_count_users); + PaginationService.setPaginationLimit('team_available_users', $scope.state.pagination_count_users); }; $scope.sortTypeGroupMembers = 'TeamRole'; @@ -30,7 +30,7 @@ function ($q, $scope, $state, $transition$, TeamService, UserService, TeamMember }; $scope.changePaginationCountGroupMembers = function() { - Pagination.setPaginationCount('team_members', $scope.state.pagination_count_members); + PaginationService.setPaginationLimit('team_members', $scope.state.pagination_count_members); }; $scope.deleteTeam = function() { diff --git a/app/components/teams/teams.html b/app/components/teams/teams.html index 3d1fb16d1..f672f9be2 100644 --- a/app/components/teams/teams.html +++ b/app/components/teams/teams.html @@ -65,67 +65,12 @@
    -
    - - -
    - Items per page: - -
    -     - -
    - -
    -
    - -
    -     - -
    - - - - - - - - - - - - - - - - - - - - - -
    - - - - Name - - - -
    {{ team.Name }} - Edit -
    Loading...
    No teams available.
    -
    - -
    -
    -     -     +
    +
    diff --git a/app/components/teams/teamsController.js b/app/components/teams/teamsController.js index 41c0e1288..986a09e3d 100644 --- a/app/components/teams/teamsController.js +++ b/app/components/teams/teamsController.js @@ -1,47 +1,17 @@ angular.module('teams', []) -.controller('TeamsController', ['$q', '$scope', '$state', 'TeamService', 'UserService', 'TeamMembershipService', 'ModalService', 'Notifications', 'Pagination', 'Authentication', -function ($q, $scope, $state, TeamService, UserService, TeamMembershipService, ModalService, Notifications, Pagination, Authentication) { +.controller('TeamsController', ['$q', '$scope', '$state', 'TeamService', 'UserService', 'ModalService', 'Notifications', 'Authentication', +function ($q, $scope, $state, TeamService, UserService, ModalService, Notifications, Authentication) { $scope.state = { userGroupGroupCreationError: '', - selectedItemCount: 0, validName: false, - pagination_count: Pagination.getPaginationCount('teams'), actionInProgress: false }; - $scope.sortType = 'Name'; - $scope.sortReverse = false; $scope.formValues = { Name: '', Leaders: [] }; - $scope.order = function(sortType) { - $scope.sortReverse = ($scope.sortType === sortType) ? !$scope.sortReverse : false; - $scope.sortType = sortType; - }; - - $scope.changePaginationCount = function() { - Pagination.setPaginationCount('teams', $scope.state.pagination_count); - }; - - $scope.selectItems = function (allSelected) { - angular.forEach($scope.state.filteredTeams, function (team) { - if (team.Checked !== allSelected) { - team.Checked = allSelected; - $scope.selectItem(team); - } - }); - }; - - $scope.selectItem = function (item) { - if (item.Checked) { - $scope.state.selectedItemCount++; - } else { - $scope.state.selectedItemCount--; - } - }; - $scope.checkNameValidity = function() { var valid = true; for (var i = 0; i < $scope.teams.length; i++) { @@ -76,32 +46,37 @@ function ($q, $scope, $state, TeamService, UserService, TeamMembershipService, M }); }; - function deleteSelectedTeams() { - angular.forEach($scope.teams, function (team) { - if (team.Checked) { - TeamService.deleteTeam(team.Id) - .then(function success(data) { - var index = $scope.teams.indexOf(team); - $scope.teams.splice(index, 1); - Notifications.success('Team successfully deleted', team.Name); - }) - .catch(function error(err) { - Notifications.error('Failure', err, 'Unable to remove team'); - }); - } - }); - } - - $scope.removeAction = function () { + $scope.removeAction = function (selectedItems) { ModalService.confirmDeletion( 'Do you want to delete the selected team(s)? Users in the team(s) will not be deleted.', function onConfirm(confirmed) { if(!confirmed) { return; } - deleteSelectedTeams(); + deleteSelectedTeams(selectedItems); } ); }; + function deleteSelectedTeams(selectedItems) { + var actionCount = selectedItems.length; + angular.forEach(selectedItems, function (team) { + TeamService.deleteTeam(team.Id) + .then(function success() { + Notifications.success('Team successfully removed', team.Name); + var index = $scope.teams.indexOf(team); + $scope.teams.splice(index, 1); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to remove team'); + }) + .finally(function final() { + --actionCount; + if (actionCount === 0) { + $state.reload(); + } + }); + }); + } + function initView() { var userDetails = Authentication.getUserDetails(); var isAdmin = userDetails.role === 1 ? true: false; diff --git a/app/components/templates/templatesController.js b/app/components/templates/templatesController.js index 142683224..beff4d48f 100644 --- a/app/components/templates/templatesController.js +++ b/app/components/templates/templatesController.js @@ -1,6 +1,6 @@ angular.module('templates', []) -.controller('TemplatesController', ['$scope', '$q', '$state', '$transition$', '$anchorScroll', '$filter', 'ContainerService', 'ContainerHelper', 'ImageService', 'NetworkService', 'TemplateService', 'TemplateHelper', 'VolumeService', 'Notifications', 'Pagination', 'ResourceControlService', 'Authentication', 'FormValidator', 'SettingsService', 'StackService', -function ($scope, $q, $state, $transition$, $anchorScroll, $filter, ContainerService, ContainerHelper, ImageService, NetworkService, TemplateService, TemplateHelper, VolumeService, Notifications, Pagination, ResourceControlService, Authentication, FormValidator, SettingsService, StackService) { +.controller('TemplatesController', ['$scope', '$q', '$state', '$transition$', '$anchorScroll', '$filter', 'ContainerService', 'ContainerHelper', 'ImageService', 'NetworkService', 'TemplateService', 'TemplateHelper', 'VolumeService', 'Notifications', 'PaginationService', 'ResourceControlService', 'Authentication', 'FormValidator', 'SettingsService', 'StackService', +function ($scope, $q, $state, $transition$, $anchorScroll, $filter, ContainerService, ContainerHelper, ImageService, NetworkService, TemplateService, TemplateHelper, VolumeService, Notifications, PaginationService, ResourceControlService, Authentication, FormValidator, SettingsService, StackService) { $scope.state = { selectedTemplate: null, showAdvancedOptions: false, diff --git a/app/components/users/users.html b/app/components/users/users.html index 521dab42e..9f6535c4d 100644 --- a/app/components/users/users.html +++ b/app/components/users/users.html @@ -113,91 +113,12 @@
    -
    - - -
    - Items per page: - -
    -     - -
    - -
    -
    - -
    -     - -
    - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - Name - - - - - - Role - - - - - - Authentication - - - -
    {{ user.Username }} - - - - {{ user.RoleName }} - - Internal - LDAP - - Edit -
    Loading...
    No users available.
    -
    - -
    -
    -     -     +
    +
    diff --git a/app/components/users/usersController.js b/app/components/users/usersController.js index 61159f62c..c96d34eff 100644 --- a/app/components/users/usersController.js +++ b/app/components/users/usersController.js @@ -1,15 +1,11 @@ angular.module('users', []) -.controller('UsersController', ['$q', '$scope', '$state', '$sanitize', 'UserService', 'TeamService', 'TeamMembershipService', 'ModalService', 'Notifications', 'Pagination', 'Authentication', 'SettingsService', -function ($q, $scope, $state, $sanitize, UserService, TeamService, TeamMembershipService, ModalService, Notifications, Pagination, Authentication, SettingsService) { +.controller('UsersController', ['$q', '$scope', '$state', '$sanitize', 'UserService', 'TeamService', 'TeamMembershipService', 'ModalService', 'Notifications', 'Authentication', 'SettingsService', +function ($q, $scope, $state, $sanitize, UserService, TeamService, TeamMembershipService, ModalService, Notifications, Authentication, SettingsService) { $scope.state = { userCreationError: '', - selectedItemCount: 0, validUsername: false, - pagination_count: Pagination.getPaginationCount('users'), actionInProgress: false }; - $scope.sortType = 'RoleName'; - $scope.sortReverse = false; $scope.formValues = { Username: '', @@ -19,32 +15,6 @@ function ($q, $scope, $state, $sanitize, UserService, TeamService, TeamMembershi Teams: [] }; - $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.filteredUsers, function (user) { - if (user.Checked !== allSelected) { - user.Checked = allSelected; - $scope.selectItem(user); - } - }); - }; - - $scope.selectItem = function (item) { - if (item.Checked) { - $scope.state.selectedItemCount++; - } else { - $scope.state.selectedItemCount--; - } - }; - $scope.checkUsernameValidity = function() { var valid = true; for (var i = 0; i < $scope.users.length; i++) { @@ -80,28 +50,33 @@ function ($q, $scope, $state, $sanitize, UserService, TeamService, TeamMembershi }); }; - function deleteSelectedUsers() { - angular.forEach($scope.users, function (user) { - if (user.Checked) { - UserService.deleteUser(user.Id) - .then(function success(data) { - var index = $scope.users.indexOf(user); - $scope.users.splice(index, 1); - Notifications.success('User successfully deleted', user.Username); - }) - .catch(function error(err) { - Notifications.error('Failure', err, 'Unable to remove user'); - }); - } + function deleteSelectedUsers(selectedItems) { + var actionCount = selectedItems.length; + angular.forEach(selectedItems, function (user) { + UserService.deleteUser(user.Id) + .then(function success() { + Notifications.success('User successfully removed', user.Username); + var index = $scope.users.indexOf(user); + $scope.users.splice(index, 1); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to remove user'); + }) + .finally(function final() { + --actionCount; + if (actionCount === 0) { + $state.reload(); + } + }); }); } - $scope.removeAction = function () { + $scope.removeAction = function (selectedItems) { ModalService.confirmDeletion( 'Do you want to remove the selected users? They will not be able to login into Portainer anymore.', function onConfirm(confirmed) { if(!confirmed) { return; } - deleteSelectedUsers(); + deleteSelectedUsers(selectedItems); } ); }; diff --git a/app/components/volumes/volumes.html b/app/components/volumes/volumes.html index 845904fb4..de8e50880 100644 --- a/app/components/volumes/volumes.html +++ b/app/components/volumes/volumes.html @@ -7,114 +7,14 @@ Volumes -
    - - -
    - Items per page: - -
    -     - -
    - - Add volume -
    -
    - -
    - - - - - -     - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - Name - - - - - - Stack - - - - - - Driver - - - - - - Mount point - - - - - - Ownership - - - -
    - {{ volume.Id|truncate:25 }} - Unused{{ volume.StackName ? volume.StackName : '-' }}{{ volume.Driver }}{{ volume.Mountpoint | truncatelr }} - - - {{ volume.ResourceControl.Ownership ? volume.ResourceControl.Ownership : volume.ResourceControl.Ownership = 'public' }} - -
    Loading...
    No volumes available.
    -
    - -
    -
    -     -     +
    +
    + +
    diff --git a/app/components/volumes/volumesController.js b/app/components/volumes/volumesController.js index 836692b32..0e21b48b5 100644 --- a/app/components/volumes/volumesController.js +++ b/app/components/volumes/volumesController.js @@ -1,67 +1,32 @@ angular.module('volumes', []) -.controller('VolumesController', ['$q', '$scope', 'VolumeService', 'Notifications', 'Pagination', -function ($q, $scope, VolumeService, Notifications, Pagination) { - $scope.state = {}; - $scope.state.pagination_count = Pagination.getPaginationCount('volumes'); - $scope.state.selectedItemCount = 0; - $scope.sortType = 'Id'; - $scope.sortReverse = false; +.controller('VolumesController', ['$q', '$scope', '$state', 'VolumeService', 'Notifications', +function ($q, $scope, $state, VolumeService, Notifications) { - $scope.changePaginationCount = function() { - Pagination.setPaginationCount('volumes', $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.filteredVolumes, function (volume) { - if (volume.Checked !== allSelected) { - volume.Checked = allSelected; - $scope.selectItem(volume); - } - }); - }; - - $scope.selectItem = function (item) { - if (item.Checked) { - $scope.state.selectedItemCount++; - } else { - $scope.state.selectedItemCount--; - } - }; - - $scope.removeAction = function () { - angular.forEach($scope.volumes, function (volume) { - if (volume.Checked) { - VolumeService.remove(volume) - .then(function success() { - Notifications.success('Volume deleted', volume.Id); - var index = $scope.volumes.indexOf(volume); - $scope.volumes.splice(index, 1); - }) - .catch(function error(err) { - Notifications.error('Failure', err, 'Unable to remove volume'); - }); - } + $scope.removeAction = function (selectedItems) { + var actionCount = selectedItems.length; + angular.forEach(selectedItems, function (volume) { + VolumeService.remove(volume) + .then(function success() { + Notifications.success('Volume successfully removed', volume.Id); + var index = $scope.volumes.indexOf(volume); + $scope.volumes.splice(index, 1); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to remove volume'); + }) + .finally(function final() { + --actionCount; + if (actionCount === 0) { + $state.reload(); + } + }); }); }; function initView() { - $q.all({ - attached: VolumeService.volumes({ - filters: { - 'dangling': ['false'] - } - }), - dangling: VolumeService.volumes({ - filters: { - 'dangling': ['true'] - } - }) + attached: VolumeService.volumes({ filters: { 'dangling': ['false'] } }), + dangling: VolumeService.volumes({ filters: { 'dangling': ['true'] } }) }) .then(function success(data) { $scope.volumes = data.attached.map(function(volume) { diff --git a/app/directives/accessControlPanel/porAccessControlPanel.html b/app/directives/accessControlPanel/porAccessControlPanel.html index e9fd62cd2..e29817aab 100644 --- a/app/directives/accessControlPanel/porAccessControlPanel.html +++ b/app/directives/accessControlPanel/porAccessControlPanel.html @@ -67,7 +67,7 @@ && !$ctrl.state.editOwnership && ($ctrl.isAdmin || $ctrl.state.canEditOwnership)"> - Change ownership + Change ownership diff --git a/app/directives/accessManagement/porAccessManagementController.js b/app/directives/accessManagement/porAccessManagementController.js index 34f130c20..87f00a649 100644 --- a/app/directives/accessManagement/porAccessManagementController.js +++ b/app/directives/accessManagement/porAccessManagementController.js @@ -1,11 +1,11 @@ angular.module('portainer') -.controller('porAccessManagementController', ['AccessService', 'Pagination', 'Notifications', -function (AccessService, Pagination, Notifications) { +.controller('porAccessManagementController', ['AccessService', 'PaginationService', 'Notifications', +function (AccessService, PaginationService, Notifications) { var ctrl = this; ctrl.state = { - pagination_count_accesses: Pagination.getPaginationCount('access_management_accesses'), - pagination_count_authorizedAccesses: Pagination.getPaginationCount('access_management_AuthorizedAccesses'), + pagination_count_accesses: PaginationService.getPaginationLimit('access_management_accesses'), + pagination_count_authorizedAccesses: PaginationService.getPaginationLimit('access_management_AuthorizedAccesses'), sortAccessesBy: 'Type', sortAccessesReverse: false, sortAuthorizedAccessesBy: 'Type', @@ -23,11 +23,11 @@ function (AccessService, Pagination, Notifications) { }; ctrl.changePaginationCountAuthorizedAccesses = function() { - Pagination.setPaginationCount('access_management_AuthorizedAccesses', ctrl.state.pagination_count_authorizedAccesses); + PaginationService.setPaginationLimit('access_management_AuthorizedAccesses', ctrl.state.pagination_count_authorizedAccesses); }; ctrl.changePaginationCountAccesses = function() { - Pagination.setPaginationCount('access_management_accesses', ctrl.state.pagination_count_accesses); + PaginationService.setPaginationLimit('access_management_accesses', ctrl.state.pagination_count_accesses); }; function dispatchUserAndTeamIDs(accesses, users, teams) { diff --git a/app/directives/serviceList/por-service-list.js b/app/directives/serviceList/por-service-list.js deleted file mode 100644 index 4a33ba96e..000000000 --- a/app/directives/serviceList/por-service-list.js +++ /dev/null @@ -1,8 +0,0 @@ -angular.module('portainer').component('porServiceList', { - templateUrl: 'app/directives/serviceList/porServiceList.html', - controller: 'porServiceListController', - bindings: { - 'services': '<', - 'nodes': '<' - } -}); diff --git a/app/directives/serviceList/porServiceList.html b/app/directives/serviceList/porServiceList.html deleted file mode 100644 index e87f74d15..000000000 --- a/app/directives/serviceList/porServiceList.html +++ /dev/null @@ -1,98 +0,0 @@ -
    -
    - - -
    - Items per page: - -
    -     - -
    - -
    -     - -
    - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - Name - - - - - - Image - - - - - - Scheduling mode - - - - - - Published Ports - - - - - - Updated at - - - -
    {{ service.Name }}{{ service.Image | hideshasum }} - {{ service.Mode }} - {{ service.Tasks | runningtaskscount }} - / - {{ service.Mode === 'replicated' ? service.Replicas : ($ctrl.nodes | availablenodecount) }} - - - {{ p.PublishedPort }}:{{ p.TargetPort }} - - - - - {{ service.UpdatedAt|getisodate }} -
    Loading...
    No services available.
    -
    - -
    -
    -     - -
    -
    diff --git a/app/directives/serviceList/porServiceList.js b/app/directives/serviceList/porServiceList.js deleted file mode 100644 index b755ef70c..000000000 --- a/app/directives/serviceList/porServiceList.js +++ /dev/null @@ -1,21 +0,0 @@ -angular.module('portainer') -.controller('porServiceListController', ['EndpointProvider', 'Pagination', -function (EndpointProvider, Pagination) { - var ctrl = this; - ctrl.state = { - pagination_count: Pagination.getPaginationCount('services_list'), - publicURL: EndpointProvider.endpointPublicURL() - }; - ctrl.sortType = 'Name'; - ctrl.sortReverse = false; - - ctrl.order = function(sortType) { - ctrl.sortReverse = (ctrl.sortType === sortType) ? !ctrl.sortReverse : false; - ctrl.sortType = sortType; - }; - - ctrl.changePaginationCount = function() { - Pagination.setPaginationCount('services_list', ctrl.state.pagination_count); - }; - -}]); diff --git a/app/directives/slider/por-slider.js b/app/directives/slider/por-slider.js deleted file mode 100644 index a44104789..000000000 --- a/app/directives/slider/por-slider.js +++ /dev/null @@ -1,12 +0,0 @@ -angular.module('portainer').component('porSlider', { - templateUrl: 'app/directives/slider/porSlider.html', - controller: 'porSliderController', - bindings: { - model: '=', - onChange: '&', - floor: '<', - ceil: '<', - step: '<', - precision: '<' - } -}); diff --git a/app/directives/taskList/por-task-list.js b/app/directives/taskList/por-task-list.js deleted file mode 100644 index 6ed1483d3..000000000 --- a/app/directives/taskList/por-task-list.js +++ /dev/null @@ -1,8 +0,0 @@ -angular.module('portainer').component('porTaskList', { - templateUrl: 'app/directives/taskList/porTaskList.html', - controller: 'porTaskListController', - bindings: { - 'tasks': '<', - 'nodes': '<' - } -}); diff --git a/app/directives/taskList/porTaskList.html b/app/directives/taskList/porTaskList.html deleted file mode 100644 index c2c75d7da..000000000 --- a/app/directives/taskList/porTaskList.html +++ /dev/null @@ -1,78 +0,0 @@ -
    -
    - - -
    - Items per page: - -
    -     - -
    - -
    -     - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Id - - Status - - - - - - Slot - - - - - - Node - - - - - - Last update - - - -
    {{ task.Id }}{{ task.Status.State }}{{ task.Slot ? task.Slot : '-' }}{{ task.NodeId | tasknodename: $ctrl.nodes }}{{ task.Updated | getisodate }}
    Loading...
    No tasks available.
    -
    - -
    -     -     -
    -
    diff --git a/app/directives/taskList/porTaskList.js b/app/directives/taskList/porTaskList.js deleted file mode 100644 index e53f546d0..000000000 --- a/app/directives/taskList/porTaskList.js +++ /dev/null @@ -1,19 +0,0 @@ -angular.module('portainer') -.controller('porTaskListController', ['Pagination', -function (Pagination) { - var ctrl = this; - ctrl.state = { - pagination_count: Pagination.getPaginationCount('tasks_list') - }; - ctrl.sortType = 'Updated'; - ctrl.sortReverse = true; - - ctrl.order = function(sortType) { - ctrl.sortReverse = (ctrl.sortType === sortType) ? !ctrl.sortReverse : false; - ctrl.sortType = sortType; - }; - - ctrl.changePaginationCount = function() { - Pagination.setPaginationCount('tasks_list', ctrl.state.pagination_count); - }; -}]); diff --git a/app/directives/ui/__module.js b/app/directives/ui/__module.js new file mode 100644 index 000000000..0a18652c8 --- /dev/null +++ b/app/directives/ui/__module.js @@ -0,0 +1 @@ +angular.module('ui', []); diff --git a/app/directives/ui/datatables/common/genericDatatableController.js b/app/directives/ui/datatables/common/genericDatatableController.js new file mode 100644 index 000000000..8a47d7808 --- /dev/null +++ b/app/directives/ui/datatables/common/genericDatatableController.js @@ -0,0 +1,65 @@ +angular.module('ui') +.controller('GenericDatatableController', ['PaginationService', 'DatatableService', +function (PaginationService, DatatableService) { + + this.state = { + selectAll: false, + orderBy: this.orderBy, + paginatedItemLimit: PaginationService.getPaginationLimit(this.tableKey), + displayTextFilter: false, + selectedItemCount: 0, + selectedItems: [] + }; + + this.changeOrderBy = function(orderField) { + this.state.reverseOrder = this.state.orderBy === orderField ? !this.state.reverseOrder : false; + this.state.orderBy = orderField; + DatatableService.setDataTableOrder(this.tableKey, orderField, this.state.reverseOrder); + }; + + this.selectItem = function(item) { + if (item.Checked) { + this.state.selectedItemCount++; + this.state.selectedItems.push(item); + } else { + this.state.selectedItems.splice(this.state.selectedItems.indexOf(item), 1); + this.state.selectedItemCount--; + } + }; + + this.selectAll = function() { + for (var i = 0; i < this.state.filteredDataSet.length; i++) { + var item = this.state.filteredDataSet[i]; + if (item.Checked !== this.state.selectAll) { + item.Checked = this.state.selectAll; + this.selectItem(item); + } + } + }; + + this.changePaginationLimit = function() { + PaginationService.setPaginationLimit(this.tableKey, this.state.paginatedItemLimit); + }; + + this.updateDisplayTextFilter = function() { + this.state.displayTextFilter = !this.state.displayTextFilter; + if (!this.state.displayTextFilter) { + delete this.state.textFilter; + } + }; + + this.$onInit = function() { + setDefaults(this); + + var storedOrder = DatatableService.getDataTableOrder(this.tableKey); + if (storedOrder !== null) { + this.state.reverseOrder = storedOrder.reverse; + this.state.orderBy = storedOrder.orderBy; + } + }; + + function setDefaults(ctrl) { + ctrl.showTextFilter = ctrl.showTextFilter ? ctrl.showTextFilter : false; + ctrl.state.reverseOrder = ctrl.reverseOrder ? ctrl.reverseOrder : false; + } +}]); diff --git a/app/directives/ui/datatables/configs-datatable/configsDatatable.html b/app/directives/ui/datatables/configs-datatable/configsDatatable.html new file mode 100644 index 000000000..81963f013 --- /dev/null +++ b/app/directives/ui/datatables/configs-datatable/configsDatatable.html @@ -0,0 +1,108 @@ +
    + + +
    +
    + {{ $ctrl.title }} +
    +
    + + Search + +
    +
    +
    + + +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + Name + + + + + + Creation Date + + + + + + Ownership + + + +
    + + + + + {{ item.Name }} + {{ item.CreatedAt | getisodate }} + + + {{ item.ResourceControl.Ownership ? item.ResourceControl.Ownership : item.ResourceControl.Ownership = 'public' }} + +
    Loading...
    No config available.
    +
    +
    +
    + {{ $ctrl.state.selectedItemCount }} item(s) selected +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    diff --git a/app/directives/ui/datatables/configs-datatable/configsDatatable.js b/app/directives/ui/datatables/configs-datatable/configsDatatable.js new file mode 100644 index 000000000..d7a81678f --- /dev/null +++ b/app/directives/ui/datatables/configs-datatable/configsDatatable.js @@ -0,0 +1,15 @@ +angular.module('ui').component('configsDatatable', { + templateUrl: 'app/directives/ui/datatables/configs-datatable/configsDatatable.html', + controller: 'GenericDatatableController', + bindings: { + title: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + showTextFilter: '<', + showOwnershipColumn: '<', + removeAction: '<' + } +}); diff --git a/app/directives/ui/datatables/container-networks-datatable/containerNetworksDatatable.html b/app/directives/ui/datatables/container-networks-datatable/containerNetworksDatatable.html new file mode 100644 index 000000000..f4f089789 --- /dev/null +++ b/app/directives/ui/datatables/container-networks-datatable/containerNetworksDatatable.html @@ -0,0 +1,82 @@ +
    + + +
    +
    + {{ $ctrl.title }} +
    +
    +
    +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    NetworkIP AddressGatewayMAC AddressActions
    {{ key }}{{ value.IPAddress || '-' }}{{ value.Gateway || '-' }}{{ value.MacAddress || '-' }} + +
    Loading...
    No network available.
    +
    +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    diff --git a/app/directives/ui/datatables/container-networks-datatable/containerNetworksDatatable.js b/app/directives/ui/datatables/container-networks-datatable/containerNetworksDatatable.js new file mode 100644 index 000000000..a4e63b4ed --- /dev/null +++ b/app/directives/ui/datatables/container-networks-datatable/containerNetworksDatatable.js @@ -0,0 +1,16 @@ +angular.module('ui').component('containerNetworksDatatable', { + templateUrl: 'app/directives/ui/datatables/container-networks-datatable/containerNetworksDatatable.html', + controller: 'GenericDatatableController', + bindings: { + title: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + container: '<', + availableNetworks: '<', + joinNetworkAction: '<', + joinNetworkActionInProgress: '<', + leaveNetworkActionInProgress: '<', + leaveNetworkAction: '<' + } +}); diff --git a/app/directives/ui/datatables/container-processes-datatable/containerProcessesDatatable.html b/app/directives/ui/datatables/container-processes-datatable/containerProcessesDatatable.html new file mode 100644 index 000000000..f3a773706 --- /dev/null +++ b/app/directives/ui/datatables/container-processes-datatable/containerProcessesDatatable.html @@ -0,0 +1,61 @@ +
    + + +
    +
    + {{ $ctrl.title }} +
    +
    + + Search + +
    +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + +
    + {{ header }} +
    {{ info }}
    Loading...
    No process available.
    +
    +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    diff --git a/app/directives/ui/datatables/container-processes-datatable/containerProcessesDatatable.js b/app/directives/ui/datatables/container-processes-datatable/containerProcessesDatatable.js new file mode 100644 index 000000000..c8fe7f2c2 --- /dev/null +++ b/app/directives/ui/datatables/container-processes-datatable/containerProcessesDatatable.js @@ -0,0 +1,14 @@ +angular.module('ui').component('containerProcessesDatatable', { + templateUrl: 'app/directives/ui/datatables/container-processes-datatable/containerProcessesDatatable.html', + controller: 'GenericDatatableController', + bindings: { + title: '@', + titleIcon: '@', + dataset: '=', + headerset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + showTextFilter: '<' + } +}); diff --git a/app/directives/ui/datatables/containers-datatable/containersDatatable.html b/app/directives/ui/datatables/containers-datatable/containersDatatable.html new file mode 100644 index 000000000..a590dd4e8 --- /dev/null +++ b/app/directives/ui/datatables/containers-datatable/containersDatatable.html @@ -0,0 +1,254 @@ +
    + + +
    +
    + {{ $ctrl.title }} +
    +
    + + Search + + + Settings +
    +
    +
    + Table settings +
    +
    +
    + + +
    +
    +
    + Quick actions +
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    + Close +
    +
    +
    +     +
    +
    +
    +
    + + + + + + + +
    + +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + Name + + + + + + State + + + +
    + Filter + Filter +
    +
    +
    +
    + Filter by state +
    +
    +
    + + +
    +
    +
    + Close +
    +
    +
    +     		+ Quick actions + + + Stack + + + + + + Image + + + + + + IP Address + + + + + + Host IP + + + + + + Published Ports + + + + + + Ownership + + + +
    + + + + + {{ item | containername | truncate: $ctrl.settings.containerNameTruncateSize }} + {{ item | swarmcontainername | truncate: $ctrl.settings.containerNameTruncateSize }} + + {{ item.Status }} + {{ item.Status }} + +
    + + + + +
    +     		{{ item.StackName ? item.StackName : '-' }}{{ item.Image | hideshasum }}{{ item.IP ? item.IP : '-' }}{{ item.hostIP }} + + {{ p.public }}:{{ p.private }} + + - + + + + {{ item.ResourceControl.Ownership ? item.ResourceControl.Ownership : item.ResourceControl.Ownership = 'public' }} + +
    Loading...
    No container available.
    +
    +
    +
    + {{ $ctrl.state.selectedItemCount }} item(s) selected +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    diff --git a/app/directives/ui/datatables/containers-datatable/containersDatatable.js b/app/directives/ui/datatables/containers-datatable/containersDatatable.js new file mode 100644 index 000000000..fa9d0cc46 --- /dev/null +++ b/app/directives/ui/datatables/containers-datatable/containersDatatable.js @@ -0,0 +1,24 @@ +angular.module('ui').component('containersDatatable', { + templateUrl: 'app/directives/ui/datatables/containers-datatable/containersDatatable.html', + controller: 'ContainersDatatableController', + bindings: { + title: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + showTextFilter: '<', + showOwnershipColumn: '<', + swarmContainers: '<', + publicUrl: '<', + containerNameTruncateSize: '<', + startAction: '<', + stopAction: '<', + killAction: '<', + restartAction: '<', + pauseAction: '<', + resumeAction: '<', + removeAction: '<' + } +}); diff --git a/app/directives/ui/datatables/containers-datatable/containersDatatableController.js b/app/directives/ui/datatables/containers-datatable/containersDatatableController.js new file mode 100644 index 000000000..ccd65507a --- /dev/null +++ b/app/directives/ui/datatables/containers-datatable/containersDatatableController.js @@ -0,0 +1,171 @@ +angular.module('ui') +.controller('ContainersDatatableController', ['PaginationService', 'DatatableService', +function (PaginationService, DatatableService) { + + var ctrl = this; + + this.state = { + selectAll: false, + orderBy: this.orderBy, + paginatedItemLimit: PaginationService.getPaginationLimit(this.tableKey), + displayTextFilter: false, + selectedItemCount: 0, + selectedItems: [] + }; + + this.settings = { + open: false, + truncateContainerName: true, + containerNameTruncateSize: 32, + showQuickActionStats: true, + showQuickActionLogs: true, + showQuickActionConsole: true, + showQuickActionInspect: true + }; + + this.filters = { + state: { + open: false, + enabled: false, + values: [] + } + }; + + this.changeOrderBy = function(orderField) { + this.state.reverseOrder = this.state.orderBy === orderField ? !this.state.reverseOrder : false; + this.state.orderBy = orderField; + DatatableService.setDataTableOrder(this.tableKey, orderField, this.state.reverseOrder); + }; + + this.toggleItemSelection = function(item) { + if (item.Checked) { + this.state.selectedItemCount++; + this.state.selectedItems.push(item); + } else { + this.state.selectedItems.splice(this.state.selectedItems.indexOf(item), 1); + this.state.selectedItemCount--; + } + }; + + this.selectItem = function(item) { + this.toggleItemSelection(item); + this.updateSelectionState(); + }; + + this.selectAll = function() { + for (var i = 0; i < this.state.filteredDataSet.length; i++) { + var item = this.state.filteredDataSet[i]; + if (item.Checked !== this.state.selectAll) { + item.Checked = this.state.selectAll; + this.toggleItemSelection(item); + } + } + this.updateSelectionState(); + }; + + this.updateSelectionState = function() { + this.state.noStoppedItemsSelected = true; + this.state.noRunningItemsSelected = true; + this.state.noPausedItemsSelected = true; + + for (var i = 0; i < this.dataset.length; i++) { + var item = this.dataset[i]; + if (item.Checked && item.Status === 'paused') { + this.state.noPausedItemsSelected = false; + } else if (item.Checked && (item.Status === 'stopped' || item.Status === 'created')) { + this.state.noStoppedItemsSelected = false; + } else if (item.Checked && item.Status === 'running') { + this.state.noRunningItemsSelected = false; + } + } + }; + + this.changePaginationLimit = function() { + PaginationService.setPaginationLimit(this.tableKey, this.state.paginatedItemLimit); + }; + + this.updateDisplayTextFilter = function() { + this.state.displayTextFilter = !this.state.displayTextFilter; + if (!this.state.displayTextFilter) { + delete this.state.textFilter; + } + }; + + this.applyFilters = function(value, index, array) { + var container = value; + var filters = ctrl.filters; + for (var i = 0; i < filters.state.values.length; i++) { + var filter = filters.state.values[i]; + if (container.Status === filter.label && filter.display) { + return true; + } + } + return false; + }; + + this.onStateFilterChange = function() { + var filters = this.filters.state.values; + var filtered = false; + for (var i = 0; i < filters.length; i++) { + var filter = filters[i]; + if (!filter.display) { + filtered = true; + } + } + this.filters.state.enabled = filtered; + DatatableService.setDataTableFilters(this.tableKey, this.filters); + }; + + this.onSettingsContainerNameTruncateChange = function() { + if (this.settings.truncateContainerName) { + this.settings.containerNameTruncateSize = 32; + } else { + this.settings.containerNameTruncateSize = 256; + } + DatatableService.setDataTableSettings(this.tableKey, this.settings); + }; + + this.onSettingsQuickActionChange = function() { + DatatableService.setDataTableSettings(this.tableKey, this.settings); + }; + + this.prepareTableFromDataset = function() { + var availableStateFilters = []; + for (var i = 0; i < this.dataset.length; i++) { + var item = this.dataset[i]; + if (item.Checked) { + this.selectItem(item); + } + availableStateFilters.push({ label: item.Status, display: true }); + } + this.filters.state.values = _.uniqBy(availableStateFilters, 'label'); + }; + + this.$onInit = function() { + setDefaults(this); + this.prepareTableFromDataset(); + + var storedOrder = DatatableService.getDataTableOrder(this.tableKey); + if (storedOrder !== null) { + this.state.reverseOrder = storedOrder.reverse; + this.state.orderBy = storedOrder.orderBy; + } + + var storedFilters = DatatableService.getDataTableFilters(this.tableKey); + if (storedFilters !== null) { + this.filters = storedFilters; + } + this.filters.state.open = false; + + var storedSettings = DatatableService.getDataTableSettings(this.tableKey); + if (storedSettings !== null) { + this.settings = storedSettings; + } + this.settings.open = false; + }; + + function setDefaults(ctrl) { + ctrl.showTextFilter = ctrl.showTextFilter ? ctrl.showTextFilter : false; + ctrl.state.reverseOrder = ctrl.reverseOrder ? ctrl.reverseOrder : false; + } +}]); diff --git a/app/directives/ui/datatables/datatable.css b/app/directives/ui/datatables/datatable.css new file mode 100644 index 000000000..d30d10ba5 --- /dev/null +++ b/app/directives/ui/datatables/datatable.css @@ -0,0 +1,244 @@ +.datatable .toolBar { + background-color: #f6f6f6; + color: #767676; + overflow: auto; + padding: 10px; +} + +.datatable .actionBar { + color: #767676; + padding: 10px; +} + +.datatable .toolBar .toolBarTitle { + float: left; + margin: 5px 0 0 10px; +} + +.datatable .toolBar .settings { + float: right; + margin: 5px 10px 0 0; +} + +.datatable .toolBar .setting { + cursor: pointer; + margin-right: 5px; +} + +.datatable .toolBar .setting-active { + color: #337ab7; +} + +.datatable .searchBar { + border-top: 1px solid #f6f6f6; + padding: 10px; +} + +.datatable .searchInput { + background: none; + border: none; + width: 95%; +} + +.datatable .searchIcon { + color: #767676; + margin-right: 5px; +} + +.datatable .searchInput:active, .datatable .searchInput:focus { + outline: none; +} + +.datatable .pagination-controls { + margin-right: 15px; +} + +.datatable .table { + margin-bottom: 0; +} + +.datatable .footer { + background-color: #f6f6f6; + color: #767676; + overflow: auto; +} + +.datatable .footer .infoBar { + float: left; + font-size: 12px; + margin: 15px 0 0 10px; +} + +.datatable .footer .paginationControls { + float: right; + margin: 10px 15px 5px 0; +} + +.datatable .footer .paginationControls .limitSelector { + font-size: 12px; + margin-right: 15px; +} + +.datatable .footer .paginationControls .pagination { + margin: 0; +} + +.datatable .pagination > li > a, .pagination > li > span { + float: none; +} + +.tableMenu { + color: #767676; + padding: 10px; +} + +.tableMenu .menuHeader { + font-size: 16px; +} + +.tableMenu .menuContent { + border-bottom: 1px solid #777; + font-size: 12px; + margin: 10px 0; + max-height: 140px; + overflow-y: auto; +} + +.tableMenu .menuContent .md-radio:first-child { + margin: 0; +} + +.datatable .table-filters thead tr > th { + height: 32px; + vertical-align: middle; +} + +.widget .widget-body table thead th .table-filter { + color: #767676; + cursor: pointer; + font-size: 12px !important; +} + +.widget .widget-body table thead th .filter-active { + color: #f0ad4e; + font-size: 12px !important; +} + +.datatable .filterbar > th { + border: none; + font-size: 12px !important; + padding: 0; +} + +.md-checkbox { + margin: 1px 0; + position: relative; +} + +.md-checkbox label { + cursor: pointer; +} + +.md-checkbox label:before, .md-checkbox label:after { + content: ""; + left: 0; + position: absolute; + top: 0; +} + +.md-checkbox label:before { + background: #fff; + border: 2px solid black; + border: 2px solid rgba(0, 0, 0, 0.54); + border-radius: 2px; + cursor: pointer; + height: 16px; + transition: background .3s; + width: 16px; +} + +.md-checkbox input[type="checkbox"] { + margin-right: 5px; + opacity: 0; + outline: 0; +} + +.md-checkbox input[type="checkbox"]:checked + label:before { + background: #337ab7; + border: none; +} + +.md-checkbox input[type="checkbox"]:disabled + label:before { + background: #ececec; + border: 2px solid #ddd; + cursor: auto; +} + +.md-checkbox input[type="checkbox"]:checked + label:after { + border: 2px solid #fff; + border-right-style: none; + border-top-style: none; + height: 4px; + left: 4px; + top: 5px; + transform: rotate(-45deg); + width: 9px; + +} + +.md-radio { + margin: 6px 0; +} + +.md-radio .md-radio-inline { + display: inline-block; +} + +.md-radio input[type="radio"] { + display: none; +} + +.md-radio input[type="radio"]:checked + label:before { + animation: ripple 0.2s linear forwards; + border-color: #337ab7; +} + +.md-radio input[type="radio"]:checked + label:after { + transform: scale(1); +} + +.md-radio label { + cursor: pointer; + display: inline-block; + height: 16px; + margin-bottom: 0; + padding: 0 22px; + position: relative; + vertical-align: bottom; +} + +.md-radio label:before, .md-radio label:after { + border-radius: 50%; + content: ''; + position: absolute; + transition: all .3s ease; + transition-property: transform, border-color; +} + +.md-radio label:before { + border: 2px solid black; + border: 2px solid rgba(0, 0, 0, 0.54); + height: 16px; + left: 0; + top: 0; + width: 16px; +} + +.md-radio label:after { + background: #337ab7; + height: 8px; + left: 4px; + top: 4px; + transform: scale(0); + width: 8px; +} diff --git a/app/directives/ui/datatables/datatableService.js b/app/directives/ui/datatables/datatableService.js new file mode 100644 index 000000000..ff4e9448d --- /dev/null +++ b/app/directives/ui/datatables/datatableService.js @@ -0,0 +1,37 @@ +angular.module('ui') +.factory('DatatableService', ['LocalStorage', +function DatatableServiceFactory(LocalStorage) { + 'use strict'; + + var service = {}; + + service.setDataTableSettings = function(key, settings) { + LocalStorage.storeDataTableSettings(key, settings); + }; + + service.getDataTableSettings = function(key) { + return LocalStorage.getDataTableSettings(key); + }; + + service.setDataTableFilters = function(key, filters) { + LocalStorage.storeDataTableFilters(key, filters); + }; + + service.getDataTableFilters = function(key) { + return LocalStorage.getDataTableFilters(key); + }; + + service.getDataTableOrder = function(key) { + return LocalStorage.getDataTableOrder(key); + }; + + service.setDataTableOrder = function(key, orderBy, reverse) { + var filter = { + orderBy: orderBy, + reverse: reverse + }; + LocalStorage.storeDataTableOrder(key, filter); + }; + + return service; +}]); diff --git a/app/directives/ui/datatables/endpoints-datatable/endpointsDatatable.html b/app/directives/ui/datatables/endpoints-datatable/endpointsDatatable.html new file mode 100644 index 000000000..d6295fd41 --- /dev/null +++ b/app/directives/ui/datatables/endpoints-datatable/endpointsDatatable.html @@ -0,0 +1,99 @@ +
    + + +
    +
    + {{ $ctrl.title }} +
    +
    + + Search + +
    +
    +
    + +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + Name + + + + + + URL + + + + Actions
    + + + + + {{ item.Name }} + {{ item.Name }} + {{ item.URL | stripprotocol }} + + Manage access + +
    Loading...
    No endpoint available.
    +
    +
    +
    + {{ $ctrl.state.selectedItemCount }} item(s) selected +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    diff --git a/app/directives/ui/datatables/endpoints-datatable/endpointsDatatable.js b/app/directives/ui/datatables/endpoints-datatable/endpointsDatatable.js new file mode 100644 index 000000000..540d6f93c --- /dev/null +++ b/app/directives/ui/datatables/endpoints-datatable/endpointsDatatable.js @@ -0,0 +1,16 @@ +angular.module('ui').component('endpointsDatatable', { + templateUrl: 'app/directives/ui/datatables/endpoints-datatable/endpointsDatatable.html', + controller: 'GenericDatatableController', + bindings: { + title: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + showTextFilter: '<', + endpointManagement: '<', + accessManagement: '<', + removeAction: '<' + } +}); diff --git a/app/directives/ui/datatables/events-datatable/eventsDatatable.html b/app/directives/ui/datatables/events-datatable/eventsDatatable.html new file mode 100644 index 000000000..4c8d45520 --- /dev/null +++ b/app/directives/ui/datatables/events-datatable/eventsDatatable.html @@ -0,0 +1,81 @@ +
    + + +
    +
    + {{ $ctrl.title }} +
    +
    + + Search + +
    +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    + + Date + + + + + + Category + + + + + + Details + + + +
    {{ item.Time | getisodatefromtimestamp }}{{ item.Type }}{{ item.Details }}
    Loading...
    No event available.
    +
    +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    diff --git a/app/directives/ui/datatables/events-datatable/eventsDatatable.js b/app/directives/ui/datatables/events-datatable/eventsDatatable.js new file mode 100644 index 000000000..0540d94c6 --- /dev/null +++ b/app/directives/ui/datatables/events-datatable/eventsDatatable.js @@ -0,0 +1,13 @@ +angular.module('ui').component('eventsDatatable', { + templateUrl: 'app/directives/ui/datatables/events-datatable/eventsDatatable.html', + controller: 'GenericDatatableController', + bindings: { + title: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + showTextFilter: '<' + } +}); diff --git a/app/directives/ui/datatables/images-datatable/imagesDatatable.html b/app/directives/ui/datatables/images-datatable/imagesDatatable.html new file mode 100644 index 000000000..e3bb4b1b0 --- /dev/null +++ b/app/directives/ui/datatables/images-datatable/imagesDatatable.html @@ -0,0 +1,144 @@ +
    + + +
    +
    + {{ $ctrl.title }} +
    +
    + + Search + +
    +
    +
    +
    + + + +
    +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + Id + + + +
    + Filter + Filter +
    +
    +
    +
    + Filter by usage +
    +
    +
    + + +
    +
    + + +
    +
    +
    + Close +
    +
    +
    +     		+ + Tags + + + + + + Size + + + + + + Created + + + +
    + + + + + {{ item.Id | truncate:20 }} + Unused + + {{ tag }} + {{ item.VirtualSize | humansize }}{{ item.Created | getisodatefromtimestamp }}
    Loading...
    No image available.
    +
    +
    +
    + {{ $ctrl.state.selectedItemCount }} item(s) selected +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    diff --git a/app/directives/ui/datatables/images-datatable/imagesDatatable.js b/app/directives/ui/datatables/images-datatable/imagesDatatable.js new file mode 100644 index 000000000..fc438bd1e --- /dev/null +++ b/app/directives/ui/datatables/images-datatable/imagesDatatable.js @@ -0,0 +1,15 @@ +angular.module('ui').component('imagesDatatable', { + templateUrl: 'app/directives/ui/datatables/images-datatable/imagesDatatable.html', + controller: 'ImagesDatatableController', + bindings: { + title: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + showTextFilter: '<', + removeAction: '<', + forceRemoveAction: '<' + } +}); diff --git a/app/directives/ui/datatables/images-datatable/imagesDatatableController.js b/app/directives/ui/datatables/images-datatable/imagesDatatableController.js new file mode 100644 index 000000000..f269203fa --- /dev/null +++ b/app/directives/ui/datatables/images-datatable/imagesDatatableController.js @@ -0,0 +1,102 @@ +angular.module('ui') +.controller('ImagesDatatableController', ['PaginationService', 'DatatableService', +function (PaginationService, DatatableService) { + + var ctrl = this; + + this.state = { + selectAll: false, + orderBy: this.orderBy, + paginatedItemLimit: PaginationService.getPaginationLimit(this.tableKey), + displayTextFilter: false, + selectedItemCount: 0, + selectedItems: [] + }; + + this.filters = { + usage: { + open: false, + enabled: false, + showUsedImages: true, + showUnusedImages: true + } + }; + + this.changeOrderBy = function(orderField) { + this.state.reverseOrder = this.state.orderBy === orderField ? !this.state.reverseOrder : false; + this.state.orderBy = orderField; + DatatableService.setDataTableOrder(this.tableKey, orderField, this.state.reverseOrder); + }; + + this.selectItem = function(item) { + if (item.Checked) { + this.state.selectedItemCount++; + this.state.selectedItems.push(item); + } else { + this.state.selectedItems.splice(this.state.selectedItems.indexOf(item), 1); + this.state.selectedItemCount--; + } + }; + + this.selectAll = function() { + for (var i = 0; i < this.state.filteredDataSet.length; i++) { + var item = this.state.filteredDataSet[i]; + if (item.Checked !== this.state.selectAll) { + item.Checked = this.state.selectAll; + this.selectItem(item); + } + } + }; + + this.changePaginationLimit = function() { + PaginationService.setPaginationLimit(this.tableKey, this.state.paginatedItemLimit); + }; + + this.updateDisplayTextFilter = function() { + this.state.displayTextFilter = !this.state.displayTextFilter; + if (!this.state.displayTextFilter) { + delete this.state.textFilter; + } + }; + + this.applyFilters = function(value, index, array) { + var image = value; + var filters = ctrl.filters; + if ((image.ContainerCount === 0 && filters.usage.showUnusedImages) + || (image.ContainerCount !== 0 && filters.usage.showUsedImages)) { + return true; + } + return false; + }; + + this.onUsageFilterChange = function() { + var filters = this.filters.usage; + var filtered = false; + if (!filters.showUsedImages || !filters.showUnusedImages) { + filtered = true; + } + this.filters.usage.enabled = filtered; + DatatableService.setDataTableFilters(this.tableKey, this.filters); + }; + + this.$onInit = function() { + setDefaults(this); + + var storedOrder = DatatableService.getDataTableOrder(this.tableKey); + if (storedOrder !== null) { + this.state.reverseOrder = storedOrder.reverse; + this.state.orderBy = storedOrder.orderBy; + } + + var storedFilters = DatatableService.getDataTableFilters(this.tableKey); + if (storedFilters !== null) { + this.filters = storedFilters; + } + this.filters.usage.open = false; + }; + + function setDefaults(ctrl) { + ctrl.showTextFilter = ctrl.showTextFilter ? ctrl.showTextFilter : false; + ctrl.state.reverseOrder = ctrl.reverseOrder ? ctrl.reverseOrder : false; + } +}]); diff --git a/app/directives/ui/datatables/networks-datatable/networksDatatable.html b/app/directives/ui/datatables/networks-datatable/networksDatatable.html new file mode 100644 index 000000000..066486963 --- /dev/null +++ b/app/directives/ui/datatables/networks-datatable/networksDatatable.html @@ -0,0 +1,148 @@ +
    + + +
    +
    + {{ $ctrl.title }} +
    +
    + + Search + +
    +
    +
    + + +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + Name + + + + + + Stack + + + + + + Scope + + + + + + Driver + + + + + + IPAM Driver + + + + + + IPAM Subnet + + + + + + IPAM Gateway + + + + + + Ownership + + + +
    + + + + + {{ item.Name | truncate:40 }} + {{ item.StackName ? item.StackName : '-' }}{{ item.Scope }}{{ item.Driver }}{{ item.IPAM.Driver }}{{ item.IPAM.Config[0].Subnet ? item.IPAM.Config[0].Subnet : '-' }}{{ item.IPAM.Config[0].Gateway ? item.IPAM.Config[0].Gateway : '-' }} + + + {{ item.ResourceControl.Ownership ? item.ResourceControl.Ownership : item.ResourceControl.Ownership = 'public' }} + +
    Loading...
    No network available.
    +
    +
    +
    + {{ $ctrl.state.selectedItemCount }} item(s) selected +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    diff --git a/app/directives/ui/datatables/networks-datatable/networksDatatable.js b/app/directives/ui/datatables/networks-datatable/networksDatatable.js new file mode 100644 index 000000000..2ccb7a41b --- /dev/null +++ b/app/directives/ui/datatables/networks-datatable/networksDatatable.js @@ -0,0 +1,15 @@ +angular.module('ui').component('networksDatatable', { + templateUrl: 'app/directives/ui/datatables/networks-datatable/networksDatatable.html', + controller: 'GenericDatatableController', + bindings: { + title: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + showTextFilter: '<', + showOwnershipColumn: '<', + removeAction: '<' + } +}); diff --git a/app/directives/ui/datatables/node-tasks-datatable/nodeTasksDatatable.html b/app/directives/ui/datatables/node-tasks-datatable/nodeTasksDatatable.html new file mode 100644 index 000000000..33776f06c --- /dev/null +++ b/app/directives/ui/datatables/node-tasks-datatable/nodeTasksDatatable.html @@ -0,0 +1,97 @@ +
    + + +
    +
    + {{ $ctrl.title }} +
    +
    + + Search + +
    +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + Id + + + + + + Status + + + + + + Slot + + + + + + Image + + + + + + Last Update + + + +
    {{ item.Id }}{{ item.Status.State }}{{ item.Slot ? item.Slot : '-' }}{{ item.Spec.ContainerSpec.Image | hideshasum }}{{ item.Updated | getisodate }}
    Loading...
    No task available.
    +
    +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    diff --git a/app/directives/ui/datatables/node-tasks-datatable/nodeTasksDatatable.js b/app/directives/ui/datatables/node-tasks-datatable/nodeTasksDatatable.js new file mode 100644 index 000000000..215636d0a --- /dev/null +++ b/app/directives/ui/datatables/node-tasks-datatable/nodeTasksDatatable.js @@ -0,0 +1,13 @@ +angular.module('ui').component('nodeTasksDatatable', { + templateUrl: 'app/directives/ui/datatables/node-tasks-datatable/nodeTasksDatatable.html', + controller: 'GenericDatatableController', + bindings: { + title: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + showTextFilter: '<' + } +}); diff --git a/app/directives/ui/datatables/nodes-datatable/nodesDatatable.html b/app/directives/ui/datatables/nodes-datatable/nodesDatatable.html new file mode 100644 index 000000000..dc6843c8b --- /dev/null +++ b/app/directives/ui/datatables/nodes-datatable/nodesDatatable.html @@ -0,0 +1,116 @@ +
    + + +
    +
    + {{ $ctrl.title }} +
    +
    + + Search + +
    +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + Name + + + + + + Role + + + + + + CPU + + + + + + Memory + + + + + + Engine + + + + + + IP Address + + + + + + Status + + + +
    + {{ item.Hostname }} + {{ item.Hostname }} + {{ item.Role }}{{ item.CPUs / 1000000000 }}{{ item.Memory | humansize }}{{ item.EngineVersion }}{{ item.Addr }}{{ item.Status }}
    Loading...
    No node available.
    +
    +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    diff --git a/app/directives/ui/datatables/nodes-datatable/nodesDatatable.js b/app/directives/ui/datatables/nodes-datatable/nodesDatatable.js new file mode 100644 index 000000000..10b79323d --- /dev/null +++ b/app/directives/ui/datatables/nodes-datatable/nodesDatatable.js @@ -0,0 +1,15 @@ +angular.module('ui').component('nodesDatatable', { + templateUrl: 'app/directives/ui/datatables/nodes-datatable/nodesDatatable.html', + controller: 'GenericDatatableController', + bindings: { + title: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + showTextFilter: '<', + showIpAddressColumn: '<', + accessToNodeDetails: '<' + } +}); diff --git a/app/directives/ui/datatables/nodes-ss-datatable/nodesSSDatatable.html b/app/directives/ui/datatables/nodes-ss-datatable/nodesSSDatatable.html new file mode 100644 index 000000000..c3518aa5e --- /dev/null +++ b/app/directives/ui/datatables/nodes-ss-datatable/nodesSSDatatable.html @@ -0,0 +1,105 @@ +
    + + +
    +
    + {{ $ctrl.title }} +
    +
    + + Search + +
    +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + Name + + + + + + CPU + + + + + + Memory + + + + + + IP Address + + + + + + Engine + + + + + + Status + + + +
    {{ item.name }}{{ item.cpu }}{{ item.memory }}{{ item.ip }}{{ item.version }}{{ item.status }}
    Loading...
    No node available.
    +
    +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    diff --git a/app/directives/ui/datatables/nodes-ss-datatable/nodesSSDatatable.js b/app/directives/ui/datatables/nodes-ss-datatable/nodesSSDatatable.js new file mode 100644 index 000000000..7da469ef5 --- /dev/null +++ b/app/directives/ui/datatables/nodes-ss-datatable/nodesSSDatatable.js @@ -0,0 +1,13 @@ +angular.module('ui').component('nodesSsDatatable', { + templateUrl: 'app/directives/ui/datatables/nodes-ss-datatable/nodesSSDatatable.html', + controller: 'GenericDatatableController', + bindings: { + title: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + showTextFilter: '<' + } +}); diff --git a/app/directives/ui/datatables/registries-datatable/registriesDatatable.html b/app/directives/ui/datatables/registries-datatable/registriesDatatable.html new file mode 100644 index 000000000..6d595c6ef --- /dev/null +++ b/app/directives/ui/datatables/registries-datatable/registriesDatatable.html @@ -0,0 +1,104 @@ +
    + + +
    +
    + {{ $ctrl.title }} +
    +
    + + Search + +
    +
    +
    + + +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + Name + + + + + + URL + + + + Actions
    + + + + + {{ item.Name }} + authentication-enabled + + {{ item.URL }} + + + Manage access + +
    Loading...
    No registry available.
    +
    +
    +
    + {{ $ctrl.state.selectedItemCount }} item(s) selected +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    diff --git a/app/directives/ui/datatables/registries-datatable/registriesDatatable.js b/app/directives/ui/datatables/registries-datatable/registriesDatatable.js new file mode 100644 index 000000000..2cd7603e2 --- /dev/null +++ b/app/directives/ui/datatables/registries-datatable/registriesDatatable.js @@ -0,0 +1,15 @@ +angular.module('ui').component('registriesDatatable', { + templateUrl: 'app/directives/ui/datatables/registries-datatable/registriesDatatable.html', + controller: 'GenericDatatableController', + bindings: { + title: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + showTextFilter: '<', + accessManagement: '<', + removeAction: '<' + } +}); diff --git a/app/directives/ui/datatables/secrets-datatable/secretsDatatable.html b/app/directives/ui/datatables/secrets-datatable/secretsDatatable.html new file mode 100644 index 000000000..cebdbf242 --- /dev/null +++ b/app/directives/ui/datatables/secrets-datatable/secretsDatatable.html @@ -0,0 +1,108 @@ +
    + + +
    +
    + {{ $ctrl.title }} +
    +
    + + Search + +
    +
    +
    + + +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + Name + + + + + + Creation Date + + + + + + Ownership + + + +
    + + + + + {{ item.Name }} + {{ item.CreatedAt | getisodate }} + + + {{ item.ResourceControl.Ownership ? item.ResourceControl.Ownership : item.ResourceControl.Ownership = 'public' }} + +
    Loading...
    No secret available.
    +
    +
    +
    + {{ $ctrl.state.selectedItemCount }} item(s) selected +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    diff --git a/app/directives/ui/datatables/secrets-datatable/secretsDatatable.js b/app/directives/ui/datatables/secrets-datatable/secretsDatatable.js new file mode 100644 index 000000000..1411b675e --- /dev/null +++ b/app/directives/ui/datatables/secrets-datatable/secretsDatatable.js @@ -0,0 +1,15 @@ +angular.module('ui').component('secretsDatatable', { + templateUrl: 'app/directives/ui/datatables/secrets-datatable/secretsDatatable.html', + controller: 'GenericDatatableController', + bindings: { + title: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + showTextFilter: '<', + showOwnershipColumn: '<', + removeAction: '<' + } +}); diff --git a/app/directives/ui/datatables/services-datatable/servicesDatatable.html b/app/directives/ui/datatables/services-datatable/servicesDatatable.html new file mode 100644 index 000000000..60afade12 --- /dev/null +++ b/app/directives/ui/datatables/services-datatable/servicesDatatable.html @@ -0,0 +1,157 @@ +
    + + +
    +
    + {{ $ctrl.title }} +
    +
    + + Search + +
    +
    +
    + + +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + Name + + + + + + Stack + + + + + + Image + + + + + + Scheduling Mode + + + + + + Published Ports + + + + + + Last Update + + + + + + Ownership + + + +
    + + + + + {{ item.Name }} + {{ item.StackName ? item.StackName : '-' }}{{ item.Image | hideshasum }} + {{ item.Mode }} {{ item.Running }} / {{ item.Replicas }} + + + Scale + + + + + + + + + + {{ p.PublishedPort }}:{{ p.TargetPort }} + + - + {{ item.UpdatedAt | getisodate }} + + + {{ item.ResourceControl.Ownership ? item.ResourceControl.Ownership : item.ResourceControl.Ownership = 'public' }} + +
    Loading...
    No service available.
    +
    +
    +
    + {{ $ctrl.state.selectedItemCount }} item(s) selected +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    diff --git a/app/directives/ui/datatables/services-datatable/servicesDatatable.js b/app/directives/ui/datatables/services-datatable/servicesDatatable.js new file mode 100644 index 000000000..14ae8954c --- /dev/null +++ b/app/directives/ui/datatables/services-datatable/servicesDatatable.js @@ -0,0 +1,17 @@ +angular.module('ui').component('servicesDatatable', { + templateUrl: 'app/directives/ui/datatables/services-datatable/servicesDatatable.html', + controller: 'GenericDatatableController', + bindings: { + title: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + showTextFilter: '<', + showOwnershipColumn: '<', + removeAction: '<', + scaleAction: '<', + swarmManagerIp: '<' + } +}); diff --git a/app/directives/ui/datatables/stack-services-datatable/stackServicesDatatable.html b/app/directives/ui/datatables/stack-services-datatable/stackServicesDatatable.html new file mode 100644 index 000000000..81c36ed50 --- /dev/null +++ b/app/directives/ui/datatables/stack-services-datatable/stackServicesDatatable.html @@ -0,0 +1,105 @@ +
    + + +
    +
    + {{ $ctrl.title }} +
    +
    + + Search + +
    +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + Name + + + + + + Image + + + + + + Scheduling Mode + + + + + + Published Ports + + + + + + Last Update + + + +
    {{ item.Name }}{{ item.Image | hideshasum }} + {{ item.Mode }} + {{ item.Tasks | runningtaskscount }} / {{ item.Mode === 'replicated' ? item.Replicas : ($ctrl.nodes | availablenodecount) }} + + + {{ p.PublishedPort }}:{{ p.TargetPort }} + + - + {{ item.UpdatedAt | getisodate }}
    Loading...
    No service available.
    +
    +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    diff --git a/app/directives/ui/datatables/stack-services-datatable/stackServicesDatatable.js b/app/directives/ui/datatables/stack-services-datatable/stackServicesDatatable.js new file mode 100644 index 000000000..d0cabf1b1 --- /dev/null +++ b/app/directives/ui/datatables/stack-services-datatable/stackServicesDatatable.js @@ -0,0 +1,15 @@ +angular.module('ui').component('stackServicesDatatable', { + templateUrl: 'app/directives/ui/datatables/stack-services-datatable/stackServicesDatatable.html', + controller: 'GenericDatatableController', + bindings: { + title: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + nodes: '<', + publicURL: '<', + showTextFilter: '<' + } +}); diff --git a/app/directives/ui/datatables/stacks-datatable/stacksDatatable.html b/app/directives/ui/datatables/stacks-datatable/stacksDatatable.html new file mode 100644 index 000000000..bcf668a04 --- /dev/null +++ b/app/directives/ui/datatables/stacks-datatable/stacksDatatable.html @@ -0,0 +1,103 @@ +
    + + +
    +
    + {{ $ctrl.title }} +
    +
    + + Search + +
    +
    +
    + + +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + +
    + + + + + + Name + + + + + + Ownership + + + +
    + + + + + {{ item.Name }} + + {{ item.Name }} + + + + + {{ item.ResourceControl.Ownership ? item.ResourceControl.Ownership : item.ResourceControl.Ownership = 'public' }} + +
    Loading...
    No stack available.
    +
    +
    +
    + {{ $ctrl.state.selectedItemCount }} item(s) selected +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    diff --git a/app/directives/ui/datatables/stacks-datatable/stacksDatatable.js b/app/directives/ui/datatables/stacks-datatable/stacksDatatable.js new file mode 100644 index 000000000..fa983f5ed --- /dev/null +++ b/app/directives/ui/datatables/stacks-datatable/stacksDatatable.js @@ -0,0 +1,16 @@ +angular.module('ui').component('stacksDatatable', { + templateUrl: 'app/directives/ui/datatables/stacks-datatable/stacksDatatable.html', + controller: 'StacksDatatableController', + bindings: { + title: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + showTextFilter: '<', + showOwnershipColumn: '<', + removeAction: '<', + displayExternalStacks: '<' + } +}); diff --git a/app/directives/ui/datatables/stacks-datatable/stacksDatatableController.js b/app/directives/ui/datatables/stacks-datatable/stacksDatatableController.js new file mode 100644 index 000000000..777c1c16c --- /dev/null +++ b/app/directives/ui/datatables/stacks-datatable/stacksDatatableController.js @@ -0,0 +1,65 @@ +angular.module('ui') +.controller('StacksDatatableController', ['PaginationService', 'DatatableService', +function (PaginationService, DatatableService) { + + this.state = { + selectAll: false, + orderBy: this.orderBy, + paginatedItemLimit: PaginationService.getPaginationLimit(this.tableKey), + displayTextFilter: false, + selectedItemCount: 0, + selectedItems: [] + }; + + this.changeOrderBy = function(orderField) { + this.state.reverseOrder = this.state.orderBy === orderField ? !this.state.reverseOrder : false; + this.state.orderBy = orderField; + DatatableService.setDataTableOrder(this.tableKey, orderField, this.state.reverseOrder); + }; + + this.selectItem = function(item) { + if (item.Checked) { + this.state.selectedItemCount++; + this.state.selectedItems.push(item); + } else { + this.state.selectedItems.splice(this.state.selectedItems.indexOf(item), 1); + this.state.selectedItemCount--; + } + }; + + this.selectAll = function() { + for (var i = 0; i < this.state.filteredDataSet.length; i++) { + var item = this.state.filteredDataSet[i]; + if (item.Id && item.Checked !== this.state.selectAll) { + item.Checked = this.state.selectAll; + this.selectItem(item); + } + } + }; + + this.changePaginationLimit = function() { + PaginationService.setPaginationLimit(this.tableKey, this.state.paginatedItemLimit); + }; + + this.updateDisplayTextFilter = function() { + this.state.displayTextFilter = !this.state.displayTextFilter; + if (!this.state.displayTextFilter) { + delete this.state.textFilter; + } + }; + + this.$onInit = function() { + setDefaults(this); + + var storedOrder = DatatableService.getDataTableOrder(this.tableKey); + if (storedOrder !== null) { + this.state.reverseOrder = storedOrder.reverse; + this.state.orderBy = storedOrder.orderBy; + } + }; + + function setDefaults(ctrl) { + ctrl.showTextFilter = ctrl.showTextFilter ? ctrl.showTextFilter : false; + ctrl.state.reverseOrder = ctrl.reverseOrder ? ctrl.reverseOrder : false; + } +}]); diff --git a/app/directives/ui/datatables/tasks-datatable/tasksDatatable.html b/app/directives/ui/datatables/tasks-datatable/tasksDatatable.html new file mode 100644 index 000000000..8cce266ac --- /dev/null +++ b/app/directives/ui/datatables/tasks-datatable/tasksDatatable.html @@ -0,0 +1,97 @@ +
    + + +
    +
    + {{ $ctrl.title }} +
    +
    + + Search + +
    +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + Id + + + + + + Status + + + + + + Slot + + + + + + Node + + + + + + Last Update + + + +
    {{ item.Id }}{{ item.Status.State }}{{ item.Slot ? item.Slot : '-' }}{{ item.NodeId | tasknodename: $ctrl.nodes }}{{ item.Updated | getisodate }}
    Loading...
    No task available.
    +
    +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    diff --git a/app/directives/ui/datatables/tasks-datatable/tasksDatatable.js b/app/directives/ui/datatables/tasks-datatable/tasksDatatable.js new file mode 100644 index 000000000..d283bd1dd --- /dev/null +++ b/app/directives/ui/datatables/tasks-datatable/tasksDatatable.js @@ -0,0 +1,15 @@ +angular.module('ui').component('tasksDatatable', { + templateUrl: 'app/directives/ui/datatables/tasks-datatable/tasksDatatable.html', + controller: 'GenericDatatableController', + bindings: { + title: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + nodes: '<', + showTextFilter: '<', + showSlotColumn: '<' + } +}); diff --git a/app/directives/ui/datatables/teams-datatable/teamsDatatable.html b/app/directives/ui/datatables/teams-datatable/teamsDatatable.html new file mode 100644 index 000000000..4c43964bb --- /dev/null +++ b/app/directives/ui/datatables/teams-datatable/teamsDatatable.html @@ -0,0 +1,84 @@ +
    + + +
    +
    + {{ $ctrl.title }} +
    +
    + + Search + +
    +
    +
    + +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + +
    + + + + + + Name + + + +
    + + + + + {{ item.Name }} +
    Loading...
    No team available.
    +
    +
    +
    + {{ $ctrl.state.selectedItemCount }} item(s) selected +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    diff --git a/app/directives/ui/datatables/teams-datatable/teamsDatatable.js b/app/directives/ui/datatables/teams-datatable/teamsDatatable.js new file mode 100644 index 000000000..7993ccde9 --- /dev/null +++ b/app/directives/ui/datatables/teams-datatable/teamsDatatable.js @@ -0,0 +1,14 @@ +angular.module('ui').component('teamsDatatable', { + templateUrl: 'app/directives/ui/datatables/teams-datatable/teamsDatatable.html', + controller: 'GenericDatatableController', + bindings: { + title: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + showTextFilter: '<', + removeAction: '<' + } +}); diff --git a/app/directives/ui/datatables/users-datatable/usersDatatable.html b/app/directives/ui/datatables/users-datatable/usersDatatable.html new file mode 100644 index 000000000..833c1d3e9 --- /dev/null +++ b/app/directives/ui/datatables/users-datatable/usersDatatable.html @@ -0,0 +1,110 @@ +
    + + +
    +
    + {{ $ctrl.title }} +
    +
    + + Search + +
    +
    +
    + +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + Name + + + + + + Role + + + + + + Authentication + + + +
    + + + + + {{ item.Username }} + + + + + + {{ item.RoleName }} + + + Internal + LDAP +
    Loading...
    No user available.
    +
    +
    +
    + {{ $ctrl.state.selectedItemCount }} item(s) selected +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    diff --git a/app/directives/ui/datatables/users-datatable/usersDatatable.js b/app/directives/ui/datatables/users-datatable/usersDatatable.js new file mode 100644 index 000000000..f59ca6ae9 --- /dev/null +++ b/app/directives/ui/datatables/users-datatable/usersDatatable.js @@ -0,0 +1,14 @@ +angular.module('ui').component('usersDatatable', { + templateUrl: 'app/directives/ui/datatables/users-datatable/usersDatatable.html', + controller: 'GenericDatatableController', + bindings: { + title: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + showTextFilter: '<', + removeAction: '<' + } +}); diff --git a/app/directives/ui/datatables/volumes-datatable/volumesDatatable.html b/app/directives/ui/datatables/volumes-datatable/volumesDatatable.html new file mode 100644 index 000000000..4a69017a0 --- /dev/null +++ b/app/directives/ui/datatables/volumes-datatable/volumesDatatable.html @@ -0,0 +1,149 @@ +
    + + +
    +
    + {{ $ctrl.title }} +
    +
    + + Search + +
    +
    +
    + + +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + Name + + + +
    + Filter + Filter +
    +
    +
    +
    + Filter by usage +
    +
    +
    + + +
    +
    + + +
    +
    +
    + Close +
    +
    +
    +     		+ + Stack + + + + + + Driver + + + + + + Mount point + + + + + + Ownership + + + +
    + + + + + {{ item.Id | truncate:25 }} + Unused + {{ item.StackName ? item.StackName : '-' }}{{ item.Driver }}{{ item.Mountpoint | truncatelr }} + + + {{ item.ResourceControl.Ownership ? item.ResourceControl.Ownership : item.ResourceControl.Ownership = 'public' }} + +
    Loading...
    No volume available.
    +
    +
    +
    + {{ $ctrl.state.selectedItemCount }} item(s) selected +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    diff --git a/app/directives/ui/datatables/volumes-datatable/volumesDatatable.js b/app/directives/ui/datatables/volumes-datatable/volumesDatatable.js new file mode 100644 index 000000000..3cdc80d8c --- /dev/null +++ b/app/directives/ui/datatables/volumes-datatable/volumesDatatable.js @@ -0,0 +1,15 @@ +angular.module('ui').component('volumesDatatable', { + templateUrl: 'app/directives/ui/datatables/volumes-datatable/volumesDatatable.html', + controller: 'VolumesDatatableController', + bindings: { + title: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + showTextFilter: '<', + showOwnershipColumn: '<', + removeAction: '<' + } +}); diff --git a/app/directives/ui/datatables/volumes-datatable/volumesDatatableController.js b/app/directives/ui/datatables/volumes-datatable/volumesDatatableController.js new file mode 100644 index 000000000..0b9d0f12f --- /dev/null +++ b/app/directives/ui/datatables/volumes-datatable/volumesDatatableController.js @@ -0,0 +1,102 @@ +angular.module('ui') +.controller('VolumesDatatableController', ['PaginationService', 'DatatableService', +function (PaginationService, DatatableService) { + + var ctrl = this; + + this.state = { + selectAll: false, + orderBy: this.orderBy, + paginatedItemLimit: PaginationService.getPaginationLimit(this.tableKey), + displayTextFilter: false, + selectedItemCount: 0, + selectedItems: [] + }; + + this.filters = { + usage: { + open: false, + enabled: false, + showUsedVolumes: true, + showUnusedVolumes: true + } + }; + + this.changeOrderBy = function(orderField) { + this.state.reverseOrder = this.state.orderBy === orderField ? !this.state.reverseOrder : false; + this.state.orderBy = orderField; + DatatableService.setDataTableOrder(this.tableKey, orderField, this.state.reverseOrder); + }; + + this.selectItem = function(item) { + if (item.Checked) { + this.state.selectedItemCount++; + this.state.selectedItems.push(item); + } else { + this.state.selectedItems.splice(this.state.selectedItems.indexOf(item), 1); + this.state.selectedItemCount--; + } + }; + + this.selectAll = function() { + for (var i = 0; i < this.state.filteredDataSet.length; i++) { + var item = this.state.filteredDataSet[i]; + if (item.Checked !== this.state.selectAll) { + item.Checked = this.state.selectAll; + this.selectItem(item); + } + } + }; + + this.changePaginationLimit = function() { + PaginationService.setPaginationLimit(this.tableKey, this.state.paginatedItemLimit); + }; + + this.updateDisplayTextFilter = function() { + this.state.displayTextFilter = !this.state.displayTextFilter; + if (!this.state.displayTextFilter) { + delete this.state.textFilter; + } + }; + + this.applyFilters = function(value, index, array) { + var volume = value; + var filters = ctrl.filters; + if ((volume.dangling && filters.usage.showUnusedVolumes) + || (!volume.dangling && filters.usage.showUsedVolumes)) { + return true; + } + return false; + }; + + this.onUsageFilterChange = function() { + var filters = this.filters.usage; + var filtered = false; + if (!filters.showUsedVolumes || !filters.showUnusedVolumes) { + filtered = true; + } + this.filters.usage.enabled = filtered; + DatatableService.setDataTableFilters(this.tableKey, this.filters); + }; + + this.$onInit = function() { + setDefaults(this); + + var storedOrder = DatatableService.getDataTableOrder(this.tableKey); + if (storedOrder !== null) { + this.state.reverseOrder = storedOrder.reverse; + this.state.orderBy = storedOrder.orderBy; + } + + var storedFilters = DatatableService.getDataTableFilters(this.tableKey); + if (storedFilters !== null) { + this.filters = storedFilters; + } + this.filters.usage.open = false; + }; + + function setDefaults(ctrl) { + ctrl.showTextFilter = ctrl.showTextFilter ? ctrl.showTextFilter : false; + ctrl.state.reverseOrder = ctrl.reverseOrder ? ctrl.reverseOrder : false; + } +}]); diff --git a/app/directives/slider/porSlider.html b/app/directives/ui/slider/slider.html similarity index 100% rename from app/directives/slider/porSlider.html rename to app/directives/ui/slider/slider.html diff --git a/app/directives/ui/slider/slider.js b/app/directives/ui/slider/slider.js new file mode 100644 index 000000000..03d8fe337 --- /dev/null +++ b/app/directives/ui/slider/slider.js @@ -0,0 +1,12 @@ +angular.module('ui').component('slider', { + templateUrl: 'app/directives/ui/slider/slider.html', + controller: 'SliderController', + bindings: { + model: '=', + onChange: '&', + floor: '<', + ceil: '<', + step: '<', + precision: '<' + } +}); diff --git a/app/directives/slider/porSliderController.js b/app/directives/ui/slider/sliderController.js similarity index 84% rename from app/directives/slider/porSliderController.js rename to app/directives/ui/slider/sliderController.js index e9cf7e386..6445007a8 100644 --- a/app/directives/slider/porSliderController.js +++ b/app/directives/ui/slider/sliderController.js @@ -1,5 +1,5 @@ -angular.module('portainer') -.controller('porSliderController', function () { +angular.module('ui') +.controller('SliderController', function () { var ctrl = this; ctrl.options = { @@ -19,5 +19,4 @@ angular.module('portainer') ctrl.onChange(); } }; - }); diff --git a/app/filters/filters.js b/app/filters/filters.js index 2c78e8dd3..e7542805b 100644 --- a/app/filters/filters.js +++ b/app/filters/filters.js @@ -4,7 +4,7 @@ function includeString(text, values) { }); } -angular.module('portainer.filters', []) +angular.module('portainer.filters') .filter('truncate', function () { 'use strict'; return function (text, length, end) { diff --git a/app/models/docker/container.js b/app/models/docker/container.js index c37f2fe93..b4e65a014 100644 --- a/app/models/docker/container.js +++ b/app/models/docker/container.js @@ -34,5 +34,7 @@ function ContainerViewModel(data) { if (data.Portainer.ResourceControl) { this.ResourceControl = new ResourceControlViewModel(data.Portainer.ResourceControl); } + } else { + this.ResourceControl = { Ownership: 'public' }; } } diff --git a/app/models/docker/network.js b/app/models/docker/network.js index baa5ab984..0a756fa5b 100644 --- a/app/models/docker/network.js +++ b/app/models/docker/network.js @@ -19,5 +19,7 @@ function NetworkViewModel(data) { if (data.Portainer.ResourceControl) { this.ResourceControl = new ResourceControlViewModel(data.Portainer.ResourceControl); } + } else { + this.ResourceControl = { Ownership: 'public' }; } } diff --git a/app/models/docker/volume.js b/app/models/docker/volume.js index 5e2701b70..611a4cf4c 100644 --- a/app/models/docker/volume.js +++ b/app/models/docker/volume.js @@ -14,5 +14,7 @@ function VolumeViewModel(data) { if (data.Portainer.ResourceControl) { this.ResourceControl = new ResourceControlViewModel(data.Portainer.ResourceControl); } + } else { + this.ResourceControl = { Ownership: 'public' }; } } diff --git a/app/routes.js b/app/routes.js index 0482b1db6..210bb0db3 100644 --- a/app/routes.js +++ b/app/routes.js @@ -55,6 +55,9 @@ function configureRoutes($stateProvider) { .state('containers', { parent: 'root', url: '/containers/', + params: { + selectedContainers: [] + }, views: { 'content@': { templateUrl: 'app/components/containers/containers.html', diff --git a/app/services/docker/containerService.js b/app/services/docker/containerService.js index 2b09aedfa..99955b350 100644 --- a/app/services/docker/containerService.js +++ b/app/services/docker/containerService.js @@ -51,19 +51,27 @@ angular.module('portainer.services') }; service.startContainer = function(containerID) { - var deferred = $q.defer(); - Container.start({ id: containerID }, {}).$promise - .then(function success(data) { - if (data.message) { - deferred.reject({ msg: data.message }); - } else { - deferred.resolve(data); - } - }) - .catch(function error(err) { - deferred.reject({ msg: 'Unable to start container', err: err }); - }); - return deferred.promise; + return Container.start({ id: containerID }, {}).$promise; + }; + + service.stopContainer = function(containerID) { + return Container.stop({ id: containerID }, {}).$promise; + }; + + service.restartContainer = function(containerID) { + return Container.restart({ id: containerID }, {}).$promise; + }; + + service.killContainer = function(containerID) { + return Container.kill({ id: containerID }, {}).$promise; + }; + + service.pauseContainer = function(containerID) { + return Container.pause({ id: containerID }, {}).$promise; + }; + + service.resumeContainer = function(containerID) { + return Container.unpause({ id: containerID }, {}).$promise; }; service.createAndStartContainer = function(configuration) { diff --git a/app/services/docker/networkService.js b/app/services/docker/networkService.js index 41f6961bf..d8b551d01 100644 --- a/app/services/docker/networkService.js +++ b/app/services/docker/networkService.js @@ -31,7 +31,6 @@ angular.module('portainer.services') return deferred.promise; }; - service.networks = function(localNetworks, swarmNetworks, swarmAttachableNetworks, globalNetworks) { var deferred = $q.defer(); @@ -65,5 +64,9 @@ angular.module('portainer.services') return deferred.promise; }; + service.remove = function(id) { + return Network.remove({ id: id }).$promise; + }; + return service; }]); diff --git a/app/services/docker/serviceService.js b/app/services/docker/serviceService.js index 65ad05709..69fc89842 100644 --- a/app/services/docker/serviceService.js +++ b/app/services/docker/serviceService.js @@ -54,5 +54,9 @@ angular.module('portainer.services') return deferred.promise; }; + service.update = function(service, config) { + return Service.update({ id: service.Id, version: service.Version }, config).$promise; + }; + return service; }]); diff --git a/app/services/entityListService.js b/app/services/entityListService.js deleted file mode 100644 index f3eeb86f8..000000000 --- a/app/services/entityListService.js +++ /dev/null @@ -1,15 +0,0 @@ -angular.module('portainer.services') -.factory('EntityListService', [function EntityListServiceFactory() { - 'use strict'; - return { - rememberPreviousSelection: function(oldContainerList, model, onSelectCallback) { - var oldModel = _.find(oldContainerList, function(item){ - return item.Id === model.Id; - }); - if (oldModel && oldModel.Checked) { - model.Checked = true; - onSelectCallback(model); - } - } - }; -}]); diff --git a/app/services/lineChart.js b/app/services/lineChart.js deleted file mode 100644 index de0df4baf..000000000 --- a/app/services/lineChart.js +++ /dev/null @@ -1,55 +0,0 @@ -angular.module('portainer.services') -.factory('LineChart', [function LineChartFactory() { - 'use strict'; - return { - build: function (id, data, getkey) { - var chart = new Chart($(id).get(0).getContext('2d')); - var map = {}; - - for (var i = 0; i < data.length; i++) { - var c = data[i]; - var key = getkey(c); - - var count = map[key]; - if (count === undefined) { - count = 0; - } - count += 1; - map[key] = count; - } - - var labels = []; - data = []; - var keys = Object.keys(map); - var max = 1; - - for (i = keys.length - 1; i > -1; i--) { - var k = keys[i]; - labels.push(k); - data.push(map[k]); - if (map[k] > max) { - max = map[k]; - } - } - var steps = Math.min(max, 10); - var dataset = { - fillColor: 'rgba(151,187,205,0.5)', - strokeColor: 'rgba(151,187,205,1)', - pointColor: 'rgba(151,187,205,1)', - pointStrokeColor: '#fff', - data: data - }; - chart.Line({ - labels: labels, - datasets: [dataset] - }, - { - scaleStepWidth: Math.ceil(max / steps), - pointDotRadius: 1, - scaleIntegersOnly: true, - scaleOverride: true, - scaleSteps: steps - }); - } - }; -}]); diff --git a/app/services/localStorage.js b/app/services/localStorage.js index 89cd98483..da9f9b670 100644 --- a/app/services/localStorage.js +++ b/app/services/localStorage.js @@ -35,24 +35,32 @@ angular.module('portainer.services') deleteJWT: function() { localStorageService.remove('JWT'); }, - storePaginationCount: function(key, count) { + storePaginationLimit: function(key, count) { localStorageService.cookie.set('pagination_' + key, count); }, - getPaginationCount: function(key) { + getPaginationLimit: function(key) { return localStorageService.cookie.get('pagination_' + key); }, + getDataTableOrder: function(key) { + return localStorageService.get('datatable_order_' + key); + }, + storeDataTableOrder: function(key, data) { + localStorageService.set('datatable_order_' + key, data); + }, + getDataTableFilters: function(key) { + return localStorageService.get('datatable_filters_' + key); + }, + storeDataTableFilters: function(key, data) { + localStorageService.set('datatable_filters_' + key, data); + }, + getDataTableSettings: function(key) { + return localStorageService.get('datatable_settings_' + key); + }, + storeDataTableSettings: function(key, data) { + localStorageService.set('datatable_settings_' + key, data); + }, clean: function() { localStorageService.clearAll(); - }, - storeFilterContainerShowAll: function(filter) { - localStorageService.cookie.set('filter_containerShowAll', filter); - }, - getFilterContainerShowAll: function() { - var filter = localStorageService.cookie.get('filter_containerShowAll'); - if (filter === null) { - filter = true; - } - return filter; } }; }]); diff --git a/app/services/pagination.js b/app/services/pagination.js index 60ba694bc..e6866a0f0 100644 --- a/app/services/pagination.js +++ b/app/services/pagination.js @@ -1,17 +1,23 @@ angular.module('portainer.services') -.factory('Pagination', ['LocalStorage', 'PAGINATION_MAX_ITEMS', function PaginationFactory(LocalStorage, PAGINATION_MAX_ITEMS) { +.factory('PaginationService', ['LocalStorage', 'PAGINATION_MAX_ITEMS', +function PaginationServiceFactory(LocalStorage, PAGINATION_MAX_ITEMS) { 'use strict'; - return { - getPaginationCount: function(key) { - var storedCount = LocalStorage.getPaginationCount(key); - var paginationCount = PAGINATION_MAX_ITEMS; - if (storedCount !== null) { - paginationCount = storedCount; - } - return '' + paginationCount; - }, - setPaginationCount: function(key, count) { - LocalStorage.storePaginationCount(key, count); + + var service = {}; + + service.getPaginationLimit = function(key) { + var paginationLimit = PAGINATION_MAX_ITEMS; + + var storedLimit = LocalStorage.getPaginationLimit(key); + if (storedLimit !== null) { + paginationLimit = storedLimit; } + return '' + paginationLimit; }; + + service.setPaginationLimit = function(key, limit) { + LocalStorage.storePaginationLimit(key, limit); + }; + + return service; }]); diff --git a/gruntfile.js b/gruntfile.js index 131a98e59..cde30f4da 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -117,7 +117,7 @@ gruntfile_cfg.src = { jsTpl: ['<%= distdir %>/templates/**/*.js'], html: ['index.html'], tpl: ['app/components/**/*.html', 'app/directives/**/*.html'], - css: ['assets/css/app.css'] + css: ['assets/css/app.css', 'app/**/*.css'] }; gruntfile_cfg.clean = {