updating nicely
This commit is contained in:
@@ -8,6 +8,7 @@ import {
|
|||||||
} from "../../contexts/keyboardContext";
|
} from "../../contexts/keyboardContext";
|
||||||
import { useTeamDashboardContext } from "../../contexts/teamDashboardContext";
|
import { useTeamDashboardContext } from "../../contexts/teamDashboardContext";
|
||||||
import Room, { RoomStatus, RoomType } from "../../models/room";
|
import Room, { RoomStatus, RoomType } from "../../models/room";
|
||||||
|
import { User } from "../../models/user";
|
||||||
import RoomService from "../../services/roomService";
|
import RoomService from "../../services/roomService";
|
||||||
|
|
||||||
const { Option } = Select;
|
const { Option } = Select;
|
||||||
@@ -21,7 +22,7 @@ interface IModalProps {
|
|||||||
|
|
||||||
export default function CreateOrUpdateRoomModal(props: IModalProps) {
|
export default function CreateOrUpdateRoomModal(props: IModalProps) {
|
||||||
const { currUser } = useAuth();
|
const { currUser } = useAuth();
|
||||||
const { teamUsers, team } = useTeamDashboardContext();
|
const { teamUsers, team, user } = useTeamDashboardContext();
|
||||||
const { pastedLink, handleModalType, showModalType } = useKeyboardContext();
|
const { pastedLink, handleModalType, showModalType } = useKeyboardContext();
|
||||||
|
|
||||||
// handle when we want to update a room and props changes
|
// 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.approximateDateTime = roomAppxDateTime;
|
||||||
newRoom.link = roomLink;
|
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.type = roomType;
|
||||||
newRoom.description = roomDescription;
|
newRoom.description = roomDescription;
|
||||||
newRoom.name = roomName;
|
newRoom.name = roomName;
|
||||||
@@ -89,7 +90,8 @@ export default function CreateOrUpdateRoomModal(props: IModalProps) {
|
|||||||
|
|
||||||
resetForm();
|
resetForm();
|
||||||
|
|
||||||
toast.success("created room");
|
toast.success("done");
|
||||||
|
|
||||||
handleModalType(ShowModalType.na);
|
handleModalType(ShowModalType.na);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
toast.error("problem creating room");
|
toast.error("problem creating room");
|
||||||
@@ -101,7 +103,7 @@ export default function CreateOrUpdateRoomModal(props: IModalProps) {
|
|||||||
setRoomLink("");
|
setRoomLink("");
|
||||||
setRoomName("");
|
setRoomName("");
|
||||||
setRoomDescription("");
|
setRoomDescription("");
|
||||||
setMembersSelected([] as string[]);
|
setMembersSelected([currUser.uid] as string[]);
|
||||||
setRoomAttachment("");
|
setRoomAttachment("");
|
||||||
setRoomAppxDateTime("");
|
setRoomAppxDateTime("");
|
||||||
setRoomType(RoomType.now);
|
setRoomType(RoomType.now);
|
||||||
@@ -112,7 +114,9 @@ export default function CreateOrUpdateRoomModal(props: IModalProps) {
|
|||||||
const [roomDescription, setRoomDescription] = useState<string>("");
|
const [roomDescription, setRoomDescription] = useState<string>("");
|
||||||
|
|
||||||
const [roomAttachment, setRoomAttachment] = useState<string>("");
|
const [roomAttachment, setRoomAttachment] = useState<string>("");
|
||||||
const [membersSelected, setMembersSelected] = useState<string[]>([]);
|
const [membersSelected, setMembersSelected] = useState<string[]>([
|
||||||
|
currUser.uid,
|
||||||
|
]);
|
||||||
|
|
||||||
const [roomType, setRoomType] = useState<RoomType>(RoomType.now);
|
const [roomType, setRoomType] = useState<RoomType>(RoomType.now);
|
||||||
const [roomAppxDateTime, setRoomAppxDateTime] = useState<string>(""); // for certain room types
|
const [roomAppxDateTime, setRoomAppxDateTime] = useState<string>(""); // for certain room types
|
||||||
@@ -125,6 +129,8 @@ export default function CreateOrUpdateRoomModal(props: IModalProps) {
|
|||||||
console.log(value);
|
console.log(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const allUsersForSelection: User[] = [...teamUsers, user];
|
||||||
|
|
||||||
const MemberSelection = () => {
|
const MemberSelection = () => {
|
||||||
return (
|
return (
|
||||||
<Select
|
<Select
|
||||||
@@ -135,7 +141,7 @@ export default function CreateOrUpdateRoomModal(props: IModalProps) {
|
|||||||
onChange={handleSelectMember}
|
onChange={handleSelectMember}
|
||||||
value={membersSelected}
|
value={membersSelected}
|
||||||
>
|
>
|
||||||
{teamUsers.map((tu) => {
|
{allUsersForSelection.map((tu) => {
|
||||||
return <Option key={tu.id}>{tu.nickName}</Option>;
|
return <Option key={tu.id}>{tu.nickName}</Option>;
|
||||||
})}
|
})}
|
||||||
</Select>
|
</Select>
|
||||||
@@ -172,7 +178,7 @@ export default function CreateOrUpdateRoomModal(props: IModalProps) {
|
|||||||
<input
|
<input
|
||||||
className="w-full rounded-lg bg-gray-50 p-3"
|
className="w-full rounded-lg bg-gray-50 p-3"
|
||||||
value={roomLink}
|
value={roomLink}
|
||||||
placeholder="https://meet.google.com/"
|
placeholder="https://meet.google.com/xxx-xxxx"
|
||||||
onChange={(e) => setRoomLink(e.target.value)}
|
onChange={(e) => setRoomLink(e.target.value)}
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
Reference in New Issue
Block a user