From 3d9f3f15446ae4b2cf87a7d716828d081e8be75b Mon Sep 17 00:00:00 2001 From: Samuel Shuert Date: Wed, 22 Jul 2026 03:27:15 +0000 Subject: [PATCH] fix(suppliers): various fixes to clean up suppliers --- backend/src/routes/supplier.rs | 4 ++-- frontend/components/forms/supplier.tsx | 1 + frontend/components/pages/suppliers.tsx | 12 ++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/backend/src/routes/supplier.rs b/backend/src/routes/supplier.rs index b4510a9..b2e5ae6 100644 --- a/backend/src/routes/supplier.rs +++ b/backend/src/routes/supplier.rs @@ -112,8 +112,8 @@ async fn get_all(pool: Data, options: Query, user: User) -> query.push_bind(like); } if let Some(like) = &address_like { - count_query.push(" AND address ILIKE "); - count_query.push_bind(like); + query.push(" AND address ILIKE "); + query.push_bind(like); } query.push(format!(" ORDER BY {sort_by} ")); diff --git a/frontend/components/forms/supplier.tsx b/frontend/components/forms/supplier.tsx index bbaecc0..0525645 100644 --- a/frontend/components/forms/supplier.tsx +++ b/frontend/components/forms/supplier.tsx @@ -47,6 +47,7 @@ export function SupplierForm({ formState: { errors, isSubmitting }, } = useForm({ resolver: zodResolver(schema), + defaultValues: supplierEdit ?? {}, }) async function onSubmit(values: FormValues) { diff --git a/frontend/components/pages/suppliers.tsx b/frontend/components/pages/suppliers.tsx index 9d392d8..1157b15 100644 --- a/frontend/components/pages/suppliers.tsx +++ b/frontend/components/pages/suppliers.tsx @@ -34,7 +34,7 @@ import { Card, CardContent } from "@/components/ui/card" import { Modal } from "@/components/modal" import { UserPermissions } from "@/lib/userPermissions" -import { MoreHorizontal, UserPlus2 } from "lucide-react" +import { MoreHorizontal, Truck } from "lucide-react" import { useQuery } from "@tanstack/react-query" import { useDebounce } from "use-debounce" import { TablePaginator } from "../tablePages" @@ -101,8 +101,8 @@ export function SuppliersPage({ userPerms }: { userPerms: UserPermissions }) { sort_order: sortOrder, }) - if (nameFilter) params.set("username", nameFilter) - if (phoneFilter) params.set("full_name", phoneFilter) + if (nameFilter) params.set("name", nameFilter) + if (phoneFilter) params.set("phone", phoneFilter) if (addressFilter) params.set("address", addressFilter) const res = await fetch(`/api/suppliers?${params.toString()}`) @@ -233,7 +233,7 @@ export function SuppliersPage({ userPerms }: { userPerms: UserPermissions }) { if (!editOpen && !deleteOpen) setSupplier(null) }, [editOpen, deleteOpen]) - async function deleteUser(id: string) { + async function deleteEntity(id: string) { const res = await fetch(`/api/suppliers/${id}`, { method: "DELETE", }) @@ -263,7 +263,7 @@ export function SuppliersPage({ userPerms }: { userPerms: UserPermissions }) { disabled={!userPerms.contains(UserPermissions.SupplierCreate)} onClick={() => setEditOpen(true)} > - New User + New Supplier @@ -358,7 +358,7 @@ export function SuppliersPage({ userPerms }: { userPerms: UserPermissions }) { variant="destructive" onClick={() => { setDeleteError(null) - if (supplier) void deleteUser(supplier.id) + if (supplier) void deleteEntity(supplier.id) setDeleteOpen(false) }} > -- 2.51.2