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

Fix help duplicates and role selection focus timing

Browse Source
This commit is contained in:
Jage9
2026-02-27 04:23:30 -05:00
parent f07bdb0296
commit 10e7a01e73
2 changed files with 17 additions and 13 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 R291"; window.CHGRID_WEB_VERSION = "2026.02.27 R292";
// 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";

28
client/src/main.ts
View File

@@ -414,7 +414,6 @@ function renderHelp(help: HelpData): void {
const sectionHeading = document.createElement('h3'); const sectionHeading = document.createElement('h3');
sectionHeading.textContent = section.title; sectionHeading.textContent = section.title;
dom.instructions.appendChild(sectionHeading); dom.instructions.appendChild(sectionHeading);
lines.push(section.title);
for (const item of section.items) { for (const item of section.items) {
const line = document.createElement('p'); const line = document.createElement('p');
const keys = document.createElement('b'); const keys = document.createElement('b');
@@ -1593,10 +1592,13 @@ function handleAdminRolesList(message: Extract<IncomingMessage, { type: 'admin_r
adminPermissionTooltips = { ...(message.permissionTooltips ?? {}) }; adminPermissionTooltips = { ...(message.permissionTooltips ?? {}) };
if (adminPendingUserAction === 'set_role' && adminSelectedUsername) { if (adminPendingUserAction === 'set_role' && adminSelectedUsername) {
state.mode = 'adminUserRoleSelect'; state.mode = 'adminUserRoleSelect';
adminRoleIndex = 0; const selectedUser = adminUsers.find((entry) => entry.username === adminSelectedUsername);
const currentRoleIndex =
selectedUser ? adminRoles.findIndex((entry) => entry.name === selectedUser.role) : -1;
adminRoleIndex = currentRoleIndex >= 0 ? currentRoleIndex : 0;
const first = adminRoles[0]; const first = adminRoles[0];
if (first) { if (first && adminRoles[adminRoleIndex]) {
updateStatus(first.name); updateStatus(adminRoles[adminRoleIndex].name);
audio.sfxUiBlip(); audio.sfxUiBlip();
} else { } else {
updateStatus('No roles available.'); updateStatus('No roles available.');
@@ -1657,6 +1659,16 @@ function handleAdminActionResult(message: Extract<IncomingMessage, { type: 'admi
if (target) { if (target) {
target.role = adminPendingUserMutation.role; target.role = adminPendingUserMutation.role;
} }
if (state.mode === 'adminUserRoleSelect') {
state.mode = 'adminUserList';
adminPendingUserAction = 'set_role';
const userIndex = adminUsers.findIndex((entry) => entry.username === adminPendingUserMutation.username);
if (userIndex >= 0) {
adminUserIndex = userIndex;
const selected = adminUsers[adminUserIndex];
updateStatus(`${selected.username}, ${selected.role}, ${selected.status}.`);
}
}
} else if (adminPendingUserMutation.action === 'ban') { } else if (adminPendingUserMutation.action === 'ban') {
adminUsers = adminUsers.filter((entry) => entry.username !== adminPendingUserMutation.username); adminUsers = adminUsers.filter((entry) => entry.username !== adminPendingUserMutation.username);
if (state.mode === 'adminUserList' && adminPendingUserAction === 'ban') { if (state.mode === 'adminUserList' && adminPendingUserAction === 'ban') {
@@ -2921,14 +2933,6 @@ function handleAdminUserRoleSelectModeInput(code: string, key: string): void {
const selectedRole = adminRoles[adminRoleIndex]; const selectedRole = adminRoles[adminRoleIndex];
adminPendingUserMutation = { action: 'set_role', username: adminSelectedUsername, role: selectedRole.name }; adminPendingUserMutation = { action: 'set_role', 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 });
state.mode = 'adminUserList';
adminPendingUserAction = 'set_role';
const selectedUser = adminUsers.find((user) => user.username === adminSelectedUsername);
if (selectedUser) {
updateStatus(`${selectedUser.username}, ${selectedUser.role}, ${selectedUser.status}.`);
} else {
updateStatus('Select user.');
}
return; return;
} }
if (control.type === 'cancel') { if (control.type === 'cancel') {