Merge pull request #1417 from rit-construct-makerspace/main

Final Deployment 🫡

Author: ZZwatermelon

client/package.json

@@ -45,7 +45,7 @@
     "start": "vite",
     "build": "vite build",
     "lint:fix": "eslint -c eslint.config.js --fix src/**/*.{ts,tsx}",
-    "lint": "eslint -c eslint.config.js --fix src/**/*.{ts,tsx}"
+    "lint": "eslint -c eslint.config.js src/**/*.{ts,tsx}"
   },
   "husky": {
     "hooks": {
@@ -85,4 +85,4 @@
     "typescript-eslint": "^8.39.0",
     "vite-bundle-analyzer": "^1.2.0"
   }
-}
+}

client/src/App.tsx

@@ -1,4 +1,4 @@
-import { ApolloClient, NormalizedCacheObject } from "@apollo/client";
+import { ApolloClient } from "@apollo/client";
 import { ApolloProvider } from "@apollo/client/react";
 import { CssBaseline, ThemeProvider } from "@mui/material";
 import { ThemeController } from "./types/site_settings/ThemeController";

client/src/AppRouter.tsx

@@ -12,7 +12,6 @@ import StorefrontPage from "./pages/lab_management/storefront/StorefrontPage";
 import StorefrontPreviewPage from "./pages/lab_management/storefront_preview/StorefrontPreviewPage";
 import HelpPage from "./pages/maker/signup/HelpPage";
 import SignupPage from "./pages/maker/signup/SignupPage";
-import TrainingPage from "./pages/maker/training/TrainingPage";
 import MakerspacePage from "./pages/makerspace_page/MakerspacePage";
 import AnnouncementsDisplay from "./pages/signage/AnnouncementsDisplay";
 import EventsDisplay from "./pages/signage/EventsDisplay";
@@ -235,7 +234,6 @@ export const routes = [
                 }],
               },
 
-              { path: "/maker/training", element: <TrainingPage /> },
               { path: "/maker/training/:id", element: <QuizPage /> },
               { path: "/maker/training/:id/results/", element: <QuizResults /> },
               { path: "/maker/training/:id/results/:submissionID", element: <QuizResults /> },

client/src/common/SearchBar.tsx

@@ -2,16 +2,6 @@ import { IconButton, InputAdornment, StandardTextFieldProps, TextField } from "@
 import SearchIcon from "@mui/icons-material/Search";
 import CloseIcon from "@mui/icons-material/Close";
 
-export function searchFilter<T>(
-  searchText: string,
-  collection: T[],
-  getter: (x: T) => string
-): T[] {
-  return collection.filter((x: any) =>
-    getter(x).toLocaleLowerCase().includes(searchText.toLocaleLowerCase())
-  );
-}
-
 interface SearchBarProps extends StandardTextFieldProps {
   onSubmit?: () => void;
   onClear?: () => void;

client/src/common/UseCurrentUser.ts

@@ -35,22 +35,4 @@ if (root !== null) {
   );
 }
 
-/*
-Start: Inserted by Apollo Client 3->4 migration codemod.
-Copy the contents of this block into a `.d.ts` file in your project to enable correct response types in your custom links.
-If you do not use the `@defer` directive in your application, you can safely remove this block.
-*/
-
-
-import "@apollo/client";
-import { Defer20220824Handler } from "@apollo/client/incremental";
-
-declare module "@apollo/client" {
-  export interface TypeOverrides extends Defer20220824Handler.TypeOverrides { }
-}
-
-/*
-End: Inserted by Apollo Client 3->4 migration codemod.
-*/
-
 

client/src/entry-client.tsx

@@ -1,4 +1,4 @@
-import { renderToPipeableStream, renderToString } from 'react-dom/server';
+import { renderToPipeableStream } from 'react-dom/server';
 import App from './App';
 import { createStaticHandler, createStaticRouter, StaticRouterProvider } from "react-router-dom"
 import { routes } from './AppRouter';
@@ -108,21 +108,3 @@ export async function render(req: express.Request, res: express.Response, siteSe
     }
   );
 }
-
-/*
-Start: Inserted by Apollo Client 3->4 migration codemod.
-Copy the contents of this block into a `.d.ts` file in your project to enable correct response types in your custom links.
-If you do not use the `@defer` directive in your application, you can safely remove this block.
-*/
-
-
-import "@apollo/client";
-import { Defer20220824Handler } from "@apollo/client/incremental";
-
-declare module "@apollo/client" {
-  export interface TypeOverrides extends Defer20220824Handler.TypeOverrides { }
-}
-
-/*
-End: Inserted by Apollo Client 3->4 migration codemod.
-*/

client/src/entry-server.tsx

@@ -18,7 +18,7 @@ export default function UserTraingingsPage() {
   const makeTheme = useMakeTheme();
 
   const getAllModules = useQuery(GET_ALL_TRAINING_MODULES);
-  const getAccessChecks = useQuery(GET_ACCESS_CHECKS_BY_USERID, {
+  const _getAccessChecks = useQuery(GET_ACCESS_CHECKS_BY_USERID, {
     variables: { userID: user.id },
   });
 

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

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import { Link } from "@mui/material";
-import { useNavigate, useParams } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import { useCurrentUser } from "../../../common/CurrentUserProvider";
 import { isManagerFor } from "../../../common/PrivilegeUtils";
 

client/src/pages/lab_management/audit_logs/AuditLogEntity.tsx

@@ -1,4 +1,4 @@
-import React, { ChangeEvent, useEffect, useMemo, useState } from "react";
+import { ChangeEvent, useEffect, useState } from "react";
 import {
   Box,
   Button,
@@ -19,7 +19,6 @@ import {
 import SearchBar from "../../../common/SearchBar";
 import { gql } from "@apollo/client";
 import { useLazyQuery } from "@apollo/client/react";
-import RequestWrapper2 from "../../../common/RequestWrapper2";
 import AuditLogRow from "./AuditLogRow";
 import { useLocation, useNavigate, useParams } from "react-router-dom";
 import { endOfDay, parse, startOfDay } from "date-fns";
@@ -85,7 +84,7 @@ export default function LogPage() {
   const navigate = useNavigate();
   const [query, queryResult] = useLazyQuery(GET_LOGS, { pollInterval: 2000 });
   const [searchText, setSearchText] = useState("");
-  const [expanded, setExpanded] = React.useState(false);
+  const [expanded, setExpanded] = useState(false);
   const [manualSignInModal, setManualSignInModal] = useState(false);
 
   const handleExpandClick = () => {
@@ -140,7 +139,7 @@ export default function LogPage() {
         makerspaceID: Number(makerspaceID)
       },
     });
-  }, [search, query, filters]);
+  }, [search, query, filters, makerspaceID]);
 
   const setUrlParam = (paramName: string, paramValue: string) => {
     const params = new URLSearchParams(search);
@@ -163,9 +162,7 @@ export default function LogPage() {
   const showClearButton =
     startDateString || stopDateString || search.includes("q=");
 
-  const logs = useMemo(() => {
-    return queryResult.data ? queryResult.data.makerspaceLogs : undefined;
-  }, [queryResult.data, queryResult.data?.makerspaceLogs])
+  const logs = queryResult.data ? queryResult.data.makerspaceLogs : undefined;
 
   return (
     <Box margin="25px">