/archive fixes

data/archive.ts

@@ -8,6 +8,8 @@ export interface SeriesArchive {
 
 export interface QuarterArchive {
   name: string;
+  season: "w" | "s" | "u" | "f";
+  year: number;
   series: SeriesArchive[];
 }
 
@@ -19,7 +21,7 @@ for (const event of eventData) {
   if (!event.type) continue;
 
   const idComponents = event.id.split("-");
-  if (idComponents.length >= 2 && /^[fws]\d\d$/.test(idComponents[0])) {
+  if (idComponents.length >= 2 && /^[wsuf]\d\d$/.test(idComponents[0])) {
     if (!quarters.has(idComponents[0])) {
       quarters.set(idComponents[0], new Map());
     }
@@ -36,22 +38,32 @@ for (const event of eventData) {
   }
 }
 
+const SEASONS = { "w": 0, "s": 1, "u": 2, "f": 3 };
+
 const archive: QuarterArchive[] = [...quarters.entries()].map(([quarterId, quarterMap]) => {
+  const seasonChar = quarterId.charAt(0);
   let season;
-  switch (quarterId.charAt(0)) {
+  switch (seasonChar) {
     case "f": season = "Fall"; break;
     case "w": season = "Winter"; break;
     case "s": season = "Spring"; break;
     case "u": season = "Summer"; break;
     default: throw `invalid season char '${quarterId.charAt(0)}' (this should never happen)`
   }
+  const year = parseInt(quarterId.length === 3 ? `20${quarterId.slice(1)}` : quarterId);
   return {
-    name: `${season} ${quarterId.length === 3 ? `20${quarterId.slice(1)}` : quarterId}`,
+    name: `${season} ${year}`,
+    season: seasonChar,
+    year: year,
     series: [...quarterMap.entries()].map(([seriesId, events]) => ({
       name: seriesId,
       description: eventTypes.find(x => x.name === seriesId)!.description,
       events,
     }))
   }
-})
+}).sort((a, b) => {
+  if (a.year == b.year) return SEASONS[a.season] - SEASONS[b.season];
+  return a.year - b.year;
+}).reverse();
+
 export default archive;