Merge pull request #414 from PolicyEngine/feat/flow-refactor-2

Refactor flows into pathways

Author: anth-volk

app/src/Router.tsx

@@ -1,11 +1,7 @@
-import { createBrowserRouter, Navigate, RouterProvider } from 'react-router-dom';
-import FlowRouter from './components/FlowRouter';
-import Layout from './components/Layout';
+import { createBrowserRouter, Navigate, Outlet, RouterProvider } from 'react-router-dom';
+import PathwayLayout from './components/PathwayLayout';
+import StandardLayout from './components/StandardLayout';
 import StaticLayout from './components/StaticLayout';
-import { PolicyCreationFlow } from './flows/policyCreationFlow';
-import { PopulationCreationFlow } from './flows/populationCreationFlow';
-import { ReportCreationFlow } from './flows/reportCreationFlow';
-import { SimulationCreationFlow } from './flows/simulationCreationFlow';
 import AppPage from './pages/AppPage';
 import BlogPage from './pages/Blog.page';
 import DashboardPage from './pages/Dashboard.page';
@@ -21,6 +17,10 @@ import SimulationsPage from './pages/Simulations.page';
 import SupportersPage from './pages/Supporters.page';
 import TeamPage from './pages/Team.page';
 import TermsPage from './pages/Terms.page';
+import PolicyPathwayWrapper from './pathways/policy/PolicyPathwayWrapper';
+import PopulationPathwayWrapper from './pathways/population/PopulationPathwayWrapper';
+import ReportPathwayWrapper from './pathways/report/ReportPathwayWrapper';
+import SimulationPathwayWrapper from './pathways/simulation/SimulationPathwayWrapper';
 import { CountryAppGuard } from './routing/guards/CountryAppGuard';
 import { CountryGuard } from './routing/guards/CountryGuard';
 import { MetadataGuard } from './routing/guards/MetadataGuard';
@@ -43,7 +43,11 @@ const router = createBrowserRouter(
           element: <MetadataGuard />,
           children: [
             {
-              element: <Layout />,
+              element: (
+                <StandardLayout>
+                  <Outlet />
+                </StandardLayout>
+              ),
               children: [
                 {
                   path: 'report-output/:reportId/:subpage?/:view?',
@@ -57,8 +61,13 @@ const router = createBrowserRouter(
         {
           element: <MetadataLazyLoader />,
           children: [
+            // Regular routes with standard layout
             {
-              element: <Layout />,
+              element: (
+                <StandardLayout>
+                  <Outlet />
+                </StandardLayout>
+              ),
               children: [
                 {
                   path: 'dashboard',
@@ -69,49 +78,45 @@ const router = createBrowserRouter(
                   path: 'reports',
                   element: <ReportsPage />,
                 },
-                {
-                  path: 'reports/create',
-                  element: <FlowRouter flow={ReportCreationFlow} returnPath="reports" />,
-                },
                 {
                   path: 'simulations',
                   element: <SimulationsPage />,
                 },
-                {
-                  path: 'simulations/create',
-                  element: <FlowRouter flow={SimulationCreationFlow} returnPath="simulations" />,
-                },
                 {
                   path: 'households',
                   element: <PopulationsPage />,
                 },
-                {
-                  path: 'households/create',
-                  element: <FlowRouter flow={PopulationCreationFlow} returnPath="households" />,
-                },
                 {
                   path: 'policies',
                   element: <PoliciesPage />,
                 },
-                {
-                  path: 'policies/create',
-                  element: <FlowRouter flow={PolicyCreationFlow} returnPath="policies" />,
-                },
                 {
                   path: 'account',
                   element: <div>Account settings page</div>,
                 },
               ],
             },
-          ],
-        },
-        // Routes that don't need metadata at all (no guard)
-        {
-          element: <Layout />,
-          children: [
+            // Pathway routes that manage their own layouts
             {
-              path: 'configurations',
-              element: <div>Configurations page</div>,
+              element: <PathwayLayout />,
+              children: [
+                {
+                  path: 'reports/create',
+                  element: <ReportPathwayWrapper />,
+                },
+                {
+                  path: 'simulations/create',
+                  element: <SimulationPathwayWrapper />,
+                },
+                {
+                  path: 'households/create',
+                  element: <PopulationPathwayWrapper />,
+                },
+                {
+                  path: 'policies/create',
+                  element: <PolicyPathwayWrapper />,
+                },
+              ],
             },
           ],
         },

app/src/api/geographicAssociation.ts

@@ -116,15 +116,8 @@ export class LocalStorageGeographicStore implements UserGeographicStore {
 
     const populations = this.getStoredPopulations();
 
-    // Check for duplicates
-    const exists = populations.some(
-      (p) => p.userId === population.userId && p.geographyId === population.geographyId
-    );
-
-    if (exists) {
-      throw new Error('Geographic population already exists');
-    }
-
+    // Allow duplicates - users can create multiple entries for the same geography
+    // Each entry has a unique ID from the caller
     const updatedPopulations = [...populations, newPopulation];
     this.setStoredPopulations(updatedPopulations);