Merge branch 'main' into matt/fix-vulnerabilities

Author: mjaydenkim

client/src/modules/Admin/Components/Stats.tsx

@@ -8,8 +8,6 @@ type StatsProps = {
 
 const Stats = ({ token }: StatsProps) => {
   const [approvedRevCount, setApprovedRevCount] = useState<Number>(0);
-  const [pendingRevCount, setPendingRevCount] = useState<Number>(0);
-  const [reportedRevCount, setReportedRevCount] = useState<Number>(0);
 
   /*
       Calls route to update the approved, pending, and reported review counts
@@ -23,8 +21,6 @@ const Stats = ({ token }: StatsProps) => {
       const result = response.data.result;
       if (response.status === 200) {
         setApprovedRevCount(result.approved);
-        setPendingRevCount(result.pending);
-        setReportedRevCount(result.reported);
       }
     };
     getCounts();
@@ -62,8 +58,6 @@ const Stats = ({ token }: StatsProps) => {
           Download ApprovedReviewCount by Class
         </button>
         <p>Approved review count: {approvedRevCount}</p>
-        <p>Pending review count: {pendingRevCount}</p>
-        <p>Reported review count: {reportedRevCount}</p>
       </div>
     </div>
   );

client/src/modules/Course/Components/Course.tsx

@@ -153,7 +153,7 @@ export const Course = () => {
           const reviews = reviewsResponse.data.result;
           // Convert date field of Review to JavaScript Date object
           reviews.map((r: Review) => (r.date = r.date && new Date(r.date)));
-          reviews.sort(sortByLikes);
+          reviews.sort(sortByDate);
           setCourseReviews(reviews);
           setVisibleCourseReviews(reviews);
 
@@ -214,7 +214,9 @@ export const Course = () => {
       setVisibleCourseReviews(courseReviews ? [...courseReviews] : []);
     } else {
       setVisibleCourseReviews(
-        (courseReviews ? [...courseReviews] : []).filter((r: Review) => r.professors?.includes(value))
+        (courseReviews ? [...courseReviews] : []).filter((r: Review) =>
+          r.professors?.includes(value)
+        )
       );
     }
     selectedProf.current = value;
@@ -370,8 +372,8 @@ export const Course = () => {
                           onChange={sortReviewsBy}
                           className={styles.filtertext}
                         >
-                          <option value="helpful">Most Helpful</option>
                           <option value="recent">Recent</option>
+                          <option value="helpful">Most Helpful</option>
                           {selectedProf.current === 'none' && (
                             <option value="professor">Professor Name</option>
                           )}

server/src/admin/admin.controller.ts

@@ -517,6 +517,7 @@ interface DefaultRaffleValue {
 
 /**
  *
+ * @param {Auth} auth: Object that represents the authentication of a request being passed in.
  * @param start date
  * @returns student netid that won the raffle. [done without replacement/removal]
  */

server/src/admin/admin.router.ts

@@ -6,7 +6,8 @@ import {
   AdminRequestType,
   AdminUserRequestType,
   AdminAddSemesterRequestType,
-  CourseEvalRequestType
+  CourseEvalRequestType,
+  VerifyAdminType
 } from './admin.type';
 import {
   getApprovedReviews,
@@ -594,6 +595,9 @@ adminRouter.post('/rec/similarity', async (req, res) => {
 
 /**
  * Reachable at POST /api/admin/draw-raffle
+ * @body token: a session's current token
+ * @body start: a date object representing the start date of the raffle
+ * Draws a random winner for the raffle
  */
 adminRouter.post('/draw-raffle', async (req, res) => {
   try {