From 5a1060483a31dfb1f42145e12f6e6a6f335b9577 Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Thu, 7 Sep 2023 04:05:54 +0000 Subject: [PATCH 01/12] Updated components/edit-member.tsx --- components/edit-member.tsx | 186 +++++++++++++++++++------------------ 1 file changed, 94 insertions(+), 92 deletions(-) diff --git a/components/edit-member.tsx b/components/edit-member.tsx index 95aabef..766404b 100644 --- a/components/edit-member.tsx +++ b/components/edit-member.tsx @@ -76,7 +76,7 @@ export default function EditMemberForm({ if (error) { console.error("Error fetching member groups:", error); } else { - console.log("member groups", data); + // console.log("member groups", data); setMemberGroups(data); } } @@ -106,81 +106,83 @@ export default function EditMemberForm({ } }, [existingGroups]); - console.log("Select", selectedGroups); - console.log("EIT", existingGroups); + // console.log("Select", selectedGroups); + // console.log("EIT", existingGroups); const existingGroupIds = existingGroups ? existingGroups.split(",") : []; - console.log("existingIDs", existingGroupIds); + // console.log("existingIDs", existingGroupIds); async function onSubmit(data: MemberFormValues) { - const { - data: { user }, - } = await supabase.auth.getUser(); - - let groupIds = []; - - // Delete all existing associations for the member - const { error: deleteError } = await supabase + const { + data: { user }, + } = await supabase.auth.getUser(); + + let groupIds = []; + + // Delete all existing associations for the member + const { error: deleteError } = await supabase .from("member_group_joins") .delete() .eq("member_id", member.id); - if (deleteError) { + if (deleteError) { console.error("Error deleting existing associations:", deleteError); - } - - // Get the IDs of the selected groups that already exist in memberGroups - // Get the IDs of the selected groups that already exist in memberGroups - const existingGroupIds = selectedGroups - ?.filter((group) => - memberGroups?.map(({ name }) => name).includes(group.value) + } + + // Get the IDs of the selected groups that already exist in memberGroups + // Get the IDs of the selected groups that already exist in memberGroups + const existingGroupIds = selectedGroups + ?.filter( + (group) => memberGroups?.map(({ name }) => name).includes(group.value), + ) + .map( + (group) => memberGroups.find(({ name }) => name === group.value)?.id, + ); + + // Add the IDs of the existing groups to groupIds + + // Save new groups - if the member group doesn't hold any of the selected groups + const newGroups = + selectedGroups + ?.filter( + (group) => + !memberGroups?.map(({ name }) => name).includes(group.value), ) - .map((group) => memberGroups.find(({ name }) => name === group.value)?.id); - - // Add the IDs of the existing groups to groupIds - - // Save new groups - if the member group doesn't hold any of the selected groups - const newGroups = - selectedGroups - ?.filter( - (group) => - !memberGroups?.map(({ name }) => name).includes(group.value) - ) - .map(({ value }) => value) || []; - - //Creating a new group if there are elements in the newgroup array - if (!!newGroups.length) { - const groupResponse = await supabase - .from("member_groups") - .insert(newGroups.map((name) => ({ name }))) - .select(); - console.log("gr", groupResponse); - const { data: createdGroups, error: createGroupError } = groupResponse; - console.log("created groups", createdGroups); - if (createGroupError) { - console.error("Error creating new group:", createGroupError); - } else { - if (Array.isArray(createdGroups) && createdGroups.length > 0) { - groupIds = createdGroups.map(({ id }) => id); - } + .map(({ value }) => value) || []; + + //Creating a new group if there are elements in the newgroup array + if (!!newGroups.length) { + const groupResponse = await supabase + .from("member_groups") + .insert(newGroups.map((name) => ({ name }))) + .select(); + console.log("gr", groupResponse); + const { data: createdGroups, error: createGroupError } = groupResponse; + console.log("created groups", createdGroups); + if (createGroupError) { + console.error("Error creating new group:", createGroupError); + } else { + if (Array.isArray(createdGroups) && createdGroups.length > 0) { + groupIds = createdGroups.map(({ id }) => id); } - } - - try { - const updates = { - email: data.email, - first_name: data.first_name, - last_name: data.last_name, - created_by: user?.id, - }; - - const selectedGroupIds = selectedGroups - ? selectedGroups.map((group) => group.value) - : []; - - console.log("SId", selectedGroupIds); - - if (!!selectedGroups?.length && member.id) { - // Insert new associations - const joinUpdates = selectedGroups + } + } + + try { + const updates = { + email: data.email, + first_name: data.first_name, + last_name: data.last_name, + created_by: user?.id, + }; + + const selectedGroupIds = selectedGroups + ? selectedGroups.map((group) => group.value) + : []; + + // console.log("SId", selectedGroupIds); + + if (!!selectedGroups?.length && member.id) { + // Insert new associations + const joinUpdates = selectedGroups ?.map((group) => memberGroups.find((g) => g.name === group.value)?.id) .concat(groupIds) .filter((id) => id !== undefined) @@ -188,41 +190,41 @@ export default function EditMemberForm({ member_id: member.id, group_id: memberGroupId, })); - - const { error: joinError } = await supabase - .from("member_group_joins") - .insert(joinUpdates); - if (joinError) { - console.error("Error updating member_group_joins:", joinError); - } - } - let { error } = await supabase - .from("members") - .update(updates) - .eq("id", member.id); - if (error) { - toast({ - description: "An error occurred while updating the member", - }); - } else { - toast({ - description: "Your member has been updated", - }); - router.refresh(); + + const { error: joinError } = await supabase + .from("member_group_joins") + .insert(joinUpdates); + if (joinError) { + console.error("Error updating member_group_joins:", joinError); } - } catch (error) { + } + let { error } = await supabase + .from("members") + .update(updates) + .eq("id", member.id); + if (error) { toast({ description: "An error occurred while updating the member", }); + } else { + toast({ + description: "Your member has been updated", + }); + router.refresh(); } + } catch (error) { + toast({ + description: "An error occurred while updating the member", + }); } + } // React.useEffect(() => { // async function fetchMemberGroups() { // const { data, error } = await supabase.from("member_groups").select(); // if (error) { - // console.error("Error fetching member groups:", error); - // } else { + // console.log("gr", groupResponse); + // console.log("created groups", createdGroups); // console.log("member groups", data); // setMemberGroups(data); // } @@ -314,7 +316,7 @@ export default function EditMemberForm({ }))} value={selectedGroups} onChange={(value) => { - console.log("creatable value", value); + // console.log("creatable value", value); setSelectedGroups(value); }} /> From 926f1fc592e96c0f4fb0b78afdfdcfe25d19f5e9 Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Thu, 7 Sep 2023 04:07:08 +0000 Subject: [PATCH 02/12] Updated components/add-member.tsx --- components/add-member.tsx | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/components/add-member.tsx b/components/add-member.tsx index 4a147d3..fb7724a 100644 --- a/components/add-member.tsx +++ b/components/add-member.tsx @@ -67,7 +67,7 @@ export default function AddMemberForm({ user }: { user: any }) { if (error) { console.error("Error fetching member groups:", error); } else { - console.log("member groups", data); + // console.log("member groups", data); setSelectedGroups(null); setMemberGroups(data); } @@ -81,8 +81,8 @@ export default function AddMemberForm({ user }: { user: any }) { } async function onSubmit(data: MemberFormValues) { - console.log("DATA", selectedGroups); - try { + // console.log("gr", groupResponse); + // console.log("created groups", createdGroups); // Get the IDs of the selected groups that already exist in memberGroups const existingGroupIds = selectedGroups ?.filter((group) => @@ -96,7 +96,8 @@ export default function AddMemberForm({ user }: { user: any }) { // groupIds = groupIds.concat(existingGroupIds); // Add the IDs of the existing groups to groupIds - console.log("memberGroups", memberGroups); + // console.log("memberGroups", memberGroups); + // console.log("newgroups", newGroups); // Check if the selectedGroups exists in memberGroups const newGroups = selectedGroups @@ -147,7 +148,7 @@ export default function AddMemberForm({ user }: { user: any }) { } const memberID = newMember[0].id; - console.log("SELECT", selectedGroups); + // console.log("SELECT", selectedGroups); // Update the joins table to associate the member with the group if (!!selectedGroups?.length && memberID) { @@ -180,7 +181,7 @@ export default function AddMemberForm({ user }: { user: any }) { setSubmitted(true); router.refresh(); } catch (error) { - console.log(error); + // console.log(error); } } @@ -273,7 +274,7 @@ export default function AddMemberForm({ user }: { user: any }) { }))} // Convert memberGroups to options value={selectedGroups} onChange={(value) => { - console.log("creatable value", value); + // console.log("creatable value", value); setSelectedGroups(value); }} /> From 7a21efadff5bd8b4efc296662b80150646db6b06 Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 03:10:00 +0000 Subject: [PATCH 03/12] feat: Updated components/add-member.tsx --- components/add-member.tsx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/components/add-member.tsx b/components/add-member.tsx index fb7724a..426382b 100644 --- a/components/add-member.tsx +++ b/components/add-member.tsx @@ -67,7 +67,7 @@ export default function AddMemberForm({ user }: { user: any }) { if (error) { console.error("Error fetching member groups:", error); } else { - // console.log("member groups", data); + setSelectedGroups(null); setMemberGroups(data); } @@ -81,8 +81,7 @@ export default function AddMemberForm({ user }: { user: any }) { } async function onSubmit(data: MemberFormValues) { - // console.log("gr", groupResponse); - // console.log("created groups", createdGroups); + // Get the IDs of the selected groups that already exist in memberGroups const existingGroupIds = selectedGroups ?.filter((group) => @@ -107,7 +106,7 @@ export default function AddMemberForm({ user }: { user: any }) { ) .map(({ value }) => value) || []; - console.log("newgroups", newGroups); + // groupIds = selectedGroups?.map((group) => group.value); @@ -118,7 +117,7 @@ export default function AddMemberForm({ user }: { user: any }) { .from("member_groups") .insert(newGroups.map((name) => ({ name, created_by: user.id }))) .select(); - console.log("gr", groupResponse); + const { data: createdGroups, error: createGroupError } = groupResponse; console.log("created groups", createdGroups); if (createGroupError) { @@ -148,7 +147,7 @@ export default function AddMemberForm({ user }: { user: any }) { } const memberID = newMember[0].id; - // console.log("SELECT", selectedGroups); + // Update the joins table to associate the member with the group if (!!selectedGroups?.length && memberID) { @@ -181,7 +180,7 @@ export default function AddMemberForm({ user }: { user: any }) { setSubmitted(true); router.refresh(); } catch (error) { - // console.log(error); + } } From 25624b479ec547fe9d145df1c1eaa2d20d9885e8 Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 03:12:03 +0000 Subject: [PATCH 04/12] feat: Updated components/add-member.tsx --- components/add-member.tsx | 109 +++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 55 deletions(-) diff --git a/components/add-member.tsx b/components/add-member.tsx index 426382b..d5bdc1a 100644 --- a/components/add-member.tsx +++ b/components/add-member.tsx @@ -60,77 +60,76 @@ export default function AddMemberForm({ user }: { user: any }) { React.useEffect(() => { async function fetchMemberGroups() { - const { data, error } = await supabase - .from("member_groups") - .select() - .eq("created_by", user.id); - if (error) { + try { + const { data, error } = await supabase + .from("member_groups") + .select() + .eq("created_by", user.id); + if (error) { + console.error("Error fetching member groups:", error); + } else { + + setSelectedGroups(null); + setMemberGroups(data); + } + } catch (error) { console.error("Error fetching member groups:", error); - } else { - - setSelectedGroups(null); - setMemberGroups(data); } - } - fetchMemberGroups(); - }, [supabase, submitted]); + fetchMemberGroups(); + }, [supabase, submitted]); - interface MemberGroup { - id: number; - name: string; - } + interface MemberGroup { + id: number; + name: string; + } - async function onSubmit(data: MemberFormValues) { - - // Get the IDs of the selected groups that already exist in memberGroups - const existingGroupIds = selectedGroups - ?.filter((group) => - memberGroups?.map(({ name }) => name).includes(group.value) - ) - .map( - (group) => memberGroups.find(({ name }) => name === group.value)?.id - ); + async function onSubmit(data: MemberFormValues) { + try { + // Get the IDs of the selected groups that already exist in memberGroups + const existingGroupIds = selectedGroups + ?.filter((group) => + memberGroups?.map(({ name }) => name).includes(group.value) + ) + .map( + (group) => memberGroups.find(({ name }) => name === group.value)?.id + ); - // let groupIds = []; - // groupIds = groupIds.concat(existingGroupIds); + // let groupIds = []; + // groupIds = groupIds.concat(existingGroupIds); - // Add the IDs of the existing groups to groupIds - // console.log("memberGroups", memberGroups); - // console.log("newgroups", newGroups); - // Check if the selectedGroups exists in memberGroups - const newGroups = - selectedGroups + // Add the IDs of the existing groups to groupIds + // console.log("memberGroups", memberGroups); + // console.log("newgroups", newGroups); + // Check if the selectedGroups exists in memberGroups + const newGroups = ?.filter( (group) => !memberGroups?.map(({ name }) => name).includes(group.value) ) .map(({ value }) => value) || []; - - - // groupIds = selectedGroups?.map((group) => group.value); + // groupIds = selectedGroups?.map((group) => group.value); - // If selectedGroups doesn't exist, create a new group - let groupIds = []; - if (!!newGroups.length) { - const groupResponse = await supabase - .from("member_groups") - .insert(newGroups.map((name) => ({ name, created_by: user.id }))) - .select(); - - const { data: createdGroups, error: createGroupError } = groupResponse; - console.log("created groups", createdGroups); - if (createGroupError) { - console.error("Error creating new group:", createGroupError); - } else { - if (Array.isArray(createdGroups) && createdGroups.length > 0) { - groupIds = createdGroups.map(({ id }) => id); + // If selectedGroups doesn't exist, create a new group + let groupIds = []; + if (!!newGroups.length) { + .from("member_groups") + .insert(newGroups.map((name) => ({ name, created_by: user.id }))) + .select(); + + const { data: createdGroups, error: createGroupError } = groupResponse; + console.log("created groups", createdGroups); + if (createGroupError) { + console.error("Error creating new group:", createGroupError); + } else { + if (Array.isArray(createdGroups) && createdGroups.length > 0) { + groupIds = createdGroups.map(({ id }) => id); + } } } - } - // Create the new member - const memberUpdates = { + // Create the new member + const memberUpdates = { email: data.email, first_name: data.first_name, last_name: data.last_name, From ac459eed644546f63c0059fb164ebe5c821ae2f6 Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 03:13:34 +0000 Subject: [PATCH 05/12] feat: Updated components/edit-member.tsx --- components/edit-member.tsx | 6 ------ 1 file changed, 6 deletions(-) diff --git a/components/edit-member.tsx b/components/edit-member.tsx index 766404b..6103b8e 100644 --- a/components/edit-member.tsx +++ b/components/edit-member.tsx @@ -76,7 +76,6 @@ export default function EditMemberForm({ if (error) { console.error("Error fetching member groups:", error); } else { - // console.log("member groups", data); setMemberGroups(data); } } @@ -106,8 +105,6 @@ export default function EditMemberForm({ } }, [existingGroups]); - // console.log("Select", selectedGroups); - // console.log("EIT", existingGroups); const existingGroupIds = existingGroups ? existingGroups.split(",") : []; // console.log("existingIDs", existingGroupIds); @@ -129,7 +126,6 @@ export default function EditMemberForm({ // Get the IDs of the selected groups that already exist in memberGroups // Get the IDs of the selected groups that already exist in memberGroups - const existingGroupIds = selectedGroups ?.filter( (group) => memberGroups?.map(({ name }) => name).includes(group.value), ) @@ -154,7 +150,6 @@ export default function EditMemberForm({ .from("member_groups") .insert(newGroups.map((name) => ({ name }))) .select(); - console.log("gr", groupResponse); const { data: createdGroups, error: createGroupError } = groupResponse; console.log("created groups", createdGroups); if (createGroupError) { @@ -178,7 +173,6 @@ export default function EditMemberForm({ ? selectedGroups.map((group) => group.value) : []; - // console.log("SId", selectedGroupIds); if (!!selectedGroups?.length && member.id) { // Insert new associations From 957e026f6462f22dabe510a76dc0a8005e2bc9a3 Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 03:14:29 +0000 Subject: [PATCH 06/12] feat: Updated components/add-member.tsx --- components/add-member.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/components/add-member.tsx b/components/add-member.tsx index d5bdc1a..34c4ae4 100644 --- a/components/add-member.tsx +++ b/components/add-member.tsx @@ -68,7 +68,6 @@ export default function AddMemberForm({ user }: { user: any }) { if (error) { console.error("Error fetching member groups:", error); } else { - setSelectedGroups(null); setMemberGroups(data); } From 01050690daa08335281d3fc72ebaba1f8cec6cd6 Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 03:14:32 +0000 Subject: [PATCH 07/12] feat: Updated components/add-member.tsx --- components/add-member.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/add-member.tsx b/components/add-member.tsx index 34c4ae4..a77a483 100644 --- a/components/add-member.tsx +++ b/components/add-member.tsx @@ -68,6 +68,7 @@ export default function AddMemberForm({ user }: { user: any }) { if (error) { console.error("Error fetching member groups:", error); } else { + setSelectedGroups(null); setMemberGroups(data); } @@ -97,8 +98,7 @@ export default function AddMemberForm({ user }: { user: any }) { // groupIds = groupIds.concat(existingGroupIds); // Add the IDs of the existing groups to groupIds - // console.log("memberGroups", memberGroups); - // console.log("newgroups", newGroups); + // Removed console.log statements // Check if the selectedGroups exists in memberGroups const newGroups = ?.filter( From 40e46ac34823079a6121f3dc9dcccaaf76c910f1 Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 03:14:35 +0000 Subject: [PATCH 08/12] feat: Updated components/add-member.tsx --- components/add-member.tsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/components/add-member.tsx b/components/add-member.tsx index a77a483..62ed4ee 100644 --- a/components/add-member.tsx +++ b/components/add-member.tsx @@ -98,14 +98,13 @@ export default function AddMemberForm({ user }: { user: any }) { // groupIds = groupIds.concat(existingGroupIds); // Add the IDs of the existing groups to groupIds - // Removed console.log statements + // console.log("memberGroups", memberGroups); + // console.log("newgroups", newGroups); // Check if the selectedGroups exists in memberGroups - const newGroups = - ?.filter( + const newGroups = selectedGroups?.filter( (group) => !memberGroups?.map(({ name }) => name).includes(group.value) - ) - .map(({ value }) => value) || []; + ).map(({ value }) => value) || []; // groupIds = selectedGroups?.map((group) => group.value); From 2684c7ee987f3760396e61592f753d2f89328b3e Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 03:14:40 +0000 Subject: [PATCH 09/12] feat: Updated components/add-member.tsx --- components/add-member.tsx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/components/add-member.tsx b/components/add-member.tsx index 62ed4ee..7511653 100644 --- a/components/add-member.tsx +++ b/components/add-member.tsx @@ -75,7 +75,11 @@ export default function AddMemberForm({ user }: { user: any }) { } catch (error) { console.error("Error fetching member groups:", error); } - fetchMemberGroups(); + try { + fetchMemberGroups(); + } catch (error) { + console.error("Error fetching member groups:", error); + } }, [supabase, submitted]); interface MemberGroup { @@ -101,10 +105,12 @@ export default function AddMemberForm({ user }: { user: any }) { // console.log("memberGroups", memberGroups); // console.log("newgroups", newGroups); // Check if the selectedGroups exists in memberGroups - const newGroups = selectedGroups?.filter( + const newGroups = + ?.filter( (group) => !memberGroups?.map(({ name }) => name).includes(group.value) - ).map(({ value }) => value) || []; + ) + .map(({ value }) => value) || []; // groupIds = selectedGroups?.map((group) => group.value); From 8ff31cfc6bff4dfc3060d7ac03c432ee367971bb Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 03:14:59 +0000 Subject: [PATCH 10/12] feat: Updated components/add-member.tsx --- components/add-member.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/add-member.tsx b/components/add-member.tsx index 7511653..a0ba0b9 100644 --- a/components/add-member.tsx +++ b/components/add-member.tsx @@ -180,8 +180,7 @@ export default function AddMemberForm({ user }: { user: any }) { toast({ description: "Your member has been added", }); - setSubmitted(true); - router.refresh(); + setSubmitted(true); router.refresh(); } catch (error) { } From 3ed340fb2439993e0e0ac681c1b8b98884e333dd Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 03:15:17 +0000 Subject: [PATCH 11/12] feat: Updated components/add-member.tsx --- components/add-member.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/add-member.tsx b/components/add-member.tsx index a0ba0b9..2bfcca4 100644 --- a/components/add-member.tsx +++ b/components/add-member.tsx @@ -147,8 +147,7 @@ export default function AddMemberForm({ user }: { user: any }) { .select(); if (memberError) { throw memberError; - } - const memberID = newMember[0].id; + } const memberID = newMember[0].id; From 5f1f91b37000b3501fbf28540b58cb25fcb23e4a Mon Sep 17 00:00:00 2001 From: "sweep-ai[bot]" <128439645+sweep-ai[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 03:29:18 +0000 Subject: [PATCH 12/12] feat: Updated components/add-member.tsx --- components/add-member.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/components/add-member.tsx b/components/add-member.tsx index 2bfcca4..4040440 100644 --- a/components/add-member.tsx +++ b/components/add-member.tsx @@ -75,11 +75,7 @@ export default function AddMemberForm({ user }: { user: any }) { } catch (error) { console.error("Error fetching member groups:", error); } - try { - fetchMemberGroups(); - } catch (error) { - console.error("Error fetching member groups:", error); - } + fetchMemberGroups(); }, [supabase, submitted]); interface MemberGroup {