Fix Warnings

client/src/common/CurrentUserProvider.tsx

@@ -1,46 +1,8 @@
 import { createContext, ReactElement, useContext } from "react";
-import { gql, useQuery } from "@apollo/client";
+import { useQuery } from "@apollo/client";
 import RequestWrapper2 from "./RequestWrapper2";
 import { Navigate, useLocation } from "react-router-dom";
-import { AccessCheck } from "../queries/userQueries";
-
-export const GET_CURRENT_USER = gql`
-  query GetCurrentUser {
-    currentUser {
-      id
-      ritUsername
-      firstName
-      lastName
-      setupComplete
-      archived
-      admin
-      holds {
-        removeDate
-      }
-      passedModules {
-        moduleID
-        moduleName
-        passedDate
-      }
-      accessChecks {
-        equipmentID
-        approved
-      }
-      cardTagID
-      trainingHolds {
-        moduleID
-        expires
-      }
-      manager
-      staff
-      trainer
-      currencyAccount{
-        id
-        balance
-      }
-    }
-  }
-`;
+import { AccessCheck, GET_CURRENT_USER } from "../queries/userQueries";
 
 export interface PassedModule {
   moduleID: number;
@@ -146,7 +108,7 @@
   );
 }
 
 export function useCurrentUser(): CurrentUser {
   const context = useContext(CurrentUserContext);
 
   if (context === undefined) {

client/src/common/ModuleStatusRow.tsx

@@ -8,7 +8,6 @@ import CheckCircleIcon from "@mui/icons-material/CheckCircle";
 import CloseIcon from "@mui/icons-material/Close";
 import { format } from "date-fns";
 import { useQuery } from "@apollo/client";
-import { GET_ACCESS_PROGRESSES } from "../queries/trainingQueries";
 import { GET_PASSED_SUBMISSION } from "../queries/getSubmissions";
 import { useCurrentUser } from "./CurrentUserProvider.js";
 import RadioButtonUncheckedIcon from '@mui/icons-material/RadioButtonUnchecked';

client/src/pages/both/user_page/user_trainings/UserTrainingsPage.tsx

@@ -1,6 +1,5 @@
 import { Divider, Grid, Stack, Typography } from "@mui/material";
 import { useCurrentUser } from "../../../../common/CurrentUserProvider";
-import { GET_ALL_TRAINING_MODULES } from "../../../maker/training/TrainingPage";
 import { useQuery } from "@apollo/client";
 import {
   ModuleStatus,
@@ -12,6 +11,7 @@ import AccessCheck from "../../../../types/AccessCheck";
 import EquipmentCard from "../../../../common/EquipmentCard";
 import ModuleStatusRow from "../../../../common/ModuleStatusRow";
 import { useIsMobile } from "../../../../common/IsMobileProvider";
+import { GET_ALL_TRAINING_MODULES } from "../../../../queries/trainingQueries";
 
 export default function UserTraingingsPage() {
   const user = useCurrentUser();

client/src/pages/lab_management/inventory/Ledger.tsx

@@ -22,7 +22,7 @@ export default function Ledger() {
 
 
   const matchingItems = queryResult.data?.Ledgers.filter((i: InventoryLedger) => {
-    var searchString = i.category + " " + i.initiator?.firstName + " " + i.initiator?.lastName + " " + i.items.toString() + " " + i.purchaser?.firstName + " " + i.purchaser?.lastName + " " + i.totalCost + " ";
+    const searchString = i.category + " " + i.initiator?.firstName + " " + i.initiator?.lastName + " " + i.items.toString() + " " + i.purchaser?.firstName + " " + i.purchaser?.lastName + " " + i.totalCost + " ";
     return searchString.toLowerCase().includes(searchText.toLowerCase())
   });
 

client/src/pages/lab_management/inventory/MaterialModalContents.tsx

@@ -1,4 +1,4 @@
-import { ChangeEvent, useEffect, useState } from "react";
+import { ChangeEvent, useState } from "react";
 import {
   Button,
   FormControl,
@@ -7,7 +7,6 @@ import {
   MenuItem,
   Select,
   Stack,
-  TextareaAutosize,
   TextField,
   Typography,
 } from "@mui/material";

client/src/pages/lab_management/inventory/ToolItemTypeModal.tsx

@@ -4,7 +4,7 @@ import { ToolItemType, ToolItemTypeInput } from "../../../types/ToolItem";
 import { useEffect, useState } from "react";
 import PrettyModal from "../../../common/PrettyModal";
 import { useNavigate, useParams } from "react-router-dom";
-import { Box, Button, Divider, InputLabel, FormControl, MenuItem, Select, Stack, Switch, TextField, Tooltip, Typography, FormControlLabel, TextareaAutosize } from "@mui/material";
+import { Box, Button, Divider, InputLabel, FormControl, MenuItem, Select, Stack, Switch, TextField, Tooltip, Typography, FormControlLabel } from "@mui/material";
 import GET_ROOMS from "../../../queries/roomQueries";
 import RequestWrapper from "../../../common/RequestWrapper";
 import Room from "../../../types/Room";

client/src/pages/lab_management/manage_equipment/InstanceGrid.tsx

@@ -1,6 +1,6 @@
 import { useQuery } from "@apollo/client";
 import { EquipmentInstance, GET_EQUIPMENT_INSTANCES } from "../../../queries/equipmentInstanceQueries";
-import { Alert, Grid, Typography } from "@mui/material";
+import { Alert, Grid } from "@mui/material";
 import RequestWrapper2 from "../../../common/RequestWrapper2";
 import EquipmentInstanceCard from "./EquipmentInstanceCard";
 

client/src/pages/lab_management/training_modules/DeleteTrainingModuleButton.tsx

@@ -25,7 +25,7 @@ export default function DeleteTrainingModuleButton(props: DeleteTrainingModuleBu
     try {
       await deleteTrainingModule();
     } catch (error) {
-      toast.error("Failed to delete training module");
+      toast.error(`Failed to delete training module: ${error}`);
       return;
     }
   }

client/src/pages/lab_management/users/UserPage.tsx

@@ -25,7 +25,6 @@ import BlockIcon from '@mui/icons-material/Block';
 import DeleteIcon from '@mui/icons-material/Delete';
 import ManageUserArchive from "./ManageUserArchive";
 import { AccessCheckExtraInfo, GET_USER, Hold, Restriction } from "../../../queries/userQueries";
-import NavLink from "../../../top_nav/NavLink";
 
 
 const CREATE_HOLD = gql`

client/src/pages/maker/signup/SignupPage.tsx

@@ -9,13 +9,12 @@ import {
   Typography,
 } from "@mui/material";
 import {
-  GET_CURRENT_USER,
   useCurrentUser,
 } from "../../../common/CurrentUserProvider";
 import styled from "styled-components";
 import { useMutation } from "@apollo/client";
 import { useNavigate } from "react-router-dom";
-import { UPDATE_STUDENT_PROFILE } from "../../../queries/userQueries";
+import { GET_CURRENT_USER, UPDATE_STUDENT_PROFILE } from "../../../queries/userQueries";
 
 const StyledFakeTextField = styled.div`
   border-radius: 4px;

client/src/pages/maker/take_quiz/EquipmentProgessCard.tsx

@@ -4,7 +4,6 @@ import {
   Typography,
   Stack,
   CardHeader} from "@mui/material";
-import { useEffect, useState } from "react";
 import { useQuery } from "@apollo/client";
 import { GET_ACCESS_PROGRESSES } from "../../../queries/trainingQueries";
 import RequestWrapper from "../../../common/RequestWrapper";

client/src/pages/maker/take_quiz/QuizPage.tsx

@@ -8,9 +8,6 @@ import { Stack } from "@mui/system";
 import { Typography } from "@mui/material";
 import { useIsMobile } from "../../../common/IsMobileProvider";
 
-
-// we're going to bring this back soon probably 
-// eslint-disable-next-line 
 function _shuffle(array: any[] | undefined) {
   if (array === undefined) return undefined;
   let currentIndex = array.length;

client/src/pages/maker/take_quiz/QuizTaker.tsx

@@ -1,16 +1,16 @@
-import React, { useEffect, useState } from "react";
+import { useState } from "react";
 import { Module, QuizItemType } from "../../../types/Quiz";
 import { useImmer } from "use-immer";
 import { Button, Card, CardContent, Stack, Typography } from "@mui/material";
 import Question from "./Question";
 import styled, { css } from "styled-components";
 import { gql, useMutation } from "@apollo/client";
-import { GET_CURRENT_USER } from "../../../common/CurrentUserProvider";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
 import Markdown from 'react-markdown'
 import GET_TRAINING_MODULES from "../../../queries/trainingQueries";
 import { useIsMobile } from "../../../common/IsMobileProvider";
+import { GET_CURRENT_USER } from "../../../queries/userQueries";
 
 
 const StyledDiv = styled.div`
@@ -103,9 +103,12 @@ export default function QuizTaker({ module }: QuizTakerProps) {
         (o) => o === optionID
       );
 
-      optionIndex === -1
-        ? draft[itemIndex].optionIDs.push(optionID)
-        : draft[itemIndex].optionIDs.splice(optionIndex, 1);
+      if (optionIndex === -1){
+        draft[itemIndex].optionIDs.push(optionID)
+      } else {
+        draft[itemIndex].optionIDs.splice(optionIndex, 1);
+      }
+
     })
     setQuizProgressed(true);
   };

client/src/pages/maker/training/Explainer.tsx

@@ -1,4 +1,3 @@
-import React, { useEffect, useState } from "react";
 import { Divider, Paper, Stack } from "@mui/material";
 import ArrowForwardIcon from "@mui/icons-material/ArrowForward";
 import ArrowDownwardIcon from '@mui/icons-material/ArrowDownward';

client/src/pages/maker/training/TrainingPage.tsx

@@ -1,7 +1,7 @@
-import React, { useState } from "react";
+import { useState } from "react";
 import Page from "../../Page";
 import Explainer from "./Explainer";
-import { gql, useQuery } from "@apollo/client";
+import { useQuery } from "@apollo/client";
 import RequestWrapper2 from "../../../common/RequestWrapper2";
 import { useCurrentUser } from "../../../common/CurrentUserProvider";
 import {
@@ -10,16 +10,7 @@ import {
 } from "../../../common/TrainingModuleUtils";
 import TrainingModuleRow from "../../../common/TrainingModuleRow";
 import SearchBar, { searchFilter } from "../../../common/SearchBar";
-
-export const GET_ALL_TRAINING_MODULES = gql`
-	query GetAllTrainingModules {
-		modules {
-			id
-			name
-			archived
-		}
-	}
-`;
+import { GET_ALL_TRAINING_MODULES } from "../../../queries/trainingQueries";
 
 /**
  * This function returns a page that displays all training modules with their statuses for the current user, along with

client/src/pages/makerspace_page/DefaultHoursBlock.tsx

@@ -3,15 +3,9 @@ import { Button, Checkbox, FormControlLabel, InputAdornment, Stack, TextField, T
 import { MakerspaceDefaultHours } from "../../types/MakerspaceHours";
 import { useState } from "react";
 import WatchLaterIcon from '@mui/icons-material/WatchLater';
-import gql from "graphql-tag";
 import { useMutation } from "@apollo/client";
 import { toast } from "react-toastify";
-
-export const UPDATE_DEFAULT_HOURS = gql`
-  mutation UpdateDefaultHours($hours: DefaultHoursInput!) {
-    updateDefaultHours(hours: $hours)
-  }
-`;
+import { UPDATE_DEFAULT_HOURS } from "../../queries/makerspaceQueries";
 
 interface DefaultHoursBlockProps {
   hours: MakerspaceDefaultHours;

client/src/pages/makerspace_page/ManageRoomTrainings.tsx

@@ -6,7 +6,7 @@ import { gql, useMutation, useQuery } from "@apollo/client";
 import GET_TRAINING_MODULES from "../../queries/trainingQueries";
 import RequestWrapper2 from "../../common/RequestWrapper2";
 import { useState } from "react";
-import { GET_ROOM } from "./MonitorRoomPage";
+import { GET_ROOM } from "../../queries/roomQueries";
 import { useParams } from "react-router-dom";
 
 interface ManageRoomTrainingsProps {

client/src/pages/makerspace_page/MonitorRoomPage.tsx

@@ -1,10 +1,10 @@
 import { useState } from "react";
 import { Box, Button, Stack, TextField, Typography } from "@mui/material";
-import { gql, useMutation, useQuery } from "@apollo/client";
+import { useMutation, useQuery } from "@apollo/client";
 import { useNavigate, useParams } from "react-router-dom";
 import RequestWrapper2 from "../../common/RequestWrapper2";
 import RoomMakerspaceAssociation from "./RoomMakerspaceAssociation";
-import { ARCHIVE_ROOM, DELETE_ROOM, UNARCHIVE_ROOM, UPDATE_ROOM_NAME } from "../../queries/roomQueries";
+import { ARCHIVE_ROOM, DELETE_ROOM, GET_ROOM, UNARCHIVE_ROOM, UPDATE_ROOM_NAME } from "../../queries/roomQueries";
 import ArchiveIcon from "@mui/icons-material/Archive";
 import PublishIcon from "@mui/icons-material/Publish";
 import DeleteIcon from "@mui/icons-material/Delete";
@@ -17,45 +17,6 @@ import ManageRoomTrainings from "./ManageRoomTrainings";
 import { toast } from "react-toastify";
 import EquipmentBlockDialog from "./EquipmentBlockDialog";
 
-export const GET_ROOM = gql`
-  query GetRoom($id: ID!) {
-    room(id: $id) {
-      name
-      archived
-      makerspace {
-        id
-        name
-      }
-      recentSwipes {
-        id
-        user {
-          id
-          firstName
-          lastName
-        }
-      }
-      equipment {
-        id
-        name
-        archived
-        imageUrl
-        sopUrl
-        trainingModules {
-          id
-          name
-        }
-        numAvailable
-        numInUse
-        byReservationOnly
-      }
-      trainingModules {
-        id
-        name
-      }
-    }
-  }
-`;
-
 export interface Swipe {
   id: string;
   user: {

client/src/pages/makerspace_page/SpecialHoursBlock.tsx

@@ -1,15 +1,9 @@
 import { Checkbox, FormControlLabel, IconButton, InputAdornment, Stack, TextField, Typography } from "@mui/material";
 import MakerspaceHours from "../../types/MakerspaceHours";
 import WatchLaterIcon from '@mui/icons-material/WatchLater';
-import gql from "graphql-tag";
 import { useMutation } from "@apollo/client";
 import DeleteIcon from '@mui/icons-material/Delete';
-
-export const DELETE_SPECIAL_HOURS = gql`
-  mutation DeleteSpecialHours($day: DateTime!, $makerspaceID: ID!) {
-    deleteSpecialHours(day: $day, makerspaceID: $makerspaceID)
-  }
-`;
+import { DELETE_SPECIAL_HOURS } from "../../queries/makerspaceQueries";
 
 interface SpecialHoursBlockProps {
   hours: MakerspaceHours;

client/src/pages/makerspace_page/equipment_pages/EquipmentInformation.tsx

@@ -1,4 +1,4 @@
-import { Autocomplete, Box, Button, FormControlLabel, Stack, Switch, TextField, ToggleButton, ToggleButtonGroup, Typography } from "@mui/material";
+import { Autocomplete, Box, Button, Stack, TextField, ToggleButton, ToggleButtonGroup, Typography } from "@mui/material";
 import { Equipment } from "./EditEquipmentPage";
 import { ARCHIVE_EQUIPMENT, PUBLISH_EQUIPMENT, UPDATE_EQUIPMENT } from "../../../queries/equipmentQueries";
 import { useMutation, useQuery } from "@apollo/client";
@@ -132,11 +132,6 @@ export default function EquipmentInformation(props: EquipmentInformationProps) {
             return (
               <Autocomplete
                 renderInput={(params: any) => <TextField {...params} label="Location" />}
-                /* Autocomplete's value prop wants undefined, not null.
-                 * But if we give it undefined then it thinks it's an
-                 * uncontrolled prop and throws a console error
-                 * when we set the value. This is a MUI problem.
-                 * @ts-ignore */
                 value={props.equipment.room}
                 options={rooms}
                 isOptionEqualToValue={(option, value) => option.id === value.id}
@@ -187,7 +182,7 @@ export default function EquipmentInformation(props: EquipmentInformationProps) {
             setModuleIds([...moduleIDs, mID]);
           }}
           removeModule={(mID) => {
-            var temp = [...moduleIDs];
+            const temp = [...moduleIDs];
             temp.splice(temp.indexOf(mID), 1);
             setModuleIds(temp);
           }}

client/src/pages/makerspace_page/equipment_pages/EquipmentTrainings.tsx

@@ -18,7 +18,7 @@ export default function EquipmentTrainings(props: EquipmentTrainingProps) {
   return (
     <RequestWrapper2 result={getModulesResult} render={(data) => {
 
-      const possibleModules = getModulesResult.data.modules.filter((m: ObjectSummary) => (
+      const possibleModules = data.modules.filter((m: ObjectSummary) => (
         !props.equipmentModules.some((eMod) => m.id === eMod.id) // TODO: filter to this makerspace's + global trainings
       ));
 

client/src/pages/makerspace_page/equipment_pages/NewEquipmentPage.tsx

@@ -28,7 +28,6 @@ export default function NewEquipmentPage() {
   });
 
   const [name, setName] = useState("");
-  const [imageUrl, setImageUrl] = useState("");
   const [sopUrl, setSopUrl] = useState("");
   const [notes, setNotes] = useState("");
   const [byReservation, setByReservation] = useState(false);
@@ -48,7 +47,7 @@ export default function NewEquipmentPage() {
         name: name,
         roomID: room.id,
         moduleIDs: [],
-        imageUrl: imageUrl,
+        imageUrl: "",
         sopUrl: sopUrl,
         notes: notes,
         byReservationOnly: byReservation,
@@ -93,11 +92,6 @@ export default function NewEquipmentPage() {
               renderInput={(params: any) => (
                 <TextField {...params} required label="Location" />
               )}
-              /* Autocomplete's value prop wants undefined, not null.
-              * But if we give it undefined then it thinks it's an
-              * uncontrolled prop and throws a console error
-              * when we set the value. This is a MUI problem.
-              * @ts-ignore */
               value={room}
               options={rooms}
               isOptionEqualToValue={(option, value) => option.id === value.id}