diff --git a/src/lib/elements/forms/inputSelectSearch.svelte b/src/lib/elements/forms/inputSelectSearch.svelte index b98ed60f1..4c1fc0740 100644 --- a/src/lib/elements/forms/inputSelectSearch.svelte +++ b/src/lib/elements/forms/inputSelectSearch.svelte @@ -93,6 +93,7 @@ value = null; !$$slots.output && (element.value = search); hasFocus = false; + dispatch('reset'); } $: showClearBtn = (hasFocus && search) || value; 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 e5058369b..0011018b0 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 @@ -35,11 +35,15 @@ await teamPrefs.load($organization.$id); documentList = await getDocuments(); - if (editing && $doc?.[attribute.key] && $doc[attribute.key]?.length) { - relatedList = - $doc[attribute.key]?.map((d: Record) => { - return d?.$id; - }) ?? []; + if (editing && $doc?.[attribute.key]) { + if ($doc[attribute.key]?.length) { + relatedList = + $doc[attribute.key]?.map((d: Record) => { + return d?.$id; + }) ?? []; + } else { + singleRel = $doc[attribute.key]?.$id; + } } displayNames = $teamPrefs?.displayNames?.[attribute?.relatedCollection] ?? ['$id']; @@ -253,6 +257,7 @@ bind:value={singleRel} {options} let:option={o} + on:reset={() => (value = null)} on:select={() => (value = singleRel)}> {o.label} diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte index a8c6abcbe..411395a22 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/data/+page.svelte @@ -94,13 +94,14 @@ ); return !symmetricDifference(workIds, relatedIds).length; } else { - return workAttribute && docAttribute - ? !symmetricDifference(Array.from(workAttribute), Array.from(docAttribute)) - .length - : true; + const workId = + typeof workAttribute === 'string' ? workAttribute : workAttribute?.$id; + const relatedId = + typeof docAttribute === 'string' ? docAttribute : docAttribute?.$id; + + return workId === relatedId; } } - return workAttribute === docAttribute; }