From 5f674393e8fa5fd4959d502c5a057f4533cf4fbd Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 12 Mar 2019 16:51:39 +0000
Subject: [PATCH 01/12] Register Endpoint Tile - basic icons

---
 .../create-endpoint-base-step.component.html  | 14 +++++
 .../create-endpoint-base-step.component.scss  |  6 ++
 ...reate-endpoint-base-step.component.spec.ts | 25 ++++++++
 .../create-endpoint-base-step.component.ts    | 58 +++++++++++++++++++
 .../create-endpoint-cf-step-1.component.html  | 11 +---
 .../create-endpoint-cf-step-1.component.ts    | 38 +++++-------
 .../create-endpoint.component.html            |  6 +-
 .../create-endpoint.component.ts              | 18 +++++-
 .../create-endpoint/create-endpoint.module.ts |  4 ++
 .../features/endpoints/endpoints.module.ts    | 13 ++---
 .../features/endpoints/endpoints.routing.ts   | 22 +++++--
 11 files changed, 166 insertions(+), 49 deletions(-)
 create mode 100644 src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html
 create mode 100644 src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.scss
 create mode 100644 src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.spec.ts
 create mode 100644 src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.ts

diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html
new file mode 100644
index 0000000000..988b35dc96
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html
@@ -0,0 +1,14 @@
+<app-page-header>
+  Register a new Endpoint
+</app-page-header>
+<app-steppers [cancel]="'/endpoints'">
+  <app-step [hideNextButton]="true">
+    <div class="select-step">
+      <h3>Select your endpoint type</h3>
+      <p class="select-step__help">
+        Endpoints provide .....
+      </p>
+      <app-tile-selector [options]="tileSelectorConfig" (selection)="selectedTile = $event"></app-tile-selector>
+    </div>
+  </app-step>
+</app-steppers>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.scss b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.scss
new file mode 100644
index 0000000000..a9fdc63c60
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.scss
@@ -0,0 +1,6 @@
+.select-step {
+  width: 100%;
+  &__help {
+    padding-bottom: 10px;
+  }
+}
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.spec.ts
new file mode 100644
index 0000000000..bec49b7ca1
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CreateEndpointBaseStepComponent } from './create-endpoint-base-step.component';
+
+describe('CreateEndpointBaseStepComponent', () => {
+  let component: CreateEndpointBaseStepComponent;
+  let fixture: ComponentFixture<CreateEndpointBaseStepComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ CreateEndpointBaseStepComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CreateEndpointBaseStepComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.ts
new file mode 100644
index 0000000000..81b420eb7a
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.ts
@@ -0,0 +1,58 @@
+import { Component } from '@angular/core';
+import { Store } from '@ngrx/store';
+
+import { RouterNav } from '../../../../../../store/src/actions/router.actions';
+import { AppState } from '../../../../../../store/src/app-state';
+import {
+  BASE_REDIRECT_QUERY,
+} from '../../../../shared/components/add-service-instance/add-service-instance-base-step/add-service-instance.types';
+import { TileConfigManager } from '../../../../shared/components/tile/tile-selector.helpers';
+import { ITileConfig, ITileData } from '../../../../shared/components/tile/tile-selector.types';
+import { getEndpointTypes } from '../../endpoint-helpers';
+
+interface ICreateEndpointTilesData extends ITileData {
+  type: string;
+}
+
+@Component({
+  selector: 'app-create-endpoint-base-step',
+  templateUrl: './create-endpoint-base-step.component.html',
+  styleUrls: ['./create-endpoint-base-step.component.scss']
+})
+export class CreateEndpointBaseStepComponent {
+
+  private tileManager = new TileConfigManager();
+
+  public tileSelectorConfig: ITileConfig<ICreateEndpointTilesData>[];
+
+  private pSelectedTile: ITileConfig<ICreateEndpointTilesData>;
+  get selectedTile() {
+    return this.pSelectedTile;
+  }
+  set selectedTile(tile: ITileConfig<ICreateEndpointTilesData>) {
+    this.pSelectedTile = tile;
+    if (tile) {
+      this.store.dispatch(new RouterNav({
+        path: `endpoints/new/${tile.data.type}`,
+        query: {
+          [BASE_REDIRECT_QUERY]: true
+        }
+      }));
+    }
+  }
+  constructor(public store: Store<AppState>) {
+    const endpointTypes = getEndpointTypes();
+    this.tileSelectorConfig = endpointTypes.map(et => {
+      return this.tileManager.getNextTileConfig<ICreateEndpointTilesData>(
+        et.label,
+        {
+          matIcon: et.icon,
+          matIconFont: et.iconFont
+        },
+        // { matIcon: 'service', matIconFont: 'stratos-icons' },
+        { type: et.value }
+      );
+    });
+  }
+
+}
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.html b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.html
index d30e96b9d1..8efbb93cee 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.html
@@ -1,12 +1,5 @@
 <form #form="ngForm" class="stepper-form">
-  <h1 class="create-endpoint__section-title">Endpoint Information</h1>
-  <mat-form-field>
-    <mat-select placeholder="Endpoint Type" id="ep-type" name="ep-type" [(ngModel)]="typeValue" (selectionChange)="setUrlValidation($event.value)" #typeField="ngModel" required>
-      <mat-option *ngFor="let type of endpointTypes" [value]="type.value">
-        {{ type.label }}
-      </mat-option>
-    </mat-select>
-  </mat-form-field>
+  <h1 class="create-endpoint__section-title">{{endpoint.label}} Information</h1>
   <mat-form-field>
     <input matInput id="name" name="name" ngModel #nameField="ngModel" required placeholder="Name" [appUnique]="(existingEndpoints | async)?.names">
     <mat-error *ngIf="nameField.errors && nameField.errors.required">Name is required</mat-error>
@@ -37,4 +30,4 @@ <h1 class="create-endpoint__section-title">Advanced Information (Optional)</h1>
       <pre>{{clientRedirectURI}}</pre>
     </div>
   </div>
-</form>
+</form>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.ts
index 95c9354e5f..3ea2885ce0 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.ts
@@ -1,21 +1,22 @@
 import { AfterContentInit, Component, ViewChild } from '@angular/core';
 import { NgForm, NgModel } from '@angular/forms';
+import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { denormalize } from 'normalizr';
 import { Observable } from 'rxjs';
 import { filter, map, pairwise, withLatestFrom } from 'rxjs/operators';
 
-import { UtilsService } from '../../../../core/utils.service';
-import { IStepperStep, StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component';
-import { DEFAULT_ENDPOINT_TYPE, getEndpointTypes, getFullEndpointApiUrl } from '../../endpoint-helpers';
+import { GetAllEndpoints, RegisterEndpoint } from '../../../../../../store/src/actions/endpoint.actions';
 import { AppState } from '../../../../../../store/src/app-state';
+import { EndpointsEffect } from '../../../../../../store/src/effects/endpoint.effects';
+import { endpointSchemaKey, entityFactory } from '../../../../../../store/src/helpers/entity-factory';
+import { getAPIRequestDataState, selectUpdateInfo } from '../../../../../../store/src/selectors/api.selectors';
 import { selectPaginationState } from '../../../../../../store/src/selectors/pagination.selectors';
 import { endpointStoreNames } from '../../../../../../store/src/types/endpoint.types';
-import { GetAllEndpoints, RegisterEndpoint } from '../../../../../../store/src/actions/endpoint.actions';
-import { getAPIRequestDataState, selectUpdateInfo } from '../../../../../../store/src/selectors/api.selectors';
-import { entityFactory, endpointSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
-import { EndpointsEffect } from '../../../../../../store/src/effects/endpoint.effects';
 import { EndpointTypeConfig } from '../../../../core/extension/extension-types';
+import { IStepperStep, StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component';
+import { getIdFromRoute } from '../../../cloud-foundry/cf.helpers';
+import { getEndpointTypes, getFullEndpointApiUrl } from '../../endpoint-helpers';
 
 
 /* tslint:disable:no-access-missing-member https://github.com/mgechev/codelyzer/issues/191*/
@@ -34,7 +35,6 @@ export class CreateEndpointCfStep1Component implements IStepperStep, AfterConten
   validate: Observable<boolean>;
 
   @ViewChild('form') form: NgForm;
-  @ViewChild('typeField') typeField: NgModel;
   @ViewChild('nameField') nameField: NgModel;
   @ViewChild('urlField') urlField: NgModel;
   @ViewChild('skipSllField') skipSllField: NgModel;
@@ -44,9 +44,7 @@ export class CreateEndpointCfStep1Component implements IStepperStep, AfterConten
   @ViewChild('clientIDField') clientIDField: NgModel;
   @ViewChild('clientSecretField') clientSecretField: NgModel;
 
-  typeValue: any;
-
-  endpointTypes = getEndpointTypes();
+  endpoint: EndpointTypeConfig;
   urlValidation: string;
 
   showAdvancedFields = false;
@@ -54,7 +52,7 @@ export class CreateEndpointCfStep1Component implements IStepperStep, AfterConten
 
   endpointTypeSupportsSSO = false;
 
-  constructor(private store: Store<AppState>, private utilsService: UtilsService) {
+  constructor(private store: Store<AppState>, activatedRoute: ActivatedRoute) {
 
     this.existingEndpoints = store.select(selectPaginationState(endpointStoreNames.type, GetAllEndpoints.storeKey))
       .pipe(
@@ -70,12 +68,9 @@ export class CreateEndpointCfStep1Component implements IStepperStep, AfterConten
         })
       );
 
-    // Auto-select default endpoint type - typically this is Cloud Foundry
-    const defaultType = this.endpointTypes.filter((t) => t.value === DEFAULT_ENDPOINT_TYPE);
-    if (defaultType && defaultType.length) {
-      this.typeValue = defaultType[0].value;
-      this.setUrlValidation(this.typeValue);
-    }
+    const endpointType = getIdFromRoute(activatedRoute, 'type');
+    this.endpoint = getEndpointTypes().find(e => e.value === endpointType);
+    this.setUrlValidation(this.endpoint);
 
     // Client Redirect URI for SSO
     this.clientRedirectURI = window.location.protocol + '//' + window.location.hostname +
@@ -84,7 +79,7 @@ export class CreateEndpointCfStep1Component implements IStepperStep, AfterConten
 
   onNext: StepOnNextFunction = () => {
     const action = new RegisterEndpoint(
-      this.typeField.value,
+      this.endpoint.value,
       this.nameField.value,
       this.urlField.value,
       !!this.skipSllField.value,
@@ -124,8 +119,7 @@ export class CreateEndpointCfStep1Component implements IStepperStep, AfterConten
       }));
   }
 
-  setUrlValidation(endpointValue: string) {
-    const endpoint = this.endpointTypes.find(e => e.value === endpointValue);
+  setUrlValidation(endpoint: EndpointTypeConfig) {
     this.urlValidation = endpoint ? endpoint.urlValidation : '';
     this.setAdvancedFields(endpoint);
   }
@@ -134,7 +128,7 @@ export class CreateEndpointCfStep1Component implements IStepperStep, AfterConten
   setAdvancedFields(endpoint: EndpointTypeConfig) {
     this.showAdvancedFields = endpoint.value === 'cf';
 
-    // Only allow SSL if the endpoint type isCloud Foundry
+    // Only allow SSL if the endpoint type is Cloud Foundry
     this.endpointTypeSupportsSSO = endpoint.value === 'cf';
   }
 }
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.html b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.html
index c8b87774eb..ecfe0c91dc 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.html
@@ -1,9 +1,9 @@
 <app-page-header>
-  <h1>Register new Endpoint</h1>
+  Register a new Endpoint
 </app-page-header>
 
-<app-steppers cancel="/endpoints">
+<app-steppers [basePreviousRedirect]="basePreviousRedirect" cancel="/endpoints">
   <app-step [title]="'Endpoint Details'" [valid]="step1.validate | async" [onNext]="step1.onNext">
     <app-create-endpoint-cf-step-1 #step1></app-create-endpoint-cf-step-1>
   </app-step>
-</app-steppers>
+</app-steppers>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.ts
index 6bb78c5514..41cb9e46f6 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.ts
@@ -1,8 +1,22 @@
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+
+import { IRouterNavPayload } from '../../../../../store/src/actions/router.actions';
+import {
+  BASE_REDIRECT_QUERY,
+} from '../../../shared/components/add-service-instance/add-service-instance-base-step/add-service-instance.types';
 
 @Component({
   selector: 'app-create-endpoint',
   templateUrl: './create-endpoint.component.html',
   styleUrls: ['./create-endpoint.component.scss']
 })
-export class CreateEndpointComponent { }
+export class CreateEndpointComponent {
+  public basePreviousRedirect: IRouterNavPayload;
+
+  constructor(route: ActivatedRoute) {
+    this.basePreviousRedirect = route.snapshot.queryParams[BASE_REDIRECT_QUERY] ? {
+      path: 'endpoints/new'
+    } : null;
+  }
+}
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.module.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.module.ts
index 125fde4b8f..f85d83217e 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.module.ts
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.module.ts
@@ -4,6 +4,8 @@ import { SharedModule } from '../../../shared/shared.module';
 import { CreateEndpointComponent } from './create-endpoint.component';
 import { NgModule } from '@angular/core';
 import { CreateEndpointCfStep1Component } from './create-endpoint-cf-step-1/create-endpoint-cf-step-1.component';
+import { CreateEndpointBaseStepComponent } from './create-endpoint-base-step/create-endpoint-base-step.component';
+import { ConnectEndpointStepComponent } from './connect-endpoint-step/connect-endpoint-step.component';
 
 @NgModule({
   imports: [
@@ -14,6 +16,8 @@ import { CreateEndpointCfStep1Component } from './create-endpoint-cf-step-1/crea
   declarations: [
     CreateEndpointComponent,
     CreateEndpointCfStep1Component,
+    CreateEndpointBaseStepComponent,
+    ConnectEndpointStepComponent,
   ],
   exports: [
     CreateEndpointComponent
diff --git a/src/frontend/packages/core/src/features/endpoints/endpoints.module.ts b/src/frontend/packages/core/src/features/endpoints/endpoints.module.ts
index e8d131f64d..6c6621b970 100644
--- a/src/frontend/packages/core/src/features/endpoints/endpoints.module.ts
+++ b/src/frontend/packages/core/src/features/endpoints/endpoints.module.ts
@@ -2,20 +2,19 @@ import { NgModule } from '@angular/core';
 
 import { CoreModule } from '../../core/core.module';
 import { SharedModule } from '../../shared/shared.module';
-
-import { EndointsRoutingModule } from './endpoints.routing';
-import { EndpointsPageComponent } from './endpoints-page/endpoints-page.component';
-import { CreateEndpointModule } from './create-endpoint/create-endpoint.module';
-import { ConnectEndpointDialogComponent } from './connect-endpoint-dialog/connect-endpoint-dialog.component';
 import { CredentialsAuthFormComponent } from './connect-endpoint-dialog/auth-forms/credentials-auth-form.component';
-import { SSOAuthFormComponent } from './connect-endpoint-dialog/auth-forms/sso-auth-form.component';
 import { NoneAuthFormComponent } from './connect-endpoint-dialog/auth-forms/none-auth-form.component';
+import { SSOAuthFormComponent } from './connect-endpoint-dialog/auth-forms/sso-auth-form.component';
+import { ConnectEndpointDialogComponent } from './connect-endpoint-dialog/connect-endpoint-dialog.component';
+import { CreateEndpointModule } from './create-endpoint/create-endpoint.module';
+import { EndpointsPageComponent } from './endpoints-page/endpoints-page.component';
+import { EndpointsRoutingModule } from './endpoints.routing';
 
 @NgModule({
   imports: [
     CoreModule,
     SharedModule,
-    EndointsRoutingModule,
+    EndpointsRoutingModule,
     CreateEndpointModule
   ],
   declarations: [
diff --git a/src/frontend/packages/core/src/features/endpoints/endpoints.routing.ts b/src/frontend/packages/core/src/features/endpoints/endpoints.routing.ts
index 931666c26e..946b1ab116 100644
--- a/src/frontend/packages/core/src/features/endpoints/endpoints.routing.ts
+++ b/src/frontend/packages/core/src/features/endpoints/endpoints.routing.ts
@@ -1,11 +1,14 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
+import { RouterModule, Routes } from '@angular/router';
 
-import { EndpointsPageComponent } from './endpoints-page/endpoints-page.component';
-import { CreateEndpointComponent } from './create-endpoint/create-endpoint.component';
 import { DynamicExtensionRoutes } from '../../core/extension/dynamic-extension-routes';
-import { PageNotFoundComponentComponent } from '../../core/page-not-found-component/page-not-found-component.component';
 import { StratosActionType } from '../../core/extension/extension-service';
+import { PageNotFoundComponentComponent } from '../../core/page-not-found-component/page-not-found-component.component';
+import {
+  CreateEndpointBaseStepComponent,
+} from './create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component';
+import { CreateEndpointComponent } from './create-endpoint/create-endpoint.component';
+import { EndpointsPageComponent } from './endpoints-page/endpoints-page.component';
 
 const endpointsRoutes: Routes = [
   {
@@ -14,7 +17,14 @@ const endpointsRoutes: Routes = [
       extensionsActionsKey: StratosActionType.Endpoints
     }
   },
-  { path: 'new', component: CreateEndpointComponent },
+  {
+    path: 'new',
+    component: CreateEndpointBaseStepComponent
+  },
+  {
+    path: 'new/:type',
+    component: CreateEndpointComponent
+  },
   {
     path: '**',
     component: PageNotFoundComponentComponent,
@@ -30,4 +40,4 @@ const endpointsRoutes: Routes = [
     RouterModule.forChild(endpointsRoutes),
   ]
 })
-export class EndointsRoutingModule { }
+export class EndpointsRoutingModule { }

From 4ea68e8e351b5c847e0030949e225b12999cad0d Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 13 Mar 2019 13:22:59 +0000
Subject: [PATCH 02/12] fix imports

---
 .../create-endpoint/create-endpoint.module.ts         | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.module.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.module.ts
index f85d83217e..59e69848ef 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.module.ts
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.module.ts
@@ -1,11 +1,11 @@
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
 import { CoreModule } from '../../../core/core.module';
 import { SharedModule } from '../../../shared/shared.module';
-import { CreateEndpointComponent } from './create-endpoint.component';
-import { NgModule } from '@angular/core';
-import { CreateEndpointCfStep1Component } from './create-endpoint-cf-step-1/create-endpoint-cf-step-1.component';
 import { CreateEndpointBaseStepComponent } from './create-endpoint-base-step/create-endpoint-base-step.component';
-import { ConnectEndpointStepComponent } from './connect-endpoint-step/connect-endpoint-step.component';
+import { CreateEndpointCfStep1Component } from './create-endpoint-cf-step-1/create-endpoint-cf-step-1.component';
+import { CreateEndpointComponent } from './create-endpoint.component';
 
 @NgModule({
   imports: [
@@ -16,8 +16,7 @@ import { ConnectEndpointStepComponent } from './connect-endpoint-step/connect-en
   declarations: [
     CreateEndpointComponent,
     CreateEndpointCfStep1Component,
-    CreateEndpointBaseStepComponent,
-    ConnectEndpointStepComponent,
+    CreateEndpointBaseStepComponent
   ],
   exports: [
     CreateEndpointComponent

From 0dba376a8648c525887fdcf5620fd74bde5a7ec6 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 13 Mar 2019 13:40:43 +0000
Subject: [PATCH 03/12] Fix issue when combining endpoint list cards & user
 provided service

---
 .../components/list/list-cards/card/card.component.ts | 11 ++++++++++-
 .../endpoint/endpoint-card/endpoint-card.component.ts |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/card/card.component.ts b/src/frontend/packages/core/src/shared/components/list/list-cards/card/card.component.ts
index aaa6848012..44e3410390 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-cards/card/card.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-cards/card/card.component.ts
@@ -70,7 +70,16 @@ export class CardComponent<T> {
     return this.pItem;
   }
 
-  @Input() dataSource = null as IListDataSource<T>;
+  private pDataSource: IListDataSource<T> = null as IListDataSource<T>;
+  @Input() set dataSource(ds: IListDataSource<T>) {
+    this.pDataSource = ds;
+    if (this.cardComponent) {
+      this.cardComponent.dataSource = this.pDataSource;
+    }
+  }
+  get dataSource() {
+    return this.pDataSource;
+  }
 
   @ViewChild('target', { read: ViewContainerRef }) target: ViewContainerRef;
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.ts
index c05cced76d..be9f5c56de 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.ts
@@ -60,7 +60,7 @@ export class EndpointCardComponent extends CardCell<EndpointModel> implements On
 
   @Input('dataSource')
   set dataSource(ds: BaseEndpointsDataSource) {
-    if (ds.endpointType !== 'cf' && !this.cardMenu) {
+    if (ds && ds.endpointType !== 'cf' && !this.cardMenu) {
       this.cardMenu = this.endpointListHelper.endpointActions().map(endpointAction => ({
         label: endpointAction.label,
         action: () => endpointAction.action(this.pRow),

From fcd11039ff87ec448702eeacd939d50942423830 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 13 Mar 2019 14:16:30 +0000
Subject: [PATCH 04/12] Add tile selector img & tidyup

---
 .../create-endpoint-base-step.component.html          |  6 ++++--
 .../create-endpoint-base-step.component.ts            | 11 ++++++-----
 .../stepper/steppers/steppers.component.html          |  5 +++--
 .../tile-selector/tile-selector.component.html        |  6 +++++-
 .../tile-selector/tile-selector.component.scss        |  4 ++++
 .../shared/components/tile/tile-selector.helpers.ts   |  6 +++---
 .../src/shared/components/tile/tile-selector.types.ts |  9 ++++++++-
 7 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html
index 988b35dc96..6f2bdcfbaf 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html
@@ -4,9 +4,11 @@
 <app-steppers [cancel]="'/endpoints'">
   <app-step [hideNextButton]="true">
     <div class="select-step">
-      <h3>Select your endpoint type</h3>
+      <h3>Select the endpoint type</h3>
       <p class="select-step__help">
-        Endpoints provide .....
+        To gain access to additional resources register a new endpoint. Most endpoints will require credentials that can
+        be supplied during
+        the 'Connecting' process. To do this return to the Endpoints page.
       </p>
       <app-tile-selector [options]="tileSelectorConfig" (selection)="selectedTile = $event"></app-tile-selector>
     </div>
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.ts
index 81b420eb7a..7c761d493f 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.ts
@@ -45,11 +45,12 @@ export class CreateEndpointBaseStepComponent {
     this.tileSelectorConfig = endpointTypes.map(et => {
       return this.tileManager.getNextTileConfig<ICreateEndpointTilesData>(
         et.label,
-        {
-          matIcon: et.icon,
-          matIconFont: et.iconFont
-        },
-        // { matIcon: 'service', matIconFont: 'stratos-icons' },
+        et.imagePath ? {
+          location: et.imagePath
+        } : {
+            matIcon: et.icon,
+            matIconFont: et.iconFont
+          },
         { type: et.value }
       );
     });
diff --git a/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.html b/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.html
index e77b77c6a4..a28e2c12fb 100644
--- a/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.html
+++ b/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.html
@@ -25,8 +25,9 @@
       </div>
       <div class="steppers__navigation">
         <div class="steppers__navigation-left">
-          <button id="stepper_previous" *ngIf="steps.length !== 1" color="accent" mat-button mat-raised-button
-            (click)="setActive(currentIndex - 1)" [disabled]="!canGoto(currentIndex - 1)">Previous</button>
+          <button id="stepper_previous" *ngIf="steps.length !== 1 || basePreviousRedirect" color="accent" mat-button
+            mat-raised-button (click)="setActive(currentIndex - 1)"
+            [disabled]="!canGoto(currentIndex - 1)">Previous</button>
         </div>
         <div class="steppers__navigation-right">
           <button id="stepper_cancel" color="primary" mat-button [routerLink]="cancel$ | async"
diff --git a/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.html b/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.html
index 9c379cabab..f82bb03bfa 100644
--- a/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.html
+++ b/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.html
@@ -3,7 +3,11 @@
     [ngClass]="{'tile-selector__selected': selected === tile, 'tile-selector__active': !selected}"
     (click)="selectionChange(tile)" *ngFor="let tile of options">
     <div class="tile-selector__header">
-      <mat-icon class="tile-selector__icon" [fontSet]="tile.icon.matIconFont">{{ tile.icon.matIcon }}</mat-icon>
+      <mat-icon *ngIf="tile.graphic.matIcon; else imgIcon" class="tile-selector__icon"
+        [fontSet]="tile.graphic.matIconFont"> {{ tile.graphic.matIcon }}</mat-icon>
+      <ng-template #imgIcon>
+        <img src="{{tile.graphic.location}}" />
+      </ng-template>
     </div>
     <div class="tile-selector__content">
       <h3>{{ tile.label }}</h3>
diff --git a/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.scss b/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.scss
index f4f416cad0..49db46d457 100644
--- a/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.scss
+++ b/src/frontend/packages/core/src/shared/components/tile-selector/tile-selector.component.scss
@@ -46,6 +46,10 @@
     flex: 2;
     justify-content: center;
     width: 100%;
+
+    img {
+      height: 100px;
+    }
   }
 
   &__content {
diff --git a/src/frontend/packages/core/src/shared/components/tile/tile-selector.helpers.ts b/src/frontend/packages/core/src/shared/components/tile/tile-selector.helpers.ts
index 4c4431b014..d5bc6e8840 100644
--- a/src/frontend/packages/core/src/shared/components/tile/tile-selector.helpers.ts
+++ b/src/frontend/packages/core/src/shared/components/tile/tile-selector.helpers.ts
@@ -1,4 +1,4 @@
-import { ITileConfig, ITileData, ITileIconConfig } from './tile-selector.types';
+import { ITileConfig, ITileData, ITileGraphic } from './tile-selector.types';
 
 export class TileConfigManager {
   private nextIndex = 0;
@@ -9,13 +9,13 @@ export class TileConfigManager {
   }
   public getNextTileConfig<T extends ITileData = ITileData>(
     label: string,
-    iconConfig: ITileIconConfig,
+    graphic: ITileGraphic,
     data: T
   ) {
     return new ITileConfig<T>(
       this.getIndex(),
       label,
-      iconConfig,
+      graphic,
       data
     );
   }
diff --git a/src/frontend/packages/core/src/shared/components/tile/tile-selector.types.ts b/src/frontend/packages/core/src/shared/components/tile/tile-selector.types.ts
index ace03c59bb..dd7c78bb3b 100644
--- a/src/frontend/packages/core/src/shared/components/tile/tile-selector.types.ts
+++ b/src/frontend/packages/core/src/shared/components/tile/tile-selector.types.ts
@@ -2,11 +2,18 @@ export interface ITileIconConfig {
   matIcon: string;
   matIconFont?: string;
 }
+
+export interface ITileImgConfig {
+  location: string;
+}
+
+export type ITileGraphic = ITileIconConfig | ITileImgConfig;
+
 export class ITileConfig<T extends ITileData = ITileData> {
   constructor(
     readonly key: number,
     public label: string | number,
-    public icon: ITileIconConfig,
+    public graphic: ITileGraphic,
     public data?: T,
   ) { }
 }

From 360de7b0d98a6673d83299438e8a097181c4f5f5 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 18 Mar 2019 10:45:58 +0000
Subject: [PATCH 05/12] Ensure our local e2e report folder is ignored when
 pushing to cf

---
 .cfignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.cfignore b/.cfignore
index b28b8a3b7b..21c16f20e7 100644
--- a/.cfignore
+++ b/.cfignore
@@ -20,3 +20,4 @@ deploy/stratos-ui-release/
 deploy/uaa/
 docs/
 build/dev_config.json
+e2e-reports/

From ea24c45237261433e96bf39f754e4172d9d12f11 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 18 Mar 2019 16:15:46 +0000
Subject: [PATCH 06/12] Add row state to endpoint card

---
 .../list/list-cards/card/card.component.scss  |  3 +
 .../meta-card-base/meta-card.component.html   | 12 ++--
 .../meta-card-base/meta-card.component.ts     |  4 +-
 .../table-row/table-row.component.theme.scss  |  5 ++
 .../endpoint-card.component.html              |  5 +-
 .../endpoint-card.component.scss              |  6 ++
 .../endpoint-card/endpoint-card.component.ts  | 60 ++++++++++++++++---
 .../page-header-events.component.ts           | 13 ++--
 .../page-header/page-header.module.ts         |  1 +
 .../shared/monitors/internal-event.monitor.ts |  8 ++-
 .../store/src/actions/dashboard-actions.ts    |  9 ++-
 .../store/src/reducers/dashboard-reducer.ts   | 16 ++++-
 12 files changed, 116 insertions(+), 26 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/card/card.component.scss b/src/frontend/packages/core/src/shared/components/list/list-cards/card/card.component.scss
index 8b13789179..a85c48c037 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-cards/card/card.component.scss
+++ b/src/frontend/packages/core/src/shared/components/list/list-cards/card/card.component.scss
@@ -1 +1,4 @@
 
+:host {
+  position: relative;
+}
diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.html b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.html
index 573d962427..ad9cc6e289 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.html
@@ -1,4 +1,5 @@
-<mat-card class="meta-card" [ngClass]="clickAction ? 'meta-card-pointer' : ''" (click)="clickAction ? clickAction() : null">
+<mat-card class="meta-card {{status$ && statusBackground? (status$ | async): '' }}" [ngClass]="{'meta-card-pointer': clickAction}"
+  (click)="clickAction ? clickAction() : null">
   <div *ngIf="isDeleting$ | async" class="meta-card__deleting-overlay">
     <div class="meta-card__deleting-overlay-inner">
       <div class="meta-card__deleting-text">Deleting</div>
@@ -9,15 +10,15 @@
   </app-card-status>
   <mat-card-header class="meta-card__header" *ngIf="title">
     <div [ngClass]="statusIconByTitle ? 'meta-card__header-container__title--with-icon' : 'meta-card__header-container__title'">
-      <div [ngClass]="statusIconByTitle ? 'meta-card__header-container__title__content--with-icon' : 'meta-card__header-container__title__content'">
+      <div
+        [ngClass]="statusIconByTitle ? 'meta-card__header-container__title__content--with-icon' : 'meta-card__header-container__title__content'">
         <ng-container *ngTemplateOutlet="title.content"></ng-container>
       </div>
       <div class="meta-card__header-container__title--with-icon__icon" *ngIf="statusIconByTitle">
         <ng-container *ngTemplateOutlet="statusIconTmple"></ng-container>
       </div>
     </div>
-    <app-entity-favorite-star [confirmRemoval]="confirmFavoriteRemoval" class="meta-card__favorite" *ngIf="favorite"
-      [favorite]="favorite">
+    <app-entity-favorite-star [confirmRemoval]="confirmFavoriteRemoval" class="meta-card__favorite" *ngIf="favorite" [favorite]="favorite">
     </app-entity-favorite-star>
     <div class="meta-card__header-container__actions" *ngIf="actionMenu && (showMenu$ | async)" appClickStopPropagation>
       <button mat-icon-button class="meta-card__header__button" color="basic" [matMenuTriggerFor]="menu" [disabled]="isDeleting$ | async">
@@ -46,5 +47,6 @@
   </mat-card-content>
 </mat-card>
 <ng-template #statusIconTmple>
-  <app-application-state-icon *ngIf="statusIcon && status$" [status]="status$ | async" matTooltip="{{statusIconTooltip}}"></app-application-state-icon>
+  <app-application-state-icon *ngIf="statusIcon && status$" [status]="status$ | async" matTooltip="{{statusIconTooltip}}">
+  </app-application-state-icon>
 </ng-template>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.ts b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.ts
index a10f21bbe2..f95a27245b 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.ts
@@ -5,13 +5,13 @@ import { first, map, tap } from 'rxjs/operators';
 
 import { AppState } from '../../../../../../../../store/src/app-state';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
+import { LoggerService } from '../../../../../../core/logger.service';
 import { getFavoriteFromCfEntity } from '../../../../../../core/user-favorite-helpers';
 import { UserFavoriteManager } from '../../../../../../core/user-favorite-manager';
 import { EntityMonitorFactory } from '../../../../../monitors/entity-monitor.factory.service';
 import { CardStatus, ComponentEntityMonitorConfig } from '../../../../../shared.types';
 import { MetaCardItemComponent } from '../meta-card-item/meta-card-item.component';
 import { MetaCardTitleComponent } from '../meta-card-title/meta-card-title.component';
-import { LoggerService } from '../../../../../../core/logger.service';
 
 
 export interface MetaCardMenuItem {
@@ -52,6 +52,8 @@ export class MetaCardComponent {
   statusIconByTitle = false;
   @Input()
   statusIconTooltip: string;
+  @Input()
+  statusBackground = false;
 
   @Input()
   set entityConfig(entityConfig: ComponentEntityMonitorConfig) {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.theme.scss b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.theme.scss
index 91bf05f36e..0a6b1cec9b 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.theme.scss
@@ -38,4 +38,9 @@
       border-left-color: $primary-color;
     }
   }
+  .meta-card {
+    &.error {
+      background-color: transparentize($error-color, .9);
+    }
+  }
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.html b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.html
index fba8e0bb1e..931e2e7399 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.html
@@ -1,4 +1,7 @@
-<app-meta-card class="endpoint-card" [routerLink]="endpointLink" [appDisableRouterLink]="!endpointLink" [ngClass]="{'no-link': !endpointLink}" [favorite]="favorite" [actionMenu]="cardMenu">
+<app-page-header-events class="endpoint-warning" [endpointIds$]="endpointIds$" [simpleErrorMessage]="true"></app-page-header-events>
+<app-meta-card class="endpoint-card" [routerLink]="endpointLink" [appDisableRouterLink]="!endpointLink"
+  [ngClass]="{'no-link': !endpointLink }" [favorite]="favorite" [actionMenu]="cardMenu" [status$]="cardStatus$" [statusIcon]="false"
+  [statusBackground]="true">
   <app-meta-card-title>
     <div class="endpoint-card__title">
       <div *ngIf="endpointConfig.imagePath" class="endpoint-card__image">
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.scss b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.scss
index d9f81e670f..9979633ad0 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.scss
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.scss
@@ -1,3 +1,9 @@
+.endpoint-warning {
+  position: absolute;
+  width: 100%;
+  z-index: 1;
+}
+
 .endpoint-card {
   cursor: pointer;
   &.no-link {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.ts
index be9f5c56de..e44b3f06e7 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.ts
@@ -1,16 +1,22 @@
-import { Component, ComponentFactoryResolver, Input, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
-import { ReplaySubject } from 'rxjs';
+import { Component, ComponentFactoryResolver, Input, OnDestroy, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Observable, ReplaySubject, Subscription } from 'rxjs';
+import { filter, first, map, pairwise, startWith } from 'rxjs/operators';
 
+import { SetHeaderEvent } from '../../../../../../../../store/src/actions/dashboard-actions';
+import { AppState } from '../../../../../../../../store/src/app-state';
 import { EndpointModel } from '../../../../../../../../store/src/types/endpoint.types';
 import { UserFavoriteEndpoint } from '../../../../../../../../store/src/types/user-favorites.types';
 import { EndpointsService } from '../../../../../../core/endpoints.service';
 import { EndpointTypeConfig } from '../../../../../../core/extension/extension-types';
 import { getFavoriteFromEndpointEntity } from '../../../../../../core/user-favorite-helpers';
+import { safeUnsubscribe } from '../../../../../../core/utils.service';
 import {
   endpointListDetailsComponents,
   getEndpointType,
   getFullEndpointApiUrl,
 } from '../../../../../../features/endpoints/endpoint-helpers';
+import { CardStatus } from '../../../../../shared.types';
 import { MetaCardMenuItem } from '../../../list-cards/meta-card/meta-card-base/meta-card.component';
 import { CardCell } from '../../../list.types';
 import { BaseEndpointsDataSource } from '../../cf-endpoints/base-endpoints-data-source';
@@ -23,8 +29,7 @@ import { EndpointListHelper } from '../endpoint-list.helpers';
   styleUrls: ['./endpoint-card.component.scss'],
   entryComponents: [...endpointListDetailsComponents]
 })
-export class EndpointCardComponent extends CardCell<EndpointModel> implements OnInit {
-
+export class EndpointCardComponent extends CardCell<EndpointModel> implements OnInit, OnDestroy {
   public rowObs = new ReplaySubject<EndpointModel>();
   public favorite: UserFavoriteEndpoint;
   public address: string;
@@ -32,12 +37,16 @@ export class EndpointCardComponent extends CardCell<EndpointModel> implements On
   public endpointConfig: EndpointTypeConfig;
   public hasDetails = true;
   public endpointLink: string = null;
+  private endpointIds = new ReplaySubject<string[]>();
+  public endpointIds$: Observable<string[]>;
+  public cardStatus$: Observable<CardStatus>;
+  private subs: Subscription[] = [];
 
   @Input() component: CfEndpointDetailsComponent;
   private endpointDetails: ViewContainerRef;
   @ViewChild('endpointDetails', { read: ViewContainerRef }) set content(content: ViewContainerRef) {
     this.endpointDetails = content;
-    this.updateDetails();
+    this.updateInnerComponent();
   }
 
   private pRow: EndpointModel;
@@ -47,33 +56,47 @@ export class EndpointCardComponent extends CardCell<EndpointModel> implements On
       return;
     }
     this.pRow = row;
+    this.endpointIds.next([row.guid]);
     this.endpointConfig = getEndpointType(row.cnsi_type);
     this.address = getFullEndpointApiUrl(row);
     this.rowObs.next(row);
     this.endpointLink = row.connectionStatus === 'connected' ? EndpointsService.getLinkForEndpoint(row) : null;
-    this.updateDetails();
+    this.updateInnerComponent();
 
   }
   get row(): EndpointModel {
     return this.pRow;
   }
 
+  private pDs: BaseEndpointsDataSource;
   @Input('dataSource')
   set dataSource(ds: BaseEndpointsDataSource) {
-    if (ds && ds.endpointType !== 'cf' && !this.cardMenu) {
+    this.pDs = ds;
+    if (!ds) {
+      return;
+    }
+
+    if (!this.cardMenu) {
       this.cardMenu = this.endpointListHelper.endpointActions().map(endpointAction => ({
         label: endpointAction.label,
         action: () => endpointAction.action(this.pRow),
         can: endpointAction.createVisible(this.rowObs)
       }));
     }
+
+    this.updateCardStatus();
+  }
+  get dataSource() {
+    return this.pDs;
   }
 
   constructor(
+    private store: Store<AppState>,
     private endpointListHelper: EndpointListHelper,
     private componentFactoryResolver: ComponentFactoryResolver
   ) {
     super();
+    this.endpointIds$ = this.endpointIds.asObservable();
   }
 
   ngOnInit() {
@@ -82,7 +105,11 @@ export class EndpointCardComponent extends CardCell<EndpointModel> implements On
     this.hasDetails = !!e.listDetailsComponent;
   }
 
-  updateDetails() {
+  ngOnDestroy(): void {
+    safeUnsubscribe(...this.subs);
+  }
+
+  updateInnerComponent() {
     if (!this.endpointDetails || !this.pRow) {
       return;
     }
@@ -98,5 +125,22 @@ export class EndpointCardComponent extends CardCell<EndpointModel> implements On
     }
     this.component.row = this.pRow;
     this.component.spaceBetween = false;
+
+    this.updateCardStatus();
+  }
+
+  updateCardStatus() {
+    if (this.row && this.dataSource && this.dataSource.getRowState && !this.cardStatus$) {
+      this.cardStatus$ = this.dataSource.getRowState(this.row).pipe(
+        map(rowState => rowState.error ? CardStatus.ERROR : null),
+        startWith(null)
+      );
+
+      this.subs.push(this.cardStatus$.pipe(
+        pairwise(),
+        filter(([oldV, newV]) => !oldV && !!newV),
+        first()
+      ).subscribe(() => this.store.dispatch(new SetHeaderEvent(true))));
+    }
   }
 }
diff --git a/src/frontend/packages/core/src/shared/components/page-header/page-header-events/page-header-events.component.ts b/src/frontend/packages/core/src/shared/components/page-header/page-header-events/page-header-events.component.ts
index 494fef82c7..06701d040f 100644
--- a/src/frontend/packages/core/src/shared/components/page-header/page-header-events/page-header-events.component.ts
+++ b/src/frontend/packages/core/src/shared/components/page-header/page-header-events/page-header-events.component.ts
@@ -35,6 +35,8 @@ import { PaginationMonitor } from '../../../monitors/pagination-monitor';
 export class PageHeaderEventsComponent implements OnInit {
   @Input()
   public endpointIds$: Observable<string[]>;
+  @Input()
+  public simpleErrorMessage = false;
 
   public eventMinimized$: Observable<boolean>;
   public errorMessage$: Observable<string>;
@@ -69,17 +71,16 @@ export class PageHeaderEventsComponent implements OnInit {
       ).pipe(
         filter(([errors]) => !!errors && !!errors.length),
         map(([errors, endpoints]) => {
-          const endpointString = errors.map(
-            id => endpoints.find(endpoint => endpoint.guid === id)
-          )
-            .map(endpoint => endpoint.name)
-            .reduce((message, endpointName, index, { length }) => {
+          const endpointString = errors
+            .map(id => endpoints.find(endpoint => endpoint.guid === id))
+            .map(endpoint => endpoint.name).reduce((message, endpointName, index, { length }) => {
               if (index === 0) {
                 return endpointName;
               }
               return index + 1 === length ? `${message} & ${endpointName}` : `${message}, ${endpointName}`;
             }, '');
-          return `We've been having trouble communicating with ${endpointString} - You may be seeing out-of-date information`;
+          return `We've been having trouble communicating with ${endpointString}` +
+            `${this.simpleErrorMessage ? '' : ' - You may be seeing out-of-date information'}`;
         })
       );
     }
diff --git a/src/frontend/packages/core/src/shared/components/page-header/page-header.module.ts b/src/frontend/packages/core/src/shared/components/page-header/page-header.module.ts
index f2fb6ffff6..7029f8b087 100644
--- a/src/frontend/packages/core/src/shared/components/page-header/page-header.module.ts
+++ b/src/frontend/packages/core/src/shared/components/page-header/page-header.module.ts
@@ -21,6 +21,7 @@ import { PageHeaderComponent } from './page-header.component';
     ExtensionButtonsComponent,
     PageSubheaderComponent,
     PageHeaderComponent,
+    PageHeaderEventsComponent
   ]
 })
 export class PageHeaderModule { }
diff --git a/src/frontend/packages/core/src/shared/monitors/internal-event.monitor.ts b/src/frontend/packages/core/src/shared/monitors/internal-event.monitor.ts
index a65fcd0ddf..33f7a8de64 100644
--- a/src/frontend/packages/core/src/shared/monitors/internal-event.monitor.ts
+++ b/src/frontend/packages/core/src/shared/monitors/internal-event.monitor.ts
@@ -2,7 +2,12 @@ import { NgZone } from '@angular/core';
 import * as moment from 'moment';
 import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { distinctUntilChanged, map, share, startWith } from 'rxjs/operators';
-import { InternalEventSubjectState, InternalEventsState, InternalEventSeverity } from '../../../../store/src/types/internal-events.types';
+
+import {
+  InternalEventSeverity,
+  InternalEventsState,
+  InternalEventSubjectState,
+} from '../../../../store/src/types/internal-events.types';
 
 export function newNonAngularInterval(ngZone: NgZone, intervalTime: number) {
   return new Observable<number>((observer) => {
@@ -36,7 +41,6 @@ export class InternalEventMonitor {
     subjectIds: string[] | Observable<string[]> = observableOf(null),
     private ngZone: NgZone,
   ) {
-    const empty = {};
     if (Array.isArray(subjectIds)) {
       subjectIds = observableOf(subjectIds);
     }
diff --git a/src/frontend/packages/store/src/actions/dashboard-actions.ts b/src/frontend/packages/store/src/actions/dashboard-actions.ts
index dda923450e..409f0763b5 100644
--- a/src/frontend/packages/store/src/actions/dashboard-actions.ts
+++ b/src/frontend/packages/store/src/actions/dashboard-actions.ts
@@ -1,11 +1,13 @@
-import { SideNavModes } from '../types/dashboard.types';
 import { Action } from '@ngrx/store';
 
+import { SideNavModes } from '../types/dashboard.types';
+
 export const OPEN_SIDE_NAV = '[Dashboard] Open side nav';
 export const CLOSE_SIDE_NAV = '[Dashboard] Close side nav';
 export const TOGGLE_SIDE_NAV = '[Dashboard] Toggle side nav';
 export const CHANGE_SIDE_NAV_MODE = '[Dashboard] Change side nav mode';
 export const TOGGLE_HEADER_EVENT = '[Dashboard] Toggle header event';
+export const SET_HEADER_EVENT = '[Dashboard] Set header event';
 
 export class OpenSideNav implements Action {
   constructor() { }
@@ -30,3 +32,8 @@ export class ChangeSideNavMode implements Action {
 export class ToggleHeaderEvent implements Action {
   type = TOGGLE_HEADER_EVENT;
 }
+
+export class SetHeaderEvent implements Action {
+  constructor(public minimised = false) { }
+  type = SET_HEADER_EVENT;
+}
diff --git a/src/frontend/packages/store/src/reducers/dashboard-reducer.ts b/src/frontend/packages/store/src/reducers/dashboard-reducer.ts
index 4ec8cd054c..38137c23d8 100644
--- a/src/frontend/packages/store/src/reducers/dashboard-reducer.ts
+++ b/src/frontend/packages/store/src/reducers/dashboard-reducer.ts
@@ -1,6 +1,13 @@
+import {
+  CHANGE_SIDE_NAV_MODE,
+  CLOSE_SIDE_NAV,
+  OPEN_SIDE_NAV,
+  SET_HEADER_EVENT,
+  SetHeaderEvent,
+  TOGGLE_HEADER_EVENT,
+  TOGGLE_SIDE_NAV,
+} from '../actions/dashboard-actions';
 import { SideNavModes } from '../types/dashboard.types';
-import { CLOSE_SIDE_NAV, OPEN_SIDE_NAV, TOGGLE_SIDE_NAV, TOGGLE_HEADER_EVENT } from '../actions/dashboard-actions';
-import { CHANGE_SIDE_NAV_MODE } from '../actions/dashboard-actions';
 
 export interface DashboardState {
   sidenavOpen: boolean;
@@ -36,6 +43,11 @@ export function dashboardReducer(state: DashboardState = defaultDashboardState,
       return {
         ...state, headerEventMinimized: !state.headerEventMinimized
       };
+    case SET_HEADER_EVENT:
+      const setHeaderEvent = action as SetHeaderEvent;
+      return {
+        ...state, headerEventMinimized: setHeaderEvent.minimised
+      };
     default:
       return state;
   }

From 66c9df7501d2f19d8e7578eb9dc0f59c320fc2f9 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 18 Mar 2019 16:27:46 +0000
Subject: [PATCH 07/12] Fix bg colour in cf endpoint card given error -
 includes fixes to cf/endpoint list data sources inheritance -

---
 .../cloud-foundry/cloud-foundry.component.ts  |   6 +-
 .../base-endpoints-data-source.ts             |  61 --------
 .../cf-endpoints/cf-endpoints-data-source.ts  |  40 ++----
 .../cf-endpoints-list-config.service.ts       |  19 ++-
 .../endpoint/base-endpoints-data-source.ts    | 135 ++++++++++++++++++
 .../endpoint-card/endpoint-card.component.ts  |   9 +-
 .../endpoint/endpoints-data-source.ts         | 104 ++------------
 7 files changed, 179 insertions(+), 195 deletions(-)
 delete mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/base-endpoints-data-source.ts
 create mode 100644 src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts

diff --git a/src/frontend/packages/core/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.ts b/src/frontend/packages/core/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.ts
index 4d43389c5d..55bfd22b84 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.ts
+++ b/src/frontend/packages/core/src/features/cloud-foundry/cloud-foundry/cloud-foundry.component.ts
@@ -3,13 +3,13 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 
+import { RouterNav } from '../../../../../store/src/actions/router.actions';
+import { AppState } from '../../../../../store/src/app-state';
 import {
   CFEndpointsListConfigService,
 } from '../../../shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service';
 import { ListConfig } from '../../../shared/components/list/list.component.types';
 import { CloudFoundryService } from '../../../shared/data-services/cloud-foundry.service';
-import { AppState } from '../../../../../store/src/app-state';
-import { RouterNav } from '../../../../../store/src/actions/router.actions';
 
 @Component({
   selector: 'app-cloud-foundry',
@@ -27,7 +27,7 @@ export class CloudFoundryComponent {
   connectedEndpoints$: Observable<number>;
   constructor(
     private store: Store<AppState>,
-    private cfService: CloudFoundryService
+    cfService: CloudFoundryService
   ) {
     this.connectedEndpoints$ = cfService.connectedCFEndpoints$.pipe(
       map(connectedEndpoints => {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/base-endpoints-data-source.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/base-endpoints-data-source.ts
deleted file mode 100644
index 3925a7cd75..0000000000
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/base-endpoints-data-source.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { Store } from '@ngrx/store';
-
-import { GetAllEndpoints } from '../../../../../../../store/src/actions/endpoint.actions';
-import { CreatePagination } from '../../../../../../../store/src/actions/pagination.actions';
-import { GetSystemInfo } from '../../../../../../../store/src/actions/system.actions';
-import { AppState } from '../../../../../../../store/src/app-state';
-import { endpointSchemaKey, entityFactory } from '../../../../../../../store/src/helpers/entity-factory';
-import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
-import { ListDataSource } from '../../data-sources-controllers/list-data-source';
-import { IListConfig } from '../../list.component.types';
-
-
-function syncPaginationSection(
-  store: Store<AppState>,
-  action: GetAllEndpoints,
-  paginationKey: string
-) {
-  store.dispatch(new CreatePagination(
-    action.entityKey,
-    paginationKey,
-    action.paginationKey
-  ));
-}
-export class BaseEndpointsDataSource extends ListDataSource<EndpointModel> {
-  store: Store<AppState>;
-  endpointType: string;
-
-  constructor(
-    store: Store<AppState>,
-    listConfig: IListConfig<EndpointModel>,
-    endpointType: string,
-  ) {
-    const action = new GetAllEndpoints();
-    const paginationKey = `${endpointType}-endpoints`;
-    // We do this here to ensure we sync up with main endpoint table data.
-    syncPaginationSection(store, action, paginationKey);
-    action.paginationKey = paginationKey;
-    super({
-      store,
-      action,
-      schema: entityFactory(endpointSchemaKey),
-      getRowUniqueId: object => object.guid,
-      paginationKey,
-      isLocal: true,
-      transformEntities: [
-        (entities: EndpointModel[]) => {
-          return entities.filter(endpoint => {
-            return endpoint.connectionStatus === 'connected' && endpoint.cnsi_type === endpointType;
-          });
-        },
-        {
-          type: 'filter',
-          field: 'name'
-        },
-      ],
-      listConfig,
-      refresh: () => this.store.dispatch(new GetSystemInfo(false, action))
-    });
-    this.endpointType = endpointType;
-  }
-}
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-data-source.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-data-source.ts
index 3498bad935..3fdf2be2af 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-data-source.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-data-source.ts
@@ -1,13 +1,14 @@
 import { Store } from '@ngrx/store';
 
-import { ListDataSource } from '../../data-sources-controllers/list-data-source';
-import { IListConfig } from '../../list.component.types';
-import { AppState } from '../../../../../../../store/src/app-state';
 import { GetAllEndpoints } from '../../../../../../../store/src/actions/endpoint.actions';
 import { CreatePagination } from '../../../../../../../store/src/actions/pagination.actions';
+import { AppState } from '../../../../../../../store/src/app-state';
 import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
-import { entityFactory, endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
-import { GetSystemInfo } from '../../../../../../../store/src/actions/system.actions';
+import { EntityMonitorFactory } from '../../../../monitors/entity-monitor.factory.service';
+import { InternalEventMonitorFactory } from '../../../../monitors/internal-event-monitor.factory';
+import { PaginationMonitorFactory } from '../../../../monitors/pagination-monitor.factory';
+import { IListConfig } from '../../list.component.types';
+import { BaseEndpointsDataSource } from '../endpoint/base-endpoints-data-source';
 
 function syncPaginationSection(
   store: Store<AppState>,
@@ -20,38 +21,21 @@ function syncPaginationSection(
     action.paginationKey
   ));
 }
-export class CFEndpointsDataSource extends ListDataSource<EndpointModel> {
+export class CFEndpointsDataSource extends BaseEndpointsDataSource {
   store: Store<AppState>;
 
   constructor(
     store: Store<AppState>,
-    listConfig: IListConfig<EndpointModel>
+    listConfig: IListConfig<EndpointModel>,
+    paginationMonitorFactory: PaginationMonitorFactory,
+    entityMonitorFactory: EntityMonitorFactory,
+    internalEventMonitorFactory: InternalEventMonitorFactory
   ) {
     const action = new GetAllEndpoints();
     const paginationKey = 'cf-endpoints';
     // We do this here to ensure we sync up with main endpoint table data.
     syncPaginationSection(store, action, paginationKey);
     action.paginationKey = paginationKey;
-    super({
-      store,
-      action,
-      schema: entityFactory(endpointSchemaKey),
-      getRowUniqueId: object => object.guid,
-      paginationKey,
-      isLocal: true,
-      transformEntities: [
-        (entities: EndpointModel[]) => {
-          return entities.filter(endpoint => {
-            return endpoint.connectionStatus === 'connected' && endpoint.cnsi_type === 'cf';
-          });
-        },
-        {
-          type: 'filter',
-          field: 'name'
-        },
-      ],
-      listConfig,
-      refresh: () => this.store.dispatch(new GetSystemInfo(false, action))
-    });
+    super(store, listConfig, action, 'cf', paginationMonitorFactory, entityMonitorFactory, internalEventMonitorFactory);
   }
 }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts
index 3289f66c4c..f351d6db32 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service.ts
@@ -3,18 +3,21 @@ import { Store } from '@ngrx/store';
 
 import { AppState } from '../../../../../../../store/src/app-state';
 import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
+import { EntityMonitorFactory } from '../../../../monitors/entity-monitor.factory.service';
+import { InternalEventMonitorFactory } from '../../../../monitors/internal-event-monitor.factory';
+import { PaginationMonitorFactory } from '../../../../monitors/pagination-monitor.factory';
 import { ITableColumn } from '../../list-table/table.types';
 import { IListConfig, ListViewTypes } from '../../list.component.types';
 import { EndpointCardComponent } from '../endpoint/endpoint-card/endpoint-card.component';
 import { endpointColumns } from '../endpoint/endpoints-list-config.service';
-import { BaseEndpointsDataSource } from './base-endpoints-data-source';
+import { CFEndpointsDataSource } from './cf-endpoints-data-source';
 
 
 @Injectable()
 export class CFEndpointsListConfigService implements IListConfig<EndpointModel> {
   columns: ITableColumn<EndpointModel>[];
   isLocal = true;
-  dataSource: BaseEndpointsDataSource;
+  dataSource: CFEndpointsDataSource;
   viewType = ListViewTypes.CARD_ONLY;
   cardComponent = EndpointCardComponent;
   text = {
@@ -26,12 +29,20 @@ export class CFEndpointsListConfigService implements IListConfig<EndpointModel>
   tableFixedRowHeight = true;
 
   constructor(
-    private store: Store<AppState>
+    private store: Store<AppState>,
+    paginationMonitorFactory: PaginationMonitorFactory,
+    entityMonitorFactory: EntityMonitorFactory,
+    internalEventMonitorFactory: InternalEventMonitorFactory
   ) {
     this.columns = endpointColumns.filter(column => {
       return column.columnId !== 'type';
     });
-    this.dataSource = new BaseEndpointsDataSource(this.store, this, 'cf');
+    this.dataSource = new CFEndpointsDataSource(
+      this.store,
+      this,
+      paginationMonitorFactory,
+      entityMonitorFactory,
+      internalEventMonitorFactory);
   }
   public getColumns = () => this.columns;
   public getGlobalActions = () => [];
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts
new file mode 100644
index 0000000000..f0a748677b
--- /dev/null
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/base-endpoints-data-source.ts
@@ -0,0 +1,135 @@
+import { Store } from '@ngrx/store';
+import { map, pairwise, tap, withLatestFrom } from 'rxjs/operators';
+
+import { GetAllEndpoints } from '../../../../../../../store/src/actions/endpoint.actions';
+import { GetSystemInfo } from '../../../../../../../store/src/actions/system.actions';
+import { AppState } from '../../../../../../../store/src/app-state';
+import { endpointSchemaKey, entityFactory } from '../../../../../../../store/src/helpers/entity-factory';
+import { endpointEntitiesSelector } from '../../../../../../../store/src/selectors/endpoint.selectors';
+import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
+import { EntityMonitorFactory } from '../../../../monitors/entity-monitor.factory.service';
+import { InternalEventMonitorFactory } from '../../../../monitors/internal-event-monitor.factory';
+import { PaginationMonitorFactory } from '../../../../monitors/pagination-monitor.factory';
+import { DataFunctionDefinition, ListDataSource } from '../../data-sources-controllers/list-data-source';
+import { TableRowStateManager } from '../../list-table/table-row/table-row-state-manager';
+import { IListConfig } from '../../list.component.types';
+import { ListRowSateHelper } from '../../list.helper';
+import { EndpointRowStateSetUpManager } from '../endpoint/endpoint-data-source.helpers';
+
+
+export abstract class BaseEndpointsDataSource extends ListDataSource<EndpointModel> {
+  store: Store<AppState>;
+  endpointType: string;
+
+  constructor(
+    store: Store<AppState>,
+    listConfig: IListConfig<EndpointModel>,
+    action: GetAllEndpoints,
+    endpointType: string = null,
+    paginationMonitorFactory: PaginationMonitorFactory,
+    entityMonitorFactory: EntityMonitorFactory,
+    internalEventMonitorFactory: InternalEventMonitorFactory
+  ) {
+    const rowStateHelper = new ListRowSateHelper();
+    const { rowStateManager, sub } = rowStateHelper.getRowStateManager(
+      paginationMonitorFactory,
+      entityMonitorFactory,
+      GetAllEndpoints.storeKey,
+      endpointSchemaKey,
+      EndpointRowStateSetUpManager
+    );
+    const eventSub = BaseEndpointsDataSource.monitorEvents(internalEventMonitorFactory, rowStateManager, store);
+    const config = BaseEndpointsDataSource.getEndpointConfig(
+      store,
+      action,
+      listConfig,
+      rowStateManager.observable,
+      () => {
+        eventSub.unsubscribe();
+        sub.unsubscribe();
+      },
+      () => this.store.dispatch(action)
+    );
+
+    super({
+      ...config,
+      paginationKey: action.paginationKey,
+      transformEntities: [
+        (entities: EndpointModel[]) => {
+          return endpointType ? entities.filter(endpoint => {
+            return endpoint.connectionStatus === 'connected' && endpoint.cnsi_type === endpointType;
+          }) : entities;
+        },
+        {
+          type: 'filter',
+          field: 'name'
+        },
+      ],
+      refresh: () => this.store.dispatch(new GetSystemInfo(false, action)),
+    });
+    this.endpointType = endpointType;
+  }
+
+  static getEndpointConfig(
+    store,
+    action,
+    listConfig,
+    rowsState,
+    destroy,
+    refresh
+  ) {
+    return {
+      store,
+      action,
+      schema: entityFactory(endpointSchemaKey),
+      getRowUniqueId: object => object.guid,
+      getEmptyType: () => ({
+        name: '',
+        system_shared_token: false,
+        metricsAvailable: false,
+        sso_allowed: false,
+      }),
+      paginationKey: GetAllEndpoints.storeKey,
+      isLocal: true,
+      transformEntities: [
+        {
+          type: 'filter',
+          field: 'name'
+        },
+      ] as DataFunctionDefinition[],
+      listConfig,
+      rowsState,
+      destroy,
+      refresh
+    };
+  }
+  static monitorEvents(
+    internalEventMonitorFactory: InternalEventMonitorFactory,
+    rowStateManager: TableRowStateManager,
+    store: Store<AppState>
+  ) {
+    const eventMonitor = internalEventMonitorFactory.getMonitor(endpointSchemaKey);
+    return eventMonitor.hasErroredOverTime().pipe(
+      withLatestFrom(store.select(endpointEntitiesSelector)),
+      tap(([errored, endpoints]) => errored.forEach(id => {
+        if (endpoints[id].connectionStatus === 'connected') {
+          rowStateManager.updateRowState(id, {
+            error: true,
+            message: `We've been having trouble communicating with this endpoint`
+          });
+        }
+      }
+      )),
+      map(([errored]) => errored),
+      pairwise(),
+      tap(([oldErrored, newErrored]) => oldErrored.forEach(oldId => {
+        if (!newErrored.find(newId => newId === oldId)) {
+          rowStateManager.updateRowState(oldId, {
+            error: false,
+            message: ''
+          });
+        }
+      })),
+    ).subscribe();
+  }
+}
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.ts
index e44b3f06e7..a185b19635 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.ts
@@ -19,7 +19,7 @@ import {
 import { CardStatus } from '../../../../../shared.types';
 import { MetaCardMenuItem } from '../../../list-cards/meta-card/meta-card-base/meta-card.component';
 import { CardCell } from '../../../list.types';
-import { BaseEndpointsDataSource } from '../../cf-endpoints/base-endpoints-data-source';
+import { BaseEndpointsDataSource } from '../base-endpoints-data-source';
 import { CfEndpointDetailsComponent } from '../cf-endpoint-details/cf-endpoint-details.component';
 import { EndpointListHelper } from '../endpoint-list.helpers';
 
@@ -72,11 +72,8 @@ export class EndpointCardComponent extends CardCell<EndpointModel> implements On
   @Input('dataSource')
   set dataSource(ds: BaseEndpointsDataSource) {
     this.pDs = ds;
-    if (!ds) {
-      return;
-    }
-
-    if (!this.cardMenu) {
+    // Don't show card menu if the ds only provides a single endpoint type (for instance the cf endpoint page)
+    if (ds && !ds.endpointType && !this.cardMenu) {
       this.cardMenu = this.endpointListHelper.endpointActions().map(endpointAction => ({
         label: endpointAction.label,
         action: () => endpointAction.action(this.pRow),
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoints-data-source.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoints-data-source.ts
index 99fe3cfc83..21dc43b57e 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoints-data-source.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoints-data-source.ts
@@ -1,23 +1,16 @@
 import { Store } from '@ngrx/store';
-import { pairwise, tap, withLatestFrom, map } from 'rxjs/operators';
 
+import { GetAllEndpoints } from '../../../../../../../store/src/actions/endpoint.actions';
+import { AppState } from '../../../../../../../store/src/app-state';
+import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
 import { EntityMonitorFactory } from '../../../../monitors/entity-monitor.factory.service';
 import { InternalEventMonitorFactory } from '../../../../monitors/internal-event-monitor.factory';
 import { PaginationMonitorFactory } from '../../../../monitors/pagination-monitor.factory';
-import { DataFunctionDefinition, ListDataSource } from '../../data-sources-controllers/list-data-source';
-import { TableRowStateManager } from '../../list-table/table-row/table-row-state-manager';
 import { IListConfig } from '../../list.component.types';
-import { ListRowSateHelper } from '../../list.helper';
-import { EndpointRowStateSetUpManager } from './endpoint-data-source.helpers';
-import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
-import { AppState } from '../../../../../../../store/src/app-state';
-import { GetAllEndpoints } from '../../../../../../../store/src/actions/endpoint.actions';
-import { endpointSchemaKey, entityFactory } from '../../../../../../../store/src/helpers/entity-factory';
-import { GetSystemInfo } from '../../../../../../../store/src/actions/system.actions';
-import { endpointEntitiesSelector } from '../../../../../../../store/src/selectors/endpoint.selectors';
+import { BaseEndpointsDataSource } from './base-endpoints-data-source';
 
 
-export class EndpointsDataSource extends ListDataSource<EndpointModel> {
+export class EndpointsDataSource extends BaseEndpointsDataSource {
   store: Store<AppState>;
 
   constructor(
@@ -27,89 +20,14 @@ export class EndpointsDataSource extends ListDataSource<EndpointModel> {
     entityMonitorFactory: EntityMonitorFactory,
     internalEventMonitorFactory: InternalEventMonitorFactory
   ) {
-    const action = new GetAllEndpoints();
-    const rowStateHelper = new ListRowSateHelper();
-    const { rowStateManager, sub } = rowStateHelper.getRowStateManager(
-      paginationMonitorFactory,
-      entityMonitorFactory,
-      GetAllEndpoints.storeKey,
-      endpointSchemaKey,
-      EndpointRowStateSetUpManager
-    );
-    const eventSub = EndpointsDataSource.monitorEvents(internalEventMonitorFactory, rowStateManager, store);
-    const config = EndpointsDataSource.getEndpointConfig(
+    super(
       store,
-      action,
       listConfig,
-      rowStateManager.observable,
-      () => {
-        eventSub.unsubscribe();
-        sub.unsubscribe();
-      },
-      () => this.store.dispatch(new GetSystemInfo())
+      new GetAllEndpoints(),
+      null,
+      paginationMonitorFactory,
+      entityMonitorFactory,
+      internalEventMonitorFactory
     );
-    super(config);
-  }
-  static getEndpointConfig(
-    store,
-    action,
-    listConfig,
-    rowsState,
-    destroy,
-    refresh
-  ) {
-    return {
-      store,
-      action,
-      schema: entityFactory(endpointSchemaKey),
-      getRowUniqueId: object => object.guid,
-      getEmptyType: () => ({
-        name: '',
-        system_shared_token: false,
-        metricsAvailable: false,
-        sso_allowed: false,
-      }),
-      paginationKey: GetAllEndpoints.storeKey,
-      isLocal: true,
-      transformEntities: [
-        {
-          type: 'filter',
-          field: 'name'
-        },
-      ] as DataFunctionDefinition[],
-      listConfig,
-      rowsState,
-      destroy,
-      refresh
-    };
-  }
-  static monitorEvents(
-    internalEventMonitorFactory: InternalEventMonitorFactory,
-    rowStateManager: TableRowStateManager,
-    store: Store<AppState>
-  ) {
-    const eventMonitor = internalEventMonitorFactory.getMonitor(endpointSchemaKey);
-    return eventMonitor.hasErroredOverTime().pipe(
-      withLatestFrom(store.select(endpointEntitiesSelector)),
-      tap(([errored, endpoints]) => errored.forEach(id => {
-        if (endpoints[id].connectionStatus === 'connected') {
-          rowStateManager.updateRowState(id, {
-            error: true,
-            message: `We've been having trouble communicating with this endpoint`
-          });
-        }
-      }
-      )),
-      map(([errored]) => errored),
-      pairwise(),
-      tap(([oldErrored, newErrored]) => oldErrored.forEach(oldId => {
-        if (!newErrored.find(newId => newId === oldId)) {
-          rowStateManager.updateRowState(oldId, {
-            error: false,
-            message: ''
-          });
-        }
-      })),
-    ).subscribe();
   }
 }

From 45867620cbcf41c95fb0e8d05b47572c6b589e15 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 18 Mar 2019 16:28:17 +0000
Subject: [PATCH 08/12] Fix endpoint list sort by status

---
 .../list/list-types/endpoint/endpoints-list-config.service.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoints-list-config.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoints-list-config.service.ts
index 7b8b81b9ef..85e2d9dbfb 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoints-list-config.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoints-list-config.service.ts
@@ -42,7 +42,7 @@ export const endpointColumns: ITableColumn<EndpointModel>[] = [
     sort: {
       type: 'sort',
       orderKey: 'connection',
-      field: 'info.user'
+      field: 'user'
     },
     cellFlex: '1'
   },

From 6b8ce59f7129df879368c4213493e1d3f07b2fc2 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 22 Mar 2019 12:59:40 +0000
Subject: [PATCH 09/12] Scale cf image better, improve text

---
 .../assets/endpoint-icons/cloudfoundry.png    | Bin 3881 -> 5544 bytes
 .../create-endpoint-base-step.component.html  |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/packages/core/assets/endpoint-icons/cloudfoundry.png b/src/frontend/packages/core/assets/endpoint-icons/cloudfoundry.png
index cc022705d57e03d8be5b63d52343da6337982482..0c81f62f51e1af3b8f1e2e344a24be184a422b4e 100644
GIT binary patch
delta 5506
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
Ef(*u?qW}N^

delta 3830
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

diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html
index 6f2bdcfbaf..6ddd7df6e8 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html
@@ -6,7 +6,7 @@
     <div class="select-step">
       <h3>Select the endpoint type</h3>
       <p class="select-step__help">
-        To gain access to additional resources register a new endpoint. Most endpoints will require credentials that can
+        To access additional resources register a new endpoint. Most endpoints will require credentials that can
         be supplied during
         the 'Connecting' process. To do this return to the Endpoints page.
       </p>

From 037008cbeb32ef24b0c23f5ea106af3edb2d6115 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 22 Mar 2019 14:03:50 +0000
Subject: [PATCH 10/12] Fix unit tests

---
 ...reate-endpoint-base-step.component.spec.ts | 28 +++++++++++++++++--
 ...reate-endpoint-cf-step-1.component.spec.ts | 20 +++++++++----
 .../create-endpoint.component.spec.ts         | 26 +++++++++++------
 3 files changed, 58 insertions(+), 16 deletions(-)

diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.spec.ts
index bec49b7ca1..83b5b4c8f2 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.spec.ts
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.spec.ts
@@ -1,5 +1,11 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 
+import { createBasicStoreModule } from '../../../../../test-framework/store-test-helper';
+import { CoreModule } from '../../../../core/core.module';
+import { SharedModule } from '../../../../shared/shared.module';
 import { CreateEndpointBaseStepComponent } from './create-endpoint-base-step.component';
 
 describe('CreateEndpointBaseStepComponent', () => {
@@ -8,9 +14,27 @@ describe('CreateEndpointBaseStepComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ CreateEndpointBaseStepComponent ]
+      declarations: [
+        CreateEndpointBaseStepComponent,
+      ],
+      imports: [
+        CoreModule,
+        SharedModule,
+        RouterTestingModule,
+        createBasicStoreModule(),
+        NoopAnimationsModule
+      ],
+      providers: [{
+        provide: ActivatedRoute,
+        useValue: {
+          snapshot: {
+            queryParams: {},
+            params: { type: 'metrics' }
+          }
+        }
+      }]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.spec.ts
index 02f2a52b7e..a18088d764 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.spec.ts
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-cf-step-1/create-endpoint-cf-step-1.component.spec.ts
@@ -1,10 +1,11 @@
-import { SharedModule } from '../../../../shared/shared.module';
-import { CoreModule } from '../../../../core/core.module';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { ActivatedRoute } from '@angular/router';
 
-import { CreateEndpointCfStep1Component } from './create-endpoint-cf-step-1.component';
 import { createBasicStoreModule } from '../../../../../test-framework/store-test-helper';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { CoreModule } from '../../../../core/core.module';
+import { SharedModule } from '../../../../shared/shared.module';
+import { CreateEndpointCfStep1Component } from './create-endpoint-cf-step-1.component';
 
 describe('CreateEndpointCfStep1Component', () => {
   let component: CreateEndpointCfStep1Component;
@@ -18,7 +19,16 @@ describe('CreateEndpointCfStep1Component', () => {
         SharedModule,
         createBasicStoreModule(),
         NoopAnimationsModule
-      ]
+      ],
+      providers: [{
+        provide: ActivatedRoute,
+        useValue: {
+          snapshot: {
+            queryParams: {},
+            params: { type: 'metrics' }
+          }
+        }
+      }]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.spec.ts
index c44cbce83d..c27f99170a 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.spec.ts
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.spec.ts
@@ -1,13 +1,13 @@
-import { RouterTestingModule } from '@angular/router/testing';
-import { EndpointsModule } from '../endpoints.module';
-import { SharedModule } from '../../../shared/shared.module';
-import { CoreModule } from '../../../core/core.module';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { CreateEndpointComponent } from './create-endpoint.component';
-import { CreateEndpointCfStep1Component } from './create-endpoint-cf-step-1/create-endpoint-cf-step-1.component';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+
 import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
+import { CoreModule } from '../../../core/core.module';
+import { SharedModule } from '../../../shared/shared.module';
+import { CreateEndpointCfStep1Component } from './create-endpoint-cf-step-1/create-endpoint-cf-step-1.component';
+import { CreateEndpointComponent } from './create-endpoint.component';
 
 describe('CreateEndpointComponent', () => {
   let component: CreateEndpointComponent;
@@ -25,8 +25,16 @@ describe('CreateEndpointComponent', () => {
         createBasicStoreModule(),
         RouterTestingModule,
         NoopAnimationsModule
-
-      ]
+      ],
+      providers: [{
+        provide: ActivatedRoute,
+        useValue: {
+          snapshot: {
+            queryParams: {},
+            params: { type: 'metrics' }
+          }
+        }
+      }]
     })
       .compileComponents();
   }));

From 1846e8f749349f44f35a8eead2d1b18c48dbb420 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 22 Mar 2019 14:25:53 +0000
Subject: [PATCH 11/12] Fix e2e tests

---
 .../create-endpoint-base-step.component.html                 | 2 +-
 .../endpoints/create-endpoint/create-endpoint.component.html | 2 +-
 src/test-e2e/endpoints/endpoints-register-e2e.spec.ts        | 5 ++++-
 src/test-e2e/endpoints/register-dialog.po.ts                 | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html
index 6ddd7df6e8..a5bd20e238 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint-base-step/create-endpoint-base-step.component.html
@@ -1,5 +1,5 @@
 <app-page-header>
-  Register a new Endpoint
+  <h1>Register a new Endpoint</h1>
 </app-page-header>
 <app-steppers [cancel]="'/endpoints'">
   <app-step [hideNextButton]="true">
diff --git a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.html b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.html
index ecfe0c91dc..ed7cdb0d3d 100644
--- a/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/create-endpoint/create-endpoint.component.html
@@ -1,5 +1,5 @@
 <app-page-header>
-  Register a new Endpoint
+  <h1>Register a new Endpoint</h1>
 </app-page-header>
 
 <app-steppers [basePreviousRedirect]="basePreviousRedirect" cancel="/endpoints">
diff --git a/src/test-e2e/endpoints/endpoints-register-e2e.spec.ts b/src/test-e2e/endpoints/endpoints-register-e2e.spec.ts
index ae7f2130b8..dbe6d04b45 100644
--- a/src/test-e2e/endpoints/endpoints-register-e2e.spec.ts
+++ b/src/test-e2e/endpoints/endpoints-register-e2e.spec.ts
@@ -2,11 +2,13 @@ import { e2e } from '../e2e';
 import { ConsoleUserType } from '../helpers/e2e-helpers';
 import { SideNavMenuItem } from '../po/side-nav.po';
 import { SnackBarComponent } from '../po/snackbar.po';
+import { TileSelector } from '../po/tile-selector.po';
 import { EndpointMetadata, EndpointsPage } from './endpoints.po';
 import { RegisterDialog } from './register-dialog.po';
 
 describe('Endpoints', () => {
   const endpointsPage = new EndpointsPage();
+  const tileSelectorStep = new TileSelector();
   const register = new RegisterDialog();
 
   const validEndpoint = e2e.secrets.getDefaultCFEndpoint();
@@ -24,6 +26,7 @@ describe('Endpoints', () => {
     beforeEach(() => {
       endpointsPage.sideNav.goto(SideNavMenuItem.Endpoints);
       endpointsPage.register();
+      tileSelectorStep.select('Cloud Foundry');
       expect(register.isRegisterDialog()).toBeTruthy();
       expect(register.stepper.canCancel()).toBeTruthy();
     });
@@ -31,7 +34,7 @@ describe('Endpoints', () => {
     it('should show add form detail view when btn in tile is pressed', () => {
       expect(register.stepper.canNext()).toBeFalsy();
       expect(register.stepper.canCancel()).toBeTruthy();
-      expect(register.stepper.canPrevious()).toBeFalsy();
+      expect(register.stepper.canPrevious()).toBeTruthy();
     });
 
     describe('Form -', () => {
diff --git a/src/test-e2e/endpoints/register-dialog.po.ts b/src/test-e2e/endpoints/register-dialog.po.ts
index 40a794fe6b..bf031470f9 100644
--- a/src/test-e2e/endpoints/register-dialog.po.ts
+++ b/src/test-e2e/endpoints/register-dialog.po.ts
@@ -18,7 +18,7 @@ export class RegisterDialog extends Page {
   }
 
   isRegisterDialog(): promise.Promise<boolean> {
-    return this.header.getTitleText().then(title => title === 'Register new Endpoint');
+    return this.header.getTitleText().then(title => title === 'Register a new Endpoint');
   }
 
   getName = () => this.form.getFormField('name');

From aba81bb97f23f1215ddfd78426753a8fc29ff1b4 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 22 Mar 2019 15:50:07 +0000
Subject: [PATCH 12/12] Fix metrics e2e test

---
 src/test-e2e/endpoints/endpoints-register-e2e.spec.ts | 4 ++--
 src/test-e2e/metrics/metrics-registration-e2e.spec.ts | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/test-e2e/endpoints/endpoints-register-e2e.spec.ts b/src/test-e2e/endpoints/endpoints-register-e2e.spec.ts
index dbe6d04b45..03ffd670ed 100644
--- a/src/test-e2e/endpoints/endpoints-register-e2e.spec.ts
+++ b/src/test-e2e/endpoints/endpoints-register-e2e.spec.ts
@@ -8,7 +8,7 @@ import { RegisterDialog } from './register-dialog.po';
 
 describe('Endpoints', () => {
   const endpointsPage = new EndpointsPage();
-  const tileSelectorStep = new TileSelector();
+  const tileSelector = new TileSelector();
   const register = new RegisterDialog();
 
   const validEndpoint = e2e.secrets.getDefaultCFEndpoint();
@@ -26,7 +26,7 @@ describe('Endpoints', () => {
     beforeEach(() => {
       endpointsPage.sideNav.goto(SideNavMenuItem.Endpoints);
       endpointsPage.register();
-      tileSelectorStep.select('Cloud Foundry');
+      tileSelector.select('Cloud Foundry');
       expect(register.isRegisterDialog()).toBeTruthy();
       expect(register.stepper.canCancel()).toBeTruthy();
     });
diff --git a/src/test-e2e/metrics/metrics-registration-e2e.spec.ts b/src/test-e2e/metrics/metrics-registration-e2e.spec.ts
index 0536aa7ded..3373ec4764 100644
--- a/src/test-e2e/metrics/metrics-registration-e2e.spec.ts
+++ b/src/test-e2e/metrics/metrics-registration-e2e.spec.ts
@@ -3,11 +3,13 @@ import { EndpointMetadata, EndpointsPage } from '../endpoints/endpoints.po';
 import { RegisterDialog } from '../endpoints/register-dialog.po';
 import { ConsoleUserType } from '../helpers/e2e-helpers';
 import { SideNavMenuItem } from '../po/side-nav.po';
+import { TileSelector } from '../po/tile-selector.po';
 
 describe('Metrics', () => {
 
   const endpointsPage = new EndpointsPage();
   const register = new RegisterDialog();
+  const tileSelector = new TileSelector();
 
   beforeAll(() => {
     e2e.setup(ConsoleUserType.admin)
@@ -18,17 +20,17 @@ describe('Metrics', () => {
   it('Should be able to register a Metrics endpoint', () => {
     endpointsPage.sideNav.goto(SideNavMenuItem.Endpoints);
     endpointsPage.register();
+    tileSelector.select('Metrics');
     expect(register.isRegisterDialog()).toBeTruthy();
     expect(register.stepper.canCancel()).toBeTruthy();
     expect(register.stepper.canNext()).toBeFalsy();
 
     register.form.getControlsMap().then(fields => {
-      expect(fields.client_id).toBeDefined();
-      expect(fields.client_secret).toBeDefined();
+      expect(fields.client_id).toBeUndefined();
+      expect(fields.client_secret).toBeUndefined();
     });
 
     register.form.fill({
-      'ep-type': 'Metrics',
       name: 'MetricsTest',
       url: 'https://www.google.com',
       skipsll: false