diff --git a/src/lib/elements/forms/inputSelectSearch.svelte b/src/lib/elements/forms/inputSelectSearch.svelte index 7c965fce0..f52090e8a 100644 --- a/src/lib/elements/forms/inputSelectSearch.svelte +++ b/src/lib/elements/forms/inputSelectSearch.svelte @@ -4,7 +4,7 @@ import { Label } from '.'; type Option = $$Generic<{ - value: string | boolean | number; + value: string | boolean | number | Record; label: string; data?: string[]; }>; diff --git a/src/lib/elements/selectSearchItem.svelte b/src/lib/elements/selectSearchItem.svelte index cb1ad1952..ce13a3355 100644 --- a/src/lib/elements/selectSearchItem.svelte +++ b/src/lib/elements/selectSearchItem.svelte @@ -2,8 +2,6 @@ import { tooltip } from '$lib/actions/tooltip'; export let data: string[] = []; - - console.log(data);
@@ -15,13 +13,13 @@ e ?? 'n/a').join(' | ') + content: data.map((e) => e ?? e?.toString()).join(' | ') }}> {#each data as item, i} {#if i} | {/if} - {item ?? 'n/a'} + {item} {/each} {/if} 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 29f297ebb..d4a675358 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 @@ -34,10 +34,11 @@ async function getDocuments(search: string = null) { if (search) { + const query = displayNames.map((name) => Query.search(name, search)); const documents = await sdk.forProject.databases.listDocuments( databaseId, attribute.relatedCollection, - [Query.search(displayNames[0], search), Query.orderDesc('$createdAt')] + [...query, Query.orderDesc('$createdAt')] ); return documents; } else { @@ -56,7 +57,7 @@ // Reactive statements $: getDocuments(search).then((res) => (documentList = res)); - $: if (isArray) value = relatedList; + $: if (isArray) value = relatedList.map((doc) => doc.label); {#if isArray} @@ -84,16 +85,9 @@
  • - - {doc} - - - - - + + {doc.label} +
  • {/each} + {#if showInput}
  • ({ - value: n.$id, - label: n.$id - })) ?? []} /> + options={documentList?.documents?.map((n) => { + const data = displayNames + .filter((name) => name !== '$id') + .map((name) => n?.[name]); + return { + value: { label: n.$id, data }, + label: n.$id, + data + }; + }) ?? []} + let:option={o}> + + {o.label} + +