diff --git a/src/lib/stores/projects.ts b/src/lib/stores/projects.ts index 26aba9773..d0d5dbbb8 100644 --- a/src/lib/stores/projects.ts +++ b/src/lib/stores/projects.ts @@ -1,4 +1,4 @@ import type { Models } from 'src/sdk'; import { writable } from 'svelte/store'; -export const user = writable>(); +export const user = writable>>(); diff --git a/src/lib/stores/user.ts b/src/lib/stores/user.ts index 26aba9773..d0d5dbbb8 100644 --- a/src/lib/stores/user.ts +++ b/src/lib/stores/user.ts @@ -1,4 +1,4 @@ import type { Models } from 'src/sdk'; import { writable } from 'svelte/store'; -export const user = writable>(); +export const user = writable>>(); diff --git a/src/routes/console/[project]/database/_create.svelte b/src/routes/console/[project]/database/_create.svelte index 5321f2690..f22f30d07 100644 --- a/src/routes/console/[project]/database/_create.svelte +++ b/src/routes/console/[project]/database/_create.svelte @@ -15,10 +15,10 @@ const create = async () => { try { - await sdkForProject.database.createCollection(id, name, 'collection', [], []); + const bucket = await sdkForProject.database.createCollection(id, name, 'collection', [], []); id = name = ''; showCreate = false; - dispatch('created'); + dispatch('created', bucket); } catch (error) { addNotification({ type: 'error', diff --git a/src/routes/console/[project]/database/collection/[collection]/index.svelte b/src/routes/console/[project]/database/collection/[collection]/index.svelte index 0208594a8..57b3158a5 100644 --- a/src/routes/console/[project]/database/collection/[collection]/index.svelte +++ b/src/routes/console/[project]/database/collection/[collection]/index.svelte @@ -7,11 +7,7 @@ let offset = 0; const limit = 25; - const project = $page.params.project; - const getDocuments = () => - sdkForProject.database.listDocuments($collection.$id, [], limit, offset); - const columns = [ { key: '$id', title: '#' }, ...$collection.attributes.map((attribute) => ({ @@ -20,7 +16,7 @@ })) ]; - let request = getDocuments(); + $: request = sdkForProject.database.listDocuments($collection.$id, [], limit, offset);

Documents

@@ -49,11 +45,6 @@ - (request = getDocuments())} - /> + {/await} diff --git a/src/routes/console/[project]/database/index.svelte b/src/routes/console/[project]/database/index.svelte index b89a05853..a3aa4bce3 100644 --- a/src/routes/console/[project]/database/index.svelte +++ b/src/routes/console/[project]/database/index.svelte @@ -5,19 +5,22 @@ import { Button } from '$lib/elements/forms'; import { Card, Pagination } from '$lib/components'; import Create from './_create.svelte'; + import { goto } from '$app/navigation'; + import type { Models } from 'src/sdk'; let search = ''; let showCreate = false; let offset = 0; const limit = 25; - const project = $page.params.project; - const getCollections = () => sdkForProject.database.listCollections(search, limit, offset); const doSearch = () => { offset = 0; - request = getCollections(); }; - let request = getCollections(); + const collectionCreated = async (event: CustomEvent) => { + await goto(`/console/${project}/database/collection/${event.detail.$id}`); + }; + + $: request = sdkForProject.database.listCollections(search, limit, offset);

Collections

@@ -49,14 +52,9 @@ {/each} - (request = getCollections())} - /> + {/await} - (request = getCollections())} /> + diff --git a/src/routes/console/[project]/functions/function/[function]/index.svelte b/src/routes/console/[project]/functions/function/[function]/index.svelte index 5b7f88219..dce9cbddf 100644 --- a/src/routes/console/[project]/functions/function/[function]/index.svelte +++ b/src/routes/console/[project]/functions/function/[function]/index.svelte @@ -10,17 +10,15 @@ let search = ''; let showCreate = false; let offset = 0; - const limit = 25; + const limit = 25; const project = $page.params.project; const functionId = $page.params.function; - const getDeployments = () => - sdkForProject.functions.listDeployments(functionId, search, limit, offset); // const doSearch = () => { // offset = 0; // request = getDeployments(); // }; - let request = getDeployments(); + $: request = sdkForProject.functions.listDeployments(functionId, search, limit, offset);

Overview

@@ -63,14 +61,9 @@ - (request = getDeployments())} - /> + {/await} - (request = getDeployments())} /> + diff --git a/src/routes/console/[project]/functions/index.svelte b/src/routes/console/[project]/functions/index.svelte index 43ad2f484..21fe3de8c 100644 --- a/src/routes/console/[project]/functions/index.svelte +++ b/src/routes/console/[project]/functions/index.svelte @@ -12,12 +12,10 @@ const limit = 25; const project = $page.params.project; - const getFunctions = () => sdkForProject.functions.list(search, limit, offset); const doSearch = () => { offset = 0; - request = getFunctions(); }; - let request = getFunctions(); + $: request = sdkForProject.functions.list(search, limit, offset);

Functions

@@ -47,14 +45,9 @@ {/each} - (request = getFunctions())} - /> + {/await} - (request = getFunctions())} /> + diff --git a/src/routes/console/[project]/storage/_create.svelte b/src/routes/console/[project]/storage/_create.svelte index 7b31a4aa6..4bee64cef 100644 --- a/src/routes/console/[project]/storage/_create.svelte +++ b/src/routes/console/[project]/storage/_create.svelte @@ -14,10 +14,10 @@ const create = async () => { try { - await sdkForProject.storage.createBucket('unique()', name, 'bucket'); + const bucket = await sdkForProject.storage.createBucket('unique()', name, 'bucket'); name = null; showCreate = false; - dispatch('created'); + dispatch('created', bucket); } catch (error) { addNotification({ type: 'error', diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/index.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/index.svelte index 86893cf02..722aec8ac 100644 --- a/src/routes/console/[project]/storage/bucket/[bucket]/index.svelte +++ b/src/routes/console/[project]/storage/bucket/[bucket]/index.svelte @@ -13,12 +13,11 @@ const project = $page.params.project; const bucket = $page.params.bucket; - const getBuckets = () => sdkForProject.storage.listFiles(bucket, search, limit, offset); const doSearch = () => { offset = 0; - request = getBuckets(); }; - let request = getBuckets(); + + $: request = sdkForProject.storage.listFiles(bucket, search, limit, offset);
@@ -52,14 +51,9 @@ - (request = getBuckets())} - /> + {/await} - (request = getBuckets())} /> + diff --git a/src/routes/console/[project]/storage/index.svelte b/src/routes/console/[project]/storage/index.svelte index b5e86da41..9a5a16ceb 100644 --- a/src/routes/console/[project]/storage/index.svelte +++ b/src/routes/console/[project]/storage/index.svelte @@ -1,30 +1,30 @@

Buckets

- - - + @@ -47,14 +47,9 @@ {/each} - (request = getCollections())} - /> + {/await} - (request = getCollections())} /> + diff --git a/src/routes/console/[project]/users/_create.svelte b/src/routes/console/[project]/users/_create.svelte index aa89a9782..7aea5b30b 100644 --- a/src/routes/console/[project]/users/_create.svelte +++ b/src/routes/console/[project]/users/_create.svelte @@ -13,10 +13,10 @@ const create = async () => { try { - await sdkForProject.users.create('unique()', mail, pass, name); + const user = await sdkForProject.users.create('unique()', mail, pass, name); mail = pass = name = ''; showCreate = false; - dispatch('created'); + dispatch('created', user); } catch (error) { addNotification({ type: 'error', diff --git a/src/routes/console/[project]/users/index.svelte b/src/routes/console/[project]/users/index.svelte index 3d9093682..b2a4b5cf2 100644 --- a/src/routes/console/[project]/users/index.svelte +++ b/src/routes/console/[project]/users/index.svelte @@ -5,6 +5,8 @@ import { Button } from '$lib/elements/forms'; import { Table, TableHeader, TableBody, TableRow, TableCell } from '$lib/elements/table'; import Create from './_create.svelte'; + import type { Models } from 'src/sdk'; + import { goto } from '$app/navigation'; let search = ''; let showCreate = false; @@ -13,20 +15,15 @@ const project = $page.params.project; const getAvatar = (name: string) => sdkForProject.avatars.getInitials(name, 30, 30).toString(); - const getUsers = () => - sdkForProject.users.list(search, limit, offset, undefined, undefined, 'DESC'); - const doSearch = () => { - offset = 0; - request = getUsers(); + const userCreated = async (event: CustomEvent>>) => { + await goto(`/console/${project}/users/user/${event.detail.$id}`); }; - let request = getUsers(); + $: request = sdkForProject.users.list(search, limit, offset, undefined, undefined, 'DESC');

Users

-
- -
+
{#await request} @@ -44,7 +41,7 @@ {#each response.users as user} - {user.name} + {user.name} @@ -58,15 +55,9 @@ {/each} - (request = getUsers())} /> + {/await} - (request = getUsers())} /> - - + diff --git a/src/routes/console/[project]/users/team/_create.svelte b/src/routes/console/[project]/users/team/_create.svelte index 2bf9c47eb..3f27d3417 100644 --- a/src/routes/console/[project]/users/team/_create.svelte +++ b/src/routes/console/[project]/users/team/_create.svelte @@ -13,10 +13,10 @@ const create = async () => { try { - await sdkForProject.teams.create('unique()', name); + const team = await sdkForProject.teams.create('unique()', name); name = ''; showCreate = false; - dispatch('created'); + dispatch('created', team); } catch (error) { addNotification({ type: 'error', diff --git a/src/routes/console/[project]/users/team/index.svelte b/src/routes/console/[project]/users/team/index.svelte index a9dfab24a..a470d4e38 100644 --- a/src/routes/console/[project]/users/team/index.svelte +++ b/src/routes/console/[project]/users/team/index.svelte @@ -5,6 +5,8 @@ import { Button } from '$lib/elements/forms'; import { Card, Pagination } from '$lib/components'; import Create from './_create.svelte'; + import { goto } from '$app/navigation'; + import type { Models } from 'src/sdk'; let search = ''; let showCreate = false; @@ -12,19 +14,15 @@ const limit = 25; const project = $page.params.project; - const getTeams = () => sdkForProject.teams.list(search, limit, offset); - const doSearch = () => { - offset = 0; - request = getTeams(); + const teamCreated = async (event: CustomEvent) => { + await goto(`/console/${project}/users/team/${event.detail.$id}`); }; - let request = getTeams(); + $: request = sdkForProject.teams.list(search, limit, offset);

Teams

-
- -
+
@@ -52,9 +50,9 @@ - (request = getTeams())} /> + {/await} - - (request = getTeams())} /> + + diff --git a/src/routes/console/[project]/users/user/[user]/activity.svelte b/src/routes/console/[project]/users/user/[user]/activity.svelte index a0bb5ee53..5fb119436 100644 --- a/src/routes/console/[project]/users/user/[user]/activity.svelte +++ b/src/routes/console/[project]/users/user/[user]/activity.svelte @@ -4,12 +4,10 @@ import { Table, TableBody, TableHeader, TableRow, TableCell } from '$lib/elements/table'; import { sdkForProject } from '$lib/stores/sdk'; - const getLogs = () => sdkForProject.users.getLogs($page.params.user); - let offset = 0; const limit = 25; - let request = getLogs(); + $: request = sdkForProject.users.getLogs($page.params.user, limit, offset);

Activity

@@ -49,6 +47,6 @@ - (request = getLogs())} /> + {/await} diff --git a/src/routes/console/[project]/users/user/[user]/sessions.svelte b/src/routes/console/[project]/users/user/[user]/sessions.svelte index 89af906d1..a31cef4af 100644 --- a/src/routes/console/[project]/users/user/[user]/sessions.svelte +++ b/src/routes/console/[project]/users/user/[user]/sessions.svelte @@ -6,11 +6,9 @@ import { addNotification } from '$lib/stores/notifications'; import { sdkForProject } from '$lib/stores/sdk'; - const getSessions = () => sdkForProject.users.getSessions($page.params.user); const deleteSession = async (id: string) => { try { await sdkForProject.users.deleteSession($page.params.user, id); - request = getSessions(); } catch (error) { addNotification({ type: 'error', @@ -30,10 +28,11 @@ }); } }; + let offset = 0; const limit = 25; - let request = getSessions(); + $: request = sdkForProject.users.getSessions($page.params.user);

Sessions

@@ -69,12 +68,7 @@ - (request = getSessions())} - /> + {/await}