diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte index 35b588d3a..c97bd912e 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte @@ -95,12 +95,17 @@ - {attribute.type} - {#if isRelationship(attribute)} - - with {attribute?.key} - + {#if 'format' in attribute} + {attribute.format} + {:else} + {attribute.type} + {#if isRelationship(attribute)} + + with {attribute?.key} + + {/if} {/if} + {attribute.array ? '[]' : ''} diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte index 4b177a5ba..846e3dd79 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/edit.svelte @@ -19,7 +19,15 @@ let error: string; let currentAttr: Attributes; - $: option = options.find((option) => option?.type === selectedAttribute?.type) as Option; + $: option = options.find((option) => { + if (selectedAttribute) { + if ('format' in selectedAttribute) { + return option?.format === selectedAttribute?.format; + } else { + return option?.type === selectedAttribute?.type; + } + } + }) as Option; async function submit() { try { @@ -57,7 +65,7 @@
{option?.name} - {#if option.type === 'relationship'} + {#if option?.type === 'relationship'}
Beta
@@ -74,7 +82,7 @@ bind:value={selectedAttribute.key} autofocus required - disabled /> + readonly />
{/if} - (option = null)} /> + {#if option} + (option = null)} /> + {/if}