update

frontend/src/pages/SalesDashboard.jsx

@@ -599,10 +599,25 @@ export default function SalesDashboard() {
                 ? 'This year'
                 : 'All time';
 
-    const quarterColumns = useMemo(() => {
+    /** Latest roll-forward row from API + merged one-time (calendar buckets); UI labels column by date filter, not Q2 2026. */
+    const revenueBoardSnapshot = useMemo(() => {
         const qs = quarterlyBoard?.quarters || [];
-        if (qs.length <= 6) return qs;
-        return qs.slice(-6);
+        const cols = qs.length <= 6 ? qs : qs.slice(-6);
+        const row = cols.length ? cols[cols.length - 1] : null;
+        let oneTimeSum = 0;
+        const mergedDeals = [];
+        const seen = new Set();
+        for (const q of cols) {
+            oneTimeSum += Number(q.one_time_usd_quarter) || 0;
+            for (const d of q.one_time_deals || []) {
+                const id = d.deal_id;
+                if (id != null && !seen.has(id)) {
+                    seen.add(id);
+                    mergedDeals.push(d);
+                }
+            }
+        }
+        return { row, oneTimeSum, mergedDeals, hasData: Boolean(row) };
     }, [quarterlyBoard]);
 
     const dateRangeSub =
@@ -673,7 +688,7 @@ export default function SalesDashboard() {
                             <Select value={dashboardPeriod} onValueChange={setDashboardPeriod}>
                                 <SelectTrigger
                                     className="h-9 w-[min(100%,10.5rem)] border-slate-200 bg-white text-sm shadow-sm"
-                                    aria-label="Date range: deal created"
+                                    aria-label="Date range for dashboard"
                                 >
                                     <span className="truncate">{dashboardPeriodLabel}</span>
                                 </SelectTrigger>
@@ -717,50 +732,53 @@ export default function SalesDashboard() {
                             <Loader2 className="h-5 w-5 animate-spin shrink-0" aria-hidden />
                             Loading quarterly metrics…
                         </div>
-                    ) : quarterColumns.length > 0 ? (
+                    ) : revenueBoardSnapshot.hasData ? (
                         <div className="space-y-4">
+                            <p className="text-xs text-slate-500">
+                                Values reflect <strong className="font-medium text-slate-700">{dashboardPeriodLabel}</strong>
+                                {isAdmin && ownerFilter !== 'all' ? (
+                                    <>
+                                        {' '}
+                                        · <strong className="font-medium text-slate-700">{ownerFilterLabel}</strong>
+                                    </>
+                                ) : null}
+                                . ARR roll-forward row is the latest period in range; one-time total sums wins across that
+                                range.
+                            </p>
                             <div className="grid grid-cols-1 gap-4 xl:grid-cols-2">
                                 <CardShell
                                     title="Annual recurring revenue (ARR)"
-                                    hint="USD ($). From won PO lines: monthly ×12, quarterly ×4, annual ×1; one-time lines excluded. Total / Existing / New roll-forward by quarter. Respects team + date range filters."
+                                    hint="USD ($). PO lines: monthly ×12, quarterly ×4, annual ×1; one-time lines excluded. Column matches your date + team filters."
                                     className="min-h-0"
                                 >
                                     <div className="overflow-x-auto -m-1 p-1">
-                                        <table className="w-full min-w-[340px] text-sm">
+                                        <table className="w-full min-w-[260px] text-sm">
                                             <thead>
                                                 <tr className="border-b border-slate-200 text-left text-xs font-semibold text-slate-600">
                                                     <th className="py-2 pr-3"> </th>
-                                                    {quarterColumns.map((q) => (
-                                                        <th key={q.label} className="px-2 py-2 text-right whitespace-nowrap">
-                                                            {q.label}
-                                                        </th>
-                                                    ))}
+                                                    <th className="px-2 py-2 text-right whitespace-nowrap">
+                                                        {dashboardPeriodLabel}
+                                                    </th>
                                                 </tr>
                                             </thead>
                                             <tbody className="tabular-nums">
                                                 <tr className="border-b border-slate-100">
                                                     <td className="py-2 pr-3 font-medium text-slate-800">TOTAL</td>
-                                                    {quarterColumns.map((q) => (
-                                                        <td key={q.label} className="px-2 py-2 text-right font-semibold">
-                                                            {fmtMoney(q.arr?.total)}
-                                                        </td>
-                                                    ))}
+                                                    <td className="px-2 py-2 text-right font-semibold">
+                                                        {fmtMoney(revenueBoardSnapshot.row?.arr?.total)}
+                                                    </td>
                                                 </tr>
                                                 <tr className="border-b border-slate-100">
                                                     <td className="py-2 pr-3 text-slate-600">EXISTING</td>
-                                                    {quarterColumns.map((q) => (
-                                                        <td key={q.label} className="px-2 py-2 text-right text-slate-700">
-                                                            {fmtMoney(q.arr?.existing)}
-                                                        </td>
-                                                    ))}
+                                                    <td className="px-2 py-2 text-right text-slate-700">
+                                                        {fmtMoney(revenueBoardSnapshot.row?.arr?.existing)}
+                                                    </td>
                                                 </tr>
                                                 <tr>
                                                     <td className="py-2 pr-3 text-slate-600">NEW</td>
-                                                    {quarterColumns.map((q) => (
-                                                        <td key={q.label} className="px-2 py-2 text-right text-slate-700">
-                                                            {fmtMoney(q.arr?.new)}
-                                                        </td>
-                                                    ))}
+                                                    <td className="px-2 py-2 text-right text-slate-700">
+                                                        {fmtMoney(revenueBoardSnapshot.row?.arr?.new)}
+                                                    </td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -768,45 +786,37 @@ export default function SalesDashboard() {
                                 </CardShell>
                                 <CardShell
                                     title="Recurring contracts"
-                                    hint="Won deals with at least one recurring PO line (not one-time only). Respects team + date filters."
+                                    hint="Won deals with at least one recurring PO line. Same filters."
                                     className="min-h-0"
                                 >
                                     <div className="overflow-x-auto -m-1 p-1">
-                                        <table className="w-full min-w-[340px] text-sm">
+                                        <table className="w-full min-w-[260px] text-sm">
                                             <thead>
                                                 <tr className="border-b border-slate-200 text-left text-xs font-semibold text-slate-600">
                                                     <th className="py-2 pr-3"> </th>
-                                                    {quarterColumns.map((q) => (
-                                                        <th key={q.label} className="px-2 py-2 text-right whitespace-nowrap">
-                                                            {q.label}
-                                                        </th>
-                                                    ))}
+                                                    <th className="px-2 py-2 text-right whitespace-nowrap">
+                                                        {dashboardPeriodLabel}
+                                                    </th>
                                                 </tr>
                                             </thead>
                                             <tbody className="tabular-nums">
                                                 <tr className="border-b border-slate-100">
                                                     <td className="py-2 pr-3 font-medium text-slate-800">TOTAL</td>
-                                                    {quarterColumns.map((q) => (
-                                                        <td key={q.label} className="px-2 py-2 text-right font-semibold">
-                                                            {q.contracts?.total ?? '—'}
-                                                        </td>
-                                                    ))}
+                                                    <td className="px-2 py-2 text-right font-semibold">
+                                                        {revenueBoardSnapshot.row?.contracts?.total ?? '—'}
+                                                    </td>
                                                 </tr>
                                                 <tr className="border-b border-slate-100">
                                                     <td className="py-2 pr-3 text-slate-600">EXISTING</td>
-                                                    {quarterColumns.map((q) => (
-                                                        <td key={q.label} className="px-2 py-2 text-right text-slate-700">
-                                                            {q.contracts?.existing ?? '—'}
-                                                        </td>
-                                                    ))}
+                                                    <td className="px-2 py-2 text-right text-slate-700">
+                                                        {revenueBoardSnapshot.row?.contracts?.existing ?? '—'}
+                                                    </td>
                                                 </tr>
                                                 <tr>
                                                     <td className="py-2 pr-3 text-slate-600">NEW</td>
-                                                    {quarterColumns.map((q) => (
-                                                        <td key={q.label} className="px-2 py-2 text-right text-slate-700">
-                                                            {q.contracts?.new ?? '—'}
-                                                        </td>
-                                                    ))}
+                                                    <td className="px-2 py-2 text-right text-slate-700">
+                                                        {revenueBoardSnapshot.row?.contracts?.new ?? '—'}
+                                                    </td>
                                                 </tr>
                                             </tbody>
                                         </table>
@@ -815,56 +825,51 @@ export default function SalesDashboard() {
                             </div>
                             <CardShell
                                 title="One-time revenue"
-                                hint="Sum of PO lines marked One-time in the win popover; recognized in the quarter the deal was marked won. USD ($). Same filters as above."
+                                hint="PO lines marked One-time; USD ($). Total summed for the filtered date range."
                                 className="min-h-0"
                             >
                                 <div className="overflow-x-auto -m-1 p-1">
-                                    <table className="w-full min-w-[280px] text-sm">
+                                    <table className="w-full min-w-[260px] text-sm">
                                         <thead>
                                             <tr className="border-b border-slate-200 text-left text-xs font-semibold text-slate-600">
-                                                <th className="py-2 pr-3">Quarter</th>
+                                                <th className="py-2 pr-3">Scope</th>
                                                 <th className="py-2 text-right">One-time ($)</th>
                                             </tr>
                                         </thead>
                                         <tbody className="tabular-nums">
-                                            {quarterColumns.map((q) => (
-                                                <tr key={q.label} className="border-b border-slate-100">
-                                                    <td className="py-2 pr-3 text-slate-800">{q.label}</td>
-                                                    <td className="py-2 text-right">
-                                                        {fmtMoney(q.one_time_usd_quarter)}
-                                                    </td>
-                                                </tr>
-                                            ))}
+                                            <tr className="border-b border-slate-100">
+                                                <td className="py-2 pr-3 text-slate-800">{dashboardPeriodLabel}</td>
+                                                <td className="py-2 text-right">
+                                                    {fmtMoney(revenueBoardSnapshot.oneTimeSum)}
+                                                </td>
+                                            </tr>
                                         </tbody>
                                     </table>
                                 </div>
-                                {(() => {
-                                    const last = quarterColumns[quarterColumns.length - 1];
-                                    const deals = last?.one_time_deals || [];
-                                    if (!deals.length) {
-                                        return (
-                                            <p className="mt-3 text-xs text-slate-500">
-                                                No one-time deals in the latest shown quarter.
-                                            </p>
-                                        );
-                                    }
-                                    return (
-                                        <div className="mt-4 rounded-lg border border-slate-100 bg-slate-50/80 px-3 py-2 text-xs text-slate-700">
-                                            <p className="font-semibold text-slate-800">
-                                                Latest quarter detail ({last?.label})
-                                            </p>
-                                            <ul className="mt-2 list-disc space-y-1 pl-5">
-                                                {deals.map((d) => (
-                                                    <li key={d.deal_id}>
-                                                        <span className="font-medium">{d.name || 'Deal'}</span>
-                                                        {' · '}
-                                                        {fmtMoney(d.amount_usd)}
-                                                    </li>
-                                                ))}
-                                            </ul>
-                                        </div>
-                                    );
-                                })()}
+                                {revenueBoardSnapshot.mergedDeals.length === 0 ? (
+                                    <p className="mt-3 text-xs text-slate-500">
+                                        No one-time revenue in this scope.
+                                    </p>
+                                ) : (
+                                    <div className="mt-4 rounded-lg border border-slate-100 bg-slate-50/80 px-3 py-2 text-xs text-slate-700">
+                                        <p className="font-semibold text-slate-800">
+                                            Detail ({dashboardPeriodLabel}
+                                            {isAdmin && ownerFilter !== 'all'
+                                                ? ` · ${ownerFilterLabel}`
+                                                : ''}
+                                            )
+                                        </p>
+                                        <ul className="mt-2 list-disc space-y-1 pl-5">
+                                            {revenueBoardSnapshot.mergedDeals.map((d) => (
+                                                <li key={d.deal_id}>
+                                                    <span className="font-medium">{d.name || 'Deal'}</span>
+                                                    {' · '}
+                                                    {fmtMoney(d.amount_usd)}
+                                                </li>
+                                            ))}
+                                        </ul>
+                                    </div>
+                                )}
                             </CardShell>
                         </div>
                     ) : (