fire-planner: ProjectionLab parity Wave 1 — tabbed shell, year stats, goals,
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
income streams, Sankey cashflow, progress overlay, settings sub-pages
Wave 1 (9 features across 4 streams):
Stream A — dashboard skeleton
1.A.1 ScenarioShell with top tabs (Plan/Cash Flow/Tax Analytics/Compare/
Reports/Estate/Settings) + left Sidebar with Plans switcher.
1.A.2 GET /scenarios/{id}/year-stats?year=N returning per-year metrics
(NW, Δ NW, taxable income, taxes, eff. rate, spending, contribs,
investment growth). YearScrubber + YearStatsPanel render the
right-hand sidebar; URL ?year= preserves selection.
1.A.3 FanChart gains optional `milestones` prop (lib/milestone.ts maps
life_event.kind → emoji) + selectedYear marker line.
Stream B — goals + progress
1.B.1 New goals_eval module: target_nw_by_year / never_run_out /
target_real_income probability evaluation. Wired into POST
/simulate (exact, per-path) and GET /scenarios/{id}/projection
(approximated from persisted fan via percentile interpolation).
GoalsSection renders pass/fail badges.
1.B.2 GET /scenarios/{id}/progress overlays AccountSnapshot totals on
the projection fan; ProgressPage shows variance side-panel.
Stream C — income + cashflow
1.C.1 New IncomeStream model + alembic 0003 + CRUD endpoints. Engine
aggregates streams into per-year inflows + taxable arrays;
income tax routes through the jurisdiction tax engine.
IncomeStreamsSection on Plan tab.
1.C.2 GET /scenarios/{id}/cashflow?year=N returns sources/sinks for
an ECharts Sankey (sums conserve). CashflowTab body.
Stream D — settings
1.D.1 SettingsTab + sub-nav (Milestones/Rates/Dividends/Bonds/Tax/
Metrics/Other/Notes); placeholder cards for unbuilt sub-pages.
1.D.2 LifeEventsSection relocated to /scenarios/:id/settings.
1.D.3 RatesSettings (Fixed/Historical/Advanced segmented + per-asset
cards). SimulateRequest gains rates_mode, inflation_pct,
stocks/bonds growth + dividend, stocks_allocation. New
build_fixed_paths() in simulator. Real-return arithmetic
verified against (1+g+d)/(1+i)−1 ≈ 5.4%.
1.D.4 NotesSettings — markdown textarea, save-on-blur, stored in
scenario.config_json.notes.
Backend: 238 pytest pass (+19 new), mypy + ruff clean.
Frontend: typecheck + 7 unit tests + production build clean.
Roadmap for Wave 2-N is documented in the implementation plan.
This commit is contained in:
parent
e12e8f9290
commit
9cc781a8d6
42 changed files with 3765 additions and 80 deletions
|
|
@ -19,25 +19,57 @@ import type { EChartsOption } from 'echarts';
|
|||
|
||||
import type { ProjectionPoint } from '@/api/client';
|
||||
import { gbpCompact } from '@/lib/format';
|
||||
import type { Milestone } from '@/lib/milestone';
|
||||
|
||||
interface Props {
|
||||
yearly: ProjectionPoint[];
|
||||
height?: number;
|
||||
showWithdrawal?: boolean;
|
||||
milestones?: Milestone[];
|
||||
selectedYear?: number | null;
|
||||
onSelectYear?: (year: number) => void;
|
||||
}
|
||||
|
||||
export function FanChart({ yearly, height = 360, showWithdrawal = false }: Props) {
|
||||
const option = useMemo<EChartsOption>(() => buildFan(yearly, showWithdrawal), [
|
||||
yearly,
|
||||
showWithdrawal,
|
||||
]);
|
||||
export function FanChart({
|
||||
yearly,
|
||||
height = 360,
|
||||
showWithdrawal = false,
|
||||
milestones,
|
||||
selectedYear,
|
||||
onSelectYear,
|
||||
}: Props) {
|
||||
const option = useMemo<EChartsOption>(
|
||||
() => buildFan(yearly, showWithdrawal, milestones, selectedYear),
|
||||
[yearly, showWithdrawal, milestones, selectedYear],
|
||||
);
|
||||
if (yearly.length === 0) {
|
||||
return <p className="text-sm text-slate-500">No projection data.</p>;
|
||||
}
|
||||
return <ReactECharts option={option} style={{ height, width: '100%' }} notMerge lazyUpdate />;
|
||||
const handlers = onSelectYear
|
||||
? {
|
||||
click: (params: { name?: string }) => {
|
||||
const year = Number(params.name);
|
||||
if (!Number.isNaN(year)) onSelectYear(year);
|
||||
},
|
||||
}
|
||||
: undefined;
|
||||
return (
|
||||
<ReactECharts
|
||||
option={option}
|
||||
style={{ height, width: '100%' }}
|
||||
notMerge
|
||||
lazyUpdate
|
||||
onEvents={handlers}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
function buildFan(yearly: ProjectionPoint[], showWithdrawal: boolean): EChartsOption {
|
||||
function buildFan(
|
||||
yearly: ProjectionPoint[],
|
||||
showWithdrawal: boolean,
|
||||
milestones?: Milestone[],
|
||||
selectedYear?: number | null,
|
||||
): EChartsOption {
|
||||
const years = yearly.map((p) => p.year_idx);
|
||||
const p10 = yearly.map((p) => num(p.p10_portfolio_gbp));
|
||||
const p25 = yearly.map((p) => num(p.p25_portfolio_gbp));
|
||||
|
|
@ -122,6 +154,50 @@ function buildFan(yearly: ProjectionPoint[], showWithdrawal: boolean): EChartsOp
|
|||
},
|
||||
];
|
||||
|
||||
if (milestones && milestones.length > 0) {
|
||||
series.push({
|
||||
name: 'milestones',
|
||||
type: 'scatter',
|
||||
data: milestones
|
||||
.filter((m) => m.year_idx >= 0 && m.year_idx < yearly.length)
|
||||
.map((m) => ({
|
||||
name: m.label,
|
||||
value: [m.year_idx, p50[m.year_idx] ?? 0],
|
||||
symbol: `text:${m.emoji}`,
|
||||
symbolSize: 26,
|
||||
label: { show: true, formatter: m.emoji, fontSize: 18 },
|
||||
tooltip: {
|
||||
formatter: () =>
|
||||
[
|
||||
`<b>${m.label}</b>`,
|
||||
`year ${m.year_idx}`,
|
||||
m.delta_gbp ? `Δ ${m.delta_gbp}` : '',
|
||||
]
|
||||
.filter(Boolean)
|
||||
.join('<br/>'),
|
||||
},
|
||||
})),
|
||||
symbol: 'circle',
|
||||
symbolSize: 24,
|
||||
itemStyle: { color: '#f59e0b' },
|
||||
z: 20,
|
||||
});
|
||||
}
|
||||
if (selectedYear != null && selectedYear >= 0 && selectedYear < yearly.length) {
|
||||
series.push({
|
||||
name: 'selected',
|
||||
type: 'line',
|
||||
data: [],
|
||||
markLine: {
|
||||
symbol: 'none',
|
||||
silent: true,
|
||||
lineStyle: { color: 'rgba(15, 23, 42, 0.6)', width: 2, type: 'solid' },
|
||||
label: { show: false },
|
||||
data: [{ xAxis: selectedYear }],
|
||||
},
|
||||
z: 30,
|
||||
});
|
||||
}
|
||||
if (showWithdrawal) {
|
||||
series.push({
|
||||
name: 'median withdrawal',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue