Merge pull request #1032 from bcgov/feature/ALCS-1046-2

Add business name to inbox
bcgov · Oct 4, 2023 · 6a1d96d · 6a1d96d
2 parents 17d5170 + 126f0ac
commit 6a1d96d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 15 deletions.
diff --git a/portal-frontend/src/app/features/home/home.component.html b/portal-frontend/src/app/features/home/home.component.html
@@ -1,5 +1,8 @@
 <div>
   <div class="header-row">
+    <div *ngIf="profile && (profile.government || profile.businessName)">
+      <h6>{{ profile.government || profile.businessName }}</h6>
+    </div>
     <diV class="title">
       <h3>Portal Inbox</h3>
       <div>

diff --git a/portal-frontend/src/app/features/home/home.component.spec.ts b/portal-frontend/src/app/features/home/home.component.spec.ts
@@ -2,23 +2,30 @@ import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MatDialogModule } from '@angular/material/dialog';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createMock, DeepMocked } from '@golevelup/ts-jest';
+import { BehaviorSubject } from 'rxjs';
 import { ApplicationSubmissionService } from '../../services/application-submission/application-submission.service';
+import { UserDto } from '../../services/authentication/authentication.dto';
 import { AuthenticationService } from '../../services/authentication/authentication.service';
 
 import { HomeComponent } from './home.component';
 
 describe('HomeComponent', () => {
   let component: HomeComponent;
   let fixture: ComponentFixture<HomeComponent>;
+  let mockAuthService: DeepMocked<AuthenticationService>;
 
   beforeEach(async () => {
+    mockAuthService = createMock();
+    mockAuthService.$currentProfile = new BehaviorSubject<UserDto | undefined>(undefined);
+
     await TestBed.configureTestingModule({
       imports: [RouterTestingModule, MatDialogModule],
       declarations: [HomeComponent],
       providers: [
         {
           provide: AuthenticationService,
-          useValue: {},
+          useValue: mockAuthService,
         },
         {
           provide: ApplicationSubmissionService,

diff --git a/portal-frontend/src/app/features/home/home.component.ts b/portal-frontend/src/app/features/home/home.component.ts
@@ -1,29 +1,31 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
+import { Subject, takeUntil } from 'rxjs';
+import { UserDto } from '../../services/authentication/authentication.dto';
 import { AuthenticationService } from '../../services/authentication/authentication.service';
-import { OverlaySpinnerService } from '../../shared/overlay-spinner/overlay-spinner.service';
 import { CreateSubmissionDialogComponent } from '../create-submission-dialog/create-submission-dialog.component';
 
 @Component({
   selector: 'app-home',
   templateUrl: './home.component.html',
   styleUrls: ['./home.component.scss'],
 })
-export class HomeComponent implements OnInit {
-  public name = '';
+export class HomeComponent implements OnInit, OnDestroy {
+  $destroy = new Subject<void>();
   public isLearnMoreOpen = false;
+  profile: UserDto | undefined;
 
-  constructor(
-    private authenticationService: AuthenticationService,
-    private dialog: MatDialog,
-    private spinnerService: OverlaySpinnerService
-  ) {}
+  constructor(private authenticationService: AuthenticationService, private dialog: MatDialog) {}
 
   ngOnInit(): void {
-    const user = this.authenticationService.currentUser;
-    if (user) {
-      this.name = user.name;
-    }
+    this.authenticationService.$currentProfile.pipe(takeUntil(this.$destroy)).subscribe((profile) => {
+      this.profile = profile;
+    });
+  }
+
+  ngOnDestroy(): void {
+    this.$destroy.next();
+    this.$destroy.complete();
   }
 
   async onCreateApplication() {

diff --git a/portal-frontend/src/app/shared/header/header.component.html b/portal-frontend/src/app/shared/header/header.component.html
@@ -36,7 +36,7 @@ <h5 class="center">
       </button>
       <mat-menu class="user-menu" #userMenu="matMenu">
         <div class="item">User ID: {{ user?.bceidUserName }}</div>
-        <div class="item">Business: {{ user?.businessName }}</div>
+        <div class="item">Business: {{ user?.government || user?.businessName }}</div>
         <div class="item">Type: {{ user?.businessName ? 'BCeID Business' : 'BCeID Basic' }}</div>
       </mat-menu>
       <button class="inbox-btn" routerLink="/home" mat-flat-button color="primary">Portal Inbox</button>