@bongos/core 1.21.37 → 1.21.39

package/tests/hall_street_desk.mjs

@@ -202,6 +202,43 @@ test('a row\'s buttons are the card\'s acts under the board\'s words, and send t
   assert.equal(D.rowsFor('charter', 0, dk, { now: NOW })[0].wait, 'reading…');
 });
 
+// task 1004564: the proposer's own sitting, before anyone has voted, is one row
+// with one button — withdraw — sent to the withdraw route. A vote takes it away.
+test('your own sitting with no vote on it: one row, withdraw, sent to its route; a vote or another viewer takes it away', () => {
+  const ms = [matter({ id: 'board:1', source: 'board', building: 'charter', state: 'moving', ref: { type: 'board_item', id: '1' } })];
+  const dk = docket(ms);
+  const room = (votes) => ({ open: [{ id: '1', subject_type: 'constitutional_amendment', subject: { title: LONG, author_id: '95' }, votes }], closed: [] });
+  const mine = D.rowsFor('charter', 0, dk, { room: room([]), now: NOW, viewerId: '95' })[0];
+  assert.deepEqual(mine.actions.map((a) => [a.key, a.label]), [['withdraw', 'withdraw']]);
+  assert.equal(mine.chips, null, 'withdraw asks nothing: no chips');
+  assert.deepEqual(j(C.request(mine.card, 'withdraw')), { method: 'POST', url: '/api/bongos/government/board/items/1/withdraw', body: {} });
+  assert.match(C.answer(mine.card, 'withdraw', { item_closed: true, outcome: 'withdrawn' }).toast, /^Withdrawn/);
+  assert.equal(C.refusal(409, { error: { code: 'votes_cast' } }), 'Someone has voted on it, so it is the sitting\'s to decide now.');
+  // one vote — anyone's — and the row is the sitting's again
+  const voted = D.rowsFor('charter', 0, dk, { room: room([{ voter_id: '7', direction: 'yes', name: 'Ana' }]), now: NOW, viewerId: '95' })[0];
+  assert.ok(!voted.actions.some((a) => a.key === 'withdraw'), 'no withdraw once a vote is cast');
+  // someone else's sitting never offers it
+  const theirs = D.rowsFor('charter', 0, dk, { room: room([]), now: NOW, viewerId: '7' })[0];
+  assert.ok(!theirs.actions.some((a) => a.key === 'withdraw'), 'only the proposer sees withdraw');
+  // a proposer who may also vote keeps yes first, withdraw second — still two buttons
+  const needs = D.rowsFor('charter', 0, docket([{ ...ms[0], state: 'needs' }]), { room: room([]), now: NOW, viewerId: '95' })[0];
+  assert.deepEqual(needs.actions.map((a) => a.key), ['for', 'withdraw']);
+  // and the line rule holds on every floor with the proposer looking
+  const own = { ...ROOM, open: ROOM.open.map((it) => it.subject_type === 'full_idea' ? it : { ...it, subject: { ...it.subject, author_id: '95' } }) };
+  const desks = everyDesk(docket(longMatters()), { room: own });
+  assert.ok(desks.flatMap((d) => d.rows).some((r) => r.actions.some((a) => a.key === 'withdraw')), 'the stress docket reached a withdraw row');
+  assert.deepEqual(desks.flatMap((d) => D.breaks(d)), []);
+});
+
+test('a withdrawn sitting reads as withdrawn on the card, never as sent back to revise', () => {
+  const dk = docket([matter({ id: 'board:1', source: 'board', building: 'charter', state: 'settled', ref: { type: 'board_item', id: '1' } })]);
+  const room = { open: [], closed: [{ id: '1', subject_type: 'constitutional_amendment', subject: { title: 'Shorter windows', author_id: '95' }, votes: [], closed_at: '2026-10-03T10:00:00.000Z', outcome: 'withdrawn' }] };
+  const cv = (viewerId) => C.model({ docket: dk, key: 'board:1', room, now: NOW, viewerId });
+  assert.equal(cv('95').result, 'You withdrew it before anyone voted.');
+  assert.match(cv('7').result, /^Withdrawn by .* before anyone voted\.$/);
+  assert.equal(cv('95').readOnly, true);
+});
+
 // ── the page: the desk acts in place, and the game layer answers ──────────────
 
 function fakeDom() {

package/tests/hall_street_inside.mjs

@@ -218,7 +218,7 @@ test('a source that is off, coming, not yours or unreadable never shows a number
   const none = I.civicInfo('release', { docket: null, now: NOW });
   assert.ok(none.floors.every((f) => f.count === '' && f.status !== 'ok' && f.status !== 'pending'), 'no docket: no numbers anywhere');
   assert.equal(none.onFile, 'the docket could not be read just now');
-  assert.deepEqual(none.table, []);
+  assert.deepEqual(none.record, [], 'no docket: nothing filed');
 });
 
 test('a floor bound to a reading shows its figure and line when live; Planning counts the open goals', () => {
@@ -237,12 +237,12 @@ test('a floor bound to a reading shows its figure and line when live; Planning c
   assert.ok(m.texts.some((t) => t.v === '5' && t.s === 20), 'only open goals are counted on the wall');
 });
 
-test('on the table: the building\'s matters, needs first; each row names the matter it opens', () => {
-  const ms = [matter({ id: 'board:1', source: 'board', building: 'charter', state: 'moving', title: 'B', deadline: '2026-10-04T09:00:00.000Z' }), matter({ id: 'board:2', source: 'board', building: 'charter', state: 'needs', title: 'A', deadline: '2026-10-02T20:00:00.000Z' }), matter({ id: 'blockers:3' })];
+test('no separate list of matters: the floor desks carry every matter, so the model keeps no table (task 1004565)', () => {
+  const ms = [matter({ id: 'board:1', source: 'board', building: 'charter', state: 'moving', title: 'B' }), matter({ id: 'board:2', source: 'board', building: 'charter', state: 'needs', title: 'A' })];
   const m = I.buildingModel({ key: 'charter', docket: docket(ms), mode: 'light', now: NOW });
-  assert.deepEqual(m.table.map((r) => [r.matter, r.label, r.status, r.state]), [['board:2', 'A', 'needs you · today', 'needs'], ['board:1', 'B', 'moving · sun', 'moving']]);
-  assert.equal(m.table[0].color, S.theme('light').accentText);
-  assert.ok(m.hasTable);
+  assert.ok(!('table' in m) && !('hasTable' in m), 'no table fields on the model');
+  assert.doesNotMatch(m.label, /on the table/, 'the building\'s label no longer counts a table');
+  assert.match(m.label, /floors in use\.$/);
 });
 
 test('the record files the building\'s matters by the month each was opened, newest drawer first', () => {
@@ -524,7 +524,8 @@ const FEEDS = (ms, extra = {}) => ({
 
 test('the markup carries the interior: one persistent lift, two flip blocks, the panel and the back link', () => {
   const html = read('street.html').replace(/<!--[\s\S]*?-->/g, '');
-  for (const id of ['streetInside', 'insideBack', 'insideSvg', 'insideFloors', 'insideLift', 'insideAnnex', 'insidePanel', 'insideName', 'insideAmend', 'insideAmendNote', 'insideFill', 'insideTable', 'insideOpenA', 'insideOpenB', 'insideDrawers', 'insideDrawerItems', 'insideDName', 'insideLegend', 'insideItems']) assert.match(html, new RegExp(`id="${id}"`), id);
+  for (const id of ['streetInside', 'insideBack', 'insideSvg', 'insideFloors', 'insideLift', 'insideAnnex', 'insidePanel', 'insideName', 'insideAmend', 'insideAmendNote', 'insideFill', 'insideOpenA', 'insideOpenB', 'insideDrawers', 'insideDrawerItems', 'insideDName', 'insideLegend', 'insideItems']) assert.match(html, new RegExp(`id="${id}"`), id);
+  assert.doesNotMatch(html, /insideTable|on the table here/i, 'the "on the table here" list is gone (task 1004565)');
   assert.equal((html.match(/<h1\b/g) || []).length, 1, 'the street keeps its one h1; the interior names are h2');
   assert.match(html, /<section class="inside" id="streetInside"[^>]*hidden>/, 'hidden until an address names a building or a district');
   assert.match(html, /<button type="button" class="inside-textbtn" id="insideAmend"/);
@@ -539,8 +540,7 @@ test('a building address draws the interior in place of the street, from the doc
   assert.equal(p.byId.get('insideFloors').children.length, 7, 'a button per floor in use');
   assert.equal(p.byId.get('insideFloors').children[4].attrs['aria-pressed'], 'true', 'the floor being decided is chosen');
   assert.equal(p.byId.get('insideLift').style.transform, 'translateY(-208px)');
-  assert.equal(p.byId.get('insideTable').children.length, 1);
-  assert.equal(p.byId.get('insideTable').children[0].className, 'inside-row inside-row--needs');
+  assert.equal(p.byId.get('insideTable'), undefined, 'no separate list of matters');
   assert.equal(p.byId.get('insideSeats').children[0].className, 'inside-seat inside-seat--open');
   assert.equal(p.focused.el, null, 'a page opened at the address keeps the browser\'s own start');
   p.location.hash = '#building=rules';
@@ -575,15 +575,17 @@ test('picking a floor moves the SAME lift node and re-enters the chosen block; d
   assert.match(p.byId.get('insideAmendNote').textContent, /could not be read/);
 });
 
-test('a table row opens the short card; Escape gives focus back to the row; back to the street returns to the door', async () => {
+test('a matter is a desk row: its name opens it in place; back to the street returns to the door', async () => {
   const ms = [matter({ id: 'board:1', source: 'board', building: 'charter', state: 'needs', title: '<b>x</b>' })];
   const p = await bootPage({ hash: '#building=charter', feeds: FEEDS(ms) });
-  p.byId.get('insideTable').children[0].fire('click');
-  assert.equal(p.byId.get('streetCard').hidden, false);
-  assert.equal(p.byId.get('streetCardTitle').textContent, '<b>x</b>', 'docket text lands as text');
-  p.fireWin('keydown', { key: 'Escape', preventDefault() {} });
-  assert.equal(p.byId.get('streetCard').hidden, true);
-  assert.equal(p.focused.el.attrs['data-matter'], 'board:1', 'focus goes back to the row');
+  const desk = () => (p.byId.get('insideOpenA').hidden ? p.byId.get('insideOpenB') : p.byId.get('insideOpenA'));
+  const find = (el, pred) => { if (pred(el)) return el; for (const c of el.children) { const hit = find(c, pred); if (hit) return hit; } return null; };
+  const nameOf = () => find(desk(), (el) => el.attrs && el.attrs['data-matter'] === 'board:1');
+  assert.ok(nameOf(), 'the desk carries the matter as a row');
+  assert.equal(nameOf().attrs['aria-expanded'], 'false');
+  nameOf().fire('click');
+  assert.equal(nameOf().attrs['aria-expanded'], 'true', 'the row opens in place');
+  assert.equal(p.byId.get('streetCard').hidden, true, 'no card is needed inside: the desk acts');
   p.byId.get('insideBack').fire('click');
   assert.deepEqual(p.history, ['/builders/street']);
   assert.equal(p.byId.get('streetInside').hidden, true);