-
-
Notifications
You must be signed in to change notification settings - Fork 18
table settings: restore order_by, column order and visible by default columns #1517
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.
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
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
1e4708d
table settings: restore order_by, column order and visible by default…
lyubov-voloshko 5043c2a
Merge branch 'main' into table-settings-restore-settings
lyubov-voloshko 9ee561a
fix unit tests
lyubov-voloshko 4b8d0ce
Merge branch 'table-settings-restore-settings' of https://github.com/…
lyubov-voloshko File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| import { Component, OnInit } from '@angular/core'; | ||
| import { TableField, TableSettings } from 'src/app/models/table'; | ||
| import { TableField, TableOrdering, TableSettings } from 'src/app/models/table'; | ||
|
|
||
| import { AlertComponent } from '../../../ui-components/alert/alert.component'; | ||
| import { Angulartics2 } from 'angulartics2'; | ||
| import { BreadcrumbsComponent } from '../../../ui-components/breadcrumbs/breadcrumbs.component'; | ||
| import { CommonModule } from '@angular/common'; | ||
| import { CompanyService } from 'src/app/services/company.service'; | ||
| import { ConnectionsService } from 'src/app/services/connections.service'; | ||
| import { DragDropModule } from '@angular/cdk/drag-drop'; | ||
| import { CdkDragDrop, DragDropModule, moveItemInArray } from '@angular/cdk/drag-drop'; | ||
| import { FormsModule } from '@angular/forms'; | ||
| import { IconPickerComponent } from '../../../ui-components/icon-picker/icon-picker.component'; | ||
| import { Location } from '@angular/common'; | ||
|
|
@@ -60,14 +60,20 @@ export class DbTableSettingsComponent implements OnInit { | |
| public loading: boolean = true; | ||
| public fields: string[]; | ||
| public fields_to_exclude: string[]; | ||
| public orderChanged: boolean = false; | ||
| public iconChanged: boolean = false; | ||
| public listFieldsOrder: string[]; | ||
| public tableSettingsInitial: TableSettings = { | ||
| connection_id: '', | ||
| table_name: '', | ||
| icon: '', | ||
| display_name: '', | ||
| autocomplete_columns: [], | ||
| identity_column: '', | ||
| ordering: TableOrdering.Ascending, | ||
| ordering_field: '', | ||
| list_fields: [], | ||
| columns_view: [], | ||
| search_fields: [], | ||
| excluded_fields: [], | ||
| readonly_fields: [], | ||
|
|
@@ -137,9 +143,13 @@ export class DbTableSettingsComponent implements OnInit { | |
| if (Object.keys(res).length !== 0) { | ||
| this.isSettingsExist = true | ||
| this.tableSettings = res; | ||
| this.listFieldsOrder = [...res.list_fields]; | ||
| } else { | ||
| this.tableSettings = this.tableSettingsInitial; | ||
| }; | ||
| if (Object.keys(res).length === 0 || (res && res.list_fields && !res.list_fields.length)) { | ||
| this.listFieldsOrder = [...this.fields]; | ||
| }; | ||
| this.title.setTitle(`${res.display_name || this.displayTableName} - Table settings | ${this._company.companyTabTitle || 'Rocketadmin'}`); | ||
| } | ||
| ); | ||
|
|
@@ -150,6 +160,18 @@ export class DbTableSettingsComponent implements OnInit { | |
| this.iconChanged = true; | ||
| } | ||
|
|
||
| drop(event: CdkDragDrop<string[]>) { | ||
| moveItemInArray(this.listFieldsOrder, event.previousIndex, event.currentIndex); | ||
| this.tableSettings.list_fields = [...this.listFieldsOrder]; | ||
| this.orderChanged = true; | ||
| } | ||
|
|
||
| resetColumnsOrder() { | ||
| this.tableSettings.list_fields = []; | ||
| this.listFieldsOrder = [...this.fields]; | ||
| this.orderChanged = true; | ||
| } | ||
|
|
||
| updateSettings() { | ||
| this.submitting = true; | ||
| this.tableSettings.connection_id = this.connectionID; | ||
|
|
@@ -160,7 +182,11 @@ export class DbTableSettingsComponent implements OnInit { | |
| for (const [key, value] of Object.entries(this.tableSettings)) { | ||
| if (key !== 'connection_id' && key !== 'table_name' && key !== 'ordering') { | ||
| if (Array.isArray(value)) { | ||
| updatedSettings[key] = value.length > 0 | ||
| if (key === 'list_fields') { | ||
| updatedSettings[key] = this.orderChanged; | ||
| } else { | ||
| updatedSettings[key] = value.length > 0; | ||
| } | ||
|
Comment on lines
+185
to
+189
|
||
| } else { | ||
| updatedSettings[key] = Boolean(value); | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The initialization of listFieldsOrder at line 146 will fail when res.list_fields is undefined or null, as spreading undefined/null will throw a runtime error. The check at line 150 only handles empty arrays, not the case where list_fields doesn't exist on the response object. This can occur when table settings exist but don't have list_fields populated, which would cause a crash when trying to spread the undefined value.