mirror of
https://github.com/portainer/portainer.git
synced 2025-08-02 20:35:25 +02:00
refactor(docker/networks): migrate macvlan nodes selector to react [EE-4669] (#10183)
This commit is contained in:
Chaim Lev-Ari
GitHub
parent
09aa1d35a8
commit
60477ae287
17 changed files with 315 additions and 220 deletions
|
|
@ -1,129 +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="'hard-drive'"></pr-icon>
|
||||
</div>
|
||||
{{ $ctrl.titleText }}
|
||||
</div>
|
||||
</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 macvlan..."
|
||||
auto-focus
|
||||
ng-model-options="{ debounce: 300 }"
|
||||
/>
|
||||
</div>
|
||||
<div class="table-responsive">
|
||||
<table class="table-hover nowrap-cells table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>
|
||||
<div class="vertical-center">
|
||||
<span class="md-checkbox">
|
||||
<input id="select_all" type="checkbox" ng-model="$ctrl.state.selectAll" ng-change="$ctrl.selectAll()" />
|
||||
<label for="select_all"></label>
|
||||
</span>
|
||||
<table-column-header
|
||||
col-title="'Name'"
|
||||
can-sort="true"
|
||||
is-sorted="$ctrl.state.orderBy === 'Hostname'"
|
||||
is-sorted-desc="$ctrl.state.orderBy === 'Hostname' && $ctrl.state.reverseOrder"
|
||||
ng-click="$ctrl.changeOrderBy('Hostname')"
|
||||
></table-column-header>
|
||||
</div>
|
||||
</th>
|
||||
<th>
|
||||
<table-column-header
|
||||
col-title="'Role'"
|
||||
can-sort="true"
|
||||
is-sorted="$ctrl.state.orderBy === 'Role'"
|
||||
is-sorted-desc="$ctrl.state.orderBy === 'Role' && $ctrl.state.reverseOrder"
|
||||
ng-click="$ctrl.changeOrderBy('Role')"
|
||||
></table-column-header>
|
||||
</th>
|
||||
<th>
|
||||
<table-column-header
|
||||
col-title="'Engine'"
|
||||
can-sort="true"
|
||||
is-sorted="$ctrl.state.orderBy === 'EngineVersion'"
|
||||
is-sorted-desc="$ctrl.state.orderBy === 'EngineVersion' && $ctrl.state.reverseOrder"
|
||||
ng-click="$ctrl.changeOrderBy('EngineVersion')"
|
||||
></table-column-header>
|
||||
</th>
|
||||
<th ng-if="$ctrl.showIpAddressColumn">
|
||||
<table-column-header
|
||||
col-title="'IP Address'"
|
||||
can-sort="true"
|
||||
is-sorted="$ctrl.state.orderBy === 'Addr'"
|
||||
is-sorted-desc="$ctrl.state.orderBy === 'Addr' && $ctrl.state.reverseOrder"
|
||||
ng-click="$ctrl.changeOrderBy('Addr')"
|
||||
></table-column-header>
|
||||
</th>
|
||||
<th>
|
||||
<table-column-header
|
||||
col-title="'Status'"
|
||||
can-sort="true"
|
||||
is-sorted="$ctrl.state.orderBy === 'Status'"
|
||||
is-sorted-desc="$ctrl.state.orderBy === 'Status' && $ctrl.state.reverseOrder"
|
||||
ng-click="$ctrl.changeOrderBy('Status')"
|
||||
></table-column-header>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr
|
||||
dir-paginate="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 }"
|
||||
>
|
||||
<td>
|
||||
<span class="md-checkbox">
|
||||
<input id="select_{{ $index }}" type="checkbox" ng-model="item.Checked" ng-click="$ctrl.selectItem(item, $event)" />
|
||||
<label for="select_{{ $index }}"></label>
|
||||
</span>
|
||||
<a ui-sref="docker.nodes.node({id: item.Id})" ng-if="$ctrl.accessToNodeDetails">{{ item.Hostname }}</a>
|
||||
<span ng-if="!$ctrl.accessToNodeDetails">{{ item.Hostname }}</span>
|
||||
</td>
|
||||
<td>{{ item.Role }}</td>
|
||||
<td>{{ item.EngineVersion }}</td>
|
||||
<td ng-if="$ctrl.showIpAddressColumn">{{ item.Addr }}</td>
|
||||
<td>
|
||||
<span class="label label-{{ item.Status | nodestatusbadge }}">{{ item.Status }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr ng-if="!$ctrl.dataset">
|
||||
<td colspan="7" class="text-muted text-center">Loading...</td>
|
||||
</tr>
|
||||
<tr ng-if="$ctrl.state.filteredDataSet.length === 0">
|
||||
<td colspan="7" class="text-muted text-center">No node available.</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="footer" ng-if="$ctrl.dataset">
|
||||
<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('macvlanNodesDatatable', {
|
||||
templateUrl: './macvlanNodesDatatable.html',
|
||||
controller: 'GenericDatatableController',
|
||||
bindings: {
|
||||
titleText: '@',
|
||||
titleIcon: '@',
|
||||
dataset: '<',
|
||||
tableKey: '@',
|
||||
orderBy: '@',
|
||||
reverseOrder: '<',
|
||||
showIpAddressColumn: '<',
|
||||
accessToNodeDetails: '<',
|
||||
state: '=',
|
||||
},
|
||||
});
|
||||
|
|
@ -37,23 +37,14 @@
|
|||
<!-- network-card-input -->
|
||||
<!-- nodes-selector -->
|
||||
<div ng-if="$ctrl.applicationState.endpoint.mode.agentProxy && $ctrl.applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'">
|
||||
<div class="form-group">
|
||||
<div class="col-sm-12">
|
||||
<macvlan-nodes-datatable
|
||||
title-text="Select the nodes where you want to deploy the local configuration"
|
||||
title-icon="hard-drive"
|
||||
dataset="$ctrl.nodes"
|
||||
table-key="nodes"
|
||||
state="$ctrl.data.DatatableState"
|
||||
order-by="Hostname"
|
||||
show-ip-address-column="$ctrl.applicationState.endpoint.apiVersion >= 1.25"
|
||||
access-to-node-details="$ctrl.isAdmin"
|
||||
name="node_selector"
|
||||
ng-model="tmp"
|
||||
ng-required="$ctrl.requiredNodeSelection()"
|
||||
></macvlan-nodes-datatable>
|
||||
</div>
|
||||
</div>
|
||||
<macvlan-nodes-selector
|
||||
dataset="$ctrl.nodes"
|
||||
is-ip-column-visible="$ctrl.applicationState.endpoint.apiVersion >= 1.25"
|
||||
have-access-to-node="$ctrl.isAdmin"
|
||||
value="$ctrl.data.DatatableState.selectedItems"
|
||||
on-change="($ctrl.onChangeSelectedNodes)"
|
||||
></macvlan-nodes-selector>
|
||||
|
||||
<div class="form-group" ng-show="macvlanConfigurationForm.node_selector.$invalid">
|
||||
<div class="col-sm-12 small text-warning">
|
||||
<div ng-messages="macvlanConfigurationForm.node_selector.$error">
|
||||
|
|
|
|||
|
|
@ -12,11 +12,18 @@ angular.module('portainer.docker').controller('NetworkMacvlanFormController', [
|
|||
|
||||
this.options = [];
|
||||
|
||||
ctrl.onChangeSelectedNodes = onChangeSelectedNodes.bind(ctrl);
|
||||
function onChangeSelectedNodes(nodes) {
|
||||
return $scope.$evalAsync(() => {
|
||||
ctrl.data.DatatableState.selectedItems = nodes;
|
||||
});
|
||||
}
|
||||
|
||||
ctrl.requiredNodeSelection = function () {
|
||||
if (ctrl.data.Scope !== 'local' || ctrl.data.DatatableState === undefined) {
|
||||
return false;
|
||||
}
|
||||
return ctrl.data.DatatableState.selectedItemCount === 0;
|
||||
return ctrl.data.DatatableState.selectedItems.length;
|
||||
};
|
||||
|
||||
ctrl.requiredConfigSelection = function () {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue