mirror of
https://github.com/portainer/portainer.git
synced 2025-07-24 15:59:41 +02:00
05357ecce5
* fix(edge): filtering of edge devices [EE-3210] fixes [EE-3210] changes: - replaces `edgeDeviceFilter` with two filters: - `edgeDevice` - `edgeDeviceUntrusted` these filters will only apply to the edge endpoints in the query (so it's possible to get both regular endpoints and edge devices). if `edgeDevice` is true, will filter out edge agents which are not an edge device. false, will filter out edge devices `edgeDeviceUntrusted` applies only when `edgeDevice` is true. then false (default) will hide the untrusted edge devices, true will show only untrusted edge devices. fix(edge/job-create): retrieve only trusted endpoints + fix endpoint selector pagination limits onChange fix(endpoint-groups): remove listing of untrusted edge envs (aka in waiting room) refactor(endpoints): move filter to another function feat(endpoints): separate edge filters refactor(environments): change getEnv api refactor(endpoints): use single getEnv feat(groups): show error when failed loading envs style(endpoints): remove unused endpointsByGroup * chore(deps): update go to 1.18 * fix(endpoint): filter out untrusted by default * fix(edge): show correct endpoints * style(endpoints): fix typo * fix(endpoints): fix swagger * fix(admin): use new getEnv function Co-authored-by: LP B <xAt0mZ@users.noreply.github.com>
62 lines
1.8 KiB
TypeScript
62 lines
1.8 KiB
TypeScript
import { useRouter } from '@uirouter/react';
|
|
|
|
import { useEnvironmentList } from '@/portainer/environments/queries/useEnvironmentList';
|
|
import { r2a } from '@/react-tools/react2angular';
|
|
import { EdgeTypes } from '@/portainer/environments/types';
|
|
|
|
import { InformationPanel } from '@@/InformationPanel';
|
|
import { TextTip } from '@@/Tip/TextTip';
|
|
import { TableSettingsProvider } from '@@/datatables/useTableSettings';
|
|
import { PageHeader } from '@@/PageHeader';
|
|
|
|
import { DataTable } from './Datatable/Datatable';
|
|
import { TableSettings } from './Datatable/types';
|
|
|
|
export function WaitingRoomView() {
|
|
const storageKey = 'edge-devices-waiting-room';
|
|
const router = useRouter();
|
|
const { environments, isLoading, totalCount } = useEnvironmentList({
|
|
edgeDevice: true,
|
|
edgeDeviceUntrusted: true,
|
|
types: EdgeTypes,
|
|
});
|
|
|
|
if (process.env.PORTAINER_EDITION !== 'BE') {
|
|
router.stateService.go('edge.devices');
|
|
return null;
|
|
}
|
|
|
|
return (
|
|
<>
|
|
<PageHeader
|
|
title="Waiting Room"
|
|
breadcrumbs={[
|
|
{ label: 'Edge Devices', link: 'edge.devices' },
|
|
{ label: 'Waiting Room' },
|
|
]}
|
|
/>
|
|
|
|
<InformationPanel>
|
|
<TextTip color="blue">
|
|
Only environments generated from the AEEC script will appear here,
|
|
manually added environments and edge devices will bypass the waiting
|
|
room.
|
|
</TextTip>
|
|
</InformationPanel>
|
|
|
|
<TableSettingsProvider<TableSettings>
|
|
defaults={{ pageSize: 10, sortBy: { desc: false, id: 'name' } }}
|
|
storageKey={storageKey}
|
|
>
|
|
<DataTable
|
|
devices={environments}
|
|
totalCount={totalCount}
|
|
isLoading={isLoading}
|
|
storageKey={storageKey}
|
|
/>
|
|
</TableSettingsProvider>
|
|
</>
|
|
);
|
|
}
|
|
|
|
export const WaitingRoomViewAngular = r2a(WaitingRoomView, []);
|