fix: supplier select

kimthu09 · Jan 15, 2024 · b641122 · b641122
1 parent 3b2b2dc
commit b641122
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 67 deletions.
diff --git a/frontend/app/stockmanage/check/add/page.tsx b/frontend/app/stockmanage/check/add/page.tsx
@@ -16,13 +16,12 @@ import { useSWRConfig } from "swr";
 import CheckInsert from "@/components/stock-manage/check-insert";
 import createCheckNote from "@/lib/check/createCheckNote";
 import { useCurrentUser } from "@/hooks/use-user";
-import Loading from "@/components/loading";
 import { includesRoles } from "@/lib/utils";
 import NoRole from "@/components/no-role";
 import ImportSheet from "@/components/book-manage/import-sheet";
 import getAllBookForSale from "@/lib/book/getAllBookForSale";
 import { useLoading } from "@/hooks/loading-context";
-import ImportNoteAddSkeleton from "@/components/skeleton/import-note-add-skeleton";
+import InventoryCheckNoteAddSkeleton from "@/components/skeleton/inventory-check-note-add-skeleton";
 
 export const FormSchema = z.object({
   id: z.string().max(12, "Tối đa 12 ký tự"),
@@ -168,7 +167,7 @@ const AddNote = () => {
   };
   const { currentUser } = useCurrentUser();
   if (!currentUser) {
-    return <ImportNoteAddSkeleton />;
+    return <InventoryCheckNoteAddSkeleton />;
   } else if (
     currentUser &&
     !includesRoles({

diff --git a/frontend/app/stockmanage/import/[importId]/page.tsx b/frontend/app/stockmanage/import/[importId]/page.tsx
@@ -57,7 +57,7 @@ const ImportDetail = ({ params }: { params: { importId: string } }) => {
     });
   if (isError) return <div>Failed to load</div>;
   else if (!currentUser || isLoading) {
-    return <ImportNoteDetailSkeleton/>;
+    return <ImportNoteDetailSkeleton />;
   } else if (
     currentUser &&
     !includesRoles({
@@ -75,7 +75,7 @@ const ImportDetail = ({ params }: { params: { importId: string } }) => {
               <span className="font-light">Mã phiếu nhập</span>
               <span>{data.id}</span>
             </div>
-            <div className="flex gap-2 flex-nowrap">
+            <div className="flex gap-2 flex-wrap justify-end">
               <Button
                 variant={"outline"}
                 className="p-2"

diff --git a/frontend/app/stockmanage/import/add/page.tsx b/frontend/app/stockmanage/import/add/page.tsx
@@ -18,13 +18,12 @@ import createImportNote from "@/lib/import/createImportNote";
 import { Switch } from "@/components/ui/switch";
 import { useSWRConfig } from "swr";
 import { useCurrentUser } from "@/hooks/use-user";
-import Loading from "@/components/loading";
 import { includesRoles } from "@/lib/utils";
 import NoRole from "@/components/no-role";
 import ImportSheet from "@/components/book-manage/import-sheet";
 import getAllBookForSale from "@/lib/book/getAllBookForSale";
 import { useLoading } from "@/hooks/loading-context";
-import InventoryCheckNoteAddSkeleton from "@/components/skeleton/inventory-check-note-add-skeleton";
+import ImportNoteAddSkeleton from "@/components/skeleton/import-note-add-skeleton";
 
 export const FormSchema = z.object({
   id: z.string().max(12, "Tối đa 12 ký tự"),
@@ -128,7 +127,7 @@ const AddNote = () => {
 
   const { currentUser } = useCurrentUser();
   if (!currentUser) {
-    return <InventoryCheckNoteAddSkeleton />;
+    return <ImportNoteAddSkeleton />;
   } else if (
     currentUser &&
     !includesRoles({
@@ -225,8 +224,13 @@ const AddNote = () => {
                     <div className="flex-1">
                       <Label>Nhà cung cấp</Label>
                       <SupplierList
+                        canAdd
                         supplierId={supplierId}
                         setSupplierId={handleSupplierIdSet}
+                        handleSupplierAdded={(supplierId) => {
+                          mutate(`${endPoint}/v1/suppliers/all`);
+                          handleSupplierIdSet(supplierId);
+                        }}
                       />
                       {errors.supplierId && (
                         <span className="error___message">

diff --git a/frontend/app/supplier/page.tsx b/frontend/app/supplier/page.tsx
@@ -6,6 +6,7 @@ import { Suspense } from "react";
 import { Metadata } from "next";
 import { withAuth } from "@/lib/role/withAuth";
 import { includesRoles } from "@/lib/utils";
+import { Button } from "@/components/ui/button";
 export const metadata: Metadata = {
   title: "Quản lý nhà cung cấp",
 };
@@ -19,7 +20,11 @@ function SupplierManage({
       <div className="flex flex-row justify-between ">
         <h1>Danh sách nhà cung cấp</h1>
         <div className="flex gap-4">
-          <CreateDialog />
+          <CreateDialog>
+            <Button className="lg:px-4 px-2 whitespace-nowrap">
+              Thêm nhà cung cấp
+            </Button>
+          </CreateDialog>
         </div>
       </div>
 

diff --git a/frontend/components/customer/create.tsx b/frontend/components/customer/create.tsx
@@ -49,8 +49,6 @@ const CreateDialog = ({
   const onSubmit: SubmitHandler<z.infer<typeof SupplierSchema>> = async (
     data
   ) => {
-    setOpen(false);
-
     const response: Promise<any> = createCustomer(data);
     showLoading();
     const responseData = await response;
@@ -67,6 +65,8 @@ const CreateDialog = ({
         title: "Thành công",
         description: "Thêm khách hàng thành công",
       });
+      setOpen(false);
+
       if (handleCustomerAdded) {
         handleCustomerAdded(responseData.data);
       }

diff --git a/frontend/components/invoice/table-layout.tsx b/frontend/components/invoice/table-layout.tsx
@@ -22,7 +22,7 @@ const TableLayout = async ({
       search: search?.toString(),
     });
   const staffs = await staffsData;
-
+  console.log(staffs);
   const totalPage = Math.ceil(staffs.paging.total / staffs.paging.limit);
   return <InvoiceTable data={staffs.data} totalPage={totalPage} />;
 };

diff --git a/frontend/components/skeleton/table-skeleton.tsx b/frontend/components/skeleton/table-skeleton.tsx
@@ -10,7 +10,7 @@ type TableSkeletonProps = {
   isHasSearch: boolean;
   isHasChooseVisibleRow: boolean;
   isHasCheckBox: boolean;
-  isHasPaging:boolean;
+  isHasPaging: boolean;
   numberRow: number;
   cells: TableSkeletonCell[];
 };
@@ -33,7 +33,7 @@ const TableSkeleton: React.FC<TableSkeletonProps> = ({
         {isHasSearch && <Skeleton className="w-full h-8 flex-1" />}
         {isHasChooseVisibleRow && <Skeleton className="w-24 h-8" />}
       </div>
-      <div className="flex flex-col rounded-md border">
+      <div className="flex flex-col rounded-md border overflow-x-auto">
         {[...Array(numberRow + 1)].map((_, index) => (
           <div
             key={index}
@@ -63,7 +63,7 @@ const TableSkeleton: React.FC<TableSkeletonProps> = ({
           <div className="flex flex-row gap-2">
             <Skeleton className="w-8 h-8" />
             <Skeleton className="w-8 h-8" />
-            <Skeleton className="w-24 h-8" />
+            <Skeleton className="flex-1 h-8" />
             <Skeleton className="w-8 h-8" />
             <Skeleton className="w-8 h-8" />
           </div>

diff --git a/frontend/components/stock-manage/check-table.tsx b/frontend/components/stock-manage/check-table.tsx
@@ -40,7 +40,6 @@ import { Input } from "../ui/input";
 import { statusNoteToString } from "@/lib/utils";
 import { toast } from "../ui/use-toast";
 import { useRouter, useSearchParams } from "next/navigation";
-import Loading from "../loading";
 import Paging, { PagingProps } from "../paging";
 import {
   Controller,
@@ -53,10 +52,7 @@ import { Label } from "../ui/label";
 import { AiOutlineClose } from "react-icons/ai";
 import { FilterDatePicker } from "./date-picker";
 import StaffList from "../staff-list";
-import getAllImportNoteForExcel from "@/lib/import/getAllImportNoteForExcel";
-import SupplierList from "../supplier-list";
 import ExportDialog from "../supplier-manage/export-dialog";
-import StatusNoteList from "../status-note-list";
 import getAllCheckNote from "@/lib/check/getAllImport";
 import { ExportCheckNote } from "./excel-check-list";
 import getAllCheckNoteForExcel from "@/lib/import/getAllCheckNoteForExcel";
@@ -385,13 +381,6 @@ export function CheckTable() {
                                 type="text"
                                 required
                               ></Input>
-                            ) : item.type.includes("Price") ? (
-                              <Input
-                                {...register(`filters.${index}.value`)}
-                                className="flex-1"
-                                type="number"
-                                required
-                              ></Input>
                             ) : item.type.includes("At") ? (
                               <Controller
                                 control={control}
@@ -438,32 +427,6 @@ export function CheckTable() {
                                   });
                                 }}
                               />
-                            ) : item.type === "supplier" ? (
-                              <div className="flex-1">
-                                <SupplierList
-                                  supplierId={supplierId}
-                                  setSupplierId={(value) => {
-                                    setSupplierId(value);
-                                    update(index, {
-                                      type: item.type,
-                                      value: value,
-                                    });
-                                  }}
-                                />
-                              </div>
-                            ) : item.type === "status" ? (
-                              <div className="flex-1">
-                                <StatusNoteList
-                                  status={status}
-                                  setStatus={(value) => {
-                                    setStatus(value);
-                                    update(index, {
-                                      type: item.type,
-                                      value: value,
-                                    });
-                                  }}
-                                />
-                              </div>
                             ) : null}
                             <Button
                               variant={"ghost"}

diff --git a/frontend/components/supplier-list.tsx b/frontend/components/supplier-list.tsx
@@ -17,16 +17,20 @@ import {
 import { cn } from "@/lib/utils";
 import getAllSupplier from "@/lib/supplier/getAllSupplier";
 import DropdownSkeleton from "./skeleton/dropdown-skeleton";
+import CreateDialog from "./supplier-manage/create";
+import { FaPlus } from "react-icons/fa";
 
 export interface SupplierListProps {
   supplierId: string;
   setSupplierId: (id: string) => void;
   canAdd?: boolean;
+  handleSupplierAdded?: (customerId: string) => void;
 }
 const SupplierList = ({
   supplierId,
   setSupplierId,
   canAdd,
+  handleSupplierAdded,
 }: SupplierListProps) => {
   const [open, setOpen] = useState(false);
   const { suppliers, isLoading, isError, mutate } = getAllSupplier();
@@ -87,13 +91,13 @@ const SupplierList = ({
             </Command>
           </DropdownMenuContent>
         </DropdownMenu>
-        {/* {canAdd ? (
-          <CreatePublisher handlePublisherAdded={handlePublisherAdded}>
+        {canAdd ? (
+          <CreateDialog handleSupplierAdded={handleSupplierAdded}>
             <Button type="button" size={"icon"} className="px-3">
               <FaPlus />
             </Button>
-          </CreatePublisher>
-        ) : null} */}
+          </CreateDialog>
+        ) : null}
       </div>
     );
 };

diff --git a/frontend/components/supplier-manage/create.tsx b/frontend/components/supplier-manage/create.tsx
@@ -34,7 +34,13 @@ const SupplierSchema = z.object({
     }),
 });
 
-const CreateDialog = () => {
+const CreateDialog = ({
+  children,
+  handleSupplierAdded,
+}: {
+  children: React.ReactNode;
+  handleSupplierAdded?: (supplierId: string) => void;
+}) => {
   const { currentUser } = useCurrentUser();
   const {
     register,
@@ -55,24 +61,29 @@ const CreateDialog = () => {
   const onSubmit: SubmitHandler<z.infer<typeof SupplierSchema>> = async (
     data
   ) => {
-    setOpen(false);
-
     const response: Promise<any> = createSupplier(data);
     showLoading();
     const responseData = await response;
     hideLoading();
     if (responseData.hasOwnProperty("errorKey")) {
+      console.log("hi");
       toast({
         variant: "destructive",
         title: "Có lỗi",
         description: responseData.message,
       });
     } else {
+      console.log("there");
+
       toast({
         variant: "success",
         title: "Thành công",
         description: "Thêm nhà cung cấp thành công",
       });
+      setOpen(false);
+      if (handleSupplierAdded) {
+        handleSupplierAdded(responseData.data);
+      }
       router.refresh();
     }
   };
@@ -103,16 +114,12 @@ const CreateDialog = () => {
           setOpen(open);
         }}
       >
-        <DialogTrigger asChild>
-          <Button className="lg:px-4 px-2 whitespace-nowrap">
-            Thêm nhà cung cấp
-          </Button>
-        </DialogTrigger>
+        <DialogTrigger asChild>{children}</DialogTrigger>
         <DialogContent className="xl:max-w-[720px] max-w-[472px] p-0 bg-white">
           <DialogHeader>
             <DialogTitle className="p-6 pb-0">Thêm nhà cung cấp</DialogTitle>
           </DialogHeader>
-          <form onSubmit={handleSubmit(onSubmit)}>
+          <form>
             <div className="p-6 flex flex-col gap-4 border-y-[1px]">
               <div>
                 <Label htmlFor="idNcc">Mã nhà cung cấp</Label>
@@ -172,7 +179,9 @@ const CreateDialog = () => {
                   Huỷ
                 </Button>
 
-                <Button type="submit">Thêm</Button>
+                <Button type="button" onClick={() => handleSubmit(onSubmit)()}>
+                  Thêm
+                </Button>
               </div>
             </div>
           </form>

diff --git a/frontend/components/supplier-manage/table.tsx b/frontend/components/supplier-manage/table.tsx
@@ -430,7 +430,7 @@ export function SupplierTable({
         </DropdownMenu>
       </div>
       <div className="rounded-md border overflow-x-auto min-w-full max-w-[50vw]">
-        <Table>
+        <Table className="min-w-full w-max">
           <TableHeader>
             {table.getHeaderGroups().map((headerGroup) => (
               <TableRow key={headerGroup.id}>