diff --git a/src/lib/components/viewSelector.svelte b/src/lib/components/viewSelector.svelte index 58c7c36c3..fd94e4f12 100644 --- a/src/lib/components/viewSelector.svelte +++ b/src/lib/components/viewSelector.svelte @@ -47,7 +47,7 @@ {#if $prefs?.preferredView === 'list'} diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.svelte index fdddab20d..e399f77d7 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.svelte @@ -22,9 +22,14 @@ import { tooltip } from '$lib/actions/tooltip'; import { columns } from './store'; import { onMount } from 'svelte'; + import RelationshipsModal from './relationshipsModal.svelte'; export let data: PageData; + const projectId = $page.params.project; + const databaseId = $page.params.database; let showCreateAttribute = false; + let showRelationships = false; + let selectedRelationship: string[] = null; function openWizard() { wizard.start(Create); @@ -35,6 +40,7 @@ ...$collection.attributes.map((attribute) => ({ id: attribute.key, title: attribute.key, + type: attribute.type, show: true })) ]); @@ -56,7 +62,6 @@ } function formatColumn(column: unknown) { - console.log(column); let formattedColumn: string; if (typeof column === 'string') { @@ -109,7 +114,7 @@ {#each data.documents.documents as document} + href={`${base}/console/project-${projectId}/databases/database-${databaseId}/collection-${$collection.$id}/document-${document.$id}`}> @@ -118,18 +123,39 @@ + {#each $columns as column} {#if column.show} - {@const formatted = formatColumn(document[column.id])} - -
- {formatted.value} -
-
+ {#if column.type === 'relationship'} + {#if column.direction === 'one'} + + {document[column.id]} + + {:else} + + {@const itemsNum = column?.data?.lenght} + + + {/if} + {:else} + {@const formatted = formatColumn(document[column.id])} + +
+ {formatted.value} +
+
+ {/if} {/if} {/each}
@@ -161,3 +187,4 @@ + diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/relationshipsModal.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/relationshipsModal.svelte new file mode 100644 index 000000000..e0143cba7 --- /dev/null +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/relationshipsModal.svelte @@ -0,0 +1,24 @@ + + + + + {selectedRelationship} + + + + + + + diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/store.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/store.ts index ab50fdee2..e7b4a3ca0 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/store.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/store.ts @@ -4,6 +4,8 @@ export type Column = { id: string; title: string; show: boolean; + type?: string; + direction?: string; width?: number; }; diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte index f18d2dbc6..1a82e667a 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/relationship.svelte @@ -1,6 +1,8 @@ {#if attribute.direction === 'one'} - + ({ value: n.$id, label: n.name })) ?? + []} /> {:else if attribute.direction === 'many'}
@@ -33,7 +64,16 @@
    {#if addRelationship === false} - + ({ + value: n.$id, + label: n.name + })) ?? []} /> {/if} {#each attribute?.relationships as relationship}