From 4c7d61e05fa628ceaf5413819c18a2f4caab44c5 Mon Sep 17 00:00:00 2001
From: Starstrike <ryderjj89@outlook.com>
Date: Wed, 30 Apr 2025 12:06:08 -0400
Subject: [PATCH] Fix: Update items status after RSVP submission and improve
 display

---
 frontend/src/components/EventAdmin.tsx |  6 +--
 frontend/src/components/RSVPForm.tsx   | 52 ++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/EventAdmin.tsx b/frontend/src/components/EventAdmin.tsx
index a37ac7c..9b6d811 100644
--- a/frontend/src/components/EventAdmin.tsx
+++ b/frontend/src/components/EventAdmin.tsx
@@ -316,7 +316,7 @@ const EventAdmin: React.FC = () => {
               <Box sx={{ display: 'flex', flexWrap: 'wrap', gap: 1 }}>
                 {neededItems.map((item: string, index: number) => (
                   <Chip
-                    key={index}
+                    key={`${item}-${index}`}
                     label={item}
                     color="primary"
                     variant="outlined"
@@ -336,7 +336,7 @@ const EventAdmin: React.FC = () => {
               <Box sx={{ display: 'flex', flexWrap: 'wrap', gap: 1 }}>
                 {claimedItems.map((item: string, index: number) => (
                   <Chip
-                    key={index}
+                    key={`${item}-${index}`}
                     label={item}
                     color="success"
                   />
@@ -401,7 +401,7 @@ const EventAdmin: React.FC = () => {
                             <Chip
                               key={`${item}-${index}`}
                               label={item}
-                              color="primary"
+                              color="success"
                               size="small"
                             />
                           )) : (
diff --git a/frontend/src/components/RSVPForm.tsx b/frontend/src/components/RSVPForm.tsx
index efc7a94..458923b 100644
--- a/frontend/src/components/RSVPForm.tsx
+++ b/frontend/src/components/RSVPForm.tsx
@@ -143,6 +143,58 @@ const RSVPForm: React.FC = () => {
         items_bringing: JSON.stringify(formData.items_bringing)
       };
       await axios.post(`/api/events/${slug}/rsvp`, submissionData);
+      
+      // Update the needed and claimed items
+      const [eventResponse, rsvpsResponse] = await Promise.all([
+        axios.get(`/api/events/${slug}`),
+        axios.get(`/api/events/${slug}/rsvps`)
+      ]);
+      
+      // Process needed items
+      let items: string[] = [];
+      if (eventResponse.data.needed_items) {
+        try {
+          if (typeof eventResponse.data.needed_items === 'string') {
+            const parsed = JSON.parse(eventResponse.data.needed_items);
+            items = Array.isArray(parsed) ? parsed : [];
+          } else if (Array.isArray(eventResponse.data.needed_items)) {
+            items = eventResponse.data.needed_items;
+          }
+        } catch (e) {
+          console.error('Error parsing needed_items:', e);
+          items = [];
+        }
+      }
+      
+      // Get all claimed items from existing RSVPs
+      const claimed = new Set<string>();
+      rsvpsResponse.data.forEach((rsvp: any) => {
+        try {
+          let rsvpItems: string[] = [];
+          if (typeof rsvp.items_bringing === 'string') {
+            try {
+              const parsed = JSON.parse(rsvp.items_bringing);
+              rsvpItems = Array.isArray(parsed) ? parsed : [];
+            } catch (e) {
+              console.error('Error parsing items_bringing JSON:', e);
+            }
+          } else if (Array.isArray(rsvp.items_bringing)) {
+            rsvpItems = rsvp.items_bringing;
+          }
+          
+          if (rsvpItems.length > 0) {
+            rsvpItems.forEach(item => claimed.add(item));
+          }
+        } catch (e) {
+          console.error('Error processing RSVP items:', e);
+        }
+      });
+      
+      // Filter out claimed items
+      const availableItems = items.filter(item => !claimed.has(item));
+      
+      setNeededItems(availableItems);
+      setClaimedItems(Array.from(claimed));
       setSuccess(true);
     } catch (err) {
       setError('Failed to submit RSVP. Please try again.');