diff --git a/src/routes/(console)/+layout.ts b/src/routes/(console)/+layout.ts index d6c08c779..071772dc1 100644 --- a/src/routes/(console)/+layout.ts +++ b/src/routes/(console)/+layout.ts @@ -35,7 +35,7 @@ export const load: LayoutLoad = async ({ depends, parent }) => { try { projectsCount = ( await sdk.forConsole.projects.list([ - Query.equal('teamId', currentOrgId), + Query.equal('teamId', currentOrgId), Query.limit(1) ]) ).total; diff --git a/src/routes/(console)/project-[region]-[project]/auth/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/+page.svelte index 1939734e0..e411fbff3 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/+page.svelte @@ -11,8 +11,9 @@ import View from './view.svelte'; export let data; - - const createUserUrl = (user: Models.User<{}>) => `${base}/project-${page.params.region}-${page.params.project}/auth/user-${user.$id}`; + + const createUserUrl = (user: Models.User<{}>) => + `${base}/project-${page.params.region}-${page.params.project}/auth/user-${user.$id}`; @@ -21,6 +22,5 @@ limit={data.limit} offset={data.offset} search={data.search} - {createUserUrl} - /> + {createUserUrl} /> diff --git a/src/routes/(console)/project-[region]-[project]/auth/settings/view.svelte b/src/routes/(console)/project-[region]-[project]/auth/settings/view.svelte index 2f2bc6df0..119d4e43d 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/settings/view.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/settings/view.svelte @@ -21,8 +21,15 @@ async function authUpdate(box: AuthMethod) { try { - await sdk.forConsole.projects.updateAuthStatus({ projectId, method: box.method, status: box.value }); - addNotification({ type: 'success', message: `${box.label} authentication has been updated` }); + await sdk.forConsole.projects.updateAuthStatus({ + projectId, + method: box.method, + status: box.value + }); + addNotification({ + type: 'success', + message: `${box.label} authentication has been updated` + }); trackEvent(Submit.AuthStatusUpdate, { method: box.method, value: box.value }); invalidate(Dependencies.PROJECT); } catch (error) { @@ -45,7 +52,11 @@ {#each $authMethods.list as box} - authUpdate(box)} /> + authUpdate(box)} /> {/each} @@ -54,18 +65,38 @@ OAuth2 Providers - {#each $project.oAuthProviders.filter((p) => p.name !== 'Mock').sort((a, b) => (a.enabled === b.enabled ? 0 : a.enabled ? -1 : 1)) as provider} + {#each $project.oAuthProviders + .filter((p) => p.name !== 'Mock') + .sort( (a, b) => (a.enabled === b.enabled ? 0 : a.enabled ? -1 : 1) ) as provider} {@const oAuthProvider = oAuthProviders[provider.key]} {#if oAuthProvider} - { selectedProvider = provider; showProvider = true; trackEvent(`click_select_provider`, { provider: provider.key.toLowerCase() }); }}> + { + selectedProvider = provider; + showProvider = true; + trackEvent(`click_select_provider`, { + provider: provider.key.toLowerCase() + }); + }}> - + - + {provider.name} - + {/if} @@ -78,5 +109,12 @@ {#if selectedProvider && showProvider} {@const oAuthProvider = oAuthProviders[selectedProvider.key]} - { selectedProvider = null; showProvider = false; }} /> + { + selectedProvider = null; + showProvider = false; + }} /> {/if} diff --git a/src/routes/(console)/project-[region]-[project]/auth/teams/+page.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/+page.svelte index 5d43e6ed7..2cabe7b23 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/teams/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/teams/+page.svelte @@ -10,8 +10,9 @@ import { Container } from '$lib/layout'; import View from './view.svelte'; export let data; - - const createTeamUrl = (team: Models.Team>) => `${base}/project-${page.params.region}-${page.params.project}/auth/teams/team-${team.$id}`; + + const createTeamUrl = (team: Models.Team>) => + `${base}/project-${page.params.region}-${page.params.project}/auth/teams/team-${team.$id}`; @@ -20,6 +21,5 @@ limit={data.limit} offset={data.offset} search={data.search} - {createTeamUrl} - /> + {createTeamUrl} /> diff --git a/src/routes/(console)/project-[region]-[project]/auth/teams/view.svelte b/src/routes/(console)/project-[region]-[project]/auth/teams/view.svelte index 0469531a7..c27c7f9b5 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/teams/view.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/teams/view.svelte @@ -3,7 +3,13 @@ import { page } from '$app/state'; import type { Models } from '@appwrite.io/console'; import { Button } from '$lib/elements/forms'; - import { Empty, EmptySearch, AvatarInitials, SearchQuery, PaginationWithLimit } from '$lib/components'; + import { + Empty, + EmptySearch, + AvatarInitials, + SearchQuery, + PaginationWithLimit + } from '$lib/components'; import { Container } from '$lib/layout'; import { Icon, Layout, Table } from '@appwrite.io/pink-svelte'; @@ -34,28 +40,28 @@ - - - - - (showCreateTeam = true)} event="create_user" size="s"> - - Create team - - + + + + (showCreateTeam = true)} event="create_user" size="s"> + + Create team + + + - {#if teams.total} - - - Name - Members - Created - - {#each teams.teams as team} - {@const href = createTeamUrl(team)} - {#if href} - +{#if teams.total} + + + Name + Members + Created + + {#each teams.teams as team} + {@const href = createTeamUrl(team)} + {#if href} + @@ -69,7 +75,7 @@ - {:else} + {:else} @@ -84,24 +90,22 @@ - {/if} - {/each} - + {/if} + {/each} + - - {:else if search} - - - Clear Search - - - {:else} - (showCreateTeam = true)} - href="https://appwrite.io/docs/references/cloud/client-web/teams" - target="team" /> - {/if} + +{:else if search} + + Clear Search + +{:else} + (showCreateTeam = true)} + href="https://appwrite.io/docs/references/cloud/client-web/teams" + target="team" /> +{/if} diff --git a/src/routes/(console)/project-[region]-[project]/auth/templates/view.svelte b/src/routes/(console)/project-[region]-[project]/auth/templates/view.svelte index 615ae474d..98f32e50f 100644 --- a/src/routes/(console)/project-[region]-[project]/auth/templates/view.svelte +++ b/src/routes/(console)/project-[region]-[project]/auth/templates/view.svelte @@ -1,16 +1,29 @@ - - - - - - (showCreateUser = true)} event="create_user" size="s"> - - Create user - - + + + + + (showCreateUser = true)} event="create_user" size="s"> + + Create user + + + - {#if users.total} - - - {#each $columns as { id, title } (id)} - {title} - {/each} - - - {#each users.users as user} - {@const href = createUserUrl(user)} - {#if href} - - {#each $columns as { id } (id)} - - {#if id === '$id'} - - - - {user.$id} - - - {:else if id === 'name'} - - {#if user.email || user.phone} - {#if user.name} - - - {user.name} - - {:else} - - - - {/if} - {:else} - - - - - {user.name} - - {/if} - - {:else if id === 'identifiers'} - - {user.email && user.phone - ? [user.email, user.phone].join(',') - : user.email || user.phone} - - {:else if id === 'status'} - {#if user.status} - {@const success = user.emailVerification || user.phoneVerification} - - {:else} - - {/if} - {:else if id === 'labels'} - - {user.labels.join(', ')} - - {:else if id === 'joined'} - {toLocaleDateTime(user.registration)} - {:else if id === 'lastActivity'} - {user.accessedAt ? toLocaleDate(user.accessedAt) : 'never'} - {:else} - {user[id]} - {/if} - - {/each} - - {:else} - - {#each $columns as { id } (id)} - - {#if id === '$id'} - - - - {user.$id} - - - {:else if id === 'name'} - - {#if user.email || user.phone} - {#if user.name} - - - {user.name} - - {:else} - - - - {/if} - {:else} - - - - - {user.name} - - {/if} - - {:else if id === 'identifiers'} - - {user.email && user.phone - ? [user.email, user.phone].join(',') - : user.email || user.phone} - - {:else if id === 'status'} - {#if user.status} - {@const success = user.emailVerification || user.phoneVerification} - - {:else} - - {/if} - {:else if id === 'labels'} - - {user.labels.join(', ')} - - {:else if id === 'joined'} - {toLocaleDateTime(user.registration)} - {:else if id === 'lastActivity'} - {user.accessedAt ? toLocaleDate(user.accessedAt) : 'never'} - {:else} - {user[id]} - {/if} - - {/each} - - {/if} +{#if users.total} + + + {#each $columns as { id, title } (id)} + {title} {/each} - + - - {:else if search} - - Clear Search - - {:else} - (showCreateUser = true)} /> - {/if} + {#each users.users as user} + {@const href = createUserUrl(user)} + {#if href} + + {#each $columns as { id } (id)} + + {#if id === '$id'} + + + + {user.$id} + + + {:else if id === 'name'} + + {#if user.email || user.phone} + {#if user.name} + + + {user.name} + + {:else} + + + + {/if} + {:else} + + + + + {user.name} + + {/if} + + {:else if id === 'identifiers'} + + {user.email && user.phone + ? [user.email, user.phone].join(',') + : user.email || user.phone} + + {:else if id === 'status'} + {#if user.status} + {@const success = + user.emailVerification || user.phoneVerification} + + {:else} + + {/if} + {:else if id === 'labels'} + + {user.labels.join(', ')} + + {:else if id === 'joined'} + {toLocaleDateTime(user.registration)} + {:else if id === 'lastActivity'} + {user.accessedAt ? toLocaleDate(user.accessedAt) : 'never'} + {:else} + {user[id]} + {/if} + + {/each} + + {:else} + + {#each $columns as { id } (id)} + + {#if id === '$id'} + + + + {user.$id} + + + {:else if id === 'name'} + + {#if user.email || user.phone} + {#if user.name} + + + {user.name} + + {:else} + + + + {/if} + {:else} + + + + + {user.name} + + {/if} + + {:else if id === 'identifiers'} + + {user.email && user.phone + ? [user.email, user.phone].join(',') + : user.email || user.phone} + + {:else if id === 'status'} + {#if user.status} + {@const success = + user.emailVerification || user.phoneVerification} + + {:else} + + {/if} + {:else if id === 'labels'} + + {user.labels.join(', ')} + + {:else if id === 'joined'} + {toLocaleDateTime(user.registration)} + {:else if id === 'lastActivity'} + {user.accessedAt ? toLocaleDate(user.accessedAt) : 'never'} + {:else} + {user[id]} + {/if} + + {/each} + + {/if} + {/each} + + + +{:else if search} + + Clear Search + +{:else} + (showCreateUser = true)} /> +{/if} diff --git a/src/routes/(console)/project-[region]-[project]/databases/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/+page.svelte index c33dc3608..681222b4c 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/+page.svelte @@ -22,6 +22,5 @@ offset={data.offset} view={data.view} search={data.search} - {getDatabaseUrl} - /> + {getDatabaseUrl} /> diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte index 085336941..c7d607078 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte @@ -18,6 +18,5 @@ offset={data.offset} view={data.view} search={data.search} - {createTableUrl} - /> + {createTableUrl} /> diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/view.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/view.svelte index 6ab369590..7042e1e48 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/view.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/view.svelte @@ -1,6 +1,14 @@ - - - - - - - - {#if $canWriteTables} - ($showCreate = true)}> - - Create table - - {/if} - + + - {#if tables.total} - {#if view === 'grid'} - ($showCreate = true)}> - {#each tables.tables as table} - - {table.name} - {table.$id} - - {/each} - - {:else} - - - {#each $tableViewColumns as { id, title }} - {title} - {/each} - - {#each tables.tables as table (table.$id)} - - {#each $tableViewColumns as column} - - {#if column.id === '$id'} - {#key $tableViewColumns} - {table.$id} - {/key} - {:else if column.id === 'name'} - {table.name} - {:else} - {table[column.id]} - {/if} - - {/each} - - {/each} - - {/if} + + - - {:else if search} - - Clear Search - + {#if $canWriteTables} + ($showCreate = true)}> + + Create table + + {/if} + + + +{#if tables.total} + {#if view === 'grid'} + ($showCreate = true)}> + {#each tables.tables as table} + + {table.name} + {table.$id} + + {/each} + {:else} - - - Create, organize, and query structured data with Tables. - - Documentation - {#if $canWriteTables} - { $showCreate = true; }}>Create table - {/if} - - - + + + {#each $tableViewColumns as { id, title }} + {title} + {/each} + + {#each tables.tables as table (table.$id)} + + {#each $tableViewColumns as column} + + {#if column.id === '$id'} + {#key $tableViewColumns} + {table.$id} + {/key} + {:else if column.id === 'name'} + {table.name} + {:else} + {table[column.id]} + {/if} + + {/each} + + {/each} + {/if} + + +{:else if search} + + Clear Search + +{:else} + + + Create, organize, and query structured data with Tables. + + Documentation + {#if $canWriteTables} + { + $showCreate = true; + }}>Create table + {/if} + + + +{/if} diff --git a/src/routes/(console)/project-[region]-[project]/databases/view.svelte b/src/routes/(console)/project-[region]-[project]/databases/view.svelte index ea27965d0..87958b443 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/view.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/view.svelte @@ -1,9 +1,17 @@ - + diff --git a/src/routes/(console)/project-[region]-[project]/messaging/view.svelte b/src/routes/(console)/project-[region]-[project]/messaging/view.svelte index e76f4b1a5..945ad9363 100644 --- a/src/routes/(console)/project-[region]-[project]/messaging/view.svelte +++ b/src/routes/(console)/project-[region]-[project]/messaging/view.svelte @@ -4,7 +4,7 @@ import { hasPageQueries } from '$lib/components/filters'; import { Button } from '$lib/elements/forms'; import { toLocaleDateTime } from '$lib/helpers/date'; - import { Container, ResponsiveContainerHeader } from '$lib/layout'; + import { ResponsiveContainerHeader } from '$lib/layout'; import { MessagingProviderType, type Models } from '@appwrite.io/console'; import CreateMessageDropdown from './createMessageDropdown.svelte'; import FailedModal from './failedModal.svelte'; @@ -19,7 +19,14 @@ import type { Column } from '$lib/helpers/types'; import { writable } from 'svelte/store'; import { canWriteMessages } from '$lib/stores/roles'; - import { Badge, FloatingActionBar, Layout, Link, Table, Typography } from '@appwrite.io/pink-svelte'; + import { + Badge, + FloatingActionBar, + Layout, + Link, + Table, + Typography + } from '@appwrite.io/pink-svelte'; import { Confirm } from '$lib/components'; import { onDestroy, onMount } from 'svelte'; import { stopPolling, pollMessagesStatus } from './helper'; @@ -49,7 +56,14 @@ const columns = writable([ { id: '$id', title: 'Message ID', type: 'string', width: 200 }, - { id: 'message', title: 'Message', type: 'string', hide: true, filter: false, width: { min: 140 } }, + { + id: 'message', + title: 'Message', + type: 'string', + hide: true, + filter: false, + width: { min: 140 } + }, { id: 'providerType', title: 'Type', type: 'string', width: { min: 100 } }, { id: 'status', title: 'Status', type: 'string', width: { min: 120 } }, { id: 'scheduledAt', title: 'Scheduled at', type: 'datetime', width: { min: 120 } }, @@ -58,11 +72,16 @@ async function handleDelete() { showDelete = false; - const promises = selected.map((id) => sdk.forProject(region, project).messaging.delete({ messageId: id })); + const promises = selected.map((id) => + sdk.forProject(region, project).messaging.delete({ messageId: id }) + ); try { await Promise.all(promises); trackEvent(Submit.MessagingMessageDelete, { total: selected.length }); - addNotification({ type: 'success', message: `${selected.length} message${selected.length > 1 ? 's' : ''} deleted` }); + addNotification({ + type: 'success', + message: `${selected.length} message${selected.length > 1 ? 's' : ''} deleted` + }); } catch (error) { addNotification({ type: 'error', message: error.message }); trackError(error, Submit.MessagingMessageDelete); @@ -92,88 +111,108 @@ {/if} - {#if messages.total} - - - {#each $columns as { id, title }} - {title} - {/each} - - {#each messages.messages as message (message.$id)} - - {#each $columns as column (column.id)} - - {#if column.id === '$id'} - {#key $columns}{message.$id}{/key} - {:else if column.id === 'message'} - {#if message.providerType === MessagingProviderType.Push} - {message.data.title} - {:else if message.providerType === MessagingProviderType.Sms} - {message.data.content} - {:else if message.providerType === MessagingProviderType.Email} - {message.data.subject} - {:else}Invalid provider{/if} - {:else if column.id === 'providerType'} - - {:else if column.id === 'status'} - - - {#if message.status === 'failed'} - { e.preventDefault(); errors = message.deliveryErrors; showFailed = true; }}>Details - {/if} - - {:else if column.type === 'datetime'} - {#if !message[column.id]}-{:else}{toLocaleDateTime(message[column.id])}{/if} - {:else} - {message[column.id]} - {/if} - - {/each} - +{#if messages.total} + + + {#each $columns as { id, title }} + {title} {/each} - + + {#each messages.messages as message (message.$id)} + + {#each $columns as column (column.id)} + + {#if column.id === '$id'} + {#key $columns}{message.$id}{/key} + {:else if column.id === 'message'} + {#if message.providerType === MessagingProviderType.Push} + {message.data.title} + {:else if message.providerType === MessagingProviderType.Sms} + {message.data.content} + {:else if message.providerType === MessagingProviderType.Email} + {message.data.subject} + {:else}Invalid provider{/if} + {:else if column.id === 'providerType'} + + {:else if column.id === 'status'} + + + {#if message.status === 'failed'} + { + e.preventDefault(); + errors = message.deliveryErrors; + showFailed = true; + }}>Details + {/if} + + {:else if column.type === 'datetime'} + {#if !message[column.id]}-{:else}{toLocaleDateTime( + message[column.id] + )}{/if} + {:else} + {message[column.id]} + {/if} + + {/each} + + {/each} + - {#if selected.length > 0} - - - - {selected.length > 1 ? 'messages' : 'message'} selected - - - (selected = [])}>Cancel - (showDelete = true)}>Delete - - - {/if} - - - {:else if $hasPageQueries} - - {:else if search} - - - Sorry, we couldn't find '{search}' - There are no messages that match your search. - - - Documentation - Clear search - - - {:else} - ($showCreate = true)}> - - Documentation - {#if $canWriteMessages} - - Create message - - {/if} + {#if selected.length > 0} + + + + {selected.length > 1 ? 'messages' : 'message'} selected - + + (selected = [])}>Cancel + (showDelete = true)}>Delete + + {/if} + +{:else if $hasPageQueries} + +{:else if search} + + + Sorry, we couldn't find '{search}' + There are no messages that match your search. + + + Documentation + Clear search + + +{:else} + ($showCreate = true)}> + + Documentation + {#if $canWriteMessages} + + Create message + + {/if} + + +{/if} + - Are you sure you want to delete {selected.length} {selected.length > 1 ? 'messages' : 'message'}? - + Are you sure you want to delete {selected.length} + {selected.length > 1 ? 'messages' : 'message'}? + diff --git a/src/routes/(console)/project-[region]-[project]/storage/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/+page.svelte index c99cd6107..56a01c64b 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/+page.svelte @@ -23,6 +23,5 @@ offset={data.offset} view={data.view} search={data.search} - {createBucketUrl} - /> + {createBucketUrl} /> diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte index a66b3d50d..906c4896d 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte @@ -17,6 +17,5 @@ limit={data.limit} offset={data.offset} search={data.search} - {createFileUrl} - /> + {createFileUrl} /> diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/view.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/view.svelte index d7d3ada30..9aec99649 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/view.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/view.svelte @@ -15,7 +15,12 @@ import { Layout, Table, Icon, Popover, ActionMenu } from '@appwrite.io/pink-svelte'; import { onMount } from 'svelte'; import DualTimeView from '$lib/components/dualTimeView.svelte'; - import { IconDotsHorizontal, IconPencil, IconPlus, IconTrash } from '@appwrite.io/pink-icons-svelte'; + import { + IconDotsHorizontal, + IconPencil, + IconPlus, + IconTrash + } from '@appwrite.io/pink-icons-svelte'; let { files, @@ -54,7 +59,9 @@ async function deleteFile(file: Models.File) { try { - await sdk.forProject(page.params.region, page.params.project).storage.deleteFile({ bucketId: file.bucketId, fileId: file.$id }); + await sdk + .forProject(page.params.region, page.params.project) + .storage.deleteFile({ bucketId: file.bucketId, fileId: file.$id }); await invalidate(Dependencies.FILES); await uploader.removeFile(file); trackEvent(Submit.FileDelete); @@ -152,10 +159,21 @@ - { close(); goto(href); }}> + { + close(); + goto(href); + }}> Edit - { close(); selectedFile = file; showDelete = true; }}> + { + close(); + selectedFile = file; + showDelete = true; + }}> Delete @@ -190,7 +208,13 @@ - { close(); selectedFile = file; showDelete = true; }}> + { + close(); + selectedFile = file; + showDelete = true; + }}> Delete @@ -209,9 +233,13 @@ Clear Search {:else} - goto("create")} /> + goto('create')} /> {/if} {#if selectedFile} -{/if} \ No newline at end of file +{/if} diff --git a/src/routes/(console)/project-[region]-[project]/storage/view.svelte b/src/routes/(console)/project-[region]-[project]/storage/view.svelte index 6360533e1..4dcafa2d2 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/view.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/view.svelte @@ -1,7 +1,14 @@ @@ -15,6 +16,5 @@ limit={data.limit} offset={data.offset} search={data.search} - {createUserUrl} - /> + {createUserUrl} /> diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/+page.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/+page.ts index f9439ed26..79e02615b 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/+page.ts +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/+page.ts @@ -15,12 +15,13 @@ export const load: PageLoad = async ({ url, route, params }) => { limit, search, page, - users: await sdk.forProject(params.region, params.project).users.list([ - Query.limit(limit), - Query.offset(offset), - Query.orderDesc(''), - ...(search ? [Query.search('name', search)] : []) - ]) + users: await sdk + .forProject(params.region, params.project) + .users.list([ + Query.limit(limit), + Query.offset(offset), + Query.orderDesc(''), + ...(search ? [Query.search('name', search)] : []) + ]) }; }; - diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/security/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/security/+page.svelte index 9eb5f5ab5..d4876d7f1 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/security/+page.svelte +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/security/+page.svelte @@ -22,4 +22,3 @@ - diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/teams/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/teams/+page.svelte index 15f334900..0759ee5cc 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/teams/+page.svelte +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/teams/+page.svelte @@ -6,7 +6,8 @@ import View from '$routes/(console)/project-[region]-[project]/auth/teams/view.svelte'; let { data } = $props(); - const createTeamUrl = (team: Models.Team>) => `${base}/embed/project-${page.params.region}-${page.params.project}/auth/teams/team-${team.$id}`; + const createTeamUrl = (team: Models.Team>) => + `${base}/embed/project-${page.params.region}-${page.params.project}/auth/teams/team-${team.$id}`; @@ -15,6 +16,5 @@ limit={data.limit} offset={data.offset} search={data.search} - {createTeamUrl} - /> + {createTeamUrl} /> diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/teams/+page.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/teams/+page.ts index dcc050a24..481050ae7 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/teams/+page.ts +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/teams/+page.ts @@ -15,12 +15,13 @@ export const load: PageLoad = async ({ url, route, params }) => { limit, search, page, - teams: await sdk.forProject(params.region, params.project).teams.list([ - Query.limit(limit), - Query.offset(offset), - Query.orderDesc(''), - ...(search ? [Query.search('name', search)] : []) - ]) + teams: await sdk + .forProject(params.region, params.project) + .teams.list([ + Query.limit(limit), + Query.offset(offset), + Query.orderDesc(''), + ...(search ? [Query.search('name', search)] : []) + ]) }; }; - diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/teams/team-[team]/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/teams/team-[team]/+page.svelte index 728182a59..3d79e8f02 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/teams/team-[team]/+page.svelte +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/teams/team-[team]/+page.svelte @@ -3,4 +3,3 @@ - diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/user-[user]/+page.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/user-[user]/+page.ts index a5c106b0b..a2d9223f0 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/auth/user-[user]/+page.ts +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/auth/user-[user]/+page.ts @@ -9,4 +9,3 @@ export const load: PageLoad = async ({ params }) => { return { user, userFactors }; }; - diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/+layout.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/+layout.ts index a3a65791a..292145ca0 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/+layout.ts +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/+layout.ts @@ -3,4 +3,4 @@ import type { LayoutLoad } from './$types'; export const load: LayoutLoad = async ({ parent }) => { const { project } = await parent(); return { project }; -}; \ No newline at end of file +}; diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/+page.svelte index 648e9210f..1e3d0fdab 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/+page.svelte +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/+page.svelte @@ -22,6 +22,5 @@ offset={data?.offset || 0} view={data?.view || 'grid'} search={data?.search || null} - {getDatabaseUrl} - /> - \ No newline at end of file + {getDatabaseUrl} /> + diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/+page.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/+page.ts index aaaa087b4..fcb828ff8 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/+page.ts +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/+page.ts @@ -1,11 +1,142 @@ -import type { PageLoad } from './$types'; +import { CARD_LIMIT, Dependencies } from '$lib/constants'; +import { getLimit, getPage, getSearch, getView, pageToOffset, View } from '$lib/helpers/load'; +import { sdk } from '$lib/stores/sdk'; +import { type Models, Query } from '@appwrite.io/console'; +import { timeFromNow } from '$lib/helpers/date'; +import type { PageLoad, RouteParams } from './$types'; +import type { BackupPolicy } from '$lib/sdk/backups'; +import { isSelfHosted } from '$lib/system'; +import { isCloud } from '$lib/system'; +import type { Plan } from '$lib/sdk/billing'; -export const load: PageLoad = async ({ parent, url }) => { - const { project } = await parent(); - - // Import the console page loader to reuse the same logic - const consoleLoader = await import('$routes/(console)/project-[region]-[project]/databases/+page.ts'); - - // Call the console loader with the same parameters - return await consoleLoader.load({ parent, url }); -}; \ No newline at end of file +export const load: PageLoad = async ({ url, route, depends, params, parent }) => { + depends(Dependencies.DATABASES); + + const page = getPage(url); + const search = getSearch(url); + const limit = getLimit(url, route, CARD_LIMIT); + const view = getView(url, route, View.Grid); + const offset = pageToOffset(page, limit); + + // already loaded by parent. + const { currentPlan } = await parent(); + + const { databases, tables, policies, lastBackups } = await fetchDatabasesAndBackups( + limit, + offset, + params, + search, + currentPlan + ); + + return { + offset, + limit, + view, + search, + tables, + policies, + databases, + lastBackups + }; +}; + +async function fetchDatabasesAndBackups( + limit: number, + offset: number, + params: RouteParams, + search?: string | undefined, + currentPlan?: Plan +) { + const backupsEnabled = currentPlan?.backupsEnabled ?? true; + + const projectSDK = sdk.forProject(params.region, params.project); + + const databases = await projectSDK.tablesDB.list({ + queries: [Query.limit(limit), Query.offset(offset), Query.orderDesc('$createdAt')], + search: search || undefined + }); + + const tables: Record = {}; + + await Promise.all( + // TODO: backend should allow `Query.select` for perf! + databases.databases.map(async ({ $id }) => { + const res = await projectSDK.tablesDB.listTables({ + databaseId: $id, + queries: [Query.limit(1), Query.orderDesc('')] + }); + + tables[$id] = res.tables?.[0]?.$id ?? null; + }) + ); + + let lastBackups: Record, policies: Record; + + if (isCloud && backupsEnabled) { + [policies, lastBackups] = await Promise.all([ + fetchPolicies(databases, params), + fetchLastBackups(databases, params) + ]); + } + + return { databases, tables, policies, lastBackups }; +} + +async function fetchPolicies(databases: Models.DatabaseList, params: RouteParams) { + if (isSelfHosted) return {}; + + const databasePolicies: Record = {}; + + await Promise.all( + databases.databases.map(async (database) => { + try { + const { policies } = await sdk + .forProject(params.region, params.project) + .backups.listPolicies([ + // TODO: are all needed!? + // Query.limit(3), + Query.equal('resourceType', 'database'), + Query.equal('resourceId', database.$id) + ]); + + if (policies.length > 0) { + databasePolicies[database.$id] = policies; + } + } catch (e) { + // ignore + } + }) + ); + + return databasePolicies; +} + +async function fetchLastBackups(databases: Models.DatabaseList, params: RouteParams) { + if (isSelfHosted) return {}; + + const lastBackups: Record = {}; + + await Promise.all( + databases.databases.map(async (database) => { + try { + const { archives } = await sdk + .forProject(params.region, params.project) + .backups.listArchives([ + Query.limit(1), + Query.orderDesc('$createdAt'), + Query.equal('resourceType', 'database'), + Query.equal('resourceId', database.$id) + ]); + + if (archives.length > 0) { + lastBackups[database.$id] = timeFromNow(archives[0].$createdAt); + } + } catch (e) { + // ignore + } + }) + ); + + return lastBackups; +} diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/+layout.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/+layout.ts index a3a65791a..487cf2403 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/+layout.ts +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/+layout.ts @@ -1,6 +1,15 @@ +import { sdk } from '$lib/stores/sdk'; +import { Dependencies } from '$lib/constants'; import type { LayoutLoad } from './$types'; -export const load: LayoutLoad = async ({ parent }) => { - const { project } = await parent(); - return { project }; -}; \ No newline at end of file +export const load: LayoutLoad = async ({ params, depends }) => { + depends(Dependencies.DATABASE); + + const database = await sdk.forProject(params.region, params.project).tablesDB.get({ + databaseId: params.database + }); + + return { + database + }; +}; diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/+page.svelte index 2e07a5e08..077ee487b 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/+page.svelte +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/+page.svelte @@ -17,6 +17,5 @@ offset={data.offset} view={data.view} search={data.search} - {createTableUrl} - /> - \ No newline at end of file + {createTableUrl} /> + diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/+page.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/+page.ts index bcf6bf4e4..475ed13fe 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/+page.ts +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/+page.ts @@ -1,11 +1,29 @@ +import { Query } from '@appwrite.io/console'; +import { sdk } from '$lib/stores/sdk'; +import { getLimit, getPage, getSearch, getView, pageToOffset, View } from '$lib/helpers/load'; import type { PageLoad } from './$types'; +import { CARD_LIMIT, Dependencies } from '$lib/constants'; -export const load: PageLoad = async ({ parent, url, params }) => { - const { project } = await parent(); - - // Import the console page loader to reuse the same logic - const consoleLoader = await import('$routes/(console)/project-[region]-[project]/databases/database-[database]/+page.ts'); - - // Call the console loader with the same parameters - return await consoleLoader.load({ parent, url, params }); -}; \ No newline at end of file +export const load: PageLoad = async ({ params, url, route, depends }) => { + depends(Dependencies.TABLES); + + const page = getPage(url); + const search = getSearch(url); + const limit = getLimit(url, route, CARD_LIMIT); + const view = getView(url, route, View.Grid); + const offset = pageToOffset(page, limit); + + const tables = await sdk.forProject(params.region, params.project).tablesDB.listTables({ + databaseId: params.database, + queries: [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], + search: search || undefined + }); + + return { + offset, + limit, + search, + view, + tables + }; +}; diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts index a3a65791a..e053fadd0 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.ts @@ -1,6 +1,14 @@ +import { sdk } from '$lib/stores/sdk'; +import { Dependencies } from '$lib/constants'; import type { LayoutLoad } from './$types'; -export const load: LayoutLoad = async ({ parent }) => { - const { project } = await parent(); - return { project }; -}; \ No newline at end of file +export const load: LayoutLoad = async ({ params, depends }) => { + depends(Dependencies.TABLE); + + return { + table: await sdk.forProject(params.region, params.project).tablesDB.getTable({ + databaseId: params.database, + tableId: params.table + }) + }; +}; diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte index 39f4e2485..b853c93dd 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/table-[table]/+page.svelte @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts index 0e64964e2..ff7326dab 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts @@ -1,11 +1,75 @@ +import { Dependencies, SPREADSHEET_PAGE_LIMIT } from '$lib/constants'; +import { getLimit, getPage, getQuery, getView, pageToOffset, View } from '$lib/helpers/load'; +import { sdk } from '$lib/stores/sdk'; +import { type Models, Query } from '@appwrite.io/console'; import type { PageLoad } from './$types'; +import { queries, queryParamToMap } from '$lib/components/filters'; +import { buildWildcardColumnsQuery } from '$routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/store'; +import type { TagValue } from '$lib/components/filters/store'; -export const load: PageLoad = async ({ parent, url, params }) => { - const { project } = await parent(); - - // Import the console page loader to reuse the same logic - const consoleLoader = await import('$routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+page.ts'); - - // Call the console loader with the same parameters - return await consoleLoader.load({ parent, url, params }); -}; \ No newline at end of file +export const load: PageLoad = async ({ params, depends, url, route, parent }) => { + const { table } = await parent(); + depends(Dependencies.ROW); /* TODO: we could just invalidate the rows maybe? */ + depends(Dependencies.ROWS); + + const page = getPage(url); + const limit = getLimit(url, route, SPREADSHEET_PAGE_LIMIT); + const view = getView(url, route, View.Grid); + const offset = pageToOffset(page, limit); + const query = getQuery(url); + + const paramQueries = url.searchParams.get('query'); + const parsedQueries = queryParamToMap(paramQueries || '[]'); + queries.set(parsedQueries); + + const currentSort = extractSortFromQueries(parsedQueries); + + return { + offset, + limit, + view, + query, + currentSort, + rows: await sdk.forProject(params.region, params.project).tablesDB.listRows({ + databaseId: params.database, + tableId: params.table, + queries: buildGridQueries(limit, offset, parsedQueries, table) + }) + }; +}; + +function extractSortFromQueries(parsedQueries: Map) { + for (const [tagValue, queryString] of parsedQueries.entries()) { + if (queryString.includes('orderAsc') || queryString.includes('orderDesc')) { + const isAsc = queryString.includes('orderAsc'); + return { + column: tagValue.value, + direction: isAsc ? 'asc' : 'desc' + }; + } + } + + return { column: null, direction: 'default' }; +} + +function buildGridQueries( + limit: number, + offset: number, + parsedQueries: Map, + table: Models.Table +) { + const hasOrderQuery = Array.from(parsedQueries.values()).some( + (q) => q.includes('orderAsc') || q.includes('orderDesc') + ); + + const queryArray = [Query.limit(limit), Query.offset(offset)]; + + // don't override if there's a user created sort! + if (!hasOrderQuery) { + queryArray.push(Query.orderDesc('')); + } + + queryArray.push(...parsedQueries.values(), ...buildWildcardColumnsQuery(table)); + + return queryArray; +} diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/messaging/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/messaging/+page.svelte index b14bb7ea9..9c2a37694 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/messaging/+page.svelte +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/messaging/+page.svelte @@ -6,7 +6,8 @@ import View from '$routes/(console)/project-[region]-[project]/messaging/view.svelte'; let { data } = $props(); - const createMessageUrl = (message) => `${base}/embed/project-${page.params.region}-${page.params.project}/messaging/message-${message.$id}`; + const createMessageUrl = (message) => + `${base}/embed/project-${page.params.region}-${page.params.project}/messaging/message-${message.$id}`; @@ -15,6 +16,5 @@ limit={data.limit} offset={data.offset} search={data.search} - {createMessageUrl} - /> + {createMessageUrl} /> diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/messaging/+page.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/messaging/+page.ts index 480068e8b..c172cc901 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/messaging/+page.ts +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/messaging/+page.ts @@ -1,6 +1,14 @@ import { queries, queryParamToMap } from '$lib/components/filters'; import { CARD_LIMIT, Dependencies } from '$lib/constants'; -import { View, getLimit, getPage, getQuery, getSearch, getView, pageToOffset } from '$lib/helpers/load'; +import { + View, + getLimit, + getPage, + getQuery, + getSearch, + getView, + pageToOffset +} from '$lib/helpers/load'; import { sdk } from '$lib/stores/sdk'; import { Query, type Models } from '@appwrite.io/console'; import type { PageLoad } from './$types'; @@ -19,7 +27,12 @@ export const load: PageLoad = async ({ depends, url, route, params }) => { queries.set(parsedQueries); const messages = (await sdk.forProject(params.region, params.project).messaging.listMessages({ - queries: [Query.limit(limit), Query.offset(offset), Query.orderDesc(''), ...parsedQueries.values()], + queries: [ + Query.limit(limit), + Query.offset(offset), + Query.orderDesc(''), + ...parsedQueries.values() + ], search: search || undefined })) as { total: number; diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/+layout.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/+layout.ts index a3a65791a..292145ca0 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/+layout.ts +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/+layout.ts @@ -3,4 +3,4 @@ import type { LayoutLoad } from './$types'; export const load: LayoutLoad = async ({ parent }) => { const { project } = await parent(); return { project }; -}; \ No newline at end of file +}; diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/+page.svelte index eecaa6eab..1a0d097f9 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/+page.svelte +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/+page.svelte @@ -4,7 +4,7 @@ import type { Models } from '@appwrite.io/console'; import { Layout } from '@appwrite.io/pink-svelte'; import View from '$routes/(console)/project-[region]-[project]/storage/view.svelte'; - + let { data } = $props(); const createBucketUrl = (bucket: Models.Bucket) => { @@ -19,6 +19,5 @@ offset={data?.offset || 0} view={data?.view || 'grid'} search={data?.search || null} - {createBucketUrl} - /> - \ No newline at end of file + {createBucketUrl} /> + diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/+page.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/+page.ts index 92da06ebd..f83547708 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/+page.ts +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/+page.ts @@ -1,11 +1,25 @@ +import { Query } from '@appwrite.io/console'; +import { sdk } from '$lib/stores/sdk'; +import { getLimit, getPage, getSearch, getView, pageToOffset, View } from '$lib/helpers/load'; +import { CARD_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ parent, url, params }) => { - const { project } = await parent(); - - // Import the console page loader to reuse the same logic - const consoleLoader = await import('$routes/(console)/project-[region]-[project]/storage/+page.ts'); - - // Call the console loader with the same parameters - return await consoleLoader.load({ parent, url, params }); -}; \ No newline at end of file +export const load: PageLoad = async ({ url, route, params }) => { + const page = getPage(url); + const search = getSearch(url); + const view = getView(url, route, View.Grid); + const limit = getLimit(url, route, CARD_LIMIT); + const offset = pageToOffset(page, limit); + const buckets = await sdk.forProject(params.region, params.project).storage.listBuckets({ + queries: [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], + search: search || undefined + }); + + return { + offset, + limit, + view, + search, + buckets + }; +}; diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts index a3a65791a..a9e606f70 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/+layout.ts @@ -1,6 +1,13 @@ +import { sdk } from '$lib/stores/sdk'; +import { Dependencies } from '$lib/constants'; import type { LayoutLoad } from './$types'; -export const load: LayoutLoad = async ({ parent }) => { - const { project } = await parent(); - return { project }; -}; \ No newline at end of file +export const load: LayoutLoad = async ({ params, depends }) => { + depends(Dependencies.BUCKET); + + return { + bucket: await sdk.forProject(params.region, params.project).storage.getBucket({ + bucketId: params.bucket + }) + }; +}; diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte index ab51cc747..df756f86c 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/+page.svelte @@ -4,7 +4,7 @@ import type { Models } from '@appwrite.io/console'; import { Layout } from '@appwrite.io/pink-svelte'; import View from '$routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/view.svelte'; - + let { data } = $props(); const createFileUrl = (file: Models.File) => { @@ -18,6 +18,5 @@ limit={data?.limit || 25} offset={data?.offset || 0} search={data?.search || null} - {createFileUrl} - /> - \ No newline at end of file + {createFileUrl} /> + diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/+page.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/+page.ts index e9446295f..9ced56632 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/+page.ts +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/+page.ts @@ -1,11 +1,26 @@ +import { Query } from '@appwrite.io/console'; +import { sdk } from '$lib/stores/sdk'; +import { getLimit, getPage, getSearch, pageToOffset } from '$lib/helpers/load'; +import { Dependencies, PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ parent, url, params }) => { - const { project } = await parent(); - - // Import the console page loader to reuse the same logic - const consoleLoader = await import('$routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/+page.ts'); - - // Call the console loader with the same parameters - return await consoleLoader.load({ parent, url, params }); -}; \ No newline at end of file +export const load: PageLoad = async ({ params, depends, url, route }) => { + depends(Dependencies.FILES); + const page = getPage(url); + const search = getSearch(url); + const limit = getLimit(url, route, PAGE_LIMIT); + const offset = pageToOffset(page, limit); + + const files = await sdk.forProject(params.region, params.project).storage.listFiles({ + bucketId: params.bucket, + queries: [Query.limit(limit), Query.offset(offset), Query.orderDesc('')], + search + }); + + return { + offset, + limit, + search, + files + }; +}; diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts index a3a65791a..3abd5967f 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts @@ -1,6 +1,17 @@ +import { sdk } from '$lib/stores/sdk'; +import { Dependencies } from '$lib/constants'; import type { LayoutLoad } from './$types'; -export const load: LayoutLoad = async ({ parent }) => { - const { project } = await parent(); - return { project }; -}; \ No newline at end of file +export const load: LayoutLoad = async ({ params, depends }) => { + depends(Dependencies.FILE); + depends(Dependencies.FILE_TOKENS); + + return { + file: await sdk + .forProject(params.region, params.project) + .storage.getFile({ bucketId: params.bucket, fileId: params.file }), + tokens: await sdk + .forProject(params.region, params.project) + .tokens.list({ bucketId: params.bucket, fileId: params.file }) + }; +}; diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte index c94992d6d..ab236c2b9 100644 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte +++ b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte @@ -1,10 +1,10 @@ - \ No newline at end of file + diff --git a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.ts b/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.ts deleted file mode 100644 index c4834e71e..000000000 --- a/src/routes/(embeddings)/embed/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.ts +++ /dev/null @@ -1,11 +0,0 @@ -import type { PageLoad } from './$types'; - -export const load: PageLoad = async ({ parent, url, params }) => { - const { project } = await parent(); - - // Import the console page loader to reuse the same logic - const consoleLoader = await import('$routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/file-[file]/+page.ts'); - - // Call the console loader with the same parameters - return await consoleLoader.load({ parent, url, params }); -}; \ No newline at end of file diff --git a/src/themes/light-studio.json b/src/themes/light-studio.json index a3fb4240b..d33cc287b 100644 --- a/src/themes/light-studio.json +++ b/src/themes/light-studio.json @@ -2,4 +2,4 @@ "bgcolor-accent": "var(--neutral-1000)", "bgcolor-accent-secondary": "var(--neutral-900)", "bgcolor-accent-tertiary": "var(--neutral-850)" -} \ No newline at end of file +}
There are no messages that match your search.