mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-19 23:33:13 +09:00
Refactor User and Role into data classes (#531)
Use the JSON data class pattern for User, Role, and PlayerStats and move them into lib/src/data. This means that User is purely data now and can't reference role objects directly. To make it possible easily check permissions attached to roles and store data only visible on the controller on user objects a ControllerUser type is introduced which is linked with the UserManager and can therefore reference role objects directly. Resolves #525.
This commit is contained in:
1 parent
f802e6ba67
commit
e453a80155
37 files changed
+629
-613
No files matched your search
@@ -13,7 +13,7 @@ import PluginExtra from "./PluginExtra";
|
||||
import { notifyErrorHandler } from "../util/notify";
|
||||
|
||||
|
||||
export type RawRoleState = Partial<lib.RawRole> & {
|
||||
export type RawRoleState = Partial<lib.Role> & {
|
||||
loading?: boolean;
|
||||
missing?: boolean;
|
||||
present?: boolean;
|
||||
@@ -76,7 +76,7 @@ export default function RoleViewPage() {
|
||||
description: role["description"],
|
||||
permissions: {
|
||||
...Object.fromEntries([...lib.permissions.values()].map(perm => [
|
||||
perm.name, role.permissions!.includes(perm.name),
|
||||
perm.name, [...role.permissions!].includes(perm.name),
|
||||
])),
|
||||
},
|
||||
};
|
||||
|
||||
@@ -63,7 +63,7 @@ export default function RolesPage() {
|
||||
let control = useContext(ControlContext);
|
||||
let navigate = useNavigate();
|
||||
|
||||
let [roles, setRoles] = useState<lib.RawRole[]>([]);
|
||||
let [roles, setRoles] = useState<lib.Role[]>([]);
|
||||
|
||||
useEffect(() => {
|
||||
control.send(new lib.RoleListRequest()).then(newRoles => {
|
||||
|
||||
@@ -35,7 +35,7 @@ export default function UserViewPage() {
|
||||
let control = useContext(ControlContext);
|
||||
let [instanceList] = useInstanceList();
|
||||
let [user] = useUser(userName);
|
||||
let [roles, setRoles] = useState<Map<number, lib.RawRole>>(new Map());
|
||||
let [roles, setRoles] = useState<Map<number, lib.Role>>(new Map());
|
||||
let [form] = Form.useForm();
|
||||
let [rolesDirty, setRolesDirty] = useState<boolean>(false);
|
||||
let [banReasonDirty, setBanReasonDirty] = useState<boolean>(false);
|
||||
@@ -78,7 +78,7 @@ export default function UserViewPage() {
|
||||
let roleSelector = <Form.Item
|
||||
noStyle
|
||||
name="roles"
|
||||
initialValue={user.roles}
|
||||
initialValue={user.roleIds}
|
||||
rules={[
|
||||
{ validator: () => (rolesError ? Promise.reject(rolesError) : Promise.resolve()) },
|
||||
]}
|
||||
@@ -181,7 +181,7 @@ export default function UserViewPage() {
|
||||
<Col flex="auto">
|
||||
{account.hasPermission("core.user.update_roles")
|
||||
? roleSelector
|
||||
: [...user.roles!].map(id => <Tag key={id}>{
|
||||
: [...user.roleIds!].map(id => <Tag key={id}>{
|
||||
roles ? (roles.get(id) || { name: id }).name : id
|
||||
}</Tag>)
|
||||
}
|
||||
|
||||
@@ -82,7 +82,7 @@ export default function UsersPage() {
|
||||
{
|
||||
title: "Name",
|
||||
key: "name",
|
||||
render: (user: lib.RawUser) => <Space>
|
||||
render: (user: lib.User) => <Space>
|
||||
{user.name}
|
||||
<span>
|
||||
{user.isAdmin && <Tag color="gold">Admin</Tag>}
|
||||
@@ -96,14 +96,14 @@ export default function UsersPage() {
|
||||
{
|
||||
title: "Roles",
|
||||
key: "roles",
|
||||
render: (user: lib.RawUser) => (
|
||||
user.roles.map(id => <Tag key={id}>{(roles.get(id) || { name: id }).name}</Tag>)
|
||||
render: (user: lib.User) => (
|
||||
[...user.roleIds].map(id => <Tag key={id}>{(roles.get(id) || { name: id }).name}</Tag>)
|
||||
),
|
||||
},
|
||||
{
|
||||
title: "Online time",
|
||||
key: "onlineTime",
|
||||
render: (user: lib.RawUser) => (user.playerStats?.onlineTimeMs
|
||||
render: (user: lib.User) => (user.playerStats?.onlineTimeMs
|
||||
? formatDuration(user.playerStats.onlineTimeMs) : null),
|
||||
sorter: (a, b) => (a.playerStats?.onlineTimeMs ?? 0) -
|
||||
(b.playerStats?.onlineTimeMs ?? 0),
|
||||
@@ -112,7 +112,7 @@ export default function UsersPage() {
|
||||
{
|
||||
title: "Last seen",
|
||||
key: "lastSeen",
|
||||
render: (user: lib.RawUser) => formatLastSeen(user),
|
||||
render: (user: lib.User) => formatLastSeen(user),
|
||||
sorter: (a, b) => sortLastSeen(a, b),
|
||||
responsive: ["lg"],
|
||||
},
|
||||
|
||||
Reference in new issue
Block a user