Fixed bugs with rankings page

Author: coder13

src/App.tsx

@@ -66,7 +66,7 @@ const PsychSheet = () => {
   const { wcif } = useWCIF();
 
   useEffect(() => {
-    if (wcif) {
+    if (wcif && wcif.events?.length > 0) {
       navigate(`/competitions/${competitionId}/psych-sheet/${wcif.events[0].id}`, {
         replace: true,
       });

src/lib/sort.ts

@@ -2,14 +2,17 @@ import { EventId, Person } from '@wca/helpers';
 import { findPR } from './activities';
 import { isRankedBySingle } from './events';
 
-export const byWorldRanking = (eventId: EventId): ((a: Person, b: Person) => number) => {
+export const byWorldRanking = (
+  eventId: EventId,
+  resultType: 'average' | 'single' = 'average',
+): ((a: Person, b: Person) => number) => {
   // const byEventRanking = byRanking(eventId);
   const findEventPR = findPR(eventId);
 
   return (a, b) => {
     if (!isRankedBySingle(eventId)) {
-      const aPRAverage = findEventPR(a.personalBests || [], 'average');
-      const bPRAverage = findEventPR(b.personalBests || [], 'average');
+      const aPRAverage = findEventPR(a.personalBests || [], resultType);
+      const bPRAverage = findEventPR(b.personalBests || [], resultType);
 
       if (aPRAverage && bPRAverage) {
         const diff = aPRAverage.worldRanking - bPRAverage.worldRanking;
@@ -23,20 +26,24 @@ export const byWorldRanking = (eventId: EventId): ((a: Person, b: Person) => num
       }
     }
 
-    const aPRSingle = findEventPR(a.personalBests || [], 'single');
-    const bPRSingle = findEventPR(b.personalBests || [], 'single');
+    if (resultType === 'average') {
+      const aPRSingle = findEventPR(a.personalBests || [], 'single');
+      const bPRSingle = findEventPR(b.personalBests || [], 'single');
 
-    if (aPRSingle && bPRSingle) {
-      const diff = aPRSingle.worldRanking - bPRSingle.worldRanking;
-      if (diff !== 0) {
-        return diff;
+      if (aPRSingle && bPRSingle) {
+        const diff = aPRSingle.worldRanking - bPRSingle.worldRanking;
+        if (diff !== 0) {
+          return diff;
+        }
+      } else if (aPRSingle && !bPRSingle) {
+        return -1;
+      } else if (!aPRSingle && bPRSingle) {
+        return 1;
       }
-    } else if (aPRSingle && !bPRSingle) {
-      return -1;
-    } else if (!aPRSingle && bPRSingle) {
-      return 1;
+
+      return a.name.localeCompare(b.name);
     }
 
-    return a.name.localeCompare(b.name);
+    return 0;
   };
 };

src/pages/Competition/PsychSheet/PsychSheetEvent.tsx

@@ -46,7 +46,7 @@ export const PsychSheetEvent = () => {
   const sortedPersons = useMemo(
     () =>
       eventId &&
-      persons.sort(byWorldRanking(eventId)).map((person) => {
+      persons.sort(byWorldRanking(eventId, resultType)).map((person) => {
         return {
           ...person,
           pr: person.personalBests?.find(
@@ -132,7 +132,7 @@ export const PsychSheetEvent = () => {
                   : rankings.length) + 1;
 
               const prAverage = person.personalBests?.find(
-                (pr) => pr.eventId === eventId && pr.type === 'average',
+                (pr) => pr.eventId === eventId && pr.type === resultType,
               );
 
               return (
@@ -148,7 +148,7 @@ export const PsychSheetEvent = () => {
                   </span>
                   <span className="px-3 py-2.5 text-left truncate">{person.name}</span>
                   <span className="px-3 py-2.5 text-right [font-variant-numeric:tabular-nums]">
-                    {prAverage ? renderResultByEventId(eventId, 'average', prAverage.best) : ''}
+                    {prAverage ? renderResultByEventId(eventId, resultType, prAverage.best) : ''}
                   </span>
                   <span className="px-3 py-2.5 text-right [font-variant-numeric:tabular-nums]">
                     {prAverage