mirror of https://github.com/portainer/portainer
refactor(kube/apps): migrate stacks table to react [EE-4661] (#10091)
Chaim Lev-Ari
GitHub
parent
a5f60c64ef
commit
25d5e62f5c
|
|
@ -1,7 +1,7 @@
|
|||
<div class="datatable">
|
||||
<!-- toolbar header actions and settings -->
|
||||
<div ng-if="$ctrl.isPrimary" class="toolBar !flex-col !gap-0">
|
||||
<div class="toolBar w-full !items-start !gap-x-5 !p-0">
|
||||
<div ng-if="$ctrl.isPrimary">
|
||||
<div class="toolBar">
|
||||
<div class="toolBarTitle vertical-center">
|
||||
<div class="widget-icon space-right">
|
||||
<pr-icon icon="'box'"></pr-icon>
|
||||
|
|
@ -109,12 +109,17 @@
|
|||
data-cy="k8sApp-searchApplicationsInput"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="form-group namespaces !mb-0 !mr-0 !h-[30px] min-w-[140px]">
|
||||
</div>
|
||||
</div>
|
||||
<div class="toolBar !pt-0">
|
||||
<div class="w-full">
|
||||
<div class="form-group !h-[30px] min-w-[140px] float-right">
|
||||
<div class="input-group">
|
||||
<span class="input-group-addon">
|
||||
<pr-icon icon="'filter'" size="'sm'"></pr-icon>
|
||||
Namespace
|
||||
<div className="flex items-center gap-1">
|
||||
<pr-icon icon="'filter'" size="'sm'"></pr-icon>
|
||||
Namespace
|
||||
</div>
|
||||
</span>
|
||||
<select
|
||||
class="form-control !h-[30px] !py-1"
|
||||
|
|
@ -126,17 +131,18 @@
|
|||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flex w-full flex-row" ng-if="$ctrl.isAdmin && !$ctrl.settings.showSystem">
|
||||
<span class="small text-muted vertical-center mt-1">
|
||||
<pr-icon icon="'info'" mode="'primary'"></pr-icon>
|
||||
System resources are hidden, this can be changed in the table settings.
|
||||
</span>
|
||||
</div>
|
||||
<div class="w-full">
|
||||
<div class="w-fit">
|
||||
<insights-box class-name="'mt-2'" type="'slim'" header="'From 2.18 on, you can filter this view by namespace.'" insight-close-id="'k8s-namespace-filtering'"></insights-box>
|
||||
|
||||
<div class="space-y-2">
|
||||
<div class="flex flex-row" authorization="K8sAccessSystemNamespaces" ng-if="$ctrl.isAdmin && !$ctrl.settings.showSystem">
|
||||
<span class="small vertical-center text-xs">
|
||||
<pr-icon icon="'info'" mode="'primary'"></pr-icon>
|
||||
<span class="text-muted">System resources are hidden, this can be changed in the table settings.</span>
|
||||
</span>
|
||||
</div>
|
||||
<div class="w-fit">
|
||||
<insights-box type="'slim'" header="'From 2.18 on, you can filter this view by namespace.'" insight-close-id="'k8s-namespace-filtering'"></insights-box>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,251 +0,0 @@
|
|||
<div class="datatable">
|
||||
<!-- table title and action menu -->
|
||||
<div class="toolBar !flex-col !gap-0">
|
||||
<div class="toolBar w-full !items-start !gap-x-5 !p-0">
|
||||
<div class="toolBarTitle vertical-center">
|
||||
<div class="widget-icon space-right">
|
||||
<pr-icon icon="'list'"></pr-icon>
|
||||
</div>
|
||||
Stacks
|
||||
</div>
|
||||
<!-- use row reverse to make the left most items wrap first to the right side in the next line -->
|
||||
<div class="inline-flex flex-row-reverse flex-wrap !gap-x-5 gap-y-3">
|
||||
<div class="actionBar !mr-0 !gap-3">
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-sm btn-dangerlight vertical-center !ml-0 h-fit"
|
||||
ng-disabled="$ctrl.state.selectedItemCount === 0"
|
||||
ng-click="$ctrl.removeAction($ctrl.state.selectedItems)"
|
||||
data-cy="k8sApp-removeStackButton"
|
||||
>
|
||||
<pr-icon icon="'trash-2'"></pr-icon>
|
||||
Remove
|
||||
</button>
|
||||
<div class="settings" data-cy="k8sApp-StackTableSettings">
|
||||
<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'" class-name="'!mr-0 !h-4'"></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" ng-if="$ctrl.isAdmin">
|
||||
<input id="applications_setting_show_system" type="checkbox" ng-model="$ctrl.settings.showSystem" ng-change="$ctrl.onSettingsShowSystemChange()" />
|
||||
<label for="applications_setting_show_system">Show system resources</label>
|
||||
</div>
|
||||
<div class="md-checkbox">
|
||||
<input
|
||||
id="setting_auto_refresh"
|
||||
type="checkbox"
|
||||
ng-model="$ctrl.settings.repeater.autoRefresh"
|
||||
ng-change="$ctrl.onSettingsRepeaterChange()"
|
||||
data-cy="k8sApp-autoRefreshCheckbox-stack"
|
||||
/>
|
||||
<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"
|
||||
data-cy="k8sApp-refreshRateDropdown-stack"
|
||||
>
|
||||
<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-sm btn-default btn-sm" ng-click="$ctrl.settings.open = false;" data-cy="k8sApp-tableSettingsCloseButton-stack">Close</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="searchBar vertical-center">
|
||||
<pr-icon icon="'search'" class-name="'!h-3'"></pr-icon>
|
||||
<input
|
||||
type="text"
|
||||
class="searchInput min-w-min self-start"
|
||||
ng-model="$ctrl.state.textFilter"
|
||||
ng-change="$ctrl.onTextFilterChange()"
|
||||
placeholder="Search..."
|
||||
auto-focus
|
||||
ng-model-options="{ debounce: 300 }"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="form-group namespaces !mb-0 !mr-0 !h-[30px] w-fit min-w-[140px]">
|
||||
<div class="input-group">
|
||||
<span class="input-group-addon">
|
||||
<pr-icon icon="'filter'" size="'sm'"></pr-icon>
|
||||
Namespace
|
||||
</span>
|
||||
<select
|
||||
class="form-control !h-[30px] !py-1"
|
||||
ng-model="$ctrl.state.namespace"
|
||||
ng-change="$ctrl.onChangeNamespace()"
|
||||
data-cy="component-namespaceSelect"
|
||||
ng-options="o.Value as (o.Name + (o.IsSystem ? ' - system' : '')) for o in $ctrl.state.namespaces"
|
||||
>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- info text -->
|
||||
<div class="flex w-full flex-row" ng-if="$ctrl.isAdmin && !$ctrl.settings.showSystem">
|
||||
<span class="small text-muted vertical-center mt-1">
|
||||
<pr-icon icon="'info'" mode="'primary'"></pr-icon>
|
||||
System resources are hidden, this can be changed in the table settings.
|
||||
</span>
|
||||
</div>
|
||||
<div class="w-full">
|
||||
<div class="w-fit">
|
||||
<insights-box class-name="'mt-2'" type="'slim'" header="'From 2.18 on, you can filter this view by namespace.'" insight-close-id="'k8s-namespace-filtering'"></insights-box>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="table-responsive">
|
||||
<table class="table-hover nowrap-cells table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="dropdown w-20">
|
||||
<div class="no-wrap flex h-full items-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>
|
||||
<div class="cursor-pointer" 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>
|
||||
</div>
|
||||
</div>
|
||||
</th>
|
||||
<th>
|
||||
<table-column-header
|
||||
col-title="'Stack'"
|
||||
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="'Namespace'"
|
||||
can-sort="true"
|
||||
is-sorted="$ctrl.state.orderBy === 'ResourcePool'"
|
||||
is-sorted-desc="$ctrl.state.orderBy === 'ResourcePool' && $ctrl.state.reverseOrder"
|
||||
ng-click="$ctrl.changeOrderBy('ResourcePool')"
|
||||
></table-column-header>
|
||||
</th>
|
||||
<th>
|
||||
<table-column-header
|
||||
col-title="'Applications'"
|
||||
can-sort="true"
|
||||
is-sorted="$ctrl.state.orderBy === 'Applications.length'"
|
||||
is-sorted-desc="$ctrl.state.orderBy === 'Applications.length' && $ctrl.state.reverseOrder"
|
||||
ng-click="$ctrl.changeOrderBy('Applications.length')"
|
||||
></table-column-header>
|
||||
</th>
|
||||
<th>
|
||||
<table-column-header col-title="'Actions'" can-sort="false"></table-column-header>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr
|
||||
ng-show="!$ctrl.isAppsLoading"
|
||||
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>
|
||||
<div class="no-wrap flex items-center">
|
||||
<span class="md-checkbox">
|
||||
<input
|
||||
id="select_{{ $index }}"
|
||||
type="checkbox"
|
||||
ng-model="item.Checked"
|
||||
ng-click="$ctrl.selectItem(item, $event); $event.stopPropagation();"
|
||||
ng-disabled="!$ctrl.allowSelection(item)"
|
||||
/>
|
||||
<label for="select_{{ $index }}"></label>
|
||||
</span>
|
||||
<div ng-if="$ctrl.itemCanExpand(item)" class="vertical-center">
|
||||
<pr-icon ng-if="item.Expanded" icon="'chevron-down'"></pr-icon>
|
||||
<pr-icon ng-if="!item.Expanded" icon="'chevron-right'"></pr-icon>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
{{ item.Name }}
|
||||
</td>
|
||||
<td>
|
||||
<a ui-sref="kubernetes.resourcePools.resourcePool({ id: item.ResourcePool })" ng-click="$event.stopPropagation();">{{ item.ResourcePool }}</a>
|
||||
<span class="label label-info image-tag label-margins" ng-if="$ctrl.isSystemNamespace(item.ResourcePool)">system</span>
|
||||
</td>
|
||||
<td>{{ item.Applications.length }}</td>
|
||||
<td>
|
||||
<a class="vertical-center" ui-sref="kubernetes.stacks.stack.logs({ namespace: item.ResourcePool, name: item.Name })">
|
||||
<pr-icon icon="'file-text'" size="'md'" title="Logs"></pr-icon>
|
||||
Logs
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
<tr
|
||||
dir-paginate-end
|
||||
ng-show="item.Expanded"
|
||||
ng-repeat="app in item.Applications"
|
||||
ng-class="{ 'datatable-highlighted': item.Highlighted, 'datatable-unhighlighted': !item.Highlighted }"
|
||||
>
|
||||
<td></td>
|
||||
<td colspan="4">
|
||||
<a ui-sref="kubernetes.applications.application({ name: app.Name, namespace: app.ResourcePool })">{{ app.Name }}</a>
|
||||
<span style="margin-left: 5px" class="label label-primary image-tag" ng-if="!$ctrl.isSystemNamespace(app.ResourcePool) && $ctrl.isExternalApplication(app)"
|
||||
>external</span
|
||||
>
|
||||
</td>
|
||||
</tr>
|
||||
<tr ng-if="$ctrl.isAppsLoading">
|
||||
<td colspan="5" class="text-muted text-center">Loading...</td>
|
||||
</tr>
|
||||
<tr ng-if="$ctrl.state.filteredDataSet.length === 0 && !$ctrl.isAppsLoading">
|
||||
<td colspan="5" class="text-muted text-center">No stack available.</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="footer pl-5" ng-if="$ctrl.dataset">
|
||||
<div class="infoBar !ml-0" 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>
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
angular.module('portainer.kubernetes').component('kubernetesApplicationsStacksDatatable', {
|
||||
templateUrl: './applicationsStacksDatatable.html',
|
||||
controller: 'KubernetesApplicationsStacksDatatableController',
|
||||
bindings: {
|
||||
titleText: '@',
|
||||
titleIcon: '@',
|
||||
dataset: '<',
|
||||
tableKey: '@',
|
||||
orderBy: '@',
|
||||
reverseOrder: '<',
|
||||
refreshCallback: '<',
|
||||
removeAction: '<',
|
||||
namespaces: '<',
|
||||
namespace: '<',
|
||||
onChangeNamespaceDropdown: '<',
|
||||
isAppsLoading: '<',
|
||||
isSystemResources: '<',
|
||||
setSystemResources: '<',
|
||||
},
|
||||
});
|
||||
|
|
@ -1,165 +0,0 @@
|
|||
import _ from 'lodash-es';
|
||||
import { KubernetesApplicationDeploymentTypes } from 'Kubernetes/models/application/models';
|
||||
import KubernetesApplicationHelper from 'Kubernetes/helpers/application';
|
||||
import KubernetesNamespaceHelper from 'Kubernetes/helpers/namespaceHelper';
|
||||
|
||||
angular.module('portainer.kubernetes').controller('KubernetesApplicationsStacksDatatableController', [
|
||||
'$scope',
|
||||
'$controller',
|
||||
'DatatableService',
|
||||
'Authentication',
|
||||
function ($scope, $controller, DatatableService, Authentication) {
|
||||
angular.extend(this, $controller('GenericDatatableController', { $scope: $scope }));
|
||||
this.state = Object.assign(this.state, {
|
||||
expandedItems: [],
|
||||
expandAll: false,
|
||||
namespace: '',
|
||||
namespaces: [],
|
||||
});
|
||||
|
||||
var ctrl = this;
|
||||
|
||||
this.settings = Object.assign(this.settings, {
|
||||
showSystem: false,
|
||||
});
|
||||
|
||||
this.onSettingsShowSystemChange = function () {
|
||||
this.updateNamespace();
|
||||
this.setSystemResources(this.settings.showSystem);
|
||||
DatatableService.setDataTableSettings(this.tableKey, this.settings);
|
||||
};
|
||||
|
||||
this.isExternalApplication = function (item) {
|
||||
return KubernetesApplicationHelper.isExternalApplication(item);
|
||||
};
|
||||
|
||||
/**
|
||||
* Do not allow applications in system namespaces to be selected
|
||||
*/
|
||||
this.allowSelection = function (item) {
|
||||
return !this.isSystemNamespace(item.ResourcePool);
|
||||
};
|
||||
|
||||
/**
|
||||
* @param {String} namespace Namespace (string name)
|
||||
* @returns Boolean
|
||||
*/
|
||||
this.isSystemNamespace = function (namespace) {
|
||||
return KubernetesNamespaceHelper.isSystemNamespace(namespace);
|
||||
};
|
||||
|
||||
this.isDisplayed = function (item) {
|
||||
return !ctrl.isSystemNamespace(item.ResourcePool) || ctrl.settings.showSystem;
|
||||
};
|
||||
|
||||
this.expandItem = function (item, expanded) {
|
||||
if (!this.itemCanExpand(item)) {
|
||||
return;
|
||||
}
|
||||
|
||||
item.Expanded = expanded;
|
||||
if (!expanded) {
|
||||
item.Highlighted = false;
|
||||
}
|
||||
};
|
||||
|
||||
this.itemCanExpand = function (item) {
|
||||
return item.Applications.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);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
this.onChangeNamespace = function () {
|
||||
this.onChangeNamespaceDropdown(this.state.namespace);
|
||||
};
|
||||
|
||||
this.updateNamespace = function () {
|
||||
if (this.namespaces) {
|
||||
const namespaces = [{ Name: 'All namespaces', Value: '', IsSystem: false }];
|
||||
this.namespaces.find((ns) => {
|
||||
if (!this.settings.showSystem && ns.IsSystem) {
|
||||
return false;
|
||||
}
|
||||
namespaces.push({ Name: ns.Name, Value: ns.Name, IsSystem: ns.IsSystem });
|
||||
});
|
||||
this.state.namespaces = namespaces;
|
||||
|
||||
if (this.state.namespace && !this.state.namespaces.find((ns) => ns.Name === this.state.namespace)) {
|
||||
if (this.state.namespaces.length > 1) {
|
||||
let defaultNS = this.state.namespaces.find((ns) => ns.Name === 'default');
|
||||
defaultNS = defaultNS || this.state.namespaces[1];
|
||||
this.state.namespace = defaultNS.Value;
|
||||
} else {
|
||||
this.state.namespace = this.state.namespaces[0].Value;
|
||||
}
|
||||
this.onChangeNamespaceDropdown(this.state.namespace);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
this.$onChanges = function () {
|
||||
if (typeof this.isSystemResources !== 'undefined') {
|
||||
this.settings.showSystem = this.isSystemResources;
|
||||
DatatableService.setDataTableSettings(this.settingsKey, this.settings);
|
||||
}
|
||||
this.state.namespace = this.namespace;
|
||||
this.updateNamespace();
|
||||
this.prepareTableFromDataset();
|
||||
};
|
||||
|
||||
this.$onInit = function () {
|
||||
this.isAdmin = Authentication.isAdmin();
|
||||
this.KubernetesApplicationDeploymentTypes = KubernetesApplicationDeploymentTypes;
|
||||
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.settingsKey);
|
||||
if (storedSettings !== null) {
|
||||
this.settings = storedSettings;
|
||||
this.settings.open = false;
|
||||
|
||||
this.setSystemResources && this.setSystemResources(this.settings.showSystem);
|
||||
}
|
||||
|
||||
// Set the default selected namespace
|
||||
if (!this.state.namespace) {
|
||||
this.state.namespace = this.namespace;
|
||||
}
|
||||
|
||||
this.updateNamespace();
|
||||
this.onSettingsRepeaterChange();
|
||||
};
|
||||
},
|
||||
]);
|
||||
|
|
@ -21,6 +21,7 @@ import { ApplicationContainersDatatable } from '@/react/kubernetes/applications/
|
|||
import { withFormValidation } from '@/react-tools/withFormValidation';
|
||||
import { withCurrentUser } from '@/react-tools/withCurrentUser';
|
||||
import { YAMLInspector } from '@/react/kubernetes/components/YAMLInspector';
|
||||
import { ApplicationsStacksDatatable } from '@/react/kubernetes/applications/ListView/ApplicationsStacksDatatable';
|
||||
|
||||
export const ngModule = angular
|
||||
.module('portainer.kubernetes.react.components', [])
|
||||
|
|
@ -134,6 +135,18 @@ export const ngModule = angular
|
|||
withUIRouter(withReactQuery(withCurrentUser(ApplicationEventsDatatable))),
|
||||
[]
|
||||
)
|
||||
)
|
||||
.component(
|
||||
'kubernetesApplicationsStacksDatatable',
|
||||
r2a(withUIRouter(withCurrentUser(ApplicationsStacksDatatable)), [
|
||||
'dataset',
|
||||
'onRefresh',
|
||||
'onRemove',
|
||||
'namespace',
|
||||
'namespaces',
|
||||
'onNamespaceChange',
|
||||
'isLoading',
|
||||
])
|
||||
);
|
||||
|
||||
export const componentsModule = ngModule.name;
|
||||
|
|
|
|||
|
|
@ -30,18 +30,15 @@
|
|||
</uib-tab>
|
||||
<uib-tab index="2" classes="btn-sm" select="ctrl.selectTab(2)">
|
||||
<uib-tab-heading class="vertical-center"> <pr-icon icon="'list'"></pr-icon> Stacks </uib-tab-heading>
|
||||
|
||||
<kubernetes-applications-stacks-datatable
|
||||
dataset="ctrl.state.stacks"
|
||||
table-key="kubernetes.applications.stacks"
|
||||
order-by="Name"
|
||||
refresh-callback="ctrl.getApplications"
|
||||
remove-action="ctrl.removeStacksAction"
|
||||
on-refresh="(ctrl.getApplications)"
|
||||
on-remove="(ctrl.removeStacksAction)"
|
||||
namespaces="ctrl.state.namespaces"
|
||||
namespace="ctrl.state.namespaceName"
|
||||
on-change-namespace-dropdown="(ctrl.onChangeNamespaceDropdown)"
|
||||
is-apps-loading="ctrl.state.isAppsLoading"
|
||||
is-system-resources="ctrl.state.isSystemResources"
|
||||
set-system-resources="(ctrl.setSystemResources)"
|
||||
is-loading="ctrl.state.isAppsLoading"
|
||||
on-namespace-change="(ctrl.onChangeNamespaceDropdown)"
|
||||
>
|
||||
</kubernetes-applications-stacks-datatable>
|
||||
</uib-tab>
|
||||
|
|
|
|||
|
|
@ -144,10 +144,12 @@ class KubernetesApplicationsController {
|
|||
}
|
||||
|
||||
onChangeNamespaceDropdown(namespaceName) {
|
||||
this.state.namespaceName = namespaceName;
|
||||
// save the selected namespaceName in local storage with the key 'kubernetes_namespace_filter_${environmentId}_${userID}'
|
||||
this.LocalStorage.storeNamespaceFilter(this.endpoint.Id, this.user.ID, namespaceName);
|
||||
return this.$async(this.getApplicationsAsync);
|
||||
return this.$async(async () => {
|
||||
this.state.namespaceName = namespaceName;
|
||||
// save the selected namespaceName in local storage with the key 'kubernetes_namespace_filter_${environmentId}_${userID}'
|
||||
this.LocalStorage.storeNamespaceFilter(this.endpoint.Id, this.user.ID, namespaceName);
|
||||
return this.getApplicationsAsync();
|
||||
});
|
||||
}
|
||||
|
||||
async getApplicationsAsync() {
|
||||
|
|
|
|||
|
|
@ -28,15 +28,19 @@ export function DatatableHeader({
|
|||
return null;
|
||||
}
|
||||
|
||||
const searchBar = <SearchBar value={searchValue} onChange={onSearchChange} />;
|
||||
const tableActions = !!renderTableActions && (
|
||||
<Table.Actions>{renderTableActions()}</Table.Actions>
|
||||
);
|
||||
const tableTitleSettings = !!renderTableSettings && (
|
||||
<Table.TitleActions>{renderTableSettings()}</Table.TitleActions>
|
||||
);
|
||||
|
||||
return (
|
||||
<Table.Title label={title} icon={titleIcon} description={description}>
|
||||
<SearchBar value={searchValue} onChange={onSearchChange} />
|
||||
{renderTableActions && (
|
||||
<Table.Actions>{renderTableActions()}</Table.Actions>
|
||||
)}
|
||||
<Table.TitleActions>
|
||||
{!!renderTableSettings && renderTableSettings()}
|
||||
</Table.TitleActions>
|
||||
{searchBar}
|
||||
{tableActions}
|
||||
{tableTitleSettings}
|
||||
</Table.Title>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,14 +6,12 @@ import { DefaultType } from './types';
|
|||
|
||||
interface Props<D extends DefaultType> {
|
||||
row: Row<D>;
|
||||
disableSelect?: boolean;
|
||||
renderSubRow(row: Row<D>): ReactNode;
|
||||
expandOnClick?: boolean;
|
||||
}
|
||||
|
||||
export function ExpandableDatatableTableRow<D extends DefaultType>({
|
||||
row,
|
||||
disableSelect,
|
||||
renderSubRow,
|
||||
expandOnClick,
|
||||
}: Props<D>) {
|
||||
|
|
@ -25,14 +23,7 @@ export function ExpandableDatatableTableRow<D extends DefaultType>({
|
|||
cells={cells}
|
||||
onClick={expandOnClick ? () => row.toggleExpanded() : undefined}
|
||||
/>
|
||||
{row.getIsExpanded() && row.getCanExpand() && (
|
||||
<tr>
|
||||
{!disableSelect && <td />}
|
||||
<td colSpan={disableSelect ? cells.length : cells.length - 1}>
|
||||
{renderSubRow(row)}
|
||||
</td>
|
||||
</tr>
|
||||
)}
|
||||
{row.getIsExpanded() && renderSubRow(row)}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -89,6 +89,16 @@
|
|||
min-height: 34px;
|
||||
}
|
||||
|
||||
.input-group .portainer-selector-root .portainer-selector__control:not(:first-child) {
|
||||
border-top-left-radius: 0;
|
||||
border-bottom-left-radius: 0;
|
||||
}
|
||||
|
||||
.input-group .portainer-selector-root .portainer-selector__control:not(:last-child) {
|
||||
border-top-right-radius: 0;
|
||||
border-bottom-right-radius: 0;
|
||||
}
|
||||
|
||||
.portainer-selector-root .portainer-selector__multi-value {
|
||||
background-color: var(--multi-value-tag-bg);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,105 @@
|
|||
import { List } from 'lucide-react';
|
||||
|
||||
import { useAuthorizations } from '@/react/hooks/useUser';
|
||||
import { SystemResourceDescription } from '@/react/kubernetes/datatables/SystemResourceDescription';
|
||||
import { systemResourcesSettings } from '@/react/kubernetes/datatables/SystemResourcesSettings';
|
||||
|
||||
import { ExpandableDatatable } from '@@/datatables/ExpandableDatatable';
|
||||
import { createPersistedStore, refreshableSettings } from '@@/datatables/types';
|
||||
import { useRepeater } from '@@/datatables/useRepeater';
|
||||
import { useTableState } from '@@/datatables/useTableState';
|
||||
import { InsightsBox } from '@@/InsightsBox';
|
||||
|
||||
import { KubernetesStack } from '../../types';
|
||||
|
||||
import { columns } from './columns';
|
||||
import { SubRows } from './SubRows';
|
||||
import { Namespace, TableSettings } from './types';
|
||||
import { StacksSettingsMenu } from './StacksSettingsMenu';
|
||||
import { NamespaceFilter } from './NamespaceFilter';
|
||||
import { TableActions } from './TableActions';
|
||||
|
||||
const storageKey = 'kubernetes.applications.stacks';
|
||||
|
||||
const settingsStore = createPersistedStore<TableSettings>(
|
||||
storageKey,
|
||||
'name',
|
||||
(set) => ({
|
||||
...systemResourcesSettings(set),
|
||||
...refreshableSettings(set),
|
||||
})
|
||||
);
|
||||
|
||||
interface Props {
|
||||
dataset: Array<KubernetesStack>;
|
||||
onRemove(selectedItems: Array<KubernetesStack>): void;
|
||||
onRefresh(): Promise<void>;
|
||||
namespace?: string;
|
||||
namespaces: Array<Namespace>;
|
||||
onNamespaceChange(namespace: string): void;
|
||||
isLoading?: boolean;
|
||||
}
|
||||
|
||||
export function ApplicationsStacksDatatable({
|
||||
dataset,
|
||||
onRemove,
|
||||
onRefresh,
|
||||
namespace = '',
|
||||
namespaces,
|
||||
onNamespaceChange,
|
||||
isLoading,
|
||||
}: Props) {
|
||||
const tableState = useTableState(settingsStore, storageKey);
|
||||
|
||||
const authorized = useAuthorizations('K8sApplicationsW');
|
||||
useRepeater(tableState.autoRefreshRate, onRefresh);
|
||||
|
||||
return (
|
||||
<ExpandableDatatable
|
||||
getRowCanExpand={(row) => row.original.Applications.length > 0}
|
||||
title="Stacks"
|
||||
titleIcon={List}
|
||||
dataset={dataset}
|
||||
isLoading={isLoading}
|
||||
columns={columns}
|
||||
settingsManager={tableState}
|
||||
disableSelect={!authorized}
|
||||
renderSubRow={(row) => (
|
||||
<SubRows stack={row.original} span={row.getVisibleCells().length} />
|
||||
)}
|
||||
noWidget
|
||||
emptyContentLabel="No stack available."
|
||||
description={
|
||||
<div className="w-full">
|
||||
<div className="min-w-[140px] float-right">
|
||||
<NamespaceFilter
|
||||
namespaces={namespaces}
|
||||
value={namespace}
|
||||
onChange={onNamespaceChange}
|
||||
showSystem={tableState.showSystemResources}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<SystemResourceDescription
|
||||
showSystemResources={tableState.showSystemResources}
|
||||
/>
|
||||
|
||||
<div className="w-fit">
|
||||
<InsightsBox
|
||||
type="slim"
|
||||
header="From 2.18 on, you can filter this view by namespace."
|
||||
insightCloseId="k8s-namespace-filtering"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
renderTableActions={(selectedItems) => (
|
||||
<TableActions selectedItems={selectedItems} onRemove={onRemove} />
|
||||
)}
|
||||
renderTableSettings={() => <StacksSettingsMenu settings={tableState} />}
|
||||
getRowId={(row) => `${row.Name}-${row.ResourcePool}`}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
import { Filter } from 'lucide-react';
|
||||
import { useEffect } from 'react';
|
||||
|
||||
import { Icon } from '@@/Icon';
|
||||
import { Select } from '@@/form-components/Input';
|
||||
import { InputGroup } from '@@/form-components/InputGroup';
|
||||
|
||||
import { Namespace } from './types';
|
||||
|
||||
function transformNamespaces(namespaces: Namespace[], showSystem: boolean) {
|
||||
return namespaces
|
||||
.filter((ns) => showSystem || !ns.IsSystem)
|
||||
.map(({ Name, IsSystem }) => ({
|
||||
label: IsSystem ? `${Name} - system` : Name,
|
||||
value: Name,
|
||||
}));
|
||||
}
|
||||
|
||||
export function NamespaceFilter({
|
||||
namespaces,
|
||||
value,
|
||||
onChange,
|
||||
showSystem,
|
||||
}: {
|
||||
namespaces: Namespace[];
|
||||
value: string;
|
||||
onChange: (value: string) => void;
|
||||
showSystem: boolean;
|
||||
}) {
|
||||
const transformedNamespaces = transformNamespaces(namespaces, showSystem);
|
||||
|
||||
// sync value with displayed namespaces
|
||||
useEffect(() => {
|
||||
const names = transformedNamespaces.map((ns) => ns.value);
|
||||
if (value && !names.find((ns) => ns === value)) {
|
||||
onChange(
|
||||
names.length > 0 ? names.find((ns) => ns === 'default') || names[0] : ''
|
||||
);
|
||||
}
|
||||
}, [value, onChange, transformedNamespaces]);
|
||||
|
||||
return (
|
||||
<InputGroup>
|
||||
<InputGroup.Addon>
|
||||
<div className="flex items-center gap-1">
|
||||
<Icon icon={Filter} />
|
||||
Namespace
|
||||
</div>
|
||||
</InputGroup.Addon>
|
||||
<Select
|
||||
className="!h-[30px] py-1"
|
||||
value={value || ''}
|
||||
onChange={(e) => onChange(e.target.value)}
|
||||
options={[
|
||||
{ label: 'All namespaces', value: '' },
|
||||
...transformedNamespaces,
|
||||
]}
|
||||
/>
|
||||
</InputGroup>
|
||||
);
|
||||
}
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
import { SystemResourcesSettings } from '@/react/kubernetes/datatables/SystemResourcesSettings';
|
||||
|
||||
import { TableSettingsMenu } from '@@/datatables';
|
||||
import { TableSettingsMenuAutoRefresh } from '@@/datatables/TableSettingsMenuAutoRefresh';
|
||||
|
||||
import { type TableSettings } from './types';
|
||||
|
||||
export function StacksSettingsMenu({ settings }: { settings: TableSettings }) {
|
||||
return (
|
||||
<TableSettingsMenu>
|
||||
<SystemResourcesSettings
|
||||
value={settings.showSystemResources}
|
||||
onChange={(value) => settings.setShowSystemResources(value)}
|
||||
/>
|
||||
|
||||
<TableSettingsMenuAutoRefresh
|
||||
onChange={settings.setAutoRefreshRate}
|
||||
value={settings.autoRefreshRate}
|
||||
/>
|
||||
</TableSettingsMenu>
|
||||
);
|
||||
}
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
import clsx from 'clsx';
|
||||
|
||||
import KubernetesApplicationHelper from '@/kubernetes/helpers/application';
|
||||
import KubernetesNamespaceHelper from '@/kubernetes/helpers/namespaceHelper';
|
||||
|
||||
import { Link } from '@@/Link';
|
||||
|
||||
import { KubernetesStack } from '../../types';
|
||||
|
||||
export function SubRows({
|
||||
stack,
|
||||
span,
|
||||
}: {
|
||||
stack: KubernetesStack;
|
||||
span: number;
|
||||
}) {
|
||||
return (
|
||||
<>
|
||||
{stack.Applications.map((app) => (
|
||||
<tr
|
||||
className={clsx({
|
||||
'datatable-highlighted': stack.Highlighted,
|
||||
'datatable-unhighlighted': !stack.Highlighted,
|
||||
})}
|
||||
key={app.Name}
|
||||
>
|
||||
<td />
|
||||
<td colSpan={span - 1}>
|
||||
<Link
|
||||
to="kubernetes.applications.application"
|
||||
params={{ name: app.Name, namespace: app.ResourcePool }}
|
||||
>
|
||||
{app.Name}
|
||||
</Link>
|
||||
{KubernetesNamespaceHelper.isSystemNamespace(app.ResourcePool) &&
|
||||
KubernetesApplicationHelper.isExternalApplication(app) && (
|
||||
<span className="space-left label label-primary image-tag">
|
||||
external
|
||||
</span>
|
||||
)}
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
import { Trash2 } from 'lucide-react';
|
||||
|
||||
import { Authorized } from '@/react/hooks/useUser';
|
||||
|
||||
import { Button } from '@@/buttons';
|
||||
|
||||
import { KubernetesStack } from '../../types';
|
||||
|
||||
export function TableActions({
|
||||
selectedItems,
|
||||
onRemove,
|
||||
}: {
|
||||
selectedItems: Array<KubernetesStack>;
|
||||
onRemove: (selectedItems: Array<KubernetesStack>) => void;
|
||||
}) {
|
||||
return (
|
||||
<Authorized authorizations="K8sApplicationsW">
|
||||
<Button
|
||||
disabled={selectedItems.length === 0}
|
||||
color="dangerlight"
|
||||
onClick={() => onRemove(selectedItems)}
|
||||
icon={Trash2}
|
||||
data-cy="k8sApp-removeStackButton"
|
||||
>
|
||||
Remove
|
||||
</Button>
|
||||
</Authorized>
|
||||
);
|
||||
}
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
import { FileText } from 'lucide-react';
|
||||
import { createColumnHelper } from '@tanstack/react-table';
|
||||
|
||||
import KubernetesNamespaceHelper from '@/kubernetes/helpers/namespaceHelper';
|
||||
|
||||
import { buildExpandColumn } from '@@/datatables/expand-column';
|
||||
import { Link } from '@@/Link';
|
||||
import { Icon } from '@@/Icon';
|
||||
|
||||
import { KubernetesStack } from '../../types';
|
||||
|
||||
export const columnHelper = createColumnHelper<KubernetesStack>();
|
||||
|
||||
export const columns = [
|
||||
buildExpandColumn<KubernetesStack>(),
|
||||
columnHelper.accessor('Name', {
|
||||
id: 'name',
|
||||
header: 'Stack',
|
||||
}),
|
||||
columnHelper.accessor('ResourcePool', {
|
||||
id: 'namespace',
|
||||
header: 'Namespace',
|
||||
cell: ({ getValue }) => {
|
||||
const value = getValue();
|
||||
return (
|
||||
<>
|
||||
<Link
|
||||
to="kubernetes.resourcePools.resourcePool"
|
||||
params={{ id: value }}
|
||||
>
|
||||
{value}
|
||||
</Link>
|
||||
{KubernetesNamespaceHelper.isSystemNamespace(value) && (
|
||||
<span className="label label-info image-tag label-margins">
|
||||
system
|
||||
</span>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
},
|
||||
}),
|
||||
|
||||
columnHelper.accessor((row) => row.Applications.length, {
|
||||
id: 'applications',
|
||||
header: 'Applications',
|
||||
}),
|
||||
|
||||
columnHelper.display({
|
||||
id: 'actions',
|
||||
header: 'Actions',
|
||||
cell: ({ row: { original: item } }) => (
|
||||
<Link
|
||||
to="kubernetes.stacks.stack.logs"
|
||||
params={{ namespace: item.ResourcePool, name: item.Name }}
|
||||
className="flex items-center gap-1"
|
||||
>
|
||||
<Icon icon={FileText} />
|
||||
Logs
|
||||
</Link>
|
||||
),
|
||||
}),
|
||||
];
|
||||
|
|
@ -0,0 +1 @@
|
|||
export { ApplicationsStacksDatatable } from './ApplicationsStacksDatatable';
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
import { SystemResourcesTableSettings } from '@/react/kubernetes/datatables/SystemResourcesSettings';
|
||||
|
||||
import {
|
||||
BasicTableSettings,
|
||||
RefreshableTableSettings,
|
||||
} from '@@/datatables/types';
|
||||
|
||||
export interface TableSettings
|
||||
extends BasicTableSettings,
|
||||
RefreshableTableSettings,
|
||||
SystemResourcesTableSettings {}
|
||||
|
||||
export interface Namespace {
|
||||
Id: string;
|
||||
Name: string;
|
||||
Yaml: string;
|
||||
IsSystem?: boolean;
|
||||
}
|
||||
|
|
@ -34,3 +34,15 @@ type Patch = {
|
|||
}[];
|
||||
|
||||
export type ApplicationPatch = Patch | RawExtension;
|
||||
|
||||
export type KubernetesStack = {
|
||||
Name: string;
|
||||
ResourcePool: string;
|
||||
Applications: Array<
|
||||
Application & {
|
||||
Name: string;
|
||||
ResourcePool: string;
|
||||
}
|
||||
>;
|
||||
Highlighted: boolean;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -91,17 +91,12 @@ export function ConfigMapsDatatable() {
|
|||
)}
|
||||
renderTableSettings={() => (
|
||||
<TableSettingsMenu>
|
||||
<DefaultDatatableSettings
|
||||
settings={tableState}
|
||||
hideShowSystemResources={!canAccessSystemResources}
|
||||
/>
|
||||
<DefaultDatatableSettings settings={tableState} />
|
||||
</TableSettingsMenu>
|
||||
)}
|
||||
description={
|
||||
<SystemResourceDescription
|
||||
showSystemResources={
|
||||
tableState.showSystemResources || !canAccessSystemResources
|
||||
}
|
||||
showSystemResources={tableState.showSystemResources}
|
||||
/>
|
||||
}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -91,17 +91,12 @@ export function SecretsDatatable() {
|
|||
)}
|
||||
renderTableSettings={() => (
|
||||
<TableSettingsMenu>
|
||||
<DefaultDatatableSettings
|
||||
settings={tableState}
|
||||
hideShowSystemResources={!canAccessSystemResources}
|
||||
/>
|
||||
<DefaultDatatableSettings settings={tableState} />
|
||||
</TableSettingsMenu>
|
||||
)}
|
||||
description={
|
||||
<SystemResourceDescription
|
||||
showSystemResources={
|
||||
tableState.showSystemResources || !canAccessSystemResources
|
||||
}
|
||||
showSystemResources={tableState.showSystemResources}
|
||||
/>
|
||||
}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -1,54 +1,31 @@
|
|||
import { TableSettingsMenuAutoRefresh } from '@@/datatables/TableSettingsMenuAutoRefresh';
|
||||
import { Checkbox } from '@@/form-components/Checkbox';
|
||||
import {
|
||||
BasicTableSettings,
|
||||
RefreshableTableSettings,
|
||||
ZustandSetFunc,
|
||||
} from '@@/datatables/types';
|
||||
|
||||
interface SystemResourcesTableSettings {
|
||||
showSystemResources: boolean;
|
||||
setShowSystemResources: (value: boolean) => void;
|
||||
}
|
||||
import {
|
||||
SystemResourcesSettings,
|
||||
SystemResourcesTableSettings,
|
||||
} from './SystemResourcesSettings';
|
||||
|
||||
export interface TableSettings
|
||||
extends BasicTableSettings,
|
||||
RefreshableTableSettings,
|
||||
SystemResourcesTableSettings {}
|
||||
|
||||
export function systemResourcesSettings<T extends SystemResourcesTableSettings>(
|
||||
set: ZustandSetFunc<T>
|
||||
): SystemResourcesTableSettings {
|
||||
return {
|
||||
showSystemResources: false,
|
||||
setShowSystemResources(showSystemResources: boolean) {
|
||||
set((s) => ({
|
||||
...s,
|
||||
showSystemResources,
|
||||
}));
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
interface Props {
|
||||
settings: TableSettings;
|
||||
hideShowSystemResources?: boolean;
|
||||
}
|
||||
|
||||
export function DefaultDatatableSettings({
|
||||
settings,
|
||||
hideShowSystemResources = false,
|
||||
}: Props) {
|
||||
}: {
|
||||
settings: TableSettings;
|
||||
}) {
|
||||
return (
|
||||
<>
|
||||
{!hideShowSystemResources && (
|
||||
<Checkbox
|
||||
id="show-system-resources"
|
||||
label="Show system resources"
|
||||
checked={settings.showSystemResources}
|
||||
onChange={(e) => settings.setShowSystemResources(e.target.checked)}
|
||||
/>
|
||||
)}
|
||||
<SystemResourcesSettings
|
||||
value={settings.showSystemResources}
|
||||
onChange={(value) => settings.setShowSystemResources(value)}
|
||||
/>
|
||||
|
||||
<TableSettingsMenuAutoRefresh
|
||||
value={settings.autoRefreshRate}
|
||||
onChange={handleRefreshRateChange}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
import { Authorized } from '@/react/hooks/useUser';
|
||||
|
||||
import { TextTip } from '@@/Tip/TextTip';
|
||||
|
||||
interface Props {
|
||||
|
|
@ -5,13 +7,11 @@ interface Props {
|
|||
}
|
||||
|
||||
export function SystemResourceDescription({ showSystemResources }: Props) {
|
||||
return (
|
||||
<div className="w-full">
|
||||
{!showSystemResources && (
|
||||
<TextTip color="blue" className="!mb-0">
|
||||
System resources are hidden, this can be changed in the table settings
|
||||
</TextTip>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
return !showSystemResources ? (
|
||||
<Authorized authorizations="K8sAccessSystemNamespaces" adminOnlyCE>
|
||||
<TextTip color="blue" className="!mb-0">
|
||||
System resources are hidden, this can be changed in the table settings
|
||||
</TextTip>
|
||||
</Authorized>
|
||||
) : null;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
import { Authorized } from '@/react/hooks/useUser';
|
||||
|
||||
import { ZustandSetFunc } from '@@/datatables/types';
|
||||
import { Checkbox } from '@@/form-components/Checkbox';
|
||||
|
||||
export function SystemResourcesSettings({
|
||||
value,
|
||||
onChange,
|
||||
}: {
|
||||
value: boolean;
|
||||
onChange: (value: boolean) => void;
|
||||
}) {
|
||||
return (
|
||||
<Authorized authorizations="K8sAccessSystemNamespaces" adminOnlyCE>
|
||||
<Checkbox
|
||||
id="show-system-resources"
|
||||
label="Show system resources"
|
||||
checked={value}
|
||||
onChange={(e) => onChange(e.target.checked)}
|
||||
/>
|
||||
</Authorized>
|
||||
);
|
||||
}
|
||||
|
||||
export interface SystemResourcesTableSettings {
|
||||
showSystemResources: boolean;
|
||||
setShowSystemResources: (value: boolean) => void;
|
||||
}
|
||||
|
||||
export function systemResourcesSettings<T extends SystemResourcesTableSettings>(
|
||||
set: ZustandSetFunc<T>
|
||||
): SystemResourcesTableSettings {
|
||||
return {
|
||||
showSystemResources: false,
|
||||
setShowSystemResources(showSystemResources: boolean) {
|
||||
set((s) => ({
|
||||
...s,
|
||||
showSystemResources,
|
||||
}));
|
||||
},
|
||||
};
|
||||
}
|
||||
|
|
@ -1,9 +1,7 @@
|
|||
import { refreshableSettings, createPersistedStore } from '@@/datatables/types';
|
||||
|
||||
import {
|
||||
systemResourcesSettings,
|
||||
TableSettings,
|
||||
} from './DefaultDatatableSettings';
|
||||
import { TableSettings } from './DefaultDatatableSettings';
|
||||
import { systemResourcesSettings } from './SystemResourcesSettings';
|
||||
|
||||
export function createStore(
|
||||
storageKey: string,
|
||||
|
|
|
|||
|
|
@ -75,17 +75,12 @@ export function IngressDatatable() {
|
|||
renderTableActions={tableActions}
|
||||
renderTableSettings={() => (
|
||||
<TableSettingsMenu>
|
||||
<DefaultDatatableSettings
|
||||
settings={tableState}
|
||||
hideShowSystemResources={!canAccessSystemResources}
|
||||
/>
|
||||
<DefaultDatatableSettings settings={tableState} />
|
||||
</TableSettingsMenu>
|
||||
)}
|
||||
description={
|
||||
<SystemResourceDescription
|
||||
showSystemResources={
|
||||
tableState.showSystemResources || !canAccessSystemResources
|
||||
}
|
||||
showSystemResources={tableState.showSystemResources}
|
||||
/>
|
||||
}
|
||||
disableSelect={useCheckboxes()}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,10 @@ import { useEnvironmentId } from '@/react/hooks/useEnvironmentId';
|
|||
import { Authorized, useAuthorizations } from '@/react/hooks/useUser';
|
||||
import { notifyError, notifySuccess } from '@/portainer/services/notifications';
|
||||
import { pluralize } from '@/portainer/helpers/strings';
|
||||
import { DefaultDatatableSettings } from '@/react/kubernetes/datatables/DefaultDatatableSettings';
|
||||
import { isSystemNamespace } from '@/react/kubernetes/namespaces/utils';
|
||||
import { useNamespaces } from '@/react/kubernetes/namespaces/queries';
|
||||
import { SystemResourceDescription } from '@/react/kubernetes/datatables/SystemResourceDescription';
|
||||
|
||||
import { Datatable, Table, TableSettingsMenu } from '@@/datatables';
|
||||
import { confirmDelete } from '@@/modals/confirm';
|
||||
|
|
@ -19,10 +23,6 @@ import {
|
|||
useServicesForCluster,
|
||||
} from '../../service';
|
||||
import { Service } from '../../types';
|
||||
import { DefaultDatatableSettings } from '../../../datatables/DefaultDatatableSettings';
|
||||
import { isSystemNamespace } from '../../../namespaces/utils';
|
||||
import { useNamespaces } from '../../../namespaces/queries';
|
||||
import { SystemResourceDescription } from '../../../datatables/SystemResourceDescription';
|
||||
|
||||
import { columns } from './columns';
|
||||
import { createStore } from './datatable-store';
|
||||
|
|
@ -71,10 +71,7 @@ export function ServicesDatatable() {
|
|||
)}
|
||||
renderTableSettings={() => (
|
||||
<TableSettingsMenu>
|
||||
<DefaultDatatableSettings
|
||||
settings={tableState}
|
||||
hideShowSystemResources={!canAccessSystemResources}
|
||||
/>
|
||||
<DefaultDatatableSettings settings={tableState} />
|
||||
</TableSettingsMenu>
|
||||
)}
|
||||
description={
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
import { refreshableSettings, createPersistedStore } from '@@/datatables/types';
|
||||
import { TableSettings } from '@/react/kubernetes/datatables/DefaultDatatableSettings';
|
||||
import { systemResourcesSettings } from '@/react/kubernetes/datatables/SystemResourcesSettings';
|
||||
|
||||
import {
|
||||
systemResourcesSettings,
|
||||
TableSettings,
|
||||
} from '../../../datatables/DefaultDatatableSettings';
|
||||
import { refreshableSettings, createPersistedStore } from '@@/datatables/types';
|
||||
|
||||
export function createStore(storageKey: string) {
|
||||
return createPersistedStore<TableSettings>(storageKey, 'name', (set) => ({
|
||||
|
|
|
|||
|
|
@ -38,7 +38,13 @@ export function JobsDatatable({
|
|||
titleIcon={Clock}
|
||||
disableSelect
|
||||
emptyContentLabel="No jobs found"
|
||||
renderSubRow={(row) => <TasksDatatable data={row.original.Tasks} />}
|
||||
renderSubRow={(row) => (
|
||||
<tr>
|
||||
<td colSpan={6}>
|
||||
<TasksDatatable data={row.original.Tasks} />
|
||||
</td>
|
||||
</tr>
|
||||
)}
|
||||
isLoading={isLoading}
|
||||
renderTableSettings={() => (
|
||||
<TableSettingsMenu>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,11 @@ const mockUser: User = {
|
|||
},
|
||||
};
|
||||
|
||||
/**
|
||||
* A helper function to wrap a component with a UserContext.Provider.
|
||||
*
|
||||
* should only be used in tests
|
||||
*/
|
||||
export function withUserProvider<T>(
|
||||
WrappedComponent: ComponentType<T>,
|
||||
user = mockUser
|
||||
|
|
|
|||
Loading…
Reference in New Issue