From dd8ac3acdb33e4381e5be45c795de46bf8021f30 Mon Sep 17 00:00:00 2001 From: JaneMoroz Date: Sun, 8 Sep 2024 22:31:45 +0300 Subject: [PATCH 1/6] fix: make meeting link optional --- .../[teamId]/sprints/components/forms/MeetingForm.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/(main)/my-voyage/[teamId]/sprints/components/forms/MeetingForm.tsx b/src/app/(main)/my-voyage/[teamId]/sprints/components/forms/MeetingForm.tsx index 503efb016..91015aa6f 100644 --- a/src/app/(main)/my-voyage/[teamId]/sprints/components/forms/MeetingForm.tsx +++ b/src/app/(main)/my-voyage/[teamId]/sprints/components/forms/MeetingForm.tsx @@ -70,8 +70,7 @@ export default function MeetingForm() { timezone, }), meetingLink: validateTextInput({ - inputName: "Meeting Link", - required: true, + inputName: "Meeting link", isUrl: true, }), }); From 9fa811287f1d05076f359f062fde702f0692454a Mon Sep 17 00:00:00 2001 From: Daniel Ko Date: Tue, 10 Sep 2024 20:32:42 -0400 Subject: [PATCH 2/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 065189105..024f291fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/). ### Changed -- Updated how we're retrieving the discord id to display in the directory page +- Updated how we're retrieving the discord id to display in the directory page https://github.com/chingu-x/chingu-dashboard/issues/202 ### Fixed From e947f3205415f0c86d13e68d36f7d44b0ae4bb0f Mon Sep 17 00:00:00 2001 From: Jane Moroz Date: Wed, 18 Sep 2024 11:45:55 +0300 Subject: [PATCH 3/6] fix: update data send when meetingLink is '' --- .../sprints/components/forms/MeetingForm.tsx | 13 +++++++++++-- .../components/meetingOverview/MeetingOverview.tsx | 1 + .../my-voyage/[teamId]/sprints/sprintsService.ts | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/app/(main)/my-voyage/[teamId]/sprints/components/forms/MeetingForm.tsx b/src/app/(main)/my-voyage/[teamId]/sprints/components/forms/MeetingForm.tsx index 91015aa6f..4b7e300c9 100644 --- a/src/app/(main)/my-voyage/[teamId]/sprints/components/forms/MeetingForm.tsx +++ b/src/app/(main)/my-voyage/[teamId]/sprints/components/forms/MeetingForm.tsx @@ -116,9 +116,18 @@ export default function MeetingForm() { timeZone: timezone, }); + const newData = + data.meetingLink === "" + ? { description: data.description, title: data.title } + : { + description: data.description, + title: data.title, + meetingLink: data.meetingLink, + }; + if (editMode) { const [res, error] = await editMeetingAction({ - ...data, + ...newData, dateTime, meetingId, sprintNumber, @@ -142,7 +151,7 @@ export default function MeetingForm() { setEditMeetingLoading(false); } } else { - const payload = { ...data, dateTime, teamId, sprintNumber }; + const payload = { ...newData, dateTime, teamId, sprintNumber }; const [res, error] = await addMeetingAction(payload); diff --git a/src/app/(main)/my-voyage/[teamId]/sprints/components/meetingOverview/MeetingOverview.tsx b/src/app/(main)/my-voyage/[teamId]/sprints/components/meetingOverview/MeetingOverview.tsx index 6b66806da..b2103cbea 100644 --- a/src/app/(main)/my-voyage/[teamId]/sprints/components/meetingOverview/MeetingOverview.tsx +++ b/src/app/(main)/my-voyage/[teamId]/sprints/components/meetingOverview/MeetingOverview.tsx @@ -34,6 +34,7 @@ export default function MeetingOverview({ className="w-full" >