Skip to content

Commit 6a5351b

Browse files
company: fix company observable
1 parent 153cfab commit 6a5351b

2 files changed

Lines changed: 20 additions & 18 deletions

File tree

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1+
import { Angulartics2, Angulartics2OnModule } from 'angulartics2';
2+
import { CUSTOM_ELEMENTS_SCHEMA, Component } from '@angular/core';
13
import { Company, CompanyMember, CompanyMemberRole } from 'src/app/models/company';
24

3-
import { Angulartics2, Angulartics2OnModule } from 'angulartics2';
5+
import { AlertComponent } from '../ui-components/alert/alert.component';
46
import { CompanyService } from 'src/app/services/company.service';
5-
import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
7+
import { DeleteDomainDialogComponent } from './delete-domain-dialog/delete-domain-dialog.component';
68
import { DeleteMemberDialogComponent } from './delete-member-dialog/delete-member-dialog.component';
9+
import { FormsModule } from '@angular/forms';
710
import { InviteMemberDialogComponent } from './invite-member-dialog/invite-member-dialog.component';
11+
import { MatButtonModule } from '@angular/material/button';
812
import { MatDialog } from '@angular/material/dialog';
9-
import { RevokeInvitationDialogComponent } from './revoke-invitation-dialog/revoke-invitation-dialog.component';
10-
import { SubscriptionPlans } from 'src/app/models/user';
11-
import { UserService } from 'src/app/services/user.service';
12-
import { environment } from 'src/environments/environment';
13-
import { orderBy } from "lodash";
14-
import { FormsModule } from '@angular/forms';
1513
import { MatFormFieldModule } from '@angular/material/form-field';
16-
import { MatInputModule } from '@angular/material/input';
17-
import { MatButtonModule } from '@angular/material/button';
1814
import { MatIconModule } from '@angular/material/icon';
15+
import { MatInputModule } from '@angular/material/input';
1916
import { MatSelectModule } from '@angular/material/select';
2017
import { MatSlideToggleModule } from '@angular/material/slide-toggle';
21-
import { MatTooltipModule } from '@angular/material/tooltip';
2218
import { MatTableModule } from '@angular/material/table';
23-
import { AlertComponent } from '../ui-components/alert/alert.component';
19+
import { MatTooltipModule } from '@angular/material/tooltip';
20+
import { NgIf } from '@angular/common';
2421
import { PlaceholderCompanyComponent } from '../skeletons/placeholder-company/placeholder-company.component';
2522
import { PlaceholderTableDataComponent } from '../skeletons/placeholder-table-data/placeholder-table-data.component';
26-
import { NgIf } from '@angular/common';
23+
import { RevokeInvitationDialogComponent } from './revoke-invitation-dialog/revoke-invitation-dialog.component';
2724
import { RouterModule } from '@angular/router';
28-
import { DeleteDomainDialogComponent } from './delete-domain-dialog/delete-domain-dialog.component';
29-
import { Title } from '@angular/platform-browser';
3025
import { Subscription } from 'rxjs';
26+
import { SubscriptionPlans } from 'src/app/models/user';
27+
import { Title } from '@angular/platform-browser';
28+
import { UserService } from 'src/app/services/user.service';
29+
import { environment } from 'src/environments/environment';
30+
import { orderBy } from "lodash";
3131

3232
@Component({
3333
selector: 'app-company',

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { AlertActionType, AlertType } from '../models/alert';
2+
import { BehaviorSubject, EMPTY } from 'rxjs';
23
import { catchError, map } from 'rxjs/operators';
34

45
import { CompanyMemberRole } from '../models/company';
5-
import { BehaviorSubject, EMPTY } from 'rxjs';
6+
import { ConfigurationService } from './configuration.service';
67
import { HttpClient } from '@angular/common/http';
78
import { Injectable } from '@angular/core';
89
import { NotificationsService } from './notifications.service';
9-
import { ConfigurationService } from './configuration.service';
1010

1111
@Injectable({
1212
providedIn: 'root'
@@ -458,9 +458,11 @@ export class CompanyService {
458458
} else {
459459
this.companyTabTitle = null;
460460
}
461-
461+
462462
this.companyTabTitleSubject.next(res.tab_title);
463463

464+
this.company.next('');
465+
464466
return {
465467
logo: this.companyLogo,
466468
favicon: this.companyFavicon,

0 commit comments

Comments
 (0)