From 033fc26907d559b24dfd84c1ea13141315f904c4 Mon Sep 17 00:00:00 2001 From: Darshan Date: Wed, 30 Jul 2025 11:58:37 +0530 Subject: [PATCH] =?UTF-8?q?updates:=20what=20`Databases`=20and=20what=20le?= =?UTF-8?q?gacy=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 f50a1474d..6775bfd4a 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 2ef1fa0d6..66352c8ad 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 35841ef15..5be2d24b3 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 fdc6cb95f..4582de8a6 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 03283b967..cb1940da6 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 e42de5ae7..7fc4ebd8d 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 454385836..acc93b8ad 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 7507b0424..474cfca16 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 27e94b0cc..180694f18 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 9b8f7d9a9..f80949739 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 70b9255be..63dc3e7b4 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); };