refactor(edge/stacks): migrate list view to react [EE-2237] (#9186)
Chaim Lev-Ari
GitHub
parent
020ecb740a
commit
a216a1e960
|
|
@ -1,173 +0,0 @@
|
|||
<div class="datatable">
|
||||
<rd-widget>
|
||||
<rd-widget-body classes="no-padding">
|
||||
<div class="toolBar">
|
||||
<div class="toolBarTitle vertical-center"> <pr-icon icon="$ctrl.titleIcon"></pr-icon> Edge Stacks </div>
|
||||
<div class="searchBar vertical-center">
|
||||
<pr-icon icon="'search'" class-name="'icon'"></pr-icon>
|
||||
<input
|
||||
type="text"
|
||||
class="searchInput"
|
||||
ng-model="$ctrl.state.textFilter"
|
||||
ng-change="$ctrl.onTextFilterChange()"
|
||||
placeholder="Search..."
|
||||
auto-focus
|
||||
ng-model-options="{ debounce: 300 }"
|
||||
/>
|
||||
</div>
|
||||
<div class="actionBar">
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-sm btn-danger"
|
||||
ng-disabled="$ctrl.state.selectedItemCount === 0"
|
||||
ng-click="$ctrl.removeAction($ctrl.state.selectedItems)"
|
||||
data-cy="edgeStack-removeStackButton"
|
||||
>
|
||||
<pr-icon icon="'trash-2'"></pr-icon> Remove
|
||||
</button>
|
||||
<button type="button" class="btn btn-sm btn-primary" ui-sref="edge.stacks.new" data-cy="edgeStack-addStackButton"> <pr-icon icon="'plus'"></pr-icon> Add stack </button>
|
||||
</div>
|
||||
<div class="settings !w-2.5" data-cy="edgeStack-stackTableSettings">
|
||||
<span class="setting mr-0" 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"> <pr-icon icon="'settings'"></pr-icon> 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()"
|
||||
data-cy="edgeStack-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">
|
||||
<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 class="inline-block w-3">
|
||||
<pr-icon id="refreshRateChange" icon="'check'" style="display: none" 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="edgeStack-stackTable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>
|
||||
<div class="vertical-center">
|
||||
<span class="md-checkbox">
|
||||
<input id="select_all" type="checkbox" ng-model="$ctrl.state.selectAll" ng-change="$ctrl.selectAll()" data-cy="edgeStack-selectAllCheckbox" />
|
||||
<label for="select_all"></label>
|
||||
</span>
|
||||
<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>
|
||||
</div>
|
||||
</th>
|
||||
<th class="text-center"> Acknowledged </th>
|
||||
<th class="text-center"> Deployed </th>
|
||||
<th class="text-center"> Failed </th>
|
||||
<th class="text-center"> Total deployments </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>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr
|
||||
dir-paginate="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit))"
|
||||
ng-class="{ active: item.Checked }"
|
||||
>
|
||||
<td>
|
||||
<span class="md-checkbox">
|
||||
<input id="select_{{ $index }}" type="checkbox" ng-model="item.Checked" ng-click="$ctrl.selectItem(item, $event)" ng-disabled="!$ctrl.allowSelection(item)" />
|
||||
<label for="select_{{ $index }}"></label>
|
||||
</span>
|
||||
<a ui-sref="edge.stacks.edit({ stackId: item.Id })">
|
||||
{{ item.Name }}
|
||||
</a>
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<span class="edge-stack-status status-acknowledged">
|
||||
•
|
||||
{{ item.aggregateStatus.acknowledged }}
|
||||
</span>
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<span class="edge-stack-status status-ok">
|
||||
•
|
||||
{{ item.aggregateStatus.ok }}
|
||||
</span>
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<span class="edge-stack-status status-error">
|
||||
•
|
||||
{{ item.aggregateStatus.error }}
|
||||
</span>
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<span class="edge-stack-status status-total">
|
||||
{{ item.NumDeployments }}
|
||||
</span>
|
||||
</td>
|
||||
<td>{{ item.CreationDate | getisodatefromtimestamp }}</td>
|
||||
</tr>
|
||||
<tr ng-if="!$ctrl.dataset" data-cy="edgeStack-loadingRow">
|
||||
<td colspan="6" class="text-muted text-center">Loading...</td>
|
||||
</tr>
|
||||
<tr ng-if="$ctrl.state.filteredDataSet.length === 0" data-cy="edgeStack-noStackRow">
|
||||
<td colspan="6" class="text-muted text-center"> No stack 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 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"></dir-pagination-controls>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</rd-widget-body>
|
||||
</rd-widget>
|
||||
</div>
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
import angular from 'angular';
|
||||
import './edgeStackDatatable.css';
|
||||
|
||||
angular.module('portainer.edge').component('edgeStacksDatatable', {
|
||||
templateUrl: './edgeStacksDatatable.html',
|
||||
controller: 'GenericDatatableController',
|
||||
bindings: {
|
||||
titleText: '@',
|
||||
titleIcon: '@',
|
||||
dataset: '<',
|
||||
tableKey: '@',
|
||||
orderBy: '@',
|
||||
reverseOrder: '<',
|
||||
removeAction: '<',
|
||||
refreshCallback: '<',
|
||||
},
|
||||
});
|
||||
|
|
@ -5,10 +5,15 @@ import { withCurrentUser } from '@/react-tools/withCurrentUser';
|
|||
import { withReactQuery } from '@/react-tools/withReactQuery';
|
||||
import { withUIRouter } from '@/react-tools/withUIRouter';
|
||||
import { WaitingRoomView } from '@/react/edge/edge-devices/WaitingRoomView';
|
||||
import { ListView } from '@/react/edge/edge-stacks/ListView';
|
||||
|
||||
export const viewsModule = angular
|
||||
.module('portainer.edge.react.views', [])
|
||||
.component(
|
||||
'waitingRoomView',
|
||||
r2a(withUIRouter(withReactQuery(withCurrentUser(WaitingRoomView))), [])
|
||||
)
|
||||
.component(
|
||||
'edgeStacksView',
|
||||
r2a(withUIRouter(withCurrentUser(ListView)), [])
|
||||
).name;
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
<page-header title="'Edge Stacks list'" breadcrumbs="['Edge Stacks']" reload="true"> </page-header>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<edge-stacks-datatable
|
||||
title-text="Edge Stacks"
|
||||
title-icon="layers"
|
||||
dataset="$ctrl.stacks"
|
||||
table-key="edgeStacks"
|
||||
order-by="Name"
|
||||
remove-action="$ctrl.removeAction"
|
||||
refresh-callback="$ctrl.getStacks"
|
||||
></edge-stacks-datatable>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1,77 +0,0 @@
|
|||
import _ from 'lodash-es';
|
||||
import { confirmDestructive } from '@@/modals/confirm';
|
||||
import { buildConfirmButton } from '@@/modals/utils';
|
||||
|
||||
export class EdgeStacksViewController {
|
||||
/* @ngInject */
|
||||
constructor($state, Notifications, EdgeStackService, $scope, $async) {
|
||||
this.$state = $state;
|
||||
this.Notifications = Notifications;
|
||||
this.EdgeStackService = EdgeStackService;
|
||||
this.$scope = $scope;
|
||||
this.$async = $async;
|
||||
|
||||
this.stacks = undefined;
|
||||
|
||||
this.getStacks = this.getStacks.bind(this);
|
||||
this.removeAction = this.removeAction.bind(this);
|
||||
this.removeActionAsync = this.removeActionAsync.bind(this);
|
||||
}
|
||||
|
||||
$onInit() {
|
||||
this.getStacks();
|
||||
}
|
||||
|
||||
removeAction(stacks) {
|
||||
return this.$async(this.removeActionAsync, stacks);
|
||||
}
|
||||
|
||||
async removeActionAsync(stacks) {
|
||||
const confirmed = await confirmDestructive({
|
||||
title: 'Are you sure?',
|
||||
message: 'Are you sure you want to remove the selected Edge stack(s)?',
|
||||
confirmButton: buildConfirmButton('Remove', 'danger'),
|
||||
});
|
||||
|
||||
if (!confirmed) {
|
||||
return;
|
||||
}
|
||||
|
||||
for (let stack of stacks) {
|
||||
try {
|
||||
await this.EdgeStackService.remove(stack.Id);
|
||||
this.Notifications.success('Stack successfully removed', stack.Name);
|
||||
_.remove(this.stacks, stack);
|
||||
} catch (err) {
|
||||
this.Notifications.error('Failure', err, 'Unable to remove stack ' + stack.Name);
|
||||
}
|
||||
}
|
||||
|
||||
this.$state.reload();
|
||||
}
|
||||
|
||||
aggregateStatus() {
|
||||
if (this.stacks) {
|
||||
this.stacks.forEach((stack) => {
|
||||
const aggregateStatus = { ok: 0, error: 0, acknowledged: 0 };
|
||||
for (let endpointId in stack.Status) {
|
||||
const { Details } = stack.Status[endpointId];
|
||||
aggregateStatus.ok += Number(Details.Ok);
|
||||
aggregateStatus.error += Number(Details.Error);
|
||||
aggregateStatus.acknowledged += Number(Details.Acknowledged);
|
||||
}
|
||||
stack.aggregateStatus = aggregateStatus;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async getStacks() {
|
||||
try {
|
||||
this.stacks = await this.EdgeStackService.stacks();
|
||||
this.aggregateStatus();
|
||||
} catch (err) {
|
||||
this.stacks = [];
|
||||
this.Notifications.error('Failure', err, 'Unable to retrieve stacks');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
import angular from 'angular';
|
||||
|
||||
import { EdgeStacksViewController } from './edgeStacksViewController';
|
||||
|
||||
angular.module('portainer.edge').component('edgeStacksView', {
|
||||
templateUrl: './edgeStacksView.html',
|
||||
controller: EdgeStacksViewController,
|
||||
});
|
||||
|
|
@ -5,7 +5,8 @@ import { Link } from '@@/Link';
|
|||
export function buildNameColumn<T extends Record<string, unknown>>(
|
||||
nameKey: keyof T,
|
||||
idKey: string,
|
||||
path: string
|
||||
path: string,
|
||||
idParam = 'id'
|
||||
): ColumnDef<T> {
|
||||
const cell = createCell<T>();
|
||||
|
||||
|
|
@ -15,6 +16,7 @@ export function buildNameColumn<T extends Record<string, unknown>>(
|
|||
id: 'name',
|
||||
cell,
|
||||
enableSorting: true,
|
||||
enableHiding: false,
|
||||
sortingFn: 'text',
|
||||
};
|
||||
|
||||
|
|
@ -27,7 +29,11 @@ export function buildNameColumn<T extends Record<string, unknown>>(
|
|||
}
|
||||
|
||||
return (
|
||||
<Link to={path} params={{ id: row.original[idKey] }} title={name}>
|
||||
<Link
|
||||
to={path}
|
||||
params={{ [idParam]: row.original[idKey] }}
|
||||
title={name}
|
||||
>
|
||||
{name}
|
||||
</Link>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,28 +1,28 @@
|
|||
.edge-stack-status {
|
||||
.root {
|
||||
padding: 2px 10px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
.edge-stack-status.status-acknowledged {
|
||||
.status-acknowledged {
|
||||
color: #337ab7;
|
||||
background-color: rgba(51, 122, 183, 0.1);
|
||||
}
|
||||
|
||||
.edge-stack-status.status-images-pulled {
|
||||
.status-images-pulled {
|
||||
color: #e1a800;
|
||||
background-color: rgba(238, 192, 32, 0.1);
|
||||
}
|
||||
|
||||
.edge-stack-status.status-ok {
|
||||
.status-ok {
|
||||
color: #23ae89;
|
||||
background-color: rgba(35, 174, 137, 0.1);
|
||||
}
|
||||
|
||||
.edge-stack-status.status-error {
|
||||
.status-error {
|
||||
color: #ae2323;
|
||||
background-color: rgba(174, 35, 35, 0.1);
|
||||
}
|
||||
|
||||
.edge-stack-status.status-total {
|
||||
.status-total {
|
||||
background-color: rgba(168, 167, 167, 0.1);
|
||||
}
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
import clsx from 'clsx';
|
||||
|
||||
import { Link } from '@@/Link';
|
||||
|
||||
import { EdgeStack, StatusType } from '../../types';
|
||||
|
||||
import styles from './DeploymentCounter.module.css';
|
||||
|
||||
export function DeploymentCounterLink({
|
||||
count,
|
||||
type,
|
||||
stackId,
|
||||
}: {
|
||||
count: number;
|
||||
type: StatusType;
|
||||
stackId: EdgeStack['Id'];
|
||||
}) {
|
||||
return (
|
||||
<div className="text-center">
|
||||
<Link
|
||||
className="hover:no-underline"
|
||||
to="edge.stacks.edit"
|
||||
params={{ stackId, tab: 1, status: type }}
|
||||
>
|
||||
<DeploymentCounter count={count} type={type} />
|
||||
</Link>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export function DeploymentCounter({
|
||||
count,
|
||||
type,
|
||||
}: {
|
||||
count: number;
|
||||
type?: StatusType;
|
||||
}) {
|
||||
return (
|
||||
<span
|
||||
className={clsx(styles.root, {
|
||||
[styles.statusOk]: type === 'Ok',
|
||||
[styles.statusError]: type === 'Error',
|
||||
[styles.statusAcknowledged]: type === 'Acknowledged',
|
||||
[styles.statusImagesPulled]: type === 'ImagesPulled',
|
||||
[styles.statusTotal]: type === undefined,
|
||||
})}
|
||||
>
|
||||
• {count}
|
||||
</span>
|
||||
);
|
||||
}
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
import { Layers } from 'lucide-react';
|
||||
|
||||
import { Datatable } from '@@/datatables';
|
||||
import { useTableState } from '@@/datatables/useTableState';
|
||||
|
||||
import { useEdgeStacks } from '../../queries/useEdgeStacks';
|
||||
import { EdgeStack } from '../../types';
|
||||
|
||||
import { createStore } from './store';
|
||||
import { columns } from './columns';
|
||||
import { DecoratedEdgeStack } from './types';
|
||||
import { TableSettingsMenus } from './TableSettingsMenus';
|
||||
import { TableActions } from './TableActions';
|
||||
|
||||
const tableKey = 'edge-stacks';
|
||||
|
||||
const settingsStore = createStore(tableKey);
|
||||
|
||||
export function EdgeStacksDatatable() {
|
||||
const tableState = useTableState(settingsStore, tableKey);
|
||||
const edgeStacksQuery = useEdgeStacks<Array<DecoratedEdgeStack>>({
|
||||
select: (edgeStacks) =>
|
||||
edgeStacks.map((edgeStack) => ({
|
||||
...edgeStack,
|
||||
aggregatedStatus: aggregateStackStatus(edgeStack.Status),
|
||||
})),
|
||||
refetchInterval: tableState.autoRefreshRate * 1000,
|
||||
});
|
||||
|
||||
return (
|
||||
<Datatable
|
||||
title="Edge Stacks"
|
||||
titleIcon={Layers}
|
||||
columns={columns}
|
||||
dataset={edgeStacksQuery.data || []}
|
||||
settingsManager={tableState}
|
||||
emptyContentLabel="No stack available."
|
||||
isLoading={edgeStacksQuery.isLoading}
|
||||
renderTableSettings={(tableInstance) => (
|
||||
<TableSettingsMenus
|
||||
tableInstance={tableInstance}
|
||||
tableState={tableState}
|
||||
/>
|
||||
)}
|
||||
renderTableActions={(selectedItems) => (
|
||||
<TableActions selectedItems={selectedItems} />
|
||||
)}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
function aggregateStackStatus(stackStatus: EdgeStack['Status']) {
|
||||
const aggregateStatus = { ok: 0, error: 0, acknowledged: 0, imagesPulled: 0 };
|
||||
return Object.values(stackStatus).reduce((acc, envStatus) => {
|
||||
acc.ok += Number(envStatus.Details.Ok);
|
||||
acc.error += Number(envStatus.Details.Error);
|
||||
acc.acknowledged += Number(envStatus.Details.Acknowledged);
|
||||
acc.imagesPulled += Number(envStatus.Details.ImagesPulled);
|
||||
return acc;
|
||||
}, aggregateStatus);
|
||||
}
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
import { Trash2, Plus } from 'lucide-react';
|
||||
|
||||
import { notifySuccess } from '@/portainer/services/notifications';
|
||||
|
||||
import { Button } from '@@/buttons';
|
||||
import { confirmDestructive } from '@@/modals/confirm';
|
||||
import { buildConfirmButton } from '@@/modals/utils';
|
||||
import { Link } from '@@/Link';
|
||||
|
||||
import { useDeleteEdgeStacksMutation } from './useDeleteEdgeStacksMutation';
|
||||
import { DecoratedEdgeStack } from './types';
|
||||
|
||||
export function TableActions({
|
||||
selectedItems,
|
||||
}: {
|
||||
selectedItems: Array<DecoratedEdgeStack>;
|
||||
}) {
|
||||
const removeMutation = useDeleteEdgeStacksMutation();
|
||||
|
||||
return (
|
||||
<div className="flex items-center gap-2">
|
||||
<Button
|
||||
color="dangerlight"
|
||||
disabled={selectedItems.length === 0}
|
||||
onClick={() => handleRemove(selectedItems)}
|
||||
icon={Trash2}
|
||||
className="!m-0"
|
||||
>
|
||||
Remove
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
as={Link}
|
||||
props={{ to: 'edge.stacks.new' }}
|
||||
icon={Plus}
|
||||
className="!m-0"
|
||||
data-cy="edgeStack-addStackButton"
|
||||
>
|
||||
Add stack
|
||||
</Button>
|
||||
</div>
|
||||
);
|
||||
|
||||
async function handleRemove(selectedItems: Array<DecoratedEdgeStack>) {
|
||||
const confirmed = await confirmDestructive({
|
||||
title: 'Are you sure?',
|
||||
message: 'Are you sure you want to remove the selected Edge stack(s)?',
|
||||
confirmButton: buildConfirmButton('Remove', 'danger'),
|
||||
});
|
||||
|
||||
if (!confirmed) {
|
||||
return;
|
||||
}
|
||||
|
||||
const ids = selectedItems.map((item) => item.Id);
|
||||
removeMutation.mutate(ids, {
|
||||
onSuccess: () => {
|
||||
notifySuccess('Success', 'Edge stack(s) removed');
|
||||
},
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
import { Table } from '@tanstack/react-table';
|
||||
|
||||
import { ColumnVisibilityMenu } from '@@/datatables/ColumnVisibilityMenu';
|
||||
import { TableSettingsMenu } from '@@/datatables';
|
||||
import { TableSettingsMenuAutoRefresh } from '@@/datatables/TableSettingsMenuAutoRefresh';
|
||||
|
||||
import { DecoratedEdgeStack } from './types';
|
||||
import { TableSettings } from './store';
|
||||
|
||||
export function TableSettingsMenus({
|
||||
tableInstance,
|
||||
tableState,
|
||||
}: {
|
||||
tableInstance: Table<DecoratedEdgeStack>;
|
||||
tableState: TableSettings;
|
||||
}) {
|
||||
const columnsToHide = tableInstance
|
||||
.getAllColumns()
|
||||
.filter((col) => col.getCanHide());
|
||||
|
||||
return (
|
||||
<>
|
||||
<ColumnVisibilityMenu<DecoratedEdgeStack>
|
||||
columns={columnsToHide}
|
||||
onChange={(hiddenColumns) => {
|
||||
tableState.setHiddenColumns(hiddenColumns);
|
||||
tableInstance.setColumnVisibility(
|
||||
Object.fromEntries(hiddenColumns.map((col) => [col, false]))
|
||||
);
|
||||
}}
|
||||
value={tableState.hiddenColumns}
|
||||
/>
|
||||
<TableSettingsMenu>
|
||||
<TableSettingsMenuAutoRefresh
|
||||
value={tableState.autoRefreshRate}
|
||||
onChange={(value) => tableState.setAutoRefreshRate(value)}
|
||||
/>
|
||||
</TableSettingsMenu>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
|
@ -0,0 +1,129 @@
|
|||
import { createColumnHelper } from '@tanstack/react-table';
|
||||
import _ from 'lodash';
|
||||
|
||||
import { isoDateFromTimestamp } from '@/portainer/filters/filters';
|
||||
import { isBE } from '@/react/portainer/feature-flags/feature-flags.service';
|
||||
|
||||
import { buildNameColumn } from '@@/datatables/NameCell';
|
||||
|
||||
import { DecoratedEdgeStack } from './types';
|
||||
import { DeploymentCounter, DeploymentCounterLink } from './DeploymentCounter';
|
||||
|
||||
const columnHelper = createColumnHelper<DecoratedEdgeStack>();
|
||||
|
||||
export const columns = _.compact([
|
||||
buildNameColumn<DecoratedEdgeStack>(
|
||||
'Name',
|
||||
'Id',
|
||||
'edge.stacks.edit',
|
||||
'stackId'
|
||||
),
|
||||
columnHelper.accessor('aggregatedStatus.acknowledged', {
|
||||
header: 'Acknowledged',
|
||||
enableSorting: false,
|
||||
enableHiding: false,
|
||||
cell: ({ getValue, row }) => (
|
||||
<DeploymentCounterLink
|
||||
count={getValue()}
|
||||
type="Acknowledged"
|
||||
stackId={row.original.Id}
|
||||
/>
|
||||
),
|
||||
meta: {
|
||||
className: '[&>*]:justify-center',
|
||||
},
|
||||
}),
|
||||
isBE &&
|
||||
columnHelper.accessor('aggregatedStatus.imagesPulled', {
|
||||
header: 'Images Pre-pulled',
|
||||
cell: ({ getValue, row }) => (
|
||||
<DeploymentCounterLink
|
||||
count={getValue()}
|
||||
type="ImagesPulled"
|
||||
stackId={row.original.Id}
|
||||
/>
|
||||
),
|
||||
enableSorting: false,
|
||||
enableHiding: false,
|
||||
meta: {
|
||||
className: '[&>*]:justify-center',
|
||||
},
|
||||
}),
|
||||
columnHelper.accessor('aggregatedStatus.ok', {
|
||||
header: 'Deployed',
|
||||
cell: ({ getValue, row }) => (
|
||||
<DeploymentCounterLink
|
||||
count={getValue()}
|
||||
type="Ok"
|
||||
stackId={row.original.Id}
|
||||
/>
|
||||
),
|
||||
enableSorting: false,
|
||||
enableHiding: false,
|
||||
meta: {
|
||||
className: '[&>*]:justify-center',
|
||||
},
|
||||
}),
|
||||
columnHelper.accessor('aggregatedStatus.error', {
|
||||
header: 'Failed',
|
||||
cell: ({ getValue, row }) => (
|
||||
<DeploymentCounterLink
|
||||
count={getValue()}
|
||||
type="Error"
|
||||
stackId={row.original.Id}
|
||||
/>
|
||||
),
|
||||
enableSorting: false,
|
||||
enableHiding: false,
|
||||
meta: {
|
||||
className: '[&>*]:justify-center',
|
||||
},
|
||||
}),
|
||||
columnHelper.accessor('NumDeployments', {
|
||||
header: 'Deployments',
|
||||
cell: ({ getValue }) => (
|
||||
<div className="text-center">
|
||||
<DeploymentCounter count={getValue()} />
|
||||
</div>
|
||||
),
|
||||
enableSorting: false,
|
||||
enableHiding: false,
|
||||
meta: {
|
||||
className: '[&>*]:justify-center',
|
||||
},
|
||||
}),
|
||||
columnHelper.accessor('CreationDate', {
|
||||
header: 'Creation Date',
|
||||
cell: ({ getValue }) => isoDateFromTimestamp(getValue()),
|
||||
enableHiding: false,
|
||||
}),
|
||||
isBE &&
|
||||
columnHelper.accessor(
|
||||
(item) =>
|
||||
item.GitConfig ? item.GitConfig.ConfigHash : item.StackFileVersion,
|
||||
{
|
||||
header: 'Target Version',
|
||||
enableSorting: false,
|
||||
cell: ({ row: { original: item } }) => {
|
||||
if (item.GitConfig) {
|
||||
return (
|
||||
<div className="text-center">
|
||||
<a
|
||||
target="_blank"
|
||||
href={`${item.GitConfig.URL}/commit/${item.GitConfig.ConfigHash}`}
|
||||
rel="noreferrer"
|
||||
>
|
||||
{item.GitConfig.ConfigHash.slice(0, 7)}
|
||||
</a>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return <div className="text-center">{item.StackFileVersion}</div>;
|
||||
},
|
||||
meta: {
|
||||
className: '[&>*]:justify-center',
|
||||
},
|
||||
}
|
||||
),
|
||||
]);
|
||||
|
|
@ -0,0 +1 @@
|
|||
export { EdgeStacksDatatable } from './EdgeStacksDatatable';
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
import {
|
||||
BasicTableSettings,
|
||||
RefreshableTableSettings,
|
||||
SettableColumnsTableSettings,
|
||||
createPersistedStore,
|
||||
hiddenColumnsSettings,
|
||||
refreshableSettings,
|
||||
} from '@@/datatables/types';
|
||||
|
||||
export interface TableSettings
|
||||
extends BasicTableSettings,
|
||||
SettableColumnsTableSettings,
|
||||
RefreshableTableSettings {}
|
||||
|
||||
export function createStore(storageKey: string) {
|
||||
return createPersistedStore<TableSettings>(storageKey, 'name', (set) => ({
|
||||
...hiddenColumnsSettings(set),
|
||||
...refreshableSettings(set),
|
||||
}));
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
import { EdgeStack } from '../../types';
|
||||
|
||||
interface AggregateStackStatus {
|
||||
ok: number;
|
||||
error: number;
|
||||
acknowledged: number;
|
||||
imagesPulled: number;
|
||||
}
|
||||
|
||||
export type DecoratedEdgeStack = EdgeStack & {
|
||||
aggregatedStatus: AggregateStackStatus;
|
||||
};
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
import { useMutation, useQueryClient } from 'react-query';
|
||||
|
||||
import { promiseSequence } from '@/portainer/helpers/promise-utils';
|
||||
import axios, { parseAxiosError } from '@/portainer/services/axios';
|
||||
import {
|
||||
mutationOptions,
|
||||
withError,
|
||||
withInvalidate,
|
||||
} from '@/react-tools/react-query';
|
||||
|
||||
import { EdgeStack } from '../../types';
|
||||
import { buildUrl } from '../../queries/buildUrl';
|
||||
import { queryKeys } from '../../queries/query-keys';
|
||||
|
||||
export function useDeleteEdgeStacksMutation() {
|
||||
const queryClient = useQueryClient();
|
||||
return useMutation(
|
||||
(edgeStackIds: Array<EdgeStack['Id']>) =>
|
||||
promiseSequence(
|
||||
edgeStackIds.map((edgeStackId) => () => deleteEdgeStack(edgeStackId))
|
||||
),
|
||||
mutationOptions(
|
||||
withError('Unable to delete Edge stack(s)'),
|
||||
withInvalidate(queryClient, [queryKeys.base()])
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
async function deleteEdgeStack(id: EdgeStack['Id']) {
|
||||
try {
|
||||
await axios.delete(buildUrl(id));
|
||||
} catch (e) {
|
||||
throw parseAxiosError(e, 'Unable to delete edge stack');
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
import { PageHeader } from '@@/PageHeader';
|
||||
|
||||
import { EdgeStacksDatatable } from './EdgeStacksDatatable';
|
||||
|
||||
export function ListView() {
|
||||
return (
|
||||
<>
|
||||
<PageHeader title="Edge Stacks list" breadcrumbs="Edge Stacks" reload />
|
||||
|
||||
<EdgeStacksDatatable />
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
|
@ -0,0 +1 @@
|
|||
export { ListView } from './ListView';
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
import { useQuery } from 'react-query';
|
||||
|
||||
import { withError } from '@/react-tools/react-query';
|
||||
import axios, { parseAxiosError } from '@/portainer/services/axios';
|
||||
|
||||
import { EdgeStack } from '../types';
|
||||
|
||||
import { buildUrl } from './buildUrl';
|
||||
|
||||
export function useEdgeStacks<T = Array<EdgeStack>>({
|
||||
select,
|
||||
/**
|
||||
* If set to a number, the query will continuously refetch at this frequency in milliseconds.
|
||||
* If set to a function, the function will be executed with the latest data and query to compute a frequency
|
||||
* Defaults to `false`.
|
||||
*/
|
||||
refetchInterval,
|
||||
}: {
|
||||
select?: (stacks: EdgeStack[]) => T;
|
||||
refetchInterval?: number | false | ((data?: T) => false | number);
|
||||
} = {}) {
|
||||
return useQuery(['edge_stacks'], () => getEdgeStacks(), {
|
||||
...withError('Failed loading Edge stack'),
|
||||
select,
|
||||
refetchInterval,
|
||||
});
|
||||
}
|
||||
|
||||
export async function getEdgeStacks() {
|
||||
try {
|
||||
const { data } = await axios.get<EdgeStack[]>(buildUrl());
|
||||
return data;
|
||||
} catch (e) {
|
||||
throw parseAxiosError(e as Error);
|
||||
}
|
||||
}
|
||||
|
|
@ -59,6 +59,7 @@ export type EdgeStack = {
|
|||
Prune: boolean;
|
||||
RetryDeploy: boolean;
|
||||
Webhook?: string;
|
||||
StackFileVersion?: number;
|
||||
EnvVars?: EnvVar[];
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue