added more descriptive error handling of forms #11

Merged
christian merged 2 commits from admin-forms into main 2024-06-03 11:28:35 +00:00
2 changed files with 59 additions and 36 deletions
Showing only changes of commit 325a561b1c - Show all commits

View File

@ -7,7 +7,9 @@ import { ZodError, z } from "zod";
import { eq } from "drizzle-orm";
export async function addCountry(prevstate: any, formData: FormData) {
//assign formdaata to variables.
const name = (formData.get("name") as string).toLowerCase();
//check if country already exists
const exists = await db
.select({ name: countries.name })
.from(countries)
@ -26,10 +28,7 @@ export async function addCountry(prevstate: any, formData: FormData) {
name,
});
//If the name doesn't exist, add the country to the database abd revalidate the page
await db
.insert(countries)
.values({ name })
.returning({ name: countries.name });
await db.insert(countries).values({ name });
revalidatePath("/");
//Return a success message
return {
@ -42,6 +41,7 @@ export async function addCountry(prevstate: any, formData: FormData) {
} catch (error) {
const zodError = error as ZodError;
const errorMap = zodError.flatten().fieldErrors;
//Return an error object with the field values and errors.
return {
message: "error",
errors: {

View File

@ -3,40 +3,63 @@
import { revalidatePath } from "next/cache";
import { db } from "../db";
import { regions } from "../db/schema";
import { z } from "zod";
const schema = z.object({
countryId: z.string().min(1, "No country selected"),
name: z.string().min(1, "Name is required"),
});
import { ZodError, z } from "zod";
import { eq } from "drizzle-orm";
export const addRegion = async (prevstate: any, formData: FormData) => {
const regionData = {
name: (formData.get("name") as string).toLowerCase(),
countryId: formData.get("country") as string,
};
const newRegion = schema.safeParse(regionData);
if (!newRegion.success) {
return {
message: newRegion.error.issues[0]?.message,
data: newRegion.data,
};
}
const confirmedRegion = await db
.insert(regions)
.values(newRegion.data)
.onConflictDoNothing()
.returning({ name: regions.name });
if (!confirmedRegion[0]) {
return {
message: `${newRegion.data.name} already exists`,
data: newRegion.data,
};
} else {
const message = `${newRegion.data.name} added`;
const errors = newRegion.error;
const data = newRegion.data;
//assign formdaata to variables.
const name = (formData.get("name") as string).toLowerCase();
const countryId = formData.get("country") as string;
//check if region already exists in country
const exists = await db
.select({ name: regions.name })
.from(regions)
.where(eq(regions.countryId, countryId) && eq(regions.name, name));
//Define the schema for the form data
const schema = z.object({
countryId: z.string().min(1, "No country selected"),
name: z
.string()
.min(1, "Name is required")
.refine(() => !exists[0], {
message: `${name} already exists in selected country`,
}),
});
//Parse the form data using the schema for validation, and check if the name already exists
try {
schema.parse({
countryId,
name,
});
//If the name doesn't exist, add the country to the database abd revalidate the page
await db.insert(regions).values({ countryId, name });
revalidatePath("/");
return { message, errors, data };
//Return a success message
return {
message: "success",
errors: undefined,
fieldValues: {
name: "",
countryId: "",
},
};
} catch (error) {
const zodError = error as ZodError;
const errorMap = zodError.flatten().fieldErrors;
//Return an error object with the field values and errors.
return {
message: "error",
errors: {
name: errorMap["name"]?.[0] ?? "",
countryId: errorMap["countryId"]?.[0] ?? "",
},
fieldValues: {
name,
countryId,
},
};
}
};