From 7339b45ff31c0f2371deda2fac9f42739d9ca759 Mon Sep 17 00:00:00 2001 From: ocahs9 Date: Tue, 12 Nov 2024 01:17:39 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=EB=B3=B8=EC=9D=B8=EC=9D=80=20?= =?UTF-8?q?=EA=B3=B5=EB=8F=99=20=EB=AA=A8=EC=9E=84=EC=9E=A5=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=EC=9D=B4=20=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/list/index.tsx | 1 + src/api/API_LEGACY/meeting/index.ts | 1 - src/components/form/Presentation/CoLeader/index.tsx | 8 ++++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pages/list/index.tsx b/pages/list/index.tsx index e4e24918..78882c76 100644 --- a/pages/list/index.tsx +++ b/pages/list/index.tsx @@ -154,4 +154,5 @@ const SNoticeWrapper = styled('div', { '@tablet': { mt: '$28', }, + }); diff --git a/src/api/API_LEGACY/meeting/index.ts b/src/api/API_LEGACY/meeting/index.ts index bea250f1..493acf72 100644 --- a/src/api/API_LEGACY/meeting/index.ts +++ b/src/api/API_LEGACY/meeting/index.ts @@ -258,7 +258,6 @@ export const createMeeting = async (formData: FormType) => { export const updateMeeting = async (meetingId: string, formData: FormType) => { const response = await api.put(`/meeting/v2/${meetingId}`, serializeFormData(formData)); - return response; }; diff --git a/src/components/form/Presentation/CoLeader/index.tsx b/src/components/form/Presentation/CoLeader/index.tsx index 0d0e386a..9b08bc9c 100644 --- a/src/components/form/Presentation/CoLeader/index.tsx +++ b/src/components/form/Presentation/CoLeader/index.tsx @@ -8,6 +8,7 @@ import { IconXCircle } from '@sopt-makers/icons'; import { useQueryGetMentionUsers } from '@api/user/hooks'; import { fontsObject } from '@sopt-makers/fonts'; import { IconXClose } from '@sopt-makers/icons'; +import { useQueryMyProfile } from '@api/API_LEGACY/user/hooks'; interface CoLeaderFieldProps { value: mentionableDataType[]; @@ -28,7 +29,10 @@ interface mentionableDataType { } const CoLeader = ({ value: coLeaders = [], onChange, error }: CoLeaderFieldProps) => { + const { data: user } = useQueryMyProfile(); const { data: mentionUserList } = useQueryGetMentionUsers(); + //API 연결에서 타입을 지정해두지 않았기 때문에 any 이용 + const filteredMeList = mentionUserList?.filter((mentionUser: any) => mentionUser.userId !== user?.id); const handleUserSelect = (user: mentionableDataType) => { if (coLeaders.length < 3 && !coLeaders.some(leader => leader.id === user.id)) { @@ -87,7 +91,7 @@ const CoLeader = ({ value: coLeaders = [], onChange, error }: CoLeaderFieldProps e.stopPropagation()}> e.stopPropagation()}> Date: Wed, 13 Nov 2024 01:40:53 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=EB=B9=8C=EB=93=9C=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/list/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/pages/list/index.tsx b/pages/list/index.tsx index 78882c76..e4e24918 100644 --- a/pages/list/index.tsx +++ b/pages/list/index.tsx @@ -154,5 +154,4 @@ const SNoticeWrapper = styled('div', { '@tablet': { mt: '$28', }, - }); From c4af49265d6106731fda6d70c2e17056b16164c5 Mon Sep 17 00:00:00 2001 From: ocahs9 Date: Wed, 13 Nov 2024 23:34:31 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=EB=A9=98=EC=85=98=20=EC=9C=A0?= =?UTF-8?q?=EC=A0=80=20=ED=83=80=EC=9E=85=20=EC=A0=95=EC=9D=98(any=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/form/Presentation/CoLeader/index.tsx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/components/form/Presentation/CoLeader/index.tsx b/src/components/form/Presentation/CoLeader/index.tsx index 9b08bc9c..6e05dc50 100644 --- a/src/components/form/Presentation/CoLeader/index.tsx +++ b/src/components/form/Presentation/CoLeader/index.tsx @@ -28,11 +28,20 @@ interface mentionableDataType { userprofileImage?: string; } +interface metionUserType { + userId: number; + orgId: number; + userName: string; + recentPart: string; + recentGeneration: number; + profileImageUrl: string; +} + const CoLeader = ({ value: coLeaders = [], onChange, error }: CoLeaderFieldProps) => { const { data: user } = useQueryMyProfile(); const { data: mentionUserList } = useQueryGetMentionUsers(); //API 연결에서 타입을 지정해두지 않았기 때문에 any 이용 - const filteredMeList = mentionUserList?.filter((mentionUser: any) => mentionUser.userId !== user?.id); + const filteredMeList = mentionUserList?.filter((mentionUser: metionUserType) => mentionUser.userId !== user?.id); const handleUserSelect = (user: mentionableDataType) => { if (coLeaders.length < 3 && !coLeaders.some(leader => leader.id === user.id)) {