New_REP_SYSTEM/ERP_Distribution
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

name: CI/CD - ERP Core Monorepo

Browse Source 
on:
  pull_request:
    branches:
      - production
    types:
      - closed

jobs:
  backend-build-and-deploy:
    name: Build & Deploy ERP Core Backend
    runs-on: linux
    if: github.event.pull_request.merged == true
    steps:
      - name: Checkout code
        run: |
          git clone \
            --depth 1 \
            --branch production \
            https://oauth2:${{ secrets.ERPCORE }}@gitea.hexdive.com/New_REP_SYSTEM/ERP-core.git \
            .

      - name: Restore backend
        run: dotnet restore Backend/ERPCore.sln

      - name: Publish backend
        run: |
          rm -rf /tmp/erpcore-deploy
          mkdir -p /tmp/erpcore-deploy
          dotnet publish Backend/ERPCore/ERPCore.csproj \
            -c Release \
            -r linux-x64 \
            --self-contained true \
            -o /tmp/erpcore-deploy

      - name: Stop backend service
        run: systemctl stop erpcore.service

      - name: Copy backend to deploy folder
        run: |
          mkdir -p /home/erp/core/publish
          rm -rf /home/erp/core/publish/*
          cp -r /tmp/erpcore-deploy/* /home/erp/core/publish/

      - name: Fix backend ownership and permissions
        run: |
          chown -R erpuser:erpuser /home/erp/core/publish
          find /home/erp/core/publish -type d -exec chmod 755 {} +
          find /home/erp/core/publish -type f -exec chmod 644 {} +
          chmod +x /home/erp/core/publish/ERPCore

      - name: Restart backend service
        run: systemctl restart erpcore.service

      - name: Verify backend
        run: |
          systemctl is-active erpcore.service && echo "Backend service running" || echo "Backend service failed"

  frontend-build-and-deploy:
    name: Build & Deploy ERP Core Frontend
    runs-on: linux
    needs: backend-build-and-deploy
    if: github.event.pull_request.merged == true
    steps:
      - name: Checkout code
        run: |
          git clone \
            --depth 1 \
            --branch Production \
            https://oauth2:${{ secrets.ERPCORE }}@gitea.hexdive.com/New_REP_SYSTEM/ERP-core.git \
            .

      - name: Build frontend Docker image
        run: docker build -t erpcore-frontend:latest Frontend/erp-system

      - name: Stop & remove existing frontend container
        run: |
          docker stop erpcore-frontend 2>/dev/null || true
          docker rm erpcore-frontend 2>/dev/null || true

      - name: Start frontend container
        run: |
          docker run -d \
            --name erpcore-frontend \
            -p 6702:6702 \
            --add-host=host.docker.internal:host-gateway \
            -e BACKEND_ORIGIN=http://host.docker.internal:6701 \
            --restart unless-stopped \
            --memory="512m" \
            --cpus="1.0" \
            --cap-drop ALL \
            --security-opt no-new-privileges \
            erpcore-frontend:latest

      - name: Remove old frontend images
        run: docker image prune -f

      - name: Verify frontend
        run: |
          docker ps --filter name=erpcore-frontend --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}" \
            | grep erpcore-frontend && echo "Frontend container running" || echo "Frontend container failed"
This commit is contained in:
Kalana B. Thilakarathna
2026-09-17 13:59:05 +05:30
parent 93f2f1bd3b
commit 03d01d4c4e
61 changed files with 2195 additions and 1245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
distribution_fe/app/(dashboard)/operations/deliveries/_components/delivery-tasks-client.tsx
+2 -2
View File
@@ -51,7 +51,7 @@ export function DeliveryTasksClient() {
const fetchRides = useCallback(async () => {
try {
const res = await ridesApi.list({ page: 1, pageSize: 200, rideType: 'Delivery' })
const res = await ridesApi.list({ page: 1, pageSize: 200 })
const items = getPaginatedItems(res)
setRides(items)
setSelectedRideId((current) => current || items[0]?.id || '')
@@ -188,7 +188,7 @@ export function DeliveryTasksClient() {
<SelectItem value="__none__" disabled={rides.length > 0}>Select a ride...</SelectItem>
{rides.map((ride) => (
<SelectItem key={ride.id} value={ride.id}>
{ride.routeName} - {ride.vehicleNumberPlate}
{ride.vehicleNumberPlate} — {ride.driverFullName}
</SelectItem>
))}
</SelectContent>
distribution_fe/app/(dashboard)/operations/loading/_components/loading-sheet-create-dialog.tsx
+113
View File
@@ -0,0 +1,113 @@
'use client'
import { useEffect, useState } from 'react'
import { useForm, zodResolver, z } from '@/lib/form'
import { FormField } from '@/components/shared/form-field'
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from '@/components/ui/select'
import { Button } from '@/components/ui/button'
import {
Dialog,
DialogContent,
DialogHeader,
DialogTitle,
DialogDescription,
DialogFooter,
} from '@/components/ui/dialog'
import { FieldGroup } from '@/components/ui/field'
import { toast } from '@/components/ui/toast'
import { loadingSheets as loadingSheetsApi, rides as ridesApi, getApiError, getPaginatedItems } from '@/lib/api/index'
import type { RideResponse } from '@/types/api'
const schema = z.object({
fK_RideId: z.string().min(1, 'Ride is required'),
})
type FormValues = z.infer<typeof schema>
interface LoadingSheetCreateDialogProps {
open: boolean
onClose: () => void
onSuccess: () => void
}
export function LoadingSheetCreateDialog({ open, onClose, onSuccess }: LoadingSheetCreateDialogProps) {
const [ridesList, setRidesList] = useState<RideResponse[]>([])
const form = useForm<FormValues>({
resolver: zodResolver(schema),
defaultValues: { fK_RideId: '' },
})
useEffect(() => {
if (!open) return
form.reset({ fK_RideId: '' })
ridesApi.list({ status: 'Open', pageSize: 200 })
.then((res) => setRidesList(getPaginatedItems(res)))
.catch((err) => toast.add({ title: 'Failed to load rides', description: getApiError(err), type: 'error' }))
}, [open])
async function onSubmit(values: FormValues) {
try {
await loadingSheetsApi.create(values)
toast.add({ title: 'Loading sheet created', type: 'success' })
onSuccess()
onClose()
} catch (err) {
toast.add({ title: 'Failed to create loading sheet', description: getApiError(err), type: 'error' })
}
}
return (
<Dialog open={open} onOpenChange={(v) => !v && onClose()}>
<DialogContent className="overflow-y-auto sm:max-w-lg">
<DialogHeader>
<DialogTitle>New Loading Sheet</DialogTitle>
<DialogDescription>
Create a loading sheet for an open ride. Only one planned sheet per ride is allowed.
</DialogDescription>
</DialogHeader>
<form onSubmit={form.handleSubmit(onSubmit)} className="flex flex-col gap-6">
<FieldGroup>
<FormField
control={form.control}
name="fK_RideId"
label="Ride"
required
render={({ field }) => (
<Select value={field.value as string} onValueChange={field.onChange}>
<SelectTrigger>
<SelectValue placeholder="Select open ride..." />
</SelectTrigger>
<SelectContent>
<SelectItem value="" disabled>Select open ride...</SelectItem>
{ridesList.map((r) => (
<SelectItem key={r.id} value={r.id}>
{r.vehicleNumberPlate} — {r.driverFullName}
</SelectItem>
))}
</SelectContent>
</Select>
)}
/>
</FieldGroup>
<DialogFooter>
<Button type="button" variant="outline" onClick={onClose}>
Cancel
</Button>
<Button type="submit" disabled={form.formState.isSubmitting}>
{form.formState.isSubmitting ? 'Creating…' : 'Create Sheet'}
</Button>
</DialogFooter>
</form>
</DialogContent>
</Dialog>
)
}
distribution_fe/app/(dashboard)/operations/loading/_components/loading-sheet-view-sheet.tsx
+13 -17
View File
@@ -11,11 +11,8 @@ import { Separator } from '@/components/ui/separator'
import type { LoadingSheetResponse, LoadingSheetStatus } from '@/types/api'
const LS_STATUS_VARIANT: Record<LoadingSheetStatus, 'default' | 'secondary' | 'destructive'> = {
Pending: 'secondary',
DispatchConfirmed: 'default',
ReceiptConfirmed: 'default',
DiscrepancyFlagged: 'destructive',
Resolved: 'secondary',
Planned: 'secondary',
Confirmed: 'default',
}
const fmtDateTime = (v: string | null) =>
@@ -25,6 +22,8 @@ const fmtDateTime = (v: string | null) =>
})
: '—'
const truncId = (id: string) => id.substring(0, 8)
interface LoadingSheetViewSheetProps {
open: boolean
onClose: () => void
@@ -51,13 +50,12 @@ export function LoadingSheetViewSheet({ open, onClose, sheet }: LoadingSheetView
</DialogHeader>
<div className="flex flex-col">
<Row label="Sheet ID" value={<span className="font-mono">{sheet.id.substring(0, 8)}</span>} />
<Row label="Warehouse" value={sheet.warehouseName} />
<Row label="Sheet ID" value={<span className="font-mono">{truncId(sheet.id)}</span>} />
<Row label="Ride ID" value={<span className="font-mono">{truncId(sheet.fK_RideId)}</span>} />
<Row label="Status" value={<Badge variant={LS_STATUS_VARIANT[sheet.status]}>{sheet.status}</Badge>} />
<Row label="Dispatch Confirmed By" value={sheet.dispatchConfirmedBy ?? '—'} />
<Row label="Dispatch Confirmed At" value={fmtDateTime(sheet.dispatchConfirmedAt)} />
<Row label="Receipt Confirmed By" value={sheet.receiptConfirmedBy ?? '—'} />
<Row label="Receipt Confirmed At" value={fmtDateTime(sheet.receiptConfirmedAt)} />
<Row label="Populated At" value={fmtDateTime(sheet.populatedAt)} />
<Row label="Confirmed At" value={fmtDateTime(sheet.confirmedAt)} />
<Row label="Source POs" value={sheet.orders.length > 0 ? sheet.orders.map(o => truncId(o.shopPOId)).join(', ') : '—'} />
<Row label="Created At" value={fmtDateTime(sheet.createdAt)} />
</div>
@@ -70,15 +68,14 @@ export function LoadingSheetViewSheet({ open, onClose, sheet }: LoadingSheetView
<thead className="bg-muted/50">
<tr>
<th className="text-left font-medium px-3 py-2">Item</th>
<th className="text-right font-medium px-3 py-2">Dispatched</th>
<th className="text-right font-medium px-3 py-2">Received</th>
<th className="text-right font-medium px-3 py-2">Resolved</th>
<th className="text-left font-medium px-3 py-2">Warehouse</th>
<th className="text-right font-medium px-3 py-2">Qty</th>
</tr>
</thead>
<tbody>
{sheet.items.length === 0 ? (
<tr>
<td colSpan={4} className="text-center text-muted-foreground px-3 py-4">
<td colSpan={3} className="text-center text-muted-foreground px-3 py-4">
No items on this sheet.
</td>
</tr>
@@ -86,9 +83,8 @@ export function LoadingSheetViewSheet({ open, onClose, sheet }: LoadingSheetView
sheet.items.map((item) => (
<tr key={item.id} className="border-t">
<td className="px-3 py-2">{item.itemName}</td>
<td className="px-3 py-2 text-muted-foreground">{item.warehouseName}</td>
<td className="text-right px-3 py-2">{item.quantityDispatched}</td>
<td className="text-right px-3 py-2">{item.quantityReceived}</td>
<td className="text-right px-3 py-2">{item.quantityResolved}</td>
</tr>
))
)}
distribution_fe/app/(dashboard)/operations/loading/_components/loading-sheets-client.tsx
+48 -39
View File
@@ -1,14 +1,19 @@
'use client'
import { useState, useEffect, useCallback, useMemo } from 'react'
import { HugeiconsIcon } from '@hugeicons/react'
import { Add01Icon } from '@hugeicons/core-free-icons'
import { DataTable } from '@/components/shared/data-table'
import type { TableConfig } from '@/components/shared/data-table'
import { Badge } from '@/components/ui/badge'
import { Button } from '@/components/ui/button'
import { toast } from '@/components/ui/toast'
import { loadingSheets as loadingSheetsApi, getApiError, getPaginatedItems } from '@/lib/api/index'
import type { LoadingSheetResponse, LoadingSheetStatus } from '@/types/api'
import { LoadingSheetViewSheet } from './loading-sheet-view-sheet'
import { LoadingSheetCreateDialog } from './loading-sheet-create-dialog'
const fmtDate = (v: string) =>
new Date(v).toLocaleDateString('en-GB', { day: '2-digit', month: 'short', year: 'numeric' })
@@ -16,11 +21,8 @@ const fmtDate = (v: string) =>
const truncId = (id: string) => id.substring(0, 8)
const LS_STATUS_VARIANT: Record<LoadingSheetStatus, 'default' | 'secondary' | 'destructive'> = {
Pending: 'secondary',
DispatchConfirmed: 'default',
ReceiptConfirmed: 'default',
DiscrepancyFlagged: 'destructive',
Resolved: 'secondary',
Planned: 'secondary',
Confirmed: 'default',
}
export function LoadingSheetsClient() {
@@ -30,6 +32,7 @@ export function LoadingSheetsClient() {
const [page, setPage] = useState(1)
const [pageSize, setPageSize] = useState(20)
const [createOpen, setCreateOpen] = useState(false)
const [viewOpen, setViewOpen] = useState(false)
const [selectedSheet, setSelectedSheet] = useState<LoadingSheetResponse | null>(null)
@@ -55,23 +58,13 @@ export function LoadingSheetsClient() {
setViewOpen(true)
}
async function handleConfirmDispatch(row: LoadingSheetResponse) {
async function handleConfirm(row: LoadingSheetResponse) {
try {
await loadingSheetsApi.confirmDispatch(row.id)
toast.add({ title: 'Dispatch confirmed', type: 'success' })
await loadingSheetsApi.confirm(row.id)
toast.add({ title: 'Loading sheet confirmed — stock committed to vehicle', type: 'success' })
fetchData(page, pageSize)
} catch (err) {
toast.add({ title: 'Failed to confirm dispatch', description: getApiError(err), type: 'error' })
}
}
async function handleConfirmReceipt(row: LoadingSheetResponse) {
try {
await loadingSheetsApi.confirmReceipt(row.id, [])
toast.add({ title: 'Receipt confirmed', type: 'success' })
fetchData(page, pageSize)
} catch (err) {
toast.add({ title: 'Failed to confirm receipt', description: getApiError(err), type: 'error' })
toast.add({ title: 'Failed to confirm loading sheet', description: getApiError(err), type: 'error' })
}
}
@@ -92,33 +85,45 @@ export function LoadingSheetsClient() {
),
},
{
key: 'warehouseName',
title: 'Warehouse',
fields: [{ key: 'warehouseName', primary: true }],
minWidth: 180,
key: 'rideId',
title: 'Ride',
fields: ['fK_RideId'],
width: 140,
cellRender: (row) => (
<span className="font-mono text-sm text-muted-foreground">{truncId(row.fK_RideId)}</span>
),
},
{
key: 'status',
title: 'Status',
fields: ['status'],
width: 180,
width: 140,
cellRender: (row) => (
<Badge variant={LS_STATUS_VARIANT[row.status]}>{row.status}</Badge>
),
},
{
key: 'orders',
title: 'POs',
fields: ['orders'],
width: 80,
cellRender: (row) => (
<span className="text-sm text-muted-foreground">{row.orders.length}</span>
),
},
{
key: 'itemCount',
title: 'Items',
fields: ['items'],
width: 120,
width: 80,
cellRender: (row) => (
<span className="text-sm text-muted-foreground">{row.items.length} items</span>
<span className="text-sm text-muted-foreground">{row.items.length}</span>
),
},
{
key: 'createdAt',
title: 'Created',
fields: [{ key: 'createdAt', transform: (v) => fmtDate(v as string) }],
key: 'populatedAt',
title: 'Populated',
fields: [{ key: 'populatedAt', transform: (v) => fmtDate(v as string) }],
width: 140,
},
],
@@ -131,15 +136,9 @@ export function LoadingSheetsClient() {
},
{
action: 'confirm',
label: 'Confirm dispatch',
onClick: handleConfirmDispatch,
visible: (target) => target.status === 'Pending',
},
{
action: 'confirm',
label: 'Confirm receipt',
onClick: handleConfirmReceipt,
visible: (target) => target.status === 'DispatchConfirmed',
label: 'Confirm & commit stock',
onClick: handleConfirm,
visible: (target) => target.status === 'Planned',
},
],
},
@@ -151,9 +150,13 @@ export function LoadingSheetsClient() {
<div>
<h1 className="text-2xl font-semibold text-foreground">Loading Sheets</h1>
<p className="text-sm text-muted-foreground mt-0.5">
Track goods loaded onto a vehicle before dispatch
Items loaded onto a vehicle before a delivery run
</p>
</div>
<Button onClick={() => setCreateOpen(true)}>
<HugeiconsIcon icon={Add01Icon} size={16} />
New Sheet
</Button>
</div>
<DataTable
@@ -167,6 +170,12 @@ export function LoadingSheetsClient() {
}}
/>
<LoadingSheetCreateDialog
open={createOpen}
onClose={() => setCreateOpen(false)}
onSuccess={() => fetchData(page, pageSize)}
/>
<LoadingSheetViewSheet
open={viewOpen}
onClose={() => setViewOpen(false)}
distribution_fe/app/(dashboard)/operations/rides/_components/ride-cancel-dialog.tsx
+5 -5
View File
@@ -57,12 +57,12 @@ export function RideCancelDialog({ open, onClose, onSuccess, ride }: RideCancelD
async function onSubmit(values: FormValues) {
try {
await ridesApi.cancelRequests.raise(ride!.id, values)
toast.add({ title: 'Cancel request raised', type: 'success' })
await ridesApi.cancel(ride!.id, values)
toast.add({ title: 'Ride cancelled', type: 'success' })
onSuccess()
onClose()
} catch (err) {
toast.add({ title: 'Failed to raise cancel request', description: getApiError(err), type: 'error' })
toast.add({ title: 'Failed to cancel ride', description: getApiError(err), type: 'error' })
}
}
@@ -72,7 +72,7 @@ export function RideCancelDialog({ open, onClose, onSuccess, ride }: RideCancelD
<DialogHeader>
<DialogTitle>Cancel Ride</DialogTitle>
<DialogDescription>
Raises a cancel request for this ride, subject to supervisor approval.
Cancelling this ride is immediate and cannot be undone.
</DialogDescription>
</DialogHeader>
@@ -122,7 +122,7 @@ export function RideCancelDialog({ open, onClose, onSuccess, ride }: RideCancelD
Back
</Button>
<Button type="submit" variant="destructive" disabled={form.formState.isSubmitting}>
{form.formState.isSubmitting ? 'Submitting…' : 'Raise Cancel Request'}
{form.formState.isSubmitting ? 'Cancelling…' : 'Cancel Ride'}
</Button>
</DialogFooter>
</form>
distribution_fe/app/(dashboard)/operations/rides/_components/ride-edit-driver-sheet.tsx
+1 -1
View File
@@ -72,7 +72,7 @@ export function RideEditDriverSheet({ open, onClose, onSuccess, ride }: RideEdit
<DialogHeader>
<DialogTitle>Edit Ride Driver</DialogTitle>
<DialogDescription>
Reassign the driver for this ride. Only available while the ride is in Draft status.
Reassign the driver for this ride. Only available while the ride is Open.
</DialogDescription>
</DialogHeader>
distribution_fe/app/(dashboard)/operations/rides/_components/ride-sheet.tsx
+3 -85
View File
@@ -26,19 +26,14 @@ import {
rides as ridesApi,
vehicles as vehiclesApi,
drivers as driversApi,
routes as routesApi,
warehouses as warehousesApi,
getApiError,
getPaginatedItems,
} from '@/lib/api/index'
import type { VehicleResponse, DriverProfileResponse, RouteResponse, WarehouseResponse } from '@/types/api'
import type { VehicleResponse, DriverProfileResponse } from '@/types/api'
const schema = z.object({
rideType: z.enum(['Delivery', 'Sale']),
vehicleId: z.string().min(1, 'Vehicle is required'),
driverProfileId: z.string().min(1, 'Driver is required'),
routeId: z.string().min(1, 'Route is required'),
sourceWarehouseId: z.string().min(1, 'Warehouse is required'),
meterstart: z.number().min(0, 'Meter start must be 0 or more'),
})
@@ -50,21 +45,15 @@ interface RideSheetProps {
onSuccess: () => void
}
export function RideSheet({ open, onClose, onSuccess }: RideSheetProps) {
const [vehiclesList, setVehiclesList] = useState<VehicleResponse[]>([])
const [driversList, setDriversList] = useState<DriverProfileResponse[]>([])
const [routesList, setRoutesList] = useState<RouteResponse[]>([])
const [warehousesList, setWarehousesList] = useState<WarehouseResponse[]>([])
const form = useForm<FormValues>({
resolver: zodResolver(schema),
defaultValues: {
rideType: 'Delivery',
vehicleId: '',
driverProfileId: '',
routeId: '',
sourceWarehouseId: '',
meterstart: 0,
},
})
@@ -73,26 +62,18 @@ export function RideSheet({ open, onClose, onSuccess }: RideSheetProps) {
if (!open) return
form.reset({
rideType: 'Delivery',
vehicleId: '',
driverProfileId: '',
routeId: '',
sourceWarehouseId: '',
meterstart: 0,
})
// available=true tells backend to exclude vehicles already on an open ride
Promise.all([
vehiclesApi.list({ available: true, isActive: true, pageSize: 200 }),
driversApi.list({ pageSize: 200 }),
routesApi.list({ pageSize: 200 }),
warehousesApi.list({ pageSize: 200 }),
])
.then(([v, d, r, w]) => {
.then(([v, d]) => {
setVehiclesList(getPaginatedItems(v))
setDriversList(getPaginatedItems(d))
setRoutesList(getPaginatedItems(r))
setWarehousesList(getPaginatedItems(w))
})
.catch((err) => {
toast.add({ title: 'Failed to load reference data', description: getApiError(err), type: 'error' })
@@ -115,30 +96,11 @@ export function RideSheet({ open, onClose, onSuccess }: RideSheetProps) {
<DialogContent className="overflow-y-auto sm:max-w-lg">
<DialogHeader>
<DialogTitle>Create Ride</DialogTitle>
<DialogDescription>Start a new delivery or sales run.</DialogDescription>
<DialogDescription>Start a new delivery run for a driver and vehicle.</DialogDescription>
</DialogHeader>
<form onSubmit={form.handleSubmit(onSubmit)} className="flex flex-col gap-6">
<FieldGroup>
<FormField
control={form.control}
name="rideType"
label="Ride Type"
required
render={({ field }) => (
<Select value={field.value as string} onValueChange={field.onChange}>
<SelectTrigger>
<SelectValue placeholder="Select ride type..." />
</SelectTrigger>
<SelectContent>
<SelectItem value="" disabled>Select ride type...</SelectItem>
<SelectItem value="Delivery">Delivery</SelectItem>
<SelectItem value="Sale">Sale</SelectItem>
</SelectContent>
</Select>
)}
/>
<FormField
control={form.control}
name="vehicleId"
@@ -183,50 +145,6 @@ export function RideSheet({ open, onClose, onSuccess }: RideSheetProps) {
)}
/>
<FormField
control={form.control}
name="routeId"
label="Route"
required
render={({ field }) => (
<Select value={field.value as string} onValueChange={field.onChange}>
<SelectTrigger>
<SelectValue placeholder="Select route..." />
</SelectTrigger>
<SelectContent>
<SelectItem value="" disabled>Select route...</SelectItem>
{routesList.map((r) => (
<SelectItem key={r.id} value={r.id}>
{r.routeName} ({r.startPoint} → {r.endPoint})
</SelectItem>
))}
</SelectContent>
</Select>
)}
/>
<FormField
control={form.control}
name="sourceWarehouseId"
label="Source Warehouse"
required
render={({ field }) => (
<Select value={field.value as string} onValueChange={field.onChange}>
<SelectTrigger>
<SelectValue placeholder="Select warehouse..." />
</SelectTrigger>
<SelectContent>
<SelectItem value="" disabled>Select warehouse...</SelectItem>
{warehousesList.map((w) => (
<SelectItem key={w.id} value={w.id}>
{w.name} — {w.location}
</SelectItem>
))}
</SelectContent>
</Select>
)}
/>
<FormField
control={form.control}
name="meterstart"
distribution_fe/app/(dashboard)/operations/rides/_components/ride-view-sheet.tsx
+4 -16
View File
@@ -7,22 +7,14 @@ import {
DialogHeader,
DialogTitle,
} from '@/components/ui/dialog'
import type { RideResponse, RideStatus, RideType } from '@/types/api'
import type { RideResponse, RideStatus } from '@/types/api'
const RIDE_STATUS_VARIANT: Record<RideStatus, 'default' | 'secondary' | 'destructive'> = {
Draft: 'secondary',
Open: 'secondary',
Active: 'default',
CancelRequested: 'destructive',
Open: 'default',
Cancelled: 'destructive',
Closed: 'secondary',
}
const RIDE_TYPE_VARIANT: Record<RideType, 'default' | 'secondary'> = {
Delivery: 'default',
Sale: 'secondary',
}
const fmtDateTime = (v: string | null) =>
v
? new Date(v).toLocaleString('en-GB', {
@@ -58,14 +50,10 @@ export function RideViewSheet({ open, onClose, ride }: RideViewSheetProps) {
<div className="flex flex-col">
<Row label="Vehicle" value={ride.vehicleNumberPlate} />
<Row label="Driver" value={ride.driverFullName} />
<Row label="Route" value={ride.routeName} />
<Row label="Source Warehouse" value={ride.sourceWarehouseName} />
<Row label="Type" value={<Badge variant={RIDE_TYPE_VARIANT[ride.rideType]}>{ride.rideType}</Badge>} />
<Row label="Status" value={<Badge variant={RIDE_STATUS_VARIANT[ride.status]}>{ride.status}</Badge>} />
<Row label="Meter Start" value={ride.meterstart} />
<Row label="Meter End" value={ride.meterend || '—'} />
<Row label="Meter Start" value={`${ride.meterstart} km`} />
<Row label="Meter End" value={ride.meterend ? `${ride.meterend} km` : '—'} />
<Row label="Started At" value={fmtDateTime(ride.startedAt)} />
<Row label="Activated At" value={fmtDateTime(ride.activatedAt)} />
<Row label="Closed At" value={fmtDateTime(ride.closedAt)} />
<Row label="Created At" value={fmtDateTime(ride.createdAt)} />
</div>
distribution_fe/app/(dashboard)/operations/rides/_components/rides-client.tsx
+20 -45
View File
@@ -10,7 +10,7 @@ import { Badge } from '@/components/ui/badge'
import { Button } from '@/components/ui/button'
import { toast } from '@/components/ui/toast'
import { rides as ridesApi, getApiError, getPaginatedItems } from '@/lib/api/index'
import type { RideResponse, RideStatus, RideType } from '@/types/api'
import type { RideResponse, RideStatus } from '@/types/api'
import { RideSheet } from './ride-sheet'
import { RideViewSheet } from './ride-view-sheet'
@@ -22,19 +22,11 @@ const fmtDate = (v: string) =>
new Date(v).toLocaleDateString('en-GB', { day: '2-digit', month: 'short', year: 'numeric' })
const RIDE_STATUS_VARIANT: Record<RideStatus, 'default' | 'secondary' | 'destructive'> = {
Draft: 'secondary',
Open: 'secondary',
Active: 'default',
CancelRequested: 'destructive',
Open: 'default',
Cancelled: 'destructive',
Closed: 'secondary',
}
const RIDE_TYPE_VARIANT: Record<RideType, 'default' | 'secondary'> = {
Delivery: 'default',
Sale: 'secondary',
}
export function RidesClient() {
const [data, setData] = useState<RideResponse[]>([])
const [loading, setLoading] = useState(true)
@@ -81,16 +73,6 @@ export function RidesClient() {
setCancelOpen(true)
}
async function handleActivate(row: RideResponse) {
try {
await ridesApi.activate(row.id)
toast.add({ title: 'Ride activated', type: 'success' })
fetchData(page, pageSize)
} catch (err) {
toast.add({ title: 'Failed to activate ride', description: getApiError(err), type: 'error' })
}
}
function handleClose(row: RideResponse) {
setSelectedRide(row)
setCloseOpen(true)
@@ -115,30 +97,29 @@ export function RidesClient() {
</div>
),
},
{
key: 'routeName',
title: 'Route',
fields: [{ key: 'routeName', primary: true }],
minWidth: 160,
},
{
key: 'rideType',
title: 'Type',
fields: ['rideType'],
width: 120,
cellRender: (row) => (
<Badge variant={RIDE_TYPE_VARIANT[row.rideType]}>{row.rideType}</Badge>
),
},
{
key: 'status',
title: 'Status',
fields: ['status'],
width: 160,
width: 140,
cellRender: (row) => (
<Badge variant={RIDE_STATUS_VARIANT[row.status]}>{row.status}</Badge>
),
},
{
key: 'meter',
title: 'Meter',
fields: ['meterstart', 'meterend'],
width: 160,
cellRender: (row) => (
<div>
<p className="text-sm">{row.meterstart} km</p>
{row.meterend ? (
<p className="text-xs text-muted-foreground">→ {row.meterend} km</p>
) : null}
</div>
),
},
{
key: 'createdAt',
title: 'Created',
@@ -157,25 +138,19 @@ export function RidesClient() {
action: 'edit',
label: 'Edit driver',
onClick: handleEditDriver,
visible: (target) => target.status === 'Draft',
},
{
action: 'activate',
label: 'Activate ride',
onClick: handleActivate,
visible: (target) => target.status === 'Open',
},
{
action: 'close',
label: 'Close ride',
onClick: handleClose,
visible: (target) => target.status === 'Active',
visible: (target) => target.status === 'Open',
},
{
action: 'cancel',
label: 'Cancel ride',
onClick: handleCancel,
visible: (target) => target.status === 'Active',
visible: (target) => target.status === 'Open',
},
],
},
@@ -192,7 +167,7 @@ export function RidesClient() {
</div>
<Button onClick={() => setSheetOpen(true)}>
<HugeiconsIcon icon={Add01Icon} size={16} />
Add Ride
New Ride
</Button>
</div>