feat: Report builder with modal-based ingredient selection

.github/workflows/chromatic.yaml

@@ -31,6 +31,12 @@ jobs:
 
       - name: Run Chromatic
         working-directory: ./app
-        run: bunx chromatic --only-changed ${{ github.event_name == 'push' && '--auto-accept-changes' || '' }} --build-script-name="storybook:build" --project-token=${{ secrets.CHROMATIC_PROJECT_TOKEN }}
+        run: >-
+          bunx chromatic
+          --only-changed
+          --build-script-name="storybook:build"
+          --project-token=${{ secrets.CHROMATIC_PROJECT_TOKEN }}
+          ${{ github.event_name == 'push' && '--auto-accept-changes' || '' }}
+          ${{ github.event_name == 'pull_request' && format('--patch-build={0}...main', github.head_ref) || '' }}
         env:
           VITE_APP_MODE: website

app/.stylelintignore

@@ -1 +1,2 @@
 dist
+storybook-static

app/src/CalculatorRouter.tsx

@@ -2,32 +2,24 @@
  * Router for the Calculator app (app.policyengine.org)
  * Contains only the interactive calculator functionality
  */
-import { lazy } from 'react';
-import { createBrowserRouter, Navigate, RouterProvider } from 'react-router-dom';
+import { createBrowserRouter, Navigate, Outlet, RouterProvider } from 'react-router-dom';
+import PathwayLayout from './components/PathwayLayout';
 import StandardLayout from './components/StandardLayout';
 import NotFoundPage from './pages/NotFound.page';
+import PoliciesPage from './pages/Policies.page';
+import PopulationsPage from './pages/Populations.page';
+import ReportOutputPage from './pages/ReportOutput.page';
+import ReportsPage from './pages/Reports.page';
+import SimulationsPage from './pages/Simulations.page';
+import PolicyPathwayWrapper from './pathways/policy/PolicyPathwayWrapper';
+import PopulationPathwayWrapper from './pathways/population/PopulationPathwayWrapper';
+import SimulationPathwayWrapper from './pathways/simulation/SimulationPathwayWrapper';
+import ReportBuilderPage from './pages/reportBuilder/ReportBuilderPage';
+import ModifyReportPage from './pages/reportBuilder/ModifyReportPage';
 import { CountryGuard } from './routing/guards/CountryGuard';
 import { MetadataGuard } from './routing/guards/MetadataGuard';
 import { MetadataLazyLoader } from './routing/guards/MetadataLazyLoader';
 import { RedirectToCountry } from './routing/RedirectToCountry';
-import SuspenseOutlet from './routing/SuspenseOutlet';
-
-// Lazy-loaded page components — only fetched when the route is visited
-const PoliciesPage = lazy(() => import('./pages/Policies.page'));
-const PopulationsPage = lazy(() => import('./pages/Populations.page'));
-const ReportOutputPage = lazy(() => import('./pages/ReportOutput.page'));
-const ReportsPage = lazy(() => import('./pages/Reports.page'));
-const SimulationsPage = lazy(() => import('./pages/Simulations.page'));
-
-// Lazy-loaded pathway wrappers — heavy components with their own sub-routes
-const PolicyPathwayWrapper = lazy(() => import('./pathways/policy/PolicyPathwayWrapper'));
-const PopulationPathwayWrapper = lazy(
-  () => import('./pathways/population/PopulationPathwayWrapper')
-);
-const ReportPathwayWrapper = lazy(() => import('./pathways/report/ReportPathwayWrapper'));
-const SimulationPathwayWrapper = lazy(
-  () => import('./pathways/simulation/SimulationPathwayWrapper')
-);
 
 /**
  * Layout wrapper that renders StandardLayout with Outlet for nested routes.
@@ -37,7 +29,7 @@ const SimulationPathwayWrapper = lazy(
 function StandardLayoutOutlet() {
   return (
     <StandardLayout>
-      <SuspenseOutlet />
+      <Outlet />
     </StandardLayout>
   );
 }
@@ -68,12 +60,8 @@ const router = createBrowserRouter(
             },
             // Pathway routes - pathways manage their own layouts
             {
-              element: <SuspenseOutlet />,
+              element: <PathwayLayout />,
               children: [
-                {
-                  path: 'reports/create',
-                  element: <ReportPathwayWrapper />,
-                },
                 {
                   path: 'simulations/create',
                   element: <SimulationPathwayWrapper />,
@@ -117,6 +105,14 @@ const router = createBrowserRouter(
                   path: 'policies',
                   element: <PoliciesPage />,
                 },
+                {
+                  path: 'reports/create',
+                  element: <ReportBuilderPage />,
+                },
+                {
+                  path: 'reports/create/:userReportId',
+                  element: <ModifyReportPage />,
+                },
                 {
                   path: 'account',
                   element: <div>Account settings page</div>,

app/src/adapters/congressional-district/congressionalDistrictDataAdapter.ts

@@ -25,7 +25,9 @@ export function buildDistrictLabelLookup(regions: MetadataRegionEntry[]): Distri
 
   for (const region of regions) {
     if (region.type === US_REGION_TYPES.CONGRESSIONAL_DISTRICT) {
-      lookup.set(region.name, region.label);
+      // Strip "congressional_district/" prefix so keys match API district IDs (e.g., "AL-01")
+      const key = region.name.replace(/^congressional_district\//, '');
+      lookup.set(key, region.label);
     }
   }
 

app/src/api/societyWideCalculation.ts

@@ -43,12 +43,20 @@ export async function fetchSocietyWideCalculation(
   });
 
   if (!response.ok) {
+    let body = '';
+    try {
+      body = await response.text();
+    } catch {
+      // ignore
+    }
     console.error(
-      '[fetchSocietyWideCalculation] Failed with status:',
-      response.status,
-      response.statusText
+      `[fetchSocietyWideCalculation] ${response.status} ${response.statusText}`,
+      url,
+      body
+    );
+    throw new Error(
+      `Society-wide calculation failed (${response.status}): ${body || response.statusText}`
     );
-    throw new Error(`Society-wide calculation failed: ${response.statusText}`);
   }
 
   const data = await response.json();

app/src/api/usageTracking.ts

@@ -0,0 +1,103 @@
+/**
+ * Usage Tracking Store
+ *
+ * A lightweight system for tracking "last used" timestamps for any ingredient
+ * type (policies, households, geographies, etc.).
+ *
+ * This is separate from association data - it only tracks when items
+ * were last accessed, not the items themselves.
+ *
+ * Usage:
+ *   import { policyUsageStore } from '@/api/usageTracking';
+ *
+ *   // Record that a policy was used
+ *   policyUsageStore.recordUsage(policyId);
+ *
+ *   // Get 5 most recently used policy IDs
+ *   const recentIds = policyUsageStore.getRecentIds(5);
+ */
+
+/** ISO timestamp string */
+export type UsageData = Record<string, string>;
+
+/**
+ * Generic store for tracking usage of items by ID.
+ * Each ingredient type gets its own store instance with a unique storage key.
+ */
+export class UsageTrackingStore {
+  constructor(private readonly storageKey: string) {}
+
+  /**
+   * Record that an item was used/accessed.
+   * Updates the lastUsedAt timestamp.
+   */
+  recordUsage(id: string): string {
+    const usage = this.getAll();
+    const timestamp = new Date().toISOString();
+    usage[id] = timestamp;
+    localStorage.setItem(this.storageKey, JSON.stringify(usage));
+    return timestamp;
+  }
+
+  /**
+   * Get all usage records (id -> lastUsedAt timestamp).
+   */
+  getAll(): UsageData {
+    try {
+      const stored = localStorage.getItem(this.storageKey);
+      return stored ? JSON.parse(stored) : {};
+    } catch {
+      console.error(`[UsageTrackingStore] Failed to parse ${this.storageKey}`);
+      return {};
+    }
+  }
+
+  /**
+   * Get IDs sorted by most recently used.
+   * @param limit Maximum number of IDs to return (default 10)
+   */
+  getRecentIds(limit = 10): string[] {
+    const usage = this.getAll();
+    return Object.entries(usage)
+      .sort(([, a], [, b]) => b.localeCompare(a))
+      .slice(0, limit)
+      .map(([id]) => id);
+  }
+
+  /**
+   * Get the last used timestamp for a specific ID.
+   */
+  getLastUsed(id: string): string | null {
+    return this.getAll()[id] || null;
+  }
+
+  /**
+   * Check if an item has any usage recorded.
+   */
+  hasUsage(id: string): boolean {
+    return !!this.getAll()[id];
+  }
+
+  /**
+   * Remove usage record for a specific ID.
+   */
+  removeUsage(id: string): void {
+    const usage = this.getAll();
+    delete usage[id];
+    localStorage.setItem(this.storageKey, JSON.stringify(usage));
+  }
+
+  /**
+   * Clear all usage records for this store.
+   */
+  clear(): void {
+    localStorage.removeItem(this.storageKey);
+  }
+}
+
+// Pre-configured stores for each ingredient type
+export const policyUsageStore = new UsageTrackingStore('policy-usage');
+export const householdUsageStore = new UsageTrackingStore('household-usage');
+export const geographyUsageStore = new UsageTrackingStore('geography-usage');
+export const simulationUsageStore = new UsageTrackingStore('simulation-usage');
+export const reportUsageStore = new UsageTrackingStore('report-usage');

app/src/components/IngredientReadView.story.tsx

@@ -7,9 +7,6 @@ const meta: Meta<typeof IngredientReadView> = {
   component: IngredientReadView,
   args: {
     onBuild: () => {},
-    enableSelection: true,
-    isSelected: () => false,
-    onSelectionChange: () => {},
   },
 };
 

app/src/components/IngredientReadView.tsx

@@ -1,7 +1,6 @@
 import { IconPlus } from '@tabler/icons-react';
 import {
   Button,
-  Checkbox,
   Spinner,
   ShadcnTable as Table,
   TableBody,
@@ -31,9 +30,6 @@ interface IngredientReadViewProps {
   searchValue?: string;
   onSearchChange?: (value: string) => void;
   onMoreFilters?: () => void;
-  enableSelection?: boolean;
-  isSelected?: (recordId: string) => boolean;
-  onSelectionChange?: (recordId: string, selected: boolean) => void;
 }
 
 export default function IngredientReadView({
@@ -50,9 +46,6 @@ export default function IngredientReadView({
   searchValue: _searchValue = '',
   onSearchChange: _onSearchChange,
   onMoreFilters: _onMoreFilters,
-  enableSelection = true,
-  isSelected = () => false,
-  onSelectionChange,
 }: IngredientReadViewProps) {
   return (
     <div>
@@ -135,16 +128,6 @@ export default function IngredientReadView({
               <Table>
                 <TableHeader>
                   <TableRow style={{ backgroundColor: colors.gray[50] }}>
-                    {enableSelection && (
-                      <TableHead
-                        style={{
-                          width: '48px',
-                          padding: `${spacing.md} ${spacing.lg}`,
-                        }}
-                      >
-                        {/* Optional: Add "select all" checkbox here in the future */}
-                      </TableHead>
-                    )}
                     {columns.map((column) => (
                       <TableHead
                         key={column.key}
@@ -163,48 +146,18 @@ export default function IngredientReadView({
                   </TableRow>
                 </TableHeader>
                 <TableBody>
-                  {data.map((record) => {
-                    const selected = isSelected(record.id);
-                    return (
-                      <TableRow
-                        key={record.id}
-                        style={{
-                          backgroundColor: selected ? colors.blue[50] : 'transparent',
-                          borderLeft: selected
-                            ? `3px solid ${colors.primary[500]}`
-                            : '3px solid transparent',
-                          cursor: enableSelection ? 'pointer' : 'default',
-                        }}
-                        onClick={() => {
-                          if (enableSelection && onSelectionChange) {
-                            onSelectionChange(record.id, !selected);
-                          }
-                        }}
-                      >
-                        {enableSelection && (
-                          <TableCell style={{ padding: `${spacing.md} ${spacing.lg}` }}>
-                            <Checkbox
-                              checked={selected}
-                              onCheckedChange={(checked) => {
-                                if (onSelectionChange) {
-                                  onSelectionChange(record.id, !!checked);
-                                }
-                              }}
-                              onClick={(e) => e.stopPropagation()}
-                            />
-                          </TableCell>
-                        )}
-                        {columns.map((column) => (
-                          <TableCell
-                            key={column.key}
-                            style={{ padding: `${spacing.md} ${spacing.lg}` }}
-                          >
-                            <ColumnRenderer config={column} record={record} />
-                          </TableCell>
-                        ))}
-                      </TableRow>
-                    );
-                  })}
+                  {data.map((record) => (
+                    <TableRow key={record.id}>
+                      {columns.map((column) => (
+                        <TableCell
+                          key={column.key}
+                          style={{ padding: `${spacing.md} ${spacing.lg}` }}
+                        >
+                          <ColumnRenderer config={column} record={record} />
+                        </TableCell>
+                      ))}
+                    </TableRow>
+                  ))}
                 </TableBody>
               </Table>
             )}

app/src/components/columns/ActionsColumn.tsx

@@ -0,0 +1,30 @@
+import { Button } from '@/components/ui/button';
+import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
+import { ActionsColumnConfig, IngredientRecord } from './types';
+
+interface ActionsColumnProps {
+  config: ActionsColumnConfig;
+  record: IngredientRecord;
+}
+
+export function ActionsColumn({ config, record }: ActionsColumnProps) {
+  return (
+    <div className="tw:flex tw:gap-1 tw:justify-end">
+      {config.actions.map((action) => (
+        <Tooltip key={action.action}>
+          <TooltipTrigger asChild>
+            <Button
+              variant="ghost"
+              size="icon"
+              onClick={() => config.onAction(action.action, record.id)}
+              aria-label={action.tooltip}
+            >
+              {action.icon}
+            </Button>
+          </TooltipTrigger>
+          <TooltipContent side="bottom">{action.tooltip}</TooltipContent>
+        </Tooltip>
+      ))}
+    </div>
+  );
+}