Skeleton: Fetch static data (teams/drivers/races/substitutions) in global layout asynchronously

src/routes/data/raceresults/+page.server.ts

@@ -49,51 +49,7 @@ export const load: PageServerLoad = async ({ fetch, locals }) => {
     return raceresults;
   };
 
-  // TODO: Duplicated code from data/season/+layout.server.ts and racepicks/+page.server.ts
-  const fetch_races = async (): Promise<Race[]> => {
-    const races: Race[] = await locals.pb.collection("races").getFullList({
-      sort: "+step",
-      fetch: fetch,
-    });
-
-    races.map((race: Race) => {
-      race.pictogram_url = locals.pb.files.getURL(race, race.pictogram);
-    });
-
-    return races;
-  };
-
-  // TODO: Duplicated code from data/season/+layout.server.ts and racepicks/+page.server.ts
-  const fetch_drivers = async (): Promise<Driver[]> => {
-    const drivers: Driver[] = await locals.pb.collection("drivers").getFullList({
-      sort: "+code",
-      fetch: fetch,
-    });
-
-    drivers.map((driver: Driver) => {
-      driver.headshot_url = locals.pb.files.getURL(driver, driver.headshot);
-    });
-
-    return drivers;
-  };
-
-  // TODO: Duplicated code from racepicks/+page.server.ts + users/+page.server.ts
-  const fetch_graphics = async (): Promise<Graphic[]> => {
-    const graphics: Graphic[] = await locals.pb
-      .collection("graphics")
-      .getFullList({ fetch: fetch });
-
-    graphics.map((graphic: Graphic) => {
-      graphic.file_url = locals.pb.files.getURL(graphic, graphic.file);
-    });
-
-    return graphics;
-  };
-
   return {
     results: await fetch_raceresults(),
-    races: await fetch_races(),
-    drivers: await fetch_drivers(),
-    graphics: await fetch_graphics(),
   };
 };

src/routes/data/raceresults/+page.svelte

@@ -12,28 +12,30 @@
       data_value_name: "race",
       label: "Step",
       valuefun: async (value: string): Promise<string> =>
-        `<span class='badge variant-filled-surface'>${get_by_value(data.races, "id", value)?.step}</span>`,
+        `<span class='badge variant-filled-surface'>${get_by_value(await data.races, "id", value)?.step}</span>`,
     },
     {
       data_value_name: "race",
       label: "Race",
       valuefun: async (value: string): Promise<string> =>
-        `<span>${get_by_value(data.races, "id", value)?.name}</span>`,
+        `<span>${get_by_value(await data.races, "id", value)?.name}</span>`,
     },
     {
       data_value_name: "race",
       label: "Guessed",
       valuefun: async (value: string): Promise<string> =>
-        `<span>P${get_by_value(data.races, "id", value)?.pxx}</span>`,
+        `<span>P${get_by_value(await data.races, "id", value)?.pxx}</span>`,
     },
     {
       data_value_name: "pxxs",
       label: "Standing",
       valuefun: async (value: string): Promise<string> => {
         const pxxs_array: string[] = value.toString().split(",");
-        const pxxs_codes: string[] = pxxs_array.map(
-          (id: string, index: number) =>
-            `<span class='w-10 badge mr-2 text-center' style='background: ${PXX_COLORS[index]};'>${get_by_value(data.drivers, "id", id)?.code ?? "Invalid"}</span>`,
+        const pxxs_codes: string[] = await Promise.all(
+          pxxs_array.map(
+            async (id: string, index: number) =>
+              `<span class='w-10 badge mr-2 text-center' style='background: ${PXX_COLORS[index]};'>${get_by_value(await data.drivers, "id", id)?.code ?? "Invalid"}</span>`,
+          ),
         );
 
         return pxxs_codes.join("");
@@ -46,9 +48,11 @@
         if (value.length === 0 || value === "") return "";
 
         const dnfs_array: string[] = value.toString().split(",");
-        const dnfs_codes: string[] = dnfs_array.map(
-          (id: string) =>
-            `<span class='w-10 text-center badge mr-2' style='background: ${PXX_COLORS[3]}'>${get_by_value(data.drivers, "id", id)?.code ?? "Invalid"}</span>`,
+        const dnfs_codes: string[] = await Promise.all(
+          dnfs_array.map(
+            async (id: string) =>
+              `<span class='w-10 text-center badge mr-2' style='background: ${PXX_COLORS[3]}'>${get_by_value(await data.drivers, "id", id)?.code ?? "Invalid"}</span>`,
+          ),
         );
 
         return dnfs_codes.join("");
@@ -64,8 +68,8 @@
       component: "raceResultCard",
       meta: {
         disable_inputs: !data.admin,
-        drivers: data.drivers,
-        races: data.races,
+        drivers: await data.drivers,
+        races: await data.races,
         result: get_by_value(data.results, "id", id),
       },
     };
@@ -73,14 +77,14 @@
     modalStore.trigger(modalSettings);
   };
 
-  const create_result_handler = (event: Event) => {
+  const create_result_handler = async (event: Event) => {
     const modalSettings: ModalSettings = {
       type: "component",
       component: "raceResultCard",
       meta: {
         disable_inputs: !data.admin,
-        drivers: data.drivers,
-        races: data.races,
+        drivers: await data.drivers,
+        races: await data.races,
         require_inputs: true,
       },
     };