From 43de6fae0a8a13b2ccab5e548f687f3d8851886a Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 2 May 2025 14:15:20 +0200 Subject: [PATCH] chore: merge conflicts --- pnpm-lock.yaml | 86 +++++-- src/lib/commandCenter/searchers/functions.ts | 22 +- .../billing/alerts/paymentFailed.svelte | 4 +- src/lib/components/bottomModalAlert.svelte | 4 +- src/lib/components/feedback/feedback.svelte | 2 +- .../components/git/connectRepoModal.svelte | 13 +- .../git/productionBranchFieldset.svelte | 8 +- src/lib/components/git/repositories.svelte | 31 ++- src/lib/components/git/selectRootModal.svelte | 31 ++- src/lib/components/limit.svelte | 2 +- src/lib/components/logs/loggingAlert.svelte | 4 +- src/lib/components/migrationBox.svelte | 4 +- src/lib/helpers/flag.ts | 6 +- src/lib/helpers/load.ts | 15 +- src/lib/helpers/project.ts | 6 +- src/lib/layout/shell.svelte | 2 +- src/lib/pages/domains/create.svelte | 4 +- src/lib/pages/domains/index.svelte | 2 +- src/lib/pages/domains/wizard/step1.svelte | 2 +- src/lib/stores/git.ts | 5 +- src/routes/(console)/+layout.svelte | 6 +- .../(console)/account/activity/+page.ts | 2 +- .../(console)/account/organizations/+page.ts | 2 +- .../account/payments/addressModal.svelte | 6 +- .../organization-[organization]/+page.ts | 2 +- .../budgetLimitAlert.svelte | 4 +- .../domains/+page.ts | 2 +- .../teamReadonlyAlert.svelte | 4 +- .../project-[region]-[project]/+layout.svelte | 4 +- .../project-[region]-[project]/auth/+page.ts | 2 +- .../auth/createTeam.svelte | 4 +- .../auth/createUser.svelte | 4 +- .../auth/teams/+page.ts | 2 +- .../auth/teams/team-[team]/activity/+page.ts | 2 +- .../auth/teams/team-[team]/breadcrumbs.svelte | 8 +- .../auth/teams/team-[team]/members/+page.ts | 2 +- .../auth/user-[user]/activity/+page.ts | 2 +- .../auth/user-[user]/breadcrumbs.svelte | 8 +- .../auth/user-[user]/identities/+page.ts | 2 +- .../auth/user-[user]/targets/+page.ts | 2 +- .../auth/user-[user]/updateEmail.svelte | 4 +- .../auth/user-[user]/updateName.svelte | 4 +- .../auth/user-[user]/updatePassword.svelte | 4 +- .../auth/user-[user]/updatePhone.svelte | 4 +- .../auth/user-[user]/updateStatus.svelte | 8 +- .../createVariableModal.svelte | 2 +- .../databases/+page.svelte | 8 +- .../databases/+page.ts | 2 +- .../databases/database-[database]/+page.ts | 2 +- .../database-[database]/backups/+page.ts | 2 +- .../collection-[collection]/+page.ts | 2 +- .../collection-[collection]/activity/+page.ts | 2 +- .../attributes/boolean.svelte | 9 +- .../attributes/datetime.svelte | 8 +- .../attributes/float.svelte | 8 +- .../attributes/ip.svelte | 8 +- .../attributes/string.svelte | 8 +- .../breadcrumbs.svelte | 8 +- .../create/+page.svelte | 20 +- .../document-[document]/activity/+page.ts | 2 +- .../document-[document]/breadcrumbs.svelte | 8 +- .../document-[document]/data/+page.svelte | 2 +- .../document-[document]/document.svelte | 2 +- .../indexes/deleteIndex.svelte | 2 +- .../settings/updateName.svelte | 2 +- .../settings/updatePermissions.svelte | 2 +- .../settings/updateSecurity.svelte | 2 +- .../settings/updateStatus.svelte | 2 +- .../createCollection.svelte | 2 +- .../databases/database-[database]/grid.svelte | 2 +- .../database-[database]/string.svelte | 8 +- .../databases/grid.svelte | 2 +- .../functions/breadcrumbs.svelte | 6 +- .../functions/create-function/+page.svelte | 2 +- .../create-function/manual/+page.svelte | 82 +++---- .../repository-[repository]/+page.svelte | 81 +++---- .../repository-[repository]/+page.ts | 4 +- .../repository-[repository]/repoCard.svelte | 4 +- .../template-[template]/+page.svelte | 98 ++++---- .../template-[template]/+page.ts | 4 +- .../template-[template]/configuration.svelte | 2 +- .../(components)/deploymentCard.svelte | 2 +- .../(modals)/activateModal.svelte | 13 +- .../(modals)/createGit.svelte | 84 +++---- .../(modals)/createManual.svelte | 11 +- .../functions/function-[function]/+page.ts | 2 +- .../function-[function]/breadcrumbs.svelte | 8 +- .../breadcrumbs.svelte | 8 +- .../deployment-[deployment]/header.svelte | 2 +- .../function-[function]/domains/+page.ts | 2 +- .../domains/add-domain/+page.svelte | 67 +++--- .../domains/add-domain/+page.ts | 21 +- .../add-domain/verify-[domain]/+page.svelte | 8 +- .../domains/deleteDomainModal.svelte | 5 +- .../domains/retryDomainModal.svelte | 5 +- .../executions/+layout.svelte | 4 +- .../function-[function]/executions/+page.ts | 2 +- .../settings/disconnectRepo.svelte | 2 +- .../settings/updateBuildCommand.svelte | 40 ++-- .../settings/updateEvents.svelte | 2 +- .../settings/updateName.svelte | 2 +- .../settings/updatePermissions.svelte | 2 +- .../settings/updateRepository.svelte | 93 ++++---- .../settings/updateResourceLimits.svelte | 40 ++-- .../settings/updateSchedule.svelte | 2 +- .../settings/updateScopes.svelte | 2 +- .../settings/updateTimeout.svelte | 2 +- .../function-[function]/table.svelte | 3 +- .../functions/usage/[[period]]/+page.svelte | 2 +- .../functions/usage/[[period]]/+page.ts | 2 +- .../messaging/+page.ts | 2 +- .../messaging/breadcrumbs.svelte | 6 +- .../create-[type]/(type)/email.svelte | 36 +-- .../create-[type]/(type)/push.svelte | 44 ++-- .../messaging/create-[type]/(type)/sms.svelte | 26 ++- .../messaging/create.svelte | 8 +- .../message-[message]/breadcrumbs.svelte | 6 +- .../message-[message]/cancelModal.svelte | 8 +- .../message-[message]/emailMessage.svelte | 4 +- .../messaging/message-[message]/header.svelte | 2 +- .../message-[message]/scheduleModal.svelte | 8 +- .../messaging/providers/+page.ts | 2 +- .../messaging/providers/create.svelte | 210 ++++++++++-------- .../provider-[provider]/header.svelte | 3 +- .../provider-[provider]/updateName.svelte | 22 +- .../messaging/topics/+page.ts | 2 +- .../messaging/topics/create.svelte | 4 +- .../topic-[topic]/settings/updateName.svelte | 4 +- .../settings/updatePermissions.svelte | 2 +- .../messaging/wizard/emailFormList.svelte | 2 +- .../overview/breadcrumbs.svelte | 4 +- .../keys/[key]/+page@project-[project].svelte | 165 -------------- .../overview/keys/[key]/breadcrumbs.svelte | 8 +- .../overview/keys/[key]/header.svelte | 2 +- .../overview/keys/action.svelte | 3 +- .../overview/keys/create/+page.svelte | 8 +- .../platforms/[platform]/header.svelte | 2 +- .../overview/platforms/wizard/skipped.svelte | 4 +- .../platforms/wizard/web/step3.svelte | 4 +- .../overview/store.ts | 5 +- .../settings/+layout.svelte | 4 +- .../settings/breadcrumbs.svelte | 6 +- .../settings/domains/add-domain/+page.svelte | 6 +- .../settings/domains/add-domain/+page.ts | 10 +- .../add-domain/verify-[domain]/+page.svelte | 8 +- .../settings/domains/deleteDomainModal.svelte | 4 +- .../settings/domains/retryDomainModal.svelte | 4 +- .../settings/migrations/(import)/step2.svelte | 4 +- .../migrations/(import)/wizard.svelte | 10 +- .../webhooks/[webhook]/breadcrumbs.svelte | 8 +- .../settings/webhooks/[webhook]/header.svelte | 2 +- .../settings/webhooks/create/+page.svelte | 6 +- .../settings/webhooks/failedModal.svelte | 2 +- .../(components)/deploymentActionMenu.svelte | 24 +- .../(components)/openOnMobileModal.svelte | 2 +- .../project-[region]-[project]/sites/+page.ts | 10 +- .../sites/activateDeploymentModal.svelte | 4 +- .../sites/create-site/+layout.ts | 4 +- .../create-site/createVariableModal.svelte | 4 +- .../sites/create-site/deploying/+page.svelte | 6 +- .../sites/create-site/deploying/+page.ts | 26 ++- .../sites/create-site/finish/+page.svelte | 50 +++-- .../sites/create-site/finish/+page.ts | 20 +- .../sites/create-site/manual/+page.svelte | 85 +++---- .../sites/create-site/manual/+page.ts | 4 +- .../sites/create-site/manual/aside.svelte | 2 +- .../create-site/repositories/+page.svelte | 9 +- .../repository-[repository]/+page.svelte | 90 ++++---- .../repository-[repository]/+page.ts | 4 +- .../sites/create-site/templates/+page.svelte | 6 +- .../sites/create-site/templates/+page.ts | 4 +- .../template-[template]/+page.svelte | 96 ++++---- .../templates/template-[template]/+page.ts | 4 +- .../template-[template]/configuration.svelte | 2 +- .../create-site/updateVariableModal.svelte | 3 +- .../sites/createSiteModal.svelte | 6 +- .../sites/grid.svelte | 4 +- .../sites/header.svelte | 2 +- .../sites/redeployModal.svelte | 9 +- .../sites/site-[site]/+layout.ts | 4 +- .../sites/site-[site]/+page.ts | 36 +-- .../site-[site]/deployments/+layout.svelte | 24 +- .../site-[site]/deployments/+page.svelte | 42 ++-- .../sites/site-[site]/deployments/+page.ts | 20 +- .../deployments/cancelDeploymentModal.svelte | 10 +- .../createGitDeploymentModal.svelte | 82 +++---- .../deployments/deleteDeploymentModal.svelte | 9 +- .../deployment-[deployment]/+page.ts | 18 +- .../deployment-[deployment]/header.svelte | 2 +- .../deployments/deploymentMetrics.svelte | 4 +- .../site-[site]/deployments/table.svelte | 2 +- .../site-[site]/deploymentsOverview.svelte | 4 +- .../sites/site-[site]/domains/+page.svelte | 4 +- .../sites/site-[site]/domains/+page.ts | 34 +-- .../domains/add-domain/+page.svelte | 64 +++--- .../site-[site]/domains/add-domain/+page.ts | 19 +- .../add-domain/verify-[domain]/+page.svelte | 8 +- .../domains/createPreviewDomainModal.svelte | 10 +- .../domains/deleteDomainModal.svelte | 4 +- .../domains/retryDomainModal.svelte | 4 +- .../sites/site-[site]/domainsOverview.svelte | 4 +- .../sites/site-[site]/header.svelte | 5 +- .../site-[site]/instantRollbackModal.svelte | 7 +- .../sites/site-[site]/logs/+page.ts | 14 +- .../sites/site-[site]/settings/+page.svelte | 14 +- .../sites/site-[site]/settings/+page.ts | 12 +- .../site-[site]/settings/deleteModal.svelte | 4 +- .../settings/disconnectRepo.svelte | 41 ++-- .../settings/updateBuildSettings.svelte | 41 ++-- .../site-[site]/settings/updateLogging.svelte | 41 ++-- .../site-[site]/settings/updateName.svelte | 40 ++-- .../settings/updateRepository.svelte | 94 ++++---- .../settings/updateResourceLimits.svelte | 43 ++-- .../settings/updateRuntimeSettings.svelte | 41 ++-- .../site-[site]/settings/updateTimeout.svelte | 41 ++-- .../site-[site]/usage/[[period]]/+page.svelte | 4 +- .../site-[site]/usage/[[period]]/+page.ts | 4 +- .../sites/sitesActionMenu.svelte | 4 +- .../sites/table.svelte | 4 +- .../sites/usage/[[period]]/+page.svelte | 2 +- .../sites/usage/[[period]]/+page.ts | 2 +- .../storage/+page.ts | 2 +- .../storage/bucket-[bucket]/+page.ts | 2 +- .../bucket-[bucket]/breadcrumbs.svelte | 8 +- .../bucket-[bucket]/create/+page.svelte | 6 +- .../storage/bucket-[bucket]/deleteFile.svelte | 4 +- .../file-[file]/breadcrumbs.svelte | 8 +- .../bucket-[bucket]/file-[file]/header.svelte | 2 +- .../bucket-[bucket]/settings/+page.svelte | 1 + .../storage/create.svelte | 4 +- .../storage/table.svelte | 4 +- .../updateVariablesModal.svelte | 2 +- .../(console)/wizard/feedback/step1.svelte | 2 +- 233 files changed, 1684 insertions(+), 1582 deletions(-) delete mode 100644 src/routes/(console)/project-[region]-[project]/overview/keys/[key]/+page@project-[project].svelte diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9d4e84121..64c21fcb0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,10 +10,13 @@ importers: dependencies: '@ai-sdk/svelte': specifier: ^1.1.24 - version: 1.1.24(svelte@4.2.19)(zod@3.24.2) + version: 1.1.24(svelte@5.25.3)(zod@3.24.3) '@appwrite.io/console': - specifier: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@e2f082e - version: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@e2f082e + specifier: 1.6.0 + version: 1.6.0 + '@appwrite.io/pink': + specifier: 0.25.0 + version: 0.25.0 '@appwrite.io/pink-icons': specifier: 0.25.0 version: 0.25.0 @@ -251,9 +254,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/appwrite/@appwrite.io/console@e2f082e': - resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@e2f082e} - version: 1.2.1 + '@appwrite.io/console@1.6.0': + resolution: {integrity: sha512-o8dvCeJcnMORozB2NdLCiN042HyyLLQzteiTelU83dTgp7q2E1DTKu69hFwyMgoEXqcxMmKeJKmMI/1qt002IQ==} '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f': resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f} @@ -283,6 +285,9 @@ packages: react-dom: ^18.0.0 svelte: ^4.0.0 + '@appwrite.io/pink@0.25.0': + resolution: {integrity: sha512-9z4G/iAhjvVpM7tkNqzGqrokst4hvNt3Fkf2jD4W6n8j//EJbQ3mJ0I+5dye5Sry0a33wUanq5DSztqFNYq5zw==} + '@asamuzakjp/css-color@3.1.1': resolution: {integrity: sha512-hpRD68SV2OMcZCsrbdkccTw5FXjNDLo5OuqSHyHZfwweGsDWZwDJ2+gONyNAbazZclobMirACLw0lk8WVxIqxA==} @@ -2091,6 +2096,9 @@ packages: resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==} engines: {node: '>=4.0'} + estree-walker@2.0.2: + resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==} + estree-walker@3.0.3: resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==} @@ -2098,6 +2106,10 @@ packages: resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} engines: {node: '>=0.10.0'} + eventsource-parser@1.0.0: + resolution: {integrity: sha512-9jgfSCa3dmEme2ES3mPByGXfgZ87VbP97tng1G2nWwWx6bV2nYxm2AWCrbQjXToSe+yYlqaZNtxffR9IeQr95g==} + engines: {node: '>=14.18'} + eventsource-parser@3.0.0: resolution: {integrity: sha512-T1C0XCUimhxVQzW4zFipdx0SficT651NnkR0ZSH3yQwh+mFMdLfgjABVi4YtMTtaL4s168593DaoaRLMqryavA==} engines: {node: '>=18.0.0'} @@ -2650,6 +2662,9 @@ packages: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} + normalize.css@8.0.1: + resolution: {integrity: sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==} + nwsapi@2.2.20: resolution: {integrity: sha512-/ieB+mDe4MrrKMT8z+mQL8klXydZWGR5Dowt4RAGKbJ3kIGEx3X4ljUo+6V73IXtUPWgfOlU5B9MlGxFO5T+cA==} @@ -2957,6 +2972,9 @@ packages: scheduler@0.23.2: resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==} + secure-json-parse@2.7.0: + resolution: {integrity: sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==} + semver@6.3.1: resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} hasBin: true @@ -3519,6 +3537,14 @@ packages: zimmerframe@1.1.2: resolution: {integrity: sha512-rAbqEGa8ovJy4pyBxZM70hg4pE6gDgaQ0Sl9M3enG3I0d6H4XSAM3GeNGLKnsBpuijUow064sf7ww1nutC5/3w==} + zod-to-json-schema@3.24.5: + resolution: {integrity: sha512-/AuWwMP+YqiPbsJx5D6TfgRTc4kTLjsh5SOcd4bLsfUg2RcEXrFMJl1DGgdHy2aCfsIA/cr/1JM0xcB2GZji8g==} + peerDependencies: + zod: ^3.24.1 + + zod@3.24.3: + resolution: {integrity: sha512-HhY1oqzWCQWuUqvBFnsyrtZRhyPeR7SUGv+C4+MsisMuVfSPx8HpwWqH8tRahSlt6M3PiFAcoeFhZAqIXTxoSg==} + zrender@5.6.1: resolution: {integrity: sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==} @@ -3529,35 +3555,35 @@ snapshots: '@adobe/css-tools@4.4.2': {} - '@ai-sdk/provider-utils@2.1.13(zod@3.24.2)': + '@ai-sdk/provider-utils@2.1.13(zod@3.24.3)': dependencies: '@ai-sdk/provider': 1.0.11 eventsource-parser: 3.0.0 - nanoid: 3.3.9 + nanoid: 3.3.11 secure-json-parse: 2.7.0 optionalDependencies: - zod: 3.24.2 + zod: 3.24.3 '@ai-sdk/provider@1.0.11': dependencies: json-schema: 0.4.0 - '@ai-sdk/svelte@1.1.24(svelte@4.2.19)(zod@3.24.2)': + '@ai-sdk/svelte@1.1.24(svelte@5.25.3)(zod@3.24.3)': dependencies: - '@ai-sdk/provider-utils': 2.1.13(zod@3.24.2) - '@ai-sdk/ui-utils': 1.1.19(zod@3.24.2) + '@ai-sdk/provider-utils': 2.1.13(zod@3.24.3) + '@ai-sdk/ui-utils': 1.1.19(zod@3.24.3) optionalDependencies: - svelte: 4.2.19 + svelte: 5.25.3 transitivePeerDependencies: - zod - '@ai-sdk/ui-utils@1.1.19(zod@3.24.2)': + '@ai-sdk/ui-utils@1.1.19(zod@3.24.3)': dependencies: '@ai-sdk/provider': 1.0.11 - '@ai-sdk/provider-utils': 2.1.13(zod@3.24.2) - zod-to-json-schema: 3.24.3(zod@3.24.2) + '@ai-sdk/provider-utils': 2.1.13(zod@3.24.3) + zod-to-json-schema: 3.24.5(zod@3.24.3) optionalDependencies: - zod: 3.24.2 + zod: 3.24.3 '@ampproject/remapping@2.3.0': dependencies: @@ -3598,7 +3624,7 @@ snapshots: '@analytics/type-utils@0.6.2': {} - '@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@e2f082e': {} + '@appwrite.io/console@1.6.0': {} '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f(svelte@5.25.3)': dependencies: @@ -3633,6 +3659,12 @@ snapshots: svelte-motion: 0.12.2(svelte@5.25.3) svelte-sonner: 0.3.28(svelte@5.25.3) + '@appwrite.io/pink@0.25.0': + dependencies: + '@appwrite.io/pink-icons': 0.25.0 + normalize.css: 8.0.1 + the-new-css-reset: 1.11.3 + '@asamuzakjp/css-color@3.1.1': dependencies: '@csstools/css-calc': 2.1.2(@csstools/css-parser-algorithms@3.0.4(@csstools/css-tokenizer@3.0.3))(@csstools/css-tokenizer@3.0.3) @@ -5688,12 +5720,16 @@ snapshots: estraverse@5.3.0: {} + estree-walker@2.0.2: {} + estree-walker@3.0.3: dependencies: '@types/estree': 1.0.7 esutils@2.0.3: {} + eventsource-parser@1.0.0: {} + eventsource-parser@3.0.0: {} expect-type@1.2.0: {} @@ -6218,6 +6254,8 @@ snapshots: normalize-path@3.0.0: {} + normalize.css@8.0.1: {} + nwsapi@2.2.20: {} object-inspect@1.13.4: {} @@ -6400,6 +6438,10 @@ snapshots: react-is@17.0.2: {} + react@18.3.1: + dependencies: + loose-envify: 1.4.0 + readdirp@3.6.0: dependencies: picomatch: 2.3.1 @@ -6528,6 +6570,8 @@ snapshots: dependencies: loose-envify: 1.4.0 + secure-json-parse@2.7.0: {} + semver@6.3.1: {} semver@7.7.1: {} @@ -7083,6 +7127,12 @@ snapshots: zimmerframe@1.1.2: {} + zod-to-json-schema@3.24.5(zod@3.24.3): + dependencies: + zod: 3.24.3 + + zod@3.24.3: {} + zrender@5.6.1: dependencies: tslib: 2.3.0 diff --git a/src/lib/commandCenter/searchers/functions.ts b/src/lib/commandCenter/searchers/functions.ts index 3b36de894..d28992964 100644 --- a/src/lib/commandCenter/searchers/functions.ts +++ b/src/lib/commandCenter/searchers/functions.ts @@ -4,7 +4,7 @@ import { project } from '$routes/(console)/project-[region]-[project]/store'; import { get } from 'svelte/store'; import type { Searcher } from '../commands'; import type { Models } from '@appwrite.io/console'; -import { page } from '$app/stores'; +import { page } from '$app/state'; import { showCreateDeployment } from '$routes/(console)/project-[region]-[project]/functions/function-[function]/store'; import { base } from '$app/paths'; import { IconLightningBolt, IconPlus } from '@appwrite.io/pink-icons-svelte'; @@ -21,10 +21,9 @@ const getFunctionCommand = (fn: Models.Function, region: string, projectId: stri }; export const functionsSearcher = (async (query: string) => { - const $page = get(page); const projectId = get(project).$id; const { functions } = await sdk - .forProject($page.params.region, $page.params.project) + .forProject(page.params.region, page.params.project) .functions.list(); const filtered = functions.filter((fn) => fn.name.toLowerCase().includes(query.toLowerCase())); @@ -32,15 +31,14 @@ export const functionsSearcher = (async (query: string) => { if (filtered.length === 1) { const func = filtered[0]; return [ - getFunctionCommand(func, $page.params.region, projectId), + getFunctionCommand(func, page.params.region, projectId), { label: 'Create deployment', nested: true, async callback() { - const $page = get(page); - if (!$page.url.pathname.endsWith(func.$id)) { + if (!page.url.pathname.endsWith(func.$id)) { await goto( - `${base}/project-${$page.params.region}-${projectId}/functions/function-${func.$id}` + `${base}/project-${page.params.region}-${projectId}/functions/function-${func.$id}` ); } showCreateDeployment.set(true); @@ -53,7 +51,7 @@ export const functionsSearcher = (async (query: string) => { nested: true, callback() { goto( - `${base}/project-${$page.params.region}-${projectId}/functions/function-${func.$id}` + `${base}/project-${page.params.region}-${projectId}/functions/function-${func.$id}` ); }, group: 'functions' @@ -63,7 +61,7 @@ export const functionsSearcher = (async (query: string) => { nested: true, callback() { goto( - `${base}/project-${$page.params.region}-${projectId}/functions/function-${func.$id}/usage` + `${base}/project-${page.params.region}-${projectId}/functions/function-${func.$id}/usage` ); }, group: 'functions' @@ -73,7 +71,7 @@ export const functionsSearcher = (async (query: string) => { nested: true, callback() { goto( - `${base}/project-${$page.params.region}-${projectId}/functions/function-${func.$id}/executions` + `${base}/project-${page.params.region}-${projectId}/functions/function-${func.$id}/executions` ); }, group: 'functions' @@ -83,7 +81,7 @@ export const functionsSearcher = (async (query: string) => { nested: true, callback() { goto( - `${base}/project-${$page.params.region}-${projectId}/functions/function-${func.$id}/settings` + `${base}/project-${page.params.region}-${projectId}/functions/function-${func.$id}/settings` ); }, group: 'functions' @@ -91,5 +89,5 @@ export const functionsSearcher = (async (query: string) => { ]; } - return filtered.map((fn) => getFunctionCommand(fn, $page.params.region, projectId)); + return filtered.map((fn) => getFunctionCommand(fn, page.params.region, projectId)); }) satisfies Searcher; diff --git a/src/lib/components/billing/alerts/paymentFailed.svelte b/src/lib/components/billing/alerts/paymentFailed.svelte index 9646864a9..83b44dc2d 100644 --- a/src/lib/components/billing/alerts/paymentFailed.svelte +++ b/src/lib/components/billing/alerts/paymentFailed.svelte @@ -1,12 +1,12 @@ {#if $failedInvoice && $failedInvoice.teamId === $organization.$id && isOnProjects} diff --git a/src/lib/components/bottomModalAlert.svelte b/src/lib/components/bottomModalAlert.svelte index c1a57c300..e10c02f63 100644 --- a/src/lib/components/bottomModalAlert.svelte +++ b/src/lib/components/bottomModalAlert.svelte @@ -13,7 +13,7 @@ import { BillingPlan } from '$lib/constants'; import { upgradeURL } from '$lib/stores/billing'; import { addBottomModalAlerts } from '$routes/(console)/bottomAlerts'; - import { project } from '$routes/(console)/project-[project]/store'; + import { project } from '$routes/(console)/project-[region]-[project]/store'; import { page } from '$app/state'; import { Click, trackEvent } from '$lib/actions/analytics'; @@ -21,7 +21,7 @@ let openModalOnMobile = false; function getPageScope(pathname: string) { - const isProjectPage = pathname.includes('project-[project]'); + const isProjectPage = pathname.includes('project-[region]-[project]'); const isOrganizationPage = pathname.includes('organization-[organization]'); return { isProjectPage, isOrganizationPage }; diff --git a/src/lib/components/feedback/feedback.svelte b/src/lib/components/feedback/feedback.svelte index 2d1a7623c..ed500aa15 100644 --- a/src/lib/components/feedback/feedback.svelte +++ b/src/lib/components/feedback/feedback.svelte @@ -11,7 +11,7 @@ import { addNotification } from '$lib/stores/notifications'; import { page } from '$app/state'; import { Typography } from '@appwrite.io/pink-svelte'; - import { project } from '$routes/(console)/project-[project]/store'; + import { project } from '$routes/(console)/project-[region]-[project]/store'; $: $selectedFeedback = feedbackOptions.find((option) => option.type === $feedback.type); diff --git a/src/lib/components/git/connectRepoModal.svelte b/src/lib/components/git/connectRepoModal.svelte index 17397c8f6..c415b20e6 100644 --- a/src/lib/components/git/connectRepoModal.svelte +++ b/src/lib/components/git/connectRepoModal.svelte @@ -12,6 +12,7 @@ import { addNotification } from '$lib/stores/notifications'; import { Click, trackEvent } from '$lib/actions/analytics'; import RepositoryBehaviour from '$lib/components/git/repositoryBehaviour.svelte'; + import { page } from '$app/state'; let { show = $bindable(false), @@ -38,7 +39,9 @@ let error = $state(''); onMount(async () => { - installations = await sdk.forProject.vcs.listInstallations(); + installations = await sdk + .forProject(page.params.region, page.params.project) + .vcs.listInstallations(); if (!$installation?.$id && installations?.total) { $installation = installations.installations[0]; } @@ -51,11 +54,9 @@ async function connectRepo() { try { if (repositoryBehaviour === 'new') { - const repo = await sdk.forProject.vcs.createRepository( - $installation.$id, - repositoryName, - repositoryPrivate - ); + const repo = await sdk + .forProject(page.params.region, page.params.project) + .vcs.createRepository($installation.$id, repositoryName, repositoryPrivate); repository.set(repo); selectedRepository = repo.id; } diff --git a/src/lib/components/git/productionBranchFieldset.svelte b/src/lib/components/git/productionBranchFieldset.svelte index e97bcacf5..67a76ed96 100644 --- a/src/lib/components/git/productionBranchFieldset.svelte +++ b/src/lib/components/git/productionBranchFieldset.svelte @@ -4,6 +4,7 @@ import SelectRootModal from './selectRootModal.svelte'; import { sdk } from '$lib/stores/sdk'; import { sortBranches } from '$lib/stores/vcs'; + import { page } from '$app/state'; export let branch = 'main'; export let rootDir: string; @@ -15,10 +16,9 @@ let show = false; async function loadBranches() { - const { branches } = await sdk.forProject.vcs.listRepositoryBranches( - installationId, - repositoryId - ); + const { branches } = await sdk + .forProject(page.params.region, page.params.project) + .vcs.listRepositoryBranches(installationId, repositoryId); const sorted = sortBranches(branches); branch = sorted[0]?.name ?? null; diff --git a/src/lib/components/git/repositories.svelte b/src/lib/components/git/repositories.svelte index 28091632c..aad4e2363 100644 --- a/src/lib/components/git/repositories.svelte +++ b/src/lib/components/git/repositories.svelte @@ -3,7 +3,7 @@ import { Button, InputSearch, InputSelect } from '$lib/elements/forms'; import { timeFromNow } from '$lib/helpers/date'; import { sdk } from '$lib/stores/sdk'; - import { repositories } from '$routes/(console)/project-[project]/functions/function-[function]/store'; + import { repositories } from '$routes/(console)/project-[region]-[project]/functions/function-[function]/store'; import { installation, installations, repository } from '$lib/stores/vcs'; import { Layout, @@ -20,6 +20,7 @@ import { VCSDetectionType, type Models } from '@appwrite.io/console'; import { getFrameworkIcon } from '$lib/stores/sites'; import { connectGitHub } from '$lib/stores/git'; + import { page } from '$app/state'; let { action = $bindable('select'), @@ -54,7 +55,9 @@ } return installationList.installations; } else { - const { installations } = await sdk.forProject.vcs.listInstallations(); + const { installations } = await sdk + .forProject(page.params.region, page.params.project) + .vcs.listInstallations(); if (installations.length) { selectedInstallation = installations[0].$id; installation.set(installations.find((entry) => entry.$id === selectedInstallation)); @@ -85,19 +88,23 @@ async function fetchRepos(installationId: string, search: string) { if (product === 'functions') { $repositories.repositories = ( - (await sdk.forProject.vcs.listRepositories( - installationId, - VCSDetectionType.Runtime, - search || undefined - )) as unknown as Models.ProviderRepositoryRuntimeList + (await sdk + .forProject(page.params.region, page.params.project) + .vcs.listRepositories( + installationId, + VCSDetectionType.Runtime, + search || undefined + )) as unknown as Models.ProviderRepositoryRuntimeList ).runtimeProviderRepositories; //TODO: remove forced cast after backend fixes } else { $repositories.repositories = ( - (await sdk.forProject.vcs.listRepositories( - installationId, - VCSDetectionType.Framework, - search || undefined - )) as unknown as Models.ProviderRepositoryFrameworkList + (await sdk + .forProject(page.params.region, page.params.project) + .vcs.listRepositories( + installationId, + VCSDetectionType.Framework, + search || undefined + )) as unknown as Models.ProviderRepositoryFrameworkList ).frameworkProviderRepositories; } } diff --git a/src/lib/components/git/selectRootModal.svelte b/src/lib/components/git/selectRootModal.svelte index 90fc85aac..e4a232dda 100644 --- a/src/lib/components/git/selectRootModal.svelte +++ b/src/lib/components/git/selectRootModal.svelte @@ -1,4 +1,5 @@ -{#if $showBudgetAlert && $organization?.$id && $organization?.billingPlan !== BillingPlan.FREE && $readOnly && !hideBillingHeaderRoutes.includes($page.url.pathname)} +{#if $showBudgetAlert && $organization?.$id && $organization?.billingPlan !== BillingPlan.FREE && $readOnly && !hideBillingHeaderRoutes.includes(page.url.pathname)} This organization has reached its budget limit and is now blocked. To continue using diff --git a/src/routes/(console)/organization-[organization]/domains/+page.ts b/src/routes/(console)/organization-[organization]/domains/+page.ts index d51738731..f083f1bec 100644 --- a/src/routes/(console)/organization-[organization]/domains/+page.ts +++ b/src/routes/(console)/organization-[organization]/domains/+page.ts @@ -4,7 +4,7 @@ import { getLimit, getPage, getQuery, getSearch, pageToOffset } from '$lib/helpe import { Dependencies, PAGE_LIMIT } from '$lib/constants'; import { queries, queryParamToMap } from '$lib/components/filters'; -export const load = async ({ depends, url, route }) => { +export const load = async ({ depends, url, route, params }) => { depends(Dependencies.DOMAINS); const page = getPage(url); const limit = getLimit(url, route, PAGE_LIMIT); diff --git a/src/routes/(console)/organization-[organization]/teamReadonlyAlert.svelte b/src/routes/(console)/organization-[organization]/teamReadonlyAlert.svelte index 19fc2bf37..f3e44e97f 100644 --- a/src/routes/(console)/organization-[organization]/teamReadonlyAlert.svelte +++ b/src/routes/(console)/organization-[organization]/teamReadonlyAlert.svelte @@ -1,5 +1,5 @@ -{#if $organization?.$id && $organization?.status === teamStatusReadonly && $organization?.remarks === billingLimitOutstandingInvoice && $readOnly && !hideBillingHeaderRoutes.includes($page.url.pathname)} +{#if $organization?.$id && $organization?.status === teamStatusReadonly && $organization?.remarks === billingLimitOutstandingInvoice && $readOnly && !hideBillingHeaderRoutes.includes(page.url.pathname)} Your organization’s access to resources has been restricted due to unpaid invoices. diff --git a/src/routes/(console)/project-[region]-[project]/+layout.svelte b/src/routes/(console)/project-[region]-[project]/+layout.svelte index 78da3bf4c..45250433b 100644 --- a/src/routes/(console)/project-[region]-[project]/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/+layout.svelte @@ -27,7 +27,7 @@ onMount(() => { return realtime - .forProject($page.params.region, $page.params.project) + .forProject(page.params.region, page.params.project) .subscribe(['project', 'console'], (response) => { if (response.events.includes('stats.connections')) { for (const [projectId, value] of Object.entries(response.payload)) { @@ -94,7 +94,7 @@ { label: 'Go to Sites', callback: () => { - goto(`${base}/project-${$project.$id}/sites`); + goto(`${base}/project-${$project.region}-${$project.$id}/sites`); }, keys: ['g', 'i'], group: 'navigation', diff --git a/src/routes/(console)/project-[region]-[project]/auth/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/+page.ts index db6ad38c7..74ce23f31 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/auth/+page.ts @@ -8,7 +8,7 @@ import { showCreateUser } from './+page.svelte'; export const load: PageLoad = async ({ url, route, params }) => { const page = getPage(url); const search = getSearch(url); - const limit = getLimit(params.project, url, route, PAGE_LIMIT); + const limit = getLimit(url, route, PAGE_LIMIT); const offset = pageToOffset(page, limit); if (typeof url.searchParams.get('create') === 'string') { diff --git a/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte b/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte index 506572d0e..a7cc15e1c 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte @@ -1,5 +1,5 @@ - - - API key - Appwrite - - - - {@const accessedAt = $key.accessedAt ? toLocaleDate($key.accessedAt) : 'never'} - - {$key.name} - -

- Last accessed: {accessedAt}
- Scopes granted: {$key.scopes.length} -

-
-
- - - API key secret - - - - - -
- - Name - Choose any name that will help you distinguish between API keys. - - - - - - - - -
-
- - Scopes - You can choose which permission scope to grant your application. It is a best practice to - allow only the permissions you need to meet your project goals. - - {#if scopes !== null} - - {/if} - - - - - - -
- - - - - Delete API key - The API key will be permanently deleted. This action is irreversible. - - -
-
-
{$key.name}
-

Last accessed: {accessedAt}

-
-
-
-
- - - - -
-
- - diff --git a/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/breadcrumbs.svelte index a163a9fe6..00fa0e8f7 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/keys/[key]/breadcrumbs.svelte @@ -1,6 +1,6 @@ {#if $canWriteKeys} - diff --git a/src/routes/(console)/project-[region]-[project]/overview/keys/create/+page.svelte b/src/routes/(console)/project-[region]-[project]/overview/keys/create/+page.svelte index cdc986601..9821d2f8a 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/keys/create/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/keys/create/+page.svelte @@ -9,7 +9,7 @@ import Button from '$lib/elements/forms/button.svelte'; import Form from '$lib/elements/forms/form.svelte'; import { sdk } from '$lib/stores/sdk'; - import { onboarding } from '$routes/(console)/project-[project]/store'; + import { onboarding } from '$routes/(console)/project-[region]-[project]/store'; import { goto, invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; @@ -39,7 +39,9 @@ trackEvent(Submit.KeyCreate, { scopes: scopes }); - goto(`${base}/project-${page.params.project}/overview/keys/${$id}`); + goto( + `${base}/project-${page.params.region}-${page.params.project}/overview/keys/${$id}` + ); addNotification({ message: `API key has been created`, type: 'success' @@ -56,7 +58,7 @@ diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/header.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/header.svelte index 42fe76f72..b52019a57 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/[platform]/header.svelte @@ -9,7 +9,7 @@ - + {$platform?.name} diff --git a/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/skipped.svelte b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/skipped.svelte index cebaaff36..fbca39fc9 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/skipped.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/platforms/wizard/skipped.svelte @@ -36,12 +36,12 @@ - import { page } from '$app/stores'; + import { page } from '$app/state'; import { Code } from '$lib/components'; import { WizardStep } from '$lib/layout'; import { getProjectEndpoint } from '$lib/helpers/project'; - const project = $page.params.project; + const project = page.params.project; const code = `const client = new Client(); client diff --git a/src/routes/(console)/project-[region]-[project]/overview/store.ts b/src/routes/(console)/project-[region]-[project]/overview/store.ts index bd869930a..82acd6078 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/store.ts +++ b/src/routes/(console)/project-[region]-[project]/overview/store.ts @@ -2,7 +2,7 @@ import { sdk } from '$lib/stores/sdk'; import { cachedStore } from '$lib/helpers/cache'; import { get, writable, type Writable } from 'svelte/store'; import type { Models, ProjectUsageRange } from '@appwrite.io/console'; -import { page } from '$app/stores'; +import { page } from '$app/state'; export const usage = cachedStore< Models.UsageProject, @@ -12,9 +12,8 @@ export const usage = cachedStore< >('projectUsage', function ({ set }) { return { load: async (start, end, period) => { - const $page = get(page); const usages = await sdk - .forProject($page.params.region, $page.params.project) + .forProject(page.params.region, page.params.project) .project.getUsage(start, end, period); set(usages); } diff --git a/src/routes/(console)/project-[region]-[project]/settings/+layout.svelte b/src/routes/(console)/project-[region]-[project]/settings/+layout.svelte index 209463884..fbe135724 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/+layout.svelte @@ -12,7 +12,9 @@ icon: IconPlus, keys: page.url.pathname.includes('webhooks') ? ['c'] : ['c', 'w'], callback: () => { - goto(`${base}/project-${page.params.project}/settings/webhooks/create`); + goto( + `${base}/project-${page.params.region}-${page.params.project}/settings/webhooks/create` + ); }, group: 'webhooks', disabled: !$canWriteProjects diff --git a/src/routes/(console)/project-[region]-[project]/settings/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/settings/breadcrumbs.svelte index cef3df714..43332805b 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/breadcrumbs.svelte @@ -1,6 +1,6 @@ @@ -21,5 +21,5 @@ + projectSdk={sdk.forProject(page.params.region, page.params.project)} /> diff --git a/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/wizard.svelte b/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/wizard.svelte index 4f0b071f7..38c8f84a3 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/wizard.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/migrations/(import)/wizard.svelte @@ -13,7 +13,7 @@ import { started } from '../stores'; import { showMigrationBox } from '$lib/components/migrationBox.svelte'; import { addNotification } from '$lib/stores/notifications'; - import { page } from '$app/stores'; + import { page } from '$app/state'; const onExit = () => { resetImportStores(); @@ -26,7 +26,7 @@ switch ($provider.provider) { case 'appwrite': { await sdk - .forProject($page.params.region, $page.params.project) + .forProject(page.params.region, page.params.project) .migrations.createAppwriteMigration( resources, $provider.endpoint, @@ -39,7 +39,7 @@ } case 'supabase': { await sdk - .forProject($page.params.region, $page.params.project) + .forProject(page.params.region, page.params.project) .migrations.createSupabaseMigration( resources, $provider.endpoint, @@ -55,14 +55,14 @@ } case 'firebase': { await sdk - .forProject($page.params.region, $page.params.project) + .forProject(page.params.region, page.params.project) .migrations.createFirebaseMigration(resources, $provider.serviceAccount); invalidate(Dependencies.MIGRATIONS); break; } case 'nhost': { await sdk - .forProject($page.params.region, $page.params.project) + .forProject(page.params.region, page.params.project) .migrations.createNHostMigration( resources, $provider.subdomain, diff --git a/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/breadcrumbs.svelte b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/breadcrumbs.svelte index e4fc8517c..21da5269b 100644 --- a/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/breadcrumbs.svelte +++ b/src/routes/(console)/project-[region]-[project]/settings/webhooks/[webhook]/breadcrumbs.svelte @@ -1,6 +1,6 @@ diff --git a/src/routes/(console)/project-[region]-[project]/sites/(components)/openOnMobileModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/(components)/openOnMobileModal.svelte index 70af02974..7427cb9f9 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/(components)/openOnMobileModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/(components)/openOnMobileModal.svelte @@ -32,7 +32,7 @@ let tooltipMessage = $state('Copy'); function getImage(url: string) { - return sdk.forProject.avatars.getQR(url, 352); + return sdk.forProject(page.params.region, page.params.project).avatars.getQR(url, 352); } diff --git a/src/routes/(console)/project-[region]-[project]/sites/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/+page.ts index 445401849..264790964 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/+page.ts @@ -12,10 +12,12 @@ export const load = async ({ url, depends, route }) => { const offset = pageToOffset(page, limit); const view = getView(url, route, View.Grid, View.Grid); - const siteList = await sdk.forProject.sites.list( - [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], - search || undefined - ); + const siteList = await sdk + .forProject(page.params.region, page.params.project) + .sites.list( + [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], + search || undefined + ); return { offset, diff --git a/src/routes/(console)/project-[region]-[project]/sites/activateDeploymentModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/activateDeploymentModal.svelte index 74bcc6be0..5bce1c91a 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/activateDeploymentModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/activateDeploymentModal.svelte @@ -14,7 +14,9 @@ async function activate() { try { - await sdk.forProject.sites.updateSiteDeployment(siteId, selectedDeploymentId); + await sdk + .forProject(page.params.region, page.params.project) + .sites.updateSiteDeployment(siteId, selectedDeploymentId); addNotification({ type: 'success', message: `Deployment has been activated` diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/+layout.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/+layout.ts index 30593d956..03156a943 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/+layout.ts @@ -2,8 +2,8 @@ import { sdk } from '$lib/stores/sdk'; export const load = async () => { const [installations, frameworks] = await Promise.all([ - sdk.forProject.vcs.listInstallations(), - sdk.forProject.sites.listFrameworks() + sdk.forProject(page.params.region, page.params.project).vcs.listInstallations(), + sdk.forProject(page.params.region, page.params.project).sites.listFrameworks() ]); return { installations, diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/createVariableModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/createVariableModal.svelte index 217dfaee3..8dc28a966 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/createVariableModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/createVariableModal.svelte @@ -66,7 +66,9 @@ Set the environment variables or secret that will be passed to your site. Global variables - can be set in project settings. diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte index a3b3acfc6..baa0e4e30 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte @@ -29,7 +29,7 @@ deployment = response.payload; if (response.payload.status === 'ready') { goto( - `${base}/project-${page.params.project}/sites/create-site/finish?site=${data.site.$id}` + `${base}/project-${page.params.region}-${page.params.project}/sites/create-site/finish?site=${data.site.$id}` ); } } @@ -40,7 +40,7 @@ + href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${data.site.$id}`}> @@ -84,7 +84,7 @@ size="s" fullWidthMobile secondary - href={`${base}/project-${page.params.project}/sites/site-${data.site.$id}`}> + href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${data.site.$id}`}> Go to dashboard diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.ts index 6b57c817a..3d23d7477 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.ts @@ -12,15 +12,19 @@ export const load: PageLoad = async ({ url, depends, params }) => { const siteId = url.searchParams.get('site'); const deploymentId = url.searchParams.get('deployment'); const [site, deployment, proxyRuleList] = await Promise.all([ - sdk.forProject.sites.get(siteId), - sdk.forProject.sites.getDeployment(siteId, deploymentId), - sdk.forProject.proxy.listRules([ - Query.equal('type', RuleType.DEPLOYMENT), - Query.equal('deploymentResourceType', DeploymentResourceType.SITE), - Query.equal('deploymentResourceId', siteId), - Query.equal('deploymentId', deploymentId), - Query.equal('trigger', RuleTrigger.MANUAL) - ]) + sdk.forProject(page.params.region, page.params.project).sites.get(siteId), + sdk + .forProject(page.params.region, page.params.project) + .sites.getDeployment(siteId, deploymentId), + sdk + .forProject(page.params.region, page.params.project) + .proxy.listRules([ + Query.equal('type', RuleType.DEPLOYMENT), + Query.equal('deploymentResourceType', DeploymentResourceType.SITE), + Query.equal('deploymentResourceId', siteId), + Query.equal('deploymentId', deploymentId), + Query.equal('trigger', RuleTrigger.MANUAL) + ]) ]); return { @@ -28,7 +32,9 @@ export const load: PageLoad = async ({ url, depends, params }) => { deployment, proxyRuleList, repository: site?.installationId - ? await sdk.forProject.vcs.getRepository(site.installationId, site.providerRepositoryId) + ? await sdk + .forProject(page.params.region, page.params.project) + .vcs.getRepository(site.installationId, site.providerRepositoryId) : undefined }; }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.svelte index debe1a5d9..39040a6f7 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.svelte @@ -37,26 +37,28 @@ async function connect(selectedInstallationId: string, selectedRepository: string) { try { - await sdk.forProject.sites.update( - data.site.$id, - data.site.name, - data.site.framework as Framework, - data.site.enabled, - data.site.logging || undefined, - data.site.timeout, - data.site.installCommand, - data.site.buildCommand, - data.site.outputDirectory, - data.site.buildRuntime as BuildRuntime, - data.site.adapter as Adapter, - data.site.fallbackFile, - selectedInstallationId, - selectedRepository, - 'main', - undefined, - undefined, - undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .sites.update( + data.site.$id, + data.site.name, + data.site.framework as Framework, + data.site.enabled, + data.site.logging || undefined, + data.site.timeout, + data.site.installCommand, + data.site.buildCommand, + data.site.outputDirectory, + data.site.buildRuntime as BuildRuntime, + data.site.adapter as Adapter, + data.site.fallbackFile, + selectedInstallationId, + selectedRepository, + 'main', + undefined, + undefined, + undefined + ); invalidate(Dependencies.SITE); } catch (error) { console.log(error); @@ -64,7 +66,9 @@ } - +
@@ -128,7 +132,7 @@ source: 'sites_create_finish' }); }} - href={`${base}/project-${page.params.project}/sites/site-${data.site.$id}/domains`}> + href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${data.site.$id}/domains`}> + href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${data.site.$id}`}> Go to dashboard diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.ts index 3fff8af30..12ae51786 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/finish/+page.ts @@ -8,16 +8,20 @@ export const load = async ({ url, depends }) => { depends(Dependencies.SITE); if (!url.searchParams.has('site')) error(404, 'Deployment is not optional'); const siteId = url.searchParams.get('site'); - const site = await sdk.forProject.sites.get(siteId); - const proxyRuleList = await sdk.forProject.proxy.listRules([ - Query.equal('type', RuleType.DEPLOYMENT), - Query.equal('deploymentResourceType', DeploymentResourceType.SITE), - Query.equal('deploymentResourceId', siteId), - Query.equal('deploymentId', site.deploymentId) - ]); + const site = await sdk.forProject(page.params.region, page.params.project).sites.get(siteId); + const proxyRuleList = await sdk + .forProject(page.params.region, page.params.project) + .proxy.listRules([ + Query.equal('type', RuleType.DEPLOYMENT), + Query.equal('deploymentResourceType', DeploymentResourceType.SITE), + Query.equal('deploymentResourceId', siteId), + Query.equal('deploymentId', site.deploymentId) + ]); return { site, - deployment: await sdk.forProject.sites.getDeployment(siteId, site.deploymentId), + deployment: await sdk + .forProject(page.params.region, page.params.project) + .sites.getDeployment(siteId, site.deploymentId), proxyRuleList }; }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.svelte index 49c4262a7..cee455f1f 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.svelte @@ -15,7 +15,7 @@ import type { Models } from '@appwrite.io/console'; import Configuration from '../configuration.svelte'; import { buildVerboseDomain } from '../store'; - import { project } from '$routes/(console)/project-[project]/store'; + import { project } from '$routes/(console)/project-[region]-[project]/store'; import { organization } from '$lib/stores/organization'; import { consoleVariables } from '$routes/(console)/store'; import { IconInfo } from '@appwrite.io/pink-icons-svelte'; @@ -48,51 +48,56 @@ const buildRuntime = Object.values(BuildRuntime).find( (f) => f === framework.buildRuntime ); - let site = await sdk.forProject.sites.create( - id || ID.unique(), - name, - fr, - buildRuntime, - undefined, - undefined, - undefined, - installCommand || undefined, - buildCommand || undefined, - outputDirectory || undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined, - undefined - ); + let site = await sdk + .forProject(page.params.region, page.params.project) + .sites.create( + id || ID.unique(), + name, + fr, + buildRuntime, + undefined, + undefined, + undefined, + installCommand || undefined, + buildCommand || undefined, + outputDirectory || undefined, + undefined, + undefined, + undefined, + undefined, + undefined, + undefined, + undefined + ); // Add domain - await sdk.forProject.proxy.createSiteRule( - `${domain}.${$consoleVariables._APP_DOMAIN_SITES}`, - site.$id - ); + await sdk + .forProject(page.params.region, page.params.project) + .proxy.createSiteRule(`${domain}.${$consoleVariables._APP_DOMAIN_SITES}`, site.$id); //Add variables const promises = variables.map((variable) => - sdk.forProject.sites.createVariable( - site.$id, - variable.key, - variable.value, - variable?.secret ?? false - ) + sdk + .forProject(page.params.region, page.params.project) + .sites.createVariable( + site.$id, + variable.key, + variable.value, + variable?.secret ?? false + ) ); await Promise.all(promises); - const deployment = await sdk.forProject.sites.createDeployment( - site.$id, - files[0], - true, - installCommand || undefined, - buildCommand || undefined, - outputDirectory || undefined - ); + const deployment = await sdk + .forProject(page.params.region, page.params.project) + .sites.createDeployment( + site.$id, + files[0], + true, + installCommand || undefined, + buildCommand || undefined, + outputDirectory || undefined + ); trackEvent(Submit.SiteCreate, { source: 'manual', @@ -100,7 +105,7 @@ }); await goto( - `${base}/project-${page.params.project}/sites/create-site/deploying?site=${site.$id}&deployment=${deployment.$id}` + `${base}/project-${page.params.region}-${page.params.project}/sites/create-site/deploying?site=${site.$id}&deployment=${deployment.$id}` ); } catch (e) { addNotification({ @@ -131,7 +136,7 @@
diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.ts index d5a966f74..c23ada03e 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/+page.ts @@ -5,6 +5,8 @@ export const load = async ({ parent }) => { return { frameworks, - template: await sdk.forProject.sites.getTemplate('starter-for-js') + template: await sdk + .forProject(page.params.region, page.params.project) + .sites.getTemplate('starter-for-js') }; }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/aside.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/aside.svelte index 35b0bc8d9..a3e99a5bc 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/aside.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/manual/aside.svelte @@ -29,7 +29,7 @@ diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/+page.svelte index 8f1ecc15b..479096dda 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/+page.svelte @@ -20,12 +20,15 @@ from: 'cover' }); repository.set(e); - const target = `${base}/project-${page.params.project}/sites/create-site/repositories/repository-${e.id}?installation=${$installation.$id}`; + const target = `${base}/project-${page.params.region}-${page.params.project}/sites/create-site/repositories/repository-${e.id}?installation=${$installation.$id}`; goto(target); } - + {#if !!data?.installations?.total}
{:else} diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte index d7d20d2da..1def9713b 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.svelte @@ -58,12 +58,14 @@ async function detectFramework() { try { - const response = await sdk.forProject.vcs.createRepositoryDetection( - $installation.$id, - data.repository.id, - VCSDetectionType.Framework, - rootDir - ); + const response = await sdk + .forProject(page.params.region, page.params.project) + .vcs.createRepositoryDetection( + $installation.$id, + data.repository.id, + VCSDetectionType.Framework, + rootDir + ); framework = data.frameworks.frameworks.find((f) => f.key === response.framework); adapter = framework?.adapters[0]; installCommand = adapter?.installCommand; @@ -92,49 +94,49 @@ const buildRuntime = Object.values(BuildRuntime).find( (f) => f === framework.buildRuntime ); - let site = await sdk.forProject.sites.create( - id || ID.unique(), - name, - fr, - buildRuntime, - undefined, - undefined, - undefined, - installCommand, - buildCommand, - outputDirectory, - undefined, - data.installation.$id, - undefined, - data.repository.id, - branch, - silentMode, - rootDir - ); + let site = await sdk + .forProject(page.params.region, page.params.project) + .sites.create( + id || ID.unique(), + name, + fr, + buildRuntime, + undefined, + undefined, + undefined, + installCommand, + buildCommand, + outputDirectory, + undefined, + data.installation.$id, + undefined, + data.repository.id, + branch, + silentMode, + rootDir + ); // Add domain - await sdk.forProject.proxy.createSiteRule( - `${domain}.${$consoleVariables._APP_DOMAIN_SITES}`, - site.$id - ); + await sdk + .forProject(page.params.region, page.params.project) + .proxy.createSiteRule(`${domain}.${$consoleVariables._APP_DOMAIN_SITES}`, site.$id); //Add variables const promises = variables.map((variable) => - sdk.forProject.sites.createVariable( - site.$id, - variable.key, - variable.value, - variable?.secret ?? false - ) + sdk + .forProject(page.params.region, page.params.project) + .sites.createVariable( + site.$id, + variable.key, + variable.value, + variable?.secret ?? false + ) ); await Promise.all(promises); - const deployment = await sdk.forProject.sites.createVcsDeployment( - site.$id, - VCSDeploymentType.Branch, - branch, - true - ); + const deployment = await sdk + .forProject(page.params.region, page.params.project) + .sites.createVcsDeployment(site.$id, VCSDeploymentType.Branch, branch, true); trackEvent(Submit.SiteCreate, { source: 'repository', @@ -142,7 +144,7 @@ }); await goto( - `${base}/project-${page.params.project}/sites/create-site/deploying?site=${site.$id}&deployment=${deployment.$id}` + `${base}/project-${page.params.region}-${page.params.project}/sites/create-site/deploying?site=${site.$id}&deployment=${deployment.$id}` ); } catch (e) { addNotification({ @@ -161,7 +163,7 @@ @@ -179,7 +181,7 @@ diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.ts index e988e000b..67eef7286 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/repository-[repository]/+page.ts @@ -5,7 +5,9 @@ import { buildVerboseDomain } from '../../store'; export const load = async ({ parent, params, url }) => { const { installations, frameworks, project, organization, consoleVariables } = await parent(); const [repository] = await Promise.all([ - sdk.forProject.vcs.getRepository(url.searchParams.get('installation'), params.repository) + sdk + .forProject(page.params.region, page.params.project) + .vcs.getRepository(url.searchParams.get('installation'), params.repository) ]); const domain = await buildVerboseDomain( diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.svelte index fcf9802fb..1756560dd 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.svelte @@ -74,7 +74,7 @@ {/if} diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.ts index 487ac79a9..243b8c79e 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/+page.ts @@ -8,7 +8,9 @@ export const load = async ({ url, route }) => { frameworks: url.searchParams.getAll('framework') }; - const siteTemplatesList = await sdk.forProject.sites.listTemplates(undefined, undefined, 100); + const siteTemplatesList = await sdk + .forProject(page.params.region, page.params.project) + .sites.listTemplates(undefined, undefined, 100); const [frameworksSet, useCasesSet] = siteTemplatesList.templates.reduce( ([fr, uc], next) => { diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.svelte index 504558b94..51f11db5d 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.svelte @@ -74,11 +74,9 @@ async function createRepository() { try { isCreatingRepository = true; - const repo = await sdk.forProject.vcs.createRepository( - $installation.$id, - repositoryName, - repositoryPrivate - ); + const repo = await sdk + .forProject(page.params.region, page.params.project) + .vcs.createRepository($installation.$id, repositoryName, repositoryPrivate); repository.set(repo); selectedRepository = repo.id; showSiteConfig = true; @@ -111,51 +109,61 @@ const buildRuntime = Object.values(BuildRuntime).find( (f) => f === framework.buildRuntime ); - let site = await sdk.forProject.sites.create( - id || ID.unique(), - name, - fr, - buildRuntime, - undefined, - undefined, - undefined, - framework.installCommand, - framework.buildCommand, - framework.outputDirectory, - framework.adapter as unknown as Adapter, - connectBehaviour === 'later' ? undefined : selectedInstallationId || undefined, - framework?.fallbackFile || undefined, - selectedRepository || undefined, - branch || undefined, - selectedRepository ? silentMode : undefined, - rootDir || undefined - ); + let site = await sdk + .forProject(page.params.region, page.params.project) + .sites.create( + id || ID.unique(), + name, + fr, + buildRuntime, + undefined, + undefined, + undefined, + framework.installCommand, + framework.buildCommand, + framework.outputDirectory, + framework.adapter as unknown as Adapter, + connectBehaviour === 'later' + ? undefined + : selectedInstallationId || undefined, + framework?.fallbackFile || undefined, + selectedRepository || undefined, + branch || undefined, + selectedRepository ? silentMode : undefined, + rootDir || undefined + ); // Add domain - await sdk.forProject.proxy.createSiteRule( - `${domain}.${$consoleVariables._APP_DOMAIN_SITES}`, - site.$id - ); + await sdk + .forProject(page.params.region, page.params.project) + .proxy.createSiteRule( + `${domain}.${$consoleVariables._APP_DOMAIN_SITES}`, + site.$id + ); //Add variables const promises = variables.map((variable) => - sdk.forProject.sites.createVariable( - site.$id, - variable.name, - variable.value, - variable?.secret ?? false - ) + sdk + .forProject(page.params.region, page.params.project) + .sites.createVariable( + site.$id, + variable.name, + variable.value, + variable?.secret ?? false + ) ); await Promise.all(promises); - const deployment = await sdk.forProject.sites.createTemplateDeployment( - site.$id, - data.template.providerRepositoryId || undefined, - data.template.providerOwner || undefined, - framework.providerRootDirectory || undefined, - data.template.providerVersion || undefined, - true - ); + const deployment = await sdk + .forProject(page.params.region, page.params.project) + .sites.createTemplateDeployment( + site.$id, + data.template.providerRepositoryId || undefined, + data.template.providerOwner || undefined, + framework.providerRootDirectory || undefined, + data.template.providerVersion || undefined, + true + ); trackEvent(Submit.SiteCreate, { source: 'template', @@ -164,7 +172,7 @@ }); await goto( - `${base}/project-${page.params.project}/sites/create-site/deploying?site=${site.$id}&deployment=${deployment.$id}` + `${base}/project-${page.params.region}-${page.params.project}/sites/create-site/deploying?site=${site.$id}&deployment=${deployment.$id}` ); } catch (e) { console.log(e); @@ -194,7 +202,7 @@ diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.ts index f8feef8b1..6bcb76463 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/+page.ts @@ -4,7 +4,9 @@ import { ID } from '@appwrite.io/console'; export const load = async ({ parent, params }) => { const { installations, frameworks, project, organization, consoleVariables } = await parent(); - const template = await sdk.forProject.sites.getTemplate(params.template); + const template = await sdk + .forProject(page.params.region, page.params.project) + .sites.getTemplate(params.template); const domain = await buildVerboseDomain( consoleVariables._APP_DOMAIN_SITES, template.name, diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/configuration.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/configuration.svelte index 9687ff888..de405dca8 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/configuration.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/templates/template-[template]/configuration.svelte @@ -14,7 +14,7 @@ import { type Component } from 'svelte'; import { getApiEndpoint } from '$lib/stores/sdk'; import { page } from '$app/state'; - import { project } from '$routes/(console)/project-[project]/store'; + import { project } from '$routes/(console)/project-[region]-[project]/store'; export let variables: Partial[] = []; export let templateVariables: Models.TemplateVariable[] = []; diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/updateVariableModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/updateVariableModal.svelte index b8acfdcb9..c678007f9 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/updateVariableModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/updateVariableModal.svelte @@ -42,7 +42,8 @@ Update the environment variable for your site. Global variables can be set in project settingsproject settings. diff --git a/src/routes/(console)/project-[region]-[project]/sites/createSiteModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/createSiteModal.svelte index 8451816fe..635d712ec 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/createSiteModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/createSiteModal.svelte @@ -20,7 +20,7 @@ variant="secondary" padding="xs" radius="s" - href={`${base}/project-${page.params.project}/sites/create-site/templates`}> + href={`${base}/project-${page.params.region}-${page.params.project}/sites/create-site/templates`}> repositories + href={`${base}/project-${page.params.region}-${page.params.project}/sites/create-site/repositories`}> repositories Or simply drag and drop your files to create a site + href={`${base}/project-${page.params.region}-${page.params.project}/sites/create-site/manual`}> manually. diff --git a/src/routes/(console)/project-[region]-[project]/sites/grid.svelte b/src/routes/(console)/project-[region]-[project]/sites/grid.svelte index 0d1bc20dd..59effbc6d 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/grid.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/grid.svelte @@ -42,7 +42,7 @@ {#each siteList.sites as site (site.$id)} + href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${site.$id}/deployments/deployment-${site.latestDeploymentId}`}> View logs diff --git a/src/routes/(console)/project-[region]-[project]/sites/header.svelte b/src/routes/(console)/project-[region]-[project]/sites/header.svelte index 317486cef..fcf9e71b7 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/header.svelte @@ -7,7 +7,7 @@ import { Typography } from '@appwrite.io/pink-svelte'; $: projectId = page.params.project; - $: path = `${base}/project-${projectId}/sites`; + $: path = `${base}/project-${page.params.region}-${page.params.project}/sites`; $: tabs = [ { href: path, diff --git a/src/routes/(console)/project-[region]-[project]/sites/redeployModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/redeployModal.svelte index 9f43a1e67..5643b75bb 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/redeployModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/redeployModal.svelte @@ -18,10 +18,9 @@ async function redeploy() { try { - const deployment = await sdk.forProject.sites.createDuplicateDeployment( - site.$id, - selectedDeploymentId - ); + const deployment = await sdk + .forProject(page.params.region, page.params.project) + .sites.createDuplicateDeployment(site.$id, selectedDeploymentId); addNotification({ type: 'success', message: `Redeploying ${site.name}` @@ -33,7 +32,7 @@ show = false; if (redirect) { await goto( - `${base}/project-${page.params.project}/sites/site-${site.$id}/deployments/deployment-${deployment.$id}` + `${base}/project-${page.params.region}-${page.params.project}/sites/site-${site.$id}/deployments/deployment-${deployment.$id}` ); } } catch (e) { diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+layout.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+layout.ts index 84bc20673..401b54c10 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+layout.ts @@ -7,7 +7,9 @@ import { error } from '@sveltejs/kit'; export const load = async ({ depends, params }) => { depends(Dependencies.SITE); try { - const [site] = await Promise.all([sdk.forProject.sites.get(params.site)]); + const [site] = await Promise.all([ + sdk.forProject(page.params.region, page.params.project).sites.get(params.site) + ]); return { site, diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts index 1aebb9875..36bf94979 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts @@ -10,23 +10,31 @@ export const load = async ({ params, depends, parent }) => { const { site } = await parent(); const [deploymentList, prodReadyDeployments, proxyRuleList] = await Promise.all([ - sdk.forProject.sites.listDeployments(params.site, [Query.limit(4), Query.orderDesc('')]), - sdk.forProject.sites.listDeployments(params.site, [ - Query.equal('status', 'ready'), - Query.equal('activate', true), - Query.orderDesc('') - ]), - sdk.forProject.proxy.listRules([ - Query.equal('type', RuleType.DEPLOYMENT), - Query.equal('deploymentResourceType', DeploymentResourceType.SITE), - Query.equal('deploymentResourceId', site.$id), - Query.equal('deploymentId', site.deploymentId), - Query.orderDesc('') - ]) + sdk + .forProject(page.params.region, page.params.project) + .sites.listDeployments(params.site, [Query.limit(4), Query.orderDesc('')]), + sdk + .forProject(page.params.region, page.params.project) + .sites.listDeployments(params.site, [ + Query.equal('status', 'ready'), + Query.equal('activate', true), + Query.orderDesc('') + ]), + sdk + .forProject(page.params.region, page.params.project) + .proxy.listRules([ + Query.equal('type', RuleType.DEPLOYMENT), + Query.equal('deploymentResourceType', DeploymentResourceType.SITE), + Query.equal('deploymentResourceId', site.$id), + Query.equal('deploymentId', site.deploymentId), + Query.orderDesc('') + ]) ]); const deployment = deploymentList?.total - ? await sdk.forProject.sites.getDeployment(params.site, site.deploymentId) + ? await sdk + .forProject(page.params.region, page.params.project) + .sites.getDeployment(params.site, site.deploymentId) : null; return { site, diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+layout.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+layout.svelte index 9fff3aebf..7ac2ca58f 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+layout.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+layout.svelte @@ -42,7 +42,9 @@ label: 'Create deployment', async callback() { if (!page.url.pathname.endsWith(page.params.site)) { - await goto(`${base}/project-${$project.$id}/sites/site-${page.params.site}`); + await goto( + `${base}/project-${$project.region}-${$project.$id}/sites/site-${page.params.site}` + ); } }, keys: page.url.pathname.endsWith(page.params.site) ? ['c'] : ['c', 'd'], @@ -54,7 +56,7 @@ label: 'Permissions', async callback() { await goto( - `${base}/project-${$project.$id}/sites/site-${page.params.site}/settings#permissions` + `${base}/project-${$project.region}-${$project.$id}/sites/site-${page.params.site}/settings#permissions` ); scrollBy({ top: -100 }); }, @@ -67,7 +69,7 @@ label: 'Variables', async callback() { await goto( - `${base}/project-${$project.$id}/sites/site-${page.params.site}/settings#variables` + `${base}/project-${$project.region}-${$project.$id}/sites/site-${page.params.site}/settings#variables` ); }, icon: IconList, @@ -77,7 +79,9 @@ { label: 'Go to deployments', callback() { - goto(`${base}/project-${$project.$id}/sites/site-${page.params.site}/deployments`); + goto( + `${base}/project-${$project.region}-${$project.$id}/sites/site-${page.params.site}/deployments` + ); }, keys: ['g', 'd'], group: 'navigation', @@ -87,7 +91,9 @@ { label: 'Go to usage', callback() { - goto(`${base}/project-${$project.$id}/sites/site-${page.params.site}/usage`); + goto( + `${base}/project-${$project.region}-${$project.$id}/sites/site-${page.params.site}/usage` + ); }, keys: ['g', 'u'], group: 'navigation', @@ -97,7 +103,9 @@ { label: 'Go to logs', callback() { - goto(`${base}/project-${$project.$id}/sites/site-${page.params.site}/logs`); + goto( + `${base}/project-${$project.region}-${$project.$id}/sites/site-${page.params.site}/logs` + ); }, keys: ['g', 'e'], group: 'navigation', @@ -107,7 +115,9 @@ { label: 'Go to settings', callback() { - goto(`${base}/project-${$project.$id}/sites/site-${page.params.site}/settings`); + goto( + `${base}/project-${$project.region}-${$project.$id}/sites/site-${page.params.site}/settings` + ); }, keys: ['g', 's'], group: 'navigation', diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte index 729a55a4f..40a713b42 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.svelte @@ -44,26 +44,28 @@ async function connect(selectedInstallationId: string, selectedRepository: string) { try { - await sdk.forProject.sites.update( - data.site.$id, - data.site.name, - data.site.framework as Framework, - data.site.enabled, - data.site.logging || undefined, - data.site.timeout, - data.site.installCommand, - data.site.buildCommand, - data.site.outputDirectory, - data.site.buildRuntime as BuildRuntime, - data.site.adapter as Adapter, - data.site.fallbackFile, - selectedInstallationId, - selectedRepository, - 'main', - undefined, - undefined, - undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .sites.update( + data.site.$id, + data.site.name, + data.site.framework as Framework, + data.site.enabled, + data.site.logging || undefined, + data.site.timeout, + data.site.installCommand, + data.site.buildCommand, + data.site.outputDirectory, + data.site.buildRuntime as BuildRuntime, + data.site.adapter as Adapter, + data.site.fallbackFile, + selectedInstallationId, + selectedRepository, + 'main', + undefined, + undefined, + undefined + ); invalidate(Dependencies.SITE); } catch (error) { console.log(error); diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts index ac0d0eecf..9c6d110c1 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts @@ -16,13 +16,15 @@ export const load = async ({ params, depends, url, route, parent }) => { queries.set(parsedQueries); const [deploymentList, installations] = await Promise.all([ - sdk.forProject.sites.listDeployments(params.site, [ - Query.limit(limit), - Query.offset(offset), - Query.orderDesc(''), - ...parsedQueries.values() - ]), - sdk.forProject.vcs.listInstallations() + sdk + .forProject(page.params.region, page.params.project) + .sites.listDeployments(params.site, [ + Query.limit(limit), + Query.offset(offset), + Query.orderDesc(''), + ...parsedQueries.values() + ]), + sdk.forProject(page.params.region, page.params.project).vcs.listInstallations() ]); return { @@ -32,7 +34,9 @@ export const load = async ({ params, depends, url, route, parent }) => { deploymentList, activeDeployment: site.deploymentId && deploymentList?.total - ? await sdk.forProject.sites.getDeployment(params.site, site.deploymentId) + ? await sdk + .forProject(page.params.region, page.params.project) + .sites.getDeployment(params.site, site.deploymentId) : null, installations }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/cancelDeploymentModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/cancelDeploymentModal.svelte index 0de8f95f4..f03be3c71 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/cancelDeploymentModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/cancelDeploymentModal.svelte @@ -14,10 +14,12 @@ async function handleSubmit() { try { - await sdk.forProject.sites.updateDeploymentStatus( - selectedDeployment.resourceId, - selectedDeployment.$id - ); + await sdk + .forProject(page.params.region, page.params.project) + .sites.updateDeploymentStatus( + selectedDeployment.resourceId, + selectedDeployment.$id + ); await invalidate(Dependencies.SITE); showCancel = false; addNotification({ diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte index 631342ac1..b75e3a27e 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/createGitDeploymentModal.svelte @@ -46,16 +46,14 @@ try { await loadInstallations(); if (!$repository?.id && hasRepository) { - $repository = await sdk.forProject.vcs.getRepository( - $installation.$id, - site.providerRepositoryId - ); + $repository = await sdk + .forProject(page.params.region, page.params.project) + .vcs.getRepository($installation.$id, site.providerRepositoryId); } selectedRepository = $repository?.id; - const branchList = await sdk.forProject.vcs.listRepositoryBranches( - $installation.$id, - selectedRepository - ); + const branchList = await sdk + .forProject(page.params.region, page.params.project) + .vcs.listRepositoryBranches($installation.$id, selectedRepository); const sorted = sortBranches(branchList.branches); branch = sorted[0]?.name ?? null; @@ -74,40 +72,46 @@ async function createDeployment() { try { if (!site?.providerRepositoryId) { - await sdk.forProject.sites.update( - site.$id, - site.name, - site.framework as Framework, - site.enabled || undefined, - site.logging || undefined, - site.timeout || undefined, - site.installCommand || undefined, - site.buildCommand || undefined, - site.outputDirectory || undefined, - (site?.buildRuntime as BuildRuntime) || undefined, - (site.adapter as Adapter) || undefined, - site.fallbackFile || undefined, - $installation.$id || undefined, - selectedRepository || undefined, - branch || undefined, - site.providerSilentMode || undefined, - site.providerRootDirectory || undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .sites.update( + site.$id, + site.name, + site.framework as Framework, + site.enabled || undefined, + site.logging || undefined, + site.timeout || undefined, + site.installCommand || undefined, + site.buildCommand || undefined, + site.outputDirectory || undefined, + (site?.buildRuntime as BuildRuntime) || undefined, + (site.adapter as Adapter) || undefined, + site.fallbackFile || undefined, + $installation.$id || undefined, + selectedRepository || undefined, + branch || undefined, + site.providerSilentMode || undefined, + site.providerRootDirectory || undefined + ); } if (commit) { - await sdk.forProject.sites.createVcsDeployment( - site.$id, - VCSDeploymentType.Commit, - commit, - activate - ); + await sdk + .forProject(page.params.region, page.params.project) + .sites.createVcsDeployment( + site.$id, + VCSDeploymentType.Commit, + commit, + activate + ); } else if (branch) { - await sdk.forProject.sites.createVcsDeployment( - site.$id, - VCSDeploymentType.Branch, - branch, - activate - ); + await sdk + .forProject(page.params.region, page.params.project) + .sites.createVcsDeployment( + site.$id, + VCSDeploymentType.Branch, + branch, + activate + ); } show = false; invalidate(Dependencies.DEPLOYMENTS); diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deleteDeploymentModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deleteDeploymentModal.svelte index d7aac811d..2d92f64d9 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deleteDeploymentModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deleteDeploymentModal.svelte @@ -18,14 +18,13 @@ async function handleSubmit() { try { - await sdk.forProject.sites.deleteDeployment( - selectedDeployment.resourceId, - selectedDeployment.$id - ); + await sdk + .forProject(page.params.region, page.params.project) + .sites.deleteDeployment(selectedDeployment.resourceId, selectedDeployment.$id); await invalidate(Dependencies.SITE); if (page.url.href.includes(`deployment-${selectedDeployment.$id}`)) { await goto( - `${base}/project-${page.params.project}/sites/site-${page.params.site}/deployments` + `${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/deployments` ); } showDelete = false; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.ts index 8fe126903..828e410f0 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.ts @@ -11,13 +11,17 @@ export const load: PageLoad = async ({ params, depends, parent }) => { const { site } = await parent(); const [deployment, proxyRuleList] = await Promise.all([ - sdk.forProject.sites.getDeployment(params.site, params.deployment), - sdk.forProject.proxy.listRules([ - Query.equal('type', RuleType.DEPLOYMENT), - Query.equal('deploymentId', params.deployment), - Query.equal('deploymentResourceType', DeploymentResourceType.SITE), - Query.equal('deploymentResourceId', params.site) - ]) + sdk + .forProject(page.params.region, page.params.project) + .sites.getDeployment(params.site, params.deployment), + sdk + .forProject(page.params.region, page.params.project) + .proxy.listRules([ + Query.equal('type', RuleType.DEPLOYMENT), + Query.equal('deploymentId', params.deployment), + Query.equal('deploymentResourceType', DeploymentResourceType.SITE), + Query.equal('deploymentResourceId', params.site) + ]) ]); return { diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/header.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/header.svelte index ea0e5376c..3210838fa 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/header.svelte @@ -9,7 +9,7 @@ + href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/deployments`}> Deployment {$deployment.$id} diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte index a14fb82e1..62952e788 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deploymentMetrics.svelte @@ -61,7 +61,9 @@ metrics = metrics; try { - const usage = await sdk.forProject.sites.getUsage(page.params.site, range); + const usage = await sdk + .forProject(page.params.region, page.params.project) + .sites.getUsage(page.params.site, range); metrics = metrics.map((metric) => { metric.value = usage[metric.id] ?? '-'; return metric; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/table.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/table.svelte index a56b2ae60..3d0ac2bf5 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/table.svelte @@ -40,7 +40,7 @@ {#each data.deploymentList.deployments as deployment} + href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/deployments/deployment-${deployment.$id}`}> {#each $columns as column} {#if column.id === '$id'} diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deploymentsOverview.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deploymentsOverview.svelte index e44848416..4492be6e2 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deploymentsOverview.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deploymentsOverview.svelte @@ -38,7 +38,7 @@ @@ -62,7 +62,7 @@ {#each deploymentList?.deployments as deployment} + href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/deployments/deployment-${deployment.$id}`}> {deployment.$id} diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.svelte index 343292e19..278fd1e23 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.svelte @@ -18,7 +18,7 @@ diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts index 8373a6b69..eb29f2897 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+page.ts @@ -22,21 +22,23 @@ export const load = async ({ params, depends, url, route }) => { limit, query, search, - domains: await sdk.forProject.proxy.listRules( - [ - Query.or([ - Query.equal('type', RuleType.DEPLOYMENT), - Query.equal('type', RuleType.REDIRECT) - ]), - Query.equal('deploymentResourceType', DeploymentResourceType.SITE), - Query.equal('deploymentResourceId', params.site), - Query.equal('trigger', RuleTrigger.MANUAL), - Query.limit(limit), - Query.offset(offset), - Query.orderDesc(''), - ...parsedQueries.values() - ], - search || undefined - ) + domains: await sdk + .forProject(page.params.region, page.params.project) + .proxy.listRules( + [ + Query.or([ + Query.equal('type', RuleType.DEPLOYMENT), + Query.equal('type', RuleType.REDIRECT) + ]), + Query.equal('deploymentResourceType', DeploymentResourceType.SITE), + Query.equal('deploymentResourceId', params.site), + Query.equal('trigger', RuleTrigger.MANUAL), + Query.limit(limit), + Query.offset(offset), + Query.orderDesc(''), + ...parsedQueries.values() + ], + search || undefined + ) }; }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte index 277d4b8bf..6de6e216f 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte @@ -24,7 +24,7 @@ import { onMount } from 'svelte'; import { ConnectRepoModal } from '$lib/components/git/index.js'; - const routeBase = `${base}/project-${page.params.project}/sites/site-${page.params.site}/domains`; + const routeBase = `${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/domains`; let { data } = $props(); @@ -53,20 +53,18 @@ try { let rule: Models.ProxyRule; if (behaviour === 'BRANCH') { - rule = await sdk.forProject.proxy.createSiteRule( - domainName, - page.params.site, - branch - ); + rule = await sdk + .forProject(page.params.region, page.params.project) + .proxy.createSiteRule(domainName, page.params.site, branch); } else if (behaviour === 'REDIRECT') { const sc = Object.values(StatusCode).find((code) => parseInt(code) === statusCode); - rule = await sdk.forProject.proxy.createRedirectRule( - domainName, - $protocol + redirect, - sc - ); + rule = await sdk + .forProject(page.params.region, page.params.project) + .proxy.createRedirectRule(domainName, $protocol + redirect, sc); } else if (behaviour === 'ACTIVE') { - rule = await sdk.forProject.proxy.createSiteRule(domainName, page.params.site); + rule = await sdk + .forProject(page.params.region, page.params.project) + .proxy.createSiteRule(domainName, page.params.site); } if (rule?.status === 'verified') { await goto(routeBase); @@ -85,26 +83,28 @@ async function connect(selectedInstallationId: string, selectedRepository: string) { try { - await sdk.forProject.sites.update( - data.site.$id, - data.site.name, - data.site.framework as Framework, - data.site.enabled, - data.site.logging || undefined, - data.site.timeout, - data.site.installCommand, - data.site.buildCommand, - data.site.outputDirectory, - data.site.buildRuntime as BuildRuntime, - data.site.adapter as Adapter, - data.site.fallbackFile, - selectedInstallationId, - selectedRepository, - 'main', - undefined, - undefined, - undefined - ); + await sdk + .forProject(page.params.region, page.params.project) + .sites.update( + data.site.$id, + data.site.name, + data.site.framework as Framework, + data.site.enabled, + data.site.logging || undefined, + data.site.timeout, + data.site.installCommand, + data.site.buildCommand, + data.site.outputDirectory, + data.site.buildRuntime as BuildRuntime, + data.site.adapter as Adapter, + data.site.fallbackFile, + selectedInstallationId, + selectedRepository, + 'main', + undefined, + undefined, + undefined + ); invalidate(Dependencies.SITE); } catch (error) { console.log(error); diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.ts index 76275be7a..79fa589ec 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.ts @@ -8,11 +8,13 @@ export const load = async ({ parent, depends }) => { depends(Dependencies.DOMAINS, Dependencies.SITES_DOMAINS); const [rules, installations] = await Promise.all([ - sdk.forProject.proxy.listRules([ - Query.equal('type', RuleType.DEPLOYMENT), - Query.equal('trigger', RuleTrigger.MANUAL) - ]), - sdk.forProject.vcs.listInstallations() + sdk + .forProject(page.params.region, page.params.project) + .proxy.listRules([ + Query.equal('type', RuleType.DEPLOYMENT), + Query.equal('trigger', RuleTrigger.MANUAL) + ]), + sdk.forProject(page.params.region, page.params.project).vcs.listInstallations() ]); return { @@ -21,10 +23,9 @@ export const load = async ({ parent, depends }) => { installations, branches: site?.installationId && site?.providerRepositoryId - ? await sdk.forProject.vcs.listRepositoryBranches( - site.installationId, - site.providerRepositoryId - ) + ? await sdk + .forProject(page.params.region, page.params.project) + .vcs.listRepositoryBranches(site.installationId, site.providerRepositoryId) : undefined }; }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte index f11d13849..7381f4173 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte @@ -40,7 +40,7 @@ ); let verified = $state(false); - let routeBase = `${base}/project-${page.params.project}/sites/site-${page.params.site}/domains`; + let routeBase = `${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/domains`; let isSubmitting = $state(writable(false)); async function verify() { @@ -48,7 +48,9 @@ data.domainsList.domains.findIndex((rule) => rule.domain === page.params.domain) === -1; try { if (selectedTab !== 'nameserver') { - const ruleData = await sdk.forProject.proxy.updateRuleVerification(ruleId); + const ruleData = await sdk + .forProject(page.params.region, page.params.project) + .proxy.updateRuleVerification(ruleId); verified = ruleData.status === 'verified'; } else if (isNewDomain && isCloud) { const domainData = await sdk.forConsole.domains.create( @@ -77,7 +79,7 @@ async function back() { if (ruleId) { - await sdk.forProject.proxy.deleteRule(ruleId); + await sdk.forProject(page.params.region, page.params.project).proxy.deleteRule(ruleId); } await goto(`${routeBase}/add-domain?domain=${page.params.domain}`); } diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/createPreviewDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/createPreviewDomainModal.svelte index 686250451..9ab54a7b2 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/createPreviewDomainModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/createPreviewDomainModal.svelte @@ -21,10 +21,12 @@ let error = null; async function onSubmit() { try { - await sdk.forProject.proxy.createSiteRule( - `${domain}.${$consoleVariables._APP_DOMAIN_SITES}`, - page.params.site - ); + await sdk + .forProject(page.params.region, page.params.project) + .proxy.createSiteRule( + `${domain}.${$consoleVariables._APP_DOMAIN_SITES}`, + page.params.site + ); await invalidate(Dependencies.SITES_DOMAINS); show = false; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/deleteDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/deleteDomainModal.svelte index 3b2657c63..38b97891d 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/deleteDomainModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/deleteDomainModal.svelte @@ -20,7 +20,9 @@ async function deleteDomain() { try { - await sdk.forProject.proxy.deleteRule(selectedDomain.$id); + await sdk + .forProject(page.params.region, page.params.project) + .proxy.deleteRule(selectedDomain.$id); await invalidate(Dependencies.SITES_DOMAINS); show = false; addNotification({ diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte index 2eb893de3..5a6d05e1d 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte @@ -40,7 +40,9 @@ let error = $state(null); async function retryDomain() { try { - const domain = await sdk.forProject.proxy.updateRuleVerification(selectedDomain.$id); + const domain = await sdk + .forProject(page.params.region, page.params.project) + .proxy.updateRuleVerification(selectedDomain.$id); await invalidate(Dependencies.SITES_DOMAINS); verified = domain.status === 'verified'; show = false; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domainsOverview.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domainsOverview.svelte index 526f8f0d2..7cca03506 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domainsOverview.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domainsOverview.svelte @@ -31,7 +31,7 @@ @@ -57,7 +57,7 @@ source: 'sites_domain_overview' }); }} - href={`${base}/project-${page.params.project}/sites/site-${page.params.site}/domains/add-domain`}> + href={`${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/domains/add-domain`}> Add domain
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/header.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/header.svelte index 43aeb8c1f..d006b3134 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/header.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/header.svelte @@ -7,7 +7,7 @@ import { site } from './store'; $: projectId = page.params.project; - $: path = `${base}/project-${projectId}/sites/site-${page.params.site}`; + $: path = `${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}`; $: tabs = [ { href: path, @@ -44,7 +44,8 @@ - {$site.name} + {$site.name} {$site?.$id} diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/instantRollbackModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/instantRollbackModal.svelte index 98ca47845..1c5123a7c 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/instantRollbackModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/instantRollbackModal.svelte @@ -24,10 +24,9 @@ async function handleSubmit() { try { - await sdk.forProject.sites.updateSiteDeployment( - selectedDeployment.resourceId, - selectedDeployment.$id - ); + await sdk + .forProject(page.params.region, page.params.project) + .sites.updateSiteDeployment(selectedDeployment.resourceId, selectedDeployment.$id); await invalidate(Dependencies.SITE); show = false; addNotification({ diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/+page.ts index 50ab62ff8..a3ed15a6c 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/logs/+page.ts @@ -20,11 +20,13 @@ export const load = async ({ params, depends, url, route, parent }) => { limit, query, site, - logs: await sdk.forProject.sites.listLogs(params.site, [ - Query.limit(limit), - Query.offset(offset), - Query.orderDesc(''), - ...parsedQueries.values() - ]) + logs: await sdk + .forProject(page.params.region, page.params.project) + .sites.listLogs(params.site, [ + Query.limit(limit), + Query.offset(offset), + Query.orderDesc(''), + ...parsedQueries.values() + ]) }; }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.svelte index bab722d9f..b809abd7b 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.svelte @@ -14,13 +14,15 @@ import { showConnectRepo } from './store'; import { isCloud } from '$lib/system'; import UpdateResourceLimits from './updateResourceLimits.svelte'; - import UpdateVariables from '$routes/(console)/project-[project]/updateVariables.svelte'; + import UpdateVariables from '$routes/(console)/project-[region]-[project]/updateVariables.svelte'; import UpdateLogging from './updateLogging.svelte'; export let data; const sdkCreateVariable = async (key: string, value: string, secret: boolean) => { - await sdk.forProject.sites.createVariable(page.params.site, key, value, secret); + await sdk + .forProject(page.params.region, page.params.project) + .sites.createVariable(page.params.site, key, value, secret); await Promise.all([invalidate(Dependencies.VARIABLES), invalidate(Dependencies.SITE)]); }; @@ -30,12 +32,16 @@ value: string, secret: boolean ) => { - await sdk.forProject.sites.updateVariable(page.params.site, variableId, key, value, secret); + await sdk + .forProject(page.params.region, page.params.project) + .sites.updateVariable(page.params.site, variableId, key, value, secret); await Promise.all([invalidate(Dependencies.VARIABLES), invalidate(Dependencies.SITE)]); }; const sdkDeleteVariable = async (variableId: string) => { - await sdk.forProject.sites.deleteVariable(page.params.site, variableId); + await sdk + .forProject(page.params.region, page.params.project) + .sites.deleteVariable(page.params.site, variableId); await Promise.all([invalidate(Dependencies.VARIABLES), invalidate(Dependencies.SITE)]); }; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.ts index 3a46b9873..e9b637a60 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.ts @@ -8,11 +8,13 @@ export const load = async ({ params, depends, parent }) => { const [globalVariables, variables, frameworks, installations, specificationsList] = await Promise.all([ - sdk.forProject.projectApi.listVariables(), - sdk.forProject.sites.listVariables(params.site), - sdk.forProject.sites.listFrameworks(), - sdk.forProject.vcs.listInstallations(), - sdk.forProject.sites.listSpecifications() + sdk.forProject(page.params.region, page.params.project).projectApi.listVariables(), + sdk + .forProject(page.params.region, page.params.project) + .sites.listVariables(params.site), + sdk.forProject(page.params.region, page.params.project).sites.listFrameworks(), + sdk.forProject(page.params.region, page.params.project).vcs.listInstallations(), + sdk.forProject(page.params.region, page.params.project).sites.listSpecifications() ]); // Conflicting variables first diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/deleteModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/deleteModal.svelte index 1715b309a..a702286fd 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/deleteModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/deleteModal.svelte @@ -14,13 +14,13 @@ let error: string; const handleSubmit = async () => { try { - await sdk.forProject.sites.delete(site.$id); + await sdk.forProject(page.params.region, page.params.project).sites.delete(site.$id); showDelete = false; addNotification({ type: 'success', message: `Site has been deleted` }); - await goto(`${base}/project-${page.params.project}/sites`); + await goto(`${base}/project-${page.params.region}-${page.params.project}/sites`); trackEvent(Submit.SiteDelete); } catch (e) { error = e.message; diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/disconnectRepo.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/disconnectRepo.svelte index 64d653c8b..430650dc9 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/disconnectRepo.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/disconnectRepo.svelte @@ -1,5 +1,6 @@