[]>(scaleMode ? nodes : catalogNodes.map((n) => ({ id: n.key, data: cardData(n) })));
const browserNodes = $derived(
- [...nodes]
+ [...listNodes]
.filter((node) => String(node.data.name ?? '').toLowerCase().includes(modelQuery.trim().toLowerCase()))
.sort((left, right) => String(left.data.name).localeCompare(String(right.data.name)))
);
@@ -334,10 +369,19 @@
.filter((g) => g.nodes.length)
);
- // immediate upstream/downstream of the selected model (for the Lineage tab)
+ // immediate upstream/downstream of the selected model (for the Lineage tab); with folders drawn,
+ // from the catalog, as an edge to a closed folder doesn't name the node it reaches
const nameOf = (id: string) => nodes.find((n) => n.id === id)?.data.name ?? id;
- const upstream = $derived(primary ? edges.filter((e) => e.target === primary.id).map((e) => nameOf(e.source)) : []);
- const downstream = $derived(primary ? edges.filter((e) => e.source === primary.id).map((e) => nameOf(e.target)) : []);
+ const upstream = $derived(
+ !primary ? [] : grouped ? (catalogByKey.get(primary.id)?.upstream ?? []) : edges.filter((e) => e.target === primary.id).map((e) => nameOf(e.source))
+ );
+ const downstream = $derived(
+ !primary
+ ? []
+ : grouped
+ ? catalogNodes.filter((n) => n.upstream.includes(primary.id)).map((n) => n.key)
+ : edges.filter((e) => e.source === primary.id).map((e) => nameOf(e.target))
+ );
let sqlMode = $state<'raw' | 'compiled'>('raw');
const sqlRaw = $derived(d?.sql?.raw ?? '');
@@ -363,7 +407,8 @@
sqlOpen = true;
}
function selectByName(name: string) {
- const id = nodes.find((node) => node.data.name === name)?.id;
+ // A node inside a closed folder isn't drawn; selecting it opens the folders around it.
+ const id = nodes.find((node) => node.data.name === name)?.id ?? (grouped && catalogByKey.has(name) ? name : undefined);
if (id) selectModel(id);
}
@@ -376,6 +421,8 @@
if (g && setFlowViewport) setFlowViewport({ zoom: 1, x: panelSize.w / 2 - (g.x + 118), y: panelSize.h / 2 - (g.y + 30) });
return;
}
+ const listed = catalogByKey.get(id);
+ if (grouped && listed && !nodes.some((n) => n.id === id)) regroup({ expanded: withFoldersOpen(listed, expanded) });
nodes = nodes.map((node) => ({ ...node, hidden: false, selected: node.id === id }));
edges = edges.map((edge) => ({ ...edge, hidden: false }));
await tick();
@@ -493,6 +540,7 @@
fitScaleGraph();
return;
}
+ if (grouped && expanded.size) regroup({ expanded: new Set() });
nodes = nodes.map((node) => ({ ...node, hidden: false }));
edges = edges.map((edge) => ({ ...edge, hidden: false }));
nodes = layoutGraph(nodes, edges);
@@ -547,6 +595,16 @@
{/if}
+ {#if !scaleMode}
+ regroup({ grouped: !grouped, expanded: new Set() })}
+ class="toolbar-action"
+ class:focus-active={grouped}
+ title={grouped ? 'Draw every node' : 'Draw each folder as one card; click a folder to open it'}
+ >
+ Folders
+
+ {/if}
Reset
{#each [['ok', 'var(--sb-success)', 'last build succeeded'], ['warn', 'var(--sb-warning)', 'last build warned'], ['stale', 'var(--sb-stale)', 'stale'], ['fail', 'var(--sb-error)', 'last build failed']] as [st, c, label] (st)}
- {@const n = nodes.filter((x) => (st === 'stale' ? !!x.data.stale : x.data.status === st)).length}
+ {@const n = scaleMode ? nodes.filter((x) => (st === 'stale' ? !!x.data.stale : x.data.status === st)).length : catalogNodes.filter((c) => (st === 'stale' ? !!c.stale?.length : cardStatus(c) === st)).length}
{#if n} {n} {/if}
{/each}
@@ -622,6 +680,7 @@
multiSelectionKey={['Shift', 'Meta', 'Control']}
selectionKey="Shift"
proOptions={{ hideAttribution: true }}
+ onnodeclick={({ node }) => node.type === 'folder' && openFolder(String(node.data.group))}
onnodepointerenter={({ node }) => (hoveredId = node.id)}
onnodepointerleave={() => (hoveredId = null)}
>
diff --git a/ui/src/routes/plan/+page.svelte b/ui/src/routes/plan/+page.svelte
index 92bf838f3b..7702efb5bc 100644
--- a/ui/src/routes/plan/+page.svelte
+++ b/ui/src/routes/plan/+page.svelte
@@ -14,17 +14,19 @@
import { kindLine } from '$lib/build-area/labels';
import { formatAgo } from '$lib/format/time';
import ScopeGraph from '$lib/lineage/scope-graph.svelte';
- import { PERMISSIONS } from '$lib/platform/permission-catalog';
import { VERBS } from '$lib/run/command-table';
import { applySuggestion, commandTokens, jobBuildTokens, jobRunProblem, parseCommand, settledJobCommand, suggest, windowOf, withFullRefresh, withVerb, withWindow, type Suggestion } from '$lib/run/command';
import DataRange from '$lib/run/data-range.svelte';
import PlanReport from '$lib/run/plan-report.svelte';
- import { changedModelKeys, readySummary } from '$lib/run/plan-text';
+ import StatusLabel from '$lib/components/list/status-label.svelte';
+ import { checkOutcomeLabel, checkOutcomeTone } from '$lib/status';
+ import { changedModelKeys, planSentence } from '$lib/run/plan-text';
import { app } from '$lib/state/app.svelte';
import { createResource } from '$lib/state/resource.svelte';
const snapshotNodes = createResource((client, scope) => client.listSnapshotNodes(scope), ['snapshot']);
const catalog = createResource((client, scope) => client.listCatalogNodes(scope), ['snapshot', 'runs', 'node_status']);
+ const checkList = createResource((client, scope) => client.listChecks(scope), ['checks']);
let cmd = $state(page.url.searchParams.get('cmd') ?? 'sqb build');
let cmdEl = $state();
@@ -139,7 +141,15 @@
// ---- what a non-build verb picks, from the catalog ----
const byKey = $derived(new Map((catalog.data ?? []).map((n) => [n.key, n])));
const picked = $derived(shown?.selection ?? []);
- let view = $state<'plan' | 'graph'>('plan');
+ let view = $state<'plan' | 'graph' | 'checks'>('plan');
+ /** The recorded checks on the models and seeds the plan builds, which run after them. */
+ const planChecks = $derived.by(() => {
+ if (!plan) return [];
+ const built = new Set([...plan.models.filter((m) => m.action !== 'skip').map((m) => m.name), ...plan.seeds.map((s) => s.name)]);
+ return (checkList.data ?? []).filter((c) => (c.attachment === 'model' || c.attachment === 'seed') && !!c.node && built.has(c.node.slice(c.node.indexOf(':') + 1)));
+ });
+ /** The tab shown: a replan with no checks leaves the Checks tab for the plan. */
+ const tab = $derived(view === 'checks' && !(shown?.verb === 'build' && planChecks.length) ? 'plan' : view);
/** A large selection draws only what the plan changes; the whole of it would be unreadable. */
const GRAPH_LIMIT = 150;
const graphKeys = $derived(picked.length > GRAPH_LIMIT && plan ? changedModelKeys(plan) : picked);
@@ -306,26 +316,42 @@
{#if shown?.verb}
{#if shown.verb === 'build'}
- {#if plan}
{readySummary(plan)} {/if}
+ {#if plan}
{planSentence(plan)} {/if}
{:else}
{picked.length} node{picked.length === 1 ? '' : 's'}{#if shown.writeSet.length}
· updates
{shown.writeSet.length} {/if}
{/if}
+ {#each Object.entries(shown.settings) as [name, value] (name)}
{value === true ? name : `${name}=${value}`} {/each}
- (view = 'plan')}>{shown.verb === 'build' ? 'Plan' : 'Nodes'}
- (view = 'graph')}>Graph
+ (view = 'plan')}>{shown.verb === 'build' ? 'Plan' : 'Nodes'}
+ (view = 'graph')}>Graph
+ {#if shown.verb === 'build' && planChecks.length} (view = 'checks')}>Checks · {planChecks.length} {/if}
{#if shown.verb === 'build' && plan}
{planning ? 'Planning…' : 'Plan again'}
{/if}
{/if}
- {#if view === 'graph' && shown?.verb && catalog.data && (shown.verb !== 'build' || plan)}
+ {#if tab === 'graph' && shown?.verb && catalog.data && (shown.verb !== 'build' || plan)}
{#if graphKeys.length < picked.length}
{picked.length} nodes are too many to draw, so the graph shows only the {graphKeys.length === 1 ? 'model' : `${graphKeys.length} models`} this plan changes.
{/if}
{#if graphKeys.length}
{}} />
{/if}
+ {:else if tab === 'checks' && shown?.verb === 'build' && plan}
+ These checks run after the models they check, and a failing error check stops what depends on it.
+
+
+ {#each planChecks as c (c.id)}
+
+ {c.name}
+ {c.node ? c.node.slice(c.node.indexOf(':') + 1) : ''}{c.column ? `.${c.column}` : ''}
+ {c.severity}
+ {#if c.latest} {/if}
+
+ {/each}
+
+
{:else if shown?.verb === 'build' && plan}
{:else if shown?.verb && shown.verb !== 'build'}
@@ -357,25 +383,6 @@
{/if}
-
-