-
-
Notifications
You must be signed in to change notification settings - Fork 18
saas and mobile fixes #1467
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
saas and mobile fixes #1467
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
cb3e12c
saas and mobile fixes
gugu f19b84b
fix tests
gugu f7d28d5
Merge branch 'main' into saas-and-mobile-fixes
gugu 432de92
Merge branch 'main' into saas-and-mobile-fixes
gugu b03c13a
Merge branch 'main' into saas-and-mobile-fixes
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
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 |
|---|---|---|
|
|
@@ -3,7 +3,9 @@ import { Angulartics2, Angulartics2Module } from 'angulartics2'; | |
| import { Component, OnDestroy, OnInit } from '@angular/core'; | ||
| import { ConnectionSettingsUI, UiSettings } from 'src/app/models/ui-settings'; | ||
| import { CustomEvent, TableProperties } from 'src/app/models/table'; | ||
| import { map } from 'rxjs/operators'; | ||
| import { TableCategory } from 'src/app/models/connection'; | ||
| import { Folder } from './db-table-view/db-table-view.component'; | ||
| import { first, map } from 'rxjs/operators'; | ||
|
|
||
| import { AlertComponent } from '../ui-components/alert/alert.component'; | ||
| import { BannerComponent } from '../ui-components/banner/banner.component'; | ||
|
|
@@ -101,6 +103,7 @@ export class DashboardComponent implements OnInit, OnDestroy { | |
| public isAIpanelOpened: boolean = false; | ||
|
|
||
| public uiSettings: ConnectionSettingsUI; | ||
| public tableFolders: Folder[] = []; | ||
|
|
||
| constructor( | ||
| private _connections: ConnectionsService, | ||
|
|
@@ -153,6 +156,8 @@ export class DashboardComponent implements OnInit, OnDestroy { | |
| this.getData(); | ||
| console.log('getData from ngOnInit'); | ||
| }); | ||
|
|
||
| this.loadTableFolders(); | ||
| } | ||
|
|
||
| ngOnDestroy() { | ||
|
|
@@ -429,4 +434,24 @@ export class DashboardComponent implements OnInit, OnDestroy { | |
| this.shownTableTitles = !this.shownTableTitles; | ||
| this._uiSettings.updateConnectionSetting(this.connectionID, 'shownTableTitles', this.shownTableTitles); | ||
| } | ||
|
|
||
| private loadTableFolders() { | ||
| this._connections.getTablesFolders(this.connectionID).subscribe({ | ||
| next: (categories: TableCategory[]) => { | ||
| if (categories && categories.length > 0) { | ||
| this.tableFolders = categories.map(cat => ({ | ||
| id: cat.category_id, | ||
| name: cat.category_name, | ||
| tableIds: cat.tables | ||
| })); | ||
| } else { | ||
| this.tableFolders = []; | ||
| } | ||
| }, | ||
| error: (error) => { | ||
| console.error('Error fetching table folders:', error); | ||
| this.tableFolders = []; | ||
| } | ||
| }); | ||
| } | ||
|
Comment on lines
+438
to
+456
|
||
| } | ||
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 |
|---|---|---|
|
|
@@ -18,6 +18,7 @@ import { DynamicModule } from 'ng-dynamic-component'; | |
| import { ForeignKeyDisplayComponent } from '../../ui-components/table-display-fields/foreign-key/foreign-key.component'; | ||
| import JsonURL from "@jsonurl/jsonurl"; | ||
| import { MatAutocompleteModule } from '@angular/material/autocomplete'; | ||
| import { MatSelectModule } from '@angular/material/select'; | ||
| import { MatButtonModule } from '@angular/material/button'; | ||
| import { MatCheckboxModule } from '@angular/material/checkbox'; | ||
| import { MatChipsModule } from '@angular/material/chips'; | ||
|
|
@@ -51,6 +52,12 @@ interface Column { | |
| selected: boolean | ||
| } | ||
|
|
||
| export interface Folder { | ||
| id: string; | ||
| name: string; | ||
| tableIds: string[]; | ||
| } | ||
|
Comment on lines
+55
to
+59
|
||
|
|
||
| @Component({ | ||
| selector: 'app-db-table-view', | ||
| templateUrl: './db-table-view.component.html', | ||
|
|
@@ -71,6 +78,7 @@ interface Column { | |
| ReactiveFormsModule, | ||
| MatInputModule, | ||
| MatAutocompleteModule, | ||
| MatSelectModule, | ||
| MatMenuModule, | ||
| MatTooltipModule, | ||
| ClipboardModule, | ||
|
|
@@ -95,6 +103,7 @@ export class DbTableViewComponent implements OnInit { | |
| @Input() filterComparators: object; | ||
| @Input() selection: SelectionModel<any>; | ||
| @Input() tables: TableProperties[]; | ||
| @Input() folders: Folder[] = []; | ||
|
|
||
| @Output() openFilters = new EventEmitter(); | ||
| @Output() openPage = new EventEmitter(); | ||
|
|
@@ -514,8 +523,24 @@ export class DbTableViewComponent implements OnInit { | |
| this._notifications.showSuccessSnackbar(message); | ||
| } | ||
|
|
||
| switchTable(_e) { | ||
| switchTable(tableName: string) { | ||
| if (tableName && tableName !== this.name) { | ||
| this.router.navigate([`/dashboard/${this.connectionID}/${tableName}`], { | ||
| queryParams: { page_index: 0, page_size: 30 } | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| getFolderTables(folder: Folder): TableProperties[] { | ||
| return this.tables.filter(table => folder.tableIds.includes(table.table)); | ||
| } | ||
|
|
||
| getUncategorizedTables(): TableProperties[] { | ||
| const categorizedTableIds = new Set<string>(); | ||
| this.folders.forEach(folder => { | ||
| folder.tableIds.forEach(id => categorizedTableIds.add(id)); | ||
| }); | ||
| return this.tables.filter(table => !categorizedTableIds.has(table.table)); | ||
| } | ||
|
Comment on lines
+534
to
544
|
||
|
|
||
| onFilterSelected($event) { | ||
|
|
||
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
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 property name
tableFolderscould be more consistent with the API terminology. Since the backend API endpoint is/table-categoriesand uses theTableCategoryinterface, consider renaming totableCategoriesto maintain consistency with the domain model throughout the codebase.