fix: data baru

sora-vp · Oct 14, 2023 · 862e2aa · 862e2aa
1 parent 0ece121
commit 862e2aa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/apps/web/src/pages/peserta/csv.tsx b/apps/web/src/pages/peserta/csv.tsx
@@ -43,7 +43,7 @@ import {
 import { api } from "~/utils/api";
 import Sidebar from "~/components/Sidebar";
 
-type StateZodErr = Array<{ message: string; path: Array<number | string> }>;
+type StateZodErr = { error: Array<{ message: string; path: Array<number | string> }>; dataOfError: Array<{ "Bagian Dari": string; Nama: string }> };
 
 const HalamanTambah = () => {
   const toast = useToast();
@@ -96,13 +96,19 @@ const HalamanTambah = () => {
       const result = CSVDataValidator.safeParse(records);
 
       if (!result.success) {
-        const error = JSON.parse(result.error.message) as StateZodErr;
+        const error = JSON.parse(result.error.message) as StateZodErr['error'];
 
-        setErr(error);
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        const dataOfError = error.map(d => records[d.path[0]])
+
+        setErr({ error, dataOfError: dataOfError as StateZodErr['dataOfError'] });
 
         return onOpen();
       }
 
+      console.log(result.data)
+
       insertManyMutation.mutate(result.data);
     });
   };
@@ -196,9 +202,11 @@ const HalamanTambah = () => {
             </Text>
 
             <UnorderedList>
-              {errors?.map((error, idx) => (
+              {errors?.error.map((error, idx) => (
                 <ListItem key={idx}>
-                  Kolom {error.path[1]} baris ke {(error.path[0] as number) + 1}
+                  {/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */}
+                  {/** @ts-ignore */}
+                  Kolom {error.path[1]} data {JSON.stringify(errors.dataOfError[idx][error.path[1]])}
                   . {error.message}
                 </ListItem>
               ))}

diff --git a/packages/config/schema/admin.participant.schema.ts b/packages/config/schema/admin.participant.schema.ts
@@ -5,7 +5,7 @@ import { validateId } from "@sora/id-generator";
 const baseNameSchema = z
   .string()
   .min(1, { message: "Diperlukan nama peserta!" })
-  .regex(/^[a-zA-Z0-9.,'\s]+$/, {
+  .regex(/^[a-zA-Z0-9.,'\s`-]+$/, {
     message:
       "Hanya diperbolehkan menulis alfabet, angka, koma, petik satu, dan titik!",
   });