diff --git a/src/routes/console/[project]/users/user/[user]/__layout.svelte b/src/routes/console/[project]/users/user/[user]/__layout.svelte index bd3c7f967..1ae3572e4 100644 --- a/src/routes/console/[project]/users/user/[user]/__layout.svelte +++ b/src/routes/console/[project]/users/user/[user]/__layout.svelte @@ -15,8 +15,8 @@ } $: { - if ($user) { - title.set($user.name); + if ($user.response) { + title.set($user.response.name); } } diff --git a/src/routes/console/[project]/users/user/[user]/index.svelte b/src/routes/console/[project]/users/user/[user]/index.svelte index 0aed9bf79..bb61dedae 100644 --- a/src/routes/console/[project]/users/user/[user]/index.svelte +++ b/src/routes/console/[project]/users/user/[user]/index.svelte @@ -14,7 +14,7 @@ $: if (newKey && newValue) { arePrefsDisabled = false; } else if (prefs) { - if (JSON.stringify(prefs) !== JSON.stringify(Object.entries($user.prefs))) { + if (JSON.stringify(prefs) !== JSON.stringify(Object.entries($user.response.prefs))) { arePrefsDisabled = false; } } @@ -33,7 +33,7 @@ onMount(async () => { await user.load($page.params.user); - prefs = Object.entries($user.prefs); + prefs = Object.entries($user.response.prefs); }); const getAvatar = (name: string) => @@ -47,11 +47,14 @@ async function updateVerification() { try { - await sdkForProject.users.updateVerification($user.$id, !$user.emailVerification); - $user.emailVerification = !$user.emailVerification; + await sdkForProject.users.updateVerification( + $user.response.$id, + !$user.response.emailVerification + ); + $user.response.emailVerification = !$user.response.emailVerification; addNotification({ message: `The account has been ${ - $user.emailVerification ? 'verified' : 'unverified' + $user.response.emailVerification ? 'verified' : 'unverified' }`, type: 'success' }); @@ -64,10 +67,10 @@ } async function updateStatus() { try { - await sdkForProject.users.updateStatus($user.$id, !$user.status); - $user.status = !$user.status; + await sdkForProject.users.updateStatus($user.response.$id, !$user.response.status); + $user.response.status = !$user.response.status; addNotification({ - message: `The account has been ${$user.status ? 'unblocked' : 'blocked'}`, + message: `The account has been ${$user.response.status ? 'unblocked' : 'blocked'}`, type: 'success' }); } catch (error) { @@ -79,8 +82,8 @@ } async function updateName() { try { - await sdkForProject.users.updateName($user.$id, userName); - $user.name = userName; + await sdkForProject.users.updateName($user.response.$id, userName); + $user.response.name = userName; userName = null; showError = false; addNotification({ @@ -93,8 +96,8 @@ } async function updateEmail() { try { - await sdkForProject.users.updateEmail($user.$id, userEmail); - $user.email = userEmail; + await sdkForProject.users.updateEmail($user.response.$id, userEmail); + $user.response.email = userEmail; userEmail = null; showError = false; addNotification({ @@ -107,7 +110,7 @@ } async function updatePassword() { try { - await sdkForProject.users.updatePassword($user.$id, newPassword); + await sdkForProject.users.updatePassword($user.response.$id, newPassword); newPassword = null; showError = false; addNotification({ @@ -129,8 +132,8 @@ newValue = null; } newPref = null; - await sdkForProject.users.updatePrefs($user.$id, updatedPrefs); - $user.prefs = updatedPrefs; + await sdkForProject.users.updatePrefs($user.response.$id, updatedPrefs); + $user.response.prefs = updatedPrefs; arePrefsDisabled = true; addNotification({ @@ -149,9 +152,9 @@ try { let updatedPrefs = Object.fromEntries(prefs); delete updatedPrefs[selectedKey]; - await sdkForProject.users.updatePrefs($user.$id, updatedPrefs); + await sdkForProject.users.updatePrefs($user.response.$id, updatedPrefs); prefs = Object.entries(updatedPrefs); - $user.prefs = updatedPrefs; + $user.response.prefs = updatedPrefs; addNotification({ message: 'Preferences have been updated', type: 'success' @@ -169,28 +172,31 @@
- {$user.email} -

Joined: {toLocaleDate($user.registration)}

+ {$user.response.email} +

Joined: {toLocaleDate($user.response.registration)}

- - {#if $user.status} + + {#if $user.response.status} + >{$user.response.emailVerification ? 'Unverify' : 'Verify'} Account {/if}
@@ -201,7 +207,7 @@ {#if showError === 'name'} @@ -224,7 +230,7 @@ {#if showError === 'email'} @@ -333,10 +339,13 @@
diff --git a/src/routes/console/[project]/users/user/[user]/store.ts b/src/routes/console/[project]/users/user/[user]/store.ts index 929bc7935..05f3ba721 100644 --- a/src/routes/console/[project]/users/user/[user]/store.ts +++ b/src/routes/console/[project]/users/user/[user]/store.ts @@ -1,17 +1,38 @@ import { sdkForProject } from '$lib/stores/sdk'; import type { Models } from 'src/sdk'; import { writable } from 'svelte/store'; +import { browser } from '$app/env'; + +export type SelectedUser = { + loading: boolean; + response?: Models.User>; +}; function createUserStore() { - const { subscribe, set } = writable>>(); + const { subscribe, set } = writable({ + loading: true, + response: browser ? JSON.parse(sessionStorage.getItem('user')) : null + }); return { subscribe, set, load: async (userId: string) => { - set(await sdkForProject.users.get(userId)); + try { + const response = await sdkForProject.users.get(userId); + set({ + loading: false, + response + }); + } catch (error) { + //TODO: take care what happens here + } } }; } export const user = createUserStore(); + +if (browser) { + user.subscribe((n) => sessionStorage?.setItem('user', JSON.stringify(n.response ?? ''))); +}