Skip to content

add/edit row: fix fields order taking into account columns_view #1755

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
May 5, 2026
Merged

add/edit row: fix fields order taking into account columns_view #1755

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
78ebeda
add/edit row: fix fields order taking into account columns_view
lyubov-voloshko May 5, 2026
2587264
Merge branch 'main' into fix-column-order
lyubov-voloshko May 5, 2026
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
8 changes: 8 additions & 0 deletions frontend/src/app/components/dashboard/db-table-view/db-table-view.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,9 +728,17 @@ export class DbTableViewComponent implements OnInit, OnChanges {
onColumnVisibilityChange() {
this.tableData.changleColumnList(this.connectionID, this.name);
this.cdr.detectChanges();

// Send selected columns first, then non-selected at the end
const orderedColumns = [
...this.tableData.columns.filter((col) => col.selected),
...this.tableData.columns.filter((col) => !col.selected),
];

this._tables
.updatePersonalTableViewSettings(this.connectionID, this.name, {
columns_view: this.tableData.displayedDataColumns,
list_fields: orderedColumns.map((col) => col.title),
})
.subscribe({
next: () => {
Expand Down
11 changes: 7 additions & 4 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 @@ -198,8 +198,10 @@ export class DbTableRowEditComponent implements OnInit {
return { [field.column_name]: '' };
}),
);
if (res.list_fields.length) {
const shownFieldsList = this.shownRows.map((field: TableField) => field.column_name);
const shownFieldsList = this.shownRows.map((field: TableField) => field.column_name);
if (res.columns_view && res.columns_view.length) {
this.fieldsOrdered = [...res.columns_view].filter((field) => shownFieldsList.includes(field));
Comment on lines +202 to +203
} else if (res.list_fields.length) {
this.fieldsOrdered = [...res.list_fields].filter((field) => shownFieldsList.includes(field));
} else {
this.fieldsOrdered = Object.keys(this.tableRowValues).map((key) => key);
Expand Down Expand Up @@ -244,8 +246,9 @@ export class DbTableRowEditComponent implements OnInit {
this.tableForeignKeys = res.foreignKeys;
// this.shownRows = res.structure.filter((field: TableField) => !field.column_default?.startsWith('nextval'));
this.tableRowValues = { ...res.row };
if (res.list_fields.length) {
// const shownFieldsList = this.shownRows.map((field: TableField) => field.column_name);
if (res.columns_view && res.columns_view.length) {
this.fieldsOrdered = [...res.columns_view];
Comment on lines +249 to +250
} else if (res.list_fields.length) {
this.fieldsOrdered = [...res.list_fields];
} else {
this.fieldsOrdered = Object.keys(this.tableRowValues).map((key) => key);
Expand Down
Loading