diff --git a/packages/lib/link/messages.js b/packages/lib/link/messages.js index cd0a00c8..5b5361da 100644 --- a/packages/lib/link/messages.js +++ b/packages/lib/link/messages.js @@ -801,6 +801,7 @@ const userProperties = { "is_admin": { type: "boolean" }, "is_banned": { type: "boolean" }, "is_whitelisted": { type: "boolean" }, + "ban_reason": { type: "string" }, "instances": { type: "array", items: { type: "integer" }}, "is_deleted": { type: "boolean" }, "player_stats": PlayerStats.jsonSchema, diff --git a/packages/master/src/ControlConnection.js b/packages/master/src/ControlConnection.js index 37cc1b6c..e60f1fd5 100644 --- a/packages/master/src/ControlConnection.js +++ b/packages/master/src/ControlConnection.js @@ -577,6 +577,7 @@ class ControlConnection extends BaseConnection { is_admin: user.isAdmin, is_banned: user.isBanned, is_whitelisted: user.isWhitelisted, + ban_reason: user.banReason, instances: [...user.instances], player_stats: user.playerStats, instance_stats: [...user.instanceStats], @@ -614,6 +615,7 @@ class ControlConnection extends BaseConnection { is_admin: user.isAdmin, is_banned: user.isBanned, is_whitelisted: user.isWhitelisted, + ban_reason: user.banReason, instances: [...user.instances], player_stats: user.playerStats, instance_stats: [...user.instanceStats], diff --git a/packages/web_ui/src/components/UserViewPage.jsx b/packages/web_ui/src/components/UserViewPage.jsx index 81a11e00..9e561b96 100644 --- a/packages/web_ui/src/components/UserViewPage.jsx +++ b/packages/web_ui/src/components/UserViewPage.jsx @@ -2,7 +2,7 @@ import React, { useEffect, useContext, useState } from "react"; import { useHistory, useParams } from "react-router-dom"; import { Button, Col, Descriptions, Form, Input, PageHeader, Popconfirm, - Popover, Row, Table, Tag, Select, Space, Spin, Switch, + Row, Table, Tag, Select, Space, Spin, Switch, } from "antd"; import DeleteOutlined from "@ant-design/icons/DeleteOutlined"; @@ -21,6 +21,9 @@ import { formatLastSeen, sortLastSeen, useUser } from "../model/user"; const strcmp = new Intl.Collator(undefined, { numerice: "true", sensitivity: "base" }).compare; +// The user page has a lot of optional elements, that does not make it +// praticularly complicated. +// eslint-disable-next-line complexity export default function UserViewPage() { let params = useParams(); let userName = params.name; @@ -30,13 +33,13 @@ export default function UserViewPage() { let account = useAccount(); let control = useContext(ControlContext); let [instanceList] = useInstanceList(); - let [user, updateUser] = useUser(userName); + let [user] = useUser(userName); let [roles, setRoles] = useState(null); let [form] = Form.useForm(); let [rolesDirty, setRolesDirty] = useState(false); + let [banReasonDirty, setBanReasonDirty] = useState(false); let [applyingRoles, setApplyingRoles] = useState(false); let [rolesError, setRolesError] = useState(); - let [banUserPopover, setBanUserPopover] = useState(false); useEffect(() => { libLink.messages.listRoles.send(control).then(result => { @@ -46,6 +49,16 @@ export default function UserViewPage() { }); }, []); + useEffect(() => { + if ( + account.hasPermission("core.user.set_banned") + && !banReasonDirty + && user["ban_reason"] !== form.getFieldValue("ban_reason") + ) { + form.setFieldsValue({ "ban_reason": user["ban_reason"] }); + } + }, [account, form, user, banReasonDirty]); + let nav = [{ name: "Users", path: "/users" }, { name: userName }]; if (user.loading) { return @@ -151,7 +164,7 @@ export default function UserViewPage() { - + {account.hasPermission("core.user.update_roles") ? roleSelector @@ -185,105 +198,100 @@ export default function UserViewPage() { } - + {account.hasPermission("core.user.set_admin") && { libLink.messages.setUserAdmin.send(control, { name: userName, admin: !user["is_admin"], create: false, - }).then(() => { - updateUser(); }).catch(notifyErrorHandler("Error toggling user admin status")); }} /> - - + } + {account.hasPermission("core.user.set_whitelisted") && { libLink.messages.setUserWhitelisted.send(control, { name: userName, whitelisted: !user["is_whitelisted"], create: false, - }).then(() => { - updateUser(); }).catch(notifyErrorHandler("Error toggling user whitelisted status")); }} /> - - - - {user["is_banned"] ? "Yes" : "No"} - {account.hasPermission("core.user.set_banned") && { - if (!user["is_banned"]) { - setBanUserPopover(!banUserPopover); - } - }} - content={ - - - - - - - + } + {account.hasPermission("core.user.set_banned") + ? + + + + { + setBanReasonDirty(e.target.value !== user["ban_reason"]); + }} + /> + + + + {user["is_banned"] + ? - - - } - > - - } - - + >Update + + + : + } + + + + : user["is_banned"] + && {user["ban_reason"]} + } - {user["player_stats"]["online_time_ms"] && formatDuration(user["player_stats"]["online_time_ms"])} + {formatDuration(user["player_stats"]["online_time_ms"] || 0)} - {user["player_stats"]["join_count"]} + {user["player_stats"]["join_count"] || 0} - {formatLastSeen(user)} + {formatLastSeen(user) || " "} diff --git a/test/integration/clusterio.js b/test/integration/clusterio.js index 375c1eca..8c029e1f 100644 --- a/test/integration/clusterio.js +++ b/test/integration/clusterio.js @@ -480,6 +480,10 @@ describe("Integration of Clusterio", function() { return new Map(result.list.map(user => [user.name, user])); } + async function getUser(name) { + return await libLink.messages.getUser.send(getControl(), { name }); + } + let lists = ["admin", "whitelisted", "banned"]; it("should add and remove the given user to the list", async function() { slowTest(this); @@ -522,6 +526,15 @@ describe("Integration of Clusterio", function() { } assert.equal(getControl().userUpdates.length, 3); }); + it("should send ban reason", async function() { + slowTest(this); + getControl().userUpdates = []; + await execCtl("user set-banned --create test_ban_reason --reason a-reason"); + assert.equal(getControl().userUpdates.length, 1); + assert.equal(getControl().userUpdates[0].ban_reason, "a-reason"); + let user = await getUser("test_ban_reason"); + assert.equal(user["ban_reason"], "a-reason"); + }); }); describe("instance extract-players", function() {