Talon/chat_grid
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refine admin set-role flow and remove extra status chatter

Browse Source
This commit is contained in:
Jage9
2026-02-27 03:59:02 -05:00
parent 7c0ddf99d1
commit d114e0d532
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/public/version.js
View File

@@ -1,5 +1,5 @@
// Maintainer-controlled web client version. // Maintainer-controlled web client version.
// Format: YYYY.MM.DD Rn (example: 2026.02.20 R2) // Format: YYYY.MM.DD Rn (example: 2026.02.20 R2)
window.CHGRID_WEB_VERSION = "2026.02.27 R288"; window.CHGRID_WEB_VERSION = "2026.02.27 R289";
// Optional display timezone for timestamps. Falls back to America/Detroit if unset/invalid. // Optional display timezone for timestamps. Falls back to America/Detroit if unset/invalid.
window.CHGRID_TIME_ZONE = "America/Detroit"; window.CHGRID_TIME_ZONE = "America/Detroit";

30
client/src/main.ts
View File

@@ -310,6 +310,7 @@ let adminUserIndex = 0;
let adminPendingUserAction: 'set_role' | 'ban' | 'unban' | null = null; let adminPendingUserAction: 'set_role' | 'ban' | 'unban' | null = null;
let adminSelectedRoleName = ''; let adminSelectedRoleName = '';
let adminSelectedUsername = ''; let adminSelectedUsername = '';
let adminPendingRoleChange: { username: string; role: string } | null = null;
let activeTeleport: let activeTeleport:
| { | {
startX: number; startX: number;
@@ -1632,6 +1633,27 @@ function handleAdminActionResult(message: Extract<IncomingMessage, { type: 'admi
if (message.action === 'role_update_permissions') { if (message.action === 'role_update_permissions') {
return; return;
} }
if (message.action === 'user_set_role') {
if (message.ok && adminPendingRoleChange) {
for (const user of adminUsers) {
if (user.username === adminPendingRoleChange.username) {
user.role = adminPendingRoleChange.role;
}
}
if (state.mode === 'adminUserList' && adminUsers.length > 0) {
adminUserIndex = Math.max(0, Math.min(adminUserIndex, adminUsers.length - 1));
const selected = adminUsers[adminUserIndex];
updateStatus(`${selected.username}, ${selected.role}, ${selected.status}.`);
}
adminPendingRoleChange = null;
audio.sfxUiConfirm();
return;
}
adminPendingRoleChange = null;
updateStatus(message.message);
audio.sfxUiCancel();
return;
}
updateStatus(message.message); updateStatus(message.message);
if (message.ok) { if (message.ok) {
audio.sfxUiConfirm(); audio.sfxUiConfirm();
@@ -2881,14 +2903,10 @@ function handleAdminUserRoleSelectModeInput(code: string, key: string): void {
} }
if (control.type === 'select') { if (control.type === 'select') {
const selectedRole = adminRoles[adminRoleIndex]; const selectedRole = adminRoles[adminRoleIndex];
adminPendingRoleChange = { username: adminSelectedUsername, role: selectedRole.name };
signaling.send({ type: 'admin_user_set_role', username: adminSelectedUsername, role: selectedRole.name }); signaling.send({ type: 'admin_user_set_role', username: adminSelectedUsername, role: selectedRole.name });
for (const user of adminUsers) {
if (user.username === adminSelectedUsername) {
user.role = selectedRole.name;
}
}
state.mode = 'adminUserList'; state.mode = 'adminUserList';
adminPendingUserAction = null; adminPendingUserAction = 'set_role';
const selectedUser = adminUsers.find((user) => user.username === adminSelectedUsername); const selectedUser = adminUsers.find((user) => user.username === adminSelectedUsername);
if (selectedUser) { if (selectedUser) {
updateStatus(`${selectedUser.username}, ${selectedUser.role}, ${selectedUser.status}.`); updateStatus(`${selectedUser.username}, ${selectedUser.role}, ${selectedUser.status}.`);