mirror of
https://github.com/portainer/portainer.git
synced 2025-08-05 05:45:22 +02:00
refactor(kube/apps): convert placement table to react [EE-4662] (#8938)
This commit is contained in:
Chaim Lev-Ari
GitHub
parent
bf79ef7d89
commit
37ece734f0
15 changed files with 379 additions and 309 deletions
33
app/kubernetes/filters/application.ts
Normal file
33
app/kubernetes/filters/application.ts
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
import { KubernetesPodNodeAffinityNodeSelectorRequirementOperators } from '../pod/models';
|
||||
|
||||
export function nodeAffinityValues(
|
||||
values: string | string[],
|
||||
operator: KubernetesPodNodeAffinityNodeSelectorRequirementOperators
|
||||
) {
|
||||
if (
|
||||
operator === KubernetesPodNodeAffinityNodeSelectorRequirementOperators.IN ||
|
||||
operator ===
|
||||
KubernetesPodNodeAffinityNodeSelectorRequirementOperators.NOT_IN
|
||||
) {
|
||||
return values;
|
||||
}
|
||||
|
||||
if (
|
||||
operator ===
|
||||
KubernetesPodNodeAffinityNodeSelectorRequirementOperators.EXISTS ||
|
||||
operator ===
|
||||
KubernetesPodNodeAffinityNodeSelectorRequirementOperators.DOES_NOT_EXIST
|
||||
) {
|
||||
return '';
|
||||
}
|
||||
|
||||
if (
|
||||
operator ===
|
||||
KubernetesPodNodeAffinityNodeSelectorRequirementOperators.GREATER_THAN ||
|
||||
operator ===
|
||||
KubernetesPodNodeAffinityNodeSelectorRequirementOperators.LOWER_THAN
|
||||
) {
|
||||
return values[0];
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
import _ from 'lodash-es';
|
||||
import { KubernetesApplicationDataAccessPolicies } from 'Kubernetes/models/application/models';
|
||||
import { KubernetesApplicationTypes, KubernetesApplicationTypeStrings } from 'Kubernetes/models/application/models';
|
||||
import { KubernetesPodNodeAffinityNodeSelectorRequirementOperators } from 'Kubernetes/pod/models';
|
||||
import { nodeAffinityValues } from './application';
|
||||
|
||||
angular
|
||||
.module('portainer.kubernetes')
|
||||
|
|
@ -65,22 +65,7 @@ angular
|
|||
})
|
||||
.filter('kubernetesApplicationConstraintNodeAffinityValue', function () {
|
||||
'use strict';
|
||||
return function (values, operator) {
|
||||
if (operator === KubernetesPodNodeAffinityNodeSelectorRequirementOperators.IN || operator === KubernetesPodNodeAffinityNodeSelectorRequirementOperators.NOT_IN) {
|
||||
return values;
|
||||
} else if (
|
||||
operator === KubernetesPodNodeAffinityNodeSelectorRequirementOperators.EXISTS ||
|
||||
operator === KubernetesPodNodeAffinityNodeSelectorRequirementOperators.DOES_NOT_EXIST
|
||||
) {
|
||||
return '';
|
||||
} else if (
|
||||
operator === KubernetesPodNodeAffinityNodeSelectorRequirementOperators.GREATER_THAN ||
|
||||
operator === KubernetesPodNodeAffinityNodeSelectorRequirementOperators.LOWER_THAN
|
||||
) {
|
||||
return values[0];
|
||||
}
|
||||
return '';
|
||||
};
|
||||
return nodeAffinityValues;
|
||||
})
|
||||
.filter('kubernetesNodeLabelHumanReadbleText', function () {
|
||||
'use strict';
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
export const KubernetesPodNodeAffinityNodeSelectorRequirementOperators = Object.freeze({
|
||||
IN: 'In',
|
||||
NOT_IN: 'NotIn',
|
||||
EXISTS: 'Exists',
|
||||
DOES_NOT_EXIST: 'DoesNotExist',
|
||||
GREATER_THAN: 'Gt',
|
||||
LOWER_THAN: 'Lt',
|
||||
});
|
||||
export enum KubernetesPodNodeAffinityNodeSelectorRequirementOperators {
|
||||
IN = 'In',
|
||||
NOT_IN = 'NotIn',
|
||||
EXISTS = 'Exists',
|
||||
DOES_NOT_EXIST = 'DoesNotExist',
|
||||
GREATER_THAN = 'Gt',
|
||||
LOWER_THAN = 'Lt',
|
||||
}
|
||||
|
||||
/**
|
||||
* KubernetesPodAffinity Model
|
||||
|
|
@ -19,6 +19,7 @@ import {
|
|||
import { withUserProvider } from '@/react/test-utils/withUserProvider';
|
||||
import { withFormValidation } from '@/react-tools/withFormValidation';
|
||||
import { withCurrentUser } from '@/react-tools/withCurrentUser';
|
||||
import { PlacementsDatatable } from '@/react/kubernetes/applications/ItemView/PlacementsDatatable';
|
||||
|
||||
export const ngModule = angular
|
||||
.module('portainer.kubernetes.react.components', [])
|
||||
|
|
@ -107,6 +108,10 @@ export const ngModule = angular
|
|||
withUIRouter(withReactQuery(withUserProvider(ApplicationDetailsWidget))),
|
||||
[]
|
||||
)
|
||||
)
|
||||
.component(
|
||||
'kubernetesApplicationPlacementsDatatable',
|
||||
r2a(withCurrentUser(PlacementsDatatable), ['dataset', 'onRefresh'])
|
||||
);
|
||||
|
||||
export const componentsModule = ngModule.name;
|
||||
|
|
|
|||
|
|
@ -40,15 +40,11 @@
|
|||
<pr-icon icon="'info'" mode="'primary'"></pr-icon>
|
||||
The placement component helps you understand whether or not this application can be deployed on a specific node.
|
||||
</div>
|
||||
|
||||
<kubernetes-application-placements-datatable
|
||||
title-text="Placement constraints/preferences"
|
||||
title-icon="minimize-2"
|
||||
ng-if="ctrl.placements"
|
||||
dataset="ctrl.placements"
|
||||
table-key="kubernetes.application.placements"
|
||||
order-by="Name"
|
||||
reverse-order="false"
|
||||
loading="ctrl.state.dataLoading"
|
||||
refresh-callback="ctrl.getApplication"
|
||||
on-refresh="(ctrl.getApplication)"
|
||||
></kubernetes-application-placements-datatable>
|
||||
</uib-tab>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,71 +0,0 @@
|
|||
import _ from 'lodash-es';
|
||||
|
||||
angular.module('portainer.docker').controller('KubernetesApplicationPlacementsDatatableController', function ($scope, $controller, DatatableService, Authentication) {
|
||||
angular.extend(this, $controller('GenericDatatableController', { $scope: $scope }));
|
||||
this.state = Object.assign(this.state, {
|
||||
expandedItems: [],
|
||||
expandAll: false,
|
||||
});
|
||||
|
||||
this.expandItem = function (item, expanded) {
|
||||
if (!this.itemCanExpand(item)) {
|
||||
return;
|
||||
}
|
||||
|
||||
item.Expanded = expanded;
|
||||
if (!expanded) {
|
||||
item.Highlighted = false;
|
||||
}
|
||||
};
|
||||
|
||||
this.itemCanExpand = function (item) {
|
||||
return !item.AcceptsApplication;
|
||||
};
|
||||
|
||||
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);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
this.$onInit = function () {
|
||||
this.isAdmin = Authentication.isAdmin();
|
||||
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();
|
||||
};
|
||||
});
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
angular.module('portainer.kubernetes').component('kubernetesApplicationPlacementsDatatable', {
|
||||
templateUrl: './template.html',
|
||||
controller: 'KubernetesApplicationPlacementsDatatableController',
|
||||
bindings: {
|
||||
titleText: '@',
|
||||
titleIcon: '@',
|
||||
dataset: '<',
|
||||
tableKey: '@',
|
||||
orderBy: '@',
|
||||
reverseOrder: '<',
|
||||
refreshCallback: '<',
|
||||
loading: '<',
|
||||
removeAction: '<',
|
||||
},
|
||||
});
|
||||
|
|
@ -1,191 +0,0 @@
|
|||
<div class="datatable">
|
||||
<div class="toolBar">
|
||||
<div class="toolBarTitle flex">
|
||||
<div class="widget-icon space-right">
|
||||
<pr-icon icon="$ctrl.titleIcon"></pr-icon>
|
||||
</div>
|
||||
<span class="vertical-center">
|
||||
{{ $ctrl.titleText }}
|
||||
</span>
|
||||
</div>
|
||||
<div class="searchBar">
|
||||
<pr-icon icon="'search'" class="vertical-center"></pr-icon>
|
||||
<input
|
||||
type="text"
|
||||
class="searchInput ml-1"
|
||||
ng-model="$ctrl.state.textFilter"
|
||||
ng-change="$ctrl.onTextFilterChange()"
|
||||
placeholder="Search for a node..."
|
||||
auto-focus
|
||||
ng-model-options="{ debounce: 300 }"
|
||||
/>
|
||||
</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><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" style="display: none" icon="'check'" mode="'success'"></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 border-none">
|
||||
<table class="table-hover nowrap-cells table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 2%">
|
||||
<a ng-click="$ctrl.expandAll()" ng-if="$ctrl.hasExpandableItems()">
|
||||
<pr-icon icon="'chevron-down'" ng-if="$ctrl.state.expandAll"></pr-icon>
|
||||
<pr-icon icon="'chevron-up'" ng-if="!$ctrl.state.expandAll"></pr-icon>
|
||||
</a>
|
||||
</th>
|
||||
<th style="width: 98%">
|
||||
<table-column-header
|
||||
col-title="'Node'"
|
||||
can-sort="true"
|
||||
is-sorted="$ctrl.state.orderBy === 'Node'"
|
||||
is-sorted-desc="$ctrl.state.orderBy === 'Node' && $ctrl.state.reverseOrder"
|
||||
ng-click="$ctrl.changeOrderBy('Node')"
|
||||
></table-column-header>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr
|
||||
dir-paginate-start="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | filter: $ctrl.isDisplayed | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit: $ctrl.tableKey))"
|
||||
ng-class="{ active: item.Checked, 'datatable-highlighted': item.Highlighted }"
|
||||
ng-click="$ctrl.expandItem(item, !item.Expanded)"
|
||||
pagination-id="$ctrl.tableKey"
|
||||
>
|
||||
<td>
|
||||
<a ng-if="$ctrl.itemCanExpand(item)">
|
||||
<pr-icon icon="'chevron-down'" class="mr-1" ng-if="item.Expanded"></pr-icon>
|
||||
<pr-icon icon="'chevron-up'" class="mr-1" ng-if="!item.Expanded"></pr-icon>
|
||||
</a>
|
||||
<pr-icon icon="'check'" ng-if="item.AcceptsApplication" mode="'success'"></pr-icon>
|
||||
<pr-icon icon="'x'" ng-if="!item.AcceptsApplication" mode="'error'"></pr-icon>
|
||||
</td>
|
||||
<td>
|
||||
{{ item.Name }}
|
||||
</td>
|
||||
</tr>
|
||||
<!-- ADMIN + UNMET TAINTS -->
|
||||
<tr
|
||||
ng-if="$ctrl.isAdmin"
|
||||
ng-show="item.Expanded"
|
||||
ng-repeat="taint in item.UnmetTaints"
|
||||
ng-class="{ 'datatable-highlighted': item.Highlighted, 'datatable-unhighlighted': !item.Highlighted }"
|
||||
>
|
||||
<td colspan="2">
|
||||
This application is missing a toleration for the taint <code>{{ taint.Key }}{{ taint.Value ? '=' + taint.Value : '' }}:{{ taint.Effect }}</code>
|
||||
</td>
|
||||
</tr>
|
||||
<!-- !ADMIN + UNMET TAINTS -->
|
||||
<!-- USER + UNMET TAINTS -->
|
||||
<tr
|
||||
ng-if="!$ctrl.isAdmin && item.UnmetTaints.length"
|
||||
ng-show="item.Expanded"
|
||||
ng-class="{ 'datatable-highlighted': item.Highlighted, 'datatable-unhighlighted': !item.Highlighted }"
|
||||
>
|
||||
<td colspan="2"> Placement constraint not respected for that node. </td>
|
||||
</tr>
|
||||
<!-- ! USER + UNMET TAINTS -->
|
||||
<!-- ADMIN + UNMET NODE SELECTOR LABELS -->
|
||||
<tr
|
||||
ng-if="$ctrl.isAdmin"
|
||||
ng-show="item.Expanded"
|
||||
ng-repeat="label in item.UnmatchedNodeSelectorLabels"
|
||||
ng-class="{ 'datatable-highlighted': item.Highlighted, 'datatable-unhighlighted': !item.Highlighted }"
|
||||
>
|
||||
<td colspan="2">
|
||||
This application can only be scheduled on a node where the label <code>{{ label.key }}</code> is set to <code>{{ label.value }}</code>
|
||||
</td>
|
||||
</tr>
|
||||
<!-- ! ADMIN + UNMET NODE SELECTOR LABELS -->
|
||||
<!-- USER + UNMET NODE SELECTOR LABELS || UNMET NODE AFFINITIES -->
|
||||
<tr
|
||||
ng-if="!$ctrl.isAdmin && (item.UnmatchedNodeSelectorLabels.length || item.UnmatchedNodeAffinities.length)"
|
||||
ng-show="item.Expanded"
|
||||
ng-class="{ 'datatable-highlighted': item.Highlighted, 'datatable-unhighlighted': !item.Highlighted }"
|
||||
>
|
||||
<td colspan="2"> Placement label not respected for that node. </td>
|
||||
</tr>
|
||||
<!-- ! USER + UNMET NODE SELECTOR LABELS || UNMET NODE AFFINITIES -->
|
||||
<!-- ADMIN + UNMET NODE AFFINITIES -->
|
||||
<tr
|
||||
ng-if="$ctrl.isAdmin"
|
||||
ng-show="item.Expanded && item.UnmatchedNodeAffinities.length"
|
||||
ng-class="{ 'datatable-highlighted': item.Highlighted, 'datatable-unhighlighted': !item.Highlighted }"
|
||||
>
|
||||
<td colspan="2"> This application can only be scheduled on nodes respecting one of the following labels combination: </td>
|
||||
</tr>
|
||||
<tr
|
||||
dir-paginate-end
|
||||
ng-if="$ctrl.isAdmin"
|
||||
ng-show="item.Expanded"
|
||||
ng-repeat="aff in item.UnmatchedNodeAffinities"
|
||||
ng-class="{ 'datatable-highlighted': item.Highlighted, 'datatable-unhighlighted': !item.Highlighted }"
|
||||
>
|
||||
<td></td>
|
||||
<td>
|
||||
<code ng-repeat-start="term in aff track by $index">
|
||||
{{ term.key }} {{ term.operator }} {{ term.values | kubernetesApplicationConstraintNodeAffinityValue : term.operator }}
|
||||
</code>
|
||||
<span ng-repeat-end>{{ $last ? '' : ' + ' }}</span>
|
||||
</td>
|
||||
</tr>
|
||||
<!-- ! ADMIN + UNMET NODE AFFINITIES -->
|
||||
<tr ng-if="$ctrl.loading">
|
||||
<td colspan="2" class="text-muted text-center">Loading...</td>
|
||||
</tr>
|
||||
<tr ng-if="!$ctrl.loading && (!$ctrl.dataset || $ctrl.state.filteredDataSet.length === 0)">
|
||||
<td colspan="2" class="text-muted text-center">No node 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">
|
||||
<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" pagination-id="$ctrl.tableKey"></dir-pagination-controls>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
Loading…
Add table
Add a link
Reference in a new issue