diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte index 8ab8b314e..a33c4e15b 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/subNavigation.svelte @@ -41,9 +41,7 @@ tables: [] }); - const sortedTables = $derived.by(() => - tables?.tables?.slice().sort((a, b) => a.name.localeCompare(b.name)) - ); + const sortedTables = $derived.by(() => tables?.tables); const selectedTable = $derived.by(() => sortedTables?.find((table: Models.Table) => table.$id === tableId) diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/editRelated.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/editRelated.svelte index 8e6e55c9b..9de017a5f 100644 --- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/editRelated.svelte +++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/rows/editRelated.svelte @@ -342,10 +342,16 @@ {:else if relatedTable?.columns?.length && fetchedRows.length} - {@const twoWayColumnKey = relatedTable.columns.find( - (col: Models.ColumnRelationship) => col.twoWay - )?.key} - {@const columnsToRender = relatedTable.columns.filter((col) => col.key !== twoWayColumnKey)} + + {@const twoWayKeys = new Set( + relatedTable + .columns + .filter((column: Models.ColumnRelationship) => column.twoWay) + .map((c) => c.key) + )} + + + {@const columnsToRender = relatedTable.columns.filter((c) => !twoWayKeys.has(c.key))}
{#if fetchedRows.length === 1}