From f202a0975ab2f5e14b0fb4998a9766558b8146d5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 20 Nov 2025 10:55:42 +0000 Subject: [PATCH] Add wrap to more Space components and fix table scroll on narrow screens Co-authored-by: Danielv123 <6792749+Danielv123@users.noreply.github.com> --- packages/web_ui/src/components/HostViewPage.tsx | 2 +- packages/web_ui/src/components/InstanceViewPage.tsx | 2 +- packages/web_ui/src/components/RoleViewPage.tsx | 6 +++--- packages/web_ui/src/components/UserViewPage.tsx | 4 ++-- packages/web_ui/src/components/UsersTable.tsx | 1 + 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/web_ui/src/components/HostViewPage.tsx b/packages/web_ui/src/components/HostViewPage.tsx index 78450966..f7eddcf8 100644 --- a/packages/web_ui/src/components/HostViewPage.tsx +++ b/packages/web_ui/src/components/HostViewPage.tsx @@ -106,7 +106,7 @@ export default function HostViewPage() { ; } - let hostButtons = + let hostButtons = { account.hasPermission("core.host.revoke_token") diff --git a/packages/web_ui/src/components/InstanceViewPage.tsx b/packages/web_ui/src/components/InstanceViewPage.tsx index ec1b28d6..69b5055c 100644 --- a/packages/web_ui/src/components/InstanceViewPage.tsx +++ b/packages/web_ui/src/components/InstanceViewPage.tsx @@ -141,7 +141,7 @@ function InstanceButtons(props: { instance: lib.InstanceDetails }) { } }, }; - return + return { account.hasAnyPermission(...InstanceControlButtonPermissions) && diff --git a/packages/web_ui/src/components/RoleViewPage.tsx b/packages/web_ui/src/components/RoleViewPage.tsx index e94bad85..29c9526d 100644 --- a/packages/web_ui/src/components/RoleViewPage.tsx +++ b/packages/web_ui/src/components/RoleViewPage.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useContext, useState } from "react"; 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 * as lib from "@clusterio/lib"; @@ -71,7 +71,7 @@ export default function RoleViewPage() { > + extra={ {canUpdate && } {account.hasPermission("core.role.delete") && } - } + } /> diff --git a/packages/web_ui/src/components/UserViewPage.tsx b/packages/web_ui/src/components/UserViewPage.tsx index 878d309c..694f1bf8 100644 --- a/packages/web_ui/src/components/UserViewPage.tsx +++ b/packages/web_ui/src/components/UserViewPage.tsx @@ -106,7 +106,7 @@ export default function UserViewPage() { {user.isBanned && Banned} } - extra={<> + extra={ {account.hasPermission("core.user.revoke_token") && ( account.name === userName || account.hasPermission("core.user.revoke_other_token") ) && } - } + } />
user.name} pagination={defaultPagination} size={size} + scroll={{ x: "max-content" }} onRow={(user) => ({ onClick: (event) => { if ((event.target as HTMLElement).closest("a")) {