From bee0a590d07ecef314992cc8f22f300d318f5723 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 26 Jun 2025 18:15:17 +0530 Subject: [PATCH] update: refactor to use the Tables API. --- package.json | 2 +- pnpm-lock.yaml | 10 +-- src/lib/commandCenter/panels/ai.svelte | 3 +- src/lib/commandCenter/searchers/tables.ts | 18 ++--- src/lib/components/columnSelector.svelte | 2 +- src/lib/components/csvImportBox.svelte | 38 ++++----- src/lib/components/eventModal.svelte | 52 ++++++------ src/lib/components/filePicker.svelte | 4 +- src/lib/constants.ts | 51 +++++++++++- src/lib/layout/containerHeader.svelte | 3 + src/lib/stores/billing.ts | 7 +- src/lib/stores/migration.ts | 25 +++--- src/lib/stores/organization.ts | 1 + src/lib/stores/preferences.ts | 26 +++--- src/lib/stores/roles.ts | 1 + src/lib/stores/sdk.ts | 4 +- .../databases/create.svelte | 1 + .../database-[database]/+layout.svelte | 6 +- .../database-[database]/+page.svelte | 11 ++- .../databases/database-[database]/+page.ts | 9 ++- .../database-[database]/createTable.svelte | 8 +- .../database-[database]/delete.svelte | 68 ++++++++-------- .../databases/database-[database]/grid.svelte | 16 ++-- .../database-[database]/settings/+page.svelte | 6 +- .../databases/database-[database]/store.ts | 4 +- .../database-[database]/string.svelte | 22 +++--- .../table-[table]/+layout.svelte | 36 ++++----- .../table-[table]/+layout.ts | 12 ++- .../table-[table]/+page.svelte | 59 +++++++------- .../table-[table]/+page.ts | 4 +- .../table-[table]/activity/+page.ts | 2 +- .../table-[table]/breadcrumbs.svelte | 6 +- .../table-[table]/columns/+page.svelte | 72 ++++++++--------- .../table-[table]/columns/boolean.svelte | 20 ++--- .../table-[table]/columns/datetime.svelte | 20 ++--- .../table-[table]/columns/deleteColumn.svelte | 24 +++--- .../table-[table]/columns/edit.svelte | 40 +++++----- .../table-[table]/columns/email.svelte | 20 ++--- .../table-[table]/columns/enum.svelte | 20 ++--- .../table-[table]/columns/float.svelte | 20 ++--- .../table-[table]/columns/integer.svelte | 20 ++--- .../table-[table]/columns/ip.svelte | 20 ++--- .../table-[table]/columns/relationship.svelte | 66 ++++++++-------- .../table-[table]/columns/store.ts | 10 +-- .../table-[table]/columns/string.svelte | 20 ++--- .../table-[table]/columns/url.svelte | 20 ++--- .../table-[table]/create/+page.svelte | 36 ++++----- .../table-[table]/createColumn.svelte | 6 +- .../table-[table]/header.svelte | 12 +-- .../table-[table]/indexes/+page.svelte | 47 ++++++----- .../table-[table]/indexes/createIndex.svelte | 70 ++++++++-------- .../table-[table]/indexes/deleteIndex.svelte | 10 +-- .../indexes/overviewIndex.svelte | 10 +-- .../table-[table]/relationshipsModal.svelte | 6 +- .../table-[table]/row-[row]/+layout.ts | 22 +++--- .../table-[table]/row-[row]/+page.svelte | 66 +++++++--------- .../table-[table]/row-[row]/activity/+page.ts | 2 +- .../row-[row]/breadcrumbs.svelte | 12 +-- .../table-[table]/row-[row]/column.svelte | 36 ++++----- .../table-[table]/row-[row]/columnForm.svelte | 12 +-- .../table-[table]/row-[row]/columnItem.svelte | 42 +++++----- .../row-[row]/columns/boolean.svelte | 6 +- .../row-[row]/columns/datetime.svelte | 6 +- .../row-[row]/columns/email.svelte | 8 +- .../row-[row]/columns/enum.svelte | 8 +- .../row-[row]/columns/integer.svelte | 12 +-- .../row-[row]/columns/relationship.svelte | 40 +++++----- .../table-[table]/row-[row]/columns/store.ts | 26 +++--- .../row-[row]/columns/string.svelte | 14 ++-- .../row-[row]/columns/url.svelte | 12 +-- .../table-[table]/row-[row]/delete.svelte | 23 +++--- .../table-[table]/row-[row]/header.svelte | 14 ++-- .../table-[table]/row-[row]/row.svelte | 40 ++++------ .../row-[row]/settings/+page.svelte | 39 +++++---- .../table-[table]/row-[row]/store.ts | 2 +- .../table-[table]/settings/+page.svelte | 4 +- .../table-[table]/settings/dangerZone.svelte | 6 +- .../table-[table]/settings/deleteTable.svelte | 8 +- .../table-[table]/settings/displayName.svelte | 13 +-- .../table-[table]/settings/updateName.svelte | 23 +++--- .../settings/updatePermissions.svelte | 25 +++--- .../settings/updateSecurity.svelte | 25 +++--- .../settings/updateStatus.svelte | 26 +++--- .../table-[table]/store.ts | 37 ++++----- .../table-[table]/subNavigation.svelte | 26 +++--- .../table-[table]/table.svelte | 79 +++++++++---------- .../usage/[[period]]/+page.svelte | 5 +- .../table-[table]/usage/[[period]]/+page.ts | 3 +- .../database-[database]/table.svelte | 52 ++++++------ .../usage/[[period]]/+page.svelte | 8 +- .../databases/usage/[[period]]/+page.svelte | 1 + .../databases/usage/[[period]]/+page.ts | 3 +- .../migrations/(import)/importReport.svelte | 5 +- .../settings/migrations/+page.svelte | 3 + .../settings/migrations/exportModal.svelte | 4 + .../file-[file]/manageFileToken.svelte | 5 +- 96 files changed, 961 insertions(+), 948 deletions(-) diff --git a/package.json b/package.json index 7438f6ce7..71e75ba6a 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "dependencies": { "@ai-sdk/svelte": "^1.1.24", - "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@56743f5", + "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@4ca420f", "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1", "@appwrite.io/pink-legacy": "^1.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 366c30233..9da094eea 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ importers: specifier: ^1.1.24 version: 1.1.24(svelte@5.25.3)(zod@3.24.3) '@appwrite.io/console': - specifier: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@56743f5 - version: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@56743f5 + specifier: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@4ca420f + version: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@4ca420f '@appwrite.io/pink-icons': specifier: 0.25.0 version: 0.25.0 @@ -257,8 +257,8 @@ packages: '@analytics/type-utils@0.6.2': resolution: {integrity: sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==} - '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@56743f5': - resolution: {tarball: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@56743f5} + '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@4ca420f': + resolution: {tarball: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@4ca420f} version: 1.9.0 '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@d521606fc63e0800b996f0fbb1a8d1f6907480ed': @@ -3636,7 +3636,7 @@ snapshots: '@analytics/type-utils@0.6.2': {} - '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@56743f5': {} + '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@4ca420f': {} '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@d521606fc63e0800b996f0fbb1a8d1f6907480ed(svelte@5.25.3)': dependencies: diff --git a/src/lib/commandCenter/panels/ai.svelte b/src/lib/commandCenter/panels/ai.svelte index 5f92593d2..b764cfd76 100644 --- a/src/lib/commandCenter/panels/ai.svelte +++ b/src/lib/commandCenter/panels/ai.svelte @@ -24,11 +24,10 @@ streamProtocol: 'text' }); - // TODO: change collections to tables after docs are updated! const examples = [ 'How to add platform in the console?', 'How can I manage users, permissions, and access control in Appwrite?', - 'How can I set up database collections and documents in Appwrite?', + 'How can I set up database tables and rows in Appwrite?', 'How do I configure and manage server-side functions in Appwrite?', 'How to add custom domain in the console?' ]; diff --git a/src/lib/commandCenter/searchers/tables.ts b/src/lib/commandCenter/searchers/tables.ts index 448b6f43f..1a8af1411 100644 --- a/src/lib/commandCenter/searchers/tables.ts +++ b/src/lib/commandCenter/searchers/tables.ts @@ -1,27 +1,25 @@ import { goto } from '$app/navigation'; -import { database } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/store'; -import { get } from 'svelte/store'; import type { Searcher } from '../commands'; import { sdk } from '$lib/stores/sdk'; import { base } from '$app/paths'; import { page } from '$app/state'; export const tablesSearcher = (async (query: string) => { - const databaseId = get(database).$id; - const { collections } = await sdk + const databaseId = page.params.database; + const { tables } = await sdk .forProject(page.params.region, page.params.project) - .databases.listCollections(databaseId); + .tables.list(databaseId); - return collections - .filter((col) => col.name.toLowerCase().includes(query.toLowerCase())) + return tables + .filter((table) => table.name.toLowerCase().includes(query.toLowerCase())) .map( - (col) => + (table) => ({ group: 'tables', - label: col.name, + label: table.name, callback: () => { goto( - `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/table-${col.$id}` + `${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/table-${table.$id}` ); } }) as const diff --git a/src/lib/components/columnSelector.svelte b/src/lib/components/columnSelector.svelte index 8deaa87a0..dfcc7e2d4 100644 --- a/src/lib/components/columnSelector.svelte +++ b/src/lib/components/columnSelector.svelte @@ -33,7 +33,7 @@ onMount(async () => { if (isCustomCollection) { - const prefs = preferences.getCustomCollectionColumns(page.params.table); + const prefs = preferences.getCustomTableColumns(page.params.table); columns.set( $columns.map((column) => { column.hide = prefs?.includes(column.id) ?? false; diff --git a/src/lib/components/csvImportBox.svelte b/src/lib/components/csvImportBox.svelte index 06a013aed..443463d00 100644 --- a/src/lib/components/csvImportBox.svelte +++ b/src/lib/components/csvImportBox.svelte @@ -13,7 +13,7 @@ type ImportItem = { status: string; - collection?: string; + table?: string; }; type ImportItemsMap = Map; @@ -22,15 +22,11 @@ * Keeps a track of the active and ongoing csv migrations. * * The structure is as follows - - * `{ migrationId: { status: status, collection: collection } }` + * `{ migrationId: { status: status, table: table } }` */ const importItems: Writable = writable(new Map()); - async function showCompletionNotification( - database: string, - collection: string, - payload: Payload - ) { + async function showCompletionNotification(database: string, table: string, payload: Payload) { const isSuccess = payload.status === 'completed'; const isError = !isSuccess && !!payload.errors; @@ -48,15 +44,15 @@ const type = isSuccess ? 'success' : 'error'; const message = isError ? errorMessage : 'CSV import finished successfully.'; - const url = `${base}/project-${page.params.region}-${page.params.project}/databases/database-${database}/table-${collection}`; + const url = `${base}/project-${page.params.region}-${page.params.project}/databases/database-${database}/table-${table}`; addNotification({ type, message, isHtml: true, buttons: - isSuccess && collection !== page.params.collection - ? [{ name: 'View documents', method: () => goto(url) }] + isSuccess && table !== page.params.table + ? [{ name: 'View rows', method: () => goto(url) }] : undefined }); @@ -70,19 +66,19 @@ const status = importData.status; const resourceId = importData.resourceId ?? ''; - const [databaseId, collectionId] = resourceId.split(':') ?? []; + const [databaseId, tableId] = resourceId.split(':') ?? []; const current = $importItems.get(importData.$id); - let collectionName = current?.collection ?? null; + let tableName = current?.table ?? null; - if (!collectionName && collectionId) { + if (!tableName && tableId) { try { - const collection = await sdk + const table = await sdk .forProject(page.params.region, page.params.project) - .databases.getCollection(databaseId, collectionId); - collectionName = collection.name; + .tables.get(databaseId, tableId); + tableName = table.name; } catch { - collectionName = null; + tableName = null; } } @@ -99,12 +95,12 @@ if (shouldSkip) return items; const next = new Map(items); - next.set(importData.$id, { status, collection: collectionName ?? undefined }); + next.set(importData.$id, { status, table: tableName ?? undefined }); return next; }); if (status === 'completed' || status === 'failed') { - await showCompletionNotification(databaseId, collectionId, importData); + await showCompletionNotification(databaseId, tableId, importData); } } @@ -172,7 +168,7 @@

- Importing documents ({$importItems.size}) + Importing rows ({$importItems.size})

+ ariaLabel="create buckets">Documentation - {#if isLoadingDocumentsCount} + {#if isLoadingRowsCount}
{/if} - {:else if collectionItems.length > 25} + {:else if tableItems.length > 25} {/if} {#if !$isSmallViewport}