From ba50e4bb7d8c9d421b5dcf55d16a2e620ff7cb4e Mon Sep 17 00:00:00 2001 From: Lyubov Voloshko Date: Wed, 18 Jun 2025 14:35:09 +0300 Subject: [PATCH 1/5] WIP foreign keys in Related records list. position of record view panel --- .../db-table-row-view.component.html | 2 +- .../db-table-row-view.component.ts | 2 +- .../dashboard/db-table/db-table.component.ts | 3 - .../db-table-row-edit.component.css | 11 +- .../db-table-row-edit.component.html | 354 ++++++++++-------- .../db-table-row-edit.component.ts | 122 ++++-- 6 files changed, 303 insertions(+), 191 deletions(-) diff --git a/frontend/src/app/components/dashboard/db-table-row-view/db-table-row-view.component.html b/frontend/src/app/components/dashboard/db-table-row-view/db-table-row-view.component.html index 47c3ee531..85941a387 100644 --- a/frontend/src/app/components/dashboard/db-table-row-view/db-table-row-view.component.html +++ b/frontend/src/app/components/dashboard/db-table-row-view/db-table-row-view.component.html @@ -25,7 +25,7 @@

Preview


-
+

Related records

-
-
- -
-
- +
+
+
+ +
+ + difference + + +
+
+ +
+
+ +
-
-
- -

- Records related to  - "{{tableRowValues[identityColumn]}}" - this row -

- - - - - {{referencedTable.displayTableName}} - - - Absent - - settings - - - open_in_new - - - - - - - {{row[referencedRecords[referencedTable.table_name].identityColumn]}} - - - {{field_name}}: - {{ row[field_name]}} +
+ +

+ Records related to  + "{{tableRowValues[identityColumn]}}" + this row +

+ + + + + {{referencedTable.displayTableName}} + + + Absent + + settings + + + open_in_new + + + + + + -
-
- -
- - - info_outline - -
+ + {{row[referencedRecords[referencedTable.table_name].identityColumn]}} + + + {{field_name}}: - - - + + {{getForeignKeyValue(row[field_name], referencedRecords[referencedTable.table_name]?.foreignKeys)}} + + + {{row[field_name]}} + + + + + + +
-
- - Back - - - - - - - - -
-
+
+
+
+
+ +
+ + + info_outline + +
+ + + + +
+
+
+ +
+ + Back + + + + + + + + +
+
+
+ +
+ diff --git a/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts b/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts index dbff5eb45..7c9db0fbf 100644 --- a/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts +++ b/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts @@ -17,6 +17,7 @@ import { CompanyService } from 'src/app/services/company.service'; import { ConnectionsService } from 'src/app/services/connections.service'; import { DBtype } from 'src/app/models/connection'; import { DbActionLinkDialogComponent } from '../dashboard/db-action-link-dialog/db-action-link-dialog.component'; +import { DbTableRowViewComponent } from '../dashboard/db-table-row-view/db-table-row-view.component'; import { DynamicModule } from 'ng-dynamic-component'; import JsonURL from "@jsonurl/jsonurl"; import { MatButtonModule } from '@angular/material/button'; @@ -31,15 +32,16 @@ import { MatSelectModule } from '@angular/material/select'; import { MatTooltipModule } from '@angular/material/tooltip'; import { NotificationsService } from 'src/app/services/notifications.service'; import { PlaceholderRowEditComponent } from '../skeletons/placeholder-row-edit/placeholder-row-edit.component'; +import { PlaceholderTableViewComponent } from '../skeletons/placeholder-table-view/placeholder-table-view.component'; import { RouterModule } from '@angular/router'; import { Subscription } from 'rxjs'; import { TableRowService } from 'src/app/services/table-row.service'; import { TableStateService } from 'src/app/services/table-state.service'; import { TablesService } from 'src/app/services/tables.service'; import { Title } from '@angular/platform-browser'; +import { formatFieldValue } from 'src/app/lib/format-field-value'; import { getTableTypes } from 'src/app/lib/setup-table-row-structure'; import { normalizeTableName } from '../../lib/normalize'; -import { formatFieldValue } from 'src/app/lib/format-field-value'; @Component({ selector: 'app-db-table-row-edit', @@ -64,7 +66,8 @@ import { formatFieldValue } from 'src/app/lib/format-field-value'; AlertComponent, PlaceholderRowEditComponent, BannerComponent, - BreadcrumbsComponent + BreadcrumbsComponent, + DbTableRowViewComponent ] }) export class DbTableRowEditComponent implements OnInit { @@ -105,6 +108,9 @@ export class DbTableRowEditComponent implements OnInit { public tableForeignKeys: TableForeignKey[]; + public selectedRow: any; + public relatedRecordsProperties: {}; + public isTestConnectionWarning: Alert = { id: 10000000, type: AlertType.Error, @@ -148,6 +154,10 @@ export class DbTableRowEditComponent implements OnInit { ...(this.tableFiltersUrlString !== 'null' ? { filters: this.tableFiltersUrlString } : {}) }; + this._tableState.cast.subscribe(row => { + this.selectedRow = row; + }); + this.routeSub = this.route.queryParams.subscribe((params) => { this.tableName = this.route.snapshot.paramMap.get('table-name'); if (Object.keys(params).length === 0) { @@ -256,30 +266,61 @@ export class DbTableRowEditComponent implements OnInit { chunkSize: 30, filters }).subscribe((res) => { + // on each iteration add key "table name" with table properties to relatedRecordsProperties + this.relatedRecordsProperties = Object.assign({}, this.relatedRecordsProperties, { + [table.table_name]: { + connectionID: this.connectionID, + tableName: table.table_name, + columnsOrder: res.list_fields, + primaryColumns: res.primaryColumns, + foreignKeys: Object.assign({}, ...res.foreignKeys.map((foreignKey: TableForeignKey) => ({[foreignKey.column_name]: foreignKey}))), + foreignKeysList: res.foreignKeys.map(fk => fk.column_name), + widgets: Object.assign({}, ...res.widgets.map((widget: Widget) => { + let parsedParams; + + try { + parsedParams = JSON5.parse(widget.widget_params); + } catch { + parsedParams = {}; + } + + return { + [widget.field_name]: { + ...widget, + widget_params: parsedParams, + }, + }; + }) + ), + widgetsList: res.widgets.map(widget => widget.field_name), + relatedRecords: [], + link: `/dashboard/${this.connectionID}/${table.table_name}/entry` + } + }); let identityColumn = res.identity_column; let fieldsOrder = []; - console.log(res); + // console.log(res); - const foreignKeyMap = {}; - for (const fk of res.foreignKeys) { - foreignKeyMap[fk.column_name] = fk.referenced_column_name; - } + // const foreignKeyMap = {}; + // for (const fk of res.foreignKeys) { + // foreignKeyMap[fk.column_name] = fk.referenced_column_name; + // } // Format each row - const formattedRows = res.rows.map(row => { - const formattedRow = {}; - - for (const key in row) { - if (foreignKeyMap[key] && typeof row[key] === 'object' && row[key] !== null) { - const preferredKey = Object.keys(row[key]).find(k => k !== foreignKeyMap[key]); - formattedRow[key] = preferredKey ? row[key][preferredKey] : row[key][foreignKeyMap[key]]; - } else { - formattedRow[key] = formatFieldValue(row[key], res.structure.find((field: TableField) => field.column_name === key)?.data_type || 'text'); - } - } - return formattedRow; - }) + // const formattedRows = res.rows.map(row => { + // const formattedRow = {}; + + // for (const key in row) { + // if (foreignKeyMap[key] && typeof row[key] === 'object' && row[key] !== null) { + // const preferredKey = Object.keys(row[key]).find(k => k !== foreignKeyMap[key]); + // formattedRow[key] = preferredKey ? row[key][preferredKey] : row[key][foreignKeyMap[key]]; + // } else { + // formattedRow[key] = formatFieldValue(row[key], res.structure.find((field: TableField) => field.column_name === key)?.data_type || 'text'); + // } + // } + // return formattedRow; + // }) if (res.identity_column && res.list_fields.length) { identityColumn = res.identity_column; @@ -303,7 +344,7 @@ export class DbTableRowEditComponent implements OnInit { } const tableRecords = { - rows: formattedRows, + rows: res.rows, links: res.rows.map(row => { let params = {}; Object.keys(res.primaryColumns).forEach((key) => { @@ -312,7 +353,8 @@ export class DbTableRowEditComponent implements OnInit { return params; }), identityColumn, - fieldsOrder + fieldsOrder, + foreignKeys: res.foreignKeys } this.referencedRecords[table.table_name] = tableRecords; }); @@ -416,6 +458,30 @@ export class DbTableRowEditComponent implements OnInit { return this.tableWidgetsList.includes(columnName); } + isForeignKey(columnName: string, foreignKeys: TableForeignKey[]) { + const foreignKeysList = foreignKeys.map((field: TableForeignKey) => {return field['column_name']}); + return foreignKeysList.includes(columnName); + } + + getForeignKeyValue(fieldValue: string, foreignKeys: TableForeignKey[]) { + // const identityColumnName = Object.keys(fieldValue).find(key => key !== foreignKeys[key].referenced_column_name); + console.log('getForeignKeyValue'); + console.log(fieldValue); + console.log(foreignKeys); + const identityColumnName = Object.keys(fieldValue).find(key => { + return foreignKeys.some(fk => fk.column_name === key && fk.referenced_column_name !== key); + }); + if (identityColumnName) { + console.log('getForeignKeyValue'); + console.log(this.selectedRow.record); + return fieldValue[identityColumnName]; + } else { + // const referencedColumnName = this.selectedRow.foreignKeys[field].referenced_column_name; + return fieldValue; + } + return ''; + } + getModifyingFields(fields) { return fields.filter((field: TableField) => !field.auto_increment && !(timestampTypes.includes(field.data_type) && field.column_default && defaultTimestampValues[this.connectionType].includes(field.column_default.toLowerCase().replace(/\(.*\)/, "")))); } @@ -604,4 +670,16 @@ export class DbTableRowEditComponent implements OnInit { }) } } + + handleViewRow(tableName: string, row: {}) { + // this.selectedRowType = 'record'; + this._tableState.selectRow({ + ...this.relatedRecordsProperties[tableName], + record: row, + primaryKeys: this.relatedRecordsProperties[tableName].primaryColumns.reduce((acc, column) => { + acc[column.column_name] = row[column.column_name]; + return acc; + }, {}), + }); + } } From caac60238431510599ecdc1df6ba83068f7cebad Mon Sep 17 00:00:00 2001 From: Lyubov Voloshko Date: Thu, 19 Jun 2025 10:10:44 +0300 Subject: [PATCH 2/5] fix foreign key display in related records list and related record preview --- .../db-table-row-edit.component.html | 30 ++----- .../db-table-row-edit.component.ts | 83 +++++++------------ 2 files changed, 37 insertions(+), 76 deletions(-) diff --git a/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.html b/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.html index 8147aadbc..96226fc78 100644 --- a/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.html +++ b/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.html @@ -70,8 +70,8 @@

{{referencedTable.displayTableName}} - Absent - Absent + settings @@ -86,31 +86,15 @@

- - - - {{row[referencedRecords[referencedTable.table_name].identityColumn]}} {{field_name}}: - - - {{getForeignKeyValue(row[field_name], referencedRecords[referencedTable.table_name]?.foreignKeys)}} - - - {{row[field_name]}} - + {{ referencedRecords[referencedTable.table_name].formattedRows[i][field_name] }} diff --git a/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts b/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts index 7c9db0fbf..e55d493e4 100644 --- a/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts +++ b/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts @@ -302,25 +302,25 @@ export class DbTableRowEditComponent implements OnInit { // console.log(res); - // const foreignKeyMap = {}; - // for (const fk of res.foreignKeys) { - // foreignKeyMap[fk.column_name] = fk.referenced_column_name; - // } + const foreignKeyMap = {}; + for (const fk of res.foreignKeys) { + foreignKeyMap[fk.column_name] = fk.referenced_column_name; + } // Format each row - // const formattedRows = res.rows.map(row => { - // const formattedRow = {}; - - // for (const key in row) { - // if (foreignKeyMap[key] && typeof row[key] === 'object' && row[key] !== null) { - // const preferredKey = Object.keys(row[key]).find(k => k !== foreignKeyMap[key]); - // formattedRow[key] = preferredKey ? row[key][preferredKey] : row[key][foreignKeyMap[key]]; - // } else { - // formattedRow[key] = formatFieldValue(row[key], res.structure.find((field: TableField) => field.column_name === key)?.data_type || 'text'); - // } - // } - // return formattedRow; - // }) + const formattedRows = res.rows.map(row => { + const formattedRow = {}; + + for (const key in row) { + if (foreignKeyMap[key] && typeof row[key] === 'object' && row[key] !== null) { + const preferredKey = Object.keys(row[key]).find(k => k !== foreignKeyMap[key]); + formattedRow[key] = preferredKey ? row[key][preferredKey] : row[key][foreignKeyMap[key]]; + } else { + formattedRow[key] = formatFieldValue(row[key], res.structure.find((field: TableField) => field.column_name === key)?.data_type || 'text'); + } + } + return formattedRow; + }) if (res.identity_column && res.list_fields.length) { identityColumn = res.identity_column; @@ -344,7 +344,8 @@ export class DbTableRowEditComponent implements OnInit { } const tableRecords = { - rows: res.rows, + rawRows: res.rows, + formattedRows, links: res.rows.map(row => { let params = {}; Object.keys(res.primaryColumns).forEach((key) => { @@ -458,30 +459,6 @@ export class DbTableRowEditComponent implements OnInit { return this.tableWidgetsList.includes(columnName); } - isForeignKey(columnName: string, foreignKeys: TableForeignKey[]) { - const foreignKeysList = foreignKeys.map((field: TableForeignKey) => {return field['column_name']}); - return foreignKeysList.includes(columnName); - } - - getForeignKeyValue(fieldValue: string, foreignKeys: TableForeignKey[]) { - // const identityColumnName = Object.keys(fieldValue).find(key => key !== foreignKeys[key].referenced_column_name); - console.log('getForeignKeyValue'); - console.log(fieldValue); - console.log(foreignKeys); - const identityColumnName = Object.keys(fieldValue).find(key => { - return foreignKeys.some(fk => fk.column_name === key && fk.referenced_column_name !== key); - }); - if (identityColumnName) { - console.log('getForeignKeyValue'); - console.log(this.selectedRow.record); - return fieldValue[identityColumnName]; - } else { - // const referencedColumnName = this.selectedRow.foreignKeys[field].referenced_column_name; - return fieldValue; - } - return ''; - } - getModifyingFields(fields) { return fields.filter((field: TableField) => !field.auto_increment && !(timestampTypes.includes(field.data_type) && field.column_default && defaultTimestampValues[this.connectionType].includes(field.column_default.toLowerCase().replace(/\(.*\)/, "")))); } @@ -671,15 +648,15 @@ export class DbTableRowEditComponent implements OnInit { } } - handleViewRow(tableName: string, row: {}) { - // this.selectedRowType = 'record'; - this._tableState.selectRow({ - ...this.relatedRecordsProperties[tableName], - record: row, - primaryKeys: this.relatedRecordsProperties[tableName].primaryColumns.reduce((acc, column) => { - acc[column.column_name] = row[column.column_name]; - return acc; - }, {}), - }); - } + handleViewRow(tableName: string, row: {}) { + // this.selectedRowType = 'record'; + this._tableState.selectRow({ + ...this.relatedRecordsProperties[tableName], + record: row, + primaryKeys: this.relatedRecordsProperties[tableName].primaryColumns.reduce((acc, column) => { + acc[column.column_name] = row[column.column_name]; + return acc; + }, {}), + }); + } } From 0bd27b13f94270c2086f697d546711bdb6ca3720 Mon Sep 17 00:00:00 2001 From: Lyubov Voloshko Date: Thu, 19 Jun 2025 10:45:03 +0300 Subject: [PATCH 3/5] related records on preview of related records in Row edit page --- .../db-table-row-edit.component.ts | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts b/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts index e55d493e4..d7429eb49 100644 --- a/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts +++ b/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts @@ -266,7 +266,7 @@ export class DbTableRowEditComponent implements OnInit { chunkSize: 30, filters }).subscribe((res) => { - // on each iteration add key "table name" with table properties to relatedRecordsProperties + this.relatedRecordsProperties = Object.assign({}, this.relatedRecordsProperties, { [table.table_name]: { connectionID: this.connectionID, @@ -297,6 +297,27 @@ export class DbTableRowEditComponent implements OnInit { link: `/dashboard/${this.connectionID}/${table.table_name}/entry` } }); + + if (res.rows && res.rows.length) { + const firstRow = res.rows[0]; + 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; + keys[column.column_name] = firstRow[column.column_name][referencedColumnNameOfForeignKey]; + } else { + keys[column.column_name] = firstRow[column.column_name]; + } + return keys; + }, {}) + ).subscribe((res) => { + this.relatedRecordsProperties[table.table_name].relatedRecords = res.referenced_table_names_and_columns[0]; + }); + } + + let identityColumn = res.identity_column; let fieldsOrder = []; From 1a804bcc60d365433cce3ea73fd1d44cb32d31da Mon Sep 17 00:00:00 2001 From: Lyubov Voloshko Date: Thu, 19 Jun 2025 10:52:33 +0300 Subject: [PATCH 4/5] fix related records positioning on Edit row --- .../db-table-row-edit/db-table-row-edit.component.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.css b/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.css index 0366dc723..e76897e0c 100644 --- a/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.css +++ b/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.css @@ -19,7 +19,7 @@ } .wrapper_shifted { - margin-left: clamp(-400px, -22vw, -200px); + margin-left: calc(clamp(-400px, -22vw, -200px) - 24px); } .row-edit-header { @@ -83,7 +83,7 @@ .related-views { position: absolute; - top: calc(52px + 96px); + top: calc(52px + 40px); right: 0; display: flex; flex-direction: column; From 7753b8efe7f55012726e982011a1fd78472b6f2e Mon Sep 17 00:00:00 2001 From: Lyubov Voloshko Date: Thu, 19 Jun 2025 14:50:01 +0300 Subject: [PATCH 5/5] edit page: fix styles and layout --- .../db-table-row-view.component.html | 3 +- .../db-table-row-view.component.ts | 1 - .../db-table-row-edit.component.css | 18 +++++- .../db-table-row-edit.component.html | 62 ++++++++++--------- .../db-table-row-edit.component.ts | 7 --- .../foreign-key/foreign-key.component.ts | 5 -- 6 files changed, 51 insertions(+), 45 deletions(-) diff --git a/frontend/src/app/components/dashboard/db-table-row-view/db-table-row-view.component.html b/frontend/src/app/components/dashboard/db-table-row-view/db-table-row-view.component.html index 85941a387..8d1912839 100644 --- a/frontend/src/app/components/dashboard/db-table-row-view/db-table-row-view.component.html +++ b/frontend/src/app/components/dashboard/db-table-row-view/db-table-row-view.component.html @@ -57,7 +57,8 @@

Related records

 + [queryParams]="referencedRecords[referencedTable.table_name]?.links[i]" + (click)="handleClose()"> {{row[referencedRecords[referencedTable.table_name].identityColumn]}} 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 f16b88f6f..6c35fdbe8 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 @@ -61,7 +61,6 @@ export class DbTableRowViewComponent implements OnInit, OnDestroy { // this.connectionID = this._connections.connectionID; this.selectedRowCast = this._tableState.cast.subscribe((row) => { - row && console.log('Row selected:', row.primaryKeys); this.selectedRow = row; if (row && row.columnsOrder) { const columnsOrder = this.selectedRow.columnsOrder.length ? this.selectedRow.columnsOrder : Object.keys(this.selectedRow.record); diff --git a/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.css b/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.css index e76897e0c..052e0b692 100644 --- a/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.css +++ b/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.css @@ -1,5 +1,6 @@ .page { display: flex; + height: 100%; } .wrapper { @@ -152,7 +153,7 @@ bottom: 0; display: flex; align-items: center; - justify-content: space-between; + /* justify-content: space-between; */ background-color: var(--mat-sidenav-content-background-color); box-shadow: var(--shadow); height: 64px; @@ -160,6 +161,21 @@ width: 100vw; } +.actions-box { + display: flex; + align-items: center; + justify-content: space-between; + width: 100%; +} + +.wrapper_shifted .actions { + left: calc(clamp(-400px, -22vw, -200px)); +} + +.wrapper_shifted .actions-box { + margin-left: -24px; +} + @media (prefers-color-scheme: dark) { .actions { --shadow: 0 3px 1px -2px rgba(0,0,0,.5),0 2px 2px 0 rgba(0,0,0,.64),0 1px 5px 0 rgba(0,0,0,0.85); diff --git a/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.html b/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.html index 96226fc78..d63127e60 100644 --- a/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.html +++ b/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.html @@ -160,39 +160,41 @@

- - Back - - +
+ + Back + + - + - + - + +
diff --git a/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts b/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts index d7429eb49..7591d9483 100644 --- a/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts +++ b/frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts @@ -485,25 +485,18 @@ export class DbTableRowEditComponent implements OnInit { } updateField = (updatedValue: any, field: string) => { - console.log('updateField'); - console.log(field); - console.log(updatedValue); if (typeof(updatedValue) === 'object' && updatedValue !== null) { for (const prop of Object.getOwnPropertyNames(this.tableRowValues[field])) { delete this.tableRowValues[field][prop]; } Object.assign(this.tableRowValues[field], updatedValue); } else { - console.log('updateField not object'); this.tableRowValues[field] = updatedValue; }; if (this.keyAttributesFromURL && Object.keys(this.keyAttributesFromURL).includes(field)) { this.isPrimaryKeyUpdated = true }; - console.log('this.tableRowValues[field]'); - console.log(this.tableRowValues[field]); - console.log(this.tableRowValues); } getFormattedUpdatedRow = () => { diff --git a/frontend/src/app/components/ui-components/row-fields/foreign-key/foreign-key.component.ts b/frontend/src/app/components/ui-components/row-fields/foreign-key/foreign-key.component.ts index f94a468c9..80dc6d042 100644 --- a/frontend/src/app/components/ui-components/row-fields/foreign-key/foreign-key.component.ts +++ b/frontend/src/app/components/ui-components/row-fields/foreign-key/foreign-key.component.ts @@ -77,9 +77,6 @@ export class ForeignKeyRowComponent extends BaseRowFieldComponent { this.fkRelations = this.relations; } - console.log('test fkRelations'); - console.log(this.fkRelations); - this.fkRelations && this._tables.fetchTable({ connectionID: this.connectionID, tableName: this.fkRelations.referenced_table_name, @@ -97,8 +94,6 @@ export class ForeignKeyRowComponent extends BaseRowFieldComponent { this.identityColumn ? `${res.rows[0][this.identityColumn]} (${Object.values(modifiedRow).filter(value => value).join(' | ')})` : Object.values(modifiedRow).filter(value => value).join(' | '); - console.log('test identityColumn'); - console.log(this.currentDisplayedString); this.currentFieldValue = res.rows[0][this.fkRelations.referenced_column_name]; this.currentFieldQueryParams = Object.assign({}, ...res.primaryColumns.map((primaeyKey) => ({[primaeyKey.column_name]: res.rows[0][primaeyKey.column_name]}))); this.onFieldChange.emit(this.currentFieldValue);