From 95b16919a64a3a9133dd902703ed7a7571de0f2a Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 27 Jul 2016 17:37:35 +1200 Subject: [PATCH 1/3] feat(ui): display an error message when trying to remove a network with active endpoints (#90) --- app/components/networks/networksController.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/components/networks/networksController.js b/app/components/networks/networksController.js index 124b18129..3cde28bfa 100644 --- a/app/components/networks/networksController.js +++ b/app/components/networks/networksController.js @@ -45,9 +45,14 @@ function ($scope, Network, Messages, errorMsgFilter) { if (network.Checked) { counter = counter + 1; Network.remove({id: network.Id}, function (d) { - Messages.send("Network deleted", network.Id); - var index = $scope.networks.indexOf(network); - $scope.networks.splice(index, 1); + var error = errorMsgFilter(d); + if (error) { + Messages.send("Error", "Unable to remove network with active endpoints"); + } else { + Messages.send("Network deleted", network.Id); + var index = $scope.networks.indexOf(network); + $scope.networks.splice(index, 1); + } complete(); }, function (e) { Messages.error("Failure", e.data); From 201ab201318af761f0efda04035f65f432ec325b Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 27 Jul 2016 19:54:31 +1200 Subject: [PATCH 2/3] feat(ui): add more info about nodes in Swarm view --- app/components/swarm/swarm.html | 78 ++++++++++++------------- app/components/swarm/swarmController.js | 4 +- app/shared/viewmodel.js | 24 ++++---- 3 files changed, 50 insertions(+), 56 deletions(-) diff --git a/app/components/swarm/swarm.html b/app/components/swarm/swarm.html index 35e3ca6af..1f02a1802 100644 --- a/app/components/swarm/swarm.html +++ b/app/components/swarm/swarm.html @@ -8,43 +8,7 @@
-
- - -
- -
-
{{ docker.Version }}
-
Swarm version
- - -
-
- - -
- -
-
{{ docker.ApiVersion }}
-
API version
- - -
-
- - -
- -
-
{{ docker.GoVersion }}
-
Go version
- - -
-
- -
-
+
@@ -58,32 +22,46 @@ Images {{ info.Images }} + + Swarm version + {{ docker.Version|swarmversion }} + + + Docker API version + {{ docker.ApiVersion }} + Strategy {{ swarm.Strategy }} - CPUs + Total CPU {{ info.NCPU }} - Total Memory + Total memory {{ info.MemTotal|humansize }} - Operating System + Operating system {{ info.OperatingSystem }} - Kernel Version + Kernel version {{ info.KernelVersion }} + + Go version + {{ docker.GoVersion }} +
-
+
+
+
@@ -97,6 +75,20 @@ + + + CPU + + + + + + + Memory + + + + IP @@ -123,6 +115,8 @@ {{ node.name }} + {{ node.cpu }} + {{ node.memory }} {{ node.ip }} {{ node.version }} {{ node.status }} diff --git a/app/components/swarm/swarmController.js b/app/components/swarm/swarmController.js index 840c6281d..eca575753 100644 --- a/app/components/swarm/swarmController.js +++ b/app/components/swarm/swarmController.js @@ -53,8 +53,8 @@ angular.module('swarm', []) node.id = info[offset + 1][1]; node.status = info[offset + 2][1]; node.containers = info[offset + 3][1]; - node.cpu = info[offset + 4][1]; - node.memory = info[offset + 5][1]; + node.cpu = info[offset + 4][1].split('/')[1]; + node.memory = info[offset + 5][1].split('/')[1]; node.labels = info[offset + 6][1]; node.version = info[offset + 8][1]; $scope.swarm.Status.push(node); diff --git a/app/shared/viewmodel.js b/app/shared/viewmodel.js index f0bf07f1e..0b2cf6150 100644 --- a/app/shared/viewmodel.js +++ b/app/shared/viewmodel.js @@ -21,18 +21,6 @@ function ContainerViewModel(data) { this.Checked = false; } -function EventViewModel(data) { - // Type, Action, Actor unavailable in Docker < 1.10 - this.Time = data.time; - if (data.Type) { - this.Type = data.Type; - this.Details = createEventDetails(data); - } else { - this.Type = data.status; - this.Details = data.from; - } -} - function createEventDetails(event) { var eventAttr = event.Actor.Attributes; var details = ''; @@ -126,3 +114,15 @@ function createEventDetails(event) { } return details; } + +function EventViewModel(data) { + // Type, Action, Actor unavailable in Docker < 1.10 + this.Time = data.time; + if (data.Type) { + this.Type = data.Type; + this.Details = createEventDetails(data); + } else { + this.Type = data.status; + this.Details = data.from; + } +} From 711ac742e1bdd01619ba33a966e7c56e6c4f0f76 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 27 Jul 2016 19:59:41 +1200 Subject: [PATCH 3/3] style(ui): update title for section in swarm view --- app/components/swarm/swarm.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/swarm/swarm.html b/app/components/swarm/swarm.html index 1f02a1802..2e09be30a 100644 --- a/app/components/swarm/swarm.html +++ b/app/components/swarm/swarm.html @@ -63,7 +63,7 @@
- +