Minor sorting related fixes

Author: ankith26

frontend/src/components/ReviewBox.tsx

@@ -68,7 +68,7 @@ const ReviewBox: React.FC<{
         setReviewsList(undefined);
       }
     }
-  }, [endpoint]);
+  }, [endpoint, initExpanded]);
 
   useEffect(() => {
     if (isExpanded) {

frontend/src/components/SortBox.tsx

@@ -47,7 +47,12 @@ const SortBox = <T extends ReviewableType>({
     setSortByAscending(false);
   }, [reviewableDefaultSortString(sortableData)]);
 
-  const disableForSize = sortableData === null || sortableData.length <= 1;
+  const disableForSize =
+    sortableData === null ||
+    sortableData.reduce(
+      (count, data) => count + (data.reviews_metadata.num_reviews > 0 ? 1 : 0),
+      0
+    ) <= 1;
   return (
     <>
       <Typography variant="h5" color="secondary" gutterBottom>

frontend/src/sortutils.tsx

@@ -45,9 +45,9 @@ const reviewableSort = <T extends ReviewableType>(
   sortBy: SortType | '' = '',
   sortByAscending: boolean = false
 ) => {
-  return [...sortableData].sort((a, b) => {
+  const reviewableCompare = <T extends ReviewableType>(a: T, b: T) => {
     if (!sortBy) {
-      return reviewableDefaultCompare(a, b);
+      return 0;
     }
 
     const left = a.reviews_metadata[sortBy];
@@ -74,7 +74,13 @@ const reviewableSort = <T extends ReviewableType>(
     } else {
       return 0;
     }
-  });
+  };
+
+  // First compare with reviewableCompare (uses sort parameters), and if that
+  // returns 0 then use the default comparator (sorts by name/sem).
+  return [...sortableData].sort(
+    (a, b) => reviewableCompare(a, b) || reviewableDefaultCompare(a, b)
+  );
 };
 
 export {