diff --git a/src/components/modals/create-evaluation-modal.tsx b/src/components/modals/create-evaluation-modal.tsx index e6697bb7..22fcdb5a 100644 --- a/src/components/modals/create-evaluation-modal.tsx +++ b/src/components/modals/create-evaluation-modal.tsx @@ -112,7 +112,7 @@ function CreateEvaluationForm({ ?.sort((a, b) => a.orderNum - b.orderNum) .map((grade) => ({ value: grade.code, - label: `${grade.code} (${grade.score})`, + label: `${grade.label} (${grade.score === 0 ? '0' : grade.score.toFixed(1)})`, })); return ( diff --git a/src/components/modals/create-mission-modal.tsx b/src/components/modals/create-mission-modal.tsx index ec1c78d7..2d265e82 100644 --- a/src/components/modals/create-mission-modal.tsx +++ b/src/components/modals/create-mission-modal.tsx @@ -29,12 +29,15 @@ const CreateMissionFormSchema = z.object({ .min(1, '수행 가이드를 입력해주세요.') .max(1000, '1000자 이하로 작성가능합니다.'), dateRange: z - .object({ - from: z.date({ error: '시작일을 선택해주세요.' }), - to: z.date({ error: '종료일을 선택해주세요.' }), - }) + .object( + { + from: z.date({ message: '시작일을 선택해주세요.' }), + to: z.date({ message: '종료일을 선택해주세요.' }), + }, + { message: '시작일과 종료일을 선택해주세요.' }, + ) .refine((data) => data.from && data.to && data.from <= data.to, { - message: '미션이 시작되면 수정 및 삭제가 불가합니다.', + message: '종료일은 시작일 이후여야 합니다.', }), }); diff --git a/src/components/modals/edit-evaluation-modal.tsx b/src/components/modals/edit-evaluation-modal.tsx index 65c18b58..d5728fc3 100644 --- a/src/components/modals/edit-evaluation-modal.tsx +++ b/src/components/modals/edit-evaluation-modal.tsx @@ -122,7 +122,7 @@ function EditEvaluationForm({ ?.sort((a, b) => a.orderNum - b.orderNum) .map((grade) => ({ value: grade.code, - label: `${grade.code} (${grade.score})`, + label: `${grade.label} (${grade.score === 0 ? '0' : grade.score.toFixed(1)})`, })); return ( diff --git a/src/components/modals/edit-mission-modal.tsx b/src/components/modals/edit-mission-modal.tsx index 3b2e668a..aa4ec2a7 100644 --- a/src/components/modals/edit-mission-modal.tsx +++ b/src/components/modals/edit-mission-modal.tsx @@ -28,11 +28,11 @@ const EditMissionFormSchema = z.object({ guide: z.string().min(1, '수행 가이드를 입력해주세요.'), dateRange: z .object({ - from: z.date({ error: '시작일을 선택해주세요.' }), - to: z.date({ error: '종료일을 선택해주세요.' }), + from: z.date({ message: '시작일을 선택해주세요.' }), + to: z.date({ message: '종료일을 선택해주세요.' }), }) .refine((data) => data.from && data.to && data.from <= data.to, { - message: '미션이 시작되면 수정 및 삭제가 불가합니다.', + message: '종료일은 시작일 이후여야 합니다.', }), }); diff --git a/src/components/ui/toggle/group.tsx b/src/components/ui/toggle/group.tsx index be31eb3c..993b59d7 100644 --- a/src/components/ui/toggle/group.tsx +++ b/src/components/ui/toggle/group.tsx @@ -82,7 +82,6 @@ function GroupItems(props: ToggleGroupProps) { role="group" aria-label="toggle-group" > - {} {options?.map(({ value: v, label }) => (