From 817107ed9314ecf8cc229bfc277639459da0aa12 Mon Sep 17 00:00:00 2001 From: lydiacho Date: Tue, 31 Dec 2024 22:54:45 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20home=20=ED=8C=8C=ED=8A=B8=EB=B3=84?= =?UTF-8?q?=20=EC=86=8C=EA=B0=9C=20validation=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/org/OrgAdmin/index.tsx | 17 ++++++++++++++++- src/components/org/OrgAdmin/utils.ts | 21 +++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/src/components/org/OrgAdmin/index.tsx b/src/components/org/OrgAdmin/index.tsx index 4950681..98b69fb 100644 --- a/src/components/org/OrgAdmin/index.tsx +++ b/src/components/org/OrgAdmin/index.tsx @@ -22,6 +22,7 @@ import type { Group } from './types'; import { validationAboutInputs, validationCommonInputs, + validationHomeInputs, validationRecruitInputs, } from './utils'; @@ -74,9 +75,14 @@ function OrgAdmin() { setIntroPart(part); }; + const handleValidateHomeInputs = () => + validationHomeInputs(getValues, setError, onChangeIntroPart); + const onSubmit: SubmitHandler = (data) => { const handleValidateCommonInputs = () => validationCommonInputs(getValues, setError, setGroup); + const handleValidateHomeInputs = () => + validationHomeInputs(getValues, setError, onChangeIntroPart); const handleValidationAboutInputs = () => validationAboutInputs( getValues, @@ -94,19 +100,27 @@ function OrgAdmin() { const validationFlow = { 공통: [ + handleValidateCommonInputs, + handleValidateHomeInputs, + handleValidationAboutInputs, + handleValidationRecruitInputs, + ], + 홈: [ + handleValidateHomeInputs, handleValidateCommonInputs, handleValidationAboutInputs, handleValidationRecruitInputs, ], - 홈: [], 소개: [ handleValidationAboutInputs, handleValidateCommonInputs, + handleValidateHomeInputs, handleValidationRecruitInputs, ], 지원하기: [ handleValidationRecruitInputs, handleValidateCommonInputs, + handleValidateHomeInputs, handleValidationAboutInputs, ], }; @@ -117,6 +131,7 @@ function OrgAdmin() { if (validateFn === handleValidateCommonInputs) return '공통'; if (validateFn === handleValidationAboutInputs) return '소개'; if (validateFn === handleValidationRecruitInputs) return '지원하기'; + if (validateFn === handleValidateHomeInputs) return '홈'; return '공통'; }; diff --git a/src/components/org/OrgAdmin/utils.ts b/src/components/org/OrgAdmin/utils.ts index 8b11332..ef76331 100644 --- a/src/components/org/OrgAdmin/utils.ts +++ b/src/components/org/OrgAdmin/utils.ts @@ -56,6 +56,27 @@ export const validationCommonInputs = ( return true; }; +export const validationHomeInputs = ( + getValues: (payload?: string | string[]) => FieldValues, + setError: (name: string, error: { type: string; message: string }) => void, + onChangeIntroPart: (part: PART_KO) => void, +) => { + for (const part of PART_LIST) { + const name = `partIntroduction${part}`; + const data = getValues(name); + if (!data) { + console.log(part, data); + setError(name, { + type: 'required', + message: VALIDATION_CHECK.required.errorText, + }); + onChangeIntroPart(part); + return false; + } + } + return true; +}; + export const validationAboutInputs = ( getValues: (payload?: string | string[]) => FieldValues, setError: (name: string, error: { type: string; message: string }) => void, From 9c5c25137ae3e4c01cf781d39b9807176589fbd2 Mon Sep 17 00:00:00 2001 From: lydiacho Date: Tue, 31 Dec 2024 22:56:18 +0900 Subject: [PATCH 2/3] =?UTF-8?q?chore:=20test=EC=9A=A9=20=EC=BD=94=EB=93=9C?= =?UTF-8?q?=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/org/OrgAdmin/index.tsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/components/org/OrgAdmin/index.tsx b/src/components/org/OrgAdmin/index.tsx index 98b69fb..86c77b1 100644 --- a/src/components/org/OrgAdmin/index.tsx +++ b/src/components/org/OrgAdmin/index.tsx @@ -75,9 +75,6 @@ function OrgAdmin() { setIntroPart(part); }; - const handleValidateHomeInputs = () => - validationHomeInputs(getValues, setError, onChangeIntroPart); - const onSubmit: SubmitHandler = (data) => { const handleValidateCommonInputs = () => validationCommonInputs(getValues, setError, setGroup); From 9a2c676ab1c63fc236f1726d9be4c5621cef1a64 Mon Sep 17 00:00:00 2001 From: lydiacho Date: Tue, 31 Dec 2024 22:57:17 +0900 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20console=20log=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/org/OrgAdmin/utils.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/org/OrgAdmin/utils.ts b/src/components/org/OrgAdmin/utils.ts index ef76331..b8a181a 100644 --- a/src/components/org/OrgAdmin/utils.ts +++ b/src/components/org/OrgAdmin/utils.ts @@ -65,7 +65,6 @@ export const validationHomeInputs = ( const name = `partIntroduction${part}`; const data = getValues(name); if (!data) { - console.log(part, data); setError(name, { type: 'required', message: VALIDATION_CHECK.required.errorText,