Skip to content

fix related items preview when promary key is foreign key #1223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lyubov-voloshko merged 2 commits into from
Jun 19, 2025
Merged

fix related items preview when promary key is foreign key #1223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc6d15a
fix related items preview when promary key is foreign key
lyubov-voloshko Jun 19, 2025
f82d19b
Merge branch 'main' into records-view
lyubov-voloshko Jun 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions frontend/src/app/components/dashboard/db-tables-data-source.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,16 @@ export class TablesDataSource implements DataSource<Object> {
.subscribe((res: any) => {
if (res.rows && res.rows.length) {
const firstRow = res.rows[0];

this.foreignKeysList = res.foreignKeys.map((field) => {return field['column_name']});
this.foreignKeys = Object.assign({}, ...res.foreignKeys.map((foreignKey: TableForeignKey) => ({[foreignKey.column_name]: foreignKey})));

this._tableRow.fetchTableRow(
connectionID,
tableName,
res.primaryColumns.reduce((keys, column) => {
if (res.foreignKeys.map(foreignKey => foreignKey.column_name).includes(column.column_name)) {
const referencedColumnNameOfForeignKey = res.foreignKeys[column.column_name].referenced_column_name;
if (this.foreignKeysList.includes(column.column_name)) {
const referencedColumnNameOfForeignKey = this.foreignKeys[column.column_name].referenced_column_name;
keys[column.column_name] = firstRow[column.column_name][referencedColumnNameOfForeignKey];
} else {
keys[column.column_name] = firstRow[column.column_name];
Expand Down Expand Up @@ -249,9 +253,6 @@ export class TablesDataSource implements DataSource<Object> {

this.sortByColumns = res.sortable_by;

this.foreignKeysList = res.foreignKeys.map((field) => {return field['column_name']});
this.foreignKeys = Object.assign({}, ...res.foreignKeys.map((foreignKey: TableForeignKey) => ({[foreignKey.column_name]: foreignKey})));

if (res.widgets) {
this.widgetsList = res.widgets.map((widget: Widget) => {return widget['field_name']});
this.widgetsCount = this.widgetsList.length;
Expand Down
7 changes: 4 additions & 3 deletions frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,12 +300,15 @@ export class DbTableRowEditComponent implements OnInit {

if (res.rows && res.rows.length) {
const firstRow = res.rows[0];

const relatedTableForeignKeys = Object.assign({}, ...res.foreignKeys.map((foreignKey: TableForeignKey) => ({[foreignKey.column_name]: foreignKey})));

this._tableRow.fetchTableRow(
this.connectionID,
table.table_name,
res.primaryColumns.reduce((keys, column) => {
if (res.foreignKeys.map(foreignKey => foreignKey.column_name).includes(column.column_name)) {
const referencedColumnNameOfForeignKey = res.foreignKeys[column.column_name]?.referenced_column_name;
const referencedColumnNameOfForeignKey = relatedTableForeignKeys[column.column_name]?.referenced_column_name;
keys[column.column_name] = firstRow[column.column_name][referencedColumnNameOfForeignKey];
} else {
keys[column.column_name] = firstRow[column.column_name];
Expand All @@ -321,8 +324,6 @@ export class DbTableRowEditComponent implements OnInit {
let identityColumn = res.identity_column;
let fieldsOrder = [];

// console.log(res);

const foreignKeyMap = {};
for (const fk of res.foreignKeys) {
foreignKeyMap[fk.column_name] = fk.referenced_column_name;
Expand Down