diff --git a/src/lib/constants.ts b/src/lib/constants.ts index c6089a6c6..1c011ef74 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -16,8 +16,6 @@ export enum Dependencies { COLLECTION = 'collection', DOCUMENT = 'document', DOCUMENTS = 'documents', - ATTRIBUTES = 'attributes', - INDEXES = 'indexes', BUCKET = 'bucket', FILE = 'file', FILES = 'files', diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts index 65447fe19..4cff24c2d 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts @@ -6,8 +6,8 @@ import Header from './header.svelte'; import { error } from '@sveltejs/kit'; export const load: LayoutLoad = async ({ params, parent, depends }) => { - await parent(); depends(Dependencies.COLLECTION); + await parent(); try { return { diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte index 2714091da..e63615b09 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte @@ -10,16 +10,13 @@ } from '$lib/elements/table'; import { Button } from '$lib/elements/forms'; import { DropList, DropListItem, Empty, Heading } from '$lib/components'; - import type { Attributes } from '../store'; + import { attributes, type Attributes } from '../store'; import { Container } from '$lib/layout'; import { Pill } from '$lib/elements'; import Create from './createAttribute.svelte'; import CreateIndex from '../indexes/createIndex.svelte'; import Delete from './deleteAttribute.svelte'; import Overview from './overview.svelte'; - import type { PageData } from './$types'; - - export let data: PageData; let showDropdown = []; let selectedAttribute: Attributes = null; @@ -39,7 +36,7 @@ - {#if data.attributes.total} + {#if $attributes.length} Key @@ -48,7 +45,7 @@ - {#each data.attributes.attributes as attribute, index} + {#each $attributes as attribute, index}
@@ -110,7 +107,7 @@
-

Total results: {data.attributes.total}

+

Total results: {$attributes.length}

{:else} (showCreate = true)}> diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.ts deleted file mode 100644 index 565b2e3c8..000000000 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { sdkForProject } from '$lib/stores/sdk'; -import { Dependencies } from '$lib/constants'; -import type { PageLoad } from './$types'; -import type { Attributes } from '../store'; - -export const load: PageLoad = async ({ params, parent, depends }) => { - await parent(); - depends(Dependencies.ATTRIBUTES); - - return { - attributes: (await sdkForProject.databases.listAttributes( - params.database, - params.collection - )) as unknown as { - total: number; - attributes: Attributes[]; - } - }; -}; diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttribute.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttribute.svelte index 0d36d76c8..f234f1040 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttribute.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/createAttribute.svelte @@ -12,7 +12,7 @@ let submitted = false; const created = async () => { - invalidate(Dependencies.ATTRIBUTES); + invalidate(Dependencies.COLLECTION); showCreate = false; }; diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte index f3227e6f6..b866f01ec 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte @@ -21,7 +21,7 @@ $collection.$id, selectedAttribute.key ); - invalidate(Dependencies.ATTRIBUTES); + invalidate(Dependencies.COLLECTION); showDelete = false; await goto( `${base}/console/project-${$page.params.project}/databases/database-${databaseId}/collection-${$page.params.collection}/attributes` diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte index 0613707cb..f5d2c9548 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.svelte @@ -11,18 +11,15 @@ TableRow } from '$lib/elements/table'; import { Container } from '$lib/layout'; - import { collection } from '../store'; + import { indexes } from '../store'; import Delete from './deleteIndex.svelte'; import Create from './createIndex.svelte'; import Overview from './overviewIndex.svelte'; import type { Models } from '@aw-labs/appwrite-console'; - import type { PageData } from './$types'; import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import { Button } from '$lib/elements/forms'; - export let data: PageData; - let showDropdown = []; let selectedIndex: Models.Index = null; let showCreateIndex = false; @@ -30,7 +27,7 @@ let showDelete = false; const handleDelete = async () => { - invalidate(Dependencies.INDEXES); + invalidate(Dependencies.COLLECTION); }; @@ -43,7 +40,7 @@ Create index - {#if data.indexes.total} + {#if $indexes.length} Key @@ -53,7 +50,7 @@ - {#each data.indexes.indexes as index, i} + {#each $indexes as index, i}
@@ -108,9 +105,9 @@
-

Total results: {data.indexes.total}

+

Total results: {$indexes.length}

- {:else if $collection.indexes?.length} + {:else if $indexes?.length} (showCreateIndex = true)}>

Create your first attribute to get started

@@ -122,6 +119,7 @@ + {#if selectedIndex} diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.ts deleted file mode 100644 index 48cb2571d..000000000 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/+page.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { sdkForProject } from '$lib/stores/sdk'; -import { Dependencies } from '$lib/constants'; -import type { PageLoad } from './$types'; - -export const load: PageLoad = async ({ params, parent, depends }) => { - await parent(); - depends(Dependencies.INDEXES); - - return { - indexes: await sdkForProject.databases.listIndexes(params.database, params.collection) - }; -}; diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte index eb59fe3ad..d87c1e4aa 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte @@ -57,7 +57,7 @@ attributeList.map((a) => a.value), attributeList.map((a) => a.order) ); - invalidate(Dependencies.INDEXES); + invalidate(Dependencies.COLLECTION); addNotification({ message: 'Index created!', type: 'success' diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/store.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/store.ts index ee7b13498..6d30597ee 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/store.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/store.ts @@ -21,3 +21,4 @@ export const attributes = derived( page, ($page) => $page.data.collection.attributes as Attributes[] ); +export const indexes = derived(page, ($page) => $page.data.collection.indexes as Models.Index[]);