Skip to content

Commit 73852d0

Browse files
committed
fix
1 parent 0e135ab commit 73852d0

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

src/components/Dialogs/CreateWorkspaceDialogContainer.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import {validationSchemaProjectWorkspace} from "../../lib/api/validations/schema
2020

2121
export type CreateDialogProps = {
2222
name: string,
23-
displayName: string,
24-
chargingTarget: string,
25-
members: Member[],
23+
displayName?: string,
24+
chargingTarget?: string,
25+
members: [Member, ...Member[]],
2626
}
2727

2828

@@ -47,7 +47,6 @@ export function CreateWorkspaceDialogContainer({
4747
formState: { errors },
4848
watch
4949
} = useForm<CreateDialogProps>({
50-
// @ts-ignore
5150
resolver: zodResolver(validationSchemaProjectWorkspace),
5251
defaultValues: {
5352
name: "",

src/lib/api/validations/schemas.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
import {z} from "zod";
2-
import {MemberRoles} from "../types/shared/members.ts";
2+
import { Member } from '../types/shared/members.ts';
33
import i18n from '../../../../i18n.ts'
44

55

66

77

88

99
const { t } = i18n;
10-
export const MemberSchema = z.object({
11-
kind: z.string().min(1, t("validationErrors.required")),
12-
name: z.string().min(1, t("validationErrors.required")),
13-
roles: z.array(z.nativeEnum(MemberRoles)).min(1, t("validationErrors.required")),
14-
});
10+
11+
12+
const member = z.custom<Member>()
1513

1614
export const validationSchemaProjectWorkspace = z.object({
1715
name: z.string().min(1, t("validationErrors.required")).regex(/^(?!-)[a-zA-Z0-9-]{1,63}(?<!-)(?:\.(?!-)[a-zA-Z0-9-]{1,63}(?<!-))*$/, t("validationErrors.properFormatting")).max(25, t("validationErrors.max25chars")),
1816
displayName: z.string().optional(),
1917
chargingTarget: z.string().optional(),
20-
members: z.array(MemberSchema).nonempty()
18+
members: z.array(member).nonempty()
2119
});

0 commit comments

Comments
 (0)