@intentius/behold 0.30.1 → 0.30.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/AGENTS.md +31 -1
- package/README.md +11 -6
- package/dist/cli.js +1516 -840
- package/example-choudoufu-estate/chant.workspace.json +1 -1
- package/example-terraform-estate/README.md +1 -1
- package/example-terraform-estate/chant.workspace.json +1 -1
- package/example-terralith/README.md +1 -1
- package/example-three-cloud/package-lock.json +19 -19
- package/example-three-cloud/package.json +4 -4
- package/package.json +5 -5
- package/web/app.js +263 -16
- package/web/embed.js +2 -2
- package/web/event-help-modal.js +18 -12
- package/web/event-help-modal.test.js +28 -1
- package/web/index.html +18 -0
- package/web/kiosk-ask-layout.js +85 -0
- package/web/kiosk-ask-layout.test.js +83 -0
- package/web/kiosk-ask-tips.js +467 -0
- package/web/kiosk-ask-tips.test.js +359 -0
- package/web/kiosk-ask.js +774 -0
- package/web/kiosk-ask.test.js +593 -0
- package/web/kiosk-banner.js +108 -0
- package/web/kiosk-banner.test.js +72 -0
- package/web/kiosk-center-cards.test.js +110 -0
- package/web/kiosk-estate-scene.js +203 -0
- package/web/kiosk-estate-scene.test.js +21 -0
- package/web/kiosk-event-help.js +4 -1
- package/web/kiosk-graph-pane.js +63 -0
- package/web/kiosk-graph-pane.test.js +105 -0
- package/web/kiosk-light-frame.js +196 -0
- package/web/kiosk-light.js +509 -0
- package/web/kiosk-light.test.js +297 -0
- package/web/kiosk-metrics.js +7 -4
- package/web/kiosk-modal-sticky.test.js +2 -1
- package/web/kiosk-refit.test.js +81 -0
- package/web/kiosk-reset.js +49 -0
- package/web/kiosk-reset.test.js +11 -0
- package/web/kiosk-shot.js +40 -2
- package/web/kiosk-shot.test.js +23 -1
- package/web/kiosk-vendor.js +85 -7
- package/web/kiosk-vendor.test.js +9 -9
- package/web/kiosk-watch.js +8 -4
- package/web/kiosk.html +107 -1
- package/web/kiosk.js +149 -23
- package/web/kiosk.test.js +25 -1
- package/web/small-stage.test.js +4 -0
- package/web/terragucci-change.js +30 -13
- package/web/tool-mark.js +4 -4
- package/web/tool-mark.test.js +1 -1
- package/web/vendors/atmos.svg +1 -0
- package/web/vendors/chant.svg +1 -0
- package/web/vendors/choudoufu.svg +1 -0
- package/web/vendors/terragrunt.svg +9 -0
- package/web/vendors/terragucci.svg +1 -0
- package/web/vendors/choudoufu-128.png +0 -0
- package/web/vendors/choudoufu-64.png +0 -0
package/web/kiosk.js
CHANGED
|
@@ -23,7 +23,7 @@ import { graphWaves } from "./chant-pr-marks.js";
|
|
|
23
23
|
import { createProgressPacer, trackWaves } from "./terragucci-live-pace.js";
|
|
24
24
|
import { PICK_HOLD_MS, annMark, mergeRun, startRuns, statusIcon } from "./kiosk-runs.js";
|
|
25
25
|
import { MODES, MODE_STORE, badges as waveBadges, badgeTitle, behindStep, steadyRun, captionModel, captionRoom, coneCaption, stepLine, watchOverlays, doraLine, modeStored, placeBeside, quietWords, recordKey, resultModel, runningStep, shotFor, stepTone, tailLines } from "./kiosk-watch.js";
|
|
26
|
-
import { shotMessage } from "./kiosk-shot.js";
|
|
26
|
+
import { REFIT_WAIT_MS, debounced, shotMessage } from "./kiosk-shot.js";
|
|
27
27
|
import { mountTrace } from "./kiosk-trace.js";
|
|
28
28
|
import { startEventHelp } from "./kiosk-event-help-ui.js";
|
|
29
29
|
import { miniWaterfall, phaseWords, waveTraces } from "./kiosk-wave-traces.js";
|
|
@@ -35,7 +35,12 @@ import { repoParam, repoUrl, stepCheckout } from "./kiosk-repo.js";
|
|
|
35
35
|
import { startKioskCarve } from "./kiosk-carve.js";
|
|
36
36
|
import { drawWaveList, waveListKey } from "./kiosk-wave-list.js";
|
|
37
37
|
import { readsFor, runsReadsFor } from "./kiosk-source.js";
|
|
38
|
-
import {
|
|
38
|
+
import { mountAskTips } from "./kiosk-ask-tips.js";
|
|
39
|
+
import { mountResetModal, resetShown } from "./kiosk-reset.js";
|
|
40
|
+
import { graphFolds, graphPending } from "./kiosk-graph-pane.js";
|
|
41
|
+
import { askEventHelp, askMode, askShot, createAskPane, hasAsk, replyValues } from "./kiosk-ask.js";
|
|
42
|
+
import { STATE_WORDS, outcomesOf, changingRoots, costLine, pinsCommit, planFitsPin, pullPin, readEdges, rootsCount, totalsLine, waveRows, blastRows } from "./terragucci-change.js";
|
|
43
|
+
import { startKioskLight } from "./kiosk-light.js"; // behold#937
|
|
39
44
|
|
|
40
45
|
/** The scenarios terragucci#1014 numbers. An id not here is shown by the title demo.json carries. */
|
|
41
46
|
export const SCENARIOS = {
|
|
@@ -630,7 +635,10 @@ export function stepView(step) {
|
|
|
630
635
|
* holds until PICK_HOLD_MS after it; `secs` is how long it still holds.
|
|
631
636
|
* Without a demo step yet, the resources view.
|
|
632
637
|
*/
|
|
633
|
-
export function kioskView(demo, { components = false, pick = null, now = Date.now() } = {}) {
|
|
638
|
+
export function kioskView(demo, { components = false, pick = null, now = Date.now(), ask = false } = {}) {
|
|
639
|
+
// behold#939: a prompt-driven step draws every root expanded to its resources, whatever the toggle held.
|
|
640
|
+
// `ask`: the scenario is in ask mode (askHeld), so its steps without a prompt (merged, applying, waiting) draw the estate too, never a pipeline view.
|
|
641
|
+
if (ask || hasAsk(demo)) return { view: "resources", pinned: false, secs: null };
|
|
634
642
|
if (!components) return { view: "resources", pinned: false, secs: null };
|
|
635
643
|
if (pick && VIEWS.some((v) => v.id === pick.view)) {
|
|
636
644
|
const left = pick.at + PICK_HOLD_MS - now;
|
|
@@ -639,6 +647,18 @@ export function kioskView(demo, { components = false, pick = null, now = Date.no
|
|
|
639
647
|
return { view: demo ? stepView(demo.step) : "components", pinned: false, secs: null };
|
|
640
648
|
}
|
|
641
649
|
|
|
650
|
+
/**
|
|
651
|
+
* Ask mode holds for a whole scenario. `held` is the key (`cycle|scenario`) the mode was on for; a step with a
|
|
652
|
+
* prompt turns it on for its scenario, a step without one keeps it while it is the same scenario, and a step of
|
|
653
|
+
* another scenario (a reset into one with no asks) lets it go. Returns the key to hold, or null.
|
|
654
|
+
*/
|
|
655
|
+
export function askHeld(held, demo) {
|
|
656
|
+
if (!demo) return null;
|
|
657
|
+
const key = `${demo.cycle}|${demo.scenario}`;
|
|
658
|
+
if (hasAsk(demo)) return key;
|
|
659
|
+
return held === key ? key : null;
|
|
660
|
+
}
|
|
661
|
+
|
|
642
662
|
/** behold#571: the static frame's title, over the legend; collapsed, its one line. */
|
|
643
663
|
export const READ_TITLE = "How to read this";
|
|
644
664
|
|
|
@@ -1362,7 +1382,8 @@ export function drawResult(host, model, s) {
|
|
|
1362
1382
|
// behold#571: a row for every wave, in wave order: its trace as one bar of its phases (a click opens the whole trace),
|
|
1363
1383
|
// else its numbers, else a quiet line until they land. Never fewer rows than the count says.
|
|
1364
1384
|
const bars = new Map(miniWaterfall(s.waveTraces || {}).map((r) => [r.wave, r]));
|
|
1365
|
-
|
|
1385
|
+
// A composed run is one apply: no wave rows, no wave traces.
|
|
1386
|
+
const order = model.composed ? [] : [...new Set([...model.waves.map((w) => w.wave), ...bars.keys()])].sort((x, y) => x - y);
|
|
1366
1387
|
if (order.length) {
|
|
1367
1388
|
const wf = el("div", "k-wf");
|
|
1368
1389
|
for (const n of order) {
|
|
@@ -1603,6 +1624,10 @@ export const TRACE_SETTLE_MS = 90_000;
|
|
|
1603
1624
|
|
|
1604
1625
|
/** behold#571: the longest a reloaded frame loads out of sight before it swaps in anyway. */
|
|
1605
1626
|
export const FRAME_SWAP_MS = 30_000;
|
|
1627
|
+
/** How long the pane's "drawing the graph" line waits for a frame that never says it drew. */
|
|
1628
|
+
export const FRAME_WAIT_MS = 10_000;
|
|
1629
|
+
/** How long the line outlasts a frame's first `behold:drawn`: the scene's layout and fit follow it. */
|
|
1630
|
+
export const FRAME_SETTLE_MS = 1_200;
|
|
1606
1631
|
/** behold#571: how long the first frame load waits for demo.json, so it opens on the step's checkout. */
|
|
1607
1632
|
export const FRAME_BOOT_WAIT_MS = 4_000;
|
|
1608
1633
|
|
|
@@ -1698,24 +1723,35 @@ export function startKiosk({ bar, frame, side, main, views, read = null, tools =
|
|
|
1698
1723
|
};
|
|
1699
1724
|
let lastKey = "";
|
|
1700
1725
|
let lastFocus;
|
|
1701
|
-
const shownView = () => kioskView(s.demo && s.demo.demo, { components: s.components, pick: s.pick, now: now().getTime() });
|
|
1726
|
+
const shownView = () => kioskView(s.demo && s.demo.demo, { components: s.components, pick: s.pick, now: now().getTime(), ask: !!s.askOn });
|
|
1727
|
+
let unstacked = false;
|
|
1728
|
+
let askTold = null;
|
|
1702
1729
|
const tellFrame = (force) => {
|
|
1703
1730
|
// behold#571: before the tool's first cycle the frame draws its repo on the base, with nothing in flight.
|
|
1704
1731
|
const notRun = !!vendor && s.mode === "none";
|
|
1705
1732
|
const d = notRun ? null : s.demo && s.demo.demo;
|
|
1706
1733
|
if (!d && !notRun) return; // nothing said yet: the frame keeps its default until the narration is read
|
|
1707
|
-
|
|
1734
|
+
// Ask mode draws the whole estate at every step, so no root is brought forward.
|
|
1735
|
+
const roots = d && !s.askOn ? focusRoots(d, s.answer, s.progress) : null;
|
|
1708
1736
|
const focus = roots ? roots.join(",") : null;
|
|
1709
1737
|
const run = d ? runPin(d) : "base";
|
|
1710
1738
|
// The cycle's pull request, so a merge's frame never draws another cycle's plan (web/terragucci-change.js pinnedAnswer).
|
|
1711
1739
|
const pull = framePull(d);
|
|
1712
1740
|
const zoom = viewZoom(shownView().view);
|
|
1713
|
-
|
|
1741
|
+
// behold#939: a prompt-driven step draws every resource as its own card (the four of app, not "app x4").
|
|
1742
|
+
const ask = !!d && (hasAsk(d) || !!s.askOn);
|
|
1743
|
+
const key = `${focus}|${run}|${pull}|${zoom}|${ask ? "unstacked" : ""}`;
|
|
1714
1744
|
if (!force && key === lastFocus) return;
|
|
1715
1745
|
lastFocus = key;
|
|
1716
|
-
|
|
1746
|
+
// Leaving it gives the default (stacked) back.
|
|
1747
|
+
post({ type: "behold:view", member: null, focus, run, pull, zoom, ...(ask ? { alike: false } : unstacked ? { alike: true } : {}) });
|
|
1748
|
+
unstacked = ask;
|
|
1749
|
+
post({ type: "behold:ask", on: askMode(s) });
|
|
1750
|
+
askTold = askMode(s);
|
|
1717
1751
|
tellHover(s.hover);
|
|
1718
1752
|
};
|
|
1753
|
+
// behold#937: the pane's events (behold#936) light the graph and give the reply its {dependents} (web/kiosk-light.js).
|
|
1754
|
+
if (typeof window !== "undefined") startKioskLight({ post, getAnswer: () => s.answer, getProgress: () => s.progress });
|
|
1719
1755
|
const pickView = (view) => {
|
|
1720
1756
|
s.pick = { view, at: now().getTime() };
|
|
1721
1757
|
draw();
|
|
@@ -1809,10 +1845,45 @@ export function startKiosk({ bar, frame, side, main, views, read = null, tools =
|
|
|
1809
1845
|
// behold#571: the titles and names demo.json has carried, by scenario, for the runs' subtitles.
|
|
1810
1846
|
const titles = {};
|
|
1811
1847
|
const names = {};
|
|
1848
|
+
// behold#936: the prompt pane (web/kiosk-ask.js), in the header's and the caption's place while a step has a prompt, in Watch.
|
|
1849
|
+
const askValues = () => {
|
|
1850
|
+
const d = s.demo && s.demo.demo;
|
|
1851
|
+
const failed = [...outcomesOf(s.answer, s.progress).values()].find((o) => o.outcome === "failed" && o.error);
|
|
1852
|
+
return replyValues(d ? matchingPull(s.answer, d) : null, failed ? failed.error : null, typeof window !== "undefined" && window.beholdAskTokens ? window.beholdAskTokens : {});
|
|
1853
|
+
};
|
|
1854
|
+
const applyAsk = () => {
|
|
1855
|
+
if (typeof document !== "undefined" && document.body && document.body.classList) document.body.classList.toggle("k-ask", !!s.askOn && !!s.watchMode);
|
|
1856
|
+
};
|
|
1857
|
+
const askPane =
|
|
1858
|
+
watch && watch.ask
|
|
1859
|
+
? createAskPane({
|
|
1860
|
+
host: watch.ask,
|
|
1861
|
+
fill: askValues,
|
|
1862
|
+
now,
|
|
1863
|
+
reduced: () => typeof matchMedia === "function" && matchMedia("(prefers-reduced-motion: reduce)").matches,
|
|
1864
|
+
onActive: (on) => {
|
|
1865
|
+
s.askPaneOn = on;
|
|
1866
|
+
s.askOn = on || !!s.askHeld;
|
|
1867
|
+
applyAsk();
|
|
1868
|
+
},
|
|
1869
|
+
})
|
|
1870
|
+
: null;
|
|
1871
|
+
// The tip cards (web/kiosk-ask-tips.js): one per act, docked in a corner of the graph during a long wait, gone the moment the prompt says something new.
|
|
1872
|
+
if (askPane && typeof window !== "undefined" && typeof document !== "undefined") mountAskTips({ win: window, doc: document, askHost: watch.ask });
|
|
1873
|
+
// The reset between acts is no turn of the story: one "Resetting" modal over the page while it runs (web/kiosk-reset.js).
|
|
1874
|
+
const resetModal = askPane && typeof document !== "undefined" && document.body ? mountResetModal(document) : null;
|
|
1812
1875
|
/** Take one narration (demo.json, or a replayed step), and ask for the run it is about when the step moved. */
|
|
1813
1876
|
const setDemo = (answer) => {
|
|
1814
1877
|
s.demo = answer;
|
|
1815
1878
|
const d = answer && answer.demo;
|
|
1879
|
+
if (askPane) {
|
|
1880
|
+
// behold#942: ask mode holds for the scenario, so the steps between prompts keep the graph and the pane.
|
|
1881
|
+
s.askHeld = askHeld(s.askHeld, d || null);
|
|
1882
|
+
askPane.setStep(d || null);
|
|
1883
|
+
s.askOn = !!s.askPaneOn || !!s.askHeld;
|
|
1884
|
+
applyAsk();
|
|
1885
|
+
if (resetModal) resetModal.set(resetShown(d || null, s.askOn));
|
|
1886
|
+
}
|
|
1816
1887
|
// behold#571: when this page first saw the driver's deadline, for the next bar when demo.json has no next.from.
|
|
1817
1888
|
s.nextSeen = nextSeen(s.nextSeen, d ? d.next || null : undefined, s.mode, shownNow().getTime());
|
|
1818
1889
|
if (d && d.scenario && typeof d.title === "string" && d.title) titles[d.scenario] = d.title;
|
|
@@ -1944,7 +2015,8 @@ export function startKiosk({ bar, frame, side, main, views, read = null, tools =
|
|
|
1944
2015
|
drawReading(shown.view, ok);
|
|
1945
2016
|
// behold#571: with no graph to show, the graph pane folds away and the runs and the log take its width.
|
|
1946
2017
|
if (typeof document !== "undefined" && document.body && document.body.classList) {
|
|
1947
|
-
|
|
2018
|
+
if (ok) s.graphSeen = true;
|
|
2019
|
+
document.body.classList.toggle("k-nograph", graphFolds({ vendor, ok, askOn: !!s.askOn, seen: !!s.graphSeen, pending: graphPending({ own: reads.own, single: s.single, answer: s.answer }) }));
|
|
1948
2020
|
// Before the tool's first cycle there are no runs and no log: those panes fold away, and the graph (when there is one) takes the width.
|
|
1949
2021
|
document.body.classList.toggle("k-notyet", !!vendor && s.mode === "none");
|
|
1950
2022
|
}
|
|
@@ -1965,6 +2037,8 @@ export function startKiosk({ bar, frame, side, main, views, read = null, tools =
|
|
|
1965
2037
|
let drawerWave = null;
|
|
1966
2038
|
let drawerView = null;
|
|
1967
2039
|
const isPhone = () => typeof matchMedia === "function" && matchMedia("(max-width: 600px)").matches;
|
|
2040
|
+
/** behold#942: ask mode on a phone (up to 700px) puts the pane under the graph, so nothing overlaps the frame. */
|
|
2041
|
+
const askStacked = () => !!(s.askOn && s.watchMode) && typeof matchMedia === "function" && matchMedia("(max-width: 700px)").matches;
|
|
1968
2042
|
const runsParent = main ? main.parentNode : null;
|
|
1969
2043
|
const runsNext = main ? main.nextSibling : null;
|
|
1970
2044
|
const applyMode = () => {
|
|
@@ -1976,6 +2050,7 @@ export function startKiosk({ bar, frame, side, main, views, read = null, tools =
|
|
|
1976
2050
|
if (s.watchMode && body && main.parentNode !== body) body.appendChild(main);
|
|
1977
2051
|
if (!s.watchMode && runsParent && main.parentNode !== runsParent) runsParent.insertBefore(main, runsNext);
|
|
1978
2052
|
}
|
|
2053
|
+
applyAsk();
|
|
1979
2054
|
if (watch) renderModeToggle(tools && tools.mode, s.watchMode ? "watch" : "inspect", setMode);
|
|
1980
2055
|
if (carveCtl) carveCtl.tellMode();
|
|
1981
2056
|
};
|
|
@@ -2027,6 +2102,11 @@ export function startKiosk({ bar, frame, side, main, views, read = null, tools =
|
|
|
2027
2102
|
}
|
|
2028
2103
|
/** The caption shown now: Watch's own, or the live carve's while it has the camera (#715). */
|
|
2029
2104
|
const shownCaption = () => (carveCtl && carveCtl.caption ? carveCtl.caption() || watch.caption : watch.caption);
|
|
2105
|
+
/**
|
|
2106
|
+
* The box the graph's room ends at: the prompt pane while it shows (the caption is hidden then, and a hidden box
|
|
2107
|
+
* measures as zeros, which sent the trail to the top and left the graph no room), else the caption shown now.
|
|
2108
|
+
*/
|
|
2109
|
+
const bottomBox = () => (s.askOn && s.watchMode && watch && watch.ask && !watch.ask.hidden ? watch.ask : shownCaption());
|
|
2030
2110
|
/** behold#631: a chant kiosk's projected track (drawChantTrack), in the trail's place. */
|
|
2031
2111
|
let trackHost = null;
|
|
2032
2112
|
/** behold#571: the caption's top, or event-help's trail's when it sits over the caption. */
|
|
@@ -2037,15 +2117,17 @@ export function startKiosk({ bar, frame, side, main, views, read = null, tools =
|
|
|
2037
2117
|
};
|
|
2038
2118
|
/** How much of the frame the overlays cover, in the frame's pixels: the caption below, and the callout, drawer or card beside the shot. */
|
|
2039
2119
|
const shotInsets = (shot) => {
|
|
2040
|
-
if (!watch || !frame || isPhone() || !frame.getBoundingClientRect) return {};
|
|
2120
|
+
if (!watch || !frame || isPhone() || askStacked() || !frame.getBoundingClientRect) return {};
|
|
2041
2121
|
const f = frame.getBoundingClientRect();
|
|
2042
|
-
const cap =
|
|
2122
|
+
const cap = bottomBox().getBoundingClientRect();
|
|
2043
2123
|
const bottom = Math.max(0, f.bottom - captionTop(cap)) + 16;
|
|
2044
2124
|
const side = shot.kind === "held" ? watch.callout : shot.kind === "active" ? watch.drawer : shot.kind === "result" ? watch.result : null;
|
|
2045
2125
|
// The result card sits right beside the graph (placeBeside's gap): an inset of its width and that gap centres the two together.
|
|
2046
2126
|
const measured = side && !side.hidden && side.offsetWidth ? side.offsetWidth + (shot.kind === "result" ? 18 : 44) : 0;
|
|
2047
2127
|
// behold#631: a chant cycle keeps one framing from start to end: the side panel's room is kept whether or not one is up, so the graph never shifts.
|
|
2048
2128
|
const right = s.chantLoop ? Math.max(measured, CHANT_SIDE_ROOM) : measured;
|
|
2129
|
+
// Ask mode centres the scene in the graph area: the same margin at each side, none extra above or under it (the fit's own pad keeps the boxes off the edges).
|
|
2130
|
+
if (shot.ask) return { top: 0, right: Math.max(right, 20), bottom: bottom - 16, left: 20 };
|
|
2049
2131
|
return { top: 20, right, bottom, left: 20 };
|
|
2050
2132
|
};
|
|
2051
2133
|
/**
|
|
@@ -2054,8 +2136,13 @@ export function startKiosk({ bar, frame, side, main, views, read = null, tools =
|
|
|
2054
2136
|
* quiet line or the trail that comes later moves nothing. None on a phone, where the caption is under the graph.
|
|
2055
2137
|
*/
|
|
2056
2138
|
function captionRoomPx() {
|
|
2057
|
-
if (!watch || !frame || isPhone() || !frame.getBoundingClientRect || typeof getComputedStyle !== "function") return 0;
|
|
2139
|
+
if (!watch || !frame || isPhone() || askStacked() || !frame.getBoundingClientRect || typeof getComputedStyle !== "function") return 0;
|
|
2058
2140
|
const f = frame.getBoundingClientRect();
|
|
2141
|
+
// behold#936: the prompt pane, when it shows, is the caption's place; its height is fixed, so the room is too.
|
|
2142
|
+
if (s.askOn && watch.ask && !watch.ask.hidden) {
|
|
2143
|
+
const a = watch.ask.getBoundingClientRect();
|
|
2144
|
+
return Math.round(Math.max(0, f.bottom - a.bottom) + a.height + 16);
|
|
2145
|
+
}
|
|
2059
2146
|
const cap = watch.caption;
|
|
2060
2147
|
const c = cap.getBoundingClientRect();
|
|
2061
2148
|
const fs = parseFloat(getComputedStyle(cap).fontSize) || 16;
|
|
@@ -2068,8 +2155,13 @@ export function startKiosk({ bar, frame, side, main, views, read = null, tools =
|
|
|
2068
2155
|
const trailLineH = chip ? chip.getBoundingClientRect().height + 4 : 26;
|
|
2069
2156
|
return captionRoom({ capHeight: c.height, extras, rowH, trailH, trailLineH, below: Math.max(0, f.bottom - c.bottom) });
|
|
2070
2157
|
}
|
|
2071
|
-
function tellShot(force) {
|
|
2158
|
+
function tellShot(force, still) {
|
|
2072
2159
|
if (!frame || !frame.contentWindow || !watch) return;
|
|
2160
|
+
// behold#940: ask mode holds in the frame between prompts and between shots, so it is told on its own, when it changes.
|
|
2161
|
+
if (askMode(s) !== askTold) {
|
|
2162
|
+
askTold = askMode(s);
|
|
2163
|
+
post({ type: "behold:ask", on: askTold });
|
|
2164
|
+
}
|
|
2073
2165
|
if (!s.watchMode) {
|
|
2074
2166
|
if (lastShot !== "release") {
|
|
2075
2167
|
lastShot = "release";
|
|
@@ -2081,10 +2173,10 @@ export function startKiosk({ bar, frame, side, main, views, read = null, tools =
|
|
|
2081
2173
|
const insets = shotInsets(s.shot);
|
|
2082
2174
|
// The caption's tallest, for a held small stage's one framing; a stage that isn't held never reads it.
|
|
2083
2175
|
const room = captionRoomPx();
|
|
2084
|
-
const key = `${s.shot.id}|${insets.right || 0}|${Math.round((insets.bottom || 0) / 12)}|${s.shot.roots.join(",")}|${Math.round(room / 12)}`;
|
|
2176
|
+
const key = `${s.shot.id}|${s.shot.ask ? "ask" : ""}|${insets.right || 0}|${Math.round((insets.top || 0) / 12)}|${Math.round((insets.left || 0) / 12)}|${Math.round((insets.bottom || 0) / 12)}|${s.shot.roots.join(",")}|${Math.round(room / 12)}`;
|
|
2085
2177
|
if (!force && key === lastShot) return;
|
|
2086
2178
|
lastShot = key;
|
|
2087
|
-
post(shotMessage({ roots: s.shot.roots, waves: s.shot.waves, whole: s.shot.whole, insets, id: s.shot.id, room }));
|
|
2179
|
+
post(shotMessage({ roots: s.shot.roots, waves: s.shot.waves, whole: s.shot.whole, insets, id: s.shot.id, room, ask: s.shot.ask === true, ...(still ? { ms: 0 } : {}) }));
|
|
2088
2180
|
}
|
|
2089
2181
|
// behold#631: the projected cycle track, a chant kiosk's bottom band in place of the chip strip and the rail.
|
|
2090
2182
|
const trackState = { cycle: null, pulls: [], key: null, since: null };
|
|
@@ -2126,7 +2218,7 @@ export function startKiosk({ bar, frame, side, main, views, read = null, tools =
|
|
|
2126
2218
|
if (model) model.onSeek = s.seekTo;
|
|
2127
2219
|
drawTrack(trackHost, model);
|
|
2128
2220
|
// In the trail's place: over the caption.
|
|
2129
|
-
const cap =
|
|
2221
|
+
const cap = bottomBox().getBoundingClientRect();
|
|
2130
2222
|
if (trackHost.style) trackHost.style.bottom = cap.height ? `${Math.round((typeof window !== "undefined" ? window.innerHeight : 0) - cap.top)}px` : "";
|
|
2131
2223
|
// The "Waiting on…" modal: a quiet stretch on a step that waits on something, never while the apply's events come in.
|
|
2132
2224
|
// Once the play shows anything of this run under way (a wave or a card), nothing waits on the apply to start.
|
|
@@ -2141,13 +2233,13 @@ export function startKiosk({ bar, frame, side, main, views, read = null, tools =
|
|
|
2141
2233
|
drawChantTrack(d, at);
|
|
2142
2234
|
const hold = d ? holdModel(s, d) : null;
|
|
2143
2235
|
const gate = !!hold && (hold.kind === "approval" || hold.kind === "driver");
|
|
2144
|
-
const shot = shotFor(d, { answer: s.answer, progress: s.progress, held: s.held, gate, runDoc: runsApi && runsApi.run ? runsApi.run.doc : null, waves: s.waves });
|
|
2236
|
+
const shot = askShot(shotFor(d, { answer: s.answer, progress: s.progress, held: s.held, gate, runDoc: runsApi && runsApi.run ? runsApi.run.doc : null, waves: s.waves }), askMode(s));
|
|
2145
2237
|
s.shot = shot;
|
|
2146
2238
|
const nums = waveBadges(s.metrics);
|
|
2147
2239
|
const opened = drawerWave !== null;
|
|
2148
2240
|
// On a held small stage nothing overlays the graph (web/kiosk-watch.js watchOverlays): the approval, the result and the
|
|
2149
2241
|
// running job are the caption's quiet lines there. Any other stage shows its cards as it always has.
|
|
2150
|
-
const shows = watchOverlays({ kind: shot.kind, opened, held: !!s.stageHeld });
|
|
2242
|
+
const shows = watchOverlays({ kind: shot.kind, opened, held: !!s.stageHeld, ask: askMode(s) });
|
|
2151
2243
|
const call = shows.callout && shot.kind === "held" && gate;
|
|
2152
2244
|
watch.callout.hidden = !call;
|
|
2153
2245
|
if (call) drawCallout(watch.callout, s, hold, badgeTitle(nums[hold.wave]));
|
|
@@ -2268,7 +2360,7 @@ export function startKiosk({ bar, frame, side, main, views, read = null, tools =
|
|
|
2268
2360
|
}
|
|
2269
2361
|
const L = watch.layer.getBoundingClientRect();
|
|
2270
2362
|
const F = frame.getBoundingClientRect();
|
|
2271
|
-
const capTop = captionTop(
|
|
2363
|
+
const capTop = captionTop(bottomBox().getBoundingClientRect()) - L.top;
|
|
2272
2364
|
const view = { x: F.left - L.left, y: F.top - L.top, w: F.width, h: capTop - (F.top - L.top) };
|
|
2273
2365
|
const boxOf = (n) => {
|
|
2274
2366
|
const waves = (s.boxes && s.boxes.waves) || {};
|
|
@@ -2424,7 +2516,8 @@ export function startKiosk({ bar, frame, side, main, views, read = null, tools =
|
|
|
2424
2516
|
const d = s.demo && s.demo.demo;
|
|
2425
2517
|
if (!d) return null;
|
|
2426
2518
|
const appr = pendingApproval(d, s.progress);
|
|
2427
|
-
|
|
2519
|
+
// behold#939: in ask mode no bubble, modal or strip; the pane and the graph tell it.
|
|
2520
|
+
return askEventHelp({
|
|
2428
2521
|
demo: d,
|
|
2429
2522
|
answer: s.answer,
|
|
2430
2523
|
// behold#741: told at the pace the graph plays the waves, while a terragucci story is on.
|
|
@@ -2450,7 +2543,7 @@ export function startKiosk({ bar, frame, side, main, views, read = null, tools =
|
|
|
2450
2543
|
frame,
|
|
2451
2544
|
watch: s.watchMode,
|
|
2452
2545
|
// The caption shown now: the live carve's while it has the camera (web/kiosk-carve.js).
|
|
2453
|
-
caption: watch ?
|
|
2546
|
+
caption: watch ? bottomBox() : null,
|
|
2454
2547
|
replay: s.mode === "replay",
|
|
2455
2548
|
approveLine: appr ? appr.approve : null,
|
|
2456
2549
|
label: d.label || "",
|
|
@@ -2460,7 +2553,7 @@ export function startKiosk({ bar, frame, side, main, views, read = null, tools =
|
|
|
2460
2553
|
waveTraces: s.waveTraces,
|
|
2461
2554
|
strip: s.stripReady() ? s.strip : null,
|
|
2462
2555
|
stripReady: s.stripReady(),
|
|
2463
|
-
};
|
|
2556
|
+
}, askMode(s));
|
|
2464
2557
|
},
|
|
2465
2558
|
})
|
|
2466
2559
|
: null;
|
|
@@ -2851,9 +2944,40 @@ export function startKiosk({ bar, frame, side, main, views, read = null, tools =
|
|
|
2851
2944
|
// merge, not at applied, not at a new cycle, in Watch and in Inspect.
|
|
2852
2945
|
let frameDrawn = false;
|
|
2853
2946
|
let bufferTimer = null;
|
|
2947
|
+
// While no frame has drawn on this page (a reload, a load in place) the pane says what it waits for (body.k-framewait),
|
|
2948
|
+
// dark and never empty; a frame that never says it drew gives the line up after FRAME_WAIT_MS.
|
|
2949
|
+
let waitTimer = null;
|
|
2950
|
+
// A frame says it drew when its cards are in the svg, a moment before the scene is laid out and fitted: the line goes
|
|
2951
|
+
// FRAME_SETTLE_MS after that, so the pane is never between the two with nothing in it.
|
|
2952
|
+
const frameWait = (on, settle = 0) => {
|
|
2953
|
+
if (typeof document === "undefined" || !document.body || !document.body.classList) return;
|
|
2954
|
+
clearTimeout(waitTimer);
|
|
2955
|
+
if (!on && settle > 0) {
|
|
2956
|
+
waitTimer = setTimeout(() => document.body.classList.remove("k-framewait"), settle);
|
|
2957
|
+
return;
|
|
2958
|
+
}
|
|
2959
|
+
document.body.classList.toggle("k-framewait", !!on);
|
|
2960
|
+
if (on) waitTimer = setTimeout(() => document.body.classList.remove("k-framewait"), FRAME_WAIT_MS);
|
|
2961
|
+
};
|
|
2962
|
+
frameWait(true);
|
|
2854
2963
|
const bootAt = now().getTime();
|
|
2855
2964
|
let bootRetry = null;
|
|
2965
|
+
// The graph's room changes after the first shot (the banner, the pane's height, web fonts, the frame's own box): tell the
|
|
2966
|
+
// frame again, once, at the end of the change, without a move. The key keeps it cheap when nothing moved.
|
|
2967
|
+
const refitShot = debounced(() => tellShot(false, true), REFIT_WAIT_MS);
|
|
2968
|
+
const watched = new Set();
|
|
2969
|
+
const watchBox = (el) => {
|
|
2970
|
+
if (!el || watched.has(el) || typeof ResizeObserver === "undefined") return;
|
|
2971
|
+
watched.add(el);
|
|
2972
|
+
new ResizeObserver(refitShot).observe(el);
|
|
2973
|
+
};
|
|
2974
|
+
if (typeof window !== "undefined") {
|
|
2975
|
+
window.addEventListener("resize", refitShot);
|
|
2976
|
+
if (document.fonts && document.fonts.ready) document.fonts.ready.then(() => tellShot(false, true), () => {});
|
|
2977
|
+
}
|
|
2856
2978
|
const wireLoad = (el) => {
|
|
2979
|
+
watchBox(el);
|
|
2980
|
+
watchBox(watch && watch.ask);
|
|
2857
2981
|
el.addEventListener("load", () => {
|
|
2858
2982
|
// A new frame takes Watch's shot before it draws, so it opens on it and never on the fit.
|
|
2859
2983
|
tellShot(true);
|
|
@@ -2875,6 +2999,7 @@ export function startKiosk({ bar, frame, side, main, views, read = null, tools =
|
|
|
2875
2999
|
frame = buffer;
|
|
2876
3000
|
buffer = null;
|
|
2877
3001
|
frameDrawn = true;
|
|
3002
|
+
frameWait(false);
|
|
2878
3003
|
s.boxes = null;
|
|
2879
3004
|
s.framePop = null; // behold#764: the old frame's details popover went with it
|
|
2880
3005
|
lastFocus = undefined;
|
|
@@ -2897,6 +3022,7 @@ export function startKiosk({ bar, frame, side, main, views, read = null, tools =
|
|
|
2897
3022
|
// Nothing drawn yet to keep up (the first load, or a load before the last one drew): load in place.
|
|
2898
3023
|
if (first || !frameDrawn || typeof document === "undefined" || !frame.parentNode) {
|
|
2899
3024
|
frameDrawn = false;
|
|
3025
|
+
frameWait(true);
|
|
2900
3026
|
frame.src = src;
|
|
2901
3027
|
return;
|
|
2902
3028
|
}
|
|
@@ -2924,7 +3050,7 @@ export function startKiosk({ bar, frame, side, main, views, read = null, tools =
|
|
|
2924
3050
|
window.addEventListener("message", (e) => {
|
|
2925
3051
|
if (e.origin !== origin || !e.data || e.data.type !== "behold:drawn") return;
|
|
2926
3052
|
if (buffer && e.source === buffer.contentWindow) swapFrame();
|
|
2927
|
-
else if (frame && e.source === frame.contentWindow) frameDrawn = true;
|
|
3053
|
+
else if (frame && e.source === frame.contentWindow) (frameDrawn = true), frameWait(false, FRAME_SETTLE_MS);
|
|
2928
3054
|
});
|
|
2929
3055
|
}
|
|
2930
3056
|
/** behold#571: the commit each served checkout holds, read again when a step names a new one. */
|
package/web/kiosk.test.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { describe, expect, it } from "vitest";
|
|
2
|
-
import { FOLLOW_WORDS, RESUME_WORDS, TAP_HOLD_MS, heldWords, touchScreen, stepTone, nextProgress, nextSeen,BEAT_CHANGES, INTRO_HEAD, READ_STORE, READ_TITLE, STEP_VIEW, STEP_WORDS, aboutRows, approvalPanel, approveGloss, chantProject, factsLine, focusRoots, holdHead, holdModel, introText, readStored, readingRows, renderReading, scenarioHead, frameSrc, factLines, kioskView, matchingPull, pendingApproval, renderKiosk, renderViewToggle, reportless, runPanel, runPin, stepView, viewZoom } from "./kiosk.js";
|
|
2
|
+
import { askHeld, FOLLOW_WORDS, RESUME_WORDS, TAP_HOLD_MS, heldWords, touchScreen, stepTone, nextProgress, nextSeen,BEAT_CHANGES, INTRO_HEAD, READ_STORE, READ_TITLE, STEP_VIEW, STEP_WORDS, aboutRows, approvalPanel, approveGloss, chantProject, factsLine, focusRoots, holdHead, holdModel, introText, readStored, readingRows, renderReading, scenarioHead, frameSrc, factLines, kioskView, matchingPull, pendingApproval, renderKiosk, renderViewToggle, reportless, runPanel, runPin, stepView, viewZoom } from "./kiosk.js";
|
|
3
3
|
import { VENDORS } from "./kiosk-vendor.js";
|
|
4
4
|
import { PICK_HOLD_MS } from "./kiosk-runs.js";
|
|
5
5
|
|
|
@@ -282,9 +282,16 @@ describe("which view the frame shows (#571)", () => {
|
|
|
282
282
|
expect(kioskView(demo("planned"), { components: true, pick: { view: "resources", at: 0 }, now: 1000 }).view).toBe("resources");
|
|
283
283
|
expect(kioskView(demo("waiting"), { components: true })).toEqual({ view: "components", pinned: false, secs: null });
|
|
284
284
|
expect(kioskView(demo("waiting"), { components: false })).toEqual({ view: "resources", pinned: false, secs: null });
|
|
285
|
+
// behold#939: a step with an ask draws the resources, whatever the toggle held; one without is as before.
|
|
286
|
+
const asked = { ...demo("planned"), ask: { prompt: "What does that touch?" } };
|
|
287
|
+
expect(kioskView(asked, { components: true })).toEqual({ view: "resources", pinned: false, secs: null });
|
|
288
|
+
expect(kioskView(asked, { components: true, pick: { view: "components", at: 0 }, now: 1000 }).view).toBe("resources");
|
|
289
|
+
expect(kioskView({ ...demo("planned"), ask: null }, { components: true }).view).toBe("components");
|
|
285
290
|
expect(kioskView(demo("waiting"), { components: false, pick: { view: "components", at: 0 }, now: 1000 }).view).toBe("resources");
|
|
286
291
|
expect(kioskView(null, { components: true }).view).toBe("components");
|
|
287
292
|
expect(kioskView(null, { components: false }).view).toBe("resources");
|
|
293
|
+
// behold#942: a scenario held in ask mode draws the resources at its steps without a prompt too.
|
|
294
|
+
expect(kioskView(demo("applying"), { components: true, ask: true }).view).toBe("resources");
|
|
288
295
|
});
|
|
289
296
|
|
|
290
297
|
it("holds a clicked view for 90 s after the last click, then follows the step again", () => {
|
|
@@ -669,3 +676,20 @@ describe("a held shot on a touch screen", () => {
|
|
|
669
676
|
}
|
|
670
677
|
});
|
|
671
678
|
});
|
|
679
|
+
|
|
680
|
+
describe("ask mode holds for a scenario (behold#942)", () => {
|
|
681
|
+
const step = (name, extra = {}) => ({ ...demo(name), cycle: 3, scenario: "choudoufu-compose-create", ...extra });
|
|
682
|
+
it("a prompt turns it on, and the steps without one keep it", () => {
|
|
683
|
+
let held = askHeld(null, step("pull-request"));
|
|
684
|
+
expect(held).toBe(null);
|
|
685
|
+
held = askHeld(held, step("planned", { ask: { prompt: "Add a subnet" } }));
|
|
686
|
+
expect(held).toBe("3|choudoufu-compose-create");
|
|
687
|
+
for (const name of ["merged", "applying", "waiting", "resumed", "applied", "reset"]) expect(askHeld(held, step(name))).toBe(held);
|
|
688
|
+
});
|
|
689
|
+
it("another scenario or cycle without a prompt lets it go", () => {
|
|
690
|
+
const held = "3|choudoufu-compose-create";
|
|
691
|
+
expect(askHeld(held, step("pull-request", { scenario: "other" }))).toBe(null);
|
|
692
|
+
expect(askHeld(held, step("pull-request", { cycle: 4 }))).toBe(null);
|
|
693
|
+
expect(askHeld(held, null)).toBe(null);
|
|
694
|
+
});
|
|
695
|
+
});
|
package/web/small-stage.test.js
CHANGED
|
@@ -78,6 +78,10 @@ describe("nothing overlays the graph in Watch, on a held small stage only", () =
|
|
|
78
78
|
}
|
|
79
79
|
// A drawer the viewer opened on a wave shows until they fold it.
|
|
80
80
|
expect(watchOverlays({ kind: "result", opened: true, held: true }).drawer).toBe(true);
|
|
81
|
+
// behold#939: ask mode shows no card, badge or drawer of the run, over any stage.
|
|
82
|
+
for (const kind of ["held", "active", "result", "change", "whole"]) expect(watchOverlays({ kind, opened: false, held: false, ask: true })).toEqual({ result: false, callout: false, badges: false, drawer: false });
|
|
83
|
+
expect(watchOverlays({ kind: "result", opened: true, ask: true }).drawer).toBe(true);
|
|
84
|
+
expect(watchOverlays({ kind: "result", opened: false, held: false })).toEqual({ result: true, callout: true, badges: true, drawer: false });
|
|
81
85
|
});
|
|
82
86
|
|
|
83
87
|
it("not held (b-waves, failure, tg-planned-outputs): the callout, the badges, the result card and the step's drawer, as on main", () => {
|
package/web/terragucci-change.js
CHANGED
|
@@ -22,6 +22,7 @@
|
|
|
22
22
|
|
|
23
23
|
import { ago, clock, hrefOf } from "./terragucci.js";
|
|
24
24
|
import { coneFact, coneOf, coneResourceLines, fallbackWhy } from "./cone.js";
|
|
25
|
+
import { COVERED_WORDS } from "./kiosk-light.js";
|
|
25
26
|
|
|
26
27
|
export const STATE_WORDS = {
|
|
27
28
|
"not-started": "queued",
|
|
@@ -60,17 +61,27 @@ export function readEdges(answer, progress) {
|
|
|
60
61
|
const estate = (from, to) => (bin[from] === "choudoufu" && bin[to] === "choudoufu" ? { estate: true } : {});
|
|
61
62
|
if (stage === "pull-request") {
|
|
62
63
|
const run = answer.pull_request.compose && answer.pull_request.compose.wave;
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
64
|
+
// One line per pair: a root that reads another through two data blocks (an estate's outputs, and a second block
|
|
65
|
+
// for the outputs new in the change) is one read, named by its first block, with every block's unknown outputs.
|
|
66
|
+
const byPair = new Map();
|
|
67
|
+
for (const r of answer.pull_request.reads) {
|
|
68
|
+
const e = {
|
|
69
|
+
from: r.root,
|
|
70
|
+
to: r.upstream,
|
|
71
|
+
data: r.data,
|
|
72
|
+
outputs: r.outputs,
|
|
73
|
+
unknown: r.unknown || [],
|
|
74
|
+
...(r.why ? { why: r.why } : {}),
|
|
75
|
+
...(r.composed && run !== undefined ? { composed: run } : {}),
|
|
76
|
+
...estate(r.root, r.upstream),
|
|
77
|
+
stage,
|
|
78
|
+
};
|
|
79
|
+
const key = `${e.from}\u0000${e.to}`;
|
|
80
|
+
const was = byPair.get(key);
|
|
81
|
+
if (!was) byPair.set(key, e);
|
|
82
|
+
else byPair.set(key, { ...was, unknown: [...new Set([...was.unknown, ...e.unknown])] });
|
|
83
|
+
}
|
|
84
|
+
return [...byPair.values()];
|
|
74
85
|
}
|
|
75
86
|
if (stage === "apply") {
|
|
76
87
|
const runOf = new Map(progress.reads.filter((r) => r.composed).map((r) => [r.root, r.composed.wave]));
|
|
@@ -705,6 +716,7 @@ export function rootStates(answer, progress, { story = false } = {}) {
|
|
|
705
716
|
const totals = totalsLine(w.totals);
|
|
706
717
|
const together = new Set([...w.roots, ...(c ? c.roots : []), ...inRun]).size > 1;
|
|
707
718
|
const composedHere = !!c && (c.roots.includes(root) || inRun.includes(root));
|
|
719
|
+
if (m && m.covered) facts.push(COVERED_WORDS); // behold#969: chant's first approval covered this stack's re-plan
|
|
708
720
|
if (m && m.apply) facts.push(memberApplyLine(m).replace(`${root}: `, "")); // this root's own part, not the wave's
|
|
709
721
|
else if (c && !composedHere) {
|
|
710
722
|
// Beside a composed run in its wave: the wave's figures are the run's, not this root's.
|
|
@@ -764,9 +776,14 @@ export function planFitsPin(pr, pin) {
|
|
|
764
776
|
export function pinnedAnswer(answer, run, pull = null) {
|
|
765
777
|
if (!answer || answer.error) return answer;
|
|
766
778
|
const pin = pullPin(run);
|
|
767
|
-
|
|
779
|
+
// behold#940: the estate scene is the plan's resources and what applied, so it goes where the plan does.
|
|
780
|
+
const none = () => {
|
|
781
|
+
const { estateScene: _scene, ...rest } = answer;
|
|
782
|
+
return { ...rest, pull_request: null };
|
|
783
|
+
};
|
|
784
|
+
if (run === "base" || (pin && !planFitsPin(answer.pull_request, pin))) return none();
|
|
768
785
|
// A commit's run is the merge of the cycle's pull request (`pull`): another cycle's plan is never drawn for it.
|
|
769
|
-
if (pull && pinsCommit(run) && !mergedPull(answer.pull_request, pull)) return
|
|
786
|
+
if (pull && pinsCommit(run) && !mergedPull(answer.pull_request, pull)) return none();
|
|
770
787
|
return answer;
|
|
771
788
|
}
|
|
772
789
|
|
package/web/tool-mark.js
CHANGED
|
@@ -48,10 +48,10 @@ export const TOOLS = {
|
|
|
48
48
|
// colors or proportions". A job label implies no endorsement, and the
|
|
49
49
|
// colours and geometry are Cloud Posse's.
|
|
50
50
|
atmos: { name: "Atmos", kind: "orchestrator", icon: { viewBox: "0 0 192 191.999996", fill: { dark: "#ffffff", light: "rgb(10,25,34)" }, shapes: [{"tag": "path", "d": "M 117.269531 58.875 L 119.5 50.671875 L 127.792969 48.460938 L 119.5 46.253906 L 117.269531 38.050781 L 115.035156 46.253906 L 106.742188 48.460938 L 115.035156 50.671875 Z M 117.269531 58.875 ", "fill-rule": "nonzero"}, {"tag": "path", "d": "M 163.125 79.195312 L 161.351562 85.703125 L 154.777344 87.453125 L 161.351562 89.207031 L 163.125 95.714844 L 164.894531 89.207031 L 171.472656 87.453125 L 164.894531 85.703125 Z M 163.125 79.195312 ", "fill-rule": "nonzero"}, {"tag": "path", "d": "M 181.980469 51.519531 L 180.484375 46.019531 L 178.988281 51.519531 L 173.429688 53 L 178.988281 54.480469 L 180.484375 59.980469 L 181.980469 54.480469 L 187.539062 53 Z M 181.980469 51.519531 ", "fill-rule": "nonzero"}, {"tag": "path", "d": "M 151.78125 101.105469 L 151.8125 101.078125 C 148.183594 95.535156 143.296875 91.1875 137.667969 88.285156 C 138.976562 85.765625 140.238281 83.152344 141.453125 80.441406 C 142.304688 80.308594 143.433594 79.996094 144.757812 79.296875 L 149.492188 85.363281 C 149.585938 85.480469 149.730469 85.546875 149.878906 85.535156 C 150.03125 85.523438 150.164062 85.4375 150.238281 85.304688 L 154.171875 78.21875 C 154.21875 78.136719 154.238281 78.042969 154.226562 77.949219 L 153.242188 70.554688 C 154.359375 68.753906 155.421875 66.730469 156.410156 64.542969 C 162.089844 51.9375 160.945312 43.84375 159.753906 40.140625 C 159.363281 38.921875 158.996094 38.296875 158.984375 38.269531 C 158.890625 38.113281 158.714844 38.03125 158.535156 38.054688 C 158.070312 38.117188 147.082031 39.8125 137.78125 57.585938 C 137.769531 57.609375 136.578125 59.976562 135.484375 63.113281 L 129.105469 67.238281 C 129.027344 67.289062 128.96875 67.359375 128.933594 67.441406 L 125.855469 74.933594 C 125.816406 75.03125 125.8125 75.136719 125.84375 75.234375 C 125.859375 75.273438 125.878906 75.3125 125.902344 75.351562 C 125.988281 75.472656 126.132812 75.546875 126.28125 75.542969 L 134.003906 75.355469 C 134.359375 76.632812 134.980469 77.679688 135.828125 78.484375 C 134.65625 81.074219 133.441406 83.578125 132.179688 85.984375 C 128.554688 84.8125 124.710938 84.191406 120.765625 84.191406 C 119.742188 84.191406 118.667969 84.242188 117.574219 84.335938 L 116.347656 84.441406 L 115.863281 83.316406 C 109.441406 68.316406 93.898438 58.242188 77.1875 58.242188 C 54.109375 58.242188 35.335938 76.433594 35.335938 98.792969 L 35.335938 100.597656 L 33.765625 100.714844 C 32.863281 100.785156 31.941406 100.894531 31.027344 101.046875 C 27.207031 101.625 23.507812 102.984375 20.21875 105.007812 L 20.222656 105.011719 L 18.957031 105.933594 C 11.15625 111.320312 6.5 120.046875 6.5 129.285156 C 6.5 145.082031 19.753906 157.933594 36.046875 157.933594 L 119.867188 157.933594 C 140.816406 157.933594 157.863281 141.414062 157.863281 121.105469 C 157.863281 114.453125 156 107.929688 152.480469 102.234375 Z M 146.242188 55.753906 C 148.613281 55.007812 151.148438 56.304688 151.902344 58.652344 C 152.65625 61 151.34375 63.503906 148.972656 64.25 C 146.597656 64.996094 144.066406 63.699219 143.3125 61.351562 C 142.558594 59.003906 143.871094 56.5 146.242188 55.753906 Z M 36.046875 151.210938 C 23.5 151.210938 13.296875 141.375 13.296875 129.285156 C 13.296875 118.742188 21.09375 109.683594 31.835938 107.738281 C 33.078125 107.542969 34.195312 107.449219 35.285156 107.449219 C 41.074219 107.449219 46.480469 109.699219 50.546875 113.648438 C 51.171875 114.433594 52.132812 114.941406 53.21875 114.941406 C 55.097656 114.941406 56.625 113.417969 56.625 111.535156 C 56.625 110.34375 56.015625 109.300781 55.089844 108.691406 C 51.796875 105.558594 47.816406 103.214844 43.402344 101.90625 L 42.253906 101.566406 L 42.179688 100.128906 C 42.15625 99.679688 42.132812 99.230469 42.132812 98.792969 C 42.132812 80.140625 57.855469 64.964844 77.1875 64.964844 C 90.570312 64.964844 102.980469 72.515625 108.800781 84.207031 L 109.628906 85.867188 L 107.878906 86.523438 C 100.277344 89.367188 93.84375 94.667969 89.496094 101.464844 C 88.996094 102.054688 88.691406 102.820312 88.691406 103.65625 C 88.691406 105.535156 90.210938 107.054688 92.085938 107.054688 C 93.375 107.054688 94.496094 106.335938 95.070312 105.28125 C 95.074219 105.285156 95.078125 105.289062 95.082031 105.292969 C 100.070312 97.289062 108.429688 91.972656 117.898438 91.066406 C 118.59375 91.023438 119.230469 91 119.867188 91 C 122.933594 91 125.894531 91.4375 128.695312 92.234375 C 112.875 118.917969 91.886719 133.214844 75.910156 140.714844 C 56.324219 149.90625 39.992188 151.113281 38.371094 151.210938 Z M 119.867188 151.210938 L 65.675781 151.210938 C 69.613281 149.855469 73.824219 148.195312 78.210938 146.144531 C 95.222656 138.207031 117.613281 122.976562 134.285156 94.421875 C 144.25 99.453125 151.066406 109.523438 151.066406 121.105469 C 151.066406 137.707031 137.070312 151.210938 119.867188 151.210938 Z M 119.867188 151.210938 ", "fill-rule": "nonzero"}] } },
|
|
51
|
-
// chant: ours. Its
|
|
52
|
-
// (https://github.com/INTENTIUS/chant/blob/main/docs/public/brand/
|
|
51
|
+
// chant: ours. Its face from chant's docs
|
|
52
|
+
// (https://github.com/INTENTIUS/chant/blob/main/docs/public/brand/logo.svg),
|
|
53
53
|
// in the gold chant's site draws it in (styles/chant.css `--ch-gold`).
|
|
54
|
-
chant: { name: "chant", kind: "orchestrator", icon: { viewBox: "
|
|
54
|
+
chant: { name: "chant", kind: "orchestrator", icon: { viewBox: "-1 -1 40 23", fill: { dark: "#c9a96e", light: "#9a7b3f" }, attrs: { "shape-rendering": "crispEdges" }, shapes: [{"tag": "rect", "x": 2, "y": 0, "width": 2, "height": 1}, {"tag": "rect", "x": 7, "y": 0, "width": 2, "height": 1}, {"tag": "rect", "x": 12, "y": 0, "width": 2, "height": 1}, {"tag": "rect", "x": 17, "y": 0, "width": 2, "height": 1}, {"tag": "rect", "x": 22, "y": 0, "width": 2, "height": 1}, {"tag": "rect", "x": 1, "y": 1, "width": 1, "height": 1}, {"tag": "rect", "x": 4, "y": 1, "width": 1, "height": 1}, {"tag": "rect", "x": 6, "y": 1, "width": 1, "height": 1}, {"tag": "rect", "x": 9, "y": 1, "width": 1, "height": 1}, {"tag": "rect", "x": 11, "y": 1, "width": 1, "height": 1}, {"tag": "rect", "x": 14, "y": 1, "width": 1, "height": 1}, {"tag": "rect", "x": 16, "y": 1, "width": 1, "height": 1}, {"tag": "rect", "x": 19, "y": 1, "width": 1, "height": 1}, {"tag": "rect", "x": 21, "y": 1, "width": 1, "height": 1}, {"tag": "rect", "x": 24, "y": 1, "width": 1, "height": 1}, {"tag": "rect", "x": 1, "y": 3, "width": 1, "height": 1}, {"tag": "rect", "x": 24, "y": 3, "width": 1, "height": 1}, {"tag": "rect", "x": 1, "y": 4, "width": 1, "height": 1}, {"tag": "rect", "x": 5, "y": 4, "width": 5, "height": 1}, {"tag": "rect", "x": 16, "y": 4, "width": 5, "height": 1}, {"tag": "rect", "x": 24, "y": 4, "width": 1, "height": 1}, {"tag": "rect", "x": 1, "y": 5, "width": 1, "height": 1}, {"tag": "rect", "x": 4, "y": 5, "width": 1, "height": 1}, {"tag": "rect", "x": 10, "y": 5, "width": 1, "height": 1}, {"tag": "rect", "x": 15, "y": 5, "width": 1, "height": 1}, {"tag": "rect", "x": 21, "y": 5, "width": 1, "height": 1}, {"tag": "rect", "x": 24, "y": 5, "width": 1, "height": 1}, {"tag": "rect", "x": 1, "y": 6, "width": 1, "height": 1}, {"tag": "rect", "x": 3, "y": 6, "width": 1, "height": 1}, {"tag": "rect", "x": 6, "y": 6, "width": 3, "height": 1}, {"tag": "rect", "x": 11, "y": 6, "width": 1, "height": 1}, {"tag": "rect", "x": 14, "y": 6, "width": 1, "height": 1}, {"tag": "rect", "x": 17, "y": 6, "width": 3, "height": 1}, {"tag": "rect", "x": 22, "y": 6, "width": 1, "height": 1}, {"tag": "rect", "x": 24, "y": 6, "width": 1, "height": 1}, {"tag": "rect", "x": 1, "y": 7, "width": 1, "height": 1}, {"tag": "rect", "x": 3, "y": 7, "width": 1, "height": 1}, {"tag": "rect", "x": 5, "y": 7, "width": 5, "height": 1}, {"tag": "rect", "x": 11, "y": 7, "width": 1, "height": 1}, {"tag": "rect", "x": 14, "y": 7, "width": 1, "height": 1}, {"tag": "rect", "x": 16, "y": 7, "width": 5, "height": 1}, {"tag": "rect", "x": 22, "y": 7, "width": 1, "height": 1}, {"tag": "rect", "x": 24, "y": 7, "width": 1, "height": 1}, {"tag": "rect", "x": 1, "y": 8, "width": 1, "height": 1}, {"tag": "rect", "x": 3, "y": 8, "width": 1, "height": 1}, {"tag": "rect", "x": 5, "y": 8, "width": 5, "height": 1}, {"tag": "rect", "x": 11, "y": 8, "width": 1, "height": 1}, {"tag": "rect", "x": 14, "y": 8, "width": 1, "height": 1}, {"tag": "rect", "x": 16, "y": 8, "width": 5, "height": 1}, {"tag": "rect", "x": 22, "y": 8, "width": 1, "height": 1}, {"tag": "rect", "x": 24, "y": 8, "width": 1, "height": 1}, {"tag": "rect", "x": 1, "y": 9, "width": 1, "height": 1}, {"tag": "rect", "x": 3, "y": 9, "width": 1, "height": 1}, {"tag": "rect", "x": 6, "y": 9, "width": 3, "height": 1}, {"tag": "rect", "x": 11, "y": 9, "width": 1, "height": 1}, {"tag": "rect", "x": 14, "y": 9, "width": 1, "height": 1}, {"tag": "rect", "x": 17, "y": 9, "width": 3, "height": 1}, {"tag": "rect", "x": 22, "y": 9, "width": 1, "height": 1}, {"tag": "rect", "x": 24, "y": 9, "width": 1, "height": 1}, {"tag": "rect", "x": 1, "y": 10, "width": 1, "height": 1}, {"tag": "rect", "x": 4, "y": 10, "width": 1, "height": 1}, {"tag": "rect", "x": 10, "y": 10, "width": 1, "height": 1}, {"tag": "rect", "x": 15, "y": 10, "width": 1, "height": 1}, {"tag": "rect", "x": 21, "y": 10, "width": 1, "height": 1}, {"tag": "rect", "x": 24, "y": 10, "width": 1, "height": 1}, {"tag": "rect", "x": 1, "y": 11, "width": 1, "height": 1}, {"tag": "rect", "x": 5, "y": 11, "width": 5, "height": 1}, {"tag": "rect", "x": 16, "y": 11, "width": 5, "height": 1}, {"tag": "rect", "x": 24, "y": 11, "width": 1, "height": 1}, {"tag": "rect", "x": 33, "y": 11, "width": 1, "height": 1}, {"tag": "rect", "x": 1, "y": 12, "width": 1, "height": 1}, {"tag": "rect", "x": 24, "y": 12, "width": 1, "height": 1}, {"tag": "rect", "x": 30, "y": 12, "width": 1, "height": 1}, {"tag": "rect", "x": 34, "y": 12, "width": 1, "height": 1}, {"tag": "rect", "x": 1, "y": 13, "width": 1, "height": 1}, {"tag": "rect", "x": 24, "y": 13, "width": 1, "height": 1}, {"tag": "rect", "x": 27, "y": 13, "width": 1, "height": 1}, {"tag": "rect", "x": 31, "y": 13, "width": 1, "height": 1}, {"tag": "rect", "x": 34, "y": 13, "width": 1, "height": 1}, {"tag": "rect", "x": 1, "y": 14, "width": 1, "height": 1}, {"tag": "rect", "x": 11, "y": 14, "width": 6, "height": 1}, {"tag": "rect", "x": 24, "y": 14, "width": 1, "height": 1}, {"tag": "rect", "x": 28, "y": 14, "width": 1, "height": 1}, {"tag": "rect", "x": 31, "y": 14, "width": 1, "height": 1}, {"tag": "rect", "x": 34, "y": 14, "width": 1, "height": 1}, {"tag": "rect", "x": 1, "y": 15, "width": 1, "height": 1}, {"tag": "rect", "x": 10, "y": 15, "width": 1, "height": 1}, {"tag": "rect", "x": 17, "y": 15, "width": 1, "height": 1}, {"tag": "rect", "x": 24, "y": 15, "width": 1, "height": 1}, {"tag": "rect", "x": 28, "y": 15, "width": 1, "height": 1}, {"tag": "rect", "x": 31, "y": 15, "width": 1, "height": 1}, {"tag": "rect", "x": 34, "y": 15, "width": 1, "height": 1}, {"tag": "rect", "x": 2, "y": 16, "width": 1, "height": 1}, {"tag": "rect", "x": 10, "y": 16, "width": 1, "height": 1}, {"tag": "rect", "x": 17, "y": 16, "width": 1, "height": 1}, {"tag": "rect", "x": 23, "y": 16, "width": 1, "height": 1}, {"tag": "rect", "x": 28, "y": 16, "width": 1, "height": 1}, {"tag": "rect", "x": 31, "y": 16, "width": 1, "height": 1}, {"tag": "rect", "x": 34, "y": 16, "width": 1, "height": 1}, {"tag": "rect", "x": 3, "y": 17, "width": 3, "height": 1}, {"tag": "rect", "x": 11, "y": 17, "width": 6, "height": 1}, {"tag": "rect", "x": 20, "y": 17, "width": 3, "height": 1}, {"tag": "rect", "x": 27, "y": 17, "width": 1, "height": 1}, {"tag": "rect", "x": 31, "y": 17, "width": 1, "height": 1}, {"tag": "rect", "x": 34, "y": 17, "width": 1, "height": 1}, {"tag": "rect", "x": 30, "y": 18, "width": 1, "height": 1}, {"tag": "rect", "x": 34, "y": 18, "width": 1, "height": 1}, {"tag": "rect", "x": 33, "y": 19, "width": 1, "height": 1}] } },
|
|
55
55
|
// OpenTofu: the color icon from cncf/artwork,
|
|
56
56
|
// https://github.com/cncf/artwork/blob/bd7f51052b704482f03f7dcb40b09a02b2cc9e7f/projects/opentofu/icon/color/opentofu-icon-color.svg,
|
|
57
57
|
// geometry and colours as published (the classes inlined as fills). "All
|
|
@@ -68,7 +68,7 @@ export const TOOLS = {
|
|
|
68
68
|
// marketing division." A job label is another use, so no logo.
|
|
69
69
|
terraform: { name: "Terraform", kind: "engine", icon: null },
|
|
70
70
|
// choudoufu: ours, the PNG the kiosk's choudoufu page already shows. Relative, so a static export finds it.
|
|
71
|
-
choudoufu: { name: "choudoufu", kind: "engine", icon: { image: "vendors/choudoufu
|
|
71
|
+
choudoufu: { name: "choudoufu", kind: "engine", icon: { image: "vendors/choudoufu.svg" } },
|
|
72
72
|
// SQL Yodeler: ours, its cowboy hat from SQL Yodeler's docs
|
|
73
73
|
// (sql-yodeler docs-site/public/brand/hat-small.png and hat-160.png), served
|
|
74
74
|
// as /vendors/sql-yodeler-44.png and -160.png; the larger one draws the mark. After
|
package/web/tool-mark.test.js
CHANGED
|
@@ -80,6 +80,6 @@ describe("the marks", () => {
|
|
|
80
80
|
// Inline geometry, or the PNG behold ships; never an external URL.
|
|
81
81
|
expect(JSON.stringify(t.icon)).not.toMatch(/https?:/);
|
|
82
82
|
}
|
|
83
|
-
expect(TOOLS.choudoufu.icon.image).toBe("vendors/choudoufu
|
|
83
|
+
expect(TOOLS.choudoufu.icon.image).toBe("vendors/choudoufu.svg");
|
|
84
84
|
});
|
|
85
85
|
});
|