Merge pull request #1145 from rocket-admin/fixes

Fixes

Author: lyubov-voloshko

frontend/src/app/components/connections-list/connections-list.component.html

@@ -2,7 +2,7 @@
 <div class="wrapper">
     <div *ngIf="companyName; else companyNameLoader" class="pageTitleHeader">
         <div class="pageTitle">
-            <h1 class="mat-headline-4 pageTitle__name">{{companyName}}</h1>
+            <h1 class="mat-headline-4 pageTitle__name" data-testid="company-name">{{companyName}}</h1>
             <a mat-icon-button *ngIf="currentUser.role === 'ADMIN'"
                 routerLink="/company"
                 class="companyEditLink">
@@ -211,7 +211,6 @@ <h2 class="connectionInfo__connectionTitle">{{ titles[connectionItem.connection.
                     <rect width="240" height="240" transform="translate(0 0.000976562)" fill="#A664DA"/>
                     <path d="M176.214 93.941H140.892C135.682 93.941 133.099 90.0115 135.13 85.2209L147.846 55.3742C150.738 48.5968 147.074 43.0557 139.7 43.0557H106.763C103.54 43.0557 99.8749 45.484 98.6166 48.4422L83.3178 84.3601C80.7791 90.2985 84.0022 95.1552 90.4484 95.1552H124.225C127.956 95.1552 131.333 97.3849 132.79 100.807L147.846 136.128C149.899 140.941 147.294 144.871 142.084 144.871H63.3831C60.16 144.871 56.4954 147.299 55.2371 150.257L40.5785 184.63C37.6866 191.407 41.3512 196.948 48.7246 196.948H125.329C128.552 196.948 132.216 194.52 133.475 191.562L150.517 151.56C151.952 148.204 155.22 146.041 158.862 146.041H192.131C198.82 146.041 202.131 141.007 199.504 134.87L184.36 99.3497C183.102 96.3915 179.437 93.9631 176.214 93.9631V93.941Z" fill="white"/>
                 </svg>
-
             </a>
 
             <a mat-flat-button *ngIf="currentUser.role === 'ADMIN' || currentUser.role === 'DB_ADMIN'"

frontend/src/app/components/dashboard/dashboard.component.ts

@@ -9,6 +9,7 @@ import { AlertComponent } from '../ui-components/alert/alert.component';
 import { BannerComponent } from '../ui-components/banner/banner.component';
 import { BbBulkActionConfirmationDialogComponent } from './db-bulk-action-confirmation-dialog/db-bulk-action-confirmation-dialog.component';
 import { CommonModule } from '@angular/common';
+import { CompanyService } from 'src/app/services/company.service';
 import { ConnectionsService } from 'src/app/services/connections.service';
 import { ContentLoaderComponent } from '../ui-components/content-loader/content-loader.component';
 import { DbActionLinkDialogComponent } from './db-action-link-dialog/db-action-link-dialog.component';
@@ -39,7 +40,6 @@ import { environment } from 'src/environments/environment';
 import { getComparatorsFromUrl } from 'src/app/lib/parse-filter-params';
 import { normalizeTableName } from '../../lib/normalize'
 import { omitBy } from "lodash";
-import { CompanyService } from 'src/app/services/company.service';
 
 interface DataToActivateActions {
   action: CustomEvent,
@@ -129,6 +129,8 @@ export class DashboardComponent implements OnInit, OnDestroy {
   }
 
   get defaultTableToOpen () {
+    console.log('dashboard component get defaultTableToOpen');
+    console.log(this._connections.defaultTableToOpen);
     return this._connections.defaultTableToOpen;
   }
 

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

@@ -362,7 +362,7 @@ <h2 class="mat-h2 table-name">{{ displayName }}</h2>
         </a>
     </div>
 
-    <mat-paginator
+    <mat-paginator data-testid="table-paginator"
         [pageSize]="30"
         [pageSizeOptions]="[10, 30, 100, 300]"
         [showFirstLastButtons]="!tableData.largeDataset">

frontend/src/app/components/db-table-row-edit/db-table-row-edit.component.ts

@@ -397,6 +397,9 @@ export class DbTableRowEditComponent implements OnInit {
   }
 
   updateField = (updatedValue: any, field: string) => {
+    console.log('updateField');
+    console.log(field);
+    console.log(updatedValue);
     if (typeof(updatedValue) === 'object' && updatedValue !== null) {
       for (const prop of Object.getOwnPropertyNames(this.tableRowValues[field])) {
         delete this.tableRowValues[field][prop];
@@ -410,6 +413,9 @@ export class DbTableRowEditComponent implements OnInit {
     if (this.keyAttributesFromURL && Object.keys(this.keyAttributesFromURL).includes(field)) {
       this.isPrimaryKeyUpdated = true
     };
+    console.log('this.tableRowValues[field]');
+    console.log(this.tableRowValues[field]);
+    console.log(this.tableRowValues);
   }
 
   getFormattedUpdatedRow = () => {

frontend/src/app/components/ui-components/row-fields/foreign-key/foreign-key.component.ts

@@ -12,10 +12,10 @@ import { MatIconModule } from '@angular/material/icon';
 import { MatInputModule } from '@angular/material/input';
 import { MatSpinner } from '@angular/material/progress-spinner';
 import { MatTooltipModule } from '@angular/material/tooltip';
-import { Subject } from 'rxjs';
-import { TablesService } from 'src/app/services/tables.service';
 import { RouterModule } from '@angular/router';
+import { Subject } from 'rxjs';
 import { TableForeignKey } from 'src/app/models/table';
+import { TablesService } from 'src/app/services/tables.service';
 
 interface Suggestion {
   displayString: string;
@@ -134,6 +134,8 @@ export class ForeignKeyRowComponent extends BaseRowFieldComponent {
     if (currentRow !== undefined) {
       this.currentFieldValue = currentRow.fieldValue;
       // this.currentFieldQueryParams = Object.assign({}, ...this.primaeyKeys.map((primaeyKey) => ({[primaeyKey.column_name]: currentRow[primaeyKey.column_name]})));
+      console.log(this.label + 'this.currentFieldValue');
+      console.log(this.currentFieldValue);
       this.onFieldChange.emit(this.currentFieldValue);
     } else {
       this.fetching = true;

frontend/src/app/services/connections.service.ts

@@ -104,6 +104,8 @@ export class ConnectionsService {
   }
 
   get defaultTableToOpen() {
+    console.log('connections service get defaultTableToOpen');
+    console.log(this.defaultDisplayTable);
     return this.defaultDisplayTable;
   }
 
@@ -156,6 +158,8 @@ export class ConnectionsService {
           console.log('setConnectionInfo ui');
           this.connectionLogo = res.connectionProperties.logo_url;
           this.companyName = res.connectionProperties.company_name;
+          console.log('connections service setConnectionInfo res.connectionProperties.default_showing_table;');
+          console.log(res.connectionProperties.default_showing_table);
           this.defaultDisplayTable = res.connectionProperties.default_showing_table;
           this.isCustomAccentedColor = !!res.connectionProperties.secondary_color;
           this._themeService.updateColors({ palettes: { primaryPalette: res.connectionProperties.primary_color, accentedPalette: res.connectionProperties.secondary_color }});