Merge pull request #1139 from rocket-admin/fixes

company: fix company observable

Author: lyubov-voloshko

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

@@ -1,33 +1,33 @@
+import { Angulartics2, Angulartics2OnModule } from 'angulartics2';
+import { CUSTOM_ELEMENTS_SCHEMA, Component } from '@angular/core';
 import { Company, CompanyMember, CompanyMemberRole } from 'src/app/models/company';
 
-import { Angulartics2, Angulartics2OnModule } from 'angulartics2';
+import { AlertComponent } from '../ui-components/alert/alert.component';
 import { CompanyService } from 'src/app/services/company.service';
-import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { DeleteDomainDialogComponent } from './delete-domain-dialog/delete-domain-dialog.component';
 import { DeleteMemberDialogComponent } from './delete-member-dialog/delete-member-dialog.component';
+import { FormsModule } from '@angular/forms';
 import { InviteMemberDialogComponent } from './invite-member-dialog/invite-member-dialog.component';
+import { MatButtonModule } from '@angular/material/button';
 import { MatDialog } from '@angular/material/dialog';
-import { RevokeInvitationDialogComponent } from './revoke-invitation-dialog/revoke-invitation-dialog.component';
-import { SubscriptionPlans } from 'src/app/models/user';
-import { UserService } from 'src/app/services/user.service';
-import { environment } from 'src/environments/environment';
-import { orderBy } from "lodash";
-import { FormsModule } from '@angular/forms';
 import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatInputModule } from '@angular/material/input';
-import { MatButtonModule } from '@angular/material/button';
 import { MatIconModule } from '@angular/material/icon';
+import { MatInputModule } from '@angular/material/input';
 import { MatSelectModule } from '@angular/material/select';
 import { MatSlideToggleModule } from '@angular/material/slide-toggle';
-import { MatTooltipModule } from '@angular/material/tooltip';
 import { MatTableModule } from '@angular/material/table';
-import { AlertComponent } from '../ui-components/alert/alert.component';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { NgIf } from '@angular/common';
 import { PlaceholderCompanyComponent } from '../skeletons/placeholder-company/placeholder-company.component';
 import { PlaceholderTableDataComponent } from '../skeletons/placeholder-table-data/placeholder-table-data.component';
-import { NgIf } from '@angular/common';
+import { RevokeInvitationDialogComponent } from './revoke-invitation-dialog/revoke-invitation-dialog.component';
 import { RouterModule } from '@angular/router';
-import { DeleteDomainDialogComponent } from './delete-domain-dialog/delete-domain-dialog.component';
-import { Title } from '@angular/platform-browser';
 import { Subscription } from 'rxjs';
+import { SubscriptionPlans } from 'src/app/models/user';
+import { Title } from '@angular/platform-browser';
+import { UserService } from 'src/app/services/user.service';
+import { environment } from 'src/environments/environment';
+import { orderBy } from "lodash";
 
 @Component({
   selector: 'app-company',

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

@@ -194,7 +194,7 @@ <h2 class="connectionInfo__connectionTitle">{{ titles[connectionItem.connection.
         </button>
 
         <div [ngClass]="connections.length ? 'fabActions' : null">
-            <a routerLink="/zapier" *ngIf="connections.length && (currentUser.role === 'ADMIN' || currentUser.role === 'DB_ADMIN')" class="zapier-link">
+            <a routerLink="/zapier" *ngIf="connections.length" class="zapier-link">
                 <svg class="zapier-link__logo" width="401" height="400" viewBox="0 0 401 400" fill="none" xmlns="http://www.w3.org/2000/svg">
                     <rect x="0.526367" width="400" height="400" fill="#FF4F00"/>
                     <rect x="0.526367" width="400" height="400" rx="200" fill="#FF4F00"/>

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

@@ -94,6 +94,8 @@
 }
 
 .alerts {
+    display: flex;
+    flex-direction: column;
     margin-top: 24px;
 }
 

frontend/src/app/components/dashboard/db-tables-data-source.ts

@@ -236,7 +236,7 @@ export class TablesDataSource implements DataSource<Object> {
             .reduce((normalizedColumns, column) => (normalizedColumns[column.title] = column.normalizedTitle, normalizedColumns), {})
           this.displayedDataColumns = (filter(this.columns, column => column.selected === true)).map(column => column.title);
           this.permissions = res.table_permissions.accessLevel;
-          if (this.keyAttributes.length && this.permissions.edit || this.permissions.delete) {
+          if (this.keyAttributes.length && (this.permissions.edit || this.permissions.delete)) {
             this.actionsColumnWidth = this.getActionsColumnWidth(this.tableActions, this.permissions);
             this.displayedColumns = ['select', ...this.displayedDataColumns, 'actions'];
           } else {

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

@@ -1,12 +1,12 @@
 import { AlertActionType, AlertType } from '../models/alert';
+import { BehaviorSubject, EMPTY } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 
 import { CompanyMemberRole } from '../models/company';
-import { BehaviorSubject, EMPTY } from 'rxjs';
+import { ConfigurationService } from './configuration.service';
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { NotificationsService } from './notifications.service';
-import { ConfigurationService } from './configuration.service';
 
 @Injectable({
   providedIn: 'root'
@@ -458,9 +458,11 @@ export class CompanyService {
           } else {
             this.companyTabTitle = null;
           }
-          
+
           this.companyTabTitleSubject.next(res.tab_title);
 
+          this.company.next('');
+
           return {
             logo: this.companyLogo,
             favicon: this.companyFavicon,