T12.2: CR-020 row selection in the User Directory
- A checkbox per row the caller may change; select-all covers only the rows the current filter and search show, and is indeterminate on a partial selection. - Your own row and rows you cannot change show a disabled box whose label gives the reason. - Changing the filter or the search clears the selection and says so in a live region (decided 2026-10-06), so no hidden row stays selected. - The bulk bar appears at one or more selected rows and is hidden (out of the tab order) at zero. Actions arrive in T12.3. - Selection is updated in place, not by re-rendering, so focus stays on the checkbox just used. One delegated listener; no ids in inline handlers. - The email-width rule now targets td.ell, not nth-child(3), which the new column would have shifted. Checked in a DOM harness (jsdom) against the real page and scripts: 14/14; against main the selection checks fail. Browser probe at 390px/1440px follows in T12.6.
This commit is contained in:
106
html/users.js
106
html/users.js
@@ -23,6 +23,10 @@
|
||||
let _users = []; // the directory as the server scoped it
|
||||
let _scope = null; // GET /api/auth/user-scope
|
||||
let _meId = null;
|
||||
// CR-020: the rows checked for a bulk action. Client-side UI state only - every
|
||||
// bulk action is decided and audited by the server, row by row (T12.1).
|
||||
let _selected = new Set();
|
||||
let _shownSelectable = []; // ids the current filter shows AND this caller may select
|
||||
|
||||
// ── boot ──────────────────────────────────────────────────────────────────────
|
||||
async function boot(){
|
||||
@@ -90,11 +94,100 @@ async function loadUsers(){
|
||||
}
|
||||
banner('users-banner','', '');
|
||||
_users = json;
|
||||
// Fresh data: any earlier selection may name accounts that changed or are gone.
|
||||
clearSelection(false);
|
||||
renderUsers();
|
||||
}
|
||||
|
||||
function manages(){ return !!(_scope && _scope.can_manage_users); }
|
||||
|
||||
// ── selection (CR-020, T12.2) ─────────────────────────────────────────────────
|
||||
// A row is selectable when this caller may change the account. Your own row is
|
||||
// not: every bulk action that could touch it (disable, demote, delete) is refused
|
||||
// for your own account, so offering it would only produce a guaranteed failure.
|
||||
function selectable(u){ return manages() && !!u.manageable && u.id !== _meId; }
|
||||
|
||||
// The search box and the filter both decide which rows are shown. Changing either
|
||||
// clears the selection (decided 2026-10-06), so no row hidden by the filter can
|
||||
// stay selected and be acted on without being seen.
|
||||
function filterChanged(){
|
||||
const had = _selected.size;
|
||||
clearSelection(false);
|
||||
renderUsers();
|
||||
banner('sel-banner', '', had ? 'Selection cleared: the filter changed. Select the rows again.' : '');
|
||||
}
|
||||
|
||||
function clearSelection(announce){
|
||||
const had = _selected.size;
|
||||
_selected = new Set();
|
||||
updateSelectionUI();
|
||||
banner('sel-banner', '', (announce && had) ? 'Selection cleared.' : '');
|
||||
}
|
||||
|
||||
function setRowSelected(id, on){
|
||||
if(on) _selected.add(id); else _selected.delete(id);
|
||||
}
|
||||
|
||||
// Select-all acts on the rows the filter shows, never on the whole directory.
|
||||
function toggleSelectAll(on){
|
||||
_shownSelectable.forEach(id => setRowSelected(id, on));
|
||||
banner('sel-banner', '', '');
|
||||
updateSelectionUI();
|
||||
}
|
||||
|
||||
// Reflect _selected into the page without re-rendering the table, so keyboard
|
||||
// focus stays on the checkbox that was just used.
|
||||
function updateSelectionUI(){
|
||||
const wrap = document.getElementById('users-table');
|
||||
if(wrap){
|
||||
wrap.querySelectorAll('input.selbox').forEach(cb => {
|
||||
const on = _selected.has(cb.dataset.id);
|
||||
cb.checked = on;
|
||||
const tr = cb.closest('tr');
|
||||
if(tr) tr.classList.toggle('is-selected', on);
|
||||
});
|
||||
const all = document.getElementById('sel-all');
|
||||
if(all){
|
||||
const n = _shownSelectable.filter(id => _selected.has(id)).length;
|
||||
all.checked = n > 0 && n === _shownSelectable.length;
|
||||
all.indeterminate = n > 0 && n < _shownSelectable.length;
|
||||
all.disabled = !_shownSelectable.length;
|
||||
}
|
||||
}
|
||||
const bar = document.getElementById('bulk-bar');
|
||||
if(bar){
|
||||
const n = _selected.size;
|
||||
bar.hidden = n === 0;
|
||||
const c = document.getElementById('bulk-count');
|
||||
if(c) c.textContent = n + ' selected';
|
||||
}
|
||||
}
|
||||
|
||||
// One listener for every checkbox in the table (event delegation): no ids are
|
||||
// bound into inline handlers, so there is nothing to escape.
|
||||
document.addEventListener('change', e => {
|
||||
const t = e.target;
|
||||
if(!(t instanceof HTMLInputElement)) return;
|
||||
if(t.id === 'sel-all'){ toggleSelectAll(t.checked); return; }
|
||||
if(t.classList.contains('selbox')){
|
||||
setRowSelected(t.dataset.id, t.checked);
|
||||
banner('sel-banner', '', '');
|
||||
updateSelectionUI();
|
||||
}
|
||||
});
|
||||
|
||||
function selCell(u){
|
||||
if(!selectable(u)){
|
||||
const why = u.id === _meId ? 'Your own account: change it one setting at a time'
|
||||
: (u.manage_blocked_reason || 'You cannot change this account');
|
||||
return '<td class="selcell"><span class="selhit" title="'+uesc(why)+'">'+
|
||||
'<input type="checkbox" disabled aria-label="'+uesc('Cannot select '+u.username+': '+why)+'"></span></td>';
|
||||
}
|
||||
return '<td class="selcell"><label class="selhit">'+
|
||||
'<input type="checkbox" class="selbox" data-id="'+uesc(u.id)+'"'+(_selected.has(u.id)?' checked':'')+
|
||||
' aria-label="'+uesc('Select '+u.username)+'"></label></td>';
|
||||
}
|
||||
|
||||
function renderUsers(){
|
||||
const wrap = document.getElementById('users-table');
|
||||
const q = ((document.getElementById('user-search')||{}).value||'').trim().toLowerCase();
|
||||
@@ -116,7 +209,8 @@ function renderUsers(){
|
||||
(u.project_role||'')+' '+roleLabel(u.role)).toLowerCase().indexOf(q) >= 0;
|
||||
});
|
||||
const count = '<div class="note">'+list.length+' of '+total+' '+(total===1?'person':'people')+'</div>';
|
||||
if(!list.length){ wrap.innerHTML = count+'<div class="note">Nothing matches.</div>'; return; }
|
||||
_shownSelectable = list.filter(selectable).map(u => u.id);
|
||||
if(!list.length){ wrap.innerHTML = count+'<div class="note">Nothing matches.</div>'; updateSelectionUI(); return; }
|
||||
|
||||
const head = manages()
|
||||
? ['Username','Name','Email',
|
||||
@@ -130,9 +224,16 @@ function renderUsers(){
|
||||
'Status'];
|
||||
const ths = head.map(h => Array.isArray(h)
|
||||
? '<th title="'+uesc(h[1])+'">'+uesc(h[0])+'</th>' : '<th>'+uesc(h)+'</th>').join('');
|
||||
// CR-020: a selection column for anyone who manages accounts. Select-all names
|
||||
// how many rows it covers, because it covers only what the filter shows.
|
||||
const selTh = manages()
|
||||
? '<th class="selcell"><label class="selhit"><input type="checkbox" id="sel-all" aria-label="'+
|
||||
uesc('Select all '+_shownSelectable.length+' shown that you can change')+'"></label></th>'
|
||||
: '';
|
||||
const rows = list.map(manages() ? managerRow : readonlyRow).join('');
|
||||
wrap.innerHTML = count+'<div class="tscroll"><table class="grid"><thead><tr>'+ths+
|
||||
wrap.innerHTML = count+'<div class="tscroll"><table class="grid"><thead><tr>'+selTh+ths+
|
||||
'</tr></thead><tbody>'+rows+'</tbody></table></div>'+legend();
|
||||
updateSelectionUI();
|
||||
}
|
||||
|
||||
function legend(){
|
||||
@@ -189,6 +290,7 @@ function managerRow(u){
|
||||
if(!can && !me) actions.push('<span class="note" style="margin:0" title="'+uesc(why)+'">read-only</span>');
|
||||
|
||||
return '<tr'+(can||me ? '' : ' class="is-locked"')+'>'+
|
||||
selCell(u)+
|
||||
'<td><strong>'+uesc(u.username)+'</strong>'+(me?'<span class="me-tag">you</span>':'')+'</td>'+
|
||||
'<td>'+uesc(u.full_name||'')+'</td>'+
|
||||
// The address is truncated with the full value on the title: a long one used to
|
||||
|
||||
Reference in New Issue
Block a user