From 39a3ae80d6817eb50242dfd09d948112772e7be3 Mon Sep 17 00:00:00 2001 From: Arjun Patel Date: Mon, 17 Jan 2022 17:18:23 -0800 Subject: [PATCH] updating nicely --- components/Modals/CreateOrUpdateRoom.tsx | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/components/Modals/CreateOrUpdateRoom.tsx b/components/Modals/CreateOrUpdateRoom.tsx index 39a70fa..39f4d6b 100644 --- a/components/Modals/CreateOrUpdateRoom.tsx +++ b/components/Modals/CreateOrUpdateRoom.tsx @@ -8,6 +8,7 @@ import { } from "../../contexts/keyboardContext"; import { useTeamDashboardContext } from "../../contexts/teamDashboardContext"; import Room, { RoomStatus, RoomType } from "../../models/room"; +import { User } from "../../models/user"; import RoomService from "../../services/roomService"; const { Option } = Select; @@ -21,7 +22,7 @@ interface IModalProps { export default function CreateOrUpdateRoomModal(props: IModalProps) { const { currUser } = useAuth(); - const { teamUsers, team } = useTeamDashboardContext(); + const { teamUsers, team, user } = useTeamDashboardContext(); const { pastedLink, handleModalType, showModalType } = useKeyboardContext(); // handle when we want to update a room and props changes @@ -74,7 +75,7 @@ export default function CreateOrUpdateRoomModal(props: IModalProps) { newRoom.approximateDateTime = roomAppxDateTime; newRoom.link = roomLink; - newRoom.members = [...membersSelected, currUser.uid]; // add currUser to the list of "people" + newRoom.members = [...membersSelected]; // add currUser to the list of "people" newRoom.type = roomType; newRoom.description = roomDescription; newRoom.name = roomName; @@ -89,7 +90,8 @@ export default function CreateOrUpdateRoomModal(props: IModalProps) { resetForm(); - toast.success("created room"); + toast.success("done"); + handleModalType(ShowModalType.na); } catch (error) { toast.error("problem creating room"); @@ -101,7 +103,7 @@ export default function CreateOrUpdateRoomModal(props: IModalProps) { setRoomLink(""); setRoomName(""); setRoomDescription(""); - setMembersSelected([] as string[]); + setMembersSelected([currUser.uid] as string[]); setRoomAttachment(""); setRoomAppxDateTime(""); setRoomType(RoomType.now); @@ -112,7 +114,9 @@ export default function CreateOrUpdateRoomModal(props: IModalProps) { const [roomDescription, setRoomDescription] = useState(""); const [roomAttachment, setRoomAttachment] = useState(""); - const [membersSelected, setMembersSelected] = useState([]); + const [membersSelected, setMembersSelected] = useState([ + currUser.uid, + ]); const [roomType, setRoomType] = useState(RoomType.now); const [roomAppxDateTime, setRoomAppxDateTime] = useState(""); // for certain room types @@ -125,6 +129,8 @@ export default function CreateOrUpdateRoomModal(props: IModalProps) { console.log(value); } + const allUsersForSelection: User[] = [...teamUsers, user]; + const MemberSelection = () => { return ( @@ -172,7 +178,7 @@ export default function CreateOrUpdateRoomModal(props: IModalProps) { setRoomLink(e.target.value)} />