mirror of https://github.com/portainer/portainer
feat(docker/networks): migrate networks datatable to React [EE-4670] (#10351)
Co-authored-by: LP B <xAt0mZ@users.noreply.github.com>pull/10369/head
Chaim Lev-Ari
GitHub
parent
0dc1805881
commit
b933bee95e
|
|
@ -1,36 +0,0 @@
|
||||||
<td ng-if="allowCheckbox">
|
|
||||||
<span class="md-checkbox" authorization="DockerNetworkDelete, DockerNetworkCreate">
|
|
||||||
<input
|
|
||||||
id="select_{{ $index }}"
|
|
||||||
type="checkbox"
|
|
||||||
ng-model="item.Checked"
|
|
||||||
ng-click="parentCtrl.selectItem(item, $event); $event.stopPropagation()"
|
|
||||||
ng-disabled="parentCtrl.disableRemove(item)"
|
|
||||||
/>
|
|
||||||
<label for="select_{{ $index }}"></label>
|
|
||||||
</span>
|
|
||||||
<a ng-if="parentCtrl.itemCanExpand(item)">
|
|
||||||
<pr-icon ng-if="item.Expanded" icon="'chevron-down'" class-name="'mr-1'"></pr-icon>
|
|
||||||
<pr-icon ng-if="!item.Expanded" icon="'chevron-right'" class-name="'mr-1'"></pr-icon>
|
|
||||||
</a>
|
|
||||||
</td>
|
|
||||||
<td ng-if="!allowCheckbox"></td>
|
|
||||||
<td>
|
|
||||||
<a ui-sref="docker.networks.network({ id: item.Id, nodeName: item.NodeName })" title="{{ item.Name }}">{{ item.Name | truncate: 40 }}</a>
|
|
||||||
<span style="margin-left: 10px" class="label label-info image-tag space-left" ng-if="item.ResourceControl.System">System</span>
|
|
||||||
</td>
|
|
||||||
<td>{{ item.StackName ? item.StackName : '-' }}</td>
|
|
||||||
<td>{{ item.Driver }}</td>
|
|
||||||
<td>{{ item.Attachable }}</td>
|
|
||||||
<td>{{ item.IPAM.Driver }}</td>
|
|
||||||
<td>{{ item.IPAM.IPV4Configs[0].Subnet ? item.IPAM.IPV4Configs[0].Subnet : '-' }}</td>
|
|
||||||
<td>{{ item.IPAM.IPV4Configs[0].Gateway ? item.IPAM.IPV4Configs[0].Gateway : '-' }}</td>
|
|
||||||
<td>{{ item.IPAM.IPV6Configs[0].Subnet ? item.IPAM.IPV6Configs[0].Subnet : '-' }}</td>
|
|
||||||
<td>{{ item.IPAM.IPV6Configs[0].Gateway ? item.IPAM.IPV6Configs[0].Gateway : '-' }}</td>
|
|
||||||
<td ng-if="parentCtrl.showHostColumn">{{ item.NodeName ? item.NodeName : '-' }}</td>
|
|
||||||
<td>
|
|
||||||
<span>
|
|
||||||
<i ng-class="item.ResourceControl.Ownership | ownershipicon" aria-hidden="true"></i>
|
|
||||||
{{ item.ResourceControl.Ownership ? item.ResourceControl.Ownership : item.ResourceControl.Ownership = RCO.ADMINISTRATORS }}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
import { ResourceControlOwnership as RCO } from '@/react/portainer/access-control/types';
|
|
||||||
|
|
||||||
angular.module('portainer.docker').directive('networkRowContent', [
|
|
||||||
function networkRowContent() {
|
|
||||||
var directive = {
|
|
||||||
templateUrl: './networkRowContent.html',
|
|
||||||
restrict: 'A',
|
|
||||||
transclude: true,
|
|
||||||
scope: {
|
|
||||||
item: '<',
|
|
||||||
parentCtrl: '<',
|
|
||||||
allowCheckbox: '<',
|
|
||||||
allowExpand: '<',
|
|
||||||
},
|
|
||||||
controller: ($scope) => {
|
|
||||||
$scope.RCO = RCO;
|
|
||||||
},
|
|
||||||
};
|
|
||||||
return directive;
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
@ -1,238 +0,0 @@
|
||||||
<div class="datatable">
|
|
||||||
<rd-widget>
|
|
||||||
<rd-widget-body classes="no-padding">
|
|
||||||
<div class="toolBar">
|
|
||||||
<div class="toolBarTitle vertical-center">
|
|
||||||
<div class="widget-icon space-right">
|
|
||||||
<pr-icon icon="$ctrl.titleIcon"></pr-icon>
|
|
||||||
</div>
|
|
||||||
{{ $ctrl.titleText }}
|
|
||||||
</div>
|
|
||||||
<div class="searchBar vertical-center">
|
|
||||||
<pr-icon icon="'search'" class-name="'searchIcon'"></pr-icon>
|
|
||||||
<input
|
|
||||||
type="text"
|
|
||||||
class="searchInput"
|
|
||||||
ng-model="$ctrl.state.textFilter"
|
|
||||||
ng-change="$ctrl.onTextFilterChange()"
|
|
||||||
placeholder="Search for a network..."
|
|
||||||
auto-focus
|
|
||||||
ng-model-options="{ debounce: 300 }"
|
|
||||||
data-cy="network-searchInput"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="actionBar !gap-3" authorization="DockerNetworkDelete, DockerNetworkCreate">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="btn btn-sm btn-dangerlight vertical-center !ml-0 h-fit"
|
|
||||||
authorization="DockerNetworkDelete"
|
|
||||||
ng-disabled="$ctrl.state.selectedItemCount === 0"
|
|
||||||
ng-click="$ctrl.removeAction($ctrl.state.selectedItems)"
|
|
||||||
data-cy="network-removeNetworkButton"
|
|
||||||
>
|
|
||||||
<pr-icon icon="'trash-2'"></pr-icon>Remove
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="btn btn-sm btn-primary vertical-center !ml-0 h-fit"
|
|
||||||
ui-sref="docker.networks.new"
|
|
||||||
authorization="DockerNetworkCreate"
|
|
||||||
data-cy="network-addNetworkButton"
|
|
||||||
>
|
|
||||||
<pr-icon icon="'plus'"></pr-icon>Add network
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div class="settings">
|
|
||||||
<span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
|
|
||||||
<span uib-dropdown-toggle aria-label="Settings">
|
|
||||||
<pr-icon icon="'more-vertical'"></pr-icon>
|
|
||||||
</span>
|
|
||||||
<div class="dropdown-menu dropdown-menu-right" uib-dropdown-menu>
|
|
||||||
<div class="tableMenu">
|
|
||||||
<div class="menuHeader"> Table settings </div>
|
|
||||||
<div class="menuContent">
|
|
||||||
<div>
|
|
||||||
<div class="md-checkbox">
|
|
||||||
<input id="setting_auto_refresh" type="checkbox" ng-model="$ctrl.settings.repeater.autoRefresh" ng-change="$ctrl.onSettingsRepeaterChange()" />
|
|
||||||
<label for="setting_auto_refresh">Auto refresh</label>
|
|
||||||
</div>
|
|
||||||
<div ng-if="$ctrl.settings.repeater.autoRefresh">
|
|
||||||
<label for="settings_refresh_rate"> Refresh rate </label>
|
|
||||||
<select id="settings_refresh_rate" ng-model="$ctrl.settings.repeater.refreshRate" ng-change="$ctrl.onSettingsRepeaterChange()" class="small-select">
|
|
||||||
<option value="10">10s</option>
|
|
||||||
<option value="30">30s</option>
|
|
||||||
<option value="60">1min</option>
|
|
||||||
<option value="120">2min</option>
|
|
||||||
<option value="300">5min</option>
|
|
||||||
</select>
|
|
||||||
<span>
|
|
||||||
<pr-icon id="refreshRateChange" icon="'check'" mode="'success'" style="display: none"></pr-icon>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<a type="button" class="btn btn-default btn-sm" ng-click="$ctrl.settings.open = false;">Close</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="table-responsive">
|
|
||||||
<table class="table-hover nowrap-cells table">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th style="width: 55px">
|
|
||||||
<span class="md-checkbox" authorization="DockerNetworkDelete, DockerNetworkCreate">
|
|
||||||
<input id="select_all" type="checkbox" ng-model="$ctrl.state.selectAll" ng-change="$ctrl.selectAll()" />
|
|
||||||
<label for="select_all"></label>
|
|
||||||
</span>
|
|
||||||
<a ng-click="$ctrl.expandAll()" ng-if="$ctrl.hasExpandableItems()">
|
|
||||||
<pr-icon ng-if="$ctrl.state.expandAll" icon="'chevron-down'"></pr-icon>
|
|
||||||
<pr-icon ng-if="!$ctrl.state.expandAll" icon="'chevron-right'"></pr-icon>
|
|
||||||
</a>
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
<table-column-header
|
|
||||||
col-title="'Name'"
|
|
||||||
can-sort="true"
|
|
||||||
is-sorted="$ctrl.state.orderBy === 'Name'"
|
|
||||||
is-sorted-desc="$ctrl.state.orderBy === 'Name' && $ctrl.state.reverseOrder"
|
|
||||||
ng-click="$ctrl.changeOrderBy('Name')"
|
|
||||||
></table-column-header>
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
<table-column-header
|
|
||||||
col-title="'Stack'"
|
|
||||||
can-sort="true"
|
|
||||||
is-sorted="$ctrl.state.orderBy === 'StackName'"
|
|
||||||
is-sorted-desc="$ctrl.state.orderBy === 'StackName' && $ctrl.state.reverseOrder"
|
|
||||||
ng-click="$ctrl.changeOrderBy('StackName')"
|
|
||||||
></table-column-header>
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
<table-column-header
|
|
||||||
col-title="'Driver'"
|
|
||||||
can-sort="true"
|
|
||||||
is-sorted="$ctrl.state.orderBy === 'Driver'"
|
|
||||||
is-sorted-desc="$ctrl.state.orderBy === 'Driver' && $ctrl.state.reverseOrder"
|
|
||||||
ng-click="$ctrl.changeOrderBy('Driver')"
|
|
||||||
></table-column-header>
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
<table-column-header
|
|
||||||
col-title="'Attachable'"
|
|
||||||
can-sort="true"
|
|
||||||
is-sorted="$ctrl.state.orderBy === 'Attachable'"
|
|
||||||
is-sorted-desc="$ctrl.state.orderBy === 'Attachable' && $ctrl.state.reverseOrder"
|
|
||||||
ng-click="$ctrl.changeOrderBy('Attachable')"
|
|
||||||
></table-column-header>
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
<table-column-header
|
|
||||||
col-title="'IPAM Driver'"
|
|
||||||
can-sort="true"
|
|
||||||
is-sorted="$ctrl.state.orderBy === 'IPAM.Driver'"
|
|
||||||
is-sorted-desc="$ctrl.state.orderBy === 'IPAM.Driver' && $ctrl.state.reverseOrder"
|
|
||||||
ng-click="$ctrl.changeOrderBy('IPAM.Driver')"
|
|
||||||
></table-column-header>
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
<table-column-header
|
|
||||||
col-title="'IPV4 IPAM Subnet'"
|
|
||||||
can-sort="true"
|
|
||||||
is-sorted="$ctrl.state.orderBy === 'IPAM.IPV4Configs[0].Subnet'"
|
|
||||||
is-sorted-desc="$ctrl.state.orderBy === 'IPAM.IPV4Configs[0].Subnet' && $ctrl.state.reverseOrder"
|
|
||||||
ng-click="$ctrl.changeOrderBy('IPAM.IPV4Configs[0].Subnet')"
|
|
||||||
></table-column-header>
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
<table-column-header
|
|
||||||
col-title="'IPV4 IPAM Gateway'"
|
|
||||||
can-sort="true"
|
|
||||||
is-sorted="$ctrl.state.orderBy === 'IPAM.IPV4Configs[0].Gateway'"
|
|
||||||
is-sorted-desc="$ctrl.state.orderBy === 'IPAM.IPV4Configs[0].Gateway' && $ctrl.state.reverseOrder"
|
|
||||||
ng-click="$ctrl.changeOrderBy('IPAM.IPV4Configs[0].Gateway')"
|
|
||||||
></table-column-header>
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
<table-column-header
|
|
||||||
col-title="'IPV6 IPAM Subnet'"
|
|
||||||
can-sort="true"
|
|
||||||
is-sorted="$ctrl.state.orderBy === 'IPAM.IPV6Configs[0].Subnet'"
|
|
||||||
is-sorted-desc="$ctrl.state.orderBy === 'IPAM.IPV6Configs[0].Subnet' && $ctrl.state.reverseOrder"
|
|
||||||
ng-click="$ctrl.changeOrderBy('IPAM.IPV6Configs[0].Subnet')"
|
|
||||||
></table-column-header>
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
<table-column-header
|
|
||||||
col-title="'IPV6 IPAM Gateway'"
|
|
||||||
can-sort="true"
|
|
||||||
is-sorted="$ctrl.state.orderBy === 'IPAM.IPV6Configs[0].Gateway'"
|
|
||||||
is-sorted-desc="$ctrl.state.orderBy === 'IPAM.IPV6Configs[0].Gateway' && $ctrl.state.reverseOrder"
|
|
||||||
ng-click="$ctrl.changeOrderBy('IPAM.IPV6Configs[0].Gateway')"
|
|
||||||
></table-column-header>
|
|
||||||
</th>
|
|
||||||
<th ng-if="$ctrl.showHostColumn">
|
|
||||||
<table-column-header
|
|
||||||
col-title="'Host'"
|
|
||||||
can-sort="true"
|
|
||||||
is-sorted="$ctrl.state.orderBy === 'NodeName'"
|
|
||||||
is-sorted-desc="$ctrl.state.orderBy === 'NodeName' && $ctrl.state.reverseOrder"
|
|
||||||
ng-click="$ctrl.changeOrderBy('NodeName')"
|
|
||||||
></table-column-header>
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
<table-column-header
|
|
||||||
col-title="'Ownership'"
|
|
||||||
can-sort="true"
|
|
||||||
is-sorted="$ctrl.state.orderBy === 'ResourceControl.Ownership'"
|
|
||||||
is-sorted-desc="$ctrl.state.orderBy === 'ResourceControl.Ownership' && $ctrl.state.reverseOrder"
|
|
||||||
ng-click="$ctrl.changeOrderBy('ResourceControl.Ownership')"
|
|
||||||
></table-column-header>
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<tr
|
|
||||||
dir-paginate-start="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit))"
|
|
||||||
ng-class="{ active: item.Checked }"
|
|
||||||
network-row-content
|
|
||||||
item="item"
|
|
||||||
parent-ctrl="$ctrl"
|
|
||||||
ng-click="$ctrl.expandItem(item, !item.Expanded)"
|
|
||||||
allow-checkbox="true"
|
|
||||||
>
|
|
||||||
</tr>
|
|
||||||
<tr dir-paginate-end ng-show="item.Expanded" ng-repeat="it in item.Subs" class="datatable-highlighted" network-row-content item="it" parent-ctrl="$ctrl"> </tr>
|
|
||||||
<tr ng-if="!$ctrl.dataset">
|
|
||||||
<td colspan="9" class="text-muted text-center">Loading...</td>
|
|
||||||
</tr>
|
|
||||||
<tr ng-if="$ctrl.state.filteredDataSet.length === 0">
|
|
||||||
<td colspan="9" class="text-muted text-center">No network available.</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
<div class="footer" ng-if="$ctrl.dataset">
|
|
||||||
<div class="infoBar" ng-if="$ctrl.state.selectedItemCount !== 0"> {{ $ctrl.state.selectedItemCount }} item(s) selected </div>
|
|
||||||
<div class="paginationControls">
|
|
||||||
<form class="form-inline vertical-center">
|
|
||||||
<span class="limitSelector">
|
|
||||||
<span style="margin-right: 5px"> Items per page </span>
|
|
||||||
<select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
|
|
||||||
<option value="0">All</option>
|
|
||||||
<option value="10">10</option>
|
|
||||||
<option value="25">25</option>
|
|
||||||
<option value="50">50</option>
|
|
||||||
<option value="100">100</option>
|
|
||||||
</select>
|
|
||||||
</span>
|
|
||||||
<dir-pagination-controls max-size="5"></dir-pagination-controls>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</rd-widget-body>
|
|
||||||
</rd-widget>
|
|
||||||
</div>
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
angular.module('portainer.docker').component('networksDatatable', {
|
|
||||||
templateUrl: './networksDatatable.html',
|
|
||||||
controller: 'NetworksDatatableController',
|
|
||||||
bindings: {
|
|
||||||
titleText: '@',
|
|
||||||
titleIcon: '@',
|
|
||||||
dataset: '<',
|
|
||||||
tableKey: '@',
|
|
||||||
orderBy: '@',
|
|
||||||
reverseOrder: '<',
|
|
||||||
showHostColumn: '<',
|
|
||||||
removeAction: '<',
|
|
||||||
refreshCallback: '<',
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
@ -1,80 +0,0 @@
|
||||||
import _ from 'lodash-es';
|
|
||||||
|
|
||||||
angular.module('portainer.docker').controller('NetworksDatatableController', [
|
|
||||||
'$scope',
|
|
||||||
'$controller',
|
|
||||||
'NetworkHelper',
|
|
||||||
'DatatableService',
|
|
||||||
function ($scope, $controller, NetworkHelper, DatatableService) {
|
|
||||||
angular.extend(this, $controller('GenericDatatableController', { $scope: $scope }));
|
|
||||||
|
|
||||||
this.disableRemove = function (item) {
|
|
||||||
return NetworkHelper.isSystemNetwork(item);
|
|
||||||
};
|
|
||||||
|
|
||||||
this.state = Object.assign(this.state, {
|
|
||||||
expandedItems: [],
|
|
||||||
});
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Do not allow system networks to be selected
|
|
||||||
*/
|
|
||||||
this.allowSelection = function (item) {
|
|
||||||
return !this.disableRemove(item);
|
|
||||||
};
|
|
||||||
|
|
||||||
this.$onInit = function () {
|
|
||||||
this.setDefaults();
|
|
||||||
this.prepareTableFromDataset();
|
|
||||||
|
|
||||||
this.state.orderBy = this.orderBy;
|
|
||||||
var storedOrder = DatatableService.getDataTableOrder(this.tableKey);
|
|
||||||
if (storedOrder !== null) {
|
|
||||||
this.state.reverseOrder = storedOrder.reverse;
|
|
||||||
this.state.orderBy = storedOrder.orderBy;
|
|
||||||
}
|
|
||||||
|
|
||||||
var textFilter = DatatableService.getDataTableTextFilters(this.tableKey);
|
|
||||||
if (textFilter !== null) {
|
|
||||||
this.state.textFilter = textFilter;
|
|
||||||
this.onTextFilterChange();
|
|
||||||
}
|
|
||||||
|
|
||||||
var storedFilters = DatatableService.getDataTableFilters(this.tableKey);
|
|
||||||
if (storedFilters !== null) {
|
|
||||||
this.filters = storedFilters;
|
|
||||||
}
|
|
||||||
if (this.filters && this.filters.state) {
|
|
||||||
this.filters.state.open = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
var storedSettings = DatatableService.getDataTableSettings(this.tableKey);
|
|
||||||
if (storedSettings !== null) {
|
|
||||||
this.settings = storedSettings;
|
|
||||||
this.settings.open = false;
|
|
||||||
}
|
|
||||||
this.onSettingsRepeaterChange();
|
|
||||||
};
|
|
||||||
|
|
||||||
this.expandItem = function (item, expanded) {
|
|
||||||
item.Expanded = expanded;
|
|
||||||
};
|
|
||||||
|
|
||||||
this.itemCanExpand = function (item) {
|
|
||||||
return item.Subs.length > 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
this.hasExpandableItems = function () {
|
|
||||||
return _.filter(this.state.filteredDataSet, (item) => this.itemCanExpand(item)).length;
|
|
||||||
};
|
|
||||||
|
|
||||||
this.expandAll = function () {
|
|
||||||
this.state.expandAll = !this.state.expandAll;
|
|
||||||
_.forEach(this.state.filteredDataSet, (item) => {
|
|
||||||
if (this.itemCanExpand(item)) {
|
|
||||||
this.expandItem(item, this.state.expandAll);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
@ -1,33 +0,0 @@
|
||||||
import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel';
|
|
||||||
|
|
||||||
export function NetworkViewModel(data) {
|
|
||||||
this.Id = data.Id;
|
|
||||||
this.Name = data.Name;
|
|
||||||
this.Scope = data.Scope;
|
|
||||||
this.Driver = data.Driver;
|
|
||||||
this.Attachable = data.Attachable;
|
|
||||||
this.Internal = data.Internal;
|
|
||||||
this.IPAM = data.IPAM;
|
|
||||||
this.Containers = data.Containers;
|
|
||||||
this.Options = data.Options;
|
|
||||||
this.Ingress = data.Ingress;
|
|
||||||
|
|
||||||
this.Labels = data.Labels;
|
|
||||||
if (this.Labels && this.Labels['com.docker.compose.project']) {
|
|
||||||
this.StackName = this.Labels['com.docker.compose.project'];
|
|
||||||
} else if (this.Labels && this.Labels['com.docker.stack.namespace']) {
|
|
||||||
this.StackName = this.Labels['com.docker.stack.namespace'];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (data.Portainer) {
|
|
||||||
if (data.Portainer.ResourceControl) {
|
|
||||||
this.ResourceControl = new ResourceControlViewModel(data.Portainer.ResourceControl);
|
|
||||||
}
|
|
||||||
if (data.Portainer.Agent && data.Portainer.Agent.NodeName) {
|
|
||||||
this.NodeName = data.Portainer.Agent.NodeName;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
this.ConfigFrom = data.ConfigFrom;
|
|
||||||
this.ConfigOnly = data.ConfigOnly;
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,79 @@
|
||||||
|
import { IPAM, Network, NetworkContainer } from 'docker-types/generated/1.41';
|
||||||
|
|
||||||
|
import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel';
|
||||||
|
import { IResource } from '@/react/docker/components/datatable/createOwnershipColumn';
|
||||||
|
import { PortainerMetadata } from '@/react/docker/types';
|
||||||
|
|
||||||
|
export class NetworkViewModel implements IResource {
|
||||||
|
Id: string;
|
||||||
|
|
||||||
|
Name: string;
|
||||||
|
|
||||||
|
Scope: string;
|
||||||
|
|
||||||
|
Driver: string;
|
||||||
|
|
||||||
|
Attachable: boolean;
|
||||||
|
|
||||||
|
Internal: boolean;
|
||||||
|
|
||||||
|
IPAM?: IPAM;
|
||||||
|
|
||||||
|
Containers?: Record<string, NetworkContainer>;
|
||||||
|
|
||||||
|
Options?: Record<string, string>;
|
||||||
|
|
||||||
|
Ingress: boolean;
|
||||||
|
|
||||||
|
Labels: Record<string, string>;
|
||||||
|
|
||||||
|
StackName?: string;
|
||||||
|
|
||||||
|
NodeName?: string;
|
||||||
|
|
||||||
|
ConfigFrom?: { Network: string };
|
||||||
|
|
||||||
|
ConfigOnly?: boolean;
|
||||||
|
|
||||||
|
ResourceControl?: ResourceControlViewModel;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
data: Network & {
|
||||||
|
Portainer?: PortainerMetadata;
|
||||||
|
ConfigFrom?: { Network: string };
|
||||||
|
ConfigOnly?: boolean;
|
||||||
|
}
|
||||||
|
) {
|
||||||
|
this.Id = data.Id || '';
|
||||||
|
this.Name = data.Name || '';
|
||||||
|
this.Scope = data.Scope || '';
|
||||||
|
this.Driver = data.Driver || '';
|
||||||
|
this.Attachable = data.Attachable || false;
|
||||||
|
this.Internal = data.Internal || false;
|
||||||
|
this.IPAM = data.IPAM;
|
||||||
|
this.Containers = data.Containers;
|
||||||
|
this.Options = data.Options;
|
||||||
|
this.Ingress = data.Ingress || false;
|
||||||
|
|
||||||
|
this.Labels = data.Labels || {};
|
||||||
|
if (this.Labels && this.Labels['com.docker.compose.project']) {
|
||||||
|
this.StackName = this.Labels['com.docker.compose.project'];
|
||||||
|
} else if (this.Labels && this.Labels['com.docker.stack.namespace']) {
|
||||||
|
this.StackName = this.Labels['com.docker.stack.namespace'];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data.Portainer) {
|
||||||
|
if (data.Portainer.ResourceControl) {
|
||||||
|
this.ResourceControl = new ResourceControlViewModel(
|
||||||
|
data.Portainer.ResourceControl
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (data.Portainer.Agent && data.Portainer.Agent.NodeName) {
|
||||||
|
this.NodeName = data.Portainer.Agent.NodeName;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.ConfigFrom = data.ConfigFrom;
|
||||||
|
this.ConfigOnly = data.ConfigOnly;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -10,9 +10,7 @@ import {
|
||||||
ResourceObject,
|
ResourceObject,
|
||||||
} from 'docker-types/generated/1.41';
|
} from 'docker-types/generated/1.41';
|
||||||
|
|
||||||
type WithRequiredProperty<Type, Key extends keyof Type> = Type & {
|
import { WithRequiredProperty } from '@/types';
|
||||||
[Property in Key]-?: Type[Property];
|
|
||||||
};
|
|
||||||
|
|
||||||
export class NodeViewModel {
|
export class NodeViewModel {
|
||||||
Model: Node;
|
Model: Node;
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ import { AgentVolumeBrowser } from '@/react/docker/volumes/BrowseView/AgentVolum
|
||||||
import { ProcessesDatatable } from '@/react/docker/containers/StatsView/ProcessesDatatable';
|
import { ProcessesDatatable } from '@/react/docker/containers/StatsView/ProcessesDatatable';
|
||||||
import { SecretsDatatable } from '@/react/docker/secrets/ListView/SecretsDatatable';
|
import { SecretsDatatable } from '@/react/docker/secrets/ListView/SecretsDatatable';
|
||||||
import { StacksDatatable } from '@/react/docker/stacks/ListView/StacksDatatable';
|
import { StacksDatatable } from '@/react/docker/stacks/ListView/StacksDatatable';
|
||||||
|
import { NetworksDatatable } from '@/react/docker/networks/ListView/NetworksDatatable';
|
||||||
|
|
||||||
import { containersModule } from './containers';
|
import { containersModule } from './containers';
|
||||||
import { servicesModule } from './services';
|
import { servicesModule } from './services';
|
||||||
|
|
@ -57,6 +58,14 @@ const ngModule = angular
|
||||||
['environment', 'stackName']
|
['environment', 'stackName']
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
.component(
|
||||||
|
'networksDatatable',
|
||||||
|
r2a(withUIRouter(withCurrentUser(NetworksDatatable)), [
|
||||||
|
'dataset',
|
||||||
|
'onRefresh',
|
||||||
|
'onRemove',
|
||||||
|
])
|
||||||
|
)
|
||||||
.component(
|
.component(
|
||||||
'gpusList',
|
'gpusList',
|
||||||
r2a(withControlledInput(GpusList), ['value', 'onChange'])
|
r2a(withControlledInput(GpusList), ['value', 'onChange'])
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,3 @@
|
||||||
<page-header title="'Network list'" breadcrumbs="['Networks']" reload="true"> </page-header>
|
<page-header title="'Network list'" breadcrumbs="['Networks']" reload="true"> </page-header>
|
||||||
|
|
||||||
<div class="row">
|
<networks-datatable ng-if="networks" dataset="networks" on-refresh="(getNetworks)" on-remove="(removeAction)"></networks-datatable>
|
||||||
<div class="col-sm-12">
|
|
||||||
<networks-datatable
|
|
||||||
title-text="Networks"
|
|
||||||
title-icon="share-2"
|
|
||||||
dataset="networks"
|
|
||||||
table-key="networks"
|
|
||||||
order-by="Name"
|
|
||||||
remove-action="removeAction"
|
|
||||||
show-host-column="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'"
|
|
||||||
refresh-callback="getNetworks"
|
|
||||||
></networks-datatable>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,20 @@
|
||||||
|
import { useEnvironmentId } from '@/react/hooks/useEnvironmentId';
|
||||||
|
|
||||||
|
import { NestedDatatable } from '@@/datatables/NestedDatatable';
|
||||||
|
|
||||||
|
import { useIsSwarm } from '../../proxy/queries/useInfo';
|
||||||
|
|
||||||
|
import { useColumns } from './columns';
|
||||||
|
import { DecoratedNetwork } from './types';
|
||||||
|
|
||||||
|
export function NestedNetworksDatatable({
|
||||||
|
dataset,
|
||||||
|
}: {
|
||||||
|
dataset: Array<DecoratedNetwork>;
|
||||||
|
}) {
|
||||||
|
const environmentId = useEnvironmentId();
|
||||||
|
const isSwarm = useIsSwarm(environmentId);
|
||||||
|
|
||||||
|
const columns = useColumns(isSwarm);
|
||||||
|
return <NestedDatatable columns={columns} dataset={dataset} />;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,113 @@
|
||||||
|
import { Plus, Share2, Trash2 } from 'lucide-react';
|
||||||
|
|
||||||
|
import { Authorized } from '@/react/hooks/useUser';
|
||||||
|
import { useEnvironmentId } from '@/react/hooks/useEnvironmentId';
|
||||||
|
|
||||||
|
import { ExpandableDatatable } from '@@/datatables/ExpandableDatatable';
|
||||||
|
import {
|
||||||
|
BasicTableSettings,
|
||||||
|
createPersistedStore,
|
||||||
|
refreshableSettings,
|
||||||
|
RefreshableTableSettings,
|
||||||
|
} from '@@/datatables/types';
|
||||||
|
import { Button } from '@@/buttons';
|
||||||
|
import { TableSettingsMenu } from '@@/datatables';
|
||||||
|
import { TableSettingsMenuAutoRefresh } from '@@/datatables/TableSettingsMenuAutoRefresh';
|
||||||
|
import { useRepeater } from '@@/datatables/useRepeater';
|
||||||
|
import { useTableState } from '@@/datatables/useTableState';
|
||||||
|
import { Link } from '@@/Link';
|
||||||
|
|
||||||
|
import { useIsSwarm } from '../../proxy/queries/useInfo';
|
||||||
|
|
||||||
|
import { useColumns } from './columns';
|
||||||
|
import { DecoratedNetwork } from './types';
|
||||||
|
import { NestedNetworksDatatable } from './NestedNetwordsTable';
|
||||||
|
|
||||||
|
const storageKey = 'docker.networks';
|
||||||
|
|
||||||
|
interface TableSettings extends BasicTableSettings, RefreshableTableSettings {}
|
||||||
|
|
||||||
|
const settingsStore = createPersistedStore<TableSettings>(
|
||||||
|
storageKey,
|
||||||
|
'name',
|
||||||
|
(set) => ({
|
||||||
|
...refreshableSettings(set),
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
type DatasetType = Array<DecoratedNetwork>;
|
||||||
|
interface Props {
|
||||||
|
dataset: DatasetType;
|
||||||
|
onRemove(selectedItems: DatasetType): void;
|
||||||
|
onRefresh(): Promise<void>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function NetworksDatatable({ dataset, onRemove, onRefresh }: Props) {
|
||||||
|
const settings = useTableState(settingsStore, storageKey);
|
||||||
|
|
||||||
|
const environmentId = useEnvironmentId();
|
||||||
|
const isSwarm = useIsSwarm(environmentId);
|
||||||
|
|
||||||
|
const columns = useColumns(isSwarm);
|
||||||
|
|
||||||
|
useRepeater(settings.autoRefreshRate, onRefresh);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<ExpandableDatatable<DecoratedNetwork>
|
||||||
|
settingsManager={settings}
|
||||||
|
title="Networks"
|
||||||
|
titleIcon={Share2}
|
||||||
|
dataset={dataset}
|
||||||
|
columns={columns}
|
||||||
|
getRowCanExpand={({ original: item }) =>
|
||||||
|
!!(item.Subs && item.Subs?.length > 0)
|
||||||
|
}
|
||||||
|
isRowSelectable={({ original: item }) => !item.ResourceControl?.System}
|
||||||
|
renderSubRow={(row) => (
|
||||||
|
<>
|
||||||
|
{row.original.Subs && (
|
||||||
|
<tr>
|
||||||
|
<td colSpan={Number.MAX_SAFE_INTEGER}>
|
||||||
|
<NestedNetworksDatatable dataset={row.original.Subs} />
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
emptyContentLabel="No networks available."
|
||||||
|
renderTableActions={(selectedRows) => (
|
||||||
|
<div className="flex gap-3">
|
||||||
|
<Authorized
|
||||||
|
authorizations={['DockerNetworkDelete', 'DockerNetworkCreate']}
|
||||||
|
>
|
||||||
|
<Button
|
||||||
|
disabled={selectedRows.length === 0}
|
||||||
|
color="dangerlight"
|
||||||
|
onClick={() => onRemove(selectedRows)}
|
||||||
|
icon={Trash2}
|
||||||
|
>
|
||||||
|
Remove
|
||||||
|
</Button>
|
||||||
|
</Authorized>
|
||||||
|
<Authorized
|
||||||
|
authorizations="DockerNetworkCreate"
|
||||||
|
data-cy="network-addNetworkButton"
|
||||||
|
>
|
||||||
|
<Button icon={Plus} as={Link} props={{ to: '.new' }}>
|
||||||
|
Add network
|
||||||
|
</Button>
|
||||||
|
</Authorized>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
renderTableSettings={() => (
|
||||||
|
<TableSettingsMenu>
|
||||||
|
<TableSettingsMenuAutoRefresh
|
||||||
|
onChange={settings.setAutoRefreshRate}
|
||||||
|
value={settings.autoRefreshRate}
|
||||||
|
/>
|
||||||
|
</TableSettingsMenu>
|
||||||
|
)}
|
||||||
|
getRowId={(row) => `${row.Name}-${row.Id}`}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
import { createColumnHelper } from '@tanstack/react-table';
|
||||||
|
|
||||||
|
import { DecoratedNetwork } from '../types';
|
||||||
|
|
||||||
|
export const columnHelper = createColumnHelper<DecoratedNetwork>();
|
||||||
|
|
@ -0,0 +1,63 @@
|
||||||
|
import _ from 'lodash';
|
||||||
|
import { useMemo } from 'react';
|
||||||
|
|
||||||
|
import { createOwnershipColumn } from '@/react/docker/components/datatable/createOwnershipColumn';
|
||||||
|
|
||||||
|
import { buildExpandColumn } from '@@/datatables/expand-column';
|
||||||
|
|
||||||
|
import { DecoratedNetwork } from '../types';
|
||||||
|
|
||||||
|
import { columnHelper } from './helper';
|
||||||
|
import { name } from './name';
|
||||||
|
|
||||||
|
export function useColumns(isHostColumnVisible?: boolean) {
|
||||||
|
return useMemo(
|
||||||
|
() =>
|
||||||
|
_.compact([
|
||||||
|
buildExpandColumn<DecoratedNetwork>(),
|
||||||
|
name,
|
||||||
|
columnHelper.accessor((item) => item.StackName || '-', {
|
||||||
|
header: 'Stack',
|
||||||
|
}),
|
||||||
|
columnHelper.accessor('Driver', {
|
||||||
|
header: 'Driver',
|
||||||
|
}),
|
||||||
|
columnHelper.accessor('Attachable', {
|
||||||
|
header: 'Attachable',
|
||||||
|
}),
|
||||||
|
columnHelper.accessor('IPAM.Driver', {
|
||||||
|
header: 'IPAM Driver',
|
||||||
|
}),
|
||||||
|
columnHelper.accessor(
|
||||||
|
(item) => item.IPAM?.IPV4Configs?.[0]?.Subnet ?? '-',
|
||||||
|
{
|
||||||
|
header: 'IPV4 IPAM Subnet',
|
||||||
|
}
|
||||||
|
),
|
||||||
|
columnHelper.accessor(
|
||||||
|
(item) => item.IPAM?.IPV4Configs?.[0]?.Gateway ?? '-',
|
||||||
|
{
|
||||||
|
header: 'IPV4 IPAM Gateway',
|
||||||
|
}
|
||||||
|
),
|
||||||
|
columnHelper.accessor(
|
||||||
|
(item) => item.IPAM?.IPV6Configs?.[0]?.Subnet ?? '-',
|
||||||
|
{
|
||||||
|
header: 'IPV6 IPAM Subnet',
|
||||||
|
}
|
||||||
|
),
|
||||||
|
columnHelper.accessor(
|
||||||
|
(item) => item.IPAM?.IPV6Configs?.[0]?.Gateway ?? '-',
|
||||||
|
{
|
||||||
|
header: 'IPV6 IPAM Gateway',
|
||||||
|
}
|
||||||
|
),
|
||||||
|
isHostColumnVisible &&
|
||||||
|
columnHelper.accessor('NodeName', {
|
||||||
|
header: 'Node',
|
||||||
|
}),
|
||||||
|
createOwnershipColumn<DecoratedNetwork>(),
|
||||||
|
]),
|
||||||
|
[isHostColumnVisible]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,31 @@
|
||||||
|
import { truncate } from '@/portainer/filters/filters';
|
||||||
|
|
||||||
|
import { Link } from '@@/Link';
|
||||||
|
|
||||||
|
import { columnHelper } from './helper';
|
||||||
|
|
||||||
|
export const name = columnHelper.accessor('Name', {
|
||||||
|
header: 'Name',
|
||||||
|
id: 'name',
|
||||||
|
cell({ row: { original: item } }) {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Link
|
||||||
|
to=".network"
|
||||||
|
params={{ id: item.Id, nodeName: item.NodeName }}
|
||||||
|
title={item.Name}
|
||||||
|
>
|
||||||
|
{truncate(item.Name, 40)}
|
||||||
|
</Link>
|
||||||
|
{item.ResourceControl?.System && (
|
||||||
|
<span
|
||||||
|
style={{ marginLeft: '10px' }}
|
||||||
|
className="label label-info image-tag space-left"
|
||||||
|
>
|
||||||
|
System
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
import { IPAMConfig } from 'docker-types/generated/1.41';
|
||||||
|
|
||||||
|
import { NetworkViewModel } from '@/docker/models/network';
|
||||||
|
|
||||||
|
export type DecoratedNetwork = NetworkViewModel & {
|
||||||
|
Subs?: DecoratedNetwork[];
|
||||||
|
IPAM: NetworkViewModel['IPAM'] & {
|
||||||
|
IPV4Configs?: Array<IPAMConfig>;
|
||||||
|
IPV6Configs?: Array<IPAMConfig>;
|
||||||
|
};
|
||||||
|
};
|
||||||
Loading…
Reference in New Issue