From d9d3b756dd7064804520ffd7cf92cb53b848db87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Wed, 8 Apr 2026 17:23:01 +0200 Subject: [PATCH] Fix build failures --- .../settings/BAA.svelte | 3 +- .../settings/BAAEnableModal.svelte | 3 +- .../overview/(components)/create.svelte | 18 +++--- .../overview/(components)/delete.svelte | 3 +- .../overview/(components)/deleteBatch.svelte | 9 +-- .../overview/(components)/keyDetails.svelte | 6 +- .../(components)/updateExpirationDate.svelte | 3 +- .../overview/api-keys/+page.ts | 4 +- .../overview/api-keys/[key]/+page.ts | 3 +- .../settings/migrations/+page.svelte | 50 ++++++++-------- .../settings/migrations/exportModal.svelte | 60 ++++++++++--------- .../settings/updateLabels.svelte | 2 +- 12 files changed, 80 insertions(+), 84 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/settings/BAA.svelte b/src/routes/(console)/organization-[organization]/settings/BAA.svelte index ba349d0c7..71a32f4d2 100644 --- a/src/routes/(console)/organization-[organization]/settings/BAA.svelte +++ b/src/routes/(console)/organization-[organization]/settings/BAA.svelte @@ -152,8 +152,7 @@ try { const result: Models.Addon | Models.PaymentAuthentication = await sdk.forConsole.organizations.createBaaAddon({ - organizationId: $organization.$id, - key: 'baa' + organizationId: $organization.$id }); if ('clientSecret' in result) { diff --git a/src/routes/(console)/organization-[organization]/settings/BAAEnableModal.svelte b/src/routes/(console)/organization-[organization]/settings/BAAEnableModal.svelte index 9fea57a93..36881a73c 100644 --- a/src/routes/(console)/organization-[organization]/settings/BAAEnableModal.svelte +++ b/src/routes/(console)/organization-[organization]/settings/BAAEnableModal.svelte @@ -31,8 +31,7 @@ try { const result: Models.Addon | Models.PaymentAuthentication = await sdk.forConsole.organizations.createBaaAddon({ - organizationId: $organization.$id, - key: 'baa' + organizationId: $organization.$id }); if ('clientSecret' in result) { diff --git a/src/routes/(console)/project-[region]-[project]/overview/(components)/create.svelte b/src/routes/(console)/project-[region]-[project]/overview/(components)/create.svelte index 4cb728f83..ed56fe2d0 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/(components)/create.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/(components)/create.svelte @@ -14,12 +14,10 @@ import { addNotification } from '$lib/stores/notifications'; import { writable } from 'svelte/store'; import Scopes from '../api-keys/scopes.svelte'; - import { type Scopes as ScopesType } from '@appwrite.io/console'; + import { ID, type Scopes as ScopesType } from '@appwrite.io/console'; import { page } from '$app/state'; import { copy } from '$lib/helpers/copy'; - const projectId = page.params.project; - let showExitModal = false; let formComponent: Form; let isSubmitting = writable(false); @@ -30,12 +28,14 @@ async function create() { try { - const { $id, secret } = await sdk.forConsole.projects.createKey({ - projectId, - name, - scopes, - expire: expire || undefined - }); + const { $id, secret } = await sdk + .forProject(page.params.region, page.params.project) + .project.createKey({ + keyId: ID.unique(), + name, + scopes, + expire: expire || undefined + }); if ($onboarding) { await invalidate(Dependencies.PROJECT); diff --git a/src/routes/(console)/project-[region]-[project]/overview/(components)/delete.svelte b/src/routes/(console)/project-[region]-[project]/overview/(components)/delete.svelte index 705551837..e00aebffd 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/(components)/delete.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/(components)/delete.svelte @@ -26,8 +26,7 @@ async function handleDelete() { try { isApiKey - ? await sdk.forConsole.projects.deleteKey({ - projectId, + ? await sdk.forProject(page.params.region, page.params.project).project.deleteKey({ keyId: key.$id }) : await sdk.forConsole.projects.deleteDevKey({ diff --git a/src/routes/(console)/project-[region]-[project]/overview/(components)/deleteBatch.svelte b/src/routes/(console)/project-[region]-[project]/overview/(components)/deleteBatch.svelte index 3a742d94c..34eeefd14 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/(components)/deleteBatch.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/(components)/deleteBatch.svelte @@ -27,10 +27,11 @@ await Promise.all( keyIds.map((key) => isApiKey - ? sdk.forConsole.projects.deleteKey({ - projectId, - keyId: key - }) + ? sdk + .forProject(page.params.region, page.params.project) + .project.deleteKey({ + keyId: key + }) : sdk.forConsole.projects.deleteDevKey({ projectId, keyId: key diff --git a/src/routes/(console)/project-[region]-[project]/overview/(components)/keyDetails.svelte b/src/routes/(console)/project-[region]-[project]/overview/(components)/keyDetails.svelte index da2487f86..6249101d3 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/(components)/keyDetails.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/(components)/keyDetails.svelte @@ -43,8 +43,7 @@ async function updateName() { try { if (isApiKey) { - await sdk.forConsole.projects.updateKey({ - projectId: $project.$id, + await sdk.forProject($project.region, $project.$id).project.updateKey({ keyId: key.$id, name, scopes, @@ -76,8 +75,7 @@ async function updateScopes() { try { - await sdk.forConsole.projects.updateKey({ - projectId: $project.$id, + await sdk.forProject($project.region, $project.$id).project.updateKey({ keyId: key.$id, name: key.name, scopes, diff --git a/src/routes/(console)/project-[region]-[project]/overview/(components)/updateExpirationDate.svelte b/src/routes/(console)/project-[region]-[project]/overview/(components)/updateExpirationDate.svelte index d39669a0f..8f2353b67 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/(components)/updateExpirationDate.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/(components)/updateExpirationDate.svelte @@ -28,8 +28,7 @@ async function updateExpire() { try { if (isApiKey) { - await sdk.forConsole.projects.updateKey({ - projectId, + await sdk.forProject(page.params.region, page.params.project).project.updateKey({ keyId: key.$id, name: key.name, scopes: (key as Models.Key).scopes as Scopes[], diff --git a/src/routes/(console)/project-[region]-[project]/overview/api-keys/+page.ts b/src/routes/(console)/project-[region]-[project]/overview/api-keys/+page.ts index 36fa8bbf5..7628733e6 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/api-keys/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/overview/api-keys/+page.ts @@ -5,8 +5,6 @@ import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, depends }) => { depends(Dependencies.KEYS); return { - keys: await sdk.forConsole.projects.listKeys({ - projectId: params.project - }) + keys: await sdk.forProject(params.region, params.project).project.listKeys() }; }; diff --git a/src/routes/(console)/project-[region]-[project]/overview/api-keys/[key]/+page.ts b/src/routes/(console)/project-[region]-[project]/overview/api-keys/[key]/+page.ts index 84421d00e..1e11cf7da 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/api-keys/[key]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/overview/api-keys/[key]/+page.ts @@ -7,8 +7,7 @@ import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, depends }) => { depends(Dependencies.KEY); - const key = await sdk.forConsole.projects.getKey({ - projectId: params.project, + const key = await sdk.forProject(params.region, params.project).project.getKey({ keyId: params.key }); if (key.expire) { diff --git a/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.svelte index 30c1c2248..7bed364e6 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/+page.svelte @@ -14,7 +14,7 @@ import Details from './details.svelte'; import ExportModal from './exportModal.svelte'; import { readOnly } from '$lib/stores/billing'; - import { Scopes, type Models } from '@appwrite.io/console'; + import { ID, Scopes, type Models } from '@appwrite.io/console'; import { canWriteProjects } from '$lib/stores/roles'; import { IconCloud, @@ -86,29 +86,31 @@ const deployToCloud = async () => { const currEndpoint = getCurrentEndpoint(); // Create API key - const { secret } = await sdk.forConsole.projects.createKey({ - projectId: $project.$id, - name: `[AUTO-GENERATED] Migration ${new Date().toISOString()}`, - scopes: [ - Scopes.UsersRead, - Scopes.TeamsRead, - Scopes.DatabasesRead, - Scopes.CollectionsRead /* legacy */, - Scopes.AttributesRead /* legacy */, - Scopes.IndexesRead, - Scopes.DocumentsRead /* legacy */, - Scopes.TablesRead, - Scopes.ColumnsRead, - Scopes.RowsRead, - Scopes.FilesRead, - Scopes.BucketsRead, - Scopes.FunctionsRead, - Scopes.ExecutionRead, - Scopes.LocaleRead, - Scopes.AvatarsRead, - Scopes.HealthRead - ] - }); + const { secret } = await sdk + .forProject(page.params.region, page.params.project) + .project.createKey({ + keyId: ID.unique(), + name: `[AUTO-GENERATED] Migration ${new Date().toISOString()}`, + scopes: [ + Scopes.UsersRead, + Scopes.TeamsRead, + Scopes.DatabasesRead, + Scopes.CollectionsRead /* legacy */, + Scopes.AttributesRead /* legacy */, + Scopes.IndexesRead, + Scopes.DocumentsRead /* legacy */, + Scopes.TablesRead, + Scopes.ColumnsRead, + Scopes.RowsRead, + Scopes.FilesRead, + Scopes.BucketsRead, + Scopes.FunctionsRead, + Scopes.ExecutionRead, + Scopes.LocaleRead, + Scopes.AvatarsRead, + Scopes.HealthRead + ] + }); const migrationData = { endpoint: currEndpoint, diff --git a/src/routes/(console)/project-[region]-[project]/settings/migrations/exportModal.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/exportModal.svelte index 9b9337f5a..d2e717718 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/migrations/exportModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/exportModal.svelte @@ -10,7 +10,7 @@ import { sdk } from '$lib/stores/sdk'; import { user } from '$lib/stores/user'; import { organization } from '$lib/stores/organization'; - import { Scopes } from '@appwrite.io/console'; + import { ID, Scopes } from '@appwrite.io/console'; export let show = false; @@ -88,34 +88,36 @@ const currEndpoint = getCurrentEndpoint(); // Create API key - const { secret } = await sdk.forConsole.projects.createKey({ - projectId: $project.$id, - name: `[AUTO-GENERATED] Migration ${new Date().toISOString()}`, - scopes: [ - Scopes.UsersRead, - Scopes.TeamsRead, - Scopes.DatabasesRead, - Scopes.CollectionsRead /* legacy */, - Scopes.AttributesRead /* legacy */, - Scopes.IndexesRead, - Scopes.DocumentsRead /* legacy */, - Scopes.TablesRead, - Scopes.ColumnsRead, - Scopes.RowsRead, - Scopes.FilesRead, - Scopes.BucketsRead, - Scopes.FunctionsRead, - Scopes.ExecutionRead, - Scopes.SitesRead, - Scopes.ProvidersRead, - Scopes.TopicsRead, - Scopes.SubscribersRead, - Scopes.MessagesRead, - Scopes.LocaleRead, - Scopes.AvatarsRead, - Scopes.HealthRead - ] - }); + const { secret } = await sdk + .forProject(page.params.region, page.params.project) + .project.createKey({ + keyId: ID.unique(), + name: `[AUTO-GENERATED] Migration ${new Date().toISOString()}`, + scopes: [ + Scopes.UsersRead, + Scopes.TeamsRead, + Scopes.DatabasesRead, + Scopes.CollectionsRead /* legacy */, + Scopes.AttributesRead /* legacy */, + Scopes.IndexesRead, + Scopes.DocumentsRead /* legacy */, + Scopes.TablesRead, + Scopes.ColumnsRead, + Scopes.RowsRead, + Scopes.FilesRead, + Scopes.BucketsRead, + Scopes.FunctionsRead, + Scopes.ExecutionRead, + Scopes.SitesRead, + Scopes.ProvidersRead, + Scopes.TopicsRead, + Scopes.SubscribersRead, + Scopes.MessagesRead, + Scopes.LocaleRead, + Scopes.AvatarsRead, + Scopes.HealthRead + ] + }); const migrationData = { endpoint: currEndpoint, diff --git a/src/routes/(console)/project-[region]-[project]/settings/updateLabels.svelte b/src/routes/(console)/project-[region]-[project]/settings/updateLabels.svelte index 21d324ec4..4bf47732c 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/updateLabels.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/updateLabels.svelte @@ -23,7 +23,7 @@ async function updateLabels() { try { - await sdk.forConsole.projects.updateLabels({ projectId: $project.$id, labels }); + await sdk.forProject($project.region, $project.$id).project.updateLabels({ labels }); await invalidate(Dependencies.PROJECT); isDisabled = true; addNotification({