mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-22 08:13:12 +09:00
Add wrap to more Space components and fix table scroll on narrow screens
Co-authored-by: Danielv123 <6792749+Danielv123@users.noreply.github.com>
This commit is contained in:
1 parent
ea4280d184
commit
f202a0975a
5 files changed
+8
-7
No files matched your search
@@ -106,7 +106,7 @@ export default function HostViewPage() {
|
|||||||
</PageLayout>;
|
</PageLayout>;
|
||||||
}
|
}
|
||||||
|
|
||||||
let hostButtons = <Space>
|
let hostButtons = <Space wrap>
|
||||||
<HostControlButton hostId={hostId} canRestart={system?.canRestart} restartRequired={system?.restartRequired}/>
|
<HostControlButton hostId={hostId} canRestart={system?.canRestart} restartRequired={system?.restartRequired}/>
|
||||||
{
|
{
|
||||||
account.hasPermission("core.host.revoke_token")
|
account.hasPermission("core.host.revoke_token")
|
||||||
|
|||||||
@@ -141,7 +141,7 @@ function InstanceButtons(props: { instance: lib.InstanceDetails }) {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
return <Space>
|
return <Space wrap>
|
||||||
{
|
{
|
||||||
account.hasAnyPermission(...InstanceControlButtonPermissions)
|
account.hasAnyPermission(...InstanceControlButtonPermissions)
|
||||||
&& <InstanceControlButton instance={instance} />
|
&& <InstanceControlButton instance={instance} />
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import React, { useEffect, useContext, useState } from "react";
|
import React, { useEffect, useContext, useState } from "react";
|
||||||
import { useNavigate, useParams } from "react-router-dom";
|
import { useNavigate, useParams } from "react-router-dom";
|
||||||
import { Button, Checkbox, Form, Input, Popconfirm, Spin } from "antd";
|
import { Button, Checkbox, Form, Input, Popconfirm, Space, Spin } from "antd";
|
||||||
import DeleteOutlined from "@ant-design/icons/DeleteOutlined";
|
import DeleteOutlined from "@ant-design/icons/DeleteOutlined";
|
||||||
|
|
||||||
import * as lib from "@clusterio/lib";
|
import * as lib from "@clusterio/lib";
|
||||||
@@ -71,7 +71,7 @@ export default function RoleViewPage() {
|
|||||||
>
|
>
|
||||||
<PageHeader
|
<PageHeader
|
||||||
title={role.name}
|
title={role.name}
|
||||||
extra={<>
|
extra={<Space wrap>
|
||||||
{canUpdate && <Button type={edited ? "primary" : "default"} htmlType="submit">Apply</Button>}
|
{canUpdate && <Button type={edited ? "primary" : "default"} htmlType="submit">Apply</Button>}
|
||||||
{account.hasPermission("core.role.delete") && <Popconfirm
|
{account.hasPermission("core.role.delete") && <Popconfirm
|
||||||
title="Delete role?"
|
title="Delete role?"
|
||||||
@@ -90,7 +90,7 @@ export default function RoleViewPage() {
|
|||||||
<DeleteOutlined />
|
<DeleteOutlined />
|
||||||
</Button>
|
</Button>
|
||||||
</Popconfirm>}
|
</Popconfirm>}
|
||||||
</>}
|
</Space>}
|
||||||
/>
|
/>
|
||||||
<Form.Item name="name" label="Name">
|
<Form.Item name="name" label="Name">
|
||||||
<Input disabled={!canUpdate}/>
|
<Input disabled={!canUpdate}/>
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ export default function UserViewPage() {
|
|||||||
{user.isBanned && <Tag color="red">Banned</Tag>}
|
{user.isBanned && <Tag color="red">Banned</Tag>}
|
||||||
</span>
|
</span>
|
||||||
</Space>}
|
</Space>}
|
||||||
extra={<>
|
extra={<Space wrap>
|
||||||
{account.hasPermission("core.user.revoke_token") && (
|
{account.hasPermission("core.user.revoke_token") && (
|
||||||
account.name === userName || account.hasPermission("core.user.revoke_other_token")
|
account.name === userName || account.hasPermission("core.user.revoke_other_token")
|
||||||
) && <Button
|
) && <Button
|
||||||
@@ -146,7 +146,7 @@ export default function UserViewPage() {
|
|||||||
<DeleteOutlined />
|
<DeleteOutlined />
|
||||||
</Button>
|
</Button>
|
||||||
</Popconfirm>}
|
</Popconfirm>}
|
||||||
</>}
|
</Space>}
|
||||||
/>
|
/>
|
||||||
<Form
|
<Form
|
||||||
form={form}
|
form={form}
|
||||||
|
|||||||
@@ -249,6 +249,7 @@ export default function UsersTable({ instanceId, onlyOnline = false, pagination,
|
|||||||
rowKey={(user) => user.name}
|
rowKey={(user) => user.name}
|
||||||
pagination={defaultPagination}
|
pagination={defaultPagination}
|
||||||
size={size}
|
size={size}
|
||||||
|
scroll={{ x: "max-content" }}
|
||||||
onRow={(user) => ({
|
onRow={(user) => ({
|
||||||
onClick: (event) => {
|
onClick: (event) => {
|
||||||
if ((event.target as HTMLElement).closest("a")) {
|
if ((event.target as HTMLElement).closest("a")) {
|
||||||
|
|||||||
Reference in new issue
Block a user