feat(app): migrate app containers to react [EE-5353] (#9992)

pull/10077/head
Ali 2023-08-17 22:00:25 +12:00 committed by GitHub
parent 6290e9facc
commit 23295d2736
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 312 additions and 297 deletions

View File

@ -1,209 +0,0 @@
<div class="datatable">
<rd-widget>
<rd-widget-body classes="no-padding">
<div class="toolBar">
<div class="toolBarTitle flex">
<div class="widget-icon space-right">
<pr-icon icon="'server'"></pr-icon>
</div>
<span>
{{ $ctrl.titleText }}
</span>
</div>
<div class="searchBar">
<pr-icon icon="'search'" class="vertical-center" size="'sm'"></pr-icon>
<input
type="text"
class="searchInput ml-1"
ng-model="$ctrl.state.textFilter"
ng-change="$ctrl.onTextFilterChange()"
placeholder="Search for an application..."
ng-model-options="{ debounce: 300 }"
/>
</div>
<div ng-if="$ctrl.refreshCallback" class="settings">
<span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
<span uib-dropdown-toggle><pr-icon icon="'more-vertical'"></pr-icon></span>
<div class="dropdown-menu dropdown-menu-right" uib-dropdown-menu>
<div class="tableMenu">
<div class="menuHeader"> Table settings </div>
<div class="menuContent">
<div>
<div class="md-checkbox">
<input id="setting_auto_refresh" type="checkbox" ng-model="$ctrl.settings.repeater.autoRefresh" ng-change="$ctrl.onSettingsRepeaterChange()" />
<label for="setting_auto_refresh">Auto refresh</label>
</div>
<div ng-if="$ctrl.settings.repeater.autoRefresh">
<label for="settings_refresh_rate"> Refresh rate </label>
<select id="settings_refresh_rate" ng-model="$ctrl.settings.repeater.refreshRate" ng-change="$ctrl.onSettingsRepeaterChange()" class="small-select">
<option value="10">10s</option>
<option value="30">30s</option>
<option value="60">1min</option>
<option value="120">2min</option>
<option value="300">5min</option>
</select>
<span>
<pr-icon id="refreshRateChange" style="display: none" icon="'check'" mode="'success'"></pr-icon>
</span>
</div>
</div>
</div>
<div>
<a type="button" class="btn btn-default btn-sm" ng-click="$ctrl.settings.open = false;">Close</a>
</div>
</div>
</div>
</span>
</div>
</div>
<div class="table-responsive">
<table class="table-hover nowrap-cells table" data-cy="k8sAppDetail-containerTable">
<thead>
<tr>
<th ng-if="!$ctrl.isPod">
<table-column-header
col-title="'Pod'"
can-sort="true"
is-sorted="$ctrl.state.orderBy === 'PodName'"
is-sorted-desc="$ctrl.state.orderBy === 'PodName' && $ctrl.state.reverseOrder"
ng-click="$ctrl.changeOrderBy('PodName')"
></table-column-header>
</th>
<th>
<table-column-header
col-title="'Name'"
can-sort="true"
is-sorted="$ctrl.state.orderBy === 'Name'"
is-sorted-desc="$ctrl.state.orderBy === 'Name' && $ctrl.state.reverseOrder"
ng-click="$ctrl.changeOrderBy('Name')"
></table-column-header>
</th>
<th>
<table-column-header
col-title="'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>
<table-column-header
col-title="'Image Pull Policy'"
can-sort="true"
is-sorted="$ctrl.state.orderBy === 'ImagePullPolicy'"
is-sorted-desc="$ctrl.state.orderBy === 'ImagePullPolicy' && $ctrl.state.reverseOrder"
ng-click="$ctrl.changeOrderBy('ImagePullPolicy')"
></table-column-header>
</th>
<th>
<table-column-header
col-title="'Status'"
can-sort="true"
is-sorted="$ctrl.state.orderBy === 'Status'"
is-sorted-desc="$ctrl.state.orderBy === 'Status' && $ctrl.state.reverseOrder"
ng-click="$ctrl.changeOrderBy('Status')"
></table-column-header>
</th>
<th>
<table-column-header
col-title="'Node'"
can-sort="true"
is-sorted="$ctrl.state.orderBy === 'Node'"
is-sorted-desc="$ctrl.state.orderBy === 'Node' && $ctrl.state.reverseOrder"
ng-click="$ctrl.changeOrderBy('Node')"
></table-column-header>
</th>
<th>
<table-column-header
col-title="'Pod IP'"
can-sort="true"
is-sorted="$ctrl.state.orderBy === 'IP'"
is-sorted-desc="$ctrl.state.orderBy === 'IP' && $ctrl.state.reverseOrder"
ng-click="$ctrl.changeOrderBy('IP')"
></table-column-header>
</th>
<th>
<table-column-header
col-title="'Creation date'"
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>
<th>Actions</th>
</tr>
</thead>
<tbody>
<tr
dir-paginate="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit: $ctrl.tableKey))"
pagination-id="$ctrl.tableKey"
>
<td ng-if="!$ctrl.isPod">{{ item.PodName }}</td>
<td>{{ item.Name }}</td>
<td title="{{ item.Image }}">{{ item.Image | truncate : 64 }}</td>
<td>{{ item.ImagePullPolicy }}</td>
<td
><span class="label label-{{ item.Status | kubernetesPodStatusColor }}">{{ item.Status }}</span></td
>
<td>
<span ng-if="item.Node">
<a ui-sref="kubernetes.cluster.node({ name: item.Node })">
{{ item.Node }}
</a>
</span>
<span ng-if="!item.Node">-</span>
</td>
<td>{{ item.PodIP }}</td>
<td>{{ item.CreationDate | getisodate }}</td>
<td>
<a
ng-if="item.Status === 'Running' && $ctrl.useServerMetrics"
ui-sref="kubernetes.applications.application.stats({ pod: item.PodName, container: item.Name })"
class="vertical-center mr-1"
>
<pr-icon icon="'bar-chart'"></pr-icon>Stats
</a>
<a ui-sref="kubernetes.applications.application.logs({ pod: item.PodName, container: item.Name })" class="vertical-center mr-1">
<pr-icon icon="'file-text'"></pr-icon>Logs
</a>
<a
ng-if="item.Status === 'Running'"
ui-sref="kubernetes.applications.application.console({ pod: item.PodName, container: item.Name })"
class="vertical-center mr-1"
>
<pr-icon icon="'terminal'"></pr-icon>Console
</a>
</td>
</tr>
<tr ng-if="!$ctrl.dataset">
<td colspan="7" class="text-muted text-center">Loading...</td>
</tr>
<tr ng-if="$ctrl.state.filteredDataSet.length === 0">
<td colspan="7" class="text-muted text-center">No pod available.</td>
</tr>
</tbody>
</table>
</div>
<div class="footer" ng-if="$ctrl.dataset">
<div class="infoBar" ng-if="$ctrl.state.selectedItemCount !== 0"> {{ $ctrl.state.selectedItemCount }} item(s) selected </div>
<div class="paginationControls">
<form class="form-inline">
<span class="limitSelector">
<span style="margin-right: 5px"> Items per page </span>
<select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
<option value="0">All</option>
<option value="10">10</option>
<option value="25">25</option>
<option value="50">50</option>
<option value="100">100</option>
</select>
</span>
<dir-pagination-controls max-size="5" pagination-id="$ctrl.tableKey"></dir-pagination-controls>
</form>
</div>
</div>
</rd-widget-body>
</rd-widget>
</div>

View File

@ -1,14 +0,0 @@
angular.module('portainer.kubernetes').component('kubernetesContainersDatatable', {
templateUrl: './containersDatatable.html',
controller: 'GenericDatatableController',
bindings: {
titleText: '@',
titleIcon: '@',
dataset: '<',
tableKey: '@',
orderBy: '@',
refreshCallback: '<',
isPod: '<',
useServerMetrics: '<',
},
});

View File

@ -76,12 +76,6 @@ class KubernetesApplicationHelper {
return containers;
}
static associateAllContainersAndApplication(app) {
const containers = _.flatMap(_.map(app.Pods, 'Containers'));
KubernetesApplicationHelper.associateContainerPersistedFoldersAndConfigurations(app, containers);
return containers;
}
static portMappingsFromApplications(applications) {
const res = _.reduce(
applications,

View File

@ -1,52 +0,0 @@
import _ from 'lodash-es';
angular
.module('portainer.kubernetes')
.filter('kubernetesPodStatusColor', function () {
'use strict';
return function (text) {
var status = _.toLower(text);
switch (status) {
case 'running':
return 'success';
case 'waiting':
return 'warning';
case 'terminated':
return 'info';
default:
return 'danger';
}
};
})
.filter('kubernetesPodConditionStatusText', function () {
'use strict';
return function (status, type) {
switch (type) {
case 'Unschedulable':
switch (status) {
case 'True':
return 'Alert';
case 'False':
return 'OK';
case 'Unknown':
return 'Warning';
}
break;
case 'PodScheduled':
case 'Ready':
case 'Initialized':
case 'ContainersReady':
switch (status) {
case 'True':
return 'Ok';
case 'False':
return 'Alert';
case 'Unknown':
return 'Warning';
}
break;
default:
return 'Unknown';
}
};
});

View File

@ -17,6 +17,7 @@ import {
ApplicationDetailsWidget,
ApplicationEventsDatatable,
} from '@/react/kubernetes/applications/DetailsView';
import { ApplicationContainersDatatable } from '@/react/kubernetes/applications/DetailsView/ApplicationContainersDatatable';
import { withFormValidation } from '@/react-tools/withFormValidation';
import { withCurrentUser } from '@/react-tools/withCurrentUser';
import { PlacementsDatatable } from '@/react/kubernetes/applications/ItemView/PlacementsDatatable';
@ -102,6 +103,15 @@ export const ngModule = angular
[]
)
)
.component(
'applicationContainersDatatable',
r2a(
withUIRouter(
withReactQuery(withCurrentUser(ApplicationContainersDatatable))
),
[]
)
)
.component(
'applicationDetailsWidget',
r2a(

View File

@ -78,17 +78,6 @@
</div>
<div class="row">
<div class="col-sm-12">
<kubernetes-containers-datatable
title-text="Application containers"
title-icon="server"
dataset="ctrl.allContainers"
table-key="kubernetes.application.containers"
is-pod="ctrl.application.ApplicationType === ctrl.KubernetesApplicationTypes.POD"
order-by="{{ ctrl.application.ApplicationType === ctrl.KubernetesApplicationTypes.POD ? 'Name' : 'PodName' }}"
use-server-metrics="ctrl.state.useServerMetrics"
>
</kubernetes-containers-datatable>
</div>
<application-containers-datatable />
</div>
</div>

View File

@ -10,7 +10,6 @@ import {
KubernetesDeploymentTypes,
} from 'Kubernetes/models/application/models';
import KubernetesEventHelper from 'Kubernetes/helpers/eventHelper';
import KubernetesApplicationHelper from 'Kubernetes/helpers/application';
import { KubernetesServiceTypes } from 'Kubernetes/models/service/models';
import { KubernetesPodNodeAffinityNodeSelectorRequirementOperators } from 'Kubernetes/pod/models';
import { KubernetesPodContainerTypes } from 'Kubernetes/pod/models/index';
@ -199,7 +198,6 @@ class KubernetesApplicationController {
this.KubernetesNodeService.get(),
]);
this.application = application;
this.allContainers = KubernetesApplicationHelper.associateAllContainersAndApplication(application);
this.placements = computePlacements(nodes, this.application);
this.state.placementWarning = _.find(this.placements, { AcceptsApplication: true }) ? false : true;
@ -238,7 +236,6 @@ class KubernetesApplicationController {
eventWarningCount: 0,
placementWarning: false,
expandedNote: false,
useServerMetrics: this.endpoint.Kubernetes.Configuration.UseServerMetrics,
publicUrl: this.endpoint.PublicURL,
};

View File

@ -25,7 +25,7 @@ export function DatatableContent<D extends Record<string, unknown>>({
const pageRowModel = tableInstance.getPaginationRowModel();
return (
<Table data-cy={dataCy}>
<Table data-cy={dataCy} className="nowrap-cells">
<thead>
{headerGroups.map((headerGroup) => (
<Table.HeaderRow<D>

View File

@ -0,0 +1,111 @@
import { Server } from 'lucide-react';
import { useCurrentStateAndParams } from '@uirouter/react';
import { useMemo } from 'react';
import { ContainerStatus, Pod } from 'kubernetes-types/core/v1';
import { IndexOptional } from '@/react/kubernetes/configs/types';
import { createStore } from '@/react/kubernetes/datatables/default-kube-datatable-store';
import { useEnvironment } from '@/react/portainer/environments/queries';
import { Datatable } from '@@/datatables';
import { useTableState } from '@@/datatables/useTableState';
import { useApplication, useApplicationPods } from '../../application.queries';
import { ContainerRowData } from './types';
import { getColumns } from './columns';
const storageKey = 'k8sContainersDatatable';
const settingsStore = createStore(storageKey);
export function ApplicationContainersDatatable() {
const tableState = useTableState(settingsStore, storageKey);
const {
params: {
endpointId: environmentId,
name,
namespace,
'resource-type': resourceType,
},
} = useCurrentStateAndParams();
// get the containers from the aapplication pods
const { data: application, ...applicationQuery } = useApplication(
environmentId,
namespace,
name,
resourceType
);
const { data: pods, ...podsQuery } = useApplicationPods(
environmentId,
namespace,
name,
application
);
const appContainers = useContainersRowData(pods);
const { data: isServerMetricsEnabled } = useEnvironment(
environmentId,
(environment) => !!environment?.Kubernetes?.Configuration.UseServerMetrics
);
return (
<Datatable<IndexOptional<ContainerRowData>>
dataset={appContainers}
columns={getColumns(!!isServerMetricsEnabled)}
settingsManager={tableState}
isLoading={applicationQuery.isLoading || podsQuery.isLoading}
emptyContentLabel="No containers found"
title="Application containers"
titleIcon={Server}
getRowId={(row) => row.name}
disableSelect
/>
);
}
// useContainersRowData row data gets the pod.spec?.containers and pod.spec?.initContainers from an array of pods
// it then appends the podName, nodeName, podId, creationDate, and status to each container
function useContainersRowData(pods?: Pod[]): ContainerRowData[] {
return (
useMemo(
() =>
pods?.flatMap((pod) => {
const containers = [
...(pod.spec?.containers || []),
...(pod.spec?.initContainers || []),
];
return containers.map((container) => ({
...container,
podName: pod.metadata?.name ?? '',
nodeName: pod.spec?.nodeName ?? '',
podIp: pod.status?.podIP ?? '',
creationDate: pod.status?.startTime ?? '',
status: computeContainerStatus(
container.name,
pod.status?.containerStatuses
),
}));
}) || [],
[pods]
) || []
);
}
function computeContainerStatus(
containerName: string,
statuses?: ContainerStatus[]
) {
const status = statuses?.find((status) => status.name === containerName);
if (!status) {
return 'Terminated';
}
const { state } = status;
if (state?.waiting) {
return 'Waiting';
}
if (!state?.running) {
return 'Terminated';
}
return 'Running';
}

View File

@ -0,0 +1,49 @@
import { BarChart, FileText, Terminal } from 'lucide-react';
import { Authorized } from '@/react/hooks/useUser';
import { Link } from '@@/Link';
import { Icon } from '@@/Icon';
import { columnHelper } from './helper';
export function getActions(isServerMetricsEnabled: boolean) {
return columnHelper.accessor(() => '', {
header: 'Actions',
enableSorting: false,
cell: ({ row: { original: container } }) => (
<div className="flex gap-x-2">
{container.status === 'Running' && isServerMetricsEnabled && (
<Link
className="flex items-center gap-1"
to="kubernetes.applications.application.stats"
params={{ pod: container.podName, container: container.name }}
>
<Icon icon={BarChart} />
Stats
</Link>
)}
<Link
className="flex items-center gap-1"
to="kubernetes.applications.application.logs"
params={{ pod: container.podName, container: container.name }}
>
<Icon icon={FileText} />
Logs
</Link>
{container.status === 'Running' && (
<Authorized authorizations="K8sApplicationConsoleRW">
<Link
className="flex items-center gap-1"
to="kubernetes.applications.application.console"
params={{ pod: container.podName, container: container.name }}
>
<Icon icon={Terminal} />
Console
</Link>
</Authorized>
)}
</div>
),
});
}

View File

@ -0,0 +1,11 @@
import { formatDate } from '@/portainer/filters/filters';
import { columnHelper } from './helper';
export const creationDate = columnHelper.accessor(
(row) => formatDate(row.creationDate),
{
header: 'Creation Date',
cell: ({ getValue }) => getValue(),
}
);

View File

@ -0,0 +1,5 @@
import { createColumnHelper } from '@tanstack/react-table';
import { ContainerRowData } from '../types';
export const columnHelper = createColumnHelper<ContainerRowData>();

View File

@ -0,0 +1,10 @@
import { columnHelper } from './helper';
export const image = columnHelper.accessor('image', {
header: 'Image',
cell: ({ getValue }) => (
<div className="max-w-xs truncate" title={getValue()}>
{getValue()}
</div>
),
});

View File

@ -0,0 +1,6 @@
import { columnHelper } from './helper';
export const imagePullPolicy = columnHelper.accessor('imagePullPolicy', {
header: 'Image Pull Policy',
id: 'imagePullPolicy',
});

View File

@ -0,0 +1,23 @@
import { pod } from './pod';
import { name } from './name';
import { image } from './image';
import { imagePullPolicy } from './imagePullPolicy';
import { status } from './status';
import { node } from './node';
import { podIp } from './podIp';
import { creationDate } from './creationDate';
import { getActions } from './actions';
export function getColumns(isServerMetricsEnabled: boolean) {
return [
pod,
name,
image,
imagePullPolicy,
status,
node,
podIp,
creationDate,
getActions(isServerMetricsEnabled),
];
}

View File

@ -0,0 +1,6 @@
import { columnHelper } from './helper';
export const name = columnHelper.accessor('name', {
header: 'Name',
id: 'name',
});

View File

@ -0,0 +1,24 @@
import { Authorized } from '@/react/hooks/useUser';
import { Link } from '@@/Link';
import { columnHelper } from './helper';
export const node = columnHelper.accessor('nodeName', {
header: 'Node',
cell: ({ getValue }) => {
const nodeName = getValue();
return (
<Authorized
authorizations="K8sClusterNodeR"
childrenUnauthorized={nodeName}
>
<Link to="kubernetes.cluster.node" params={{ nodeName }}>
<div className="max-w-xs truncate" title={nodeName}>
{nodeName}
</div>
</Link>
</Authorized>
);
},
});

View File

@ -0,0 +1,10 @@
import { columnHelper } from './helper';
export const pod = columnHelper.accessor('podName', {
header: 'Pod',
cell: ({ getValue }) => (
<div className="max-w-xs truncate" title={getValue()}>
{getValue()}
</div>
),
});

View File

@ -0,0 +1,6 @@
import { columnHelper } from './helper';
export const podIp = columnHelper.accessor('podIp', {
header: 'Pod IP',
id: 'podIp',
});

View File

@ -0,0 +1,29 @@
import { CellContext } from '@tanstack/react-table';
import { Badge, BadgeType } from '@@/Badge';
import { ContainerRowData } from '../types';
import { columnHelper } from './helper';
export const status = columnHelper.accessor('status', {
header: 'Status',
cell: StatusCell,
});
function StatusCell({ getValue }: CellContext<ContainerRowData, string>) {
return <Badge type={getContainerStatusType(getValue())}>{getValue()}</Badge>;
}
function getContainerStatusType(status: string): BadgeType {
switch (status.toLowerCase()) {
case 'running':
return 'success';
case 'waiting':
return 'warn';
case 'terminated':
return 'info';
default:
return 'danger';
}
}

View File

@ -0,0 +1 @@
export { ApplicationContainersDatatable } from './ApplicationContainersDatatable';

View File

@ -0,0 +1,9 @@
import { Container } from 'kubernetes-types/core/v1';
export interface ContainerRowData extends Container {
podName: string;
nodeName: string;
podIp: string;
creationDate: string;
status: string;
}