Merge branch 'main' of github.com:iforge-uos/ignis

iforge-uos · Apr 19, 2024 · 66f13b1 · 66f13b1
2 parents 26cb594 + 367ccc2
commit 66f13b1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/apps/forge/src/components/training/TrainingLocation.tsx b/apps/forge/src/components/training/TrainingLocation.tsx
@@ -57,6 +57,7 @@ export default function TrainingLocation({ location, img, optionalTrainingText }
     },
     { compulsory: [] as PartialTrainingWithStatus[], not_compulsory: [] as PartialTrainingWithStatus[] },
   );
+
   return (
     <>
       <Title prompt={`${name} Training`} />
@@ -83,9 +84,11 @@ export default function TrainingLocation({ location, img, optionalTrainingText }
               </div>
             </div>
             <div className="grid gap-4 align-middle w-full grid-cols-1 items-stretch justify-center md:grid-cols-2 lg:grid-cols-3">
-              {compulsory.map((training) => (
-                <TrainingCourseCard training={training} isRep={isRep} />
-              ))}
+              {compulsory
+                .sort((a, b) => a.name.localeCompare(b.name))
+                .map((training) => (
+                  <TrainingCourseCard training={training} isRep={isRep} />
+                ))}
             </div>
           </div>
         </div>
@@ -103,9 +106,11 @@ export default function TrainingLocation({ location, img, optionalTrainingText }
               </div>
             </div>
             <div className="grid gap-4 align-middle w-full grid-cols-1 items-stretch justify-center md:grid-cols-2 lg:grid-cols-3">
-              {not_compulsory.map((training) => (
-                <TrainingCourseCard training={training} isRep={isRep} />
-              ))}
+              {not_compulsory
+                .sort((a, b) => a.name.localeCompare(b.name))
+                .map((training) => (
+                  <TrainingCourseCard training={training} isRep={isRep} />
+                ))}
             </div>
           </div>
         </div>

diff --git a/apps/forge/src/lib/utils.ts b/apps/forge/src/lib/utils.ts
@@ -41,7 +41,7 @@ export function extractError(error: Error): string {
     return undefined as never;
   }
   if (isAxiosError(error)) {
-    return `${ErrorCodes[error.response?.data.code]}: ${error.response?.data.message}`;
+    return `${ErrorCodes[error.response?.data.code] || "unspecified_error"}: ${error.response?.data.message}`;
   }
   return error?.message || "Unknown Error. Contact the IT Team";
 }
diff --git a/apps/forge/src/routes/_authenticated/_reponly/users/$id.tsx b/apps/forge/src/routes/_authenticated/_reponly/users/$id.tsx
@@ -10,14 +10,13 @@ import { Training } from "@ignis/types/users.ts";
 import { useQuery } from "@tanstack/react-query";
 import { createFileRoute, notFound } from "@tanstack/react-router";
 import { Badge } from "@ui/components/ui/badge.tsx";
+import { Loader } from "@ui/components/ui/loader";
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@ui/components/ui/table.tsx";
 import { isAxiosError } from "axios";
-import { Check, Loader, X } from "lucide-react";
+import { Check, X } from "lucide-react";
 
 async function getData(id: string) {
-  const user = await getUser(id);
-  const trainings = await getUserTraining(id);
-  const signIns = await getUserSignIns(id);
+  const [user, trainings, signIns] = await Promise.all([getUser(id), getUserTraining(id), getUserSignIns(id)]);
   return {
     user,
     trainings,
@@ -110,9 +109,8 @@ export default function Component() {
                   </TableRow>
                 </TableHeader>
                 <TableBody>
-                  {/* sorting stably is for losers */}
                   {trainings
-                    .sort((a, b) => (a.name < b.name ? -1 : 1))
+                    .sort((a, b) => a.name.localeCompare(b.name))
                     .map((training) =>
                       training["@created_at"] ? (
                         <TableRow>