From be9e781de7be122d7e5ee95d23b447807d14cd30 Mon Sep 17 00:00:00 2001 From: Darshan Date: Thu, 3 Jul 2025 13:21:58 +0530 Subject: [PATCH] add: lazy loading relationship support. --- .../collection-[collection]/+page.ts | 9 +++++++-- .../document-[document]/+layout.ts | 10 ++++++++-- .../attributes/relationship.svelte | 9 +++++---- .../document-[document]/attributes/store.ts | 17 ++++++++++++++++- 4 files changed, 36 insertions(+), 9 deletions(-) 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 107d096f6..6d7d7530c 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 @@ -4,9 +4,12 @@ import { sdk } from '$lib/stores/sdk'; import { Query } from '@appwrite.io/console'; import type { PageLoad } from './$types'; import { queries, queryParamToMap } from '$lib/components/filters'; +import { buildWildcardAttributesQuery } from './document-[document]/attributes/store'; -export const load: PageLoad = async ({ params, depends, url, route }) => { +export const load: PageLoad = async ({ params, depends, url, route, parent }) => { + const { collection } = await parent(); depends(Dependencies.DOCUMENTS); + const page = getPage(url); const limit = getLimit(url, route, PAGE_LIMIT); const view = getView(url, route, View.Grid); @@ -15,6 +18,7 @@ export const load: PageLoad = async ({ params, depends, url, route }) => { const paramQueries = url.searchParams.get('query'); const parsedQueries = queryParamToMap(paramQueries || '[]'); + queries.set(parsedQueries); return { @@ -28,7 +32,8 @@ export const load: PageLoad = async ({ params, depends, url, route }) => { Query.limit(limit), Query.offset(offset), Query.orderDesc(''), - ...parsedQueries.values() + ...parsedQueries.values(), + ...buildWildcardAttributesQuery(collection) ]) }; }; diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts index 0c83436f4..5e9479dc0 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts @@ -4,14 +4,20 @@ import type { LayoutLoad } from './$types'; import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; import type { Attributes } from '../store'; +import { buildWildcardAttributesQuery } from './attributes/store'; export const load: LayoutLoad = async ({ params, parent, depends }) => { - depends(Dependencies.DOCUMENT); const { collection } = await parent(); + depends(Dependencies.DOCUMENT); const document = await sdk .forProject(params.region, params.project) - .databases.getDocument(params.database, params.collection, params.document); + .databases.getDocument( + params.database, + params.collection, + params.document, + buildWildcardAttributesQuery(collection) + ); /** * Sanitize DateTime to remove UTC Timezone section. diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte index e63977b1b..0b5e826d3 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte @@ -39,8 +39,6 @@ } } - documentList = await getDocuments(); - if (editing && $doc?.[attribute.key]) { if ($doc[attribute.key]?.length) { relatedList = @@ -59,7 +57,10 @@ }); async function getDocuments(search: string = null) { - const queries = search ? [Query.startsWith('$id', search), Query.orderDesc('')] : []; + const queries = search + ? [Query.select(['$id']), Query.startsWith('$id', search), Query.orderDesc('')] + : [Query.select(['$id'])]; + return await sdk .forProject(page.params.region, page.params.project) .databases.listDocuments(databaseId, attribute.relatedCollection, queries); @@ -103,7 +104,7 @@ showInput = false; } - //Reactive statements + // Reactive statements $: getDocuments(search).then((res) => (documentList = res)); $: paginatedItems = editing diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts index 3fb3c64de..a599246c4 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/store.ts @@ -1,4 +1,4 @@ -import type { Models } from '@appwrite.io/console'; +import { type Models, Query } from '@appwrite.io/console'; import type { Attributes } from '../../store'; export function isRelationshipToMany(attribute: Models.AttributeRelationship) { @@ -20,3 +20,18 @@ export function isString(attribute: Attributes): attribute is Models.AttributeSt if (!attribute) return false; return attribute?.type === 'string'; } + +/** + * Returns select queries for all main and related fields in a collection. + */ +export function buildWildcardAttributesQuery( + collection: Models.Collection | null = null +): string[] { + return [ + ...(collection?.attributes + ?.filter((attr) => isRelationship(attr)) + ?.map((attr) => Query.select([`${attr.key}.*`])) ?? []), + + Query.select(['*']) + ]; +}