Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-25 08:19:40 +02:00
Code Issues Releases Activity

chore(project): add prettier for code format (#3645)

Browse source 
* chore(project): install prettier and lint-staged

* chore(project): apply prettier to html too

* chore(project): git ignore eslintcache

* chore(project): add a comment about format script

* chore(prettier): update printWidth

* chore(prettier): remove useTabs option

* chore(prettier): add HTML validation

* refactor(prettier): fix closing tags

* feat(prettier): define angular parser for html templates

* style(prettier): run prettier on codebase

Co-authored-by: Anthony Lapenna <lapenna.anthony@gmail.com>
This commit is contained in:
Chaim Lev-Ari 2020-04-11 00:54:53 +03:00 • committed by GitHub
parent 6663073be1
commit cf5056d9c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
714 changed files with 31228 additions and 28305 deletions
Download patch file Download diff file Expand all files Collapse all files

145
app/docker/views/networks/networksController.js
View file

@ -1,80 +1,87 @@
import _ from 'lodash-es';
angular.module('portainer.docker')
.controller('NetworksController', ['$q', '$scope', '$state', 'NetworkService', 'Notifications', 'HttpRequestHelper', 'EndpointProvider', 'AgentService',
function ($q, $scope, $state, NetworkService, Notifications, HttpRequestHelper, EndpointProvider, AgentService) {
$scope.removeAction = function (selectedItems) {
var actionCount = selectedItems.length;
angular.forEach(selectedItems, function (network) {
HttpRequestHelper.setPortainerAgentTargetHeader(network.NodeName);
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();
}
angular.module('portainer.docker').controller('NetworksController', [
'$q',
'$scope',
'$state',
'NetworkService',
'Notifications',
'HttpRequestHelper',
'EndpointProvider',
'AgentService',
function ($q, $scope, $state, NetworkService, Notifications, HttpRequestHelper, EndpointProvider, AgentService) {
$scope.removeAction = function (selectedItems) {
var actionCount = selectedItems.length;
angular.forEach(selectedItems, function (network) {
HttpRequestHelper.setPortainerAgentTargetHeader(network.NodeName);
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();
}
});
});
});
};
$scope.offlineMode = false;
$scope.getNetworks = getNetworks;
function groupSwarmNetworksManagerNodesFirst(networks, agents) {
const getRole = (item) => _.find(agents, (agent) => agent.NodeName === item.NodeName).NodeRole;
const nonSwarmNetworks = _.remove(networks, (item) => item.Scope !== 'swarm')
const grouped = _.toArray(_.groupBy(networks, (item) => item.Id));
const sorted = _.map(grouped, (arr) => _.sortBy(arr, (item) => getRole(item)));
const arr = _.map(sorted, (a) => {
const item = a[0];
for (let i = 1; i < a.length; i++) {
item.Subs.push(a[i]);
}
return item;
});
const res = _.concat(arr, ...nonSwarmNetworks);
return res;
}
function getNetworks() {
const req = {
networks: NetworkService.networks(true, true, true)
};
if ($scope.applicationState.endpoint.mode.agentProxy && $scope.applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE') {
req.agents = AgentService.agents();
$scope.offlineMode = false;
$scope.getNetworks = getNetworks;
function groupSwarmNetworksManagerNodesFirst(networks, agents) {
const getRole = (item) => _.find(agents, (agent) => agent.NodeName === item.NodeName).NodeRole;
const nonSwarmNetworks = _.remove(networks, (item) => item.Scope !== 'swarm');
const grouped = _.toArray(_.groupBy(networks, (item) => item.Id));
const sorted = _.map(grouped, (arr) => _.sortBy(arr, (item) => getRole(item)));
const arr = _.map(sorted, (a) => {
const item = a[0];
for (let i = 1; i < a.length; i++) {
item.Subs.push(a[i]);
}
return item;
});
const res = _.concat(arr, ...nonSwarmNetworks);
return res;
}
$q.all(req)
.then((data) => {
$scope.offlineMode = EndpointProvider.offlineMode();
const networks = _.forEach(data.networks, (item) => item.Subs = []);
function getNetworks() {
const req = {
networks: NetworkService.networks(true, true, true),
};
if ($scope.applicationState.endpoint.mode.agentProxy && $scope.applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE') {
$scope.networks = groupSwarmNetworksManagerNodesFirst(data.networks, data.agents);
} else {
$scope.networks = networks;
req.agents = AgentService.agents();
}
})
.catch((err) => {
$scope.networks = [];
Notifications.error('Failure', err, 'Unable to retrieve networks');
});
}
function initView() {
getNetworks();
}
$q.all(req)
.then((data) => {
$scope.offlineMode = EndpointProvider.offlineMode();
const networks = _.forEach(data.networks, (item) => (item.Subs = []));
if ($scope.applicationState.endpoint.mode.agentProxy && $scope.applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE') {
$scope.networks = groupSwarmNetworksManagerNodesFirst(data.networks, data.agents);
} else {
$scope.networks = networks;
}
})
.catch((err) => {
$scope.networks = [];
Notifications.error('Failure', err, 'Unable to retrieve networks');
});
}
initView();
}]);
function initView() {
getNetworks();
}
initView();
},
]);