From 5ed18eb79f972c2f1e5c27eb5c03403143cbfe5e Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 30 Jul 2025 11:40:33 +0530 Subject: [PATCH 1/4] refactor: tables > grid api. --- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- src/lib/commandCenter/searchers/tables.ts | 2 +- src/lib/components/csvImportBox.svelte | 2 +- src/lib/stores/sdk.ts | 4 ++-- .../databases/database-[database]/+page.ts | 2 +- .../database-[database]/createTable.svelte | 2 +- .../databases/database-[database]/delete.svelte | 2 +- .../database-[database]/settings/+page.svelte | 2 +- .../databases/database-[database]/string.svelte | 4 ++-- .../table-[table]/+layout.ts | 4 ++-- .../database-[database]/table-[table]/+page.ts | 2 +- .../table-[table]/activity/+page.ts | 2 +- .../table-[table]/columns/boolean.svelte | 4 ++-- .../table-[table]/columns/datetime.svelte | 4 ++-- .../table-[table]/columns/deleteColumn.svelte | 2 +- .../table-[table]/columns/email.svelte | 4 ++-- .../table-[table]/columns/enum.svelte | 4 ++-- .../table-[table]/columns/float.svelte | 4 ++-- .../table-[table]/columns/integer.svelte | 4 ++-- .../table-[table]/columns/ip.svelte | 4 ++-- .../table-[table]/columns/relationship.svelte | 6 +++--- .../table-[table]/columns/string.svelte | 4 ++-- .../table-[table]/columns/url.svelte | 4 ++-- .../table-[table]/create/+page.svelte | 2 +- .../table-[table]/indexes/createIndex.svelte | 17 +++++++++-------- .../table-[table]/indexes/deleteIndex.svelte | 2 +- .../table-[table]/row-[row]/+layout.ts | 6 +++--- .../table-[table]/row-[row]/+page.svelte | 2 +- .../table-[table]/row-[row]/activity/+page.ts | 2 +- .../row-[row]/columns/relationship.svelte | 2 +- .../table-[table]/row-[row]/delete.svelte | 2 +- .../table-[table]/row-[row]/row.svelte | 2 +- .../row-[row]/settings/+page.svelte | 2 +- .../table-[table]/settings/deleteTable.svelte | 2 +- .../table-[table]/settings/updateName.svelte | 2 +- .../settings/updatePermissions.svelte | 2 +- .../settings/updateSecurity.svelte | 2 +- .../table-[table]/settings/updateStatus.svelte | 2 +- .../table-[table]/table.svelte | 2 +- .../table-[table]/usage/[[period]]/+page.ts | 8 ++++---- .../databases/database-[database]/table.svelte | 2 +- 42 files changed, 73 insertions(+), 72 deletions(-) diff --git a/package.json b/package.json index a02a8af39f..22d4d4a2f0 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@935b30f", + "@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@c489ea0", "@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 81067a61a8..c0d12a22bf 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@935b30f - version: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@935b30f + specifier: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@c489ea0 + version: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@c489ea0 '@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@935b30f': - resolution: {tarball: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@935b30f} + '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@c489ea0': + resolution: {tarball: https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@c489ea0} version: 1.9.0 '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@fee5c539136e15c93cd3f2398d25cb217caa8dc8': @@ -3651,7 +3651,7 @@ snapshots: '@analytics/type-utils@0.6.2': {} - '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@935b30f': {} + '@appwrite.io/console@https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@c489ea0': {} '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@fee5c539136e15c93cd3f2398d25cb217caa8dc8(svelte@5.25.3)': dependencies: diff --git a/src/lib/commandCenter/searchers/tables.ts b/src/lib/commandCenter/searchers/tables.ts index 1a8af14119..8beff8e058 100644 --- a/src/lib/commandCenter/searchers/tables.ts +++ b/src/lib/commandCenter/searchers/tables.ts @@ -8,7 +8,7 @@ export const tablesSearcher = (async (query: string) => { const databaseId = page.params.database; const { tables } = await sdk .forProject(page.params.region, page.params.project) - .tables.list(databaseId); + .grids.listTables(databaseId); return tables .filter((table) => table.name.toLowerCase().includes(query.toLowerCase())) diff --git a/src/lib/components/csvImportBox.svelte b/src/lib/components/csvImportBox.svelte index 443463d002..48bef97ac5 100644 --- a/src/lib/components/csvImportBox.svelte +++ b/src/lib/components/csvImportBox.svelte @@ -75,7 +75,7 @@ try { const table = await sdk .forProject(page.params.region, page.params.project) - .tables.get(databaseId, tableId); + .grids.getTable(databaseId, tableId); tableName = table.name; } catch { tableName = null; diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts index 469a3b0385..2ef1fa0d66 100644 --- a/src/lib/stores/sdk.ts +++ b/src/lib/stores/sdk.ts @@ -21,7 +21,7 @@ import { Vcs, Sites, Tokens, - Tables, + Grids, Domains } from '@appwrite.io/console'; import { Billing } from '../sdk/billing'; @@ -124,7 +124,7 @@ const sdkForProject = { proxy: new Proxy(clientProject), migrations: new Migrations(clientProject), sites: new Sites(clientProject), - tables: new Tables(clientProject) + grids: new Grids(clientProject) }; export const realtime = { diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts index 9cb9662a7b..5d99e96f3e 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts @@ -14,7 +14,7 @@ export const load: PageLoad = async ({ params, url, route, depends }) => { const tables = await sdk .forProject(params.region, params.project) - .tables.list( + .grids.listTables( params.database, [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], search || undefined diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte index 87f8215d9b..39929480f2 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/createTable.svelte @@ -26,7 +26,7 @@ try { const table = await sdk .forProject(page.params.region, page.params.project) - .tables.create(databaseId, id ? id : ID.unique(), name); + .grids.createTable(databaseId, id ? id : ID.unique(), name); showCreate = false; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte index eab134fd32..e42de5ae70 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte @@ -47,7 +47,7 @@ tables = await sdk .forProject(page.params.region, page.params.project) - .tables.list(databaseId, queries); + .grids.listTables(databaseId, queries); const tablePromises = tables.tables.map(async (table) => { return { diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte index f5e7cab127..4543858360 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte @@ -28,7 +28,7 @@ async function loadTableCount() { const { total } = await sdk .forProject(page.params.region, page.params.project) - .tables.list($database.$id, [Query.limit(1)]); + .grids.listTables($database.$id, [Query.limit(1)]); return total; } diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte index c729c7a154..86ea8a2537 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte @@ -11,7 +11,7 @@ ) { await sdk .forProject(page.params.region, page.params.project) - .tables.createStringColumn( + .grids.createStringColumn( databaseId, tableId, key, @@ -29,7 +29,7 @@ ) { await sdk .forProject(page.params.region, page.params.project) - .tables.updateStringColumn( + .grids.updateStringColumn( databaseId, tableId, originalKey, diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts index 49c33070e3..474a4c67d5 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts @@ -10,11 +10,11 @@ export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.TABLE); const [table, allTables] = await Promise.all([ - sdk.forProject(params.region, params.project).tables.get(params.database, params.table), + sdk.forProject(params.region, params.project).grids.getTable(params.database, params.table), sdk .forProject(params.region, params.project) - .tables.list(params.database, [Query.orderDesc(''), Query.limit(100)]) + .grids.listTables(params.database, [Query.orderDesc(''), Query.limit(100)]) ]); return { diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts index 38538bf4dc..bcf2ab647f 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts @@ -27,7 +27,7 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) => query, rows: await sdk .forProject(params.region, params.project) - .tables.listRows(params.database, params.table, [ + .grids.listRows(params.database, params.table, [ Query.limit(limit), Query.offset(offset), Query.orderDesc(''), diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/activity/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/activity/+page.ts index eaf1207155..160286a61a 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/activity/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/activity/+page.ts @@ -14,7 +14,7 @@ export const load: PageLoad = async ({ params, url, route }) => { limit, logs: await sdk .forProject(params.region, params.project) - .tables.listLogs(params.database, params.table, [ + .grids.listTableLogs(params.database, params.table, [ Query.limit(limit), Query.offset(offset) ]) diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/boolean.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/boolean.svelte index 469b26690f..7c43d1f732 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/boolean.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/boolean.svelte @@ -11,7 +11,7 @@ ) { await sdk .forProject(page.params.region, page.params.project) - .tables.createBooleanColumn( + .grids.createBooleanColumn( databaseId, tableId, key, @@ -28,7 +28,7 @@ ) { await sdk .forProject(page.params.region, page.params.project) - .tables.updateBooleanColumn( + .grids.updateBooleanColumn( databaseId, tableId, originalKey, diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte index 358ad9b8bb..90a3e076fe 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte @@ -11,7 +11,7 @@ ) { await sdk .forProject(page.params.region, page.params.project) - .tables.createDatetimeColumn( + .grids.createDatetimeColumn( databaseId, tableId, key, @@ -29,7 +29,7 @@ ) { await sdk .forProject(page.params.region, page.params.project) - .tables.updateDatetimeColumn( + .grids.updateDatetimeColumn( databaseId, tableId, originalKey, diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/deleteColumn.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/deleteColumn.svelte index 2035710d13..e962d35abf 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/deleteColumn.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/deleteColumn.svelte @@ -23,7 +23,7 @@ try { await sdk .forProject(page.params.region, page.params.project) - .tables.deleteColumn(databaseId, $table.$id, selectedColumn.key); + .grids.deleteColumn(databaseId, $table.$id, selectedColumn.key); showDelete = false; addNotification({ diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/email.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/email.svelte index e3c68f216e..59fc70d70c 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/email.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/email.svelte @@ -11,7 +11,7 @@ ) { await sdk .forProject(page.params.region, page.params.project) - .tables.createEmailColumn( + .grids.createEmailColumn( databaseId, tableId, key, @@ -29,7 +29,7 @@ ) { await sdk .forProject(page.params.region, page.params.project) - .tables.updateEmailColumn( + .grids.updateEmailColumn( databaseId, tableId, originalKey, diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/enum.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/enum.svelte index 1ecc105420..fd9ad73f0b 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/enum.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/enum.svelte @@ -11,7 +11,7 @@ ) { await sdk .forProject(page.params.region, page.params.project) - .tables.createEnumColumn( + .grids.createEnumColumn( databaseId, tableId, key, @@ -30,7 +30,7 @@ ) { await sdk .forProject(page.params.region, page.params.project) - .tables.updateEnumColumn( + .grids.updateEnumColumn( databaseId, tableId, originalKey, diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/float.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/float.svelte index 9bcb213719..61069f2a5b 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/float.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/float.svelte @@ -11,7 +11,7 @@ ) { await sdk .forProject(page.params.region, page.params.project) - .tables.createFloatColumn( + .grids.createFloatColumn( databaseId, tableId, key, @@ -31,7 +31,7 @@ ) { await sdk .forProject(page.params.region, page.params.project) - .tables.updateFloatColumn( + .grids.updateFloatColumn( databaseId, tableId, originalKey, diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/integer.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/integer.svelte index 69695c3dd5..07a9a4414a 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/integer.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/integer.svelte @@ -11,7 +11,7 @@ ) { await sdk .forProject(page.params.region, page.params.project) - .tables.createIntegerColumn( + .grids.createIntegerColumn( databaseId, tableId, key, @@ -31,7 +31,7 @@ ) { await sdk .forProject(page.params.region, page.params.project) - .tables.updateIntegerColumn( + .grids.updateIntegerColumn( databaseId, tableId, originalKey, diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/ip.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/ip.svelte index e6018ec70d..6e977d5ad1 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/ip.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/ip.svelte @@ -11,7 +11,7 @@ ) { await sdk .forProject(page.params.region, page.params.project) - .tables.createIpColumn( + .grids.createIpColumn( databaseId, tableId, key, @@ -28,7 +28,7 @@ ) { await sdk .forProject(page.params.region, page.params.project) - .tables.updateIpColumn( + .grids.updateIpColumn( databaseId, tableId, originalKey, diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/relationship.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/relationship.svelte index 67c07808f6..896d5ca8ce 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/relationship.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/relationship.svelte @@ -21,7 +21,7 @@ await sdk .forProject(page.params.region, page.params.project) - .tables.createRelationshipColumn( + .grids.createRelationshipColumn( databaseId, tableId, data.relatedTable, @@ -45,7 +45,7 @@ await sdk .forProject(page.params.region, page.params.project) - .tables.updateRelationshipColumn( + .grids.updateRelationshipColumn( databaseId, tableId, originalKey, @@ -97,7 +97,7 @@ const queries = [Query.limit(100)]; return sdk .forProject(page.params.region, page.params.project) - .tables.list(databaseId, queries, search); + .grids.listTables(databaseId, queries, search); } const debouncedFetchTables = debounce(async () => { diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/string.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/string.svelte index 22372f60a3..ab3a830418 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/string.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/string.svelte @@ -11,7 +11,7 @@ ) { await sdk .forProject(page.params.region, page.params.project) - .tables.createStringColumn( + .grids.createStringColumn( databaseId, tableId, key, @@ -30,7 +30,7 @@ ) { await sdk .forProject(page.params.region, page.params.project) - .tables.updateStringColumn( + .grids.updateStringColumn( databaseId, tableId, originalKey, diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/url.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/url.svelte index cbc744918f..2cadeddfe2 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/url.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/url.svelte @@ -11,7 +11,7 @@ ) { await sdk .forProject(page.params.region, page.params.project) - .tables.createUrlColumn( + .grids.createUrlColumn( databaseId, tableId, key, @@ -29,7 +29,7 @@ ) { await sdk .forProject(page.params.region, page.params.project) - .tables.updateUrlColumn( + .grids.updateUrlColumn( databaseId, tableId, originalKey, diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/create/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/create/+page.svelte index f2ec17d3ec..8fd51dd9d1 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/create/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/create/+page.svelte @@ -53,7 +53,7 @@ try { const { $id } = await sdk .forProject(page.params.region, page.params.project) - .tables.createRow( + .grids.createRow( page.params.database, page.params.table, $createRow.id ?? ID.unique(), diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/createIndex.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/createIndex.svelte index 8a564fb52f..7507b04248 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/createIndex.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/createIndex.svelte @@ -75,14 +75,15 @@ } try { - await sdk.forProject(page.params.region, page.params.project).tables.createIndex( - databaseId, - $table.$id, - key, - selectedType, - columnList.map((a) => a.value), - columnList.map((a) => a.order), - columnList.map((a) => (a.length ? Number(a.length) : null)) + await sdk.forProject(page.params.region, page.params.project) + .grids.createIndex( + databaseId, + $table.$id, + key, + selectedType, + columnList.map((a) => a.value), + columnList.map((a) => a.order), + columnList.map((a) => (a.length ? Number(a.length) : null)) ); await Promise.allSettled([ diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/deleteIndex.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/deleteIndex.svelte index ecdcb395e4..6c392f3f3b 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/deleteIndex.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/deleteIndex.svelte @@ -20,7 +20,7 @@ try { await sdk .forProject(page.params.region, page.params.project) - .tables.deleteIndex(databaseId, $table.$id, selectedIndex.key); + .grids.deleteIndex(databaseId, $table.$id, selectedIndex.key); await invalidate(Dependencies.TABLE); showDelete = false; addNotification({ diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/+layout.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/+layout.ts index ea01397717..2b299e8306 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/+layout.ts @@ -12,13 +12,13 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => { const row = await sdk .forProject(params.region, params.project) - .tables.getRow(params.database, params.table, params.row, buildWildcardColumnsQuery(table)); + .grids.getRow(params.database, params.table, params.row, buildWildcardColumnsQuery(table)); /** * Sanitize DateTime to remove UTC Timezone section. */ - table.columns.forEach((column) => { - const { type, key, array } = column as unknown as Columns; + table.columns.forEach((column: Columns) => { + const { type, key, array } = column; if (type === 'datetime') { if (array) { row[key] = row[key].map((n: string) => { diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/+page.svelte index 6b83869b2a..fc61ffb249 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/+page.svelte @@ -51,7 +51,7 @@ try { await sdk .forProject(page.params.region, page.params.project) - .tables.updateRow(databaseId, tableId, rowId, $work, $work.$permissions); + .grids.updateRow(databaseId, tableId, rowId, $work, $work.$permissions); invalidate(Dependencies.ROW); trackEvent(Submit.RowUpdate); diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/activity/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/activity/+page.ts index ca69a70443..35dbfa22d6 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/activity/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/activity/+page.ts @@ -14,7 +14,7 @@ export const load: PageLoad = async ({ params, url, route }) => { limit, logs: await sdk .forProject(params.region, params.project) - .tables.listRowLogs(params.database, params.table, params.row, [ + .grids.listRowLogs(params.database, params.table, params.row, [ Query.limit(limit), Query.offset(offset) ]) diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/relationship.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/relationship.svelte index 311f4079e7..46619afecc 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/relationship.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/relationship.svelte @@ -63,7 +63,7 @@ return await sdk .forProject(page.params.region, page.params.project) - .tables.listRows(databaseId, column.relatedTable, queries); + .grids.listRows(databaseId, column.relatedTable, queries); } function getAvailableOptions(excludeIndex?: number) { diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/delete.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/delete.svelte index 32c23a2de8..5d1cf7892d 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/delete.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/delete.svelte @@ -20,7 +20,7 @@ try { await sdk .forProject(page.params.region, page.params.project) - .tables.deleteRow(databaseId, page.params.table, page.params.row); + .grids.deleteRow(databaseId, page.params.table, page.params.row); showDelete = false; addNotification({ type: 'success', diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/row.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/row.svelte index 535e7ca9ff..1318f4e774 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/row.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/row.svelte @@ -50,7 +50,7 @@ try { await sdk .forProject(page.params.region, page.params.project) - .tables.updateRow(databaseId, tableId, rowId, $work, $work.$permissions); + .grids.updateRow(databaseId, tableId, rowId, $work, $work.$permissions); await invalidate(Dependencies.ROW); currentRow = JSON.stringify($work); diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/settings/+page.svelte index b1ed736c67..27e94b0ccf 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/settings/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/settings/+page.svelte @@ -25,7 +25,7 @@ try { await sdk .forProject(page.params.region, page.params.project) - .tables.updateRow( + .grids.updateRow( $row.$databaseId, $row.$tableId, $row.$id, diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/deleteTable.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/deleteTable.svelte index 74a9e27d3f..c51e097fcd 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/deleteTable.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/deleteTable.svelte @@ -19,7 +19,7 @@ try { await sdk .forProject(page.params.region, page.params.project) - .tables.delete(databaseId, $table.$id); + .grids.deleteTable(databaseId, $table.$id); await invalidate(Dependencies.DATABASE); showDelete = false; addNotification({ diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateName.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateName.svelte index a2349261e7..641338d407 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateName.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateName.svelte @@ -22,7 +22,7 @@ try { await sdk .forProject(page.params.region, page.params.project) - .tables.update( + .grids.updateTable( databaseId, $table.$id, tableName, diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updatePermissions.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updatePermissions.svelte index 795125324a..bf9f3fe8cb 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updatePermissions.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updatePermissions.svelte @@ -27,7 +27,7 @@ try { await sdk .forProject(page.params.region, page.params.project) - .tables.update( + .grids.updateTable( databaseId, $table.$id, $table.name, diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateSecurity.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateSecurity.svelte index b06c557fdc..05cf901465 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateSecurity.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateSecurity.svelte @@ -22,7 +22,7 @@ try { await sdk .forProject(page.params.region, page.params.project) - .tables.update( + .grids.updateTable( databaseId, $table.$id, $table.name, diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateStatus.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateStatus.svelte index ce0ac93cea..699e996ee6 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateStatus.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/updateStatus.svelte @@ -23,7 +23,7 @@ try { await sdk .forProject(page.params.region, page.params.project) - .tables.update( + .grids.updateTable( databaseId, $table.$id, $table.name, diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/table.svelte index 0e28835663..ec4573bdaf 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/table.svelte @@ -107,7 +107,7 @@ const promises = selectedRows.map((rowId) => sdk .forProject(page.params.region, page.params.project) - .tables.deleteRow(databaseId, tableId, rowId) + .grids.deleteRow(databaseId, tableId, rowId) ); try { await Promise.all(promises); diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.ts index bd0a8843ee..9cdb7bdd1e 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/usage/[[period]]/+page.ts @@ -1,14 +1,14 @@ import { isValueOfStringEnum } from '$lib/helpers/types'; import { sdk } from '$lib/stores/sdk'; -import { DatabaseUsageRange } from '@appwrite.io/console'; +import { GridUsageRange } from '@appwrite.io/console'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params }) => { - const period = isValueOfStringEnum(DatabaseUsageRange, params.period) + const period = isValueOfStringEnum(GridUsageRange, params.period) ? params.period - : DatabaseUsageRange.ThirtyDays; + : GridUsageRange.ThirtyDays; return sdk .forProject(params.region, params.project) - .tables.getUsage(params.database, params.table, period); + .grids.getTableUsage(params.database, params.table, period); }; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte index 3cb279185e..4e4b4ae725 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table.svelte @@ -28,7 +28,7 @@ const promises = selectedTables.map((tableId) => sdk .forProject(page.params.region, page.params.project) - .tables.delete(databaseId, tableId) + .grids.deleteTable(databaseId, tableId) ); try { await Promise.all(promises); From 033fc26907d559b24dfd84c1ea13141315f904c4 Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 30 Jul 2025 11:58:37 +0530 Subject: [PATCH 2/4] =?UTF-8?q?updates:=20what=20`Databases`=20and=20what?= =?UTF-8?q?=20legacy=20APIs=3F=20=F0=9F=91=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/commandCenter/searchers/databases.ts | 2 +- src/lib/stores/sdk.ts | 2 -- .../databases/+page.ts | 2 +- .../databases/create.svelte | 2 +- .../databases/database-[database]/+layout.ts | 4 +++- .../databases/database-[database]/delete.svelte | 2 +- .../database-[database]/settings/+page.svelte | 2 +- .../table-[table]/indexes/createIndex.svelte | 17 ++++++++--------- .../row-[row]/settings/+page.svelte | 8 +------- .../usage/[[period]]/+page.ts | 3 ++- .../databases/usage/[[period]]/+page.ts | 3 ++- 11 files changed, 21 insertions(+), 26 deletions(-) diff --git a/src/lib/commandCenter/searchers/databases.ts b/src/lib/commandCenter/searchers/databases.ts index f50a1474d6..6775bfd4a0 100644 --- a/src/lib/commandCenter/searchers/databases.ts +++ b/src/lib/commandCenter/searchers/databases.ts @@ -8,7 +8,7 @@ import { page } from '$app/state'; export const dbSearcher = (async (query: string) => { const { databases } = await sdk .forProject(page.params.region, page.params.project) - .databases.list(); + .grids.listDatabases(); return databases .filter((db) => db.name.toLowerCase().includes(query.toLowerCase())) diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts index 2ef1fa0d66..66352c8adc 100644 --- a/src/lib/stores/sdk.ts +++ b/src/lib/stores/sdk.ts @@ -5,7 +5,6 @@ import { Avatars, Client, Console, - Databases, Functions, Health, Locale, @@ -109,7 +108,6 @@ const sdkForProject = { account: new Account(clientProject), avatars: new Avatars(clientProject), backups: new Backups(clientProject), - databases: new Databases(clientProject), functions: new Functions(clientProject), health: new Health(clientProject), locale: new Locale(clientProject), diff --git a/src/routes/(console)/project-[region]-[project]/databases/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/+page.ts index 35841ef153..5be2d24b37 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/+page.ts @@ -50,7 +50,7 @@ async function fetchDatabasesAndBackups( const databases = await sdk .forProject(params.region, params.project) - .databases.list( + .grids.listDatabases( [Query.limit(limit), Query.offset(offset), Query.orderDesc('$createdAt')], search || undefined ); diff --git a/src/routes/(console)/project-[region]-[project]/databases/create.svelte b/src/routes/(console)/project-[region]-[project]/databases/create.svelte index fdc6cb95f8..4582de8a63 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/create.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/create.svelte @@ -81,7 +81,7 @@ const databaseId = id ? id : ID.unique(); const database = await sdk .forProject(page.params.region, page.params.project) - .databases.create(databaseId, name); + .grids.createDatabase(databaseId, name); await createPolicies(databaseId); diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts index 03283b9676..cb1940da66 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+layout.ts @@ -10,6 +10,8 @@ export const load: LayoutLoad = async ({ params, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - database: await sdk.forProject(params.region, params.project).databases.get(params.database) + database: await sdk + .forProject(params.region, params.project) + .grids.getDatabase(params.database) }; }; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte index e42de5ae70..7fc4ebd8db 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/delete.svelte @@ -69,7 +69,7 @@ try { await sdk .forProject(page.params.region, page.params.project) - .databases.delete(databaseId); + .grids.deleteDatabase(databaseId); showDelete = false; addNotification({ type: 'success', diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte index 4543858360..acc93b8ad0 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/settings/+page.svelte @@ -42,7 +42,7 @@ try { await sdk .forProject(page.params.region, page.params.project) - .databases.update(page.params.database, databaseName); + .grids.updateDatabase(page.params.database, databaseName); await invalidate(Dependencies.DATABASE); addNotification({ message: 'Name has been updated', diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/createIndex.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/createIndex.svelte index 7507b04248..474cfca160 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/createIndex.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/indexes/createIndex.svelte @@ -75,15 +75,14 @@ } try { - await sdk.forProject(page.params.region, page.params.project) - .grids.createIndex( - databaseId, - $table.$id, - key, - selectedType, - columnList.map((a) => a.value), - columnList.map((a) => a.order), - columnList.map((a) => (a.length ? Number(a.length) : null)) + await sdk.forProject(page.params.region, page.params.project).grids.createIndex( + databaseId, + $table.$id, + key, + selectedType, + columnList.map((a) => a.value), + columnList.map((a) => a.order), + columnList.map((a) => (a.length ? Number(a.length) : null)) ); await Promise.allSettled([ diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/settings/+page.svelte index 27e94b0ccf..180694f189 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/settings/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/settings/+page.svelte @@ -25,13 +25,7 @@ try { await sdk .forProject(page.params.region, page.params.project) - .grids.updateRow( - $row.$databaseId, - $row.$tableId, - $row.$id, - $row.data, - permissions - ); + .grids.updateRow($row.$databaseId, $row.$tableId, $row.$id, $row.data, permissions); await invalidate(Dependencies.ROW); arePermsDisabled = true; addNotification({ diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.ts index 9b8f7d9a95..f809497396 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/usage/[[period]]/+page.ts @@ -4,10 +4,11 @@ import { DatabaseUsageRange } from '@appwrite.io/console'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params }) => { + // TODO: @Jake, should be GridUsageRange const period = isValueOfStringEnum(DatabaseUsageRange, params.period) ? params.period : DatabaseUsageRange.ThirtyDays; return sdk .forProject(params.region, params.project) - .databases.getDatabaseUsage(params.database, period); + .grids.getDatabaseUsage(params.database, period); }; diff --git a/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.ts index 70b9255be3..63dc3e7b46 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/usage/[[period]]/+page.ts @@ -4,9 +4,10 @@ import { DatabaseUsageRange } from '@appwrite.io/console'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params }) => { + // TODO: @Jake, should be GridUsageRange const period = isValueOfStringEnum(DatabaseUsageRange, params.period) ? params.period : DatabaseUsageRange.ThirtyDays; - return sdk.forProject(params.region, params.project).databases.listUsage(period); + return sdk.forProject(params.region, params.project).grids.listDatabaseUsage(period); }; From 83c8ef31dcb130aa5bb8f89904ee437e047ed33a Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 30 Jul 2025 14:19:10 +0530 Subject: [PATCH 3/4] Branch merge - 'main' into '1.8.x'. --- src/lib/components/filters/content.svelte | 2 +- src/lib/layout/gridHeader.svelte | 8 +----- .../database-[database]/string.svelte | 4 +-- .../table-[table]/+layout.svelte | 10 +++---- .../table-[table]/columns/boolean.svelte | 4 +-- .../columns/createColumnDropdown.svelte | 12 ++++---- .../table-[table]/columns/datetime.svelte | 4 +-- .../table-[table]/columns/edit.svelte | 2 +- .../table-[table]/columns/email.svelte | 4 +-- .../table-[table]/columns/enum.svelte | 4 +-- .../table-[table]/columns/float.svelte | 4 +-- .../table-[table]/columns/integer.svelte | 4 +-- .../table-[table]/columns/ip.svelte | 4 +-- .../table-[table]/columns/relationship.svelte | 4 +-- .../table-[table]/columns/string.svelte | 4 +-- .../table-[table]/columns/url.svelte | 4 +-- .../table-[table]/create/+page.svelte | 6 ++-- .../table-[table]/relationshipsModal.svelte | 2 +- .../table-[table]/row-[row]/+layout.ts | 2 +- .../table-[table]/row-[row]/columns/store.ts | 2 +- .../table-[table]/row-[row]/delete.svelte | 28 +++++++++---------- .../table-[table]/settings/displayName.svelte | 6 ++-- .../settings/updateStatus.svelte | 4 +-- .../table-[table]/store.ts | 8 +++--- .../table-[table]/subNavigation.svelte | 10 +++---- .../table-[table]/table.svelte | 28 +++++++++---------- 26 files changed, 83 insertions(+), 91 deletions(-) diff --git a/src/lib/components/filters/content.svelte b/src/lib/components/filters/content.svelte index 1fd218fb9f..5b9ca0d549 100644 --- a/src/lib/components/filters/content.svelte +++ b/src/lib/components/filters/content.svelte @@ -85,7 +85,7 @@
-
+ {title}
- +
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte index 86ea8a2537..66677ff538 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/string.svelte @@ -104,9 +104,9 @@ bind:value={data.default} /> {/if} - Indicate whether this is a required attribute + Indicate whether this is a required column - Indicate whether this attribute should act as an array, with the default value set as an empty + Indicate whether this column should act as an array, with the default value set as an empty array. diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte index b70d5b5cb7..e5a7dccdd2 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte @@ -2,13 +2,13 @@ import { writable } from 'svelte/store'; import type { Option } from './columns/store'; - const createAttributeArgs = writable({ + const createColumnArgs = writable({ showCreate: false, selectedOption: null as Option['name'] | null }); export const initCreateColumn = (option: Option['name']) => { - createAttributeArgs.set({ showCreate: true, selectedOption: option }); + createColumnArgs.set({ showCreate: true, selectedOption: option }); }; const showCreateIndex = writable(false); @@ -24,7 +24,7 @@ import { onMount } from 'svelte'; import { table } from './store'; import { addSubPanel, registerCommands, updateCommandGroupRanks } from '$lib/commandCenter'; - import CreateAttribute from './createColumn.svelte'; + import CreateColumn from './createColumn.svelte'; import { CreateColumnPanel } from '$lib/commandCenter/panels'; import { database } from '../store'; import { project } from '$routes/(console)/project-[region]-[project]/store'; @@ -204,8 +204,8 @@ -{#if $createAttributeArgs.showCreate} - +{#if $createColumnArgs.showCreate} + {/if} {#if $showCreateIndex} diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/boolean.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/boolean.svelte index 7c43d1f732..480d185174 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/boolean.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/boolean.svelte @@ -93,11 +93,11 @@ label="Required" bind:checked={data.required} disabled={data.array} - description="Indicate whether this attribute is required" /> + description="Indicate whether this column is required" /> + description="Indicate whether this column is an array. Defaults to an empty array." /> diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/createColumnDropdown.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/createColumnDropdown.svelte index c5d7298046..bfc31adc66 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/createColumnDropdown.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/createColumnDropdown.svelte @@ -14,26 +14,26 @@ {:else} - - {#each columnOptions as attribute} + {#each columnOptions as column} { - selectedOption = attribute.name; + selectedOption = column.name; showCreate = true; }}> - {attribute.name} + {column.name} {/each} diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte index 90a3e076fe..3de3454359 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/datetime.svelte @@ -85,11 +85,11 @@ label="Required" bind:checked={data.required} disabled={data.array} - description="Indicate whether this attribute is required" /> + description="Indicate whether this column is required" /> + description="Indicate whether this column is an array. Defaults to an empty array." /> diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/edit.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/edit.svelte index caccb58d9c..6911c33333 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/edit.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/edit.svelte @@ -53,7 +53,7 @@ } $: onShow(showEdit); - $: title = `Update ${columnOptions.find((v) => v.name === option.name)?.sentenceName ?? ''} attribute`; + $: title = `Update ${columnOptions.find((v) => v.name === option.name)?.sentenceName ?? ''} column`; function onShow(show: boolean) { if (show) { diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/email.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/email.svelte index 59fc70d70c..4e2cea63cb 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/email.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/email.svelte @@ -86,11 +86,11 @@ label="Required" bind:checked={data.required} disabled={data.array} - description="Indicate whether this attribute is required" /> + description="Indicate whether this column is required" /> + description="Indicate whether this column is an array. Defaults to an empty array." /> diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/enum.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/enum.svelte index fd9ad73f0b..0301326a74 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/enum.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/enum.svelte @@ -117,11 +117,11 @@ label="Required" bind:checked={data.required} disabled={data.array} - description="Indicate whether this attribute is required" /> + description="Indicate whether this column is required" /> + description="Indicate whether this column is an array. Defaults to an empty array." /> diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/float.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/float.svelte index 61069f2a5b..a984dc1f86 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/float.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/float.svelte @@ -115,11 +115,11 @@ label="Required" bind:checked={data.required} disabled={data.array} - description="Indicate whether this attribute is required" /> + description="Indicate whether this column is required" /> + description="Indicate whether this column is an array. Defaults to an empty array." /> diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/integer.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/integer.svelte index 07a9a4414a..b28e5cde8c 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/integer.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/integer.svelte @@ -113,11 +113,11 @@ label="Required" bind:checked={data.required} disabled={data.array} - description="Indicate whether this attribute is required" /> + description="Indicate whether this column is required" /> + description="Indicate whether this column is an array. Defaults to an empty array." /> diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/ip.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/ip.svelte index 6e977d5ad1..5688637a53 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/ip.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/ip.svelte @@ -85,11 +85,11 @@ label="Required" bind:checked={data.required} disabled={data.array} - description="Indicate whether this attribute is required" /> + description="Indicate whether this column is required" /> + description="Indicate whether this column is an array. Defaults to an empty array." /> diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/relationship.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/relationship.svelte index 896d5ca8ce..9026ce8517 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/relationship.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/relationship.svelte @@ -108,8 +108,8 @@ function updateKeyName() { if (!editing) { - const collection = tableList.tables.find((n) => n.$id === data.relatedTable); - data.key = camelize(collection.name); + const table = tableList.tables.find((n) => n.$id === data.relatedTable); + data.key = camelize(table.name); } } diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/string.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/string.svelte index ab3a830418..5ea2fc165f 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/string.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/string.svelte @@ -159,8 +159,8 @@ - Protect attribute against data leaks for best privacy compliance. Encrypted - attributes cannot be queried. + Protect column against data leaks for best privacy compliance. Encrypted + columns cannot be queried. diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/url.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/url.svelte index 2cadeddfe2..0c7a330532 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/url.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/columns/url.svelte @@ -86,11 +86,11 @@ label="Required" bind:checked={data.required} disabled={data.array} - description="Indicate whether this attribute is required" /> + description="Indicate whether this column is required" /> + description="Indicate whether this column is an array. Defaults to an empty array." /> diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/create/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/create/+page.svelte index 8fd51dd9d1..7b8a4bb65f 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/create/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/create/+page.svelte @@ -22,7 +22,7 @@ let formComponent: Form; let isSubmitting = writable(false); - type CreateDocument = { + type CreateRow = { id?: string; row: object; permissions: string[]; @@ -44,7 +44,7 @@ columns: availableColumns }; - return writable({ ...initial }); + return writable({ ...initial }); } const createRow = createRowWritable(); @@ -66,7 +66,7 @@ type: 'success' }); trackEvent(Submit.RowCreate, { - customId: !!$createRow.id // todo: @itznotabug - change store name + customId: !!$createRow.id }); goto( `${base}/project-${page.params.region}-${page.params.project}/databases/database-${page.params.database}/table-${page.params.table}/row-${$id}` diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/relationshipsModal.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/relationshipsModal.svelte index b834a00c76..c61a3ee1c6 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/relationshipsModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/relationshipsModal.svelte @@ -8,7 +8,7 @@ import { Table } from '@appwrite.io/pink-svelte'; export let show = false; - export let data: Partial[]; + export let data: Partial[]; export let selectedRelationship: Models.ColumnRelationship = null; const databaseId = page.params.database; const limit = 10; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/+layout.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/+layout.ts index 2b299e8306..c136e06d70 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/+layout.ts @@ -7,8 +7,8 @@ import type { Columns } from '../store'; import { buildWildcardColumnsQuery } from './columns/store'; export const load: LayoutLoad = async ({ params, parent, depends }) => { - depends(Dependencies.ROW); const { table } = await parent(); + depends(Dependencies.ROW); const row = await sdk .forProject(params.region, params.project) diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/store.ts index 454e2b0cba..7d92c8e229 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/store.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/columns/store.ts @@ -1,5 +1,5 @@ -import { type Models, Query } from '@appwrite.io/console'; import type { Columns } from '../../store'; +import { type Models, Query } from '@appwrite.io/console'; export function isRelationshipToMany(column: Models.ColumnRelationship) { if (!column) return false; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/delete.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/delete.svelte index 5d1cf7892d..5121b3af18 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/delete.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/row-[row]/delete.svelte @@ -45,17 +45,17 @@ 'restrict' = 'Row cannot be deleted' } - $: relColumns = $columns?.filter( - (attribute) => - isRelationship(attribute) && + $: relatedColumns = $columns?.filter( + (column) => + isRelationship(column) && // One-to-One are always included - (attribute.relationType === 'oneToOne' || + (column.relationType === 'oneToOne' || // One-to-Many: Only if parent is deleted - (attribute.relationType === 'oneToMany' && attribute.side === 'parent') || + (column.relationType === 'oneToMany' && column.side === 'parent') || // Many-to-One: Only include if child is deleted - (attribute.relationType === 'manyToOne' && attribute.side === 'child') || + (column.relationType === 'manyToOne' && column.side === 'child') || // Many-to-Many: Only include if the parent is being deleted - (isRelationshipToMany(attribute) && attribute.side === 'parent')) + (isRelationshipToMany(column) && column.side === 'parent')) ) as Models.ColumnRelationship[]; @@ -64,7 +64,7 @@ Are you sure you want to delete the row from {$table.name}?

- {#if relColumns?.length} + {#if relatedColumns?.length}

This row contains the following relationships:

Setting - {#each relColumns as attr} + {#each relatedColumns as column} - {#if attr.twoWay} + {#if column.twoWay} {:else} {/if} - {attr.key} + {column.key} - {attr.onDelete} + {column.onDelete} - {Deletion[attr.onDelete]} + {Deletion[column.onDelete]} {/each} @@ -109,6 +109,6 @@ - + diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/displayName.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/displayName.svelte index 81c643c6de..ce22763a8b 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/displayName.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/settings/displayName.svelte @@ -64,7 +64,7 @@ })); } - const addAttributeDisabled = $derived( + const addColumnDisabled = $derived( names?.length >= 5 || (names?.length && !names[names?.length - 1]) ); @@ -117,12 +117,12 @@ {/each} {/if} - + {#if !hasExhaustedOptions}
+ diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store.ts index 4b80c67a99..fc37bcb9c1 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/store.ts @@ -1,7 +1,7 @@ import { page } from '$app/stores'; -import { derived, writable } from 'svelte/store'; +import type { Column } from '$lib/helpers/types'; import type { Models } from '@appwrite.io/console'; -import type { Column as TableColumn } from '$lib/helpers/types'; +import { derived, writable } from 'svelte/store'; export type Columns = | Models.ColumnBoolean @@ -20,8 +20,8 @@ type Table = Omit & { export const table = derived(page, ($page) => $page.data.table as Table); export const columns = derived(page, ($page) => $page.data.table.columns as Columns[]); -export const indexes = derived(page, ($page) => $page.data.table.indexes as Models.ColumnIndex[]); +export const indexes = derived(page, ($page) => $page.data.table.indexes as Models.Index[]); -export const tableColumns = writable([]); +export const tableColumns = writable([]); export const isCsvImportInProgress = writable(false); diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/subNavigation.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/subNavigation.svelte index 2004e7dc8e..b8b21a21dc 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/subNavigation.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/subNavigation.svelte @@ -24,9 +24,7 @@ data?.allTables?.tables?.slice().sort((a, b) => a.name.localeCompare(b.name)) ); - const selectedTable = $derived.by(() => - sortedTables?.find((collection) => collection.$id === tableId) - ); + const selectedTable = $derived.by(() => sortedTables?.find((table) => table.$id === tableId)); let openBottomSheet = $state(false); @@ -111,11 +109,11 @@ bind:isOpen={openBottomSheet} menu={{ top: { - items: sortedTables.slice(0, 10).map((collection) => { + items: sortedTables.slice(0, 10).map((table) => { return { - name: collection.name, + name: table.name, leadingIcon: IconTable, - href: `${base}/project-${region}-${project}/databases/database-${databaseId}/table-${collection.$id}` + href: `${base}/project-${region}-${project}/databases/database-${databaseId}/table-${table.$id}` }; }) }, diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/table.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/table.svelte index ec4573bdaf..445dfdd9cf 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/table.svelte @@ -37,7 +37,7 @@ let displayNames = {}; let showRelationships = false; let selectedRelationship: Models.ColumnRelationship = null; - let relationshipData: Partial[]; + let relationshipData: Partial[]; onMount(async () => { displayNames = preferences.getDisplayNames(); @@ -135,17 +135,17 @@ 'restrict' = 'Row cannot be deleted' } - $: relAttributes = $columns?.filter( - (attribute) => - isRelationship(attribute) && + $: relatedColumns = $columns?.filter( + (column) => + isRelationship(column) && // One-to-One are always included - (attribute.relationType === 'oneToOne' || + (column.relationType === 'oneToOne' || // One-to-Many: Only if parent is deleted - (attribute.relationType === 'oneToMany' && attribute.side === 'parent') || + (column.relationType === 'oneToMany' && column.side === 'parent') || // Many-to-One: Only include if child is deleted - (attribute.relationType === 'manyToOne' && attribute.side === 'child') || + (column.relationType === 'manyToOne' && column.side === 'child') || // Many-to-Many: Only include if the parent is being deleted - (isRelationshipToMany(attribute) && attribute.side === 'parent')) + (isRelationshipToMany(column) && column.side === 'parent')) ) as Models.ColumnRelationship[]; let checked = false; @@ -233,14 +233,14 @@ {:else} {@const datetime = row[id]} {@const formatted = formatColumn(row[id])} - {@const isDatetimeAttribute = column.type === 'datetime'} - {@const isEncryptedAttribute = isString(column) && column.encrypt} - {#if isDatetimeAttribute} + {@const isDatetimeColumn = column.type === 'datetime'} + {@const isEncryptedColumn = isString(column) && column.encrypt} + {#if isDatetimeColumn} Timestamp {toLocaleDateTime(datetime, true)} - {:else if isEncryptedAttribute} + {:else if isEncryptedColumn}