github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(network-details): add a fallback for listing containers when APIV… (#531)

pull/532/head
Anthony Lapenna 2017-01-23 16:06:51 +13:00 committed by GitHub
parent fa4ec04c47
commit 70f139514f
1 changed files with 51 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
app/components/network/networkController.js
View File

@ -1,6 +1,6 @@
angular.module('network', []) angular.module('network', [])
.controller('NetworkController', ['$scope', '$state', '$stateParams', 'Network', 'Container', 'ContainerHelper', 'Messages', .controller('NetworkController', ['$scope', '$state', '$stateParams', '$filter', 'Config', 'Network', 'Container', 'ContainerHelper', 'Messages',
function ($scope, $state, $stateParams, Network, Container, ContainerHelper, Messages) { function ($scope, $state, $stateParams, $filter, Config, Network, Container, ContainerHelper, Messages) {
$scope.removeNetwork = function removeNetwork(networkId) { $scope.removeNetwork = function removeNetwork(networkId) {
$('#loadingViewSpinner').show(); $('#loadingViewSpinner').show();
@ -38,34 +38,63 @@ function ($scope, $state, $stateParams, Network, Container, ContainerHelper, Mes
function getNetwork() { function getNetwork() {
$('#loadingViewSpinner').show(); $('#loadingViewSpinner').show();
Network.get({id: $stateParams.id}, function (d) { Network.get({id: $stateParams.id}, function success(data) {
$scope.network = d; $scope.network = data;
getContainersInNetwork(d); getContainersInNetwork(data);
}, function error(err) {
$('#loadingViewSpinner').hide(); $('#loadingViewSpinner').hide();
}, function (e) { Messages.error("Failure", err, "Unable to retrieve network info");
$('#loadingViewSpinner').hide();
Messages.error("Failure", e, "Unable to retrieve network info");
}); });
} }
function filterContainersInNetwork(network, containers) {
if ($scope.containersToHideLabels) {
containers = ContainerHelper.hideContainers(containers, $scope.containersToHideLabels);
}
var containersInNetwork = [];
containers.forEach(function(container) {
var containerInNetwork = network.Containers[container.Id];
containerInNetwork.Id = container.Id;
// Name is not available in Docker 1.9
if (!containerInNetwork.Name) {
containerInNetwork.Name = $filter('trimcontainername')(container.Names[0]);
}
containersInNetwork.push(containerInNetwork);
});
$scope.containersInNetwork = containersInNetwork;
}
function getContainersInNetwork(network) { function getContainersInNetwork(network) {
if (network.Containers) { if (network.Containers) {
Container.query({ if ($scope.applicationState.endpoint.apiVersion < 1.24) {
filters: {network: [$stateParams.id]} Container.query({}, function success(data) {
}, function (containersInNetworkResult) { var containersInNetwork = data.filter(function filter(container) {
if ($scope.containersToHideLabels) { if (container.HostConfig.NetworkMode === network.Name) {
containersInNetworkResult = ContainerHelper.hideContainers(containersInNetworkResult, $scope.containersToHideLabels); return container;
} }
var containersInNetwork = []; });
containersInNetworkResult.forEach(function(container) { filterContainersInNetwork(network, containersInNetwork);
var containerInNetwork = network.Containers[container.Id]; $('#loadingViewSpinner').hide();
containerInNetwork.Id = container.Id; }, function error(err) {
containersInNetwork.push(containerInNetwork); $('#loadingViewSpinner').hide();
Messages.error("Failure", err, "Unable to retrieve containers in network");
}); });
$scope.containersInNetwork = containersInNetwork; } else {
}); Container.query({
filters: {network: [$stateParams.id]}
}, function success(data) {
filterContainersInNetwork(network, data);
$('#loadingViewSpinner').hide();
}, function error(err) {
$('#loadingViewSpinner').hide();
Messages.error("Failure", err, "Unable to retrieve containers in network");
});
}
} }
} }
getNetwork(); Config.$promise.then(function (c) {
$scope.containersToHideLabels = c.hiddenLabels;
getNetwork();
});
}]); }]);