Implement archive room functionality

CSSE1001 · Apr 23, 2023 · 3793684 · 3793684
1 parent d9f1893
commit 3793684
Show file tree

Hide file tree

Showing 12 changed files with 269 additions and 100 deletions.
diff --git a/bootstrap/modheaders.json b/bootstrap/modheaders.json
diff --git a/src/client/App.tsx b/src/client/App.tsx
@@ -16,7 +16,7 @@ import { __prod__ } from "../constants";
 const hostname = __prod__
     ? window.location.hostname +
       (window.location.port ? ":" + window.location.port : "")
-    : "localhost:5000";
+    : `${window.location.hostname}:5000`;
 
 const httpLink = new HttpLink({
     uri: `http${__prod__ ? "s" : ""}://${hostname}/graphql`,

diff --git a/src/client/components/queue/Queue.tsx b/src/client/components/queue/Queue.tsx
@@ -11,7 +11,6 @@ import {
     Tooltip,
     UnorderedList,
     useColorModeValue,
-    useMediaQuery,
 } from "@chakra-ui/react";
 import React from "react";
 import {

diff --git a/src/client/components/queue/RoomSelector.tsx b/src/client/components/queue/RoomSelector.tsx
@@ -5,7 +5,12 @@ type Props = {
     isStaff: boolean;
     selected: string;
     onSelect: (roomId: string) => void;
-    rooms: [roomId: string, roomName: string, isActive: boolean][];
+    rooms: [
+        roomId: string,
+        roomName: string,
+        isActive: boolean,
+        archived: boolean
+    ][];
 };
 
 export const RoomSelector: React.FC<Props> = ({
@@ -27,10 +32,14 @@ export const RoomSelector: React.FC<Props> = ({
                 <option value="default" disabled>
                     Choose an option
                 </option>
-                {rooms.map(([roomId, roomName, isActive]) => (
+                {rooms.map(([roomId, roomName, isActive, archived]) => (
                     <option key={roomId} value={roomId}>
-                        {(!isStaff || !isActive) && `${roomName}`}
-                        {isStaff && isActive && `${roomName} (active)`}
+                        {(!isStaff || (isActive && !archived)) && `${roomName}`}
+                        {isStaff && archived && `${roomName} (archived)`}
+                        {isStaff &&
+                            !archived &&
+                            !isActive &&
+                            `${roomName} (inactive)`}
                     </option>
                 ))}
             </Select>

diff --git a/src/client/containers/CoursePageContainer.tsx b/src/client/containers/CoursePageContainer.tsx
@@ -30,10 +30,6 @@ import {
     useUpdateQueueMutation,
 } from "../generated/graphql";
 import {
-    Alert,
-    AlertDescription,
-    AlertIcon,
-    AlertTitle,
     Button,
     Flex,
     FormControl,
@@ -42,7 +38,6 @@ import {
     Input,
     Text,
     useDisclosure,
-    useMediaQuery,
     useToast,
 } from "@chakra-ui/react";
 import { QuestionProps } from "./QuestionContainer";
@@ -434,6 +429,7 @@ export const CoursePageContainer: React.FC<Props> = () => {
                                 room.id,
                                 room.name,
                                 room.isActive,
+                                room.archived,
                             ]) || [],
                             ([, name, isActive]) => [!isActive, name]
                         )}

diff --git a/src/client/containers/RoomPageContainer.tsx b/src/client/containers/RoomPageContainer.tsx
@@ -10,11 +10,13 @@ import { UserContext } from "../utils/user";
 import { Map } from "immutable";
 import {
     RoomInput,
+    Room as GraphQLRoom,
     StaffRole,
-    UpdateRoomMutation,
     useAddRoomMutation,
     useDeleteRoomMutation,
     useUpdateRoomMutation,
+    WeeklyEvent,
+    useArchiveRoomMutation,
 } from "../generated/graphql";
 import { Form, Formik } from "formik";
 import {
@@ -38,12 +40,20 @@ import { RoomDeleteAlert } from "../components/room/RoomDeleteAlert";
 
 type Props = {};
 
-const placeholderRoom: RoomInput = {
+const placeholderRoom: Room = {
+    id: "",
     name: "",
     capacity: 0,
     enforceCapacity: false,
-    manuallyDisabled: false,
     activeTimes: [],
+    archived: false,
+};
+
+type Room = Pick<
+    GraphQLRoom,
+    "id" | "name" | "capacity" | "enforceCapacity" | "archived"
+> & {
+    activeTimes: Pick<WeeklyEvent, "startTime" | "endTime" | "day">[];
 };
 
 export const RoomPageContainer: React.FC<Props> = () => {
@@ -58,8 +68,17 @@ export const RoomPageContainer: React.FC<Props> = () => {
         onOpen: openDeleteAlert,
     } = useDisclosure();
     const [courses, setCourses] = useState<
-        Map<string, { [key: string]: RoomInput }>
+        Map<string, { [key: string]: Room }>
     >(Map());
+    const isCoordinator = useMemo(
+        () =>
+            user.getCourseStaff.some(
+                (courseStaff) =>
+                    courseStaff.role === StaffRole.Coordinator &&
+                    courseStaff.course.id === chosenCourse
+            ),
+        [user.getCourseStaff, chosenCourse]
+    );
     const toast = useToast();
     const [
         updateRoomMutation,
@@ -73,6 +92,10 @@ export const RoomPageContainer: React.FC<Props> = () => {
         deleteRoomMutation,
         { data: deleteRoomMutationData, loading: deleteRoomMutationLoading },
     ] = useMutationWithError(useDeleteRoomMutation, { errorPolicy: "all" });
+    const [
+        archiveRoomMutation,
+        { data: archiveRoomMutationData, loading: archiveRoomMutationLoading },
+    ] = useMutationWithError(useArchiveRoomMutation, { errorPolicy: "all" });
     useEffect(() => {
         document.title = "Manage Rooms";
     }, []);
@@ -82,15 +105,16 @@ export const RoomPageContainer: React.FC<Props> = () => {
         setChosenRoom("");
     }, [chosenCourse]);
     const updateRoom = useCallback(
-        (room: UpdateRoomMutation["updateRoom"]) => {
+        (room: Room) => {
             setCourses((prev) =>
                 prev.set(chosenCourse, {
                     ...prev.get(chosenCourse),
                     [room.id]: {
+                        id: room.id,
                         name: room.name,
                         capacity: room.capacity,
                         enforceCapacity: room.enforceCapacity,
-                        manuallyDisabled: room.manuallyDisabled,
+                        archived: room.archived,
                         activeTimes: room.activeTimes,
                     },
                 })
@@ -127,6 +151,12 @@ export const RoomPageContainer: React.FC<Props> = () => {
         const updatedRoom = updateRoomMutationData.updateRoom;
         updateRoom(updatedRoom);
     }, [updateRoomMutationData, updateRoom]);
+    useEffect(() => {
+        if (!archiveRoomMutationData) {
+            return;
+        }
+        updateRoom(archiveRoomMutationData.archiveRoom);
+    }, [archiveRoomMutationData, updateRoom]);
     useEffect(() => {
         if (!addRoomMutationData) {
             return;
@@ -150,16 +180,17 @@ export const RoomPageContainer: React.FC<Props> = () => {
                 prev.set(
                     courseStaff.course.id,
                     courseStaff.course.rooms.reduce<{
-                        [key: string]: RoomInput;
+                        [key: string]: Room;
                     }>(
                         (prevValue, currentRoom) => ({
                             ...prevValue,
                             [currentRoom.id]: {
+                                id: currentRoom.id,
                                 name: currentRoom.name,
                                 capacity: currentRoom.capacity,
                                 enforceCapacity: currentRoom.enforceCapacity,
-                                manuallyDisabled: currentRoom.manuallyDisabled,
                                 activeTimes: currentRoom.activeTimes,
+                                archived: currentRoom.archived,
                             },
                         }),
                         {}
@@ -168,7 +199,7 @@ export const RoomPageContainer: React.FC<Props> = () => {
             );
         });
     }, [user]);
-    const room = useMemo<RoomInput>(() => {
+    const room = useMemo<Room>(() => {
         if (isAdding) {
             return placeholderRoom;
         } else {
@@ -250,10 +281,6 @@ export const RoomPageContainer: React.FC<Props> = () => {
                                     label="Enforce Capacity:"
                                     name="enforceCapacity"
                                 />
-                                <FormikCheckbox
-                                    label="Disabled:"
-                                    name="manuallyDisabled"
-                                />
                                 <FormikActiveTimeInput
                                     name="activeTimes"
                                     label="Weekly Active Times"
@@ -270,6 +297,35 @@ export const RoomPageContainer: React.FC<Props> = () => {
                                         Save
                                     </Button>
                                     {!isAdding && (
+                                        <Button
+                                            isLoading={
+                                                archiveRoomMutationLoading
+                                            }
+                                            colorScheme={
+                                                room.archived
+                                                    ? "green"
+                                                    : "orange"
+                                            }
+                                            variant={
+                                                !room.archived
+                                                    ? "solid"
+                                                    : "outline"
+                                            }
+                                            onClick={() =>
+                                                archiveRoomMutation({
+                                                    variables: {
+                                                        roomId: chosenRoom,
+                                                        archive: !room.archived,
+                                                    },
+                                                })
+                                            }
+                                        >
+                                            {room.archived
+                                                ? "Restore"
+                                                : "Archive"}
+                                        </Button>
+                                    )}
+                                    {!isAdding && isCoordinator && (
                                         <Button
                                             colorScheme="red"
                                             isLoading={