mirror of https://github.com/portainer/portainer
refactor(kube/apps): migrate table to react [EE-4685] (#11028)
Chaim Lev-Ari
GitHub
parent
e9ebef15a0
commit
76e49ed9a8
|
|
@ -1,12 +0,0 @@
|
|||
import { KubernetesConfigurationKinds } from 'Kubernetes/models/configuration/models';
|
||||
|
||||
export default class {
|
||||
$onInit() {
|
||||
const secrets = (this.configurations || [])
|
||||
.filter((config) => config.Data && config.Kind === KubernetesConfigurationKinds.SECRET)
|
||||
.flatMap((config) => Object.entries(config.Data))
|
||||
.map(([key, value]) => ({ key, value }));
|
||||
|
||||
this.state = { secrets };
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
<div class="col-xs-12 !px-0 !py-1 text-[13px]"> Secrets </div>
|
||||
<table style="width: 50%">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>
|
||||
<sensitive-details ng-repeat="secret in $ctrl.state.secrets" key="{{ secret.key }}" value="{{ secret.value }}"> </sensitive-details>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
import angular from 'angular';
|
||||
import controller from './applications-datatable-details.controller';
|
||||
|
||||
angular.module('portainer.kubernetes').component('kubernetesApplicationsDatatableDetails', {
|
||||
templateUrl: './applications-datatable-details.html',
|
||||
controller,
|
||||
bindings: {
|
||||
configurations: '<',
|
||||
},
|
||||
});
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
.secondary-heading {
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
.secondary-body {
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
.datatable-wide {
|
||||
width: 55px;
|
||||
}
|
||||
|
||||
.published-url-container {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr 3fr;
|
||||
padding-top: 10px;
|
||||
padding-bottom: 5px;
|
||||
}
|
||||
|
||||
.publish-url-link {
|
||||
width: min-content;
|
||||
}
|
||||
|
|
@ -1,394 +0,0 @@
|
|||
<div class="datatable">
|
||||
<!-- toolbar header actions and settings -->
|
||||
<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>
|
||||
</div>
|
||||
Applications
|
||||
</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="settings" data-cy="k8sApp-tableSettings">
|
||||
<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'" 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()"
|
||||
data-cy="k8sApp-showSystemCheckbox"
|
||||
/>
|
||||
<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"
|
||||
/>
|
||||
<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"
|
||||
>
|
||||
<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">Close</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div class="actionBar !mr-0 !gap-3">
|
||||
<button
|
||||
ng-if="$ctrl.isPrimary"
|
||||
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-removeAppButton"
|
||||
>
|
||||
<pr-icon icon="'trash-2'"></pr-icon>
|
||||
Remove
|
||||
</button>
|
||||
<button
|
||||
ng-if="$ctrl.isPrimary"
|
||||
hide-deployment-option="form"
|
||||
type="button"
|
||||
class="btn btn-sm btn-secondary vertical-center !ml-0 h-fit"
|
||||
ui-sref="kubernetes.applications.new"
|
||||
data-cy="k8sApp-addApplicationButton"
|
||||
>
|
||||
<pr-icon icon="'plus'" class-name="'!h-3'"></pr-icon>Add with form
|
||||
</button>
|
||||
<button
|
||||
ng-if="$ctrl.isPrimary"
|
||||
type="button"
|
||||
class="btn btn-sm btn-primary vertical-center !ml-0 h-fit"
|
||||
ui-sref="kubernetes.deploy({ referrer: 'kubernetes.applications' })"
|
||||
data-cy="k8sApp-deployFromManifestButton"
|
||||
>
|
||||
<pr-icon icon="'plus'" class-name="'!h-3'"></pr-icon>Create from manifest
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="searchBar">
|
||||
<pr-icon icon="'search'" class-name="'searchIcon'"></pr-icon>
|
||||
<input
|
||||
type="text"
|
||||
data-cy="k8sApp-searchApplicationsInput"
|
||||
class="searchInput"
|
||||
ng-model="$ctrl.state.textFilter"
|
||||
ng-change="$ctrl.onTextFilterChange()"
|
||||
placeholder="Search..."
|
||||
auto-focus
|
||||
ng-model-options="{ debounce: 300 }"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="toolBar !pt-0">
|
||||
<div class="w-full">
|
||||
<div class="form-group float-right mr-2 !h-[30px] min-w-[140px]">
|
||||
<div class="input-group">
|
||||
<span class="input-group-addon">
|
||||
<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"
|
||||
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 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">
|
||||
<helm-insights-box></helm-insights-box>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- data table content -->
|
||||
<div ng-class="{ 'table-responsive': $ctrl.isPrimary, 'inner-datatable': !$ctrl.isPrimary }">
|
||||
<table class="table-hover table-filters nowrap-cells table" data-cy="k8sApp-appTable">
|
||||
<thead ng-class="{ 'secondary-heading': !$ctrl.isPrimary }">
|
||||
<tr role="row">
|
||||
<th role="columnheader" class="datatable-wide dropdown">
|
||||
<div ng-if="$ctrl.isPrimary" class="no-wrap flex min-w-max">
|
||||
<span class="md-checkbox vertical-center">
|
||||
<input id="select_all" type="checkbox" ng-model="$ctrl.state.selectAll" ng-change="$ctrl.selectAll()" data-cy="k8sApp-selectAllCheckbox" />
|
||||
<label for="select_all"></label>
|
||||
</span>
|
||||
<div class="vertical-center cursor-pointer" ng-click="$ctrl.expandAll()">
|
||||
<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="'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 ng-if="!$ctrl.hideStacksFunctionality">
|
||||
<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="'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="'Image'"
|
||||
can-sort="true"
|
||||
is-sorted="$ctrl.state.orderBy === 'Image'"
|
||||
is-sorted-desc="$ctrl.state.orderBy === 'Image' && $ctrl.state.reverseOrder"
|
||||
ng-click="$ctrl.changeOrderBy('Image')"
|
||||
></table-column-header>
|
||||
</th>
|
||||
<th uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.filters.state.open">
|
||||
<div class="no-wrap flex flex-row gap-2">
|
||||
<table-column-header
|
||||
col-title="'Application Type'"
|
||||
can-sort="true"
|
||||
is-sorted="$ctrl.state.orderBy === 'ApplicationType'"
|
||||
is-sorted-desc="$ctrl.state.orderBy === 'ApplicationType' && $ctrl.state.reverseOrder"
|
||||
ng-click="$ctrl.changeOrderBy('ApplicationType')"
|
||||
></table-column-header>
|
||||
<div class="no-wrap flex flex-row items-center gap-1" uib-dropdown-toggle>
|
||||
<span class="table-filter">Filters</span>
|
||||
<pr-icon ng-if="!$ctrl.filters.state.enabled" icon="'filter'"></pr-icon>
|
||||
<pr-icon ng-if="$ctrl.filters.state.enabled" icon="'check'"></pr-icon>
|
||||
</div>
|
||||
<div class="dropdown-menu" uib-dropdown-menu>
|
||||
<div class="tableMenu">
|
||||
<div class="menuHeader"> Filter by application type </div>
|
||||
<div class="menuContent">
|
||||
<div class="md-checkbox" ng-repeat="filter in $ctrl.filters.state.values track by $index">
|
||||
<input
|
||||
id="filter_state_{{ $index }}"
|
||||
type="checkbox"
|
||||
ng-model="filter.display"
|
||||
ng-change="$ctrl.onStateFilterChange()"
|
||||
data-cy="k8sApp-filter-state-{{ $index }}"
|
||||
/>
|
||||
<label for="filter_state_{{ $index }}">{{ filter.type }}</label>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<a type="button" class="btn btn-sm btn-default btn-sm" ng-click="$ctrl.filters.state.open = false;">Close</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</th>
|
||||
<th>
|
||||
<table-column-header col-title="'Status'" can-sort="false"></table-column-header>
|
||||
<!-- Status -->
|
||||
</th>
|
||||
<th>
|
||||
<table-column-header col-title="'Published'" can-sort="false"></table-column-header>
|
||||
<!-- Published -->
|
||||
</th>
|
||||
<th>
|
||||
<table-column-header
|
||||
col-title="'Created'"
|
||||
can-sort="true"
|
||||
is-sorted="$ctrl.state.orderBy === 'CreationDate'"
|
||||
is-sorted-desc="$ctrl.state.orderBy === 'CreationDate' && $ctrl.state.reverseOrder"
|
||||
ng-click="$ctrl.changeOrderBy('CreationDate')"
|
||||
></table-column-header>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr
|
||||
ng-show="!$ctrl.isAppsLoading"
|
||||
ng-click="$ctrl.expandItem(item, !$ctrl.isItemExpanded(item))"
|
||||
dir-paginate-start="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.applyFilters | 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, interactive: $ctrl.isExpandable(item), 'secondary-body': !$ctrl.isPrimary }"
|
||||
pagination-id="$ctrl.tableKey"
|
||||
>
|
||||
<td class="h-[50px]">
|
||||
<span ng-if="$ctrl.isPrimary" class="md-checkbox vertical-center">
|
||||
<input
|
||||
id="select_{{ $index }}"
|
||||
type="checkbox"
|
||||
data-cy="k8sApp-checkbox-{{ item.Name }}"
|
||||
ng-model="item.Checked"
|
||||
ng-click="$ctrl.selectItem(item, $event); $event.stopPropagation()"
|
||||
ng-disabled="$ctrl.isSystemNamespace(item)"
|
||||
/>
|
||||
<label for="select_{{ $index }}"></label>
|
||||
</span>
|
||||
<div ng-if="$ctrl.isExpandable(item)" class="vertical-center">
|
||||
<pr-icon ng-if="$ctrl.isItemExpanded(item)" icon="'chevron-down'"></pr-icon>
|
||||
<pr-icon ng-if="!$ctrl.isItemExpanded(item)" icon="'chevron-right'"></pr-icon>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<a
|
||||
ng-if="item.KubernetesApplications"
|
||||
ui-sref="kubernetes.helm({ name: item.Name, namespace: item.ResourcePool })"
|
||||
ng-click="$event.stopPropagation()"
|
||||
class="hyperlink"
|
||||
>{{ item.Name }}
|
||||
</a>
|
||||
<a
|
||||
ng-if="!item.KubernetesApplications"
|
||||
ui-sref="kubernetes.applications.application({ name: item.Name, namespace: item.ResourcePool, 'resource-type': item.ApplicationType })"
|
||||
ng-click="$event.stopPropagation()"
|
||||
class="hyperlink"
|
||||
>{{ item.Name }}
|
||||
</a>
|
||||
<span class="label label-info image-tag label-margins" ng-if="$ctrl.isSystemNamespace(item)">system</span>
|
||||
<span class="label label-primary image-tag label-margins" ng-if="!$ctrl.isSystemNamespace(item) && $ctrl.isExternalApplication(item)">external</span>
|
||||
</td>
|
||||
<td ng-if="!$ctrl.hideStacksFunctionality">{{ item.StackName || '-' }}</td>
|
||||
<td>
|
||||
<a ui-sref="kubernetes.resourcePools.resourcePool({ id: item.ResourcePool })" ng-click="$event.stopPropagation()">{{ item.ResourcePool }}</a>
|
||||
</td>
|
||||
<td title="{{ item.Image }}"
|
||||
>{{ item.Image | truncate: 64 }} <span ng-if="item.Containers.length > 1">+ {{ item.Containers.length - 1 }}</span></td
|
||||
>
|
||||
<td>{{ item.ApplicationType }}</td>
|
||||
<td ng-if="item.ApplicationType !== $ctrl.KubernetesApplicationTypes.Pod">
|
||||
<status-indicator ok="(item.TotalPodsCount > 0 && item.TotalPodsCount === item.RunningPodsCount) || item.Status === 'Ready'"></status-indicator>
|
||||
<span ng-if="item.DeploymentType === $ctrl.KubernetesApplicationDeploymentTypes.Replicated">Replicated</span>
|
||||
<span ng-if="item.DeploymentType === $ctrl.KubernetesApplicationDeploymentTypes.Global">Global</span>
|
||||
<span ng-if="item.RunningPodsCount >= 0 && item.TotalPodsCount >= 0"
|
||||
><code>{{ item.RunningPodsCount }}</code> / <code>{{ item.TotalPodsCount }}</code></span
|
||||
>
|
||||
<span ng-if="item.KubernetesApplications">{{ item.Status }}</span>
|
||||
</td>
|
||||
<td ng-if="item.ApplicationType === $ctrl.KubernetesApplicationTypes.Pod"> {{ item.Pods[0].Status }} </td>
|
||||
<td>
|
||||
<span> {{ item.Services.length === 0 ? 'No' : 'Yes' }} </span>
|
||||
</td>
|
||||
<td>{{ item.CreationDate | getisodate }} {{ item.ApplicationOwner ? 'by ' + item.ApplicationOwner : '' }}</td>
|
||||
</tr>
|
||||
<tr dir-paginate-end ng-show="$ctrl.isExpandable(item) && $ctrl.isItemExpanded(item)" ng-class="{ 'secondary-body': $ctrl.isPrimary && !item.KubernetesApplications }">
|
||||
<td></td>
|
||||
<td colspan="8" class="datatable-padding-vertical">
|
||||
<span ng-if="item.KubernetesApplications">
|
||||
<kubernetes-applications-datatable
|
||||
dataset="item.KubernetesApplications"
|
||||
table-key="{{ item.Id }}_table"
|
||||
settings-key="{{ $ctrl.tableKey }}"
|
||||
order-by="Name"
|
||||
remove-action="$ctrl.removeAction"
|
||||
refresh-callback="$ctrl.refreshCallback"
|
||||
on-publishing-mode-click="($ctrl.onPublishingModeClick)"
|
||||
is-primary="false"
|
||||
hide-stacks-functionality="$ctrl.hideStacksFunctionality"
|
||||
>
|
||||
</kubernetes-applications-datatable>
|
||||
</span>
|
||||
<span ng-if="!item.KubernetesApplications">
|
||||
<div class="published-url-container">
|
||||
<div>
|
||||
<div class="text-muted"> Published URL(s) </div>
|
||||
</div>
|
||||
<div>
|
||||
<div ng-repeat="url in $ctrl.getPublishedUrls(item)">
|
||||
<a ng-href="{{ url }}" target="_blank" class="publish-url-link vertical-center">
|
||||
<pr-icon icon="'external-link'"></pr-icon>
|
||||
{{ url }}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<kubernetes-applications-datatable-details
|
||||
ng-if="$ctrl.hasConfigurationSecrets(item)"
|
||||
configurations="item.Configurations"
|
||||
></kubernetes-applications-datatable-details>
|
||||
</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr ng-if="$ctrl.isAppsLoading">
|
||||
<td colspan="8" class="text-muted text-center">Loading...</td>
|
||||
</tr>
|
||||
<tr ng-if="$ctrl.state.filteredDataSet.length === 0 && !$ctrl.isAppsLoading">
|
||||
<td colspan="8" class="text-muted text-center">No application available.</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="footer pl-5" ng-if="$ctrl.isPrimary && $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 class="mr-1"> 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,27 +0,0 @@
|
|||
import './applicationsDatatable.css';
|
||||
|
||||
angular.module('portainer.kubernetes').component('kubernetesApplicationsDatatable', {
|
||||
templateUrl: './applicationsDatatable.html',
|
||||
controller: 'KubernetesApplicationsDatatableController',
|
||||
bindings: {
|
||||
titleText: '@',
|
||||
titleIcon: '@',
|
||||
dataset: '<',
|
||||
tableKey: '@',
|
||||
settingsKey: '@',
|
||||
orderBy: '@',
|
||||
reverseOrder: '<',
|
||||
removeAction: '<',
|
||||
refreshCallback: '<',
|
||||
onPublishingModeClick: '<',
|
||||
isPrimary: '<',
|
||||
namespaces: '<',
|
||||
namespace: '<',
|
||||
onChangeNamespaceDropdown: '<',
|
||||
isAppsLoading: '<',
|
||||
isSystemResources: '<',
|
||||
isVisible: '<',
|
||||
setSystemResources: '<',
|
||||
hideStacksFunctionality: '<',
|
||||
},
|
||||
});
|
||||
|
|
@ -1,251 +0,0 @@
|
|||
import _ from 'lodash-es';
|
||||
import KubernetesApplicationHelper from 'Kubernetes/helpers/application';
|
||||
import KubernetesNamespaceHelper from 'Kubernetes/helpers/namespaceHelper';
|
||||
import { KubernetesConfigurationKinds } from 'Kubernetes/models/configuration/models';
|
||||
import { KubernetesApplicationDeploymentTypes, KubernetesApplicationTypes } from 'Kubernetes/models/application/models/appConstants';
|
||||
|
||||
import { getSchemeFromPort } from '@/react/common/network-utils';
|
||||
|
||||
angular.module('portainer.kubernetes').controller('KubernetesApplicationsDatatableController', [
|
||||
'$scope',
|
||||
'$controller',
|
||||
'DatatableService',
|
||||
'Authentication',
|
||||
function ($scope, $controller, DatatableService, Authentication) {
|
||||
angular.extend(this, $controller('GenericDatatableController', { $scope: $scope }));
|
||||
|
||||
const ctrl = this;
|
||||
|
||||
this.settings = Object.assign(this.settings, {
|
||||
showSystem: false,
|
||||
});
|
||||
|
||||
this.state = Object.assign(this.state, {
|
||||
expandAll: false,
|
||||
expandedItems: [],
|
||||
namespace: '',
|
||||
namespaces: [],
|
||||
});
|
||||
|
||||
this.filters = {
|
||||
state: {
|
||||
open: false,
|
||||
enabled: false,
|
||||
values: [],
|
||||
},
|
||||
};
|
||||
|
||||
this.expandAll = function () {
|
||||
this.state.expandAll = !this.state.expandAll;
|
||||
this.state.filteredDataSet.forEach((item) => this.expandItem(item, this.state.expandAll));
|
||||
};
|
||||
|
||||
this.isItemExpanded = function (item) {
|
||||
return this.state.expandedItems.includes(item.Id);
|
||||
};
|
||||
|
||||
this.isExpandable = function (item) {
|
||||
return item.KubernetesApplications || this.hasConfigurationSecrets(item) || !!this.getPublishedUrls(item).length;
|
||||
};
|
||||
|
||||
this.expandItem = function (item, expanded) {
|
||||
// collapse item
|
||||
if (!expanded) {
|
||||
this.state.expandedItems = this.state.expandedItems.filter((id) => id !== item.Id);
|
||||
// expanded item
|
||||
} else if (expanded && !this.state.expandedItems.includes(item.Id)) {
|
||||
this.state.expandedItems = [...this.state.expandedItems, item.Id];
|
||||
}
|
||||
DatatableService.setDataTableExpandedItems(this.tableKey, this.state.expandedItems);
|
||||
};
|
||||
|
||||
this.expandItems = function (storedExpandedItems) {
|
||||
this.state.expandedItems = storedExpandedItems;
|
||||
if (this.state.expandedItems.length === this.dataset.length) {
|
||||
this.state.expandAll = true;
|
||||
}
|
||||
};
|
||||
|
||||
this.onDataRefresh = function () {
|
||||
const storedExpandedItems = DatatableService.getDataTableExpandedItems(this.tableKey);
|
||||
if (storedExpandedItems !== null) {
|
||||
this.expandItems(storedExpandedItems);
|
||||
}
|
||||
};
|
||||
|
||||
this.onSettingsShowSystemChange = function () {
|
||||
this.updateNamespace();
|
||||
this.setSystemResources(this.settings.showSystem);
|
||||
DatatableService.setDataTableSettings(this.tableKey, this.settings);
|
||||
};
|
||||
|
||||
this.isExternalApplication = function (item) {
|
||||
return KubernetesApplicationHelper.isExternalApplication(item);
|
||||
};
|
||||
|
||||
this.isSystemNamespace = function (item) {
|
||||
// if all charts in a helm app/release are in the system namespace
|
||||
if (item.KubernetesApplications && item.KubernetesApplications.length > 0) {
|
||||
return item.KubernetesApplications.some((app) => KubernetesNamespaceHelper.isSystemNamespace(app.ResourcePool));
|
||||
}
|
||||
return KubernetesNamespaceHelper.isSystemNamespace(item.ResourcePool);
|
||||
};
|
||||
|
||||
this.isDisplayed = function (item) {
|
||||
return !ctrl.isSystemNamespace(item) || ctrl.settings.showSystem;
|
||||
};
|
||||
|
||||
this.getPublishedUrls = function (item) {
|
||||
// Map all ingress rules in published ports to their respective URLs
|
||||
const ingressUrls = item.PublishedPorts.flatMap((pp) => pp.IngressRules)
|
||||
.filter(({ Host, IP }) => Host || IP)
|
||||
.map(({ Host, IP, Path, TLS }) => {
|
||||
let scheme = TLS && TLS.filter((tls) => tls.hosts && tls.hosts.includes(Host)).length > 0 ? 'https' : 'http';
|
||||
return `${scheme}://${Host || IP}${Path}`;
|
||||
});
|
||||
|
||||
// Map all load balancer service ports to ip address
|
||||
let loadBalancerURLs = [];
|
||||
if (item.LoadBalancerIPAddress) {
|
||||
loadBalancerURLs = item.PublishedPorts.map((pp) => {
|
||||
const scheme = getSchemeFromPort(pp.Port);
|
||||
return `${scheme}://${item.LoadBalancerIPAddress}:${pp.Port}`;
|
||||
});
|
||||
}
|
||||
|
||||
// combine ingress urls
|
||||
const publishedUrls = [...ingressUrls, ...loadBalancerURLs];
|
||||
|
||||
// Return the first URL - priority given to ingress urls, then services (load balancers)
|
||||
return publishedUrls.length > 0 ? publishedUrls : '';
|
||||
};
|
||||
|
||||
this.hasConfigurationSecrets = function (item) {
|
||||
return item.Configurations && item.Configurations.some((config) => config.Data && config.Kind === KubernetesConfigurationKinds.SECRET);
|
||||
};
|
||||
|
||||
/**
|
||||
* Do not allow applications in system namespaces to be selected
|
||||
*/
|
||||
this.allowSelection = function (item) {
|
||||
return !this.isSystemNamespace(item);
|
||||
};
|
||||
|
||||
this.applyFilters = function (item) {
|
||||
return ctrl.filters.state.values.some((filter) => item.ApplicationType === filter.type && filter.display);
|
||||
};
|
||||
|
||||
this.onStateFilterChange = function () {
|
||||
this.filters.state.enabled = this.filters.state.values.some((filter) => !filter.display);
|
||||
};
|
||||
|
||||
this.prepareTableFromDataset = function () {
|
||||
const availableTypeFilters = this.dataset.map((item) => ({ type: item.ApplicationType, display: true }));
|
||||
this.filters.state.values = _.uniqBy(availableTypeFilters, 'type');
|
||||
};
|
||||
|
||||
this.onChangeNamespace = function () {
|
||||
this.onChangeNamespaceDropdown(this.state.namespace);
|
||||
};
|
||||
|
||||
this.updateNamespace = function () {
|
||||
if (this.namespaces && this.settingsLoaded) {
|
||||
const allNamespacesOption = { Name: 'All namespaces', Value: '', IsSystem: false };
|
||||
const visibleNamespaceOptions = this.namespaces
|
||||
.filter((ns) => {
|
||||
if (!this.settings.showSystem && ns.IsSystem) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
})
|
||||
.map((ns) => ({ Name: ns.Name, Value: ns.Name, IsSystem: ns.IsSystem }));
|
||||
this.state.namespaces = [allNamespacesOption, ...visibleNamespaceOptions];
|
||||
|
||||
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.$onChanges = function (changes) {
|
||||
if (this.settingsLoaded) {
|
||||
// when the table is visible, sync the show system setting with the stack show system setting
|
||||
if (changes.isVisible && changes.isVisible.currentValue) {
|
||||
const storedStacksSettings = DatatableService.getDataTableSettings('kubernetes.applications.stacks');
|
||||
if (storedStacksSettings && storedStacksSettings.state) {
|
||||
this.settings.showSystem = storedStacksSettings.state.showSystemResources;
|
||||
DatatableService.setDataTableSettings(this.settingsKey, this.settings);
|
||||
}
|
||||
} else 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.KubernetesApplicationTypes = KubernetesApplicationTypes;
|
||||
this.setDefaults();
|
||||
this.prepareTableFromDataset();
|
||||
|
||||
this.state.orderBy = this.orderBy;
|
||||
const storedOrder = DatatableService.getDataTableOrder(this.tableKey);
|
||||
if (storedOrder !== null) {
|
||||
this.state.reverseOrder = storedOrder.reverse;
|
||||
this.state.orderBy = storedOrder.orderBy;
|
||||
}
|
||||
|
||||
const textFilter = DatatableService.getDataTableTextFilters(this.tableKey);
|
||||
if (textFilter !== null) {
|
||||
this.state.textFilter = textFilter;
|
||||
this.onTextFilterChange();
|
||||
}
|
||||
|
||||
const storedFilters = DatatableService.getDataTableFilters(this.tableKey);
|
||||
if (storedFilters !== null) {
|
||||
this.filters = storedFilters;
|
||||
}
|
||||
if (this.filters && this.filters.state) {
|
||||
this.filters.state.open = false;
|
||||
}
|
||||
|
||||
const storedExpandedItems = DatatableService.getDataTableExpandedItems(this.tableKey);
|
||||
if (storedExpandedItems !== null) {
|
||||
this.expandItems(storedExpandedItems);
|
||||
}
|
||||
|
||||
const storedSettings = DatatableService.getDataTableSettings(this.settingsKey);
|
||||
if (storedSettings !== null) {
|
||||
this.settings = storedSettings;
|
||||
this.settings.open = false;
|
||||
|
||||
// make show system in sync with the stack show system settings
|
||||
const storedStacksSettings = DatatableService.getDataTableSettings('kubernetes.applications.stacks');
|
||||
if (storedStacksSettings && storedStacksSettings.state) {
|
||||
this.settings.showSystem = storedStacksSettings.state.showSystemResources || this.settings.showSystem;
|
||||
}
|
||||
|
||||
this.setSystemResources && this.setSystemResources(this.settings.showSystem);
|
||||
}
|
||||
this.settingsLoaded = true;
|
||||
// Set the default selected namespace
|
||||
if (!this.state.namespace) {
|
||||
this.state.namespace = this.namespace;
|
||||
}
|
||||
|
||||
this.updateNamespace();
|
||||
this.onSettingsRepeaterChange();
|
||||
};
|
||||
},
|
||||
]);
|
||||
|
|
@ -1,6 +1,25 @@
|
|||
import angular from 'angular';
|
||||
|
||||
export const applicationsModule = angular.module(
|
||||
'portainer.kubernetes.react.components.applications',
|
||||
[]
|
||||
).name;
|
||||
import { r2a } from '@/react-tools/react2angular';
|
||||
import { withUIRouter } from '@/react-tools/withUIRouter';
|
||||
import { withCurrentUser } from '@/react-tools/withCurrentUser';
|
||||
import { ApplicationsDatatable } from '@/react/kubernetes/applications/ListView/ApplicationsDatatable/ApplicationsDatatable';
|
||||
|
||||
export const applicationsModule = angular
|
||||
.module('portainer.kubernetes.react.components.applications', [])
|
||||
|
||||
.component(
|
||||
'kubernetesApplicationsDatatable',
|
||||
r2a(withUIRouter(withCurrentUser(ApplicationsDatatable)), [
|
||||
'dataset',
|
||||
'isLoading',
|
||||
'namespace',
|
||||
'namespaces',
|
||||
'onNamespaceChange',
|
||||
'onRefresh',
|
||||
'showSystem',
|
||||
'onShowSystemChange',
|
||||
'onRemove',
|
||||
'hideStacks',
|
||||
])
|
||||
).name;
|
||||
|
|
|
|||
|
|
@ -59,7 +59,6 @@ import { deploymentTypeValidation } from '@/react/kubernetes/applications/compon
|
|||
import { AppDeploymentTypeFormSection } from '@/react/kubernetes/applications/components/AppDeploymentTypeFormSection/AppDeploymentTypeFormSection';
|
||||
import { EnvironmentVariablesFormSection } from '@/react/kubernetes/applications/components/EnvironmentVariablesFormSection/EnvironmentVariablesFormSection';
|
||||
import { kubeEnvVarValidationSchema } from '@/react/kubernetes/applications/components/EnvironmentVariablesFormSection/kubeEnvVarValidationSchema';
|
||||
import { HelmInsightsBox } from '@/react/kubernetes/applications/ListView/ApplicationsDatatable/HelmInsightsBox';
|
||||
import { IntegratedAppsDatatable } from '@/react/kubernetes/components/IntegratedAppsDatatable/IntegratedAppsDatatable';
|
||||
|
||||
import { applicationsModule } from './applications';
|
||||
|
|
@ -101,7 +100,6 @@ export const ngModule = angular
|
|||
'value',
|
||||
])
|
||||
)
|
||||
.component('helmInsightsBox', r2a(HelmInsightsBox, []))
|
||||
.component(
|
||||
'namespaceAccessUsersSelector',
|
||||
r2a(NamespaceAccessUsersSelector, [
|
||||
|
|
|
|||
|
|
@ -10,23 +10,18 @@
|
|||
<uib-tabset active="ctrl.state.activeTab" justified="true" type="pills" ng-if="!ctrl.deploymentOptions.hideStacksFunctionality">
|
||||
<uib-tab index="0" classes="btn-sm" select="ctrl.selectTab(0)">
|
||||
<uib-tab-heading class="vertical-center"> <pr-icon icon="'box'"></pr-icon> Applications </uib-tab-heading>
|
||||
|
||||
<kubernetes-applications-datatable
|
||||
dataset="ctrl.state.applications"
|
||||
table-key="kubernetes.applications"
|
||||
settings-key="kubernetes.applications"
|
||||
order-by="Name"
|
||||
remove-action="ctrl.removeAction"
|
||||
refresh-callback="ctrl.getApplications"
|
||||
on-publishing-mode-click="(ctrl.onPublishingModeClick)"
|
||||
is-primary="true"
|
||||
on-refresh="(ctrl.getApplications)"
|
||||
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"
|
||||
is-visible="ctrl.state.activeTab === 0"
|
||||
set-system-resources="(ctrl.setSystemResources)"
|
||||
hide-stacks-functionality="ctrl.deploymentOptions.hideStacksFunctionality"
|
||||
on-namespace-change="(ctrl.onChangeNamespaceDropdown)"
|
||||
is-loading="ctrl.state.isAppsLoading"
|
||||
show-system="ctrl.state.isSystemResources"
|
||||
on-show-system-change="(ctrl.setSystemResources)"
|
||||
on-remove="(ctrl.removeAction)"
|
||||
hide-stacks="ctrl.deploymentOptions.hideStacksFunctionality"
|
||||
>
|
||||
</kubernetes-applications-datatable>
|
||||
</uib-tab>
|
||||
|
|
@ -50,20 +45,15 @@
|
|||
<kubernetes-applications-datatable
|
||||
ng-if="ctrl.deploymentOptions.hideStacksFunctionality"
|
||||
dataset="ctrl.state.applications"
|
||||
table-key="kubernetes.applications"
|
||||
settings-key="kubernetes.applications"
|
||||
order-by="Name"
|
||||
remove-action="ctrl.removeAction"
|
||||
refresh-callback="ctrl.getApplications"
|
||||
on-publishing-mode-click="(ctrl.onPublishingModeClick)"
|
||||
is-primary="true"
|
||||
on-refresh="(ctrl.getApplications)"
|
||||
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)"
|
||||
hide-stacks-functionality="ctrl.deploymentOptions.hideStacksFunctionality"
|
||||
on-namespace-change="(ctrl.onChangeNamespaceDropdown)"
|
||||
is-loading="ctrl.state.isAppsLoading"
|
||||
show-system="ctrl.state.isSystemResources"
|
||||
on-show-system-change="(ctrl.setSystemResources)"
|
||||
on-remove="(ctrl.removeAction)"
|
||||
hide-stacks="ctrl.deploymentOptions.hideStacksFunctionality"
|
||||
>
|
||||
</kubernetes-applications-datatable>
|
||||
</rd-widget-body>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import KubernetesApplicationHelper from 'Kubernetes/helpers/application';
|
|||
import KubernetesConfigurationHelper from 'Kubernetes/helpers/configurationHelper';
|
||||
import { KubernetesApplicationTypes } from 'Kubernetes/models/application/models/appConstants';
|
||||
import { KubernetesPortainerApplicationStackNameLabel } from 'Kubernetes/models/application/models';
|
||||
import { confirmDelete } from '@@/modals/confirm';
|
||||
import { getDeploymentOptions } from '@/react/portainer/environments/environment.service';
|
||||
|
||||
class KubernetesApplicationsController {
|
||||
|
|
@ -118,11 +117,7 @@ class KubernetesApplicationsController {
|
|||
}
|
||||
|
||||
removeAction(selectedItems) {
|
||||
confirmDelete('Do you want to remove the selected application(s)?').then((confirmed) => {
|
||||
if (confirmed) {
|
||||
return this.$async(this.removeActionAsync, selectedItems);
|
||||
}
|
||||
});
|
||||
this.$async(() => this.removeActionAsync(selectedItems));
|
||||
}
|
||||
|
||||
onPublishingModeClick(application) {
|
||||
|
|
@ -169,7 +164,9 @@ class KubernetesApplicationsController {
|
|||
}
|
||||
|
||||
setSystemResources(flag) {
|
||||
this.state.isSystemResources = flag;
|
||||
return this.$scope.$applyAsync(() => {
|
||||
this.state.isSystemResources = flag;
|
||||
});
|
||||
}
|
||||
|
||||
getApplications() {
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<tbody class="release-table">
|
||||
<tr>
|
||||
<td class="vertical-center !pl-0">Name</td>
|
||||
<td class="vertical-center !p-2">
|
||||
<td class="vertical-center !p-2" data-cy="k8sAppDetail-appName">
|
||||
{{ $ctrl.state.release.name }}
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
export default class CopyButtonController {
|
||||
/* @ngInject */
|
||||
constructor(clipboard) {
|
||||
this.clipboard = clipboard;
|
||||
this.state = { isFading: false };
|
||||
}
|
||||
|
||||
copyValueText() {
|
||||
this.clipboard.copyText(this.value);
|
||||
this.state.isFading = true;
|
||||
setTimeout(() => (this.state.isFading = false), 1000);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
@-webkit-keyframes fadeOut {
|
||||
0% {
|
||||
opacity: 1;
|
||||
}
|
||||
50% {
|
||||
opacity: 0.8;
|
||||
}
|
||||
99% {
|
||||
opacity: 0.01;
|
||||
}
|
||||
100% {
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
@keyframes fadeOut {
|
||||
0% {
|
||||
opacity: 1;
|
||||
}
|
||||
50% {
|
||||
opacity: 0.8;
|
||||
}
|
||||
99% {
|
||||
opacity: 0.01;
|
||||
}
|
||||
100% {
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.copy-button-fadeout {
|
||||
animation: fadeOut 2.5s;
|
||||
animation-fill-mode: forwards;
|
||||
}
|
||||
|
||||
.copy-button-copy-text {
|
||||
opacity: 0;
|
||||
margin-left: 7px;
|
||||
color: #23ae89;
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
<span>
|
||||
<button type="button" class="btn btn-link nopadding" ng-click="$ctrl.copyValueText()" title="Copy Value">
|
||||
<pr-icon icon="'clipboard'"></pr-icon>
|
||||
Copy
|
||||
</button>
|
||||
<span ng-class="{ 'copy-button-fadeout': $ctrl.state.isFading }" class="copy-button-copy-text">
|
||||
<pr-icon icon="'check'"></pr-icon>
|
||||
copied
|
||||
</span>
|
||||
</span>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
import angular from 'angular';
|
||||
import controller from './copy-button.controller';
|
||||
import './copy-button.css';
|
||||
|
||||
angular.module('portainer.app').component('copyButton', {
|
||||
templateUrl: './copy-button.html',
|
||||
controller,
|
||||
bindings: {
|
||||
value: '<',
|
||||
},
|
||||
});
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
<div class="sensitive-details-container">
|
||||
<div class="text-wrap">{{ $ctrl.key }}</div>
|
||||
<show-hide class="show-hide-container" value="$ctrl.value" use-asterisk="true"></show-hide>
|
||||
<copy-button value="$ctrl.value"></copy-button>
|
||||
</div>
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
import angular from 'angular';
|
||||
import './sensitive-details.css';
|
||||
|
||||
angular.module('portainer.app').component('sensitiveDetails', {
|
||||
templateUrl: './sensitive-details.html',
|
||||
bindings: {
|
||||
key: '@',
|
||||
value: '@',
|
||||
},
|
||||
});
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
<div class="small text-muted text-wrap">
|
||||
<span ng-if="!$ctrl.show && $ctrl.useAsterisk">********</span>
|
||||
<span ng-if="$ctrl.show">{{ $ctrl.value }}</span>
|
||||
</div>
|
||||
|
||||
<button type="button" class="btn btn-link nopadding" ng-click="$ctrl.show = !$ctrl.show" title="Show/Hide value">
|
||||
<div ng-if="!$ctrl.show">
|
||||
<pr-icon icon="'eye-off'"></pr-icon>
|
||||
Show</div
|
||||
>
|
||||
<div ng-if="$ctrl.show">
|
||||
<pr-icon icon="'eye'"></pr-icon>
|
||||
Hide</div
|
||||
>
|
||||
</button>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
import angular from 'angular';
|
||||
|
||||
angular.module('portainer.app').component('showHide', {
|
||||
templateUrl: './show-hide.html',
|
||||
bindings: {
|
||||
value: '<',
|
||||
useAsterisk: '<',
|
||||
},
|
||||
});
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
import angular from 'angular';
|
||||
|
||||
import './status-indicator.css';
|
||||
|
||||
export const statusIndicator = {
|
||||
templateUrl: './status-indicator.html',
|
||||
bindings: {
|
||||
ok: '<',
|
||||
},
|
||||
};
|
||||
|
||||
angular.module('portainer.app').component('statusIndicator', statusIndicator);
|
||||
|
|
@ -1 +0,0 @@
|
|||
<i aria-hidden="true" ng-class="['status-indicator', { ok: $ctrl.ok }]"></i>
|
||||
|
|
@ -0,0 +1,166 @@
|
|||
import { useEffect } from 'react';
|
||||
import { BoxIcon } from 'lucide-react';
|
||||
|
||||
import { useKubeStore } from '@/react/kubernetes/datatables/default-kube-datatable-store';
|
||||
import { DefaultDatatableSettings } from '@/react/kubernetes/datatables/DefaultDatatableSettings';
|
||||
import { SystemResourceDescription } from '@/react/kubernetes/datatables/SystemResourceDescription';
|
||||
import { CreateFromManifestButton } from '@/react/kubernetes/components/CreateFromManifestButton';
|
||||
import { useNamespacesQuery } from '@/react/kubernetes/namespaces/queries/useNamespacesQuery';
|
||||
import { useEnvironmentId } from '@/react/hooks/useEnvironmentId';
|
||||
import { useCurrentEnvironment } from '@/react/hooks/useCurrentEnvironment';
|
||||
import { useAuthorizations } from '@/react/hooks/useUser';
|
||||
|
||||
import { TableSettingsMenu } from '@@/datatables';
|
||||
import { useRepeater } from '@@/datatables/useRepeater';
|
||||
import { DeleteButton } from '@@/buttons/DeleteButton';
|
||||
import { AddButton } from '@@/buttons';
|
||||
import { ExpandableDatatable } from '@@/datatables/ExpandableDatatable';
|
||||
|
||||
import { NamespaceFilter } from '../ApplicationsStacksDatatable/NamespaceFilter';
|
||||
import { Namespace } from '../ApplicationsStacksDatatable/types';
|
||||
|
||||
import { Application, ConfigKind } from './types';
|
||||
import { useColumns } from './useColumns';
|
||||
import { getPublishedUrls } from './PublishedPorts';
|
||||
import { SubRow } from './SubRow';
|
||||
import { HelmInsightsBox } from './HelmInsightsBox';
|
||||
|
||||
export function ApplicationsDatatable({
|
||||
dataset,
|
||||
onRefresh,
|
||||
isLoading,
|
||||
onRemove,
|
||||
namespace = '',
|
||||
namespaces,
|
||||
onNamespaceChange,
|
||||
showSystem,
|
||||
onShowSystemChange,
|
||||
hideStacks,
|
||||
}: {
|
||||
dataset: Array<Application>;
|
||||
onRefresh: () => void;
|
||||
isLoading: boolean;
|
||||
onRemove: (selectedItems: Application[]) => void;
|
||||
namespace?: string;
|
||||
namespaces: Array<Namespace>;
|
||||
onNamespaceChange(namespace: string): void;
|
||||
showSystem?: boolean;
|
||||
onShowSystemChange(showSystem: boolean): void;
|
||||
hideStacks: boolean;
|
||||
}) {
|
||||
const envId = useEnvironmentId();
|
||||
const envQuery = useCurrentEnvironment();
|
||||
const namespaceMetaListQuery = useNamespacesQuery(envId);
|
||||
|
||||
const tableState = useKubeStore('kubernetes.applications', 'Name');
|
||||
useRepeater(tableState.autoRefreshRate, onRefresh);
|
||||
|
||||
const hasWriteAuthQuery = useAuthorizations(
|
||||
'K8sApplicationsW',
|
||||
undefined,
|
||||
true
|
||||
);
|
||||
|
||||
const { setShowSystemResources } = tableState;
|
||||
|
||||
useEffect(() => {
|
||||
setShowSystemResources(showSystem || false);
|
||||
}, [showSystem, setShowSystemResources]);
|
||||
|
||||
const columns = useColumns(hideStacks);
|
||||
|
||||
const filteredDataset = !showSystem
|
||||
? dataset.filter(
|
||||
(item) => !namespaceMetaListQuery.data?.[item.ResourcePool]?.IsSystem
|
||||
)
|
||||
: dataset;
|
||||
|
||||
return (
|
||||
<ExpandableDatatable
|
||||
data-cy="k8sApp-appTable"
|
||||
noWidget
|
||||
dataset={filteredDataset}
|
||||
settingsManager={tableState}
|
||||
columns={columns}
|
||||
title="Applications"
|
||||
titleIcon={BoxIcon}
|
||||
isLoading={isLoading}
|
||||
disableSelect={!hasWriteAuthQuery.authorized}
|
||||
isRowSelectable={(row) =>
|
||||
!namespaceMetaListQuery.data?.[row.original.ResourcePool]?.IsSystem
|
||||
}
|
||||
getRowCanExpand={(row) => isExpandable(row.original)}
|
||||
renderSubRow={(row) => (
|
||||
<SubRow
|
||||
item={row.original}
|
||||
hideStacks={hideStacks}
|
||||
areSecretsRestricted={
|
||||
envQuery.data?.Kubernetes.Configuration.RestrictSecrets || false
|
||||
}
|
||||
/>
|
||||
)}
|
||||
renderTableActions={(selectedItems) =>
|
||||
hasWriteAuthQuery.authorized && (
|
||||
<>
|
||||
<DeleteButton
|
||||
data-cy="k8sApp-removeAppButton"
|
||||
disabled={selectedItems.length === 0}
|
||||
confirmMessage="Do you want to remove the selected application(s)?"
|
||||
onConfirmed={() => onRemove(selectedItems)}
|
||||
/>
|
||||
|
||||
<AddButton data-cy="k8sApp-addApplicationButton" color="secondary">
|
||||
Add with form
|
||||
</AddButton>
|
||||
|
||||
<CreateFromManifestButton data-cy="k8sApp-deployFromManifestButton" />
|
||||
</>
|
||||
)
|
||||
}
|
||||
renderTableSettings={() => (
|
||||
<TableSettingsMenu>
|
||||
<DefaultDatatableSettings
|
||||
settings={tableState}
|
||||
onShowSystemChange={onShowSystemChange}
|
||||
/>
|
||||
</TableSettingsMenu>
|
||||
)}
|
||||
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">
|
||||
<HelmInsightsBox />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
function isExpandable(item: Application) {
|
||||
return (
|
||||
!!item.KubernetesApplications ||
|
||||
!!getPublishedUrls(item).length ||
|
||||
hasConfigurationSecrets(item)
|
||||
);
|
||||
}
|
||||
|
||||
function hasConfigurationSecrets(item: Application) {
|
||||
return !!item.Configurations?.some(
|
||||
(config) => config.Data && config.Kind === ConfigKind.Secret
|
||||
);
|
||||
}
|
||||
|
|
@ -0,0 +1,56 @@
|
|||
import { useAuthorizations } from '@/react/hooks/useUser';
|
||||
|
||||
import { SensitiveDetails } from './SensitiveDetails';
|
||||
import { Application, ConfigKind } from './types';
|
||||
|
||||
export function ConfigurationDetails({
|
||||
item,
|
||||
areSecretsRestricted,
|
||||
username,
|
||||
}: {
|
||||
item: Application;
|
||||
areSecretsRestricted: boolean;
|
||||
username: string;
|
||||
}) {
|
||||
const isEnvironmentAdminQuery = useAuthorizations(['K8sResourcePoolsW']);
|
||||
|
||||
const secrets = item.Configurations?.filter(
|
||||
(config) => config.Data && config.Kind === ConfigKind.Secret
|
||||
);
|
||||
|
||||
if (isEnvironmentAdminQuery.isLoading || !secrets || secrets.length === 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="col-xs-12 !px-0 !py-1 text-[13px]"> Secrets </div>
|
||||
<table className="w-1/2">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>
|
||||
{secrets.map((secret) =>
|
||||
Object.entries(secret.Data || {}).map(([key, value]) => (
|
||||
<SensitiveDetails
|
||||
key={key}
|
||||
name={key}
|
||||
value={value}
|
||||
canSeeValue={canSeeValue(secret)}
|
||||
/>
|
||||
))
|
||||
)}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</>
|
||||
);
|
||||
|
||||
function canSeeValue(secret: { ConfigurationOwner: string }) {
|
||||
return (
|
||||
!areSecretsRestricted ||
|
||||
isEnvironmentAdminQuery.authorized ||
|
||||
secret.ConfigurationOwner === username
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
import { NestedDatatable } from '@@/datatables/NestedDatatable';
|
||||
|
||||
import { Application } from './types';
|
||||
import { useBaseColumns } from './useColumns';
|
||||
|
||||
export function InnerTable({
|
||||
dataset,
|
||||
hideStacks,
|
||||
}: {
|
||||
dataset: Array<Application>;
|
||||
hideStacks: boolean;
|
||||
}) {
|
||||
const columns = useBaseColumns(hideStacks);
|
||||
|
||||
return (
|
||||
<NestedDatatable
|
||||
dataset={dataset}
|
||||
columns={columns}
|
||||
data-cy="applications-nested-datatable"
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
|
@ -0,0 +1,70 @@
|
|||
import { ExternalLinkIcon } from 'lucide-react';
|
||||
|
||||
import { getSchemeFromPort } from '@/react/common/network-utils';
|
||||
|
||||
import { Icon } from '@@/Icon';
|
||||
|
||||
import { Application } from './types';
|
||||
|
||||
export function PublishedPorts({ item }: { item: Application }) {
|
||||
const urls = getPublishedUrls(item);
|
||||
|
||||
if (urls.length === 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="published-url-container">
|
||||
<div>
|
||||
<div className="text-muted"> Published URL(s) </div>
|
||||
</div>
|
||||
<div>
|
||||
{urls.map((url) => (
|
||||
<div key={url}>
|
||||
<a
|
||||
href={url}
|
||||
target="_blank"
|
||||
className="publish-url-link vertical-center"
|
||||
rel="noreferrer"
|
||||
>
|
||||
<Icon icon={ExternalLinkIcon} />
|
||||
{url}
|
||||
</a>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export function getPublishedUrls(item: Application) {
|
||||
// Map all ingress rules in published ports to their respective URLs
|
||||
const ingressUrls =
|
||||
item.PublishedPorts?.flatMap((pp) => pp.IngressRules)
|
||||
.filter(({ Host, IP }) => Host || IP)
|
||||
.map(({ Host, IP, Path, TLS }) => {
|
||||
const scheme =
|
||||
TLS &&
|
||||
TLS.filter((tls) => tls.hosts && tls.hosts.includes(Host)).length > 0
|
||||
? 'https'
|
||||
: 'http';
|
||||
return `${scheme}://${Host || IP}${Path}`;
|
||||
}) || [];
|
||||
|
||||
// Map all load balancer service ports to ip address
|
||||
const loadBalancerURLs =
|
||||
(item.LoadBalancerIPAddress &&
|
||||
item.PublishedPorts?.map(
|
||||
(pp) =>
|
||||
`${getSchemeFromPort(pp.Port)}://${item.LoadBalancerIPAddress}:${
|
||||
pp.Port
|
||||
}`
|
||||
)) ||
|
||||
[];
|
||||
|
||||
// combine ingress urls
|
||||
const publishedUrls = [...ingressUrls, ...loadBalancerURLs];
|
||||
|
||||
// Return the first URL - priority given to ingress urls, then services (load balancers)
|
||||
return publishedUrls.length > 0 ? publishedUrls : [];
|
||||
}
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
import { useState } from 'react';
|
||||
import { EyeIcon, EyeOffIcon } from 'lucide-react';
|
||||
|
||||
import { RestrictedSecretBadge } from '@/react/kubernetes/configs/RestrictedSecretBadge';
|
||||
|
||||
import { Button, CopyButton } from '@@/buttons';
|
||||
|
||||
import styles from './SensitiveDetails.module.css';
|
||||
|
||||
export function SensitiveDetails({
|
||||
name,
|
||||
value,
|
||||
canSeeValue,
|
||||
}: {
|
||||
name: string;
|
||||
value: string;
|
||||
canSeeValue?: boolean;
|
||||
}) {
|
||||
return (
|
||||
<div className={styles.sensitiveDetailsContainer}>
|
||||
<div className="text-wrap">{name}</div>
|
||||
{canSeeValue ? (
|
||||
<>
|
||||
<ShowHide value={value} useAsterisk />
|
||||
<CopyButton copyText={value} data-cy="copy-button" />
|
||||
</>
|
||||
) : (
|
||||
<RestrictedSecretBadge />
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function ShowHide({
|
||||
value,
|
||||
useAsterisk,
|
||||
}: {
|
||||
value: string;
|
||||
useAsterisk: boolean;
|
||||
}) {
|
||||
const [show, setShow] = useState(false);
|
||||
|
||||
return (
|
||||
<div className={styles.showHideContainer}>
|
||||
<div className="small text-muted text-wrap">
|
||||
{show ? value : useAsterisk && '********'}
|
||||
</div>
|
||||
|
||||
<Button
|
||||
color="link"
|
||||
type="button"
|
||||
onClick={() => setShow((show) => !show)}
|
||||
title="Show/Hide value"
|
||||
icon={show ? EyeIcon : EyeOffIcon}
|
||||
data-cy="show-hide-button"
|
||||
>
|
||||
{show ? 'Hide' : 'Show'}
|
||||
</Button>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
import clsx from 'clsx';
|
||||
|
||||
import { useCurrentUser } from '@/react/hooks/useUser';
|
||||
|
||||
import { ConfigurationDetails } from './ConfigurationDetails';
|
||||
import { InnerTable } from './InnerTable';
|
||||
import { PublishedPorts } from './PublishedPorts';
|
||||
import { Application } from './types';
|
||||
|
||||
export function SubRow({
|
||||
item,
|
||||
hideStacks,
|
||||
areSecretsRestricted,
|
||||
}: {
|
||||
item: Application;
|
||||
hideStacks: boolean;
|
||||
areSecretsRestricted: boolean;
|
||||
}) {
|
||||
const {
|
||||
user: { Username: username },
|
||||
} = useCurrentUser();
|
||||
|
||||
return (
|
||||
<tr className={clsx({ 'secondary-body': !item.KubernetesApplications })}>
|
||||
<td />
|
||||
<td colSpan={8} className="datatable-padding-vertical">
|
||||
{item.KubernetesApplications ? (
|
||||
<InnerTable
|
||||
dataset={item.KubernetesApplications}
|
||||
hideStacks={hideStacks}
|
||||
/>
|
||||
) : (
|
||||
<>
|
||||
<PublishedPorts item={item} />
|
||||
<ConfigurationDetails
|
||||
item={item}
|
||||
areSecretsRestricted={areSecretsRestricted}
|
||||
username={username}
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
import { createColumnHelper } from '@tanstack/react-table';
|
||||
|
||||
import { Application } from './types';
|
||||
|
||||
export const helper = createColumnHelper<Application>();
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
import { CellContext } from '@tanstack/react-table';
|
||||
|
||||
import { useIsSystemNamespace } from '@/react/kubernetes/namespaces/queries/useIsSystemNamespace';
|
||||
|
||||
import { Link } from '@@/Link';
|
||||
import { SystemBadge } from '@@/Badge/SystemBadge';
|
||||
import { ExternalBadge } from '@@/Badge/ExternalBadge';
|
||||
|
||||
import { helper } from './columns.helper';
|
||||
import { Application } from './types';
|
||||
|
||||
export const name = helper.accessor('Name', {
|
||||
header: 'Name',
|
||||
cell: Cell,
|
||||
});
|
||||
|
||||
function Cell({ row: { original: item } }: CellContext<Application, string>) {
|
||||
const isSystem = useIsSystemNamespace(item.ResourcePool);
|
||||
|
||||
return (
|
||||
<div className="flex items-center gap-2">
|
||||
{item.KubernetesApplications ? (
|
||||
<Link
|
||||
data-cy="application-helm-link"
|
||||
to="kubernetes.helm"
|
||||
params={{ name: item.Name, namespace: item.ResourcePool }}
|
||||
>
|
||||
{item.Name}
|
||||
</Link>
|
||||
) : (
|
||||
<Link
|
||||
data-cy="application-link"
|
||||
to="kubernetes.applications.application"
|
||||
params={{
|
||||
name: item.Name,
|
||||
namespace: item.ResourcePool,
|
||||
'resource-type': item.ApplicationType,
|
||||
}}
|
||||
>
|
||||
{item.Name}
|
||||
</Link>
|
||||
)}
|
||||
|
||||
{isSystem ? <SystemBadge /> : !item.ApplicationOwner && <ExternalBadge />}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
@ -8,6 +8,6 @@
|
|||
display: inline-block;
|
||||
}
|
||||
|
||||
.ok {
|
||||
.status-indicator.ok {
|
||||
background-color: var(--green-3);
|
||||
}
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
import { CellContext } from '@tanstack/react-table';
|
||||
import clsx from 'clsx';
|
||||
|
||||
import {
|
||||
KubernetesApplicationDeploymentTypes,
|
||||
KubernetesApplicationTypes,
|
||||
} from '@/kubernetes/models/application/models/appConstants';
|
||||
|
||||
import styles from './columns.status.module.css';
|
||||
import { helper } from './columns.helper';
|
||||
import { Application } from './types';
|
||||
|
||||
export const status = helper.accessor('Status', {
|
||||
header: 'Status',
|
||||
cell: Cell,
|
||||
enableSorting: false,
|
||||
});
|
||||
|
||||
function Cell({ row: { original: item } }: CellContext<Application, string>) {
|
||||
if (
|
||||
item.ApplicationType === KubernetesApplicationTypes.Pod &&
|
||||
item.Pods &&
|
||||
item.Pods.length > 0
|
||||
) {
|
||||
return item.Pods[0].Status;
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<span
|
||||
className={clsx([
|
||||
styles.statusIndicator,
|
||||
{
|
||||
[styles.ok]:
|
||||
(item.TotalPodsCount > 0 &&
|
||||
item.TotalPodsCount === item.RunningPodsCount) ||
|
||||
item.Status === 'Ready',
|
||||
},
|
||||
])}
|
||||
/>
|
||||
{item.DeploymentType ===
|
||||
KubernetesApplicationDeploymentTypes.Replicated && (
|
||||
<span>Replicated</span>
|
||||
)}
|
||||
{item.DeploymentType === KubernetesApplicationDeploymentTypes.Global && (
|
||||
<span>Global</span>
|
||||
)}
|
||||
{item.RunningPodsCount >= 0 && item.TotalPodsCount >= 0 && (
|
||||
<span>
|
||||
<code aria-label="Running Pods" title="Running Pods">
|
||||
{item.RunningPodsCount}
|
||||
</code>{' '}
|
||||
/{' '}
|
||||
<code aria-label="Total Pods" title="Total Pods">
|
||||
{item.TotalPodsCount}
|
||||
</code>
|
||||
</span>
|
||||
)}
|
||||
{item.KubernetesApplications && <span>{item.Status}</span>}
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
import { isoDate, truncate } from '@/portainer/filters/filters';
|
||||
|
||||
import { helper } from './columns.helper';
|
||||
|
||||
export const stackName = helper.accessor('StackName', {
|
||||
header: 'Stack',
|
||||
cell: ({ getValue }) => getValue() || '-',
|
||||
});
|
||||
|
||||
export const namespace = helper.accessor('ResourcePool', {
|
||||
header: 'Namespace',
|
||||
cell: ({ getValue }) => getValue() || '-',
|
||||
});
|
||||
|
||||
export const image = helper.accessor('Image', {
|
||||
header: 'Image',
|
||||
cell: ({ row: { original: item } }) => (
|
||||
<>
|
||||
{truncate(item.Image, 64)}
|
||||
{item.Containers && item.Containers?.length > 1 && (
|
||||
<>+ {item.Containers.length - 1}</>
|
||||
)}
|
||||
</>
|
||||
),
|
||||
});
|
||||
|
||||
export const appType = helper.accessor('ApplicationType', {
|
||||
header: 'Application Type',
|
||||
});
|
||||
|
||||
export const published = helper.accessor('Services', {
|
||||
header: 'Published',
|
||||
cell: ({ row: { original: item } }) =>
|
||||
item.Services?.length === 0 ? 'No' : 'Yes',
|
||||
enableSorting: false,
|
||||
});
|
||||
|
||||
export const created = helper.accessor('CreationDate', {
|
||||
header: 'Created',
|
||||
cell({ row: { original: item } }) {
|
||||
return (
|
||||
<>
|
||||
{isoDate(item.CreationDate)}{' '}
|
||||
{item.ApplicationOwner ? ` by ${item.ApplicationOwner}` : ''}
|
||||
</>
|
||||
);
|
||||
},
|
||||
});
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
import { AppType, DeploymentType } from '../../types';
|
||||
|
||||
export interface Application {
|
||||
Id: string;
|
||||
Name: string;
|
||||
Image: string;
|
||||
Containers?: Array<unknown>;
|
||||
Services?: Array<unknown>;
|
||||
CreationDate: string;
|
||||
ApplicationOwner?: string;
|
||||
StackName?: string;
|
||||
ResourcePool: string;
|
||||
ApplicationType: AppType;
|
||||
KubernetesApplications?: Array<Application>;
|
||||
Metadata?: {
|
||||
labels: Record<string, string>;
|
||||
};
|
||||
Status: 'Ready' | string;
|
||||
TotalPodsCount: number;
|
||||
RunningPodsCount: number;
|
||||
DeploymentType: DeploymentType;
|
||||
Pods?: Array<{
|
||||
Status: string;
|
||||
}>;
|
||||
Configurations?: Array<{
|
||||
Data?: object;
|
||||
Kind: ConfigKind;
|
||||
ConfigurationOwner: string;
|
||||
}>;
|
||||
LoadBalancerIPAddress?: string;
|
||||
PublishedPorts?: Array<{
|
||||
IngressRules: Array<{
|
||||
Host: string;
|
||||
IP: string;
|
||||
Path: string;
|
||||
TLS: Array<{
|
||||
hosts: Array<string>;
|
||||
}>;
|
||||
}>;
|
||||
Port: number;
|
||||
}>;
|
||||
}
|
||||
|
||||
export enum ConfigKind {
|
||||
ConfigMap = 1,
|
||||
Secret,
|
||||
}
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
import _ from 'lodash';
|
||||
|
||||
import { buildExpandColumn } from '@@/datatables/expand-column';
|
||||
|
||||
import { name } from './columns.name';
|
||||
import { status } from './columns.status';
|
||||
import {
|
||||
appType,
|
||||
created,
|
||||
image,
|
||||
namespace,
|
||||
published,
|
||||
stackName,
|
||||
} from './columns';
|
||||
import { Application } from './types';
|
||||
|
||||
export function useColumns(hideStacks: boolean) {
|
||||
const baseColumns = useBaseColumns(hideStacks);
|
||||
|
||||
return _.compact([buildExpandColumn<Application>(), ...baseColumns]);
|
||||
}
|
||||
|
||||
export function useBaseColumns(hideStacks: boolean) {
|
||||
return _.compact([
|
||||
name,
|
||||
!hideStacks && stackName,
|
||||
namespace,
|
||||
image,
|
||||
appType,
|
||||
status,
|
||||
published,
|
||||
created,
|
||||
]);
|
||||
}
|
||||
|
|
@ -47,10 +47,11 @@ export function ApplicationsStacksDatatable({
|
|||
}: Props) {
|
||||
const tableState = useTableState(settingsStore, storageKey);
|
||||
|
||||
const { setShowSystemResources } = tableState;
|
||||
|
||||
useEffect(() => {
|
||||
tableState.setShowSystemResources(showSystem || false);
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [showSystem]);
|
||||
setShowSystemResources(showSystem || false);
|
||||
}, [showSystem, setShowSystemResources]);
|
||||
|
||||
const { authorized } = useAuthorizations('K8sApplicationsW');
|
||||
useRepeater(tableState.autoRefreshRate, onRefresh);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
import { Badge } from '@@/Badge';
|
||||
import { TooltipWithChildren } from '@@/Tip/TooltipWithChildren';
|
||||
|
||||
export function RestrictedSecretBadge() {
|
||||
return (
|
||||
<TooltipWithChildren message="You can only view details of secrets you've created yourself in Portainer">
|
||||
<div className="min-w-min">
|
||||
<Badge type="warn">Restricted</Badge>
|
||||
</div>
|
||||
</TooltipWithChildren>
|
||||
);
|
||||
}
|
||||
|
|
@ -16,14 +16,19 @@ export interface TableSettings
|
|||
|
||||
export function DefaultDatatableSettings({
|
||||
settings,
|
||||
onShowSystemChange,
|
||||
}: {
|
||||
settings: TableSettings;
|
||||
onShowSystemChange?(showSystem: boolean): void;
|
||||
}) {
|
||||
return (
|
||||
<>
|
||||
<SystemResourcesSettings
|
||||
value={settings.showSystemResources}
|
||||
onChange={(value) => settings.setShowSystemResources(value)}
|
||||
onChange={(value) => {
|
||||
settings.setShowSystemResources(value);
|
||||
onShowSystemChange?.(value);
|
||||
}}
|
||||
/>
|
||||
|
||||
<TableSettingsMenuAutoRefresh
|
||||
|
|
|
|||
|
|
@ -1,18 +1,36 @@
|
|||
import { refreshableSettings, createPersistedStore } from '@@/datatables/types';
|
||||
import { useState } from 'react';
|
||||
|
||||
import {
|
||||
refreshableSettings,
|
||||
createPersistedStore,
|
||||
ZustandSetFunc,
|
||||
} from '@@/datatables/types';
|
||||
import { useTableState } from '@@/datatables/useTableState';
|
||||
|
||||
import { TableSettings } from './DefaultDatatableSettings';
|
||||
import { systemResourcesSettings } from './SystemResourcesSettings';
|
||||
|
||||
export function createStore(
|
||||
export function createStore<T extends TableSettings>(
|
||||
storageKey: string,
|
||||
initialSortBy: string | { id: string; desc: boolean } = 'name'
|
||||
initialSortBy?: string | { id: string; desc: boolean },
|
||||
create: (set: ZustandSetFunc<T>) => Omit<T, keyof TableSettings> = () =>
|
||||
({}) as T
|
||||
) {
|
||||
return createPersistedStore<TableSettings>(
|
||||
return createPersistedStore<T>(
|
||||
storageKey,
|
||||
initialSortBy,
|
||||
(set) => ({
|
||||
...refreshableSettings(set),
|
||||
...systemResourcesSettings(set),
|
||||
})
|
||||
(set) =>
|
||||
({
|
||||
...refreshableSettings(set),
|
||||
...systemResourcesSettings(set),
|
||||
...create(set),
|
||||
}) as T
|
||||
);
|
||||
}
|
||||
|
||||
export function useKubeStore<T extends TableSettings>(
|
||||
...args: Parameters<typeof createStore<T>>
|
||||
) {
|
||||
const [store] = useState(() => createStore(...args));
|
||||
return useTableState(store, args[0]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@ export interface KubernetesConfiguration {
|
|||
EnableResourceOverCommit?: boolean;
|
||||
ResourceOverCommitPercentage?: number;
|
||||
RestrictDefaultNamespace?: boolean;
|
||||
RestrictSecrets?: boolean;
|
||||
RestrictStandardUserIngressW?: boolean;
|
||||
IngressClasses: IngressClass[];
|
||||
IngressAvailabilityPerNamespace: boolean;
|
||||
|
|
|
|||
Loading…
Reference in New Issue