From e50122951ac766c940be4d0ac3eac2010cf3d47c Mon Sep 17 00:00:00 2001
From: Starstrike <raiden89@live.com>
Date: Thu, 1 May 2025 18:30:18 -0400
Subject: [PATCH] feat: Add other_items field to RSVP edit form

---
 frontend/src/components/EventAdmin.tsx | 26 +++++++++++++++++++++-----
 frontend/src/components/EventView.tsx  | 11 +----------
 frontend/src/types.ts                  |  4 ++--
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/EventAdmin.tsx b/frontend/src/components/EventAdmin.tsx
index 0c689eb..4bdda49 100644
--- a/frontend/src/components/EventAdmin.tsx
+++ b/frontend/src/components/EventAdmin.tsx
@@ -69,6 +69,7 @@ interface EditFormData {
   guest_count: number;
   guest_names: string[];
   items_bringing: string[];
+  other_items: string;
 }
 
 const EventAdmin: React.FC = () => {
@@ -90,7 +91,8 @@ const EventAdmin: React.FC = () => {
     bringing_guests: 'no',
     guest_count: 0,
     guest_names: [],
-    items_bringing: []
+    items_bringing: [],
+    other_items: ''
   });
   const [deleteEventDialogOpen, setDeleteEventDialogOpen] = useState(false);
   const [manageItemsDialogOpen, setManageItemsDialogOpen] = useState(false);
@@ -228,7 +230,8 @@ const EventAdmin: React.FC = () => {
       guest_names: processedGuestNames,
       items_bringing: Array.isArray(rsvp.items_bringing) ? rsvp.items_bringing :
         typeof rsvp.items_bringing === 'string' ? 
-          (rsvp.items_bringing ? JSON.parse(rsvp.items_bringing) : []) : []
+          (rsvp.items_bringing ? JSON.parse(rsvp.items_bringing) : []) : [],
+      other_items: rsvp.other_items || ''
     });
     setEditDialogOpen(true);
   };
@@ -284,7 +287,8 @@ const EventAdmin: React.FC = () => {
         bringing_guests: 'no',
         guest_count: 0,
         guest_names: [],
-        items_bringing: [] // Clear items when not attending
+        items_bringing: [], // Clear items when not attending
+        other_items: ''
       }));
     } else if (name === 'bringing_guests') {
       // When bringing guests is changed
@@ -294,7 +298,8 @@ const EventAdmin: React.FC = () => {
         // If changing to 'yes', set guest count to 1 and initialize one empty name field
         guest_count: value === 'yes' ? 1 : 0,
         // Clear guest names if changing to 'no', otherwise initialize with empty string or keep existing
-        guest_names: value === 'no' ? [] : (value === 'yes' ? [''] : prev.guest_names)
+        guest_names: value === 'no' ? [] : (value === 'yes' ? [''] : prev.guest_names),
+        other_items: prev.other_items
       }));
     } else {
       setEditForm(prev => ({
@@ -330,6 +335,7 @@ const EventAdmin: React.FC = () => {
         guest_count: editForm.bringing_guests === 'yes' ? Math.max(1, parseInt(editForm.guest_count.toString(), 10)) : 0,
         guest_names: filteredGuestNames,
         items_bringing: JSON.stringify(editForm.items_bringing),
+        other_items: editForm.other_items,
         event_id: event.id
       };
 
@@ -363,7 +369,8 @@ const EventAdmin: React.FC = () => {
           ...rsvpToEdit,
           ...submissionData,
           guest_names: filteredGuestNames,
-          items_bringing: editForm.items_bringing // Keep as array in local state
+          items_bringing: editForm.items_bringing,
+          other_items: editForm.other_items
         };
         
         // Update the local state
@@ -960,6 +967,15 @@ const EventAdmin: React.FC = () => {
                     ))}
                   </Select>
                 </FormControl>
+                <TextField
+                  label="Other Items"
+                  name="other_items"
+                  value={editForm.other_items}
+                  onChange={(e) => setEditForm(prev => ({ ...prev, other_items: e.target.value }))}
+                  fullWidth
+                  multiline
+                  rows={3}
+                />
               </Box>
             </DialogContent>
             <DialogActions>
diff --git a/frontend/src/components/EventView.tsx b/frontend/src/components/EventView.tsx
index aa0b980..add4ce0 100644
--- a/frontend/src/components/EventView.tsx
+++ b/frontend/src/components/EventView.tsx
@@ -319,16 +319,7 @@ const EventView: React.FC = () => {
                         </Box>
                       </TableCell>
                       <TableCell>
-                        {rsvp.other_items && rsvp.other_items.length > 0 ? 
-                          rsvp.other_items.map((item, index) => (
-                            <Chip 
-                              key={index} 
-                              label={item} 
-                              sx={{ m: 0.5 }} 
-                            />
-                          )) : 
-                          'None'
-                        }
+                        {rsvp.other_items || 'None'}
                       </TableCell>
                     </TableRow>
                   ))}
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
index 14db5c7..bf444d5 100644
--- a/frontend/src/types.ts
+++ b/frontend/src/types.ts
@@ -18,8 +18,8 @@ export interface Rsvp {
   attending: string;
   bringing_guests: string;
   guest_count: number;
-  guest_names: string;
-  items_bringing: string[];
+  guest_names: string[] | string;
+  items_bringing: string[] | string;
   other_items?: string;
   created_at: string;
 } 
\ No newline at end of file