diff --git a/src/lib/commandCenter/searchers/buckets.ts b/src/lib/commandCenter/searchers/buckets.ts
index 8b81a1574..6c6a30f4f 100644
--- a/src/lib/commandCenter/searchers/buckets.ts
+++ b/src/lib/commandCenter/searchers/buckets.ts
@@ -9,11 +9,11 @@ import { FilesPanel } from '../panels';
import { base } from '$app/paths';
import { page } from '$app/stores';
-const getBucketCommand = (bucket: Models.Bucket, projectId: string) => {
+const getBucketCommand = (bucket: Models.Bucket, region: string, projectId: string) => {
return {
label: `${bucket.name}`,
callback() {
- goto(`${base}/project-${projectId}/storage/bucket-${bucket.$id}`);
+ goto(`${base}/project-${region}-${projectId}/storage/bucket-${bucket.$id}`);
},
group: 'buckets',
icon: 'folder'
@@ -23,6 +23,7 @@ const getBucketCommand = (bucket: Models.Bucket, projectId: string) => {
export const bucketSearcher = (async (query: string) => {
const $page = get(page);
const $project = get(project);
+ const region = $page.params.region;
const { buckets } = await sdk
.forProject($page.params.region, $page.params.project)
.storage.listBuckets([Query.orderDesc('$createdAt')]);
@@ -32,7 +33,7 @@ export const bucketSearcher = (async (query: string) => {
if (filtered.length === 1) {
const bucket = filtered[0];
return [
- getBucketCommand(bucket, $project.$id),
+ getBucketCommand(bucket, region, $project.$id),
{
label: 'Find files',
async callback() {
@@ -84,5 +85,5 @@ export const bucketSearcher = (async (query: string) => {
];
}
- return filtered.map((bucket) => getBucketCommand(bucket, $project.$id));
+ return filtered.map((bucket) => getBucketCommand(bucket, $project.region, $project.$id));
}) satisfies Searcher;
diff --git a/src/lib/commandCenter/searchers/collections.ts b/src/lib/commandCenter/searchers/collections.ts
index d7ece4b2d..1045b17d2 100644
--- a/src/lib/commandCenter/searchers/collections.ts
+++ b/src/lib/commandCenter/searchers/collections.ts
@@ -1,6 +1,5 @@
import { goto } from '$app/navigation';
import { database } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/store';
-import { project } from '$routes/(console)/project-[region]-[project]/store';
import { get } from 'svelte/store';
import type { Searcher } from '../commands';
import { sdk } from '$lib/stores/sdk';
@@ -14,7 +13,6 @@ export const collectionsSearcher = (async (query: string) => {
.forProject($page.params.region, $page.params.project)
.databases.listCollections(databaseId);
- const projectId = get(project).$id;
return collections
.filter((col) => col.name.toLowerCase().includes(query.toLowerCase()))
.map(
@@ -24,7 +22,7 @@ export const collectionsSearcher = (async (query: string) => {
label: col.name,
callback: () => {
goto(
- `${base}/project-${projectId}/databases/database-${databaseId}/collection-${col.$id}`
+ `${base}/project-${$page.params.region}-${$page.params.project}/databases/database-${databaseId}/collection-${col.$id}`
);
}
}) as const
diff --git a/src/lib/commandCenter/searchers/databases.ts b/src/lib/commandCenter/searchers/databases.ts
index bb1691e5a..605afbb92 100644
--- a/src/lib/commandCenter/searchers/databases.ts
+++ b/src/lib/commandCenter/searchers/databases.ts
@@ -1,5 +1,4 @@
import { goto } from '$app/navigation';
-import { project } from '$routes/(console)/project-[region]-[project]/store';
import { get } from 'svelte/store';
import type { Searcher } from '../commands';
import { sdk } from '$lib/stores/sdk';
@@ -20,7 +19,9 @@ export const dbSearcher = (async (query: string) => {
group: 'databases',
label: db.name,
callback: () => {
- goto(`${base}/project-${get(project).$id}/databases/database-${db.$id}`);
+ goto(
+ `${base}/project-${$page.params.region}-${$page.params.project}/databases/database-${db.$id}`
+ );
},
icon: 'database'
}) as const
diff --git a/src/lib/commandCenter/searchers/functions.ts b/src/lib/commandCenter/searchers/functions.ts
index 2c7867511..091491993 100644
--- a/src/lib/commandCenter/searchers/functions.ts
+++ b/src/lib/commandCenter/searchers/functions.ts
@@ -8,11 +8,11 @@ import { page } from '$app/stores';
import { showCreateDeployment } from '$routes/(console)/project-[region]-[project]/functions/function-[function]/store';
import { base } from '$app/paths';
-const getFunctionCommand = (fn: Models.Function, projectId: string) => {
+const getFunctionCommand = (fn: Models.Function, region: string, projectId: string) => {
return {
label: fn.name,
callback: () => {
- goto(`${base}/project-${projectId}/functions/function-${fn.$id}`);
+ goto(`${base}/project-${region}-${projectId}/functions/function-${fn.$id}`);
},
group: 'functions',
icon: 'lightning-bolt'
@@ -31,14 +31,16 @@ export const functionsSearcher = (async (query: string) => {
if (filtered.length === 1) {
const func = filtered[0];
return [
- getFunctionCommand(func, 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)) {
- await goto(`${base}/project-${projectId}/functions/function-${func.$id}`);
+ await goto(
+ `${base}/project-${$page.params.region}-${projectId}/functions/function-${func.$id}`
+ );
}
showCreateDeployment.set(true);
},
@@ -49,7 +51,9 @@ export const functionsSearcher = (async (query: string) => {
label: 'Go to deployments',
nested: true,
callback() {
- goto(`${base}/project-${projectId}/functions/function-${func.$id}`);
+ goto(
+ `${base}/project-${$page.params.region}-${projectId}/functions/function-${func.$id}`
+ );
},
group: 'functions'
},
@@ -57,7 +61,9 @@ export const functionsSearcher = (async (query: string) => {
label: 'Go to usage',
nested: true,
callback() {
- goto(`${base}/project-${projectId}/functions/function-${func.$id}/usage`);
+ goto(
+ `${base}/project-${$page.params.region}-${projectId}/functions/function-${func.$id}/usage`
+ );
},
group: 'functions'
},
@@ -65,7 +71,9 @@ export const functionsSearcher = (async (query: string) => {
label: 'Go to executions',
nested: true,
callback() {
- goto(`${base}/project-${projectId}/functions/function-${func.$id}/executions`);
+ goto(
+ `${base}/project-${$page.params.region}-${projectId}/functions/function-${func.$id}/executions`
+ );
},
group: 'functions'
},
@@ -73,12 +81,14 @@ export const functionsSearcher = (async (query: string) => {
label: 'Go to settings',
nested: true,
callback() {
- goto(`${base}/project-${projectId}/functions/function-${func.$id}/settings`);
+ goto(
+ `${base}/project-${$page.params.region}-${projectId}/functions/function-${func.$id}/settings`
+ );
},
group: 'functions'
}
];
}
- return filtered.map((fn) => getFunctionCommand(fn, projectId));
+ return filtered.map((fn) => getFunctionCommand(fn, $page.params.region, projectId));
}) satisfies Searcher;
diff --git a/src/lib/commandCenter/searchers/messages.ts b/src/lib/commandCenter/searchers/messages.ts
index 9db090442..3e5e72c27 100644
--- a/src/lib/commandCenter/searchers/messages.ts
+++ b/src/lib/commandCenter/searchers/messages.ts
@@ -1,9 +1,8 @@
import { goto } from '$app/navigation';
-import { project } from '$routes/(console)/project-[region]-[project]/store';
import { get } from 'svelte/store';
import { type Searcher } from '../commands';
import { sdk } from '$lib/stores/sdk';
-import { MessagingProviderType } from '@appwrite.io/console';
+import { MessagingProviderType, type Models } from '@appwrite.io/console';
import { base } from '$app/paths';
import { page } from '$app/stores';
@@ -20,7 +19,7 @@ const getLabel = (message) => {
}
};
-const getIcon = (message) => {
+const getIcon = (message: Models.Message) => {
switch (message.providerType) {
case MessagingProviderType.Push:
return 'device-mobile';
@@ -35,7 +34,6 @@ const getIcon = (message) => {
export const messagesSearcher = (async (query: string) => {
const $page = get(page);
- const projectId = get(project).$id;
const { messages } = await sdk
.forProject($page.params.region, $page.params.project)
.messaging.listMessages([], query || undefined);
@@ -48,7 +46,9 @@ export const messagesSearcher = (async (query: string) => {
group: 'messages',
label: getLabel(message),
callback: () => {
- goto(`${base}/project-${projectId}/messaging/message-${message.$id}`);
+ goto(
+ `${base}/project-${$page.params.region}-${$page.params.project}/messaging/message-${message.$id}`
+ );
},
icon: getIcon(message)
}) as const
diff --git a/src/lib/commandCenter/searchers/providers.ts b/src/lib/commandCenter/searchers/providers.ts
index 1ff011c35..4a30a9e65 100644
--- a/src/lib/commandCenter/searchers/providers.ts
+++ b/src/lib/commandCenter/searchers/providers.ts
@@ -1,5 +1,4 @@
import { goto } from '$app/navigation';
-import { project } from '$routes/(console)/project-[region]-[project]/store';
import { get } from 'svelte/store';
import type { Searcher } from '../commands';
import { sdk } from '$lib/stores/sdk';
@@ -14,7 +13,6 @@ const getIcon = (provider: string) => {
export const providersSearcher = (async (query: string) => {
const $page = get(page);
- const projectId = get(project).$id;
const { providers } = await sdk
.forProject($page.params.region, $page.params.project)
.messaging.listProviders([], query || undefined);
@@ -28,7 +26,7 @@ export const providersSearcher = (async (query: string) => {
label: provider.name,
callback: () => {
goto(
- `${base}/project-${projectId}/messaging/providers/provider-${provider.$id}`
+ `${base}/project-${$page.params.region}-${$page.params.project}/messaging/providers/provider-${provider.$id}`
);
},
image: getIcon(provider.provider)
diff --git a/src/lib/commandCenter/searchers/teams.ts b/src/lib/commandCenter/searchers/teams.ts
index 342cf547d..47de6470e 100644
--- a/src/lib/commandCenter/searchers/teams.ts
+++ b/src/lib/commandCenter/searchers/teams.ts
@@ -1,17 +1,16 @@
import { goto } from '$app/navigation';
import { sdk } from '$lib/stores/sdk';
-import { project } from '$routes/(console)/project-[region]-[project]/store';
import { get } from 'svelte/store';
import type { Command, Searcher } from '../commands';
import type { Models } from '@appwrite.io/console';
import { base } from '$app/paths';
import { page } from '$app/stores';
-const getTeamCommand = (team: Models.Team