From ec1d9dfb2556c2c4095a1ab8c00c967a7271bb69 Mon Sep 17 00:00:00 2001
From: Satyam Rastogi <satyamrastogi302@gmail.com>
Date: Fri, 29 May 2026 15:51:09 +0530
Subject: [PATCH] feat(routes): unify won leads and projects on a single
 /projects/:id page

- add role-prefix-free /projects/:id route (OWNER/ADMIN/FIELD_AGENT; ABAC guard lands in Phase 8)
- relax detail lookup so admin/field-agent open any project, owners only their own
- kanban drawer + project list route won leads (with projectId) to /projects/:id; pre-sale leads stay on the lead page
---
 src/App.jsx                              | 6 ++++++
 src/components/kanban/LeadInfoDrawer.jsx | 4 +++-
 src/pages/owner/OwnerProjectDetail.jsx   | 3 ++-
 src/pages/owner/OwnerProjectList.jsx     | 8 ++++----
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/App.jsx b/src/App.jsx
index f186611..a3f6287 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -188,6 +188,12 @@ function App() {
                 <OwnerProjectDetail />
               </ProtectedRoute>
             } />
+            {/* Unified project detail — won leads and projects share this page (interim coarse guard; ABAC policy guard lands in Phase 8) */}
+            <Route path="/projects/:projectId" element={
+              <ProtectedRoute allowedRoles={['OWNER', 'ADMIN', 'FIELD_AGENT']}>
+                <OwnerProjectDetail />
+              </ProtectedRoute>
+            } />
             <Route path="/owner/maps" element={
               <ProtectedRoute allowedRoles={['OWNER']}>
                 <Maps />
diff --git a/src/components/kanban/LeadInfoDrawer.jsx b/src/components/kanban/LeadInfoDrawer.jsx
index 3799377..14bc143 100644
--- a/src/components/kanban/LeadInfoDrawer.jsx
+++ b/src/components/kanban/LeadInfoDrawer.jsx
@@ -299,7 +299,9 @@ export default function LeadInfoDrawer({ lead, columns, isOpen, onClose }) {
                             <button
                                 onClick={() => {
                                     onClose();
-                                    navigate(`${basePath}/leads/${lead.id}`);
+                                    // Won leads are projects now — open the unified project page; pre-sale leads stay on the lead page.
+                                    if (lead.projectId) navigate(`/projects/${lead.projectId}`);
+                                    else navigate(`${basePath}/leads/${lead.id}`);
                                 }}
                                 className="w-full flex items-center justify-center gap-2 px-4 py-2.5 rounded-xl bg-blue-600 hover:bg-blue-700 text-white text-sm font-semibold transition-colors shadow-sm"
                             >
diff --git a/src/pages/owner/OwnerProjectDetail.jsx b/src/pages/owner/OwnerProjectDetail.jsx
index 36d3e79..d406792 100644
--- a/src/pages/owner/OwnerProjectDetail.jsx
+++ b/src/pages/owner/OwnerProjectDetail.jsx
@@ -294,7 +294,8 @@ const OwnerProjectDetail = () => {
     const totalReceived = payments.reduce((sum, p) => sum + p.amount, 0);
 
     const project = useMemo(() =>
-        projects.find(p => p.id === projectId && p.ownerId === user?.id)
+        // Owners only see their own projects; admin/field-agent can open any project.
+        projects.find(p => p.id === projectId && (user?.role !== 'OWNER' || p.ownerId === user?.id))
         , [projects, projectId, user]);
 
     useEffect(() => {
diff --git a/src/pages/owner/OwnerProjectList.jsx b/src/pages/owner/OwnerProjectList.jsx
index cc03fad..992af59 100644
--- a/src/pages/owner/OwnerProjectList.jsx
+++ b/src/pages/owner/OwnerProjectList.jsx
@@ -277,7 +277,7 @@ const OwnerProjectList = () => {
                             return (
                                 <div
                                     key={project.id}
-                                    onClick={() => navigate(`/owner/projects/${project.id}`)}
+                                    onClick={() => navigate(`/projects/${project.id}`)}
                                     className="p-4 active:bg-zinc-50 dark:active:bg-white/5 transition-colors cursor-pointer"
                                 >
                                     <div className="flex justify-between items-start mb-2">
@@ -363,7 +363,7 @@ const OwnerProjectList = () => {
                                     return (
                                         <tr
                                             key={project.id}
-                                            onClick={() => navigate(`/owner/projects/${project.id}`)}
+                                            onClick={() => navigate(`/projects/${project.id}`)}
                                             className="hover:bg-zinc-50 dark:hover:bg-white/5 transition-colors cursor-pointer group"
                                         >
                                             {/* Project Name */}
@@ -496,7 +496,7 @@ const OwnerProjectList = () => {
                             return (
                                 <div
                                     key={lead.id}
-                                    onClick={() => navigate(`/owner/leads/${lead.id}`)}
+                                    onClick={() => navigate(lead.projectId ? `/projects/${lead.projectId}` : `/owner/leads/${lead.id}`)}
                                     className="p-4 active:bg-zinc-50 dark:active:bg-white/5 transition-colors cursor-pointer"
                                 >
                                     <div className="flex justify-between items-start mb-2">
@@ -562,7 +562,7 @@ const OwnerProjectList = () => {
                                     return (
                                         <tr
                                             key={lead.id}
-                                            onClick={() => navigate(`/owner/leads/${lead.id}`)}
+                                            onClick={() => navigate(lead.projectId ? `/projects/${lead.projectId}` : `/owner/leads/${lead.id}`)}
                                             className="hover:bg-zinc-50 dark:hover:bg-white/5 transition-colors cursor-pointer group"
                                         >
                                             <td className="px-5 py-4">