Merge pull request #4090 from cloudfoundry/fix-rebrand-support

Reflect app title in setup screens
cloudfoundry · Jan 10, 2020 · a95b7dc · a95b7dc
2 parents 98297a7 + a614b22
commit a95b7dc
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 11 deletions.
diff --git a/src/frontend/packages/core/src/core/core.module.ts b/src/frontend/packages/core/src/core/core.module.ts
@@ -30,6 +30,8 @@ import { TruncatePipe } from './truncate.pipe';
 import { UserService } from './user.service';
 import { UtilsService } from './utils.service';
 import { WindowRef } from './window-ref/window-ref.service';
+import { APP_TITLE, appTitleFactory } from './core.types';
+import { Title } from '@angular/platform-browser';
 
 @NgModule({
   imports: [
@@ -72,7 +74,12 @@ import { WindowRef } from './window-ref/window-ref.service';
     EndpointsService,
     UserService,
     EntityServiceFactory,
-    CurrentUserPermissionsService
+    CurrentUserPermissionsService,
+    {
+      provide: APP_TITLE,
+      useFactory: appTitleFactory,
+      deps: [Title]
+    }
   ],
   declarations: [
     StatefulIconComponent,

diff --git a/src/frontend/packages/core/src/core/core.types.ts b/src/frontend/packages/core/src/core/core.types.ts
@@ -0,0 +1,9 @@
+import { InjectionToken } from '@angular/core';
+
+import { Title } from '@angular/platform-browser';
+
+export const APP_TITLE = new InjectionToken<string>('appTitle');
+
+export const appTitleFactory = (titleService: Title) => {
+  return titleService.getTitle();
+};
diff --git a/...packages/core/src/features/setup/local-account-wizard/local-account-wizard.component.html b/...packages/core/src/features/setup/local-account-wizard/local-account-wizard.component.html
@@ -1,6 +1,6 @@
 <div class="page-container">
     <app-page-header hideMenu="true" [showHistory]="false">
-      <h1>Stratos Setup with Local Admin Account</h1>
+      <h1>{{title}} Setup with Local Admin Account</h1>
     </app-page-header>
     <app-show-page-header></app-show-page-header>
     <div class="local-setup-wizard">

diff --git a/...d/packages/core/src/features/setup/local-account-wizard/local-account-wizard.component.ts b/...d/packages/core/src/features/setup/local-account-wizard/local-account-wizard.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, Inject } from '@angular/core';
 import { FormGroup, FormControl, Validators, ValidatorFn, AbstractControl } from '@angular/forms';
 import { Observable, BehaviorSubject, of as obsof } from 'rxjs';
 import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component';
@@ -9,6 +9,7 @@ import { UAASetupState, LocalAdminSetupData } from '../../../../../store/src/typ
 import { AuthState } from '../../../../../store/src/reducers/auth.reducer';
 import { VerifySession } from '../../../../../store/src/actions/auth.actions';
 import { SetupSaveConfig } from '../../../../../store/src/actions/setup.actions';
+import { APP_TITLE } from '../../../core/core.types';
 
 @Component({
   selector: 'app-local-account-wizard',
@@ -21,7 +22,7 @@ export class LocalAccountWizardComponent implements OnInit {
   validateLocalAuthForm: Observable<boolean>;
   applyingSetup$ = new BehaviorSubject<boolean>(false);
 
-  constructor(private store: Store<Pick<InternalAppState, 'uaaSetup' | 'auth'>>) { }
+  constructor(private store: Store<Pick<InternalAppState, 'uaaSetup' | 'auth'>>, @Inject(APP_TITLE) public title: string) { }
 
   ngOnInit() {
     this.passwordForm = new FormGroup({

diff --git a/src/frontend/packages/core/src/features/setup/setup-welcome/setup-welcome.component.html b/src/frontend/packages/core/src/features/setup/setup-welcome/setup-welcome.component.html
@@ -1,6 +1,6 @@
 <div class="page-container">
   <app-page-header hideMenu="true" [showHistory]="false">
-    <h1>Stratos Setup</h1>
+    <h1>{{title}} Setup</h1>
   </app-page-header>
   <app-show-page-header></app-show-page-header>
   <div class="setup">

diff --git a/src/frontend/packages/core/src/features/setup/setup-welcome/setup-welcome.component.ts b/src/frontend/packages/core/src/features/setup/setup-welcome/setup-welcome.component.ts
@@ -1,4 +1,5 @@
-import { Component } from '@angular/core';
+import { APP_TITLE } from './../../../core/core.types';
+import { Component, Inject } from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { RouterNav } from '../../../../../store/src/actions/router.actions';
@@ -33,7 +34,7 @@ export class SetupWelcomeComponent {
 
   ];
 
-  constructor(private store: Store<GeneralEntityAppState>) { }
+  constructor(private store: Store<GeneralEntityAppState>, @Inject(APP_TITLE) public title: string) { }
 
   public selectionChange(tile: ITileConfig<ITileData>) {
     if (tile) {

diff --git a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.html
@@ -1,6 +1,6 @@
 <div class="page-container">
   <app-page-header hideMenu="true" [showHistory]="false">
-    <h1>Stratos Setup with Cloud Foundry UAA</h1>
+    <h1>{{title}} Setup with Cloud Foundry UAA</h1>
   </app-page-header>
   <app-show-page-header></app-show-page-header>
   <div class="uaa-wizard">

diff --git a/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.ts b/src/frontend/packages/core/src/features/setup/uaa-wizard/console-uaa-wizard.component.ts
@@ -1,6 +1,5 @@
-import { Component, OnInit, ViewEncapsulation } from '@angular/core';
+import { Component, OnInit, ViewEncapsulation, Inject } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
-import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { delay, filter, map, skipWhile, take } from 'rxjs/operators';
@@ -11,6 +10,7 @@ import { AuthState } from '../../../../../store/src/reducers/auth.reducer';
 import { UAASetupState } from '../../../../../store/src/types/uaa-setup.types';
 import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component';
 import { SetupConsoleGetScopes, SetupSaveConfig } from '../../../../../store/src/actions/setup.actions';
+import { APP_TITLE } from '../../../core/core.types';
 
 @Component({
   selector: 'app-console-uaa-wizard',
@@ -22,7 +22,8 @@ export class ConsoleUaaWizardComponent implements OnInit {
 
   private clientRedirectURI: string;
 
-  constructor(private store: Store<Pick<InternalAppState, 'uaaSetup' | 'auth'>>, private router: Router) {
+  constructor(
+    private store: Store<Pick<InternalAppState, 'uaaSetup' | 'auth'>>, @Inject(APP_TITLE) public title: string) {
     // Client Redirect URI for SSO
     this.clientRedirectURI = window.location.protocol + '//' + window.location.hostname +
       (window.location.port ? ':' + window.location.port : '') + '/pp/v1/auth/sso_login_callback';