Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

319 replace depreciated nonempty() with min(1) #355

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/types/forms/checkIn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import { zOrganizationResponse } from '../dataModel/organization';
import { zObjectId } from '../dataModel/base';

export const zCheckInFormData = z.object({
firstName: z.string().nonempty('Required'),
lastName: z.string().nonempty('Required'),
email: z.string().email().nonempty('Required'),
phoneNumber: z.string().nonempty('Required'),
address: z.string().nonempty('Required'),
firstName: z.string().min(1, 'Required'),
lastName: z.string().min(1, 'Required'),
email: z.string().email().min(1, 'Required'),
phoneNumber: z.string().min(1, 'Required'),
address: z.string().min(1, 'Required'),
role: zRole,
organization: zOrganizationResponse.optional(),
volunteerId: zObjectId.optional(),
Expand Down
4 changes: 2 additions & 2 deletions src/types/forms/email.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { z } from 'zod';

export const EmailFormData = z.object({
subject: z.string().nonempty('Required'),
emailbody: z.string().nonempty('Required'),
subject: z.string().min(1, 'Required'),
emailbody: z.string().min(1, 'Required'),
});

export interface EmailFormData extends z.infer<typeof EmailFormData> {}
2 changes: 1 addition & 1 deletion src/types/forms/events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const zDayJs = z.custom<Dayjs>((val) => val instanceof dayjs, 'Invalid date');

export const zEventFormData = z
.object({
name: z.string().nonempty('Required'),
name: z.string().min(1, 'Required'),
description: z.string().optional(),
eventLocation: z.string().optional(),
date: zDayJs,
Expand Down
2 changes: 1 addition & 1 deletion src/types/forms/organizations.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { z } from 'zod';

export const zUpsertOrganizationFormData = z.object({
name: z.string().nonempty('Required'),
name: z.string().min(1, 'Required'),
});

export interface UpsertOrganizationFormData
Expand Down
2 changes: 1 addition & 1 deletion src/types/forms/role-verifications.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { zVerifiedRole } from '../dataModel/roles';

export const zUpsertRoleVerificationFormData = z.object({
role: zVerifiedRole,
verifier: z.string().nonempty('Required'),
verifier: z.string().min(1, 'Required'),
});

export interface UpsertRoleVerificationFormData
Expand Down
10 changes: 5 additions & 5 deletions src/types/forms/volunteer.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { z } from 'zod';
// Data Form for create/update Volunteer
export const zUpsertVolunteerFormData = z.object({
firstName: z.string().nonempty('Required'),
lastName: z.string().nonempty('Required'),
email: z.string().email().nonempty('Required'),
phoneNumber: z.string().nonempty('Required'),
address: z.string().nonempty('Required'),
firstName: z.string().min(1, 'Required'),
lastName: z.string().min(1, 'Required'),
email: z.string().email().min(1, 'Required'),
phoneNumber: z.string().min(1, 'Required'),
address: z.string().min(1, 'Required'),
});

export interface UpsertVolunteerFormData
Expand Down
Loading