diff --git a/beszel/site/bun.lockb b/beszel/site/bun.lockb index 7fd9092..20541a4 100755 Binary files a/beszel/site/bun.lockb and b/beszel/site/bun.lockb differ diff --git a/beszel/site/package.json b/beszel/site/package.json index 3fdbb71..35fe1a3 100644 --- a/beszel/site/package.json +++ b/beszel/site/package.json @@ -38,7 +38,7 @@ "d3-time": "^3.1.0", "lucide-react": "^0.452.0", "nanostores": "^0.11.3", - "pocketbase": "^0.21.5", + "pocketbase": "^0.22.1", "react": "^18.3.1", "react-dom": "^18.3.1", "recharts": "^2.13.0", diff --git a/beszel/site/src/components/add-system.tsx b/beszel/site/src/components/add-system.tsx index 3819cf3..fca744f 100644 --- a/beszel/site/src/components/add-system.tsx +++ b/beszel/site/src/components/add-system.tsx @@ -56,7 +56,7 @@ export function AddSystemButton({ className }: { className?: string }) { e.preventDefault() const formData = new FormData(e.target as HTMLFormElement) const data = Object.fromEntries(formData) as Record - data.users = pb.authStore.model!.id + data.users = pb.authStore.record!.id try { setOpen(false) await pb.collection("systems").create(data) diff --git a/beszel/site/src/components/navbar.tsx b/beszel/site/src/components/navbar.tsx index e23da19..7e7340a 100644 --- a/beszel/site/src/components/navbar.tsx +++ b/beszel/site/src/components/navbar.tsx @@ -58,7 +58,7 @@ export default function Navbar() { - {pb.authStore.model?.email} + {pb.authStore.record?.email} {isAdmin() && ( diff --git a/beszel/site/src/lib/stores.ts b/beszel/site/src/lib/stores.ts index 3223fa7..39edc8b 100644 --- a/beszel/site/src/lib/stores.ts +++ b/beszel/site/src/lib/stores.ts @@ -26,7 +26,7 @@ export const $chartTime = atom("1h") as WritableAtom /** User settings */ export const $userSettings = map({ chartTime: "1h", - emails: [pb.authStore.model?.email || ""], + emails: [pb.authStore.record?.email || ""], }) // update local storage on change $userSettings.subscribe((value) => { diff --git a/beszel/site/src/lib/utils.ts b/beszel/site/src/lib/utils.ts index 9cbbb9e..b7b9c0b 100644 --- a/beszel/site/src/lib/utils.ts +++ b/beszel/site/src/lib/utils.ts @@ -91,8 +91,8 @@ export const updateFavicon = (newIcon: string) => { ;(document.querySelector("link[rel='icon']") as HTMLLinkElement).href = `/static/${newIcon}` } -export const isAdmin = () => pb.authStore.model?.role === "admin" -export const isReadOnlyUser = () => pb.authStore.model?.role === "readonly" +export const isAdmin = () => pb.authStore.record?.role === "admin" +export const isReadOnlyUser = () => pb.authStore.record?.role === "readonly" /** Update systems / alerts list when records change */ export function updateRecordList(e: RecordSubscription, $store: WritableAtom) { @@ -251,7 +251,7 @@ export async function updateUserSettings() { } // create user settings if error fetching existing try { - const createdSettings = await pb.collection("user_settings").create({ user: pb.authStore.model!.id }) + const createdSettings = await pb.collection("user_settings").create({ user: pb.authStore.record!.id }) $userSettings.set(createdSettings.settings) } catch (e) { console.log("create settings", e)