diff --git a/src/lib/helpers/arrayComparison.ts b/src/lib/helpers/array.ts similarity index 100% rename from src/lib/helpers/arrayComparison.ts rename to src/lib/helpers/array.ts diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts index b387a6d44..26394b631 100644 --- a/src/lib/stores/sdk.ts +++ b/src/lib/stores/sdk.ts @@ -19,7 +19,12 @@ clientConsole.setEndpoint(endpoint).setProject('console'); const clientProject = new Client(); clientProject.setEndpoint(endpoint).setMode('admin'); -const setProject = (projectId: string): Client => clientProject.setProject(projectId); +const setProject = (projectId: string): Client => { + clientProject.setProject(projectId); + console.log(clientProject.config.project); + + return clientProject; +}; const sdkForConsole = { client: clientConsole, diff --git a/src/routes/console/project-[project]/__layout.svelte b/src/routes/console/project-[project]/__layout.svelte index 7a3f6caa2..d05675a08 100644 --- a/src/routes/console/project-[project]/__layout.svelte +++ b/src/routes/console/project-[project]/__layout.svelte @@ -1,7 +1,7 @@ @@ -53,6 +55,6 @@ Appwrite - Database -{#if $database && $database.$id === databaseId} +{#if loaded} {/if} diff --git a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/__layout.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/__layout.svelte index 63d451637..f39830075 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/__layout.svelte +++ b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/__layout.svelte @@ -4,7 +4,7 @@ import { page } from '$app/stores'; import { updateLayout } from '$lib/stores/layout'; import { onMount } from 'svelte'; - import { collection, documentList } from './store'; + import { collection } from './store'; const databaseId = $page.params.database; const collectionId = $page.params.collection; @@ -18,9 +18,7 @@ if ($collection?.$id !== collectionId) { await collection.load(databaseId, collectionId); } - if ($collection) { - await documentList.load(databaseId, $collection.$id, [], 12, 0); - } + updateLayout({ navigate: event, title: $collection.name, @@ -60,6 +58,6 @@ Appwrite - {$collection?.name ?? 'Collection'} -{#if $collection && $documentList} +{#if $collection} {/if} diff --git a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/_document.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/_document.svelte index db4d3b230..b792ef85c 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/_document.svelte +++ b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/_document.svelte @@ -11,10 +11,13 @@ let currentDoc: string; let disableUpdate = true; + const databaseId = $page.params.database; + const collectionId = $page.params.collection; + const documentId = $page.params.document; onMount(async () => { - await doc.load(databaseId, $collection.$id, $page.params.document); + await doc.load(databaseId, collectionId, documentId); currentDoc = JSON.stringify($doc); }); @@ -30,8 +33,8 @@ try { await sdkForProject.databases.updateDocument( databaseId, - $collection.$id, - $page.params.document, + collectionId, + documentId, $doc, $doc.$read, $doc.$write diff --git a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/index.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/index.svelte index fb346489d..f1a6fed61 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/index.svelte +++ b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/document/[document]/index.svelte @@ -8,7 +8,7 @@ import { toLocaleDateTime } from '$lib/helpers/date'; import Document from './_document.svelte'; import Delete from './_delete.svelte'; - import { difference } from '$lib/helpers/arrayComparison'; + import { difference } from '$lib/helpers/array'; import { page } from '$app/stores'; let showDelete = false; diff --git a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/index.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/index.svelte index cb56e1b94..1c66a262c 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/index.svelte +++ b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/index.svelte @@ -14,7 +14,6 @@ import { Container } from '$lib/layout'; import { Button } from '$lib/elements/forms'; import { base } from '$app/paths'; - import { onMount } from 'svelte'; import Create from './_create.svelte'; let offset = 0; @@ -24,10 +23,7 @@ const projectId = $page.params.project; const databaseId = $page.params.database; - onMount(async () => { - await documentList.load(databaseId, $collection.$id, [], limit, offset); - }); - + $: documentList.load(databaseId, $collection.$id, [], limit, offset); $: columns = [ ...$collection.attributes.map((attribute) => ({ key: attribute.key, diff --git a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/settings.svelte b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/settings.svelte index cdd96d22a..3cf5bb0fb 100644 --- a/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/settings.svelte +++ b/src/routes/console/project-[project]/databases/database/[database]/collection/[collection]/settings.svelte @@ -9,7 +9,7 @@ import Delete from './_delete.svelte'; import { onMount } from 'svelte'; import { page } from '$app/stores'; - import { difference } from '$lib/helpers/arrayComparison'; + import { difference } from '$lib/helpers/array'; const databaseId = $page.params.database;