mirror of
https://github.com/PHIDIAS0303/ExpCluster.git
synced 2026-09-21 17:04:00 +00:00
Address review on the role api
- Roles are objects and everything done to or with a role is a method on it: assign, unassign, has_player, has_permission, is_higher_than, is_lower_than, get_players, get_player_names, print. Assignment has one entry point, role:assign(player, options), with local_only as an option rather than a second function. - Roles are looked up by clusterio id with get_role; get_role_by_name searches the list for the few places, such as configs, which only know a name. The name map and the ordered list are gone, get_roles sorts on demand and the index field is replaced by the comparison methods. - Players are LuaPlayer objects only, with nil or index 0 for the server. - get_higher_roles and get_lower_roles replace print_to_roles_higher and print_to_roles_lower, call sites loop over them with role:print. - Permission groups are removed from roles again, exp_groups owns the mapping from roles to groups. - Seeding is a SeedRolesRequest behind a button on the roles page rather than running on first start, and creates only the roles; the player assignments are dropped. The seed lists each permission once at the lowest role which has it and lets the parent chain carry it up. - System commands unlock for core.admin rather than a permission of their own. - Role metatables are registered with Storage.register_metatable so the methods survive save and load, which the role records in storage needed. - The player list auth uses Roles.player_outranks directly, and the event carries role ids rather than names. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Fable 5
parent
78a533a6f6
commit
bea8d46c82
@@ -15,7 +15,6 @@ type RoleFormValues = {
|
||||
shortHand: string;
|
||||
tag: string;
|
||||
color: string | { toRgb(): { r: number, g: number, b: number } } | null;
|
||||
permissionGroup: string;
|
||||
autoAssignHours: number | null;
|
||||
blockAutoAssign: boolean;
|
||||
};
|
||||
@@ -47,7 +46,6 @@ export default function RoleProperties(props: { plugin: WebPlugin, role?: lib.Ro
|
||||
shortHand: meta.shortHand,
|
||||
tag: meta.tag,
|
||||
color: meta.color ? `rgb(${meta.color.r}, ${meta.color.g}, ${meta.color.b})` : null,
|
||||
permissionGroup: meta.permissionGroup,
|
||||
autoAssignHours: meta.autoAssignOnlineTimeMs === null
|
||||
? null
|
||||
: meta.autoAssignOnlineTimeMs / MS_PER_HOUR,
|
||||
@@ -80,7 +78,6 @@ export default function RoleProperties(props: { plugin: WebPlugin, role?: lib.Ro
|
||||
values.shortHand ?? "",
|
||||
values.tag ?? "",
|
||||
color,
|
||||
values.permissionGroup ?? "",
|
||||
values.autoAssignHours === null || values.autoAssignHours === undefined
|
||||
? null
|
||||
: values.autoAssignHours * MS_PER_HOUR,
|
||||
@@ -161,19 +158,6 @@ export default function RoleProperties(props: { plugin: WebPlugin, role?: lib.Ro
|
||||
</Form.Item>
|
||||
</Col>
|
||||
|
||||
<Col xs={24} sm={12} xl={6}>
|
||||
<Form.Item
|
||||
name="permissionGroup"
|
||||
label={labelled(
|
||||
"Permission group",
|
||||
"Factorio permission group players are moved into while this is their "
|
||||
+ "most privileged role which names one. Leave empty to not change their group"
|
||||
)}
|
||||
>
|
||||
<Input />
|
||||
</Form.Item>
|
||||
</Col>
|
||||
|
||||
<Col xs={24} sm={12} xl={6}>
|
||||
<Form.Item
|
||||
name="autoAssignHours"
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
import React, { useContext, useState } from "react";
|
||||
import { Button, Popconfirm } from "antd";
|
||||
|
||||
import { ControlContext, SectionHeader, useAccount, notifyErrorHandler } from "@clusterio/web_ui";
|
||||
|
||||
import { SeedRolesRequest } from "../../messages";
|
||||
|
||||
/** Button on the roles page which creates the roles the scenario shipped with. */
|
||||
export default function SeedRoles() {
|
||||
const control = useContext(ControlContext);
|
||||
const account = useAccount();
|
||||
const [seeding, setSeeding] = useState(false);
|
||||
|
||||
if (!account.hasPermission("core.role.create")) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return <SectionHeader
|
||||
title="ExpGaming Roles"
|
||||
extra={<Popconfirm
|
||||
title="Create the ExpGaming roles?"
|
||||
description="Roles which already exist by name are kept and only gain permissions."
|
||||
onConfirm={() => {
|
||||
setSeeding(true);
|
||||
control.send(new SeedRolesRequest())
|
||||
.catch(notifyErrorHandler("Error seeding roles"))
|
||||
.finally(() => setSeeding(false));
|
||||
}}
|
||||
>
|
||||
<Button loading={seeding}>Seed roles</Button>
|
||||
</Popconfirm>}
|
||||
/>;
|
||||
}
|
||||
Reference in New Issue
Block a user