feat(api): restructure api with axios and chainage related changes
This commit is contained in:
@@ -10,13 +10,7 @@ import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } f
|
||||
import { Loader2, CheckCircle2, Package, FolderKanban, Globe } from "lucide-react"
|
||||
import { DataTable } from "@/components/data-table"
|
||||
import { PageHeader } from "@/components/page-header"
|
||||
import {
|
||||
fetchProjects,
|
||||
fetchAllPackages,
|
||||
createPackage,
|
||||
updatePackage,
|
||||
deletePackage
|
||||
} from "@/lib/api"
|
||||
import { projectService, packageService } from "@/services/api"
|
||||
import {
|
||||
Project,
|
||||
Package as PackageType,
|
||||
@@ -51,13 +45,15 @@ export default function PackagePage() {
|
||||
const [selectedProjectId, setSelectedProjectId] = useState("")
|
||||
const [name, setName] = useState("")
|
||||
const [region, setRegion] = useState("")
|
||||
const [chainageStartKm, setChainageStartKm] = useState<string>("")
|
||||
const [chainageEndKm, setChainageEndKm] = useState<string>("")
|
||||
|
||||
// Load packages and projects
|
||||
const loadPackages = async (currentSkip = skip, currentLimit = limit) => {
|
||||
try {
|
||||
setIsLoading(true)
|
||||
setError(null)
|
||||
const data = await fetchAllPackages({ skip: currentSkip, limit: currentLimit })
|
||||
const data = await packageService.getPackages({ skip: currentSkip, limit: currentLimit })
|
||||
setPackages(data.items)
|
||||
setTotalItems(data.totalItems)
|
||||
} catch (err) {
|
||||
@@ -73,7 +69,7 @@ export default function PackagePage() {
|
||||
const loadProjects = async () => {
|
||||
try {
|
||||
setLoadingProjects(true)
|
||||
const data = await fetchProjects({ skip: 0, limit: 1000 }) // Load all projects for selector
|
||||
const data = await projectService.getProjects({ skip: 0, limit: 1000 }) // Load all projects for selector
|
||||
setProjects(data.items)
|
||||
} catch (err) {
|
||||
setError("Failed to load projects.")
|
||||
@@ -91,6 +87,8 @@ export default function PackagePage() {
|
||||
setSelectedProjectId("")
|
||||
setName("")
|
||||
setRegion("")
|
||||
setChainageStartKm("")
|
||||
setChainageEndKm("")
|
||||
setError(null)
|
||||
setIsEditing(false)
|
||||
setCurrentPackage(null)
|
||||
@@ -115,8 +113,10 @@ export default function PackagePage() {
|
||||
const data: PackageUpdate = {
|
||||
name: name.trim(),
|
||||
region: region.trim() || null,
|
||||
chainage_start_km: chainageStartKm ? parseFloat(chainageStartKm) : 0,
|
||||
chainage_end_km: chainageEndKm ? parseFloat(chainageEndKm) : 0,
|
||||
}
|
||||
await updatePackage(currentPackage.id, data)
|
||||
await packageService.updatePackage(currentPackage.id, data)
|
||||
toast.success("Package Updated", {
|
||||
description: `${name} has been updated successfully at ${new Date().toLocaleTimeString()}`,
|
||||
})
|
||||
@@ -125,8 +125,10 @@ export default function PackagePage() {
|
||||
project_id: selectedProjectId,
|
||||
name: name.trim(),
|
||||
region: region.trim() || null,
|
||||
chainage_start_km: chainageStartKm ? parseFloat(chainageStartKm) : 0,
|
||||
chainage_end_km: chainageEndKm ? parseFloat(chainageEndKm) : 0,
|
||||
}
|
||||
await createPackage(data)
|
||||
await packageService.createPackage(data)
|
||||
toast.success("Package Created", {
|
||||
description: `${name} has been established successfully at ${new Date().toLocaleTimeString()}`,
|
||||
})
|
||||
@@ -155,6 +157,8 @@ export default function PackagePage() {
|
||||
setSelectedProjectId(pkg.project_id)
|
||||
setName(pkg.name || "")
|
||||
setRegion(pkg.region || "")
|
||||
setChainageStartKm(pkg.chainage_start_km?.toString() || "0")
|
||||
setChainageEndKm(pkg.chainage_end_km?.toString() || "0")
|
||||
setIsModalOpen(true)
|
||||
}
|
||||
|
||||
@@ -163,7 +167,7 @@ export default function PackagePage() {
|
||||
|
||||
try {
|
||||
setIsLoading(true)
|
||||
await deletePackage(pkg.id)
|
||||
await packageService.deletePackage(pkg.id)
|
||||
toast.success("Package Deleted", {
|
||||
description: `${pkg.name} has been removed from the system.`,
|
||||
})
|
||||
@@ -242,6 +246,16 @@ export default function PackagePage() {
|
||||
accessorKey: "region",
|
||||
header: "Region",
|
||||
},
|
||||
{
|
||||
accessorKey: "chainage_start_km",
|
||||
header: "Start (km)",
|
||||
cell: ({ row }) => row.original.chainage_start_km?.toFixed(2) ?? "0.00"
|
||||
},
|
||||
{
|
||||
accessorKey: "chainage_end_km",
|
||||
header: "End (km)",
|
||||
cell: ({ row }) => row.original.chainage_end_km?.toFixed(2) ?? "0.00"
|
||||
},
|
||||
]
|
||||
|
||||
return (
|
||||
@@ -383,6 +397,36 @@ export default function PackagePage() {
|
||||
className="h-11 bg-muted/20 border-border/60"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="chainage-start" className="text-[11px] font-bold text-muted-foreground uppercase tracking-wider">
|
||||
Chainage Start (km)
|
||||
</Label>
|
||||
<Input
|
||||
id="chainage-start"
|
||||
type="number"
|
||||
step="0.01"
|
||||
value={chainageStartKm}
|
||||
onChange={(e) => setChainageStartKm(e.target.value)}
|
||||
placeholder="0.00"
|
||||
className="h-11 bg-muted/20 border-border/60"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="chainage-end" className="text-[11px] font-bold text-muted-foreground uppercase tracking-wider">
|
||||
Chainage End (km)
|
||||
</Label>
|
||||
<Input
|
||||
id="chainage-end"
|
||||
type="number"
|
||||
step="0.01"
|
||||
value={chainageEndKm}
|
||||
onChange={(e) => setChainageEndKm(e.target.value)}
|
||||
placeholder="0.00"
|
||||
className="h-11 bg-muted/20 border-border/60"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -396,14 +440,14 @@ export default function PackagePage() {
|
||||
resetForm()
|
||||
}}
|
||||
disabled={isSubmitting}
|
||||
className="flex-1 h-12 font-bold uppercase tracking-wider text-xs border-border/80 hover:bg-muted/50"
|
||||
className="flex-1"
|
||||
>
|
||||
Cancel
|
||||
</Button>
|
||||
<Button
|
||||
type="submit"
|
||||
disabled={isSubmitting || !name.trim() || !selectedProjectId}
|
||||
className="flex-1 h-12 font-bold uppercase tracking-wider text-xs"
|
||||
className="flex-1"
|
||||
>
|
||||
{isSubmitting ? (
|
||||
<div className="flex items-center gap-2">
|
||||
|
||||
Reference in New Issue
Block a user