From a4cc06d51684d7353982eb858bec58d895124000 Mon Sep 17 00:00:00 2001 From: dharaneesh-r Date: Fri, 28 Aug 2026 13:00:05 +0530 Subject: [PATCH] updates on the milers page and name change --- src/App.jsx | 11 ++++-- .../assistant/DoormileAI/pageContext.jsx | 1 + src/layouts/AdminLayout.jsx | 2 +- src/pages/doormile/riders/CreateRider.jsx | 39 +++++++++++-------- src/pages/doormile/riders/EditRider.jsx | 8 ++-- src/pages/doormile/riders/Riders.jsx | 14 +++---- 6 files changed, 44 insertions(+), 31 deletions(-) diff --git a/src/App.jsx b/src/App.jsx index d773b9a..e588ad7 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -101,9 +101,14 @@ const AuthenticatedApp = () => { } /> - } /> - } /> - } /> + } /> + } /> + } /> + + {/* Backwards-compatible aliases */} + } /> + } /> + } /> } /> } /> diff --git a/src/components/assistant/DoormileAI/pageContext.jsx b/src/components/assistant/DoormileAI/pageContext.jsx index 557e42c..45f7e09 100644 --- a/src/components/assistant/DoormileAI/pageContext.jsx +++ b/src/components/assistant/DoormileAI/pageContext.jsx @@ -284,6 +284,7 @@ const ROUTES = [ ['/doormile/dispatch', DISPATCH], ['/doormile/deliveries', { ...ORDERS, label: 'Deliveries' }], ['/doormile/orders', ORDERS], + ['/doormile/milers', RIDERS], ['/doormile/riders', RIDERS], ['/doormile/vehicles', VEHICLES], ['/doormile/hubs', HUBS], diff --git a/src/layouts/AdminLayout.jsx b/src/layouts/AdminLayout.jsx index aacf29d..924904b 100644 --- a/src/layouts/AdminLayout.jsx +++ b/src/layouts/AdminLayout.jsx @@ -49,7 +49,7 @@ const NAV = [ { label: 'Dispatch', path: '/doormile/dispatch' }, { label: 'Orders', path: '/doormile/orders' }, { label: 'Deliveries', path: '/doormile/deliveries' }, - { label: 'Riders', path: '/doormile/riders' }, + { label: 'Milers', path: '/doormile/milers' }, { label: 'Clients', path: '/doormile/tenants' }, { label: 'Pricing', path: '/doormile/pricing' }, { label: 'Customers', path: '/doormile/customers' }, diff --git a/src/pages/doormile/riders/CreateRider.jsx b/src/pages/doormile/riders/CreateRider.jsx index 7a98cc5..8574dc8 100644 --- a/src/pages/doormile/riders/CreateRider.jsx +++ b/src/pages/doormile/riders/CreateRider.jsx @@ -77,7 +77,7 @@ export default function CreateRider() { applocationid: Number(form.applocationid), hubid: form.hubid ? Number(form.hubid) : undefined, }, - { onSuccess: (res) => res?.success !== false && navigate('/doormile/riders') } + { onSuccess: (res) => res?.success !== false && navigate('/doormile/milers') } ); }; @@ -85,23 +85,23 @@ export default function CreateRider() { - Riders + Milers - New rider + New miler } actions={ - } @@ -140,7 +140,7 @@ export default function CreateRider() { /> - + - set('defaultvehicletype')(value)}> @@ -166,15 +166,19 @@ export default function CreateRider() { {isStaff && ( - - set('tenantid')(value === 'all' ? '' : value)} + > - + + All clients (Doormile staff) {(tenants || []).map((tenant) => ( - {tenant.tenantname || `Tenant #${tenant.tenantid}`} + {tenant.tenantname || `Client #${tenant.tenantid}`} ))} @@ -182,10 +186,13 @@ export default function CreateRider() { )} - - set('applocationid')(value)} + > - + {(locations || []) @@ -220,11 +227,11 @@ export default function CreateRider() {
-
diff --git a/src/pages/doormile/riders/EditRider.jsx b/src/pages/doormile/riders/EditRider.jsx index 5e3897c..61b6196 100644 --- a/src/pages/doormile/riders/EditRider.jsx +++ b/src/pages/doormile/riders/EditRider.jsx @@ -83,7 +83,7 @@ export default function EditRider() { applocationid: form.applocationid === '' ? undefined : Number(form.applocationid), }, }, - { onSuccess: (res) => res?.success !== false && navigate('/doormile/riders') } + { onSuccess: (res) => res?.success !== false && navigate('/doormile/milers') } ); }; @@ -91,13 +91,13 @@ export default function EditRider() { - Riders + Milers @@ -107,7 +107,7 @@ export default function EditRider() { } actions={ - } diff --git a/src/pages/doormile/riders/Riders.jsx b/src/pages/doormile/riders/Riders.jsx index c2ed1bc..2a87f1a 100644 --- a/src/pages/doormile/riders/Riders.jsx +++ b/src/pages/doormile/riders/Riders.jsx @@ -159,11 +159,11 @@ export default function Riders() { cell: (row) => (
navigate('/doormile/riders/edit', { state: { rider: row } })} + onClick={() => navigate('/doormile/milers/edit', { state: { rider: row } })} /> setLogsRow(row)} /> - setBlockRow(row)} /> + setBlockRow(row)} />
), }, @@ -204,11 +204,11 @@ export default function Riders() { navigate('/doormile/riders/create')}> - New rider + } /> @@ -217,7 +217,7 @@ export default function Riders() {