changes

apps/edr-freight-web/backoffice/src/App.tsx

@@ -4,7 +4,6 @@ import {
   Container,
   FileSignature,
   FileText,
-  Flag,
   LayoutDashboard,
   LayoutGrid,
   Network,
@@ -15,14 +14,21 @@ import {
   Send,
   Settings,
   ShieldCheck,
-  Ship,
   SlidersHorizontal,
   Train,
   Truck,
   Users,
   Wallet,
 } from "lucide-react";
-import { Navigate, Outlet, Route, Routes, useLocation, useNavigate } from "react-router-dom";
+import {
+  Navigate,
+  Outlet,
+  Route,
+  Routes,
+  useLocation,
+  useNavigate,
+  useParams,
+} from "react-router-dom";
 
 import { FreightDashboardLayout, type SidebarItem, type SidebarSection } from "@/components/layout";
 import { useAuth } from "./auth/useAuth";
@@ -37,11 +43,11 @@ import ContractRequestDetailPage from "./pages/contracts/ContractRequestDetailPa
 import ContractViewPage from "./pages/contracts/ContractViewPage";
 import ContractClearanceListPage from "./pages/contracts/ContractClearanceListPage";
 import ContractClearanceDetailPage from "./pages/contracts/ContractClearanceDetailPage";
-import GlEthiopiaClearanceListPage from "./pages/contracts/GlEthiopiaClearanceListPage";
-import GlDjiboutiClearanceListPage from "./pages/contracts/GlDjiboutiClearanceListPage";
-import GlClearanceDetailPage from "./pages/contracts/GlClearanceDetailPage";
+import ShipmentRequestsPage from "./pages/contracts/ShipmentRequestsPage";
+import ShipmentRequestDetailPage from "./pages/contracts/ShipmentRequestDetailPage";
 import GlCreateBookingForm from "./components/contracts/GlCreateBookingForm";
 import BookingMilestonesPage from "./pages/contracts/BookingMilestonesPage";
+import DocumentClearanceDetailPage from "./pages/bookings/DocumentClearanceDetailPage";
 import CustomerDetailPage from "./pages/customers/CustomerDetailPage";
 import CustomersPage from "./pages/customers/CustomersPage";
 import DemoUser1Page from "./pages/dashboard/demo/DemoUser1Page";
@@ -139,19 +145,17 @@ const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
         label: "Document Clearance",
         href: "/dashboard/contracts/clearance",
         icon: <ShieldCheck />,
-        permission: FREIGHT_PERMS.contracts.clearanceReview,
+        permission: [
+          FREIGHT_PERMS.contracts.clearanceReview,
+          FREIGHT_PERMS.contracts.clearanceEtActions,
+          FREIGHT_PERMS.contracts.clearanceDjActions,
+        ],
       },
       {
-        label: "GL Ethiopia Clearance",
-        href: "/dashboard/gl-ethiopia/clearance",
-        icon: <Flag />,
-        permission: FREIGHT_PERMS.contracts.clearanceEtActions,
-      },
-      {
-        label: "GL Djibouti Clearance",
-        href: "/dashboard/gl-djibouti/clearance",
-        icon: <Ship />,
-        permission: FREIGHT_PERMS.contracts.clearanceDjActions,
+        label: "Shipment Requests",
+        href: "/dashboard/shipment-requests",
+        icon: <Send />,
+        permission: FREIGHT_PERMS.contracts.createBooking,
       },
       {
         label: "Train Schedules",
@@ -481,7 +485,11 @@ const App = () => {
         />
         <Route
           path="clearance/:id"
-          element={<Navigate to="/dashboard/contracts/clearance" replace />}
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.bookings.clearanceView}>
+              <DocumentClearanceDetailPage />
+            </RequirePermission>
+          }
         />
 
         {/* Contracts (Path A/B) */}
@@ -509,11 +517,41 @@ const App = () => {
             </RequirePermission>
           }
         />
+        <Route
+          path="bookings/:bookingId/clearance"
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.bookings.clearanceView}>
+              <DocumentClearanceDetailPage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="shipment-requests"
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.contracts.createBooking}>
+              <ShipmentRequestsPage />
+            </RequirePermission>
+          }
+        />
+        <Route
+          path="shipment-requests/:id"
+          element={
+            <RequirePermission permission={FREIGHT_PERMS.contracts.createBooking}>
+              <ShipmentRequestDetailPage />
+            </RequirePermission>
+          }
+        />
         {/* GL (Path B) contract clearance review hub */}
         <Route
           path="contracts/clearance"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.contracts.clearanceReview}>
+            <RequirePermission
+              permission={[
+                FREIGHT_PERMS.contracts.clearanceReview,
+                FREIGHT_PERMS.contracts.clearanceEtActions,
+                FREIGHT_PERMS.contracts.clearanceDjActions,
+              ]}
+            >
               <ContractClearanceListPage />
             </RequirePermission>
           }
@@ -521,51 +559,21 @@ const App = () => {
         <Route
           path="contracts/clearance/:id"
           element={
-            <RequirePermission permission={FREIGHT_PERMS.contracts.clearanceReview}>
+            <RequirePermission
+              permission={[
+                FREIGHT_PERMS.contracts.clearanceReview,
+                FREIGHT_PERMS.contracts.clearanceEtActions,
+                FREIGHT_PERMS.contracts.clearanceDjActions,
+              ]}
+            >
               <ContractClearanceDetailPage />
             </RequirePermission>
           }
         />
-        <Route
-          path="gl-ethiopia/clearance"
-          element={
-            <RequirePermission permission={FREIGHT_PERMS.contracts.clearanceEtActions}>
-              <GlEthiopiaClearanceListPage />
-            </RequirePermission>
-          }
-        />
-        <Route
-          path="gl-ethiopia/clearance/:id"
-          element={
-            <RequirePermission permission={FREIGHT_PERMS.contracts.clearanceEtActions}>
-              <GlClearanceDetailPage
-                backTo="/dashboard/gl-ethiopia/clearance"
-                breadcrumbsLabel="GL Ethiopia Clearance"
-                roleMode="ET"
-              />
-            </RequirePermission>
-          }
-        />
-        <Route
-          path="gl-djibouti/clearance"
-          element={
-            <RequirePermission permission={FREIGHT_PERMS.contracts.clearanceDjActions}>
-              <GlDjiboutiClearanceListPage />
-            </RequirePermission>
-          }
-        />
-        <Route
-          path="gl-djibouti/clearance/:id"
-          element={
-            <RequirePermission permission={FREIGHT_PERMS.contracts.clearanceDjActions}>
-              <GlClearanceDetailPage
-                backTo="/dashboard/gl-djibouti/clearance"
-                breadcrumbsLabel="GL Djibouti Clearance"
-                roleMode="DJ"
-              />
-            </RequirePermission>
-          }
-        />
+        <Route path="gl-ethiopia/clearance" element={<LegacyGlClearanceRedirect />} />
+        <Route path="gl-ethiopia/clearance/:id" element={<LegacyGlClearanceRedirect />} />
+        <Route path="gl-djibouti/clearance" element={<LegacyGlClearanceRedirect />} />
+        <Route path="gl-djibouti/clearance/:id" element={<LegacyGlClearanceRedirect />} />
         {/* Path A ops queue out of scope for now → fold into the GL hub. */}
         <Route
           path="contracts/ops-clearance"
@@ -909,4 +917,13 @@ const App = () => {
   );
 };
 
+/** Redirect legacy GL Ethiopia/Djibouti clearance URLs to the unified hub. */
+function LegacyGlClearanceRedirect() {
+  const { id } = useParams();
+  if (id) {
+    return <Navigate to={`/dashboard/contracts/clearance/${id}`} replace />;
+  }
+  return <Navigate to="/dashboard/contracts/clearance" replace />;
+}
+
 export default App;