diff --git a/src/lib/layout/createProject.svelte b/src/lib/layout/createProject.svelte index 4758dbbb0..945a4e5c3 100644 --- a/src/lib/layout/createProject.svelte +++ b/src/lib/layout/createProject.svelte @@ -2,13 +2,13 @@ import { Layout, Typography, Input, Tag, Icon } from '@appwrite.io/pink-svelte'; import { IconPencil } from '@appwrite.io/pink-icons-svelte'; import { CustomId } from '$lib/components/index.js'; - import type { Region } from '$lib/sdk/billing'; import { getFlagUrl } from '$lib/helpers/flag'; import { isCloud } from '$lib/system.js'; + import type { Models } from '@appwrite.io/console'; export let projectName: string; export let id: string; - export let regions: Array = []; + export let regions: Array = []; export let region: string; export let showTitle = true; diff --git a/src/routes/(console)/onboarding/create-project/+page.svelte b/src/routes/(console)/onboarding/create-project/+page.svelte index d6676a320..fb59cbdf5 100644 --- a/src/routes/(console)/onboarding/create-project/+page.svelte +++ b/src/routes/(console)/onboarding/create-project/+page.svelte @@ -1,9 +1,8 @@ @@ -91,7 +92,7 @@ @@ -183,7 +184,7 @@ diff --git a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/+page.ts b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/+page.ts index d4b3e9cc8..475f950a5 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/+page.ts @@ -1,38 +1,40 @@ -import { Query } from '@appwrite.io/console'; -import { sdk } from '$lib/stores/sdk'; -import { getLimit, getPage, getQuery, getSearch, pageToOffset } from '$lib/helpers/load'; +import { queries, queryParamToMap } from '$lib/components/filters'; import { Dependencies, PAGE_LIMIT } from '$lib/constants'; +import { getLimit, getPage, getQuery, getSearch, pageToOffset } from '$lib/helpers/load'; +import { sdk } from '$lib/stores/sdk'; +import { Query } from '@appwrite.io/console'; import type { PageLoad } from './$types'; -import { queryParamToMap, queries } from '$lib/components/filters'; export const load: PageLoad = async ({ params, url, route, depends }) => { - depends(Dependencies.MESSAGING_TOPIC_SUBSCRIBERS); + depends(Dependencies.USER_IDENTITIES); const page = getPage(url); const limit = getLimit(url, route, PAGE_LIMIT); const offset = pageToOffset(page, limit); - const search = getSearch(url); const query = getQuery(url); + const search = getSearch(url); const parsedQueries = queryParamToMap(query || '[]'); queries.set(parsedQueries); + const identities = await sdk + .forProject(params.region, params.project) + .users.listIdentities( + [ + Query.equal('userId', params.user), + Query.limit(limit), + Query.offset(offset), + Query.orderDesc(''), + ...parsedQueries.values() + ], + search + ); + return { offset, limit, - search, query, - subscribers: await sdk - .forProject(params.region, params.project) - .messaging.listSubscribers( - params.topic, - [ - Query.limit(limit), - Query.offset(offset), - Query.orderDesc(''), - ...parsedQueries.values() - ], - search || undefined - ) + search, + identities }; }; diff --git a/src/routes/(console)/project-[region]-[project]/databases/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/+page.ts index b5d30e8ca..6abcffdc5 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/+page.ts @@ -15,7 +15,7 @@ export const load: PageLoad = async ({ url, route, depends, params, parent }) => const page = getPage(url); const search = getSearch(url); const limit = getLimit(url, route, CARD_LIMIT); - const view = getView(params.project, url, route, View.Grid); + const view = getView(url, route, View.Grid); const offset = pageToOffset(page, limit); // already loaded by parent. @@ -24,8 +24,8 @@ export const load: PageLoad = async ({ url, route, depends, params, parent }) => const { databases, policies, lastBackups } = await fetchDatabasesAndBackups( limit, offset, - search, params, + search, currentPlan ); diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts index b87e8e194..05c23e830 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts @@ -9,7 +9,7 @@ export const load: PageLoad = async ({ params, url, route, depends }) => { const page = getPage(url); const search = getSearch(url); const limit = getLimit(url, route, CARD_LIMIT); - const view = getView(params.project, url, route, View.Grid); + const view = getView(url, route, View.Grid); const offset = pageToOffset(page, limit); const collections = await sdk .forProject(params.region, params.project) diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.ts index ea5c38ca2..52d9e65c9 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/backups/+page.ts @@ -10,7 +10,7 @@ export const load = async ({ params, url, route, depends, parent }) => { const page = getPage(url); const limit = getLimit(url, route, PAGE_LIMIT); - const view = getView(params.project, url, route, View.Grid); + const view = getView(url, route, View.Grid); const offset = pageToOffset(page, limit); let backups: BackupArchiveList = { total: 0, archives: [] }; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.ts index 30ad5bb6d..107d096f6 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/+page.ts @@ -9,7 +9,7 @@ export const load: PageLoad = async ({ params, depends, url, route }) => { depends(Dependencies.DOCUMENTS); const page = getPage(url); const limit = getLimit(url, route, PAGE_LIMIT); - const view = getView(params.project, url, route, View.Grid); + const view = getView(url, route, View.Grid); const offset = pageToOffset(page, limit); const query = getQuery(url); diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createGit.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createGit.svelte index c67694701..ab09c31e3 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createGit.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(modals)/createGit.svelte @@ -13,6 +13,7 @@ import { IconGithub } from '@appwrite.io/pink-icons-svelte'; import { Icon, Layout, Skeleton, Typography } from '@appwrite.io/pink-svelte'; import { func } from '../store'; + import { page } from '$app/state'; export let show = false; diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/redeployModal.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/redeployModal.svelte index d3f7847cc..62269ebbc 100644 --- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/redeployModal.svelte +++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/redeployModal.svelte @@ -1,7 +1,7 @@ Console - Appwrite - + diff --git a/src/routes/(console)/project-[region]-[project]/messaging/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/+page.ts index e01656e77..0436e02e7 100644 --- a/src/routes/(console)/project-[region]-[project]/messaging/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/messaging/+page.ts @@ -18,7 +18,7 @@ export const load: PageLoad = async ({ depends, url, route, params }) => { const page = getPage(url); const search = getSearch(url); - const view = getView(params.project, url, route, View.Grid); + const view = getView(url, route, View.Grid); const limit = getLimit(url, route, CARD_LIMIT); const offset = pageToOffset(page, limit); const query = getQuery(url); diff --git a/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.ts b/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.ts index cb0e7a66e..e8f6bf337 100644 --- a/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/+page.ts @@ -18,7 +18,7 @@ export const load: PageLoad = async ({ depends, url, route, params }) => { const page = getPage(url); const search = getSearch(url); - const view = getView(params.project, url, route, View.Grid); + const view = getView(url, route, View.Grid); const limit = getLimit(url, route, PAGE_LIMIT); const offset = pageToOffset(page, limit); const query = getQuery(url); diff --git a/src/routes/(console)/project-[region]-[project]/messaging/providers/table.svelte b/src/routes/(console)/project-[region]-[project]/messaging/providers/table.svelte index 4063cd237..47f1b776e 100644 --- a/src/routes/(console)/project-[region]-[project]/messaging/providers/table.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/providers/table.svelte @@ -16,6 +16,7 @@ import { Badge, FloatingActionBar, Icon, Table, Typography } from '@appwrite.io/pink-svelte'; import { IconCheckCircle } from '@appwrite.io/pink-icons-svelte'; import Confirm from '$lib/components/confirm.svelte'; + import { page } from '$app/state'; export let data: PageData; diff --git a/src/routes/(console)/project-[region]-[project]/overview/onboard.svelte b/src/routes/(console)/project-[region]-[project]/overview/onboard.svelte index e35976fd0..3a7d7d5a5 100644 --- a/src/routes/(console)/project-[region]-[project]/overview/onboard.svelte +++ b/src/routes/(console)/project-[region]-[project]/overview/onboard.svelte @@ -48,7 +48,6 @@ }); } - export let projectId: string; export let platforms: Models.Platform[] = []; export let pingCount = 0; 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 3d23d7477..239290177 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,12 +12,10 @@ 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(page.params.region, page.params.project).sites.get(siteId), + sdk.forProject(params.region, params.project).sites.get(siteId), + sdk.forProject(params.region, params.project).sites.getDeployment(siteId, deploymentId), sdk - .forProject(page.params.region, page.params.project) - .sites.getDeployment(siteId, deploymentId), - sdk - .forProject(page.params.region, page.params.project) + .forProject(params.region, params.project) .proxy.listRules([ Query.equal('type', RuleType.DEPLOYMENT), Query.equal('deploymentResourceType', DeploymentResourceType.SITE), @@ -33,7 +31,7 @@ export const load: PageLoad = async ({ url, depends, params }) => { proxyRuleList, repository: site?.installationId ? await sdk - .forProject(page.params.region, page.params.project) + .forProject(params.region, params.project) .vcs.getRepository(site.installationId, site.providerRepositoryId) : undefined }; 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 828e410f0..44d1e0a2c 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 @@ -12,10 +12,10 @@ export const load: PageLoad = async ({ params, depends, parent }) => { const [deployment, proxyRuleList] = await Promise.all([ sdk - .forProject(page.params.region, page.params.project) + .forProject(params.region, params.project) .sites.getDeployment(params.site, params.deployment), sdk - .forProject(page.params.region, page.params.project) + .forProject(params.region, params.project) .proxy.listRules([ Query.equal('type', RuleType.DEPLOYMENT), Query.equal('deploymentId', params.deployment), diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/usage/[[period]]/+page.ts index 7e74b28d5..db813ddf3 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/usage/[[period]]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/usage/[[period]]/+page.ts @@ -9,9 +9,7 @@ export const load: PageLoad = async ({ params }) => { ? params.period : SiteUsageRange.ThirtyDays; try { - return sdk - .forProject(page.params.region, page.params.project) - .sites.getUsage(params.site, period); + return sdk.forProject(params.region, params.project).sites.getUsage(params.site, period); } catch (e) { error(e.code, e.message); } diff --git a/src/routes/(console)/project-[region]-[project]/sites/usage/[[period]]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/usage/[[period]]/+page.ts index af6b3823e..1aa27edd8 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/usage/[[period]]/+page.ts +++ b/src/routes/(console)/project-[region]-[project]/sites/usage/[[period]]/+page.ts @@ -9,7 +9,7 @@ export const load: PageLoad = async ({ params }) => { ? params.period : SiteUsageRange.ThirtyDays; try { - return sdk.forProject(page.params.region, page.params.project).sites.listUsage(period); + return sdk.forProject(params.region, params.project).sites.listUsage(period); } catch (e) { error(e.code, e.message); }