- |
+ |
diff --git a/ui/src/views/Forecast.jsx b/ui/src/views/Forecast.jsx
index fa1a2ce..b5dcb5b 100644
--- a/ui/src/views/Forecast.jsx
+++ b/ui/src/views/Forecast.jsx
@@ -30,6 +30,68 @@ function cleanLayout(cfg, validCols) {
return c
}
+// Ordering for the pf_bucket and pf_segment column groups, as Perspective
+// expression columns.
+//
+// Perspective orders column groups by the value string, and SortDir's `col asc` /
+// `col desc` only reverses that — so Prior Year → Plan → Actual → Forecast is
+// expressible as neither, being alphabetical in neither direction. The order has
+// to be part of the value, as a "01 · " prefix.
+//
+// Done as expressions rather than in SQL. The prefix is a pivot-ordering concern,
+// and computing it server-side put it in every other reader too: the change log
+// and the bridge's basis list would both show "04 · Forecast". As expressions it
+// stays in the pivot, lives in ViewConfig so it travels with saved layouts, and
+// reordering takes effect immediately instead of needing a reload.
+//
+// Syntax per rust/perspective-client/src/rust/config/expressions.rs: columns in
+// double quotes, string literals in single, if/else with braces. The ordered
+// label is emitted as a literal rather than built with concat() — fewer moving
+// parts, and the mapping is known here anyway.
+const ORDER_EXPR_NAMES = { bucket: 'Bucket', segment: 'Segment' }
+
+function orderedLabel(ord, label) {
+ return `${String(ord).padStart(2, '0')} · ${label}`
+}
+
+function sqlSafe(v) {
+ return String(v).replace(/'/g, "''")
+}
+
+// pairs: [[rawValue, ordinal], ...]. Anything unlisted falls through to the raw
+// column, so it sorts after the ordered entries (digits before letters) rather
+// than silently landing first.
+function buildOrderExpression(sourceCol, pairs) {
+ const cases = pairs
+ .filter(([label, ord]) => label && ord > 0)
+ .sort((a, b) => a[1] - b[1])
+ .map(([label, ord]) =>
+ `if ("${sourceCol}" == '${sqlSafe(label)}') { '${sqlSafe(orderedLabel(ord, label))}' }`)
+ if (cases.length === 0) return null
+ return `${cases.join('\nelse ')}\nelse { "${sourceCol}" }`
+}
+
+// Build both expressions from the version's bucket_order and the log's seq values.
+function buildOrderExpressions(bucketOrder, logMeta) {
+ const out = {}
+
+ const buckets = (Array.isArray(bucketOrder) ? bucketOrder : [])
+ .map((label, i) => [label, i + 1])
+ const bucketExpr = buildOrderExpression('pf_bucket', buckets)
+ if (bucketExpr) out[ORDER_EXPR_NAMES.bucket] = bucketExpr
+
+ // Segments are ordered by pf.log.seq, keyed on the label the pivot shows —
+ // which is the tag if there is one, else the note, the same precedence the
+ // server uses to build pf_segment.
+ const segs = Object.values(logMeta || {})
+ .filter(m => m.seq != null && ['baseline', 'reference'].includes(m.operation))
+ .map(m => [(m.tag || m.note || '').trim(), m.seq])
+ const segExpr = buildOrderExpression('pf_segment', segs)
+ if (segExpr) out[ORDER_EXPR_NAMES.segment] = segExpr
+
+ return out
+}
+
export default function Forecast({ sources = [], sourceId, versions = [], versionId, refreshSources }) {
const { dark } = useTheme()
const [loading, setLoading] = useState(false)
@@ -506,7 +568,10 @@ export default function Forecast({ sources = [], sourceId, versions = [], versio
try {
const entries = await fetch(`/api/versions/${vid}/log`).then(r => r.json())
const map = {}
- for (const e of entries) map[e.id] = { tag: e.tag || null, note: e.note || null, operation: e.operation }
+ for (const e of entries) map[e.id] = {
+ tag: e.tag || null, note: e.note || null, operation: e.operation,
+ bucket: e.bucket || null, seq: e.seq ?? null,
+ }
setLogMeta(map)
} catch { setLogMeta({}) }
}
@@ -550,6 +615,9 @@ export default function Forecast({ sources = [], sourceId, versions = [], versio
}, [sourceId, versionId])
useEffect(() => { refreshLogMeta(versionId) }, [versionId])
+ // Reordering on the Baseline page takes effect here without a reload: the
+ // expressions are rebuilt and the pivot re-renders.
+ useEffect(() => { if (tableRef.current) syncOrderExpressions() }, [logMeta, versions, versionId])
useEffect(() => { refreshTags(sourceId) }, [sourceId])
// Stream an Arrow IPC endpoint into one buffer, reporting download progress.
@@ -660,6 +728,7 @@ export default function Forecast({ sources = [], sourceId, versions = [], versio
await viewer.load(tableRef.current)
viewer.setAttribute('theme', dark ? 'Pro Dark' : 'Pro Light')
if (!hideSplitTotal()) setTimeout(hideSplitTotal, 400)
+ await syncOrderExpressions()
// restore last-used layout or build default
// Strip cfg.table — table is already loaded by reference above; a stale name
@@ -812,6 +881,46 @@ export default function Forecast({ sources = [], sourceId, versions = [], versio
}
}
+ // Keep the ordering expressions in step with the version's bucket_order and the
+ // log's seq values. Merged into the live config rather than replacing
+ // expressions, so anything the user defined themselves survives.
+ //
+ // Removing an ordering removes its column: leaving a stale Bucket expression
+ // behind would keep ordering by an order that no longer exists.
+ async function syncOrderExpressions() {
+ const viewer = viewerRef.current
+ if (!viewer) return
+ const version = versions.find(v => String(v.id) === String(versionId))
+ const wanted = buildOrderExpressions(version?.bucket_order, logMeta)
+
+ const { table: _t, ...cfg } = await viewer.save()
+ const current = cfg.expressions || {}
+ const managed = Object.values(ORDER_EXPR_NAMES)
+
+ const next = { ...current }
+ for (const name of managed) delete next[name]
+ Object.assign(next, wanted)
+
+ const same = JSON.stringify(next) === JSON.stringify(current)
+ if (same) return
+
+ // An expression the pivot is using cannot simply vanish; drop it from the
+ // axes first or restore() rejects the config.
+ const stillValid = (col) => next[col] !== undefined || !managed.includes(col)
+ try {
+ await viewer.restore({
+ ...cfg,
+ expressions: next,
+ columns: (cfg.columns || []).filter(c => c == null || stillValid(c)),
+ group_by: (cfg.group_by || []).filter(stillValid),
+ split_by: (cfg.split_by || []).filter(stillValid),
+ sort: (cfg.sort || []).filter(([c]) => stillValid(c)),
+ })
+ } catch (err) {
+ console.error('[syncOrderExpressions]', err)
+ }
+ }
+
// In rollup mode the datagrid emits a grand-total column group as well as the
// subtotals. The subtotals are the point -- they are what per-branch collapse
// needs -- but the grand total sums across the split, and when the split is
|