Skeleton: Remove user/admin from fetched data
This data was fetched before it was available, so the user object was undefined
This commit is contained in:
@ -14,7 +14,7 @@
|
||||
import { team_dropdown_options } from "$lib/dropdown";
|
||||
import { get_driver_headshot_template } from "$lib/database";
|
||||
import { get_error_toast } from "$lib/toast";
|
||||
import { pb } from "$lib/pocketbase";
|
||||
import { pb, pbUser } from "$lib/pocketbase";
|
||||
import { error } from "@sveltejs/kit";
|
||||
import type { PageData } from "../../../routes/data/season/drivers/$types";
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
|
||||
// Reactive state
|
||||
let required: boolean = $derived(!driver);
|
||||
let disabled: boolean = $derived(!data.admin);
|
||||
let disabled: boolean = $derived(!pbUser?.admin);
|
||||
let firstname_input_value: string = $state(driver?.firstname ?? "");
|
||||
let lastname_input_value: string = $state(driver?.lastname ?? "");
|
||||
let code_input_value: string = $state(driver?.code ?? "");
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
import { get_race_pictogram_template } from "$lib/database";
|
||||
import { format_date, isodatetimeformat } from "$lib/date";
|
||||
import { get_error_toast } from "$lib/toast";
|
||||
import { pb } from "$lib/pocketbase";
|
||||
import { pb, pbUser } from "$lib/pocketbase";
|
||||
import { error } from "@sveltejs/kit";
|
||||
import type { PageData } from "../../../routes/data/season/races/$types";
|
||||
|
||||
@ -50,7 +50,7 @@
|
||||
|
||||
// Reactive state
|
||||
let required: boolean = $derived(!race);
|
||||
let disabled: boolean = $derived(!data.admin);
|
||||
let disabled: boolean = $derived(!pbUser?.admin);
|
||||
let name_value: string = $state(race?.name ?? "");
|
||||
let step_value: string = $state(race?.step.toString() ?? "");
|
||||
let pxx_value: string = $state(race?.pxx.toString() ?? "");
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
import { DRIVER_HEADSHOT_HEIGHT, DRIVER_HEADSHOT_WIDTH } from "$lib/config";
|
||||
import { driver_dropdown_options } from "$lib/dropdown";
|
||||
import { get_error_toast } from "$lib/toast";
|
||||
import { pb } from "$lib/pocketbase";
|
||||
import { pb, pbUser } from "$lib/pocketbase";
|
||||
import type { PageData } from "../../../routes/racepicks/$types";
|
||||
|
||||
interface RacePickCardProps {
|
||||
@ -96,7 +96,7 @@
|
||||
// Database actions
|
||||
const update_racepick = (create?: boolean): (() => Promise<void>) => {
|
||||
const handler = async (): Promise<void> => {
|
||||
if (!data.user?.id || data.user.id === "") {
|
||||
if (!pbUser?.id || pbUser.id === "") {
|
||||
toastStore.trigger(get_error_toast("Invalid user id!"));
|
||||
return;
|
||||
}
|
||||
@ -114,7 +114,7 @@
|
||||
}
|
||||
|
||||
const racepick_data = {
|
||||
user: data.user.id,
|
||||
user: pbUser.id,
|
||||
race: data.currentrace.id,
|
||||
pxx: pxx_select_value,
|
||||
dnf: dnf_select_value,
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
import type { Driver, Race, RaceResult, Substitution } from "$lib/schema";
|
||||
import { get_by_value } from "$lib/database";
|
||||
import { race_dropdown_options } from "$lib/dropdown";
|
||||
import { pb } from "$lib/pocketbase";
|
||||
import { pb, pbUser } from "$lib/pocketbase";
|
||||
import { get_error_toast } from "$lib/toast";
|
||||
import type { PageData } from "../../../routes/data/raceresults/$types";
|
||||
|
||||
@ -51,7 +51,7 @@
|
||||
|
||||
// Reactive state
|
||||
let required: boolean = $derived(!result);
|
||||
let disabled: boolean = $derived(!data.admin); // TODO: Datelock (prevent entering future result)
|
||||
let disabled: boolean = $derived(!pbUser?.admin); // TODO: Datelock (prevent entering future result)
|
||||
let race_select_value: string = $state(result?.race ?? "");
|
||||
|
||||
let currentrace: Race | undefined = $derived(
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
import { DRIVER_HEADSHOT_HEIGHT, DRIVER_HEADSHOT_WIDTH } from "$lib/config";
|
||||
import { driver_dropdown_options, team_dropdown_options } from "$lib/dropdown";
|
||||
import { get_error_toast } from "$lib/toast";
|
||||
import { pb } from "$lib/pocketbase";
|
||||
import { pb, pbUser } from "$lib/pocketbase";
|
||||
import type { PageData } from "../../../routes/seasonpicks/$types";
|
||||
|
||||
interface SeasonPickCardProps {
|
||||
@ -184,7 +184,7 @@
|
||||
// Database actions
|
||||
const update_seasonpick = (create?: boolean): (() => Promise<void>) => {
|
||||
const handler = async (): Promise<void> => {
|
||||
if (!data.user?.id || data.user.id === "") {
|
||||
if (!pbUser?.id || pbUser.id === "") {
|
||||
toastStore.trigger(get_error_toast("Invalid user id!"));
|
||||
return;
|
||||
}
|
||||
@ -229,7 +229,7 @@
|
||||
}
|
||||
|
||||
const seasonpick_data = {
|
||||
user: data.user.id,
|
||||
user: pbUser.id,
|
||||
hottake: hottake_value,
|
||||
wdcwinner: wdc_value,
|
||||
wccwinner: wcc_value,
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
import { DRIVER_HEADSHOT_HEIGHT, DRIVER_HEADSHOT_WIDTH } from "$lib/config";
|
||||
import { driver_dropdown_options, race_dropdown_options } from "$lib/dropdown";
|
||||
import { get_error_toast } from "$lib/toast";
|
||||
import { pb } from "$lib/pocketbase";
|
||||
import { pb, pbUser } from "$lib/pocketbase";
|
||||
import type { PageData } from "../../../routes/data/season/substitutions/$types";
|
||||
|
||||
interface SubstitutionCardProps {
|
||||
@ -43,7 +43,7 @@
|
||||
|
||||
// Reactive state
|
||||
let required: boolean = $derived(!substitution);
|
||||
let disabled: boolean = $derived(!data.admin);
|
||||
let disabled: boolean = $derived(!pbUser?.admin);
|
||||
let active_drivers: Driver[] = $derived((drivers ?? []).filter((d: Driver) => d.active));
|
||||
let inactive_drivers: Driver[] = $derived((drivers ?? []).filter((d: Driver) => !d.active));
|
||||
let substitute_value: string = $state(substitution?.substitute ?? "");
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
} from "$lib/config";
|
||||
import { get_team_banner_template, get_team_logo_template } from "$lib/database";
|
||||
import { get_error_toast } from "$lib/toast";
|
||||
import { pb } from "$lib/pocketbase";
|
||||
import { pb, pbUser } from "$lib/pocketbase";
|
||||
import { error } from "@sveltejs/kit";
|
||||
import type { PageData } from "../../../routes/data/season/teams/$types";
|
||||
|
||||
@ -46,7 +46,7 @@
|
||||
|
||||
// Reactive state
|
||||
let required: boolean = $derived(!team);
|
||||
let disabled: boolean = $derived(!data.admin);
|
||||
let disabled: boolean = $derived(!pbUser?.admin);
|
||||
let name_value: string = $state(team?.name ?? "");
|
||||
let color_value: string = $state(team?.color ?? "");
|
||||
let banner_value: FileList | undefined = $state();
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
import { get } from "svelte/store";
|
||||
import { pb, pbUser } from "./pocketbase";
|
||||
import type {
|
||||
CurrentPickedUser,
|
||||
|
||||
Reference in New Issue
Block a user