implemented zod in addWine server action and rewrote the logic for useActionState
All checks were successful
Vercel Preview Deployment / Deploy-Preview (push) Successful in 2m15s
All checks were successful
Vercel Preview Deployment / Deploy-Preview (push) Successful in 2m15s
This commit is contained in:
parent
f76e72db80
commit
10cdf225d9
2
package-lock.json
generated
2
package-lock.json
generated
@ -16,7 +16,7 @@
|
|||||||
"postgres": "^3.4.3",
|
"postgres": "^3.4.3",
|
||||||
"react": "18.2.0",
|
"react": "18.2.0",
|
||||||
"react-dom": "18.2.0",
|
"react-dom": "18.2.0",
|
||||||
"zod": "^3.23.3"
|
"zod": "^3.23.8"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/eslint": "^8.56.2",
|
"@types/eslint": "^8.56.2",
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
"postgres": "^3.4.3",
|
"postgres": "^3.4.3",
|
||||||
"react": "18.2.0",
|
"react": "18.2.0",
|
||||||
"react-dom": "18.2.0",
|
"react-dom": "18.2.0",
|
||||||
"zod": "^3.23.3"
|
"zod": "^3.23.8"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/eslint": "^8.56.2",
|
"@types/eslint": "^8.56.2",
|
||||||
|
@ -1,11 +1,9 @@
|
|||||||
'use server'
|
'use server'
|
||||||
|
import { ZodError, z } from 'zod';
|
||||||
import { db } from '../db/index'
|
import { db } from '../db/index'
|
||||||
import { wines } from '../db/schema'
|
import { wines } from '../db/schema'
|
||||||
|
|
||||||
type Wine = {
|
type NewWine = typeof wines.$inferInsert;
|
||||||
name: string;
|
|
||||||
producer: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export type InsertResult = {
|
export type InsertResult = {
|
||||||
name: string;
|
name: string;
|
||||||
@ -13,14 +11,56 @@ export type InsertResult = {
|
|||||||
id: string;
|
id: string;
|
||||||
createdAt: Date;
|
createdAt: Date;
|
||||||
updatedAt: Date | null;
|
updatedAt: Date | null;
|
||||||
}[];
|
|
||||||
|
|
||||||
export const addWine = async (wine: Wine): Promise<InsertResult> => {
|
}[];
|
||||||
const { name, producer } = wine;
|
export type Fields = {
|
||||||
const response = await db.insert(wines).values({
|
name: FormDataEntryValue | null
|
||||||
producer: producer,
|
producer: FormDataEntryValue | null;
|
||||||
name: name,
|
}
|
||||||
})
|
|
||||||
.returning();
|
export type FormState = {
|
||||||
return response;
|
message: string;
|
||||||
};
|
errors: Record<keyof Fields, string> | undefined;
|
||||||
|
fieldValues: NewWine;
|
||||||
|
}
|
||||||
|
|
||||||
|
const schema = z.object({
|
||||||
|
name: z.string(),
|
||||||
|
producer: z.string().uuid(),
|
||||||
|
})
|
||||||
|
|
||||||
|
export const addWine = async (
|
||||||
|
prevState: FormState,
|
||||||
|
formData: FormData): Promise<FormState> => {
|
||||||
|
const newWine: NewWine = {
|
||||||
|
name: formData.get('name') as string,
|
||||||
|
producer: formData.get('producer') as string
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
schema.parse(newWine)
|
||||||
|
|
||||||
|
const response = await db.insert(wines).values(newWine);
|
||||||
|
return {
|
||||||
|
message: `success fully added ${response}`,
|
||||||
|
errors: undefined,
|
||||||
|
fieldValues: {
|
||||||
|
name: "",
|
||||||
|
producer: ""
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
const zodError = error as ZodError;
|
||||||
|
const errorMap = zodError.flatten().fieldErrors;
|
||||||
|
return {
|
||||||
|
message: "error",
|
||||||
|
errors: {
|
||||||
|
name: errorMap["name"]?.[0] ?? "",
|
||||||
|
producer: errorMap["producer"]?.[0] ?? ""
|
||||||
|
},
|
||||||
|
fieldValues: {
|
||||||
|
name: newWine.name,
|
||||||
|
producer: newWine.producer
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user