allow to revoke host tokens from web ui (#511)

* allow to revoke / restore host access from web ui

* refector to what is expected

* remove core.admin check on HostViewPage.tsx

* update core.host.revoke_token description
This commit is contained in:
Luciole authored and GitHub committed 2023-09-29 19:50:14 +02:00
1 parent 838170a9ff
commit e2dea35e02
11 files changed
+120 -10

No files matched your search

@@ -1,21 +1,27 @@
import React from "react";
import { Descriptions, Spin, Tag, Typography } from "antd";
import React, { useContext } from "react";
import { Descriptions, Spin, Tag, Typography, Button, Space, Modal, Popconfirm } from "antd";
import { useParams } from "react-router-dom";
import * as lib from "@clusterio/lib";
import notify, { notifyErrorHandler } from "../util/notify";
import type { Control } from "../util/websocket";
import ControlContext from "./ControlContext";
import InstanceList from "./InstanceList";
import LogConsole from "./LogConsole";
import { useAccount } from "../model/account";
import { useInstanceList } from "../model/instance";
import { useHost } from "../model/host";
import { HostState, useHost } from "../model/host";
import PageHeader from "./PageHeader";
import PageLayout from "./PageLayout";
import PluginExtra from "./PluginExtra";
import { formatTimestamp } from "../util/time_format";
const { Title } = Typography;
export default function HostViewPage() {
let params = useParams();
let hostId = Number(params.id);
let control = useContext(ControlContext);
let account = useAccount();
let [instanceList] = useInstanceList();
let [host] = useHost(hostId);
@@ -34,9 +40,31 @@ export default function HostViewPage() {
</PageLayout>;
}
return <PageLayout nav={nav}>
<PageHeader title={host.name || String(hostId)} />
let hostButtons = <Space> {
account.hasPermission("core.host.revoke_access") &&
<Popconfirm
title={`Revoke tokens of ${host.name}?`}
placement="bottomRight"
okText="Revoke Tokens"
okButtonProps={{ danger: true }}
onConfirm={() => {
control.send(new lib.HostRevokeTokensRequest(host.id!))
.then(() => notify("Host tokens revoked"))
.catch(notifyErrorHandler(`Error revoking tokens for host id:${host.id}`))
}}
>
<Button danger>
Revoke tokens
</Button>
</Popconfirm>
}
</Space>
return <PageLayout nav={nav}>
<PageHeader
title={host.name || String(hostId)}
extra={hostButtons}
/>
<Descriptions bordered size="small" column={{ xs: 1, sm: 2, xl: 4 }}>
<Descriptions.Item label="Name">{host["name"]}</Descriptions.Item>
<Descriptions.Item label="Connected">
@@ -46,6 +74,12 @@ export default function HostViewPage() {
</Descriptions.Item>
<Descriptions.Item label="Agent">{host["agent"]}</Descriptions.Item>
<Descriptions.Item label="Version">{host["version"]}</Descriptions.Item>
{
host.tokenValidAfter &&
<Descriptions.Item label="Tokens valid after:">
{formatTimestamp(host.tokenValidAfter*1000)}
</Descriptions.Item>
}
</Descriptions>
{account.hasPermission("core.instance.list") && <>
<Title level={5} style={{ marginTop: 16 }}>Instances</Title>
+1 -1
View File
@@ -229,7 +229,7 @@ export default function HostsPage() {
{host.connected ? "Connected" : "Disconnected"}
</Tag>,
sorter: (a, b) => Number(a.connected) - Number(b.connected),
},
}
]}
dataSource={hostList}
rowKey={host => host.id}