Merge pull request #1315 from rocket-admin/fixes-saved-filters

Fixes saved filters

Author: lyubov-voloshko

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

@@ -41,10 +41,10 @@ import { SelectionModel } from '@angular/cdk/collections';
 import { TableRowService } from 'src/app/services/table-row.service';
 import { TableStateService } from 'src/app/services/table-state.service';
 import { formatFieldValue } from 'src/app/lib/format-field-value';
+import { getTableTypes } from 'src/app/lib/setup-table-row-structure';
 import { merge } from 'rxjs';
 import { normalizeTableName } from '../../../lib/normalize'
 import { tap } from 'rxjs/operators';
-import { getTableTypes } from 'src/app/lib/setup-table-row-structure';
 
 interface Column {
   title: string,
@@ -163,9 +163,14 @@ export class DbTableViewComponent implements OnInit {
           tap(() => {
 
             const filters = JsonURL.stringify( this.activeFilters );
+            const saved_filter = this.route.snapshot.queryParams.saved_filter;
+            const dynamic_column = this.route.snapshot.queryParams.dynamic_column;
+
             this.router.navigate([`/dashboard/${this.connectionID}/${this.name}`], {
               queryParams: {
                 filters,
+                saved_filter,
+                dynamic_column,
                 sort_active: this.sort.active,
                 sort_direction: this.sort.direction.toUpperCase(),
                 page_index: this.paginator.pageIndex,

frontend/src/app/components/dashboard/db-table-view/saved-filters-panel/saved-filters-panel.component.css

@@ -10,6 +10,16 @@
     gap: 16px;
 }
 
+.saved-filters-list__first-time-button {
+    background: var(--color-accentedPalette-50);
+    border: 1px dashed var(--color-accentedPalette-300);
+    transition: background 0.3s ease;
+}
+
+.saved-filters-list__first-time-button:hover {
+    background: var(--color-accentedPalette-100) !important;
+}
+
 /* .saved-filters-tabs {
     --mdc-chip-container-shape-radius: 4px;
 } */
@@ -72,6 +82,17 @@
     margin-left: 8px;
 }
 
+.dynamic-column-editor ::ng-deep .foreign-key {
+    display: block;
+    min-width: 280px;
+    margin-bottom: 16px;
+}
+
+.dynamic-column-editor ::ng-deep .foreign-key .mat-mdc-form-field-subscript-wrapper,
+.dynamic-column-editor ::ng-deep .foreign-key .foreign-key__link {
+    display: none;
+}
+
 .static-filters {
     display: flex;
     flex-wrap: wrap;

frontend/src/app/components/dashboard/db-table-view/saved-filters-panel/saved-filters-panel.component.html

@@ -2,6 +2,7 @@
     <app-placeholder-saved-filters *ngIf="savedFilterData === null"></app-placeholder-saved-filters>
     <div *ngIf="savedFilterData" class="saved-filters-list">
         <button *ngIf="accessLevel === 'edit' && savedFilterData?.length === 0"
+            class="saved-filters-list__first-time-button"
             mat-button type="button"
             angulartics2On="click"
             angularticsAction="Saved filters: first time setup is clicked"