@bongos/core 1.21.34 → 1.21.36

package/modules/hall-ui/public/street.css

@@ -310,9 +310,22 @@ html[data-fullscreen="on"] .street-top { padding-right: 184px; }
 .desk-chip--primary { background: var(--ink); border: 0; color: var(--bg); }
 .desk-chip--quiet, .desk-chip--choice { background: none; border: 1px solid var(--street-rule-strong); color: var(--ink); }
 .desk-chip--choice { height: 30px; padding: 0 14px; }
+.desk-field { height: 30px; min-width: 0; flex: 1 1 140px; max-width: 220px; padding: 0 12px; border-radius: 999px; border: 1px solid var(--street-rule-strong); background: none; color: var(--ink); font-family: var(--font-body); font-size: 13.5px; }
 .desk-chip:hover { filter: brightness(1.08); }
 .desk-chip[disabled] { opacity: 0.55; cursor: progress; }
 .desk-wait { font-size: 13px; color: var(--ink-faint); border: 1px dashed var(--street-rule-strong); border-radius: 999px; padding: 6px 12px; white-space: nowrap; }
+/* the Planning desks (task 1004560): a goal's place in the order, its promise
+   pips (or a vote's seats), the two arrows, and the save bar under a moved order */
+.desk-pos { width: 22px; flex: none; font-size: 13px; color: var(--ink-faint); font-variant-numeric: tabular-nums; }
+.desk-pips { display: flex; gap: 4px; flex: none; }
+.desk-pip { width: 12px; height: 12px; border-radius: 3px; box-sizing: border-box; border: 1px solid var(--street-rule-strong); }
+.desk-pip--on { background: var(--ink); border-color: var(--ink); }
+.desk-arrow { width: 34px; height: 34px; flex: none; border-radius: 999px; border: 1px solid var(--street-rule-strong); background: none; color: var(--ink); cursor: pointer; display: inline-flex; align-items: center; justify-content: center; padding: 0; }
+.desk-arrow svg { fill: none; stroke: currentColor; stroke-width: 2; stroke-linecap: round; stroke-linejoin: round; }
+.desk-arrow[disabled] { opacity: 0.55; cursor: progress; }
+.desk-arrow:focus-visible { outline: 2px solid var(--accent); outline-offset: 3px; }
+.desk-save { display: flex; align-items: center; flex-wrap: wrap; gap: 10px 14px; padding: 16px 0 0; animation: street-enter 300ms cubic-bezier(.16,1,.3,1) both; }
+.desk-save__line { font-size: 13.5px; color: var(--ink-soft); margin-right: auto; }
 .desk-facts, .desk-choices { display: flex; gap: 8px; flex-wrap: wrap; align-items: center; padding: 10px 0 2px 52px; animation: street-enter 300ms cubic-bezier(.16,1,.3,1) both; }
 .desk-fact { font-size: 13px; color: var(--ink-soft); background: var(--street-wash); border-radius: 6px; padding: 6px 10px; white-space: nowrap; }
 .desk-choices__ask { font-size: 12.5px; color: var(--ink-faint); margin-right: 4px; }
@@ -372,6 +385,9 @@ html[data-fullscreen="on"] .street-top { padding-right: 184px; }
   .inside-gov__row { flex-wrap: wrap; row-gap: 4px; }
   .desk-row__main { flex-wrap: wrap; row-gap: 8px; }
   .desk-name { flex-basis: calc(100% - 52px); }
+  .desk-pos ~ .desk-name { flex-basis: calc(100% - 88px); }
+  .desk-pos ~ .desk-pips { margin-left: 88px; }
+  .desk-pips ~ .desk-acts { margin-left: auto; }
   .desk-acts { margin-left: 52px; }
   .desk-facts, .desk-choices { padding-left: 0; }
   .desk-tile { min-width: 0; padding: 10px 14px; }

package/modules/hall-ui/public/street.js

@@ -82,7 +82,8 @@
   var view = { open: null, opener: null, model: null, scale: 1, mode: null, inside: null, insideModel: null };
   // the desk's own state: rows you acted on this visit, what you did per floor,
   // the floors you cleared, the row whose facts or chips are open
-  var desk = { done: {}, mine: {}, cleared: {}, open: null, ask: null, busy: false, roomAsked: false, model: null };
+  // order: the Priorities desk's order as the viewer has moved it, per floor (task 1004560)
+  var desk = { done: {}, mine: {}, cleared: {}, order: {}, open: null, ask: null, busy: false, roomAsked: false, model: null };
   var TODAY_KEY = 'gov-desk-today';
   var today = { day: '', n: 0 };
 
@@ -553,7 +554,7 @@
     var D = window.GovDesk, st = view.inside;
     if (!D || !st) return;
     var k = st.key + ':' + bv.selFloor;
-    var dm = D.deskModel({ key: st.key, floor: bv.selFloor, docket: data.docket, goals: (data.goals || []).filter(function (g) { return g && g.status === 'open'; }), now: Date.now(), room: data.room, constitution: data.constitution, done: desk.done, mine: desk.mine[k] || [], cleared: !!desk.cleared[k], today: today.n, sym: bv.sym });
+    var dm = D.deskModel({ key: st.key, floor: bv.selFloor, docket: data.docket, goals: (data.goals || []).filter(function (g) { return g && g.status === 'open'; }), now: Date.now(), room: data.room, constitution: data.constitution, done: desk.done, mine: desk.mine[k] || [], cleared: !!desk.cleared[k], today: today.n, sym: bv.sym, order: desk.order[k] || null });
     desk.model = dm;
     el.className = 'inside-open desk' + (dm.quiet ? ' desk--quiet' : '');
     el.setAttribute('data-desk', dm.key);
@@ -595,6 +596,14 @@
       dm.rows.forEach(function (r) { list.appendChild(deskRow(r)); });
       el.appendChild(list);
     }
+    // a changed order: what saving does, then undo and save (task 1004560)
+    if (dm.save) {
+      var bar = node('div', 'desk-save');
+      bar.appendChild(node('span', 'desk-save__line', dm.save.line));
+      bar.appendChild(chipBtn('desk-chip--quiet', 'undo', function () { desk.order[k] = null; draw(); }));
+      bar.appendChild(chipBtn('desk-chip--primary', dm.save.label, function () { saveOrder(dm, k); }));
+      el.appendChild(bar);
+    }
     // the record line: what you just did here, then what this building closed
     var rec = node('div', 'desk-record');
     rec.appendChild(node('span', 'desk-record__label', 'record'));
@@ -606,6 +615,7 @@
     var row = node('div', 'desk-row' + (r.needs ? ' desk-row--needs' : ''));
     row.setAttribute('data-row', r.key);
     var main = node('div', 'desk-row__main');
+    if (r.pos) main.appendChild(node('span', 'desk-pos', String(r.pos)));
     main.appendChild(node('span', 'desk-ini', r.ini));
     var name = node('button', 'desk-name');
     name.setAttribute('type', 'button');
@@ -615,13 +625,36 @@
     name.appendChild(node('span', 'desk-name__f', r.fact));
     name.addEventListener('click', function () { desk.open = desk.open === r.key ? null : r.key; desk.ask = null; draw(); focusRow(r.key, 'name'); });
     main.appendChild(name);
+    // promises kept of total, or a vote's seats: one pip each
+    if (r.pips && r.pips.length) {
+      var pips = node('span', 'desk-pips');
+      pips.setAttribute('aria-hidden', 'true');
+      r.pips.forEach(function (p) { pips.appendChild(node('span', 'desk-pip' + (p.on ? ' desk-pip--on' : ''))); });
+      main.appendChild(pips);
+    }
     var acts = node('span', 'desk-acts');
     if (r.wait) acts.appendChild(node('span', 'desk-wait', r.wait));
+    if (r.order) {
+      // the order's two arrows: the move is the viewer's until saved
+      [['up', -1, 'M6 15l6-6 6 6'], ['down', 1, 'M6 9l6 6 6-6']].forEach(function (m) {
+        if (!r.actions.some(function (a) { return a.key === m[0]; })) return;
+        var b = node('button', 'desk-arrow');
+        b.setAttribute('type', 'button');
+        b.setAttribute('aria-label', 'move ' + r.name + ' ' + m[0]);
+        // the top goal cannot go up, nor the last down
+        if (desk.busy || (m[1] < 0 && r.top) || (m[1] > 0 && r.bottom)) b.setAttribute('disabled', '');
+        b.appendChild(icon(m[2], null, 14));
+        b.addEventListener('click', function () { moveRow(r, m[1]); });
+        acts.appendChild(b);
+      });
+    }
     // the primary button sits rightmost, as on the board
-    r.actions.slice().reverse().forEach(function (a) {
+    // a row whose chips stand open is decided by its chip alone: no button for it
+    if (!r.order) r.actions.slice().reverse().forEach(function (a) {
+      if (r.show && a.key === r.show) return;
       acts.appendChild(chipBtn('desk-chip--' + a.tone, a.label, function () {
         if (a.go) { window.location.href = a.go; return; }
-        if (a.ask) { desk.ask = desk.ask === r.key ? null : r.key; desk.open = null; draw(); focusRow(r.key, 'chip'); return; }
+        if (a.ask) { var at = r.key + '|' + a.key; desk.ask = desk.ask === at ? null : at; desk.open = null; draw(); focusRow(r.key, 'chip'); return; }
         deskAct(r, a.key, {});
       }));
     });
@@ -632,14 +665,58 @@
       r.facts.forEach(function (f) { facts.appendChild(node('span', 'desk-fact', f)); });
       row.appendChild(facts);
     }
-    if (desk.ask === r.key && r.chips) {
+    var asked = desk.ask && desk.ask.indexOf(r.key + '|') === 0 ? (r.choices || {})[desk.ask.slice(r.key.length + 1)] : null;
+    // a blocker's options stand open: deciding it is picking one
+    if (!asked && r.show) asked = (r.choices || {})[r.show] || null;
+    if (asked) {
       var chips = node('div', 'desk-choices');
-      chips.appendChild(node('span', 'desk-choices__ask', r.chips.ask));
-      r.chips.options.forEach(function (c) { chips.appendChild(chipBtn('desk-chip--choice', c.label, function () { deskAct(r, r.chips.for, c.input); })); });
+      chips.appendChild(node('span', 'desk-choices__ask', asked.ask));
+      asked.options.forEach(function (c) { chips.appendChild(chipBtn('desk-chip--choice', c.label, function () { deskAct(r, asked.for, c.input); })); });
+      if (asked.field) {
+        // the one typed value a desk takes: a name to invite (never a reason)
+        var input = node('input', 'desk-field');
+        input.setAttribute('type', 'text');
+        input.setAttribute('aria-label', asked.ask);
+        input.setAttribute('autocomplete', 'off');
+        input.setAttribute('maxlength', '60');
+        var send = function () { var v = input.value.trim(); if (v) deskAct(r, asked.for, { option: v, label: v }); };
+        input.addEventListener('keydown', function (e) { if (e.key === 'Enter') send(); });
+        chips.appendChild(input);
+        chips.appendChild(chipBtn('desk-chip--primary', 'send', send));
+      }
       row.appendChild(chips);
     }
     return row;
   }
+  // The Priorities desk (task 1004560): a move is kept in this visit until saved.
+  function moveRow(r, by) {
+    var D = window.GovDesk, st = view.inside;
+    if (!D || !st || !desk.model) return;
+    var k = st.key + ':' + (view.insideModel ? view.insideModel.selFloor : 0);
+    var now = desk.model.rows.filter(function (x) { return x.order; }).map(function (x) { return x.key; });
+    desk.order[k] = D.moved(now, r.key, by);
+    draw();
+    focusRow(r.key, 'arrow');
+  }
+  // Save: the order goes to POST /goals/reorder, or is filed for the council;
+  // the server's own checks decide either way.
+  function saveOrder(dm, k) {
+    var C = window.GovMatterCard;
+    var req = C && C.orderRequest ? C.orderRequest(dm.save) : null;
+    if (!req || desk.busy) return Promise.resolve(false);
+    desk.busy = true;
+    draw();
+    return send(req).then(function (out) {
+      desk.busy = false;
+      if (!out.ok) { say(C.refusal(out.status, out.body)); draw(); return false; }
+      desk.order[k] = null;
+      desk.mine[k] = [dm.save.council ? 'order sent to council' : 'order set'].concat(desk.mine[k] || []);
+      bumpToday();
+      say(dm.save.said);
+      draw();
+      return load().then(function () { return true; });
+    });
+  }
   function deskRowsEl() {
     var st = view.insideModel;
     var on = $(st && st.flipA ? 'insideOpenA' : 'insideOpenB');
@@ -654,6 +731,7 @@
       if (rows[i].getAttribute('data-row') !== key) continue;
       var main = rows[i].children[0];
       var target = what === 'chip' && rows[i].children[1] ? rows[i].children[1].children[1] : main && main.children[1];
+      if (what === 'arrow' && main) target = main.querySelector ? main.querySelector('.desk-arrow') : target;
       if (target && target.focus) target.focus();
       return;
     }
@@ -666,7 +744,15 @@
     if (typeof setTimeout !== 'function') return then();
     setTimeout(then, 320);
   }
-  var DONE_WORDS = { for: 'voted yes', object: 'voted no', fine: 'let in', refuse: 'turned away', release: 'released', hold: 'held' };
+  var DONE_WORDS = {
+    for: 'voted yes', object: 'voted no', fine: 'let in', refuse: 'turned away', release: 'released', hold: 'held',
+    confirm: 'confirmed', dispute: 'disputed', fix: 'fixed', remove: 'removed', keep: 'kept', signoff: 'signed off', force: 'forced',
+    switch_on: 'switched on', switch_off: 'switched off', allow: 'allowed', disallow: 'disallowed', first: 'put first',
+    pause: 'paused', resume: 'resumed', tier: 'new tier', deactivate: 'deactivated', give: 'gave', take: 'took back',
+    check: 'checked', rot: 'set', module_on: 'turned on', module_off: 'turned off', backup: 'backed up', invite: 'invited',
+    decide: 'decided', ratify: 'ratified', ratify_goal: 'made a goal of',
+    budget: 'set the limit of', unsign: 'undid',
+  };
   // One act from a row: checked, sent through the card's own request (the
   // server's permission checks decide), then the row clears, the floor counts
   // it, the meter takes a pip and the toast says what happened. An act that
@@ -680,7 +766,9 @@
     var req = C.request(r.card, key, input);
     var settle = function (body) {
       var a = C.answer(r.card, key, body);
-      desk.mine[k] = [DONE_WORDS[key] + ' ' + r.name].concat(desk.mine[k] || []);
+      // an act at a building a sitting decides went to it as a matter (task 1004561)
+      var sent = r.card.subject && r.card.subject.council && req && /\/government\/board\/matters$/.test(req.url);
+      desk.mine[k] = [(sent ? 'sent to council:' : DONE_WORDS[key]) + ' ' + r.name].concat(desk.mine[k] || []);
       desk.done[r.matter] = true;
       desk.open = null; desk.ask = null;
       if (desk.model && !desk.model.rows.some(function (x) { return x.matter !== r.matter; })) desk.cleared[k] = true;

package/modules/hall-ui/public/street.states.json

@@ -55,14 +55,37 @@
       "auth": true,
       "_": "In the hall since task 1004544: the shell's full-screen switch pressed, the sidebar and the top bar gone, the street filling the window and the one exit in the corner (the sky's mechanism, task 1004327).",
       "actions": [
-        ["wait", 900],
-        ["click", "#fullscreen-toggle"],
-        ["wait", 500]
+        [
+          "wait",
+          900
+        ],
+        [
+          "click",
+          "#fullscreen-toggle"
+        ],
+        [
+          "wait",
+          500
+        ]
       ],
       "expect": {
-        "visible": ["#streetBoard", "#streetSigns", "#streetMode", "#fullscreen-toggle"],
-        "hidden": ["#app-sidebar", "#topbar-title"],
-        "attr": [["#fullscreen-toggle", "aria-pressed", "true"]]
+        "visible": [
+          "#streetBoard",
+          "#streetSigns",
+          "#streetMode",
+          "#fullscreen-toggle"
+        ],
+        "hidden": [
+          "#app-sidebar",
+          "#topbar-title"
+        ],
+        "attr": [
+          [
+            "#fullscreen-toggle",
+            "aria-pressed",
+            "true"
+          ]
+        ]
       }
     },
     "card": {
@@ -456,6 +479,332 @@
           ".desk-quiet"
         ]
       }
+    },
+    "desk-people-builders": {
+      "auth": true,
+      "_": "Task 1004559: People, Builders floor. Each builder is a row with tier and deactivate, the acts the old builders page held.",
+      "url": "/builders/street#building=people",
+      "actions": [
+        [
+          "wait",
+          900
+        ],
+        [
+          "clickIfVisible",
+          "[data-craft-close]"
+        ],
+        [
+          "wait",
+          300
+        ],
+        [
+          "click",
+          "[data-floor=\"2\"]"
+        ],
+        [
+          "wait",
+          600
+        ]
+      ],
+      "expect": {
+        "visible": [
+          ".desk-rows",
+          ".desk-chip--primary"
+        ]
+      }
+    },
+    "desk-people-tier": {
+      "auth": true,
+      "_": "Task 1004559: the tier button opens its tiers as one-tap chips in place (one rung up at most).",
+      "url": "/builders/street#building=people",
+      "actions": [
+        [
+          "wait",
+          900
+        ],
+        [
+          "clickIfVisible",
+          "[data-craft-close]"
+        ],
+        [
+          "wait",
+          300
+        ],
+        [
+          "click",
+          "[data-floor=\"2\"]"
+        ],
+        [
+          "wait",
+          600
+        ],
+        [
+          "click",
+          ".desk-row .desk-chip--primary"
+        ],
+        [
+          "wait",
+          400
+        ]
+      ],
+      "expect": {
+        "visible": [
+          ".desk-choices"
+        ]
+      }
+    },
+    "desk-disputes": {
+      "auth": true,
+      "_": "Task 1004559: Disputes, Security reports. Confirm or dispute an open report; mark a confirmed one fixed.",
+      "url": "/builders/street#building=disputes",
+      "actions": [
+        [
+          "wait",
+          900
+        ],
+        [
+          "clickIfVisible",
+          "[data-craft-close]"
+        ],
+        [
+          "wait",
+          300
+        ],
+        [
+          "click",
+          "[data-floor=\"0\"]"
+        ],
+        [
+          "wait",
+          600
+        ]
+      ],
+      "expect": {
+        "visible": [
+          ".desk-rows",
+          ".desk-status--hot"
+        ]
+      }
+    },
+    "desk-automation-goals": {
+      "auth": true,
+      "_": "Task 1004559: Automation, Allowed goals. Disallow, put first, or allow an open goal from chips.",
+      "url": "/builders/street#building=automation",
+      "actions": [
+        [
+          "wait",
+          900
+        ],
+        [
+          "clickIfVisible",
+          "[data-craft-close]"
+        ],
+        [
+          "wait",
+          300
+        ],
+        [
+          "click",
+          "[data-floor=\"1\"]"
+        ],
+        [
+          "wait",
+          600
+        ]
+      ],
+      "expect": {
+        "visible": [
+          ".desk-rows"
+        ]
+      }
+    },
+    "desk-release-core": {
+      "auth": true,
+      "_": "Task 1004559: Release, Core update. Check first (a dry run); take it is offered only after the check passed for that version.",
+      "url": "/builders/street#building=release",
+      "actions": [
+        [
+          "wait",
+          900
+        ],
+        [
+          "clickIfVisible",
+          "[data-craft-close]"
+        ],
+        [
+          "wait",
+          300
+        ],
+        [
+          "click",
+          "[data-floor=\"3\"]"
+        ],
+        [
+          "wait",
+          600
+        ]
+      ],
+      "expect": {
+        "visible": [
+          ".desk-rows"
+        ]
+      }
+    },
+    "desk-rules": {
+      "auth": true,
+      "_": "Task 1004559: Rules in force. The rot timer as day chips, work categories as a link, each module on or off.",
+      "url": "/builders/street#building=rules",
+      "actions": [
+        [
+          "wait",
+          900
+        ],
+        [
+          "clickIfVisible",
+          "[data-craft-close]"
+        ],
+        [
+          "wait",
+          300
+        ],
+        [
+          "click",
+          "[data-floor=\"0\"]"
+        ],
+        [
+          "wait",
+          600
+        ]
+      ],
+      "expect": {
+        "visible": [
+          ".desk-rows"
+        ]
+      }
+    },
+    "desk-planning-priorities": {
+      "auth": true,
+      "_": "Task 1004560: Planning, Priorities. The open goals in order with promise pips and two arrows; one goal moved down, so the save bar says the new order goes to the council and how many yes it needs, with undo.",
+      "url": "/builders/street#building=planning",
+      "actions": [
+        [
+          "wait",
+          900
+        ],
+        [
+          "clickIfVisible",
+          "[data-craft-close]"
+        ],
+        [
+          "wait",
+          300
+        ],
+        [
+          "click",
+          "[data-floor=\"0\"]"
+        ],
+        [
+          "wait",
+          600
+        ],
+        [
+          "click",
+          ".desk-arrow[aria-label$=\" down\"]"
+        ],
+        [
+          "wait",
+          400
+        ]
+      ],
+      "expect": {
+        "visible": [
+          ".desk-rows",
+          ".desk-pips",
+          ".desk-save"
+        ]
+      }
+    },
+    "desk-planning-ideas": {
+      "auth": true,
+      "_": "Task 1004560: Planning, Ideas to ratify. A Full Idea in its vote with seat pips, a promise to ratify in one tap, and a carried Full Idea made a goal from a version chip.",
+      "url": "/builders/street#building=planning",
+      "actions": [
+        [
+          "wait",
+          900
+        ],
+        [
+          "clickIfVisible",
+          "[data-craft-close]"
+        ],
+        [
+          "wait",
+          300
+        ],
+        [
+          "click",
+          "[data-floor=\"1\"]"
+        ],
+        [
+          "wait",
+          600
+        ],
+        [
+          "focus",
+          ".desk-rows .desk-row:last-child .desk-name"
+        ],
+        [
+          "wait",
+          300
+        ]
+      ],
+      "expect": {
+        "visible": [
+          ".desk-rows"
+        ]
+      }
+    },
+    "desk-planning-blockers": {
+      "auth": true,
+      "_": "Task 1004560: Planning, Waiting on you. Each blocker decided by one of its options as chips standing open; go ahead, not now, need more when it lists none.",
+      "url": "/builders/street#building=planning",
+      "actions": [
+        [
+          "wait",
+          900
+        ],
+        [
+          "clickIfVisible",
+          "[data-craft-close]"
+        ],
+        [
+          "wait",
+          300
+        ],
+        [
+          "click",
+          "[data-floor=\"2\"]"
+        ],
+        [
+          "wait",
+          600
+        ],
+        [
+          "focus",
+          ".desk-rows .desk-row:last-child .desk-name"
+        ],
+        [
+          "wait",
+          300
+        ]
+      ],
+      "expect": {
+        "visible": [
+          ".desk-rows",
+          ".desk-choices",
+          ".desk-status--hot"
+        ]
+      }
     }
   },
   "reducedMotion": {