Skip to content

Commit 5ed54a9

Browse files
karinakharchenkokarinakharchenko
committed
fast filters (new editing)
1 parent 399131d commit 5ed54a9

3 files changed

Lines changed: 16 additions & 72 deletions

File tree

‎frontend/src/app/components/dashboard/db-table-view/db-table-view.component.css‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -55,25 +55,6 @@
5555
}
5656
}
5757

58-
.dashboard-toggle {
59-
display: flex;
60-
align-items: center;
61-
margin-left: 16px;
62-
margin-right: 8px;
63-
}
64-
65-
.dashboard-toggle .toggle-label {
66-
margin-left: 8px;
67-
font-size: 14px;
68-
}
69-
70-
@media (width <= 600px) {
71-
.dashboard-toggle {
72-
margin-left: 0;
73-
margin-top: 8px;
74-
}
75-
}
76-
7758
.table-switcher-option ::ng-deep .mdc-list-item__primary-text {
7859
width: 100%;
7960
}

‎frontend/src/app/components/dashboard/db-table-view/db-table-view.component.html‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,6 @@ <h2 class="mat-h2 table-name">{{ displayName }}</h2>
2525
</mat-autocomplete>
2626
</mat-form-field>
2727

28-
<div class="dashboard-toggle">
29-
<mat-slide-toggle
30-
[checked]="showDashboard"
31-
(change)="toggleDashboard()"
32-
matTooltip="Toggle dashboard view">
33-
<span class="toggle-label">Dashboard</span>
34-
</mat-slide-toggle>
35-
</div>
36-
3728
<button mat-icon-button (click)="loadRowsPage()">
3829
<mat-icon>refresh</mat-icon>
3930
</button>
@@ -195,7 +186,7 @@ <h2 class="mat-h2 table-name">{{ displayName }}</h2>
195186
</mat-chip-row>
196187
</div>
197188

198-
<app-saved-filters-panel *ngIf="tableData && tableData.structure && tableData.widgets && !showDashboard"
189+
<app-saved-filters-panel *ngIf="tableData && tableData.structure && tableData.widgets"
199190
[connectionID]="connectionID"
200191
[selectedTableName]="name"
201192
[selectedTableDisplayName]="displayName"
@@ -207,21 +198,12 @@ <h2 class="mat-h2 table-name">{{ displayName }}</h2>
207198
(filterSelected)="onFilterSelected($event)"
208199
></app-saved-filters-panel>
209200

210-
<!-- Dashboard View -->
211-
<app-db-table-dashboard
212-
*ngIf="showDashboard && tableData"
213-
[tableData]="tableData"
214-
[connectionID]="connectionID"
215-
[tableName]="name"
216-
[displayName]="displayName">
217-
</app-db-table-dashboard>
218-
219201
<!-- Table View -->
220-
<div *ngIf="!showDashboard && tableData && tableData.loading$ | async" class="skeleton mat-elevation-z4">
202+
<div *ngIf="tableData && tableData.loading$ | async" class="skeleton mat-elevation-z4">
221203
<app-placeholder-table-data></app-placeholder-table-data>
222204
</div>
223205

224-
<div *ngIf="!showDashboard" [ngClass]="{hidden: !tableData || (tableData.loading$ | async)}" class="mat-elevation-z4 table-surface">
206+
<div [ngClass]="{hidden: !tableData || (tableData.loading$ | async)}" class="mat-elevation-z4 table-surface">
225207
<div class="table-box">
226208
<mat-table matSort [dataSource]="tableData" NgMatTableQueryReflector
227209
class="db-table"

‎frontend/src/app/components/dashboard/db-table-view/db-table-view.component.ts‎

Lines changed: 13 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,33 @@
1-
import * as JSON5 from 'json5';
2-
3-
import { ActivatedRoute, Router } from '@angular/router';
41
import { Component, EventEmitter, Input, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core';
5-
import { CustomAction, TableForeignKey, TablePermissions, TableProperties, TableRow, Widget } from 'src/app/models/table';
2+
import { CommonModule } from '@angular/common';
63
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
7-
import { UIwidgets, tableDisplayTypes } from '../../../consts/table-display-types';
8-
9-
import { AccessLevel } from 'src/app/models/user';
10-
import { Angulartics2OnModule } from 'angulartics2';
4+
import { ActivatedRoute, Router, RouterModule } from '@angular/router';
5+
import { SelectionModel } from '@angular/cdk/collections';
116
import { ClipboardModule } from '@angular/cdk/clipboard';
12-
import { CommonModule } from '@angular/common';
13-
import { ConnectionsService } from 'src/app/services/connections.service';
14-
import { DbTableExportDialogComponent } from './db-table-export-dialog/db-table-export-dialog.component';
15-
import { DbTableImportDialogComponent } from './db-table-import-dialog/db-table-import-dialog.component';
16-
import { DbTableFiltersDialogComponent } from './db-table-filters-dialog/db-table-filters-dialog.component';
177
import { DragDropModule } from '@angular/cdk/drag-drop';
18-
import { DynamicModule } from 'ng-dynamic-component';
19-
import { ForeignKeyDisplayComponent } from '../../ui-components/table-display-fields/foreign-key/foreign-key.component';
20-
import JsonURL from "@jsonurl/jsonurl";
218
import { MatAutocompleteModule } from '@angular/material/autocomplete';
229
import { MatButtonModule } from '@angular/material/button';
2310
import { MatCheckboxModule } from '@angular/material/checkbox';
2411
import { MatChipsModule } from '@angular/material/chips';
25-
import { MatDialog } from '@angular/material/dialog';
26-
import { MatDialogModule } from '@angular/material/dialog';
12+
import { MatDialog, MatDialogModule } from '@angular/material/dialog';
2713
import { MatFormFieldModule } from '@angular/material/form-field';
2814
import { MatIconModule } from '@angular/material/icon';
2915
import { MatInputModule } from '@angular/material/input';
3016
import { MatMenuModule } from '@angular/material/menu';
31-
import { MatPaginator } from '@angular/material/paginator';
32-
import { MatPaginatorModule } from '@angular/material/paginator';
33-
import { MatSort } from '@angular/material/sort';
34-
import { MatSortModule } from '@angular/material/sort';
17+
import { MatPaginator, MatPaginatorModule } from '@angular/material/paginator';
18+
import { MatSelectModule } from '@angular/material/select';
19+
import { MatSort, MatSortModule } from '@angular/material/sort';
3520
import { MatTableModule } from '@angular/material/table';
3621
import { MatTooltipModule } from '@angular/material/tooltip';
37-
import { ActivatedRoute, Router, RouterModule } from '@angular/router';
38-
import JsonURL from '@jsonurl/jsonurl';
3922
import { Angulartics2OnModule } from 'angulartics2';
23+
import JsonURL from '@jsonurl/jsonurl';
4024
import * as JSON5 from 'json5';
4125
import { DynamicModule } from 'ng-dynamic-component';
4226
import { merge } from 'rxjs';
4327
import { tap } from 'rxjs/operators';
28+
import { tableDisplayTypes, UIwidgets } from '../../../consts/table-display-types';
4429
import { formatFieldValue } from 'src/app/lib/format-field-value';
30+
import { normalizeTableName } from '../../../lib/normalize';
4531
import { getTableTypes } from 'src/app/lib/setup-table-row-structure';
4632
import {
4733
CustomAction,
@@ -54,19 +40,14 @@ import {
5440
import { AccessLevel } from 'src/app/models/user';
5541
import { ConnectionsService } from 'src/app/services/connections.service';
5642
import { NotificationsService } from 'src/app/services/notifications.service';
57-
import { PlaceholderTableDataComponent } from '../../skeletons/placeholder-table-data/placeholder-table-data.component';
58-
import { RouterModule } from '@angular/router';
59-
import { SavedFiltersPanelComponent } from './saved-filters-panel/saved-filters-panel.component';
60-
import { SelectionModel } from '@angular/cdk/collections';
6143
import { TableRowService } from 'src/app/services/table-row.service';
6244
import { TableStateService } from 'src/app/services/table-state.service';
63-
import { tableDisplayTypes, UIwidgets } from '../../../consts/table-display-types';
64-
import { normalizeTableName } from '../../../lib/normalize';
65-
import { PlaceholderTableDataComponent } from '../../skeletons/placeholder-table-data/placeholder-table-data.component';
66-
import { ForeignKeyDisplayComponent } from '../../ui-components/table-display-fields/foreign-key/foreign-key.component';
6745
import { DbTableExportDialogComponent } from './db-table-export-dialog/db-table-export-dialog.component';
46+
import { DbTableFiltersDialogComponent } from './db-table-filters-dialog/db-table-filters-dialog.component';
6847
import { DbTableImportDialogComponent } from './db-table-import-dialog/db-table-import-dialog.component';
6948
import { SavedFiltersPanelComponent } from './saved-filters-panel/saved-filters-panel.component';
49+
import { ForeignKeyDisplayComponent } from '../../ui-components/table-display-fields/foreign-key/foreign-key.component';
50+
import { PlaceholderTableDataComponent } from '../../skeletons/placeholder-table-data/placeholder-table-data.component';
7051

7152
interface Column {
7253
title: string,

0 commit comments

Comments
 (0)