saved filters: fix structure passing

Author: lyubov-voloshko

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

@@ -179,7 +179,7 @@ <h2 class="mat-h2 table-name">{{ displayName }}</h2>
     </mat-chip-row>
 </div>
 
-<app-saved-filters-panel
+<app-saved-filters-panel *ngIf="tableData && tableData.structure && tableData.widgets"
     [connectionID]="connectionID"
     [selectedTableName]="name"
     [selectedTableDisplayName]="displayName"

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

@@ -44,6 +44,10 @@
     margin-top: -8px;
 }
 
+.column-name strong {
+    margin-left: 8px;
+}
+
 .static-filters {
     display: flex;
     flex-wrap: wrap;

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

@@ -37,7 +37,11 @@
         <form *ngIf="savedFilterMap[selectedFilterSetId]?.dynamicColumn"
             class="dynamic-column-editor"
             (ngSubmit)="applyDynamicColumnChanges()">
-            <span class="column-name mat-body-1">where <strong>{{ savedFilterMap[selectedFilterSetId]?.dynamicColumn.column }}</strong></span>
+            <span class="column-name mat-body-1">where
+                <strong *ngIf="getComparatorType(getInputType(savedFilterMap[selectedFilterSetId]?.dynamicColumn.column)) !== 'nonComparable'">
+                    {{ savedFilterMap[selectedFilterSetId]?.dynamicColumn.column }}
+                </strong>
+            </span>
             <mat-form-field *ngIf="getComparatorType(getInputType(savedFilterMap[selectedFilterSetId]?.dynamicColumn.column)) === 'text'" appearance="outline">
                 <mat-select [(ngModel)]="savedFilterMap[selectedFilterSetId].dynamicColumn.operator"
                         name="textComparator"

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

@@ -1,5 +1,6 @@
 import { ActivatedRoute, Router } from '@angular/router';
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
+import { TableField, TableForeignKey } from 'src/app/models/table';
 
 import { AccessLevel } from 'src/app/models/user';
 import { CommonModule } from '@angular/common';
@@ -18,7 +19,6 @@ import { MatSelectModule } from '@angular/material/select';
 import { MatTabsModule } from '@angular/material/tabs';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { SavedFiltersDialogComponent } from './saved-filters-dialog/saved-filters-dialog.component';
-import { TableForeignKey } from 'src/app/models/table';
 import { TablesService } from 'src/app/services/tables.service';
 import { UIwidgets } from 'src/app/consts/record-edit-types';
 import { filterTypes } from 'src/app/consts/filter-types';
@@ -123,6 +123,10 @@ export class SavedFiltersPanelComponent implements OnInit, OnDestroy {
         this.router.navigate([`/dashboard/${this.connectionID}/${this.selectedTableName}`], { queryParams });
       }
     });
+
+    this.tableRowStructure = Object.assign({}, ...this.structure.map((field: TableField) => {
+      return {[field.column_name]: field};
+    }));
   }
 
   loadSavedFilters() {