From 259e53f8a5234c46aa6550c9b9c9449aa75d8908 Mon Sep 17 00:00:00 2001 From: Lyubov Voloshko Date: Wed, 25 Jun 2025 16:41:30 +0300 Subject: [PATCH] record view: fix foreign key display when foreign key contains direct value --- .../db-table-row-view/db-table-row-view.component.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/components/dashboard/db-table-row-view/db-table-row-view.component.ts b/frontend/src/app/components/dashboard/db-table-row-view/db-table-row-view.component.ts index f574953e9..2a23732a0 100644 --- a/frontend/src/app/components/dashboard/db-table-row-view/db-table-row-view.component.ts +++ b/frontend/src/app/components/dashboard/db-table-row-view/db-table-row-view.component.ts @@ -228,16 +228,18 @@ export class DbTableRowViewComponent implements OnInit, OnDestroy { } getForeignKeyValue(field: string) { - if (this.selectedRow) { + if (this.selectedRow && typeof this.selectedRow.record[field] === 'object') { const identityColumnName = Object.keys(this.selectedRow.record[field]).find(key => key !== this.selectedRow.foreignKeys[field].referenced_column_name); + const referencedColumnName = this.selectedRow.foreignKeys[field].referenced_column_name; if (identityColumnName) { return this.selectedRow.record[field][identityColumnName]; - } else { - const referencedColumnName = this.selectedRow.foreignKeys[field].referenced_column_name; + } + if (referencedColumnName) { return this.selectedRow.record[field][referencedColumnName]; } + return this.selectedRow.record[field] || ''; }; - return ''; + return this.selectedRow.record[field] || ''; } getForeignKeyQueryParams(field: string) {