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 6d7d7530c..6f83ab46b 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,10 +4,8 @@ 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, parent }) => { - const { collection } = await parent(); +export const load: PageLoad = async ({ params, depends, url, route }) => { depends(Dependencies.DOCUMENTS); const page = getPage(url); @@ -32,8 +30,7 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) => Query.limit(limit), Query.offset(offset), Query.orderDesc(''), - ...parsedQueries.values(), - ...buildWildcardAttributesQuery(collection) + ...parsedQueries.values() ]) }; }; 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 5e9479dc0..681e90b3b 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,7 +4,6 @@ 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 }) => { const { collection } = await parent(); @@ -12,12 +11,7 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => { const document = await sdk .forProject(params.region, params.project) - .databases.getDocument( - params.database, - params.collection, - params.document, - buildWildcardAttributesQuery(collection) - ); + .databases.getDocument(params.database, params.collection, params.document); /** * Sanitize DateTime to remove UTC Timezone section. diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte index 31db52abd..8dcef8e86 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte @@ -90,11 +90,11 @@ if (isRelationship(attribute)) { if (isRelationshipToMany(attribute as Models.AttributeRelationship)) { - const workIds = workAttribute.map((doc: string | Record) => + const workIds = workAttribute?.map((doc: string | Record) => typeof doc === 'string' ? doc : doc.$id ); - const relatedIds = docAttribute.map((doc: string | Record) => + const relatedIds = docAttribute?.map((doc: string | Record) => typeof doc === 'string' ? doc : doc.$id ); return !symmetricDifference(workIds, relatedIds).length; 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 993e25f97..3aab3cda1 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, Query } from '@appwrite.io/console'; +import { type Models } from '@appwrite.io/console'; import type { Attributes } from '../../store'; export function isRelationshipToMany(attribute: Models.AttributeRelationship) { @@ -20,18 +20,3 @@ 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) => attr.status === 'available' && isRelationship(attr)) - ?.map((attr) => Query.select([`${attr.key}.*`])) ?? []), - - Query.select(['*']) - ]; -}