From eccd0543eae33e4abb113e9760f89cde78ff0067 Mon Sep 17 00:00:00 2001
From: zyjiaobj <zyjiaobj@cn.ibm.com>
Date: Thu, 19 Dec 2019 13:27:55 +0800
Subject: [PATCH 001/176] [autoscaler] add custom metric support

---
 .../autoscaler-transform-metric.ts            |  10 +-
 .../autoscaler-transform-policy.ts            |   6 +-
 .../autoscaler-helpers/autoscaler-util.ts     |  17 +-
 .../autoscaler-validation.ts                  |   5 +
 .../src/core/autoscaler.module.ts             |   2 +
 .../src/core/autoscaler.routing.ts            |   5 +
 .../autoscaler-tab-extension.component.html   |  25 +--
 .../autoscaler-tab-extension.component.ts     |  27 ++-
 .../edit-autoscaler-credential.component.html |  64 +++++++
 .../edit-autoscaler-credential.component.scss |  22 +++
 ...it-autoscaler-credential.component.spec.ts |  50 ++++++
 .../edit-autoscaler-credential.component.ts   | 160 ++++++++++++++++++
 ...dit-autoscaler-policy-step2.component.html |  24 ++-
 ...dit-autoscaler-policy-step2.component.scss |  11 ++
 .../edit-autoscaler-policy-step2.component.ts |  30 +++-
 .../edit-autoscaler-policy-step3.component.ts |   5 -
 .../src/store/app-autoscaler.actions.ts       |  31 +++-
 .../src/store/app-autoscaler.types.ts         |  13 ++
 .../src/store/autoscaler-entity-factory.ts    |   7 +
 .../src/store/autoscaler-entity-generator.ts  |  13 +-
 .../src/store/autoscaler.effects.ts           |  60 +++++++
 .../plugins/autoscaler/autoscaler.go          |  20 +++
 src/jetstream/plugins/autoscaler/main.go      |   2 +
 23 files changed, 567 insertions(+), 42 deletions(-)
 create mode 100644 src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.html
 create mode 100644 src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.scss
 create mode 100644 src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.spec.ts
 create mode 100644 src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts

diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-metric.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-metric.ts
index 90660b13f3..899e687833 100644
--- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-metric.ts
+++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-metric.ts
@@ -31,7 +31,7 @@ function initMetricData(metricName: string): AppAutoscalerMetricDataLocal {
       colorTarget: []
     },
     markline: [],
-    unit: AutoscalerConstants.metricMap[metricName].unit_internal,
+    unit: AutoscalerConstants.getMetricUnit(metricName),
     chartMaxValue: 0,
   };
 }
@@ -228,8 +228,8 @@ function getMetricBasicInfo(
   let maxCount = 1;
   let preTimestamp = 0;
   let maxValue = -1;
-  const unit = AutoscalerConstants.metricMap[metricName].unit_internal;
-  intervalMap[AutoscalerConstants.metricMap[metricName].interval] = 1;
+  let unit = AutoscalerConstants.getMetricUnit(metricName);
+  intervalMap[AutoscalerConstants.getMetricInterval(metricName)] = 1;
   const resultInterval = source.reduce((interval, item) => {
     maxValue = Math.max(Number(item.value), maxValue);
     const thisTimestamp = Math.round(item.timestamp / AutoscalerConstants.S2NS);
@@ -240,9 +240,9 @@ function getMetricBasicInfo(
       maxCount = intervalMap[currentInterval];
     }
     preTimestamp = thisTimestamp;
-    // unit = item.unit === '' ? unit : item.unit;
+    unit = item.unit || unit;
     return interval;
-  }, AutoscalerConstants.metricMap[metricName].interval);
+  }, AutoscalerConstants.getMetricInterval(metricName));
   return {
     interval: resultInterval,
     unit,
diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.ts
index ef37ce3d6d..5e11d7642b 100644
--- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.ts
+++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-transform-policy.ts
@@ -83,7 +83,7 @@ export function autoscalerTransformMapToArray(oldPolicy: AppAutoscalerPolicyLoca
     instance_max_count: oldPolicy.instance_max_count
   };
   const scalingRules: AppScalingRule[] = oldPolicy.scaling_rules_form.map((trigger) => {
-    return {
+    const newTrigger: AppScalingRule = {
       adjustment: trigger.adjustment,
       breach_duration_secs: trigger.breach_duration_secs,
       cool_down_secs: trigger.breach_duration_secs,
@@ -91,6 +91,10 @@ export function autoscalerTransformMapToArray(oldPolicy: AppAutoscalerPolicyLoca
       operator: trigger.operator,
       threshold: trigger.threshold
     };
+    if (AutoscalerConstants.getMetricUnit(trigger.metric_type) === '' && trigger.unit && trigger.unit !== '') {
+      newTrigger.unit = trigger.unit;
+    }
+    return newTrigger;
   });
   if (scalingRules.length > 0) {
     newPolicy.scaling_rules = scalingRules;
diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts
index a1b84d299c..e090b4457a 100644
--- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts
+++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts
@@ -64,6 +64,10 @@ export class AutoscalerConstants {
     instance_max_count: 10,
     initial_min_instance_count: 5
   };
+  public static CredentialDefault = {
+    username: 'my-username',
+    password: 'my-password',
+  };
 
   public static metricMap: { [metricName: string]: AppAutoscalerMetricMapInfo } = {
     memoryused: {
@@ -88,11 +92,19 @@ export class AutoscalerConstants {
     }
   };
 
-  public static getMetricUnit(metricType: string) {
+  public static getMetricUnit(metricType: string, unit?: string) {
     if (AutoscalerConstants.metricMap[metricType]) {
       return AutoscalerConstants.metricMap[metricType].unit_internal;
     } else {
-      return '';
+      return unit || '';
+    }
+  }
+
+  public static getMetricInterval(metricType: string) {
+    if (AutoscalerConstants.metricMap[metricType]) {
+      return AutoscalerConstants.metricMap[metricType].interval;
+    } else {
+      return 40;
     }
   }
 
@@ -110,6 +122,7 @@ export const PolicyAlert = {
   alertInvalidPolicyMaximumRange: 'The Maximum Instance Count must be an integer greater than the Minimum Instance Count.',
   alertInvalidPolicyInitialMaximumRange:
     'The Initial Minimum Instance Count must be an integer between Minimum Instance Count and Maximum Instance Count.',
+  alertInvalidPolicyTriggerMetricName: 'Invalid metric type name, only combination of letters, numbers and underlines "_" are allowed.',
   alertInvalidPolicyTriggerUpperThresholdRange: 'The Upper Threshold value must be an integer greater than the Lower Threshold value.',
   alertInvalidPolicyTriggerLowerThresholdRange: 'The Lower Threshold value must be an integer between 1 and (Upper Threshold-1).',
   alertInvalidPolicyTriggerThreshold100: 'The Lower/Upper Threshold value of memoryutil must be an integer below or equal to 100.',
diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-validation.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-validation.ts
index 2f9f60de3f..22410741c5 100644
--- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-validation.ts
+++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-validation.ts
@@ -133,3 +133,8 @@ export function getThresholdMax(policyTriggers: AppScalingRule[], metricType: st
     return Number.MAX_VALUE;
   }
 }
+
+export function inValidMetricType(metricType: string) {
+  const metricTypePattern = new RegExp('^[a-zA-Z0-9_]+$');
+  return !metricTypePattern.test(metricType);
+}
diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
index 05795f3f22..16e7b2bc38 100644
--- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
+++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
@@ -23,6 +23,7 @@ import {
   EditAutoscalerPolicyStep4Component,
 } from '../features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component';
 import { EditAutoscalerPolicyComponent } from '../features/edit-autoscaler-policy/edit-autoscaler-policy.component';
+import { EditAutoscalerCredentialComponent } from '../features/edit-autoscaler-credential/edit-autoscaler-credential.component';
 import { CardAutoscalerDefaultComponent } from '../shared/card-autoscaler-default/card-autoscaler-default.component';
 import {
   TableCellAutoscalerEventChangeIconPipe,
@@ -65,6 +66,7 @@ import { AutoscalerRoutingModule } from './autoscaler.routing';
     EditAutoscalerPolicyStep2Component,
     EditAutoscalerPolicyStep3Component,
     EditAutoscalerPolicyStep4Component,
+    EditAutoscalerCredentialComponent,
     CardAutoscalerDefaultComponent,
     AppAutoscalerMetricChartCardComponent,
     AppAutoscalerComboChartComponent,
diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler.routing.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.routing.ts
index f4a0685688..c19d672dc3 100644
--- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler.routing.ts
+++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.routing.ts
@@ -12,6 +12,7 @@ import {
   AutoscalerScaleHistoryPageComponent,
 } from '../features/autoscaler-scale-history-page/autoscaler-scale-history-page.component';
 import { EditAutoscalerPolicyComponent } from '../features/edit-autoscaler-policy/edit-autoscaler-policy.component';
+import { EditAutoscalerCredentialComponent } from '../features/edit-autoscaler-credential/edit-autoscaler-credential.component';
 
 const autoscalerRoutes: Routes = [
   {
@@ -25,6 +26,10 @@ const autoscalerRoutes: Routes = [
             path: 'edit-autoscaler-policy',
             component: EditAutoscalerPolicyComponent,
           },
+          {
+            path: 'edit-autoscaler-credential',
+            component: EditAutoscalerCredentialComponent,
+          },
           {
             path: 'app-autoscaler-metric-page',
             component: AutoscalerMetricPageComponent,
diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html
index 8338842097..cd6dee7a5d 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html
+++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html
@@ -10,6 +10,11 @@
         <mat-icon class="nav-button-with-text__icon">delete</mat-icon> Delete Policy
       </span>
     </button>
+    <button mat-button name="credential" (click)="manageCredentialPage()" class="nav-button-with-text">
+      <span class="nav-button-with-text__span">
+        <mat-icon class="nav-button-with-text__icon">vpn_key</mat-icon> Manage Credential
+      </span>
+    </button>
   </ng-container>
   <ng-template #noPolicy>
     <button mat-button name="add" (click)="updatePolicyPage(true)" class="nav-button-with-text">
@@ -33,15 +38,15 @@
           </mat-card-header>
           <mat-card-content>
             <div class="app-metadata">
-              <div class="app-metadata__two-cols" *ngFor="let metricName of appAutoscalerAppMetricNames$ | async">
-                <app-metadata-item *ngIf="appAutoscalerAppMetrics[metricName] | async as metricData"
-                  label={{metricName}}>
-                  <ngx-charts-gauge [view]="[80, 80]" [margin]="[5, 5, 0, 5]"
-                    [customColors]="[metricData[0].entity.latest.colorTarget[0]]"
-                    [results]="[metricData[0].entity.latest.target[0]]" [animations]="true" [textValue]=""
-                    [scheme]="'cool'" [min]="0" [max]="metricData[0].entity.chartMaxValue"
-                    [units]="metricData[0].entity.unit" [angleSpan]="240" [startAngle]="-120" [showAxis]="false"
-                    [bigSegments]="10" [smallSegments]="5" [tooltipDisabled]="false" (select)="select($event)">
+              <div class="app-metadata__two-cols" *ngFor="let metric of appAutoscalerAppMetricNames$ | async">
+                <app-metadata-item label={{metric.name}}>
+                  <ngx-charts-gauge *ngIf="appAutoscalerAppMetrics[metric.name] | async as metricData" [view]="[80, 80]"
+                    [margin]="[5, 5, 0, 5]" [customColors]="[metricData[0].entity.latest.colorTarget[0]]"
+                    [results]="[metricData[0].entity.latest.target[0]]" [animations]="true" [scheme]="'cool'" [min]="0"
+                    [max]="metricData[0].entity.chartMaxValue"
+                    [units]="metricData[0].entity.unit || metric.unit || '__'" [angleSpan]="240" [startAngle]="-120"
+                    [showAxis]="false" [bigSegments]="10" [smallSegments]="5" [tooltipDisabled]="false"
+                    (select)="select($event)">
                   </ngx-charts-gauge>
                 </app-metadata-item>
               </div>
@@ -74,7 +79,7 @@
                   <ng-container matColumnDef="condition">
                     <th mat-header-cell *matHeaderCellDef> Condition </th>
                     <td mat-cell *matCellDef="let element">
-                      {{element.operator}}{{element.threshold}}{{getMetricUnit(element.metric_type)}} for
+                      {{element.operator}}{{element.threshold}}{{getMetricUnit(element.metric_type, element.unit)}} for
                       {{element.breach_duration_secs}} secs. </td>
                   </ng-container>
                   <ng-container matColumnDef="action">
diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
index 0968a383d2..3b005f11ce 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
@@ -38,6 +38,7 @@ import {
   AppAutoscalerPolicyLocal,
   AppAutoscalerScalingHistory,
   AppScalingTrigger,
+  AppAutoscaleMetricChart,
 } from '../../store/app-autoscaler.types';
 import { appAutoscalerAppMetricEntityType, autoscalerEntityFactory } from '../../store/autoscaler-entity-factory';
 
@@ -73,7 +74,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
   appAutoscalerPolicy$: Observable<AppAutoscalerPolicyLocal>;
   appAutoscalerPolicySafe$: Observable<AppAutoscalerPolicyLocal>;
   appAutoscalerScalingHistory$: Observable<AppAutoscalerScalingHistory>;
-  appAutoscalerAppMetricNames$: Observable<string[]>;
+  appAutoscalerAppMetricNames$: Observable<AppAutoscaleMetricChart[]>;
 
   public showNoPolicyMessage$: Observable<boolean>;
   public showAutoscalerHistory$: Observable<boolean>;
@@ -146,7 +147,14 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
     this.loadLatestMetricsUponPolicy();
 
     this.appAutoscalerAppMetricNames$ = this.appAutoscalerPolicySafe$.pipe(
-      map(entity => Object.keys(entity.scaling_rules_map)),
+      map(entity => Object.keys(entity.scaling_rules_map).map((name) => {
+        const unit = entity.scaling_rules_map[name].upper[0] && entity.scaling_rules_map[name].upper[0].unit
+          || entity.scaling_rules_map[name].lower[0] && entity.scaling_rules_map[name].lower[0].unit;
+        return {
+          name,
+          unit,
+        };
+      })),
     );
 
     this.scalingHistoryAction = new GetAppAutoscalerScalingHistoryAction(
@@ -319,8 +327,19 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
     this.store.dispatch(this.scalingHistoryAction);
   }
 
-  getMetricUnit(metricType: string) {
-    return AutoscalerConstants.getMetricUnit(metricType);
+  getMetricUnit(metricType: string, unit?: string) {
+    return AutoscalerConstants.getMetricUnit(metricType, unit);
+  }
+
+  manageCredentialPage = () => {
+    this.store.dispatch(new RouterNav({
+      path: [
+        'autoscaler',
+        this.applicationService.cfGuid,
+        this.applicationService.appGuid,
+        'edit-autoscaler-credential'
+      ]
+    }));
   }
 
 }
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.html b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.html
new file mode 100644
index 0000000000..de59b1fe81
--- /dev/null
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.html
@@ -0,0 +1,64 @@
+<app-page-header>
+  <h1>Manage AutoScaler Credential: {{ (applicationService.application$ | async)?.app.entity.name }} </h1>
+  <div class="page-header-right">
+    <button mat-icon-button mat-button routerLink="{{parentUrl}}">
+      <mat-icon>clear</mat-icon>
+    </button>
+  </div>
+</app-page-header>
+<div class="autoscaler-credential-page">
+  <app-tile-grid class="app-autoscaler-tile-grid-100">
+    <app-tile-group>
+      <app-tile>
+        <mat-card>
+          <mat-card-header>
+            <div>Custom metrics credential</div>
+          </mat-card-header>
+          <mat-card-content>
+              <button class="autoscaler-credential-submit" color="accent" mat-button mat-raised-button
+              (click)="createCredential()" [disabled]="false">Create</button>
+              <button class="autoscaler-credential-submit" color="accent" mat-button mat-raised-button
+              (click)="deleteCredentialConfirm()" [disabled]="false">Delete</button>
+            <form [formGroup]="editCredentialForm" validate class="autoscaler-credential-form">
+              <div class="autoscaler-credential-toggle">
+                <span>Create random credential</span>
+                <mat-slide-toggle [checked]="!randomCredential" (toggleChange)="toggleChange()">Create specified
+                  credential
+                </mat-slide-toggle>
+              </div>
+              <mat-form-field>
+                <input matInput placeholder="Username" name="acusername" formControlName="acusername" type="text"
+                  required>
+                <mat-error *ngIf="editCredentialForm.get('acusername').hasError('required')">
+                  Username is required
+                </mat-error>
+              </mat-form-field>
+              <mat-form-field>
+                <input matInput placeholder="Password" name="acpassword" formControlName="acpassword" type="text"
+                  required>
+                <mat-error *ngIf="editCredentialForm.get('acpassword').hasError('required')">
+                  Password is required
+                </mat-error>
+              </mat-form-field>
+            </form>
+          </mat-card-content>
+        </mat-card>
+      </app-tile>
+    </app-tile-group>
+    <app-tile-group *ngIf="appAutoscalerCredential$ | async as credential">
+      <app-tile>
+        <mat-card>
+          <mat-card-header>
+            <div>A new credential generated. Please update the credential setting, and restart your application to
+              ensure your env variable changes take effect.</div>
+          </mat-card-header>
+          <mat-card-content>
+            <app-code-block>
+              <pre>{{ credential | json }}</pre>
+            </app-code-block>
+          </mat-card-content>
+        </mat-card>
+      </app-tile>
+    </app-tile-group>
+  </app-tile-grid>
+</div>
\ No newline at end of file
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.scss b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.scss
new file mode 100644
index 0000000000..6239258751
--- /dev/null
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.scss
@@ -0,0 +1,22 @@
+.autoscaler-credential-form {
+  display: flex;
+  flex-direction: column;
+  margin-top: 10px;
+  max-width: 450px;
+  mat-form-field {
+    width: 100%;
+  }
+  .autoscaler-credential-toggle {
+    padding: 1em 0 1em 0;
+    span {
+      margin-right: .8em;
+    }
+  }
+}
+
+.autoscaler-credential-submit {
+  margin-top: 1em;
+  margin-right: 1em;
+}
+
+
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.spec.ts
new file mode 100644
index 0000000000..50682c3a1c
--- /dev/null
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.spec.ts
@@ -0,0 +1,50 @@
+import { DatePipe } from '@angular/common';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
+
+import { CoreModule } from '../../../../core/src/core/core.module';
+import { ApplicationService } from '../../../../core/src/features/applications/application.service';
+import { SharedModule } from '../../../../core/src/shared/shared.module';
+import { TabNavService } from '../../../../core/tab-nav.service';
+import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper';
+import { createBasicStoreModule } from '../../../../core/test-framework/store-test-helper';
+import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module';
+import { EditAutoscalerCredentialComponent } from './edit-autoscaler-credential.component';
+
+describe('EditAutoscalerCredentialComponent', () => {
+  let component: EditAutoscalerCredentialComponent;
+  let fixture: ComponentFixture<EditAutoscalerCredentialComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [
+        EditAutoscalerCredentialComponent,
+      ],
+      imports: [
+        BrowserAnimationsModule,
+        createBasicStoreModule(),
+        CoreModule,
+        SharedModule,
+        RouterTestingModule,
+        CfAutoscalerTestingModule
+      ],
+      providers: [
+        DatePipe,
+        { provide: ApplicationService, useClass: ApplicationServiceMock },
+        TabNavService,
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(EditAutoscalerCredentialComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should be created', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts
new file mode 100644
index 0000000000..1499f2a13d
--- /dev/null
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts
@@ -0,0 +1,160 @@
+import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Observable, Subscription } from 'rxjs';
+import { map, publishReplay, refCount, distinctUntilChanged, filter, first, pairwise } from 'rxjs/operators';
+import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material';
+import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms';
+import { Store } from '@ngrx/store';
+import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material';
+
+import { AppState } from '../../../../store/src/app-state';
+import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
+import { AppAutoscalerCredential } from '../../store/app-autoscaler.types';
+import { UpdateAppAutoscalerCredentialAction, DeleteAppAutoscalerCredentialAction } from '../../store/app-autoscaler.actions';
+import { EntityService } from '../../../../core/src/core/entity-service';
+import { EntityServiceFactory } from '../../../../core/src/core/entity-service-factory.service';
+import { entityCatalogue } from '../../../../core/src/core/entity-catalogue/entity-catalogue.service';
+import { safeUnsubscribe } from '../../../../core/src/core/utils.service';
+import { AutoscalerConstants } from '../../core/autoscaler-helpers/autoscaler-util';
+import { ConfirmationDialogConfig } from '../../../../core/src/shared/components/confirmation-dialog.config';
+import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
+import { selectDeletionInfo } from '../../../../store/src/selectors/api.selectors';
+import { ConfirmationDialogService } from '../../../../core/src/shared/components/confirmation-dialog.service';
+
+@Component({
+  selector: 'app-edit-autoscaler-credential',
+  templateUrl: './edit-autoscaler-credential.component.html',
+  styleUrls: ['./edit-autoscaler-credential.component.scss'],
+  providers: [
+    { provide: ErrorStateMatcher, useClass: ShowOnDirtyErrorStateMatcher },
+  ]
+})
+export class EditAutoscalerCredentialComponent implements OnInit, OnDestroy {
+
+  parentUrl = `/applications/${this.applicationService.cfGuid}/${this.applicationService.appGuid}/autoscale`;
+  applicationName$: Observable<string>;
+
+  public editCredentialForm: FormGroup;
+  public randomCredential = true;
+  public appAutoscalerCredential$: Observable<AppAutoscalerCredential>;
+
+  private appAutoscalerCredentialErrorSub: Subscription;
+  private appAutoscalerCredentialSnackBarRef: MatSnackBarRef<SimpleSnackBar>;
+
+  constructor(
+    public applicationService: ApplicationService,
+    private fb: FormBuilder,
+    private store: Store<AppState>,
+    private entityServiceFactory: EntityServiceFactory,
+    private appAutoscalerCredentialSnackBar: MatSnackBar,
+    private confirmDialog: ConfirmationDialogService,
+  ) {
+    this.editCredentialForm = this.fb.group({
+      acusername: new FormControl({ value: '', disabled: this.randomCredential }, Validators.required),
+      acpassword: new FormControl({ value: '', disabled: this.randomCredential }, Validators.required),
+    });
+  }
+
+  ngOnInit() {
+    this.applicationName$ = this.applicationService.app$.pipe(
+      map(({ entity }) => entity ? entity.entity.name : null),
+      publishReplay(1),
+      refCount()
+    );
+  }
+
+  ngOnDestroy(): void {
+    if (this.appAutoscalerCredentialSnackBarRef) {
+      this.appAutoscalerCredentialSnackBarRef.dismiss();
+    }
+    safeUnsubscribe(this.appAutoscalerCredentialErrorSub);
+  }
+
+  toggleChange() {
+    this.randomCredential = !this.randomCredential;
+    if (this.randomCredential) {
+      this.editCredentialForm.controls.acusername.setValue('');
+      this.editCredentialForm.controls.acpassword.setValue('');
+      this.editCredentialForm.controls.acusername.disable();
+      this.editCredentialForm.controls.acpassword.disable();
+    } else {
+      this.editCredentialForm.controls.acusername.setValue(AutoscalerConstants.CredentialDefault.username);
+      this.editCredentialForm.controls.acpassword.setValue(AutoscalerConstants.CredentialDefault.password);
+      this.editCredentialForm.controls.acusername.enable();
+      this.editCredentialForm.controls.acpassword.enable();
+    }
+  }
+
+  createCredential() {
+    let action: UpdateAppAutoscalerCredentialAction;
+    if (this.randomCredential) {
+      action = new UpdateAppAutoscalerCredentialAction(this.applicationService.appGuid, this.applicationService.cfGuid);
+    } else {
+      const credential: AppAutoscalerCredential = {
+        username: this.editCredentialForm.controls.acusername.value,
+        password: this.editCredentialForm.controls.acpassword.value,
+      };
+      if (!credential.username || !credential.password) {
+        return;
+      }
+      action = new UpdateAppAutoscalerCredentialAction(this.applicationService.appGuid, this.applicationService.cfGuid, credential);
+    }
+    const updateAppAutoscalerCredentialService: EntityService = this.entityServiceFactory.create(
+      this.applicationService.appGuid,
+      action,
+    );
+    this.appAutoscalerCredential$ = updateAppAutoscalerCredentialService.entityObs$.pipe(
+      map(({ entity }) => entity ? entity.entity : null),
+      publishReplay(1),
+      refCount()
+    );
+    updateAppAutoscalerCredentialService.entityMonitor.entityRequest$.pipe(
+      filter(request => !!request.error),
+      map(request => {
+        const msg = request.message;
+        request.error = false;
+        request.message = '';
+        return msg;
+      }),
+      distinctUntilChanged(),
+    ).subscribe(errorMessage => {
+      if (this.appAutoscalerCredentialSnackBarRef) {
+        this.appAutoscalerCredentialSnackBarRef.dismiss();
+      }
+      this.appAutoscalerCredentialSnackBarRef = this.appAutoscalerCredentialSnackBar.open(errorMessage, 'Dismiss');
+    });
+    this.store.dispatch(action);
+  }
+
+  deleteCredentialConfirm() {
+    const confirmation = new ConfirmationDialogConfig(
+      'Delete Credential',
+      'Are you sure you want to delete the credential?',
+      'Delete',
+      true
+    );
+    this.confirmDialog.open(confirmation, () => {
+      const doUpdate = () => this.deleteCredential();
+      doUpdate().pipe(
+        first(),
+      ).subscribe(actionState => {
+        if (actionState.error) {
+          this.appAutoscalerCredentialSnackBarRef =
+            this.appAutoscalerCredentialSnackBar.open(`Failed to delete credential: ${actionState.message}`, 'Dismiss');
+        }
+      });
+    });
+  }
+
+  deleteCredential(): Observable<ActionState> {
+    const action = new DeleteAppAutoscalerCredentialAction(this.applicationService.appGuid, this.applicationService.cfGuid);
+    this.store.dispatch(action);
+    const entityKey = entityCatalogue.getEntityKey(action);
+
+    return this.store.select(selectDeletionInfo(entityKey, this.applicationService.appGuid)).pipe(
+      pairwise(),
+      filter(([oldV, newV]) => oldV.busy && !newV.busy),
+      map(([, newV]) => newV)
+    );
+  }
+
+}
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html
index fbdd6401b7..3644b024ca 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html
@@ -12,16 +12,18 @@
           </mat-card-header>
           <mat-card-content class="autoscaler-policy-edit-trigger-item">
             <div *ngIf="editIndex!=index" class="autoscaler-policy-edit-trigger-item-desc">
-              If average {{rule.metric_type}} {{rule.operator}} {{rule.threshold}} {{getMetricUnit(rule.metric_type)}}
+              If average {{rule.metric_type}} {{rule.operator}} {{rule.threshold}} {{getMetricUnit(rule.metric_type, rule.unit)}}
               for {{rule.breach_duration_secs}} seconds, then {{rule.adjustment}} instances. Cooldown:
               {{rule.cool_down_secs}} seconds.
             </div>
             <div *ngIf="editIndex==index">
               <form [formGroup]="editTriggerForm" validate>
                 If average
-                <mat-form-field *ngIf="metricTypes.length > 1">
-                  <mat-select class="reset-margin" placeholder="Metric Type" name="metric_type"
-                    formControlName="metric_type" required>
+                <mat-form-field *ngIf="metricTypes.length > 1" class="autoscaler-edit-select">
+                  <input matInput placeholder="Metric Type" type="text" name="metric_type"
+                    formControlName="metric_type">
+                  <mat-select class="reset-margin" placeholder="Metric Type" name="metric_type_select"
+                    formControlName="metric_type_select" required>
                     <mat-option *ngFor="let metricType of metricTypes" [value]="metricType">
                       {{ metricType }}
                     </mat-option>
@@ -39,10 +41,10 @@
                   <input matInput placeholder="Threshold" type="number" name="threshold" formControlName="threshold"
                     required>
                 </mat-form-field>
-                <span class="autoscaler-policy-edit-trigger-item__unit">
-                  {{metricUnit$ | async}}
-                </span>
-                for
+                <mat-form-field *ngIf="getMetricUnit(editMetricType) == ''">
+                  <input matInput placeholder="Unit" type="text" name="unit" formControlName="unit">
+                </mat-form-field>
+                {{getMetricUnit(editMetricType)}} for
                 <mat-form-field>
                   <input matInput placeholder="Breach Duration" type="number" name="breach_duration_secs"
                     formControlName="breach_duration_secs">
@@ -66,6 +68,12 @@
                 </mat-form-field>
                 seconds.
               </form>
+              <mat-error *ngIf="editTriggerForm.get('metric_type').hasError('required')">
+                Metric type is required
+              </mat-error>
+              <mat-error *ngIf="editTriggerForm.get('metric_type').hasError('alertInvalidPolicyTriggerMetricName')">
+                {{policyAlert.alertInvalidPolicyTriggerMetricName}}
+              </mat-error>
               <mat-error *ngIf="editTriggerForm.get('threshold').hasError('required')">
                 Threshold is required
               </mat-error>
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss
index 3ed560932a..93413f1bd3 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss
@@ -27,3 +27,14 @@
     font-size: 85%;
   }
 }
+
+.autoscaler-edit-select {
+  input {
+    background: white;
+    left: 0em;
+    position: absolute;
+    top: .5em;
+    width: 90%;
+    z-index: 200;
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts
index d35e6de1a9..faef01ecdd 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts
@@ -17,6 +17,7 @@ import {
   getThresholdMax,
   getThresholdMin,
   numberWithFractionOrExceedRange,
+  inValidMetricType,
 } from '../../../core/autoscaler-helpers/autoscaler-validation';
 import { AppAutoscalerInvalidPolicyError, AppAutoscalerPolicyLocal } from '../../../store/app-autoscaler.types';
 import { EditAutoscalerPolicy } from '../edit-autoscaler-policy-base-step';
@@ -56,9 +57,11 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp
   ) {
     super(service, route);
     this.editTriggerForm = this.fb.group({
-      metric_type: [0, this.validateTriggerMetricType()],
+      metric_type: [0, [Validators.required, this.validateTriggerMetricType()]],
+      metric_type_select: [0, this.validateTriggerMetricTypeSelect()],
       operator: [0, this.validateTriggerOperator()],
       threshold: [0, [Validators.required, Validators.min(1), this.validateTriggerThreshold()]],
+      unit: [0],
       adjustment: [0, [Validators.required, Validators.min(1), this.validateTriggerAdjustment()]],
       breach_duration_secs: [0, [
         Validators.min(AutoscalerConstants.PolicyDefaultSetting.breach_duration_secs_min),
@@ -98,8 +101,10 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp
     this.editAdjustmentType = getAdjustmentType(this.currentPolicy.scaling_rules_form[index].adjustment);
     this.editTriggerForm.setValue({
       metric_type: this.editMetricType,
+      metric_type_select: this.editMetricType,
       operator: this.currentPolicy.scaling_rules_form[index].operator,
       threshold: this.currentPolicy.scaling_rules_form[index].threshold,
+      unit: this.currentPolicy.scaling_rules_form[index].unit || '' ,
       adjustment: Math.abs(Number(this.currentPolicy.scaling_rules_form[index].adjustment)),
       breach_duration_secs: this.currentPolicy.scaling_rules_form[index].breach_duration_secs,
       cool_down_secs: this.currentPolicy.scaling_rules_form[index].cool_down_secs,
@@ -115,6 +120,7 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp
     this.currentPolicy.scaling_rules_form[this.editIndex].metric_type = this.editTriggerForm.get('metric_type').value;
     this.currentPolicy.scaling_rules_form[this.editIndex].operator = this.editTriggerForm.get('operator').value;
     this.currentPolicy.scaling_rules_form[this.editIndex].threshold = this.editTriggerForm.get('threshold').value;
+    this.currentPolicy.scaling_rules_form[this.editIndex].unit = this.editTriggerForm.get('unit').value;
     this.currentPolicy.scaling_rules_form[this.editIndex].adjustment = adjustmentM;
     if (this.editTriggerForm.get('breach_duration_secs').value) {
       this.currentPolicy.scaling_rules_form[this.editIndex].breach_duration_secs =
@@ -133,10 +139,24 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp
   }
 
   validateTriggerMetricType(): ValidatorFn {
+    return (control: AbstractControl): { [key: string]: any } => {
+      if (!this.editTriggerForm) {
+        return null;
+      }
+      this.editMetricType = control.value;
+      const errors: AppAutoscalerInvalidPolicyError = {};
+      if (inValidMetricType(control.value)) {
+        errors.alertInvalidPolicyTriggerMetricName = { value: control.value };
+      }
+      this.editTriggerForm.controls.threshold.updateValueAndValidity();
+      return Object.keys(errors).length === 0 ? null : errors;
+    };
+  }
+
+  validateTriggerMetricTypeSelect(): ValidatorFn {
     return (control: AbstractControl): { [key: string]: any } => {
       if (this.editTriggerForm) {
-        this.editMetricType = control.value;
-        this.editTriggerForm.controls.threshold.updateValueAndValidity();
+        this.editTriggerForm.controls.metric_type.setValue(control.value);
       }
       return null;
     };
@@ -196,8 +216,8 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp
     };
   }
 
-  getMetricUnit(metricType: string) {
-    return AutoscalerConstants.getMetricUnit(metricType);
+  getMetricUnit(metricType: string, unit?: string) {
+    return AutoscalerConstants.getMetricUnit(metricType, unit);
   }
 
   ngOnDestroy() {
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts
index 90db0a0f92..542688df0a 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.ts
@@ -242,11 +242,6 @@ export class EditAutoscalerPolicyStep3Component extends EditAutoscalerPolicy imp
     this.setRecurringScheduleValidator();
   }
 
-  resetRepeatType(key: string) {
-    this.editRepeatType = key;
-    this.setRecurringScheduleValidator();
-  }
-
   mutualValidate(inputName: string, lastValid: boolean, currentValid: boolean) {
     if (this.editRecurringScheduleForm && lastValid !== currentValid) {
       this.editRecurringScheduleForm.controls[inputName].updateValueAndValidity();
diff --git a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts
index 679ec56335..e889929a5c 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts
@@ -3,7 +3,7 @@ import { createEntityRelationPaginationKey } from '../../../cloud-foundry/src/en
 import { ApiRequestTypes } from '../../../store/src/reducers/api-request-reducer/request-helpers';
 import { PaginatedAction, PaginationParam } from '../../../store/src/types/pagination.types';
 import { EntityRequestAction } from '../../../store/src/types/request.types';
-import { AppAutoscalerPolicyLocal, AppScalingTrigger } from './app-autoscaler.types';
+import { AppAutoscalerPolicyLocal, AppScalingTrigger, AppAutoscalerCredential } from './app-autoscaler.types';
 import {
   appAutoscalerAppMetricEntityType,
   appAutoscalerHealthEntityType,
@@ -11,6 +11,7 @@ import {
   appAutoscalerPolicyEntityType,
   appAutoscalerPolicyTriggerEntityType,
   appAutoscalerScalingHistoryEntityType,
+  appAutoscalerCredentialEntityType,
   AUTOSCALER_ENDPOINT_TYPE,
   autoscalerEntityFactory,
 } from './autoscaler-entity-factory';
@@ -45,6 +46,8 @@ export const APP_AUTOSCALER_POLICY_TRIGGER = '[New App Autoscaler] Fetch policy
 export const CREATE_APP_AUTOSCALER_POLICY = '[New App Autoscaler] Create policy';
 export const UPDATE_APP_AUTOSCALER_POLICY = '[New App Autoscaler] Update policy';
 export const DETACH_APP_AUTOSCALER_POLICY = '[New App Autoscaler] Detach policy';
+export const UPDATE_APP_AUTOSCALER_CREDENTIAL = '[New App Autoscaler] Update credential';
+export const DELETE_APP_AUTOSCALER_CREDENTIAL = '[New App Autoscaler] Delete credential';
 export const APP_AUTOSCALER_HEALTH = '[New App Autoscaler] Fetch Health';
 export const APP_AUTOSCALER_SCALING_HISTORY = '[New App Autoscaler] Fetch Scaling History';
 export const FETCH_APP_AUTOSCALER_METRIC = '[New App Autoscaler] Fetch Metric';
@@ -235,3 +238,29 @@ export class GetAppAutoscalerAppMetricAction extends GetAppAutoscalerMetricActio
   }
   entityType = appAutoscalerAppMetricEntityType;
 }
+
+export class UpdateAppAutoscalerCredentialAction implements EntityRequestAction {
+  static updateKey = 'Updating-Application-Credential';
+  constructor(
+    public guid: string,
+    public endpointGuid: string,
+    public credential?: AppAutoscalerCredential,
+  ) { }
+  type = UPDATE_APP_AUTOSCALER_CREDENTIAL;
+  entity = autoscalerEntityFactory(appAutoscalerCredentialEntityType);
+  entityType = appAutoscalerCredentialEntityType;
+  endpointType = AUTOSCALER_ENDPOINT_TYPE;
+}
+
+export class DeleteAppAutoscalerCredentialAction implements EntityRequestAction {
+  static updateKey = 'Deleting-Application-Credential';
+  constructor(
+    public guid: string,
+    public endpointGuid: string,
+  ) { }
+  type = DELETE_APP_AUTOSCALER_CREDENTIAL;
+  entity = autoscalerEntityFactory(appAutoscalerCredentialEntityType);
+  entityType = appAutoscalerCredentialEntityType;
+  endpointType = AUTOSCALER_ENDPOINT_TYPE;
+  requestType: ApiRequestTypes = 'delete';
+}
diff --git a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts
index df8909a37e..bfb1e3c860 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts
@@ -34,6 +34,7 @@ export interface AppScalingRule {
   metric_type: string;
   operator: string;
   threshold: number;
+  unit?: string;
 }
 
 export interface AppScalingTrigger {
@@ -147,6 +148,7 @@ export interface AppAutoscalerFetchPolicyFailedResponse {
 }
 
 export interface AppAutoscalerInvalidPolicyError {
+  alertInvalidPolicyTriggerMetricName?: AppAutoscalerInvalidPolicyErrorEntity;
   alertInvalidPolicyTriggerThreshold100?: AppAutoscalerInvalidPolicyErrorEntity;
   alertInvalidPolicyTriggerThresholdRange?: AppAutoscalerInvalidPolicyErrorEntity;
   alertInvalidPolicyTriggerStepRange?: AppAutoscalerInvalidPolicyErrorEntity;
@@ -162,3 +164,14 @@ export interface AppAutoscalerInvalidPolicyErrorEntity {
   value?: string | number;
 }
 
+export interface AppAutoscaleMetricChart {
+  name: string;
+  unit: string;
+}
+
+export interface AppAutoscalerCredential {
+  username: string;
+  password: string;
+  app_id?: string;
+  url?: string;
+}
diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-factory.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-factory.ts
index 1c3cfbc7c5..714b7523b5 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-factory.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-factory.ts
@@ -9,6 +9,7 @@ export const appAutoscalerPolicyEntityType = 'autoscalerPolicy';
 export const appAutoscalerPolicyTriggerEntityType = 'autoscalerPolicyTrigger';
 export const appAutoscalerScalingHistoryEntityType = 'autoscalerScalingHistory';
 export const appAutoscalerAppMetricEntityType = 'autoscalerAppMetric';
+export const appAutoscalerCredentialEntityType = 'autoscalerCredential'
 
 export const AUTOSCALER_ENDPOINT_TYPE = 'autoscaler';
 
@@ -40,6 +41,12 @@ entityCache[appAutoscalerInfoEntityType] = new AutoscalerEntitySchema(
   { idAttribute: getAPIResourceGuid }
 );
 
+entityCache[appAutoscalerCredentialEntityType] = new AutoscalerEntitySchema(
+  appAutoscalerCredentialEntityType,
+  {},
+  { idAttribute: getAPIResourceGuid }
+);
+
 entityCache[appAutoscalerPolicyEntityType] = new AutoscalerEntitySchema(
   appAutoscalerPolicyEntityType,
   {},
diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
index fe10d93c33..a776780c39 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
@@ -22,6 +22,7 @@ import {
   appAutoscalerPolicyEntityType,
   appAutoscalerPolicyTriggerEntityType,
   appAutoscalerScalingHistoryEntityType,
+  appAutoscalerCredentialEntityType,
   AUTOSCALER_ENDPOINT_TYPE,
   autoscalerEntityFactory,
 } from './autoscaler-entity-factory';
@@ -44,7 +45,8 @@ export function generateASEntities(): StratosBaseCatalogEntity[] {
     generateHealthEntity(endpointDefinition),
     generateScalingEntity(endpointDefinition),
     generateAppMetricEntity(endpointDefinition),
-    generateMetricEntity(endpointDefinition)
+    generateMetricEntity(endpointDefinition),
+    generateCredentialEntity(endpointDefinition),
   ];
 }
 
@@ -57,6 +59,15 @@ function generatePolicyEntity(endpointDefinition: IStratosEndpointDefinition) {
   return new StratosCatalogEntity<IFavoriteMetadata, APIResource<AppAutoscalerPolicy>>(definition);
 }
 
+function generateCredentialEntity(endpointDefinition: IStratosEndpointDefinition) {
+  const definition = {
+    type: appAutoscalerCredentialEntityType,
+    schema: autoscalerEntityFactory(appAutoscalerCredentialEntityType),
+    endpoint: endpointDefinition
+  };
+  return new StratosCatalogueEntity<IFavoriteMetadata, APIResource<AppAutoscalerPolicy>>(definition);
+}
+
 function generateInfoEntity(endpointDefinition: IStratosEndpointDefinition) {
   const definition = {
     type: appAutoscalerInfoEntityType,
diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts
index dde4382a87..d963b1635b 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts
@@ -36,6 +36,8 @@ import {
   APP_AUTOSCALER_SCALING_HISTORY,
   AUTOSCALER_INFO,
   AutoscalerPaginationParams,
+  UPDATE_APP_AUTOSCALER_CREDENTIAL,
+  DELETE_APP_AUTOSCALER_CREDENTIAL,
   AutoscalerQuery,
   CREATE_APP_AUTOSCALER_POLICY,
   CreateAppAutoscalerPolicyAction,
@@ -50,6 +52,8 @@ import {
   GetAppAutoscalerScalingHistoryAction,
   UPDATE_APP_AUTOSCALER_POLICY,
   UpdateAppAutoscalerPolicyAction,
+  UpdateAppAutoscalerCredentialAction,
+  DeleteAppAutoscalerCredentialAction,
 } from './app-autoscaler.actions';
 import {
   AppAutoscalerEvent,
@@ -59,6 +63,7 @@ import {
   AppAutoscalerPolicy,
   AppAutoscalerPolicyLocal,
   AppScalingTrigger,
+  AppAutoscalerCredential,
 } from './app-autoscaler.types';
 
 const { proxyAPIVersion } = environment;
@@ -208,6 +213,61 @@ export class AutoscalerEffects {
     mergeMap(action => this.fetchPolicy(new GetAppAutoscalerPolicyAction(action.guid, action.endpointGuid), action))
   );
 
+  @Effect()
+  updateAppAutoscalerCredential$ = this.actions$.pipe(
+    ofType<UpdateAppAutoscalerCredentialAction>(UPDATE_APP_AUTOSCALER_CREDENTIAL),
+    mergeMap(action => {
+      const actionType = 'update';
+      this.store.dispatch(new StartRequestAction(action, actionType));
+      return this.http.put<AppAutoscalerCredential>(
+        `${commonPrefix}/apps/${action.guid}/credential`,
+        action.credential,
+        {
+          headers: this.addHeaders(action.endpointGuid)
+        }).pipe(
+          mergeMap(response => {
+            const credentialInfo = response;
+            const entity = entityCatalogue.getEntity(action);
+            const mappedData = {
+              entities: { [entity.entityKey]: {} },
+              result: []
+            } as NormalizedResponse;
+            this.transformData(entity.entityKey, mappedData, action.guid, credentialInfo);
+            return [
+              new WrapperRequestActionSuccess(mappedData, action, actionType)
+            ];
+          }),
+          catchError(err => [
+            new WrapperRequestActionFailed(createAutoscalerErrorMessage('update credential', err), action, actionType)
+          ]));
+    }));
+
+  @Effect()
+  deleteAppAutoscalerCredential$ = this.actions$.pipe(
+    ofType<DeleteAppAutoscalerCredentialAction>(DELETE_APP_AUTOSCALER_CREDENTIAL),
+    mergeMap(action => {
+      const actionType = 'delete';
+      this.store.dispatch(new StartRequestAction(action, actionType));
+      return this.http
+        .delete(`${commonPrefix}/apps/${action.guid}/credential`, {
+          headers: this.addHeaders(action.endpointGuid)
+        }).pipe(
+          mergeMap(response => {
+            const entity = entityCatalogue.getEntity(action);
+            const mappedData = {
+              entities: { [entity.entityKey]: {} },
+              result: []
+            } as NormalizedResponse;
+            this.transformData(entity.entityKey, mappedData, action.guid, { enabled: false });
+            return [
+              new WrapperRequestActionSuccess(mappedData, action, actionType)
+            ];
+          }),
+          catchError(err => [
+            new WrapperRequestActionFailed(createAutoscalerErrorMessage('delete credential', err), action, actionType)
+          ]));
+    }));
+
   @Effect()
   fetchAppAutoscalerScalingHistory$ = this.actions$.pipe(
     ofType<GetAppAutoscalerScalingHistoryAction>(APP_AUTOSCALER_SCALING_HISTORY),
diff --git a/src/jetstream/plugins/autoscaler/autoscaler.go b/src/jetstream/plugins/autoscaler/autoscaler.go
index d0e99f20b1..d3fb26fdbf 100644
--- a/src/jetstream/plugins/autoscaler/autoscaler.go
+++ b/src/jetstream/plugins/autoscaler/autoscaler.go
@@ -87,3 +87,23 @@ func (a *Autoscaler) getAutoscalerEvent(echoContext echo.Context) error {
 	}
 	return a.portalProxy.SendProxiedResponse(echoContext, responses)
 }
+
+func (a *Autoscaler) createAutoscalerCredential(echoContext echo.Context) error {
+	appID := echoContext.Param("appId")
+	credentialURL, _ := url.Parse("/v1/apps/" + appID + "/credential")
+	responses, err := a.portalProxy.ProxyRequest(echoContext, credentialURL)
+	if err != nil {
+		return err
+	}
+	return a.portalProxy.SendProxiedResponse(echoContext, responses)
+}
+
+func (a *Autoscaler) deleteAutoscalerCredential(echoContext echo.Context) error {
+	appID := echoContext.Param("appId")
+	credentialURL, _ := url.Parse("/v1/apps/" + appID + "/credential")
+	responses, err := a.portalProxy.ProxyRequest(echoContext, credentialURL)
+	if err != nil {
+		return err
+	}
+	return a.portalProxy.SendProxiedResponse(echoContext, responses)
+}
diff --git a/src/jetstream/plugins/autoscaler/main.go b/src/jetstream/plugins/autoscaler/main.go
index ccfd9570d4..e33d092a0b 100644
--- a/src/jetstream/plugins/autoscaler/main.go
+++ b/src/jetstream/plugins/autoscaler/main.go
@@ -44,6 +44,8 @@ func (a *Autoscaler) AddSessionGroupRoutes(echoGroup *echo.Group) {
 	echoGroup.GET("/autoscaler/apps/:appId/policy", a.getAutoscalerPolicy)
 	echoGroup.PUT("/autoscaler/apps/:appId/policy", a.attachAutoscalerPolicy)
 	echoGroup.DELETE("/autoscaler/apps/:appId/policy", a.detachAutoscalerPolicy)
+	echoGroup.PUT("/autoscaler/apps/:appId/credential", a.createAutoscalerCredential)
+	echoGroup.DELETE("/autoscaler/apps/:appId/credential", a.deleteAutoscalerCredential)
 	echoGroup.GET("/autoscaler/apps/:appId/metric/:metricType", a.getAutoscalerMetric)
 	echoGroup.GET("/autoscaler/apps/:appId/event", a.getAutoscalerEvent)
 }

From 24ec1c6edebd03379affdcba8c75356c744fec74 Mon Sep 17 00:00:00 2001
From: zyjiaobj <zyjiaobj@cn.ibm.com>
Date: Thu, 19 Dec 2019 14:13:54 +0800
Subject: [PATCH 002/176] [autoscaler] fix credential edit pager test error

---
 .../edit-autoscaler-credential.component.spec.ts                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.spec.ts
index 50682c3a1c..67aa232e81 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.spec.ts
@@ -4,7 +4,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { CoreModule } from '../../../../core/src/core/core.module';
-import { ApplicationService } from '../../../../core/src/features/applications/application.service';
+import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../core/tab-nav.service';
 import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper';

From 80f5de1661df21b54b6e42b831ff368c3c132012 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 1 Apr 2020 20:01:10 +0100
Subject: [PATCH 003/176] Remove @nrwl

---
 angular.json |  2 +-
 package.json | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/angular.json b/angular.json
index 9d29bc4da8..43d24281ff 100644
--- a/angular.json
+++ b/angular.json
@@ -330,6 +330,6 @@
     }
   },
   "cli": {
-    "defaultCollection": "@nrwl/angular"
+    "_defaultCollection": "@nrwl/angular"
   }
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index b278bf16eb..3c9e3c6a32 100644
--- a/package.json
+++ b/package.json
@@ -41,9 +41,7 @@
     "customize-default": "gulp customize-default",
     "customize-reset": "gulp customize-reset",
     "store-git-metadata": "gulp store-git-metadata",
-    "postinstall": "npm run customize && gulp dev-setup",
-    "update": "ng update @nrwl/workspace",
-    "nx": "nx"
+    "postinstall": "npm run customize && gulp dev-setup"
   },
   "author": "",
   "license": "Apache-2.0",
@@ -90,8 +88,7 @@
     "web-animations-js": "^2.3.2",
     "xterm": "^4.0.2",
     "xterm-addon-fit": "^0.3.0",
-    "zone.js": "~0.10.2",
-    "@nrwl/angular": "8.5.2"
+    "zone.js": "~0.10.2"
   },
   "engines": {
     "node": "12.13.0"
@@ -148,7 +145,6 @@
     "tsickle": "^0.37.0",
     "tslib": "^1.9.0",
     "tslint": "~5.20.0",
-    "typescript": "<3.6.0",
-    "@nrwl/workspace": "8.5.2"
+    "typescript": "<3.6.0"
   }
 }

From 02f0e1d8a944f3bbed578ee98deee3b14517e85e Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 1 Apr 2020 20:03:12 +0100
Subject: [PATCH 004/176] Update dependencies

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 3c9e3c6a32..c9d8de8f45 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@angular/common": "^8.2.9",
     "@angular/compiler": "^8.2.9",
     "@angular/core": "^8.2.9",
-    "@angular/flex-layout": "^8.0.0-beta.27",
+    "@angular/flex-layout": "^9.0.0-beta.29",
     "@angular/forms": "^8.2.9",
     "@angular/material": "^8.2.2",
     "@angular/material-moment-adapter": "^8.2.2",
@@ -144,7 +144,7 @@
     "ts-node": "~8.4.1",
     "tsickle": "^0.37.0",
     "tslib": "^1.9.0",
-    "tslint": "~5.20.0",
+    "tslint": "~6.1.0",
     "typescript": "<3.6.0"
   }
 }

From 64ea234651dd14864e282d5a787d37aa262fb12b Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 1 Apr 2020 20:04:02 +0100
Subject: [PATCH 005/176] Update lock file

---
 package-lock.json | 5039 ++++++++++++++++++++-------------------------
 1 file changed, 2204 insertions(+), 2835 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1f145e3968..de9410d41f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
           "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
           "dev": true,
           "requires": {
-            "tslib": "1.10.0"
+            "tslib": "^1.9.0"
           }
         }
       }
@@ -95,10 +95,10 @@
           "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "2.0.1",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.4.1",
-            "uri-js": "4.2.2"
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
         "glob": {
@@ -107,12 +107,12 @@
           "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
           "dev": true,
           "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.4",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         },
         "parse5": {
@@ -127,7 +127,7 @@
           "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
           "dev": true,
           "requires": {
-            "tslib": "1.10.0"
+            "tslib": "^1.9.0"
           }
         },
         "semver": {
@@ -160,7 +160,7 @@
           "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
           "dev": true,
           "requires": {
-            "tslib": "1.10.0"
+            "tslib": "^1.9.0"
           }
         }
       }
@@ -210,7 +210,7 @@
           "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
           "dev": true,
           "requires": {
-            "tslib": "1.10.0"
+            "tslib": "^1.9.0"
           }
         }
       }
@@ -234,10 +234,10 @@
           "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "2.0.1",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.4.1",
-            "uri-js": "4.2.2"
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
         "rxjs": {
@@ -246,7 +246,7 @@
           "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
           "dev": true,
           "requires": {
-            "tslib": "1.10.0"
+            "tslib": "^1.9.0"
           }
         },
         "source-map": {
@@ -273,7 +273,7 @@
           "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
           "dev": true,
           "requires": {
-            "tslib": "1.10.0"
+            "tslib": "^1.9.0"
           }
         }
       }
@@ -283,7 +283,7 @@
       "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.9.tgz",
       "integrity": "sha512-l30AF0d9P5okTPM1wieUHgcnDyGSNvyaBcxXSOkT790wAP2v5zs7VrKq9Lm+ICu4Nkx07KrOr5XLUHhqsg3VXA==",
       "requires": {
-        "tslib": "1.10.0"
+        "tslib": "^1.9.0"
       }
     },
     "@angular/cdk": {
@@ -291,8 +291,8 @@
       "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-8.2.2.tgz",
       "integrity": "sha512-e+BtFab0Vd1q/ZVu6l850Q4vvgyVYiugSX31oMRlp86fKHPowlAO7jL3z5JcAG7TybpLIqd7oqF8XQBR/yw83w==",
       "requires": {
-        "parse5": "5.1.0",
-        "tslib": "1.10.0"
+        "parse5": "^5.0.0",
+        "tslib": "^1.7.1"
       }
     },
     "@angular/cli": {
@@ -308,7 +308,7 @@
         "@schematics/update": "0.803.7",
         "@yarnpkg/lockfile": "1.1.0",
         "ansi-colors": "4.1.1",
-        "debug": "4.1.1",
+        "debug": "^4.1.1",
         "ini": "1.3.5",
         "inquirer": "6.5.1",
         "npm-package-arg": "6.1.0",
@@ -318,8 +318,8 @@
         "read-package-tree": "5.3.1",
         "semver": "6.3.0",
         "symbol-observable": "1.2.0",
-        "universal-analytics": "0.4.20",
-        "uuid": "3.3.3"
+        "universal-analytics": "^0.4.20",
+        "uuid": "^3.3.2"
       },
       "dependencies": {
         "ansi-colors": {
@@ -334,7 +334,7 @@
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "ms": "^2.1.1"
           }
         },
         "ms": {
@@ -356,7 +356,7 @@
       "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.9.tgz",
       "integrity": "sha512-76WDU1USlI5vAzqCJ3gxCQGuu57aJEggNk/xoWmQEXipiFTFBh2wSKn/dE6Txr/q3COTPIcrmb9OCeal5kQPIA==",
       "requires": {
-        "tslib": "1.10.0"
+        "tslib": "^1.9.0"
       }
     },
     "@angular/compiler": {
@@ -364,7 +364,7 @@
       "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.9.tgz",
       "integrity": "sha512-oQho19DnOhEDNerCOGuGK95tcZ2oy4dSA5SykJmmniRnZzPM2++bJD32qJehXHy1K+3hv2zN9x7HPhqT3ljT6g==",
       "requires": {
-        "tslib": "1.10.0"
+        "tslib": "^1.9.0"
       }
     },
     "@angular/compiler-cli": {
@@ -374,14 +374,14 @@
       "dev": true,
       "requires": {
         "canonical-path": "1.0.0",
-        "chokidar": "2.1.8",
-        "convert-source-map": "1.6.0",
-        "dependency-graph": "0.7.2",
-        "magic-string": "0.25.3",
-        "minimist": "1.2.0",
-        "reflect-metadata": "0.1.13",
-        "source-map": "0.6.1",
-        "tslib": "1.10.0",
+        "chokidar": "^2.1.1",
+        "convert-source-map": "^1.5.1",
+        "dependency-graph": "^0.7.2",
+        "magic-string": "^0.25.0",
+        "minimist": "^1.2.0",
+        "reflect-metadata": "^0.1.2",
+        "source-map": "^0.6.1",
+        "tslib": "^1.9.0",
         "yargs": "13.1.0"
       },
       "dependencies": {
@@ -397,18 +397,18 @@
           "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
           "dev": true,
           "requires": {
-            "anymatch": "2.0.0",
-            "async-each": "1.0.3",
-            "braces": "2.3.2",
-            "fsevents": "1.2.9",
-            "glob-parent": "3.1.0",
-            "inherits": "2.0.4",
-            "is-binary-path": "1.0.1",
-            "is-glob": "4.0.1",
-            "normalize-path": "3.0.0",
-            "path-is-absolute": "1.0.1",
-            "readdirp": "2.2.1",
-            "upath": "1.2.0"
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
           }
         },
         "cliui": {
@@ -417,9 +417,9 @@
           "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
           "dev": true,
           "requires": {
-            "string-width": "2.1.1",
-            "strip-ansi": "4.0.0",
-            "wrap-ansi": "2.1.0"
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
           },
           "dependencies": {
             "string-width": {
@@ -428,8 +428,8 @@
               "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
               "dev": true,
               "requires": {
-                "is-fullwidth-code-point": "2.0.0",
-                "strip-ansi": "4.0.0"
+                "is-fullwidth-code-point": "^2.0.0",
+                "strip-ansi": "^4.0.0"
               }
             }
           }
@@ -464,7 +464,7 @@
           "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
           "dev": true,
           "requires": {
-            "invert-kv": "2.0.0"
+            "invert-kv": "^2.0.0"
           }
         },
         "mem": {
@@ -473,9 +473,9 @@
           "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
           "dev": true,
           "requires": {
-            "map-age-cleaner": "0.1.3",
-            "mimic-fn": "2.1.0",
-            "p-is-promise": "2.1.0"
+            "map-age-cleaner": "^0.1.1",
+            "mimic-fn": "^2.0.0",
+            "p-is-promise": "^2.0.0"
           }
         },
         "normalize-path": {
@@ -490,9 +490,9 @@
           "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
           "dev": true,
           "requires": {
-            "execa": "1.0.0",
-            "lcid": "2.0.0",
-            "mem": "4.3.0"
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.0"
           }
         },
         "require-main-filename": {
@@ -513,9 +513,9 @@
           "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "dev": true,
           "requires": {
-            "emoji-regex": "7.0.3",
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "5.2.0"
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
           },
           "dependencies": {
             "ansi-regex": {
@@ -530,7 +530,7 @@
               "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
               "dev": true,
               "requires": {
-                "ansi-regex": "4.1.0"
+                "ansi-regex": "^4.1.0"
               }
             }
           }
@@ -541,7 +541,7 @@
           "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "3.0.0"
+            "ansi-regex": "^3.0.0"
           }
         },
         "which-module": {
@@ -556,17 +556,17 @@
           "integrity": "sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==",
           "dev": true,
           "requires": {
-            "cliui": "4.1.0",
-            "find-up": "3.0.0",
-            "get-caller-file": "2.0.5",
-            "os-locale": "3.1.0",
-            "require-directory": "2.1.1",
-            "require-main-filename": "2.0.0",
-            "set-blocking": "2.0.0",
-            "string-width": "3.1.0",
-            "which-module": "2.0.0",
-            "y18n": "4.0.0",
-            "yargs-parser": "13.1.1"
+            "cliui": "^4.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "os-locale": "^3.1.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.0.0"
           }
         },
         "yargs-parser": {
@@ -575,8 +575,8 @@
           "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
           "dev": true,
           "requires": {
-            "camelcase": "5.3.1",
-            "decamelize": "1.2.0"
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
           }
         }
       }
@@ -586,23 +586,20 @@
       "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.9.tgz",
       "integrity": "sha512-GpHAuLOlN9iioELCQBmAsjETTUCyFgVUI3LXwh3e63jnpd+ZuuZcZbjfTYhtgYVNMetn7cVEO6p88eb7qvpUWQ==",
       "requires": {
-        "tslib": "1.10.0"
+        "tslib": "^1.9.0"
       }
     },
     "@angular/flex-layout": {
-      "version": "8.0.0-beta.27",
-      "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-8.0.0-beta.27.tgz",
-      "integrity": "sha512-qmpvQPesU4ZQ56IscwgmVRpK2UnyV+gwvXUql7TMv0QV215hLcHczjGsrKkLfW2By5E7XEyDat9br72uVXcPMw==",
-      "requires": {
-        "tslib": "1.10.0"
-      }
+      "version": "9.0.0-beta.29",
+      "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-9.0.0-beta.29.tgz",
+      "integrity": "sha512-93sxR+kYfYMOdnlWL0Q77FZ428gg8XnBu0YZm6GsCdkw/vLggIT/G1ZAqHlCPIODt6pxmCJ5KXh4ShvniIYDsA=="
     },
     "@angular/forms": {
       "version": "8.2.9",
       "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.9.tgz",
       "integrity": "sha512-kAdBuApC9PPOdPI8BmNhxCraAkXGbX/PkVan8pQ5xdumvgGqvVjbJvLaUSbJROPtgCRlQyiEDrHFd4gk/WU76A==",
       "requires": {
-        "tslib": "1.10.0"
+        "tslib": "^1.9.0"
       }
     },
     "@angular/language-service": {
@@ -616,7 +613,7 @@
       "resolved": "https://registry.npmjs.org/@angular/material/-/material-8.2.2.tgz",
       "integrity": "sha512-mR2ppE+Z1S5As2SUFK8wUH76Fj7YgrefhrwVGaeCLcAen//RHPw043+KL2apPAUaltdIFlGFtUuA6yJN6av0nQ==",
       "requires": {
-        "tslib": "1.10.0"
+        "tslib": "^1.7.1"
       }
     },
     "@angular/material-moment-adapter": {
@@ -624,7 +621,7 @@
       "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-8.2.2.tgz",
       "integrity": "sha512-HZYoVssNh+uon0SszUDtVTWmjah5vtEJOYVYl9BakE6dC+Z4910B+/hVQ1HfOdas5mHpjxVoYpbIoe4QG5sc5A==",
       "requires": {
-        "tslib": "1.10.0"
+        "tslib": "^1.7.1"
       }
     },
     "@angular/platform-browser": {
@@ -632,7 +629,7 @@
       "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.9.tgz",
       "integrity": "sha512-k3aNZy0OTqGn7HlHHV52QF6ZAP/VlQhWGD2u5e1dWIWMq39kdkdSCNu5tiuAf5hIzMBiSQ0tjnuVWA4MuDBYIQ==",
       "requires": {
-        "tslib": "1.10.0"
+        "tslib": "^1.9.0"
       }
     },
     "@angular/platform-browser-dynamic": {
@@ -640,7 +637,7 @@
       "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.9.tgz",
       "integrity": "sha512-GbE4TUy4n/a8yp8fLWwdG/QnjUPZZ8VufItZ7GvOpoyknzegvka111dLctvMoPzSAsrKyShL6cryuyDC5PShUA==",
       "requires": {
-        "tslib": "1.10.0"
+        "tslib": "^1.9.0"
       }
     },
     "@angular/platform-server": {
@@ -648,9 +645,9 @@
       "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-8.2.9.tgz",
       "integrity": "sha512-rr6h82+DdUGhpsF3WT3eLk5itjZDXe7SiNtRGHkPj+yTyFAxuTKA3cX0N7LWsGGIFax+s1vQhMreV4YcyHKGPQ==",
       "requires": {
-        "domino": "2.1.3",
-        "tslib": "1.10.0",
-        "xhr2": "0.1.4"
+        "domino": "^2.1.2",
+        "tslib": "^1.9.0",
+        "xhr2": "^0.1.4"
       }
     },
     "@angular/router": {
@@ -658,58 +655,63 @@
       "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.9.tgz",
       "integrity": "sha512-4P60CWNB/jxGjDBEuYN0Jobt76QlebAQeFBTDswRVwRlq/WJT4QhL3a8AVIRsHn9bQII0LUt/ZQBBPxn7h9lSA==",
       "requires": {
-        "tslib": "1.10.0"
+        "tslib": "^1.9.0"
       }
     },
     "@babel/code-frame": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
       "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
+      "dev": true,
       "requires": {
-        "@babel/highlight": "7.5.0"
+        "@babel/highlight": "^7.0.0"
       }
     },
     "@babel/core": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz",
       "integrity": "sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==",
+      "dev": true,
       "requires": {
-        "@babel/code-frame": "7.5.5",
-        "@babel/generator": "7.6.2",
-        "@babel/helpers": "7.6.2",
-        "@babel/parser": "7.6.2",
-        "@babel/template": "7.6.0",
-        "@babel/traverse": "7.6.2",
-        "@babel/types": "7.6.1",
-        "convert-source-map": "1.6.0",
-        "debug": "4.1.1",
-        "json5": "2.1.1",
-        "lodash": "4.17.15",
-        "resolve": "1.12.0",
-        "semver": "5.6.0",
-        "source-map": "0.5.6"
+        "@babel/code-frame": "^7.5.5",
+        "@babel/generator": "^7.5.5",
+        "@babel/helpers": "^7.5.5",
+        "@babel/parser": "^7.5.5",
+        "@babel/template": "^7.4.4",
+        "@babel/traverse": "^7.5.5",
+        "@babel/types": "^7.5.5",
+        "convert-source-map": "^1.1.0",
+        "debug": "^4.1.0",
+        "json5": "^2.1.0",
+        "lodash": "^4.17.13",
+        "resolve": "^1.3.2",
+        "semver": "^5.4.1",
+        "source-map": "^0.5.0"
       },
       "dependencies": {
         "debug": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "ms": "^2.1.1"
           }
         },
         "json5": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz",
           "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==",
+          "dev": true,
           "requires": {
-            "minimist": "1.2.0"
+            "minimist": "^1.2.0"
           }
         },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         }
       }
     },
@@ -717,17 +719,19 @@
       "version": "7.6.2",
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.6.2.tgz",
       "integrity": "sha512-j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ==",
+      "dev": true,
       "requires": {
-        "@babel/types": "7.6.1",
-        "jsesc": "2.5.2",
-        "lodash": "4.17.15",
-        "source-map": "0.5.6"
+        "@babel/types": "^7.6.0",
+        "jsesc": "^2.5.1",
+        "lodash": "^4.17.13",
+        "source-map": "^0.5.0"
       },
       "dependencies": {
         "jsesc": {
           "version": "2.5.2",
           "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
+          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+          "dev": true
         }
       }
     },
@@ -735,357 +739,397 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz",
       "integrity": "sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==",
+      "dev": true,
       "requires": {
-        "@babel/types": "7.6.1"
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz",
       "integrity": "sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==",
+      "dev": true,
       "requires": {
-        "@babel/helper-explode-assignable-expression": "7.1.0",
-        "@babel/types": "7.6.1"
+        "@babel/helper-explode-assignable-expression": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-call-delegate": {
       "version": "7.4.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz",
       "integrity": "sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==",
+      "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "7.4.4",
-        "@babel/traverse": "7.6.2",
-        "@babel/types": "7.6.1"
+        "@babel/helper-hoist-variables": "^7.4.4",
+        "@babel/traverse": "^7.4.4",
+        "@babel/types": "^7.4.4"
       }
     },
     "@babel/helper-define-map": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz",
       "integrity": "sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg==",
+      "dev": true,
       "requires": {
-        "@babel/helper-function-name": "7.1.0",
-        "@babel/types": "7.6.1",
-        "lodash": "4.17.15"
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/types": "^7.5.5",
+        "lodash": "^4.17.13"
       }
     },
     "@babel/helper-explode-assignable-expression": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz",
       "integrity": "sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==",
+      "dev": true,
       "requires": {
-        "@babel/traverse": "7.6.2",
-        "@babel/types": "7.6.1"
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-function-name": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
       "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
+      "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "7.0.0",
-        "@babel/template": "7.6.0",
-        "@babel/types": "7.6.1"
+        "@babel/helper-get-function-arity": "^7.0.0",
+        "@babel/template": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-get-function-arity": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
       "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
+      "dev": true,
       "requires": {
-        "@babel/types": "7.6.1"
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-hoist-variables": {
       "version": "7.4.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz",
       "integrity": "sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==",
+      "dev": true,
       "requires": {
-        "@babel/types": "7.6.1"
+        "@babel/types": "^7.4.4"
       }
     },
     "@babel/helper-member-expression-to-functions": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz",
       "integrity": "sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA==",
+      "dev": true,
       "requires": {
-        "@babel/types": "7.6.1"
+        "@babel/types": "^7.5.5"
       }
     },
     "@babel/helper-module-imports": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz",
       "integrity": "sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==",
+      "dev": true,
       "requires": {
-        "@babel/types": "7.6.1"
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-module-transforms": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz",
       "integrity": "sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw==",
+      "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "7.0.0",
-        "@babel/helper-simple-access": "7.1.0",
-        "@babel/helper-split-export-declaration": "7.4.4",
-        "@babel/template": "7.6.0",
-        "@babel/types": "7.6.1",
-        "lodash": "4.17.15"
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-simple-access": "^7.1.0",
+        "@babel/helper-split-export-declaration": "^7.4.4",
+        "@babel/template": "^7.4.4",
+        "@babel/types": "^7.5.5",
+        "lodash": "^4.17.13"
       }
     },
     "@babel/helper-optimise-call-expression": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz",
       "integrity": "sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==",
+      "dev": true,
       "requires": {
-        "@babel/types": "7.6.1"
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-plugin-utils": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz",
-      "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA=="
+      "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==",
+      "dev": true
     },
     "@babel/helper-regex": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.5.5.tgz",
       "integrity": "sha512-CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw==",
+      "dev": true,
       "requires": {
-        "lodash": "4.17.15"
+        "lodash": "^4.17.13"
       }
     },
     "@babel/helper-remap-async-to-generator": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz",
       "integrity": "sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==",
+      "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "7.0.0",
-        "@babel/helper-wrap-function": "7.2.0",
-        "@babel/template": "7.6.0",
-        "@babel/traverse": "7.6.2",
-        "@babel/types": "7.6.1"
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-wrap-function": "^7.1.0",
+        "@babel/template": "^7.1.0",
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-replace-supers": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz",
       "integrity": "sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg==",
+      "dev": true,
       "requires": {
-        "@babel/helper-member-expression-to-functions": "7.5.5",
-        "@babel/helper-optimise-call-expression": "7.0.0",
-        "@babel/traverse": "7.6.2",
-        "@babel/types": "7.6.1"
+        "@babel/helper-member-expression-to-functions": "^7.5.5",
+        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/traverse": "^7.5.5",
+        "@babel/types": "^7.5.5"
       }
     },
     "@babel/helper-simple-access": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz",
       "integrity": "sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==",
+      "dev": true,
       "requires": {
-        "@babel/template": "7.6.0",
-        "@babel/types": "7.6.1"
+        "@babel/template": "^7.1.0",
+        "@babel/types": "^7.0.0"
       }
     },
     "@babel/helper-split-export-declaration": {
       "version": "7.4.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
       "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
+      "dev": true,
       "requires": {
-        "@babel/types": "7.6.1"
+        "@babel/types": "^7.4.4"
       }
     },
     "@babel/helper-wrap-function": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz",
       "integrity": "sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==",
+      "dev": true,
       "requires": {
-        "@babel/helper-function-name": "7.1.0",
-        "@babel/template": "7.6.0",
-        "@babel/traverse": "7.6.2",
-        "@babel/types": "7.6.1"
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/template": "^7.1.0",
+        "@babel/traverse": "^7.1.0",
+        "@babel/types": "^7.2.0"
       }
     },
     "@babel/helpers": {
       "version": "7.6.2",
       "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.2.tgz",
       "integrity": "sha512-3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA==",
+      "dev": true,
       "requires": {
-        "@babel/template": "7.6.0",
-        "@babel/traverse": "7.6.2",
-        "@babel/types": "7.6.1"
+        "@babel/template": "^7.6.0",
+        "@babel/traverse": "^7.6.2",
+        "@babel/types": "^7.6.0"
       }
     },
     "@babel/highlight": {
       "version": "7.5.0",
       "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
       "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
+      "dev": true,
       "requires": {
-        "chalk": "2.4.2",
-        "esutils": "2.0.3",
-        "js-tokens": "4.0.0"
+        "chalk": "^2.0.0",
+        "esutils": "^2.0.2",
+        "js-tokens": "^4.0.0"
       },
       "dependencies": {
         "js-tokens": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+          "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+          "dev": true
         }
       }
     },
     "@babel/parser": {
       "version": "7.6.2",
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.2.tgz",
-      "integrity": "sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg=="
+      "integrity": "sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg==",
+      "dev": true
     },
     "@babel/plugin-proposal-async-generator-functions": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz",
       "integrity": "sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-remap-async-to-generator": "7.1.0",
-        "@babel/plugin-syntax-async-generators": "7.2.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-remap-async-to-generator": "^7.1.0",
+        "@babel/plugin-syntax-async-generators": "^7.2.0"
       }
     },
     "@babel/plugin-proposal-dynamic-import": {
       "version": "7.5.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz",
       "integrity": "sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/plugin-syntax-dynamic-import": "7.2.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-dynamic-import": "^7.2.0"
       }
     },
     "@babel/plugin-proposal-json-strings": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz",
       "integrity": "sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/plugin-syntax-json-strings": "7.2.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-json-strings": "^7.2.0"
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
       "version": "7.6.2",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz",
       "integrity": "sha512-LDBXlmADCsMZV1Y9OQwMc0MyGZ8Ta/zlD9N67BfQT8uYwkRswiu2hU6nJKrjrt/58aH/vqfQlR/9yId/7A2gWw==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/plugin-syntax-object-rest-spread": "7.2.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.2.0"
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz",
       "integrity": "sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/plugin-syntax-optional-catch-binding": "7.2.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0"
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
       "version": "7.6.2",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.6.2.tgz",
       "integrity": "sha512-NxHETdmpeSCtiatMRYWVJo7266rrvAC3DTeG5exQBIH/fMIUK7ejDNznBbn3HQl/o9peymRRg7Yqkx6PdUXmMw==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-regex": "7.5.5",
-        "regexpu-core": "4.6.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.6.0"
       }
     },
     "@babel/plugin-syntax-async-generators": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz",
       "integrity": "sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-syntax-dynamic-import": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz",
       "integrity": "sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-syntax-json-strings": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz",
       "integrity": "sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-syntax-object-rest-spread": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz",
       "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-syntax-optional-catch-binding": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz",
       "integrity": "sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-arrow-functions": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz",
       "integrity": "sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
       "version": "7.5.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz",
       "integrity": "sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg==",
+      "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "7.0.0",
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-remap-async-to-generator": "7.1.0"
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-remap-async-to-generator": "^7.1.0"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz",
       "integrity": "sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-block-scoping": {
       "version": "7.6.2",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.2.tgz",
       "integrity": "sha512-zZT8ivau9LOQQaOGC7bQLQOT4XPkPXgN2ERfUgk1X8ql+mVkLc4E8eKk+FO3o0154kxzqenWCorfmEXpEZcrSQ==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "lodash": "4.17.15"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "lodash": "^4.17.13"
       }
     },
     "@babel/plugin-transform-classes": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz",
       "integrity": "sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg==",
+      "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "7.0.0",
-        "@babel/helper-define-map": "7.5.5",
-        "@babel/helper-function-name": "7.1.0",
-        "@babel/helper-optimise-call-expression": "7.0.0",
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-replace-supers": "7.5.5",
-        "@babel/helper-split-export-declaration": "7.4.4",
-        "globals": "11.12.0"
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-define-map": "^7.5.5",
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.5.5",
+        "@babel/helper-split-export-declaration": "^7.4.4",
+        "globals": "^11.1.0"
       },
       "dependencies": {
         "globals": {
           "version": "11.12.0",
           "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
+          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+          "dev": true
         }
       }
     },
@@ -1093,1302 +1137,453 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz",
       "integrity": "sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-destructuring": {
       "version": "7.6.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz",
       "integrity": "sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
       "version": "7.6.2",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.6.2.tgz",
       "integrity": "sha512-KGKT9aqKV+9YMZSkowzYoYEiHqgaDhGmPNZlZxX6UeHC4z30nC1J9IrZuGqbYFB1jaIGdv91ujpze0exiVK8bA==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-regex": "7.5.5",
-        "regexpu-core": "4.6.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.6.0"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
       "version": "7.5.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz",
       "integrity": "sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz",
       "integrity": "sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==",
+      "dev": true,
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "7.1.0",
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-for-of": {
       "version": "7.4.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz",
       "integrity": "sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-function-name": {
       "version": "7.4.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz",
       "integrity": "sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==",
+      "dev": true,
       "requires": {
-        "@babel/helper-function-name": "7.1.0",
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-literals": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz",
       "integrity": "sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-member-expression-literals": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz",
       "integrity": "sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-modules-amd": {
       "version": "7.5.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz",
       "integrity": "sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==",
+      "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "7.5.5",
-        "@babel/helper-plugin-utils": "7.0.0",
-        "babel-plugin-dynamic-import-node": "2.3.0"
+        "@babel/helper-module-transforms": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "babel-plugin-dynamic-import-node": "^2.3.0"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
       "version": "7.6.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz",
       "integrity": "sha512-Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g==",
+      "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "7.5.5",
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-simple-access": "7.1.0",
-        "babel-plugin-dynamic-import-node": "2.3.0"
+        "@babel/helper-module-transforms": "^7.4.4",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-simple-access": "^7.1.0",
+        "babel-plugin-dynamic-import-node": "^2.3.0"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
       "version": "7.5.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz",
       "integrity": "sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg==",
+      "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "7.4.4",
-        "@babel/helper-plugin-utils": "7.0.0",
-        "babel-plugin-dynamic-import-node": "2.3.0"
+        "@babel/helper-hoist-variables": "^7.4.4",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "babel-plugin-dynamic-import-node": "^2.3.0"
       }
     },
     "@babel/plugin-transform-modules-umd": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz",
       "integrity": "sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==",
+      "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "7.5.5",
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-module-transforms": "^7.1.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
       "version": "7.6.2",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.2.tgz",
       "integrity": "sha512-xBdB+XOs+lgbZc2/4F5BVDVcDNS4tcSKQc96KmlqLEAwz6tpYPEvPdmDfvVG0Ssn8lAhronaRs6Z6KSexIpK5g==",
+      "dev": true,
       "requires": {
-        "regexpu-core": "4.6.0"
+        "regexpu-core": "^4.6.0"
       }
     },
     "@babel/plugin-transform-new-target": {
       "version": "7.4.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz",
       "integrity": "sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-object-super": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz",
       "integrity": "sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-replace-supers": "7.5.5"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.5.5"
       }
     },
     "@babel/plugin-transform-parameters": {
       "version": "7.4.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz",
       "integrity": "sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==",
+      "dev": true,
       "requires": {
-        "@babel/helper-call-delegate": "7.4.4",
-        "@babel/helper-get-function-arity": "7.0.0",
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-call-delegate": "^7.4.4",
+        "@babel/helper-get-function-arity": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-property-literals": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz",
       "integrity": "sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-regenerator": {
       "version": "7.4.5",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz",
       "integrity": "sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==",
+      "dev": true,
       "requires": {
-        "regenerator-transform": "0.14.1"
+        "regenerator-transform": "^0.14.0"
       }
     },
     "@babel/plugin-transform-reserved-words": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz",
       "integrity": "sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz",
       "integrity": "sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-spread": {
       "version": "7.6.2",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz",
       "integrity": "sha512-DpSvPFryKdK1x+EDJYCy28nmAaIMdxmhot62jAXF/o99iA33Zj2Lmcp3vDmz+MUh0LNYVPvfj5iC3feb3/+PFg==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz",
       "integrity": "sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-regex": "7.5.5"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.0.0"
       }
     },
     "@babel/plugin-transform-template-literals": {
       "version": "7.4.4",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz",
       "integrity": "sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==",
+      "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "7.0.0",
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-annotate-as-pure": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz",
       "integrity": "sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
       "version": "7.6.2",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.6.2.tgz",
       "integrity": "sha512-orZI6cWlR3nk2YmYdb0gImrgCUwb5cBUwjf6Ks6dvNVvXERkwtJWOQaEOjPiu0Gu1Tq6Yq/hruCZZOOi9F34Dw==",
+      "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/helper-regex": "7.5.5",
-        "regexpu-core": "4.6.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.6.0"
       }
     },
     "@babel/preset-env": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.5.5.tgz",
       "integrity": "sha512-GMZQka/+INwsMz1A5UEql8tG015h5j/qjptpKY2gJ7giy8ohzU710YciJB5rcKsWGWHiW3RUnHib0E5/m3Tp3A==",
+      "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "7.0.0",
-        "@babel/helper-plugin-utils": "7.0.0",
-        "@babel/plugin-proposal-async-generator-functions": "7.2.0",
-        "@babel/plugin-proposal-dynamic-import": "7.5.0",
-        "@babel/plugin-proposal-json-strings": "7.2.0",
-        "@babel/plugin-proposal-object-rest-spread": "7.6.2",
-        "@babel/plugin-proposal-optional-catch-binding": "7.2.0",
-        "@babel/plugin-proposal-unicode-property-regex": "7.6.2",
-        "@babel/plugin-syntax-async-generators": "7.2.0",
-        "@babel/plugin-syntax-dynamic-import": "7.2.0",
-        "@babel/plugin-syntax-json-strings": "7.2.0",
-        "@babel/plugin-syntax-object-rest-spread": "7.2.0",
-        "@babel/plugin-syntax-optional-catch-binding": "7.2.0",
-        "@babel/plugin-transform-arrow-functions": "7.2.0",
-        "@babel/plugin-transform-async-to-generator": "7.5.0",
-        "@babel/plugin-transform-block-scoped-functions": "7.2.0",
-        "@babel/plugin-transform-block-scoping": "7.6.2",
-        "@babel/plugin-transform-classes": "7.5.5",
-        "@babel/plugin-transform-computed-properties": "7.2.0",
-        "@babel/plugin-transform-destructuring": "7.6.0",
-        "@babel/plugin-transform-dotall-regex": "7.6.2",
-        "@babel/plugin-transform-duplicate-keys": "7.5.0",
-        "@babel/plugin-transform-exponentiation-operator": "7.2.0",
-        "@babel/plugin-transform-for-of": "7.4.4",
-        "@babel/plugin-transform-function-name": "7.4.4",
-        "@babel/plugin-transform-literals": "7.2.0",
-        "@babel/plugin-transform-member-expression-literals": "7.2.0",
-        "@babel/plugin-transform-modules-amd": "7.5.0",
-        "@babel/plugin-transform-modules-commonjs": "7.6.0",
-        "@babel/plugin-transform-modules-systemjs": "7.5.0",
-        "@babel/plugin-transform-modules-umd": "7.2.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "7.6.2",
-        "@babel/plugin-transform-new-target": "7.4.4",
-        "@babel/plugin-transform-object-super": "7.5.5",
-        "@babel/plugin-transform-parameters": "7.4.4",
-        "@babel/plugin-transform-property-literals": "7.2.0",
-        "@babel/plugin-transform-regenerator": "7.4.5",
-        "@babel/plugin-transform-reserved-words": "7.2.0",
-        "@babel/plugin-transform-shorthand-properties": "7.2.0",
-        "@babel/plugin-transform-spread": "7.6.2",
-        "@babel/plugin-transform-sticky-regex": "7.2.0",
-        "@babel/plugin-transform-template-literals": "7.4.4",
-        "@babel/plugin-transform-typeof-symbol": "7.2.0",
-        "@babel/plugin-transform-unicode-regex": "7.6.2",
-        "@babel/types": "7.6.1",
-        "browserslist": "4.6.6",
-        "core-js-compat": "3.2.1",
-        "invariant": "2.2.4",
-        "js-levenshtein": "1.1.6",
-        "semver": "5.6.0"
+        "@babel/helper-module-imports": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-async-generator-functions": "^7.2.0",
+        "@babel/plugin-proposal-dynamic-import": "^7.5.0",
+        "@babel/plugin-proposal-json-strings": "^7.2.0",
+        "@babel/plugin-proposal-object-rest-spread": "^7.5.5",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.2.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-syntax-async-generators": "^7.2.0",
+        "@babel/plugin-syntax-dynamic-import": "^7.2.0",
+        "@babel/plugin-syntax-json-strings": "^7.2.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.2.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0",
+        "@babel/plugin-transform-arrow-functions": "^7.2.0",
+        "@babel/plugin-transform-async-to-generator": "^7.5.0",
+        "@babel/plugin-transform-block-scoped-functions": "^7.2.0",
+        "@babel/plugin-transform-block-scoping": "^7.5.5",
+        "@babel/plugin-transform-classes": "^7.5.5",
+        "@babel/plugin-transform-computed-properties": "^7.2.0",
+        "@babel/plugin-transform-destructuring": "^7.5.0",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/plugin-transform-duplicate-keys": "^7.5.0",
+        "@babel/plugin-transform-exponentiation-operator": "^7.2.0",
+        "@babel/plugin-transform-for-of": "^7.4.4",
+        "@babel/plugin-transform-function-name": "^7.4.4",
+        "@babel/plugin-transform-literals": "^7.2.0",
+        "@babel/plugin-transform-member-expression-literals": "^7.2.0",
+        "@babel/plugin-transform-modules-amd": "^7.5.0",
+        "@babel/plugin-transform-modules-commonjs": "^7.5.0",
+        "@babel/plugin-transform-modules-systemjs": "^7.5.0",
+        "@babel/plugin-transform-modules-umd": "^7.2.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.4.5",
+        "@babel/plugin-transform-new-target": "^7.4.4",
+        "@babel/plugin-transform-object-super": "^7.5.5",
+        "@babel/plugin-transform-parameters": "^7.4.4",
+        "@babel/plugin-transform-property-literals": "^7.2.0",
+        "@babel/plugin-transform-regenerator": "^7.4.5",
+        "@babel/plugin-transform-reserved-words": "^7.2.0",
+        "@babel/plugin-transform-shorthand-properties": "^7.2.0",
+        "@babel/plugin-transform-spread": "^7.2.0",
+        "@babel/plugin-transform-sticky-regex": "^7.2.0",
+        "@babel/plugin-transform-template-literals": "^7.4.4",
+        "@babel/plugin-transform-typeof-symbol": "^7.2.0",
+        "@babel/plugin-transform-unicode-regex": "^7.4.4",
+        "@babel/types": "^7.5.5",
+        "browserslist": "^4.6.0",
+        "core-js-compat": "^3.1.1",
+        "invariant": "^2.2.2",
+        "js-levenshtein": "^1.1.3",
+        "semver": "^5.5.0"
       }
     },
     "@babel/template": {
       "version": "7.6.0",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz",
       "integrity": "sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==",
+      "dev": true,
       "requires": {
-        "@babel/code-frame": "7.5.5",
-        "@babel/parser": "7.6.2",
-        "@babel/types": "7.6.1"
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.6.0",
+        "@babel/types": "^7.6.0"
       }
     },
     "@babel/traverse": {
       "version": "7.6.2",
       "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.2.tgz",
       "integrity": "sha512-8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ==",
+      "dev": true,
       "requires": {
-        "@babel/code-frame": "7.5.5",
-        "@babel/generator": "7.6.2",
-        "@babel/helper-function-name": "7.1.0",
-        "@babel/helper-split-export-declaration": "7.4.4",
-        "@babel/parser": "7.6.2",
-        "@babel/types": "7.6.1",
-        "debug": "4.1.1",
-        "globals": "11.12.0",
-        "lodash": "4.17.15"
+        "@babel/code-frame": "^7.5.5",
+        "@babel/generator": "^7.6.2",
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-split-export-declaration": "^7.4.4",
+        "@babel/parser": "^7.6.2",
+        "@babel/types": "^7.6.0",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0",
+        "lodash": "^4.17.13"
       },
       "dependencies": {
         "debug": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        }
-      }
-    },
-    "@babel/types": {
-      "version": "7.6.1",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.6.1.tgz",
-      "integrity": "sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==",
-      "requires": {
-        "esutils": "2.0.3",
-        "lodash": "4.17.15",
-        "to-fast-properties": "2.0.0"
-      },
-      "dependencies": {
-        "to-fast-properties": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
-        }
-      }
-    },
-    "@cypress/webpack-preprocessor": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@cypress/webpack-preprocessor/-/webpack-preprocessor-4.1.0.tgz",
-      "integrity": "sha512-LbxsdYVpHGoC2fMOdW0aQvuvVRD7aZx8p8DrP53HISpl7bD1PqLGWKzhHn7cGG24UHycBJrbaEeKEosW29W1dg==",
-      "requires": {
-        "@babel/core": "7.5.5",
-        "@babel/preset-env": "7.5.5",
-        "babel-loader": "8.0.6",
-        "bluebird": "3.5.0",
-        "debug": "3.1.0"
-      },
-      "dependencies": {
-        "bluebird": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
-          "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw="
-        },
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        }
-      }
-    },
-    "@ngrx/effects": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-8.3.0.tgz",
-      "integrity": "sha512-/DdBqCFpHOJZUAmIpefQ8EVwmJXXkcEdLhsV8aXncCNWkK61sy/MbZZfDAbee6Cd1is33bVXRUKD49Z+Upvw5A=="
-    },
-    "@ngrx/router-store": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-8.3.0.tgz",
-      "integrity": "sha512-wIWGW3ZyT9+lJEBXVsPx1/NLFQ8KoCbhlEmpmQHniXE3iIMnK25Or2JCNXfgrndQA9SSVlKIPP3uaDJMyoBotQ=="
-    },
-    "@ngrx/store": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-8.3.0.tgz",
-      "integrity": "sha512-QtM5T6/wTYqAlqeW60ptqqrsBwYF7jvQHsh0yE3AnwZIQvSbLFM2t5S2kN+753v4rHiXVRrA5pLaLzjGhAKcSg=="
-    },
-    "@ngrx/store-devtools": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-8.3.0.tgz",
-      "integrity": "sha512-7jsmN8wz6PMKrbqHnUulMvf8OSYUZbXXOwkcXRaGqIjlnEG9RCHQL0cXuF8zB6uX5xencdEXsRVQe3MdZXWQng=="
-    },
-    "@ngtools/webpack": {
-      "version": "8.3.7",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-8.3.7.tgz",
-      "integrity": "sha512-JPUzw08myovtT/x2dzzWVUNjFq8OHD81bvcBXdqPAQwQvHDSIdo6bKcu2qhakgagtXLJZnglKtefTJFrMG8ciw==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/core": "8.3.7",
-        "enhanced-resolve": "4.1.0",
-        "rxjs": "6.4.0",
-        "tree-kill": "1.2.1",
-        "webpack-sources": "1.4.3"
-      },
-      "dependencies": {
-        "rxjs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
           "dev": true,
           "requires": {
-            "tslib": "1.10.0"
-          }
-        }
-      }
-    },
-    "@nodelib/fs.scandir": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.2.tgz",
-      "integrity": "sha512-wrIBsjA5pl13f0RN4Zx4FNWmU71lv03meGKnqRUoCyan17s4V3WL92f3w3AIuWbNnpcrQyFBU5qMavJoB8d27w==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.stat": "2.0.2",
-        "run-parallel": "1.1.9"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.2.tgz",
-      "integrity": "sha512-z8+wGWV2dgUhLqrtRYa03yDx4HWMvXKi1z8g3m2JyxAx8F7xk74asqPk5LAETjqDSGLFML/6CDl0+yFunSYicw==",
-      "dev": true
-    },
-    "@nodelib/fs.walk": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.3.tgz",
-      "integrity": "sha512-l6t8xEhfK9Sa4YO5mIRdau7XSOADfmh3jCr0evNHdY+HNkW6xuQhgMH7D73VV6WpZOagrW0UludvMTiifiwTfA==",
-      "dev": true,
-      "requires": {
-        "@nodelib/fs.scandir": "2.1.2",
-        "fastq": "1.6.0"
-      }
-    },
-    "@nrwl/angular": {
-      "version": "8.5.2",
-      "resolved": "https://registry.npmjs.org/@nrwl/angular/-/angular-8.5.2.tgz",
-      "integrity": "sha512-wZ8zMsSjtsFMO9XzwUgCCmYwTx+gbLyCglAIFF6EFs0c2sDYsS4MDoKBbGd4K+nHBYVB0Thu7FzPnaB3jwgWNg==",
-      "requires": {
-        "@angular-devkit/schematics": "8.3.3",
-        "@nrwl/cypress": "8.5.2",
-        "@nrwl/jest": "8.5.2",
-        "@schematics/angular": "8.3.3",
-        "jasmine-marbles": "0.6.0"
-      },
-      "dependencies": {
-        "@angular-devkit/core": {
-          "version": "8.3.3",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.3.tgz",
-          "integrity": "sha512-E49GCnn06q79Xd5SC/+8CDRF1wp9wQqP6HKJVVMijoi3NOrMQTuHTesPURvve2xbkCYqQOVlMEonhOJF5vpnoQ==",
-          "requires": {
-            "ajv": "6.10.2",
-            "fast-json-stable-stringify": "2.0.0",
-            "magic-string": "0.25.3",
-            "rxjs": "6.4.0",
-            "source-map": "0.7.3"
-          }
-        },
-        "@angular-devkit/schematics": {
-          "version": "8.3.3",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.3.tgz",
-          "integrity": "sha512-t5I77YeRCWpr5PJMQn8iCu2zHqnQt7qqxt66ejmsDnFgCQDw2G1IQl48AzjegJybIoRCaWX12yUZaS5aaJm5Cg==",
-          "requires": {
-            "@angular-devkit/core": "8.3.3",
-            "rxjs": "6.4.0"
-          }
-        },
-        "@schematics/angular": {
-          "version": "8.3.3",
-          "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.3.tgz",
-          "integrity": "sha512-8dRe7mBPqesscXG56pg7bWgDz+xb8jmU/Yp6LizOL3U0EoO/QV6yuVgPkgiIMSaGQaP3PBzZ7h0xuOOogWJ6ig==",
-          "requires": {
-            "@angular-devkit/core": "8.3.3",
-            "@angular-devkit/schematics": "8.3.3"
-          }
-        },
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-          "requires": {
-            "fast-deep-equal": "2.0.1",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.4.1",
-            "uri-js": "4.2.2"
-          }
-        },
-        "rxjs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
-        }
-      }
-    },
-    "@nrwl/cli": {
-      "version": "8.5.2",
-      "resolved": "https://registry.npmjs.org/@nrwl/cli/-/cli-8.5.2.tgz",
-      "integrity": "sha512-4rEnQBnyhFWC7iKCYgdKUgZUifUSPBMwmzL2PWXvW+cuWHPDq1B40jEiBECZ2nZSxTJNYOxN6UifR3/6Mu9kaA==",
-      "dev": true,
-      "requires": {
-        "@nrwl/tao": "8.5.2",
-        "tmp": "0.0.33",
-        "yargs": "11.1.0",
-        "yargs-parser": "10.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        },
-        "cliui": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "2.1.1",
-            "strip-ansi": "4.0.0",
-            "wrap-ansi": "2.1.0"
-          }
-        },
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-          "dev": true,
-          "requires": {
-            "lru-cache": "4.1.5",
-            "shebang-command": "1.2.0",
-            "which": "1.3.1"
-          }
-        },
-        "execa": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "5.1.0",
-            "get-stream": "3.0.0",
-            "is-stream": "1.1.0",
-            "npm-run-path": "2.0.2",
-            "p-finally": "1.0.0",
-            "signal-exit": "3.0.2",
-            "strip-eof": "1.0.0"
-          }
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "2.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "dev": true,
-          "requires": {
-            "p-locate": "2.0.0",
-            "path-exists": "3.0.0"
-          }
-        },
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
-          "requires": {
-            "pseudomap": "1.0.2",
-            "yallist": "2.1.2"
-          }
-        },
-        "mem": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-          "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
-          "dev": true,
-          "requires": {
-            "mimic-fn": "1.2.0"
-          }
-        },
-        "mimic-fn": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-          "dev": true
-        },
-        "os-locale": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
-          "dev": true,
-          "requires": {
-            "execa": "0.7.0",
-            "lcid": "1.0.0",
-            "mem": "1.1.0"
-          }
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "dev": true,
-          "requires": {
-            "p-try": "1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "dev": true,
-          "requires": {
-            "p-limit": "1.3.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "3.0.0"
-          }
-        },
-        "which-module": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-          "dev": true
-        },
-        "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-          "dev": true
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-          "dev": true
-        },
-        "yargs": {
-          "version": "11.1.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
-          "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
-          "dev": true,
-          "requires": {
-            "cliui": "4.1.0",
-            "decamelize": "1.2.0",
-            "find-up": "2.1.0",
-            "get-caller-file": "1.0.3",
-            "os-locale": "2.1.0",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "2.1.1",
-            "which-module": "2.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "9.0.2"
-          },
-          "dependencies": {
-            "yargs-parser": {
-              "version": "9.0.2",
-              "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
-              "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
-              "dev": true,
-              "requires": {
-                "camelcase": "4.1.0"
-              }
-            }
-          }
-        },
-        "yargs-parser": {
-          "version": "10.0.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.0.0.tgz",
-          "integrity": "sha512-+DHejWujTVYeMHLff8U96rLc4uE4Emncoftvn5AjhB1Jw1pWxLzgBUT/WYbPrHmy6YPEBTZQx5myHhVcuuu64g==",
-          "dev": true,
-          "requires": {
-            "camelcase": "4.1.0"
-          }
-        }
-      }
-    },
-    "@nrwl/cypress": {
-      "version": "8.5.2",
-      "resolved": "https://registry.npmjs.org/@nrwl/cypress/-/cypress-8.5.2.tgz",
-      "integrity": "sha512-jU74ew/RUqpn+SJHkWPClrYHdoRIt/yl2My7hEYUbKo/t5pxuqpF16VB9EoevSfx+NGsuZ7vpp+rbt3lczVCVA==",
-      "requires": {
-        "@angular-devkit/architect": "0.803.3",
-        "@angular-devkit/core": "8.3.3",
-        "@cypress/webpack-preprocessor": "4.1.0",
-        "fork-ts-checker-webpack-plugin": "0.4.15",
-        "tree-kill": "1.2.1",
-        "ts-loader": "5.3.1",
-        "tsconfig-paths-webpack-plugin": "3.2.0",
-        "webpack-node-externals": "1.7.2"
-      },
-      "dependencies": {
-        "@angular-devkit/architect": {
-          "version": "0.803.3",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.3.tgz",
-          "integrity": "sha512-PInK3JTLZ+r/3MK52rocD0IwmxKVULnoed4XuxdklD1zh7e7Aj9WIoTGdVgzaTwdUFaeuBdAy4UqwfhHEmn5MQ==",
-          "requires": {
-            "@angular-devkit/core": "8.3.3",
-            "rxjs": "6.4.0"
-          }
-        },
-        "@angular-devkit/core": {
-          "version": "8.3.3",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.3.tgz",
-          "integrity": "sha512-E49GCnn06q79Xd5SC/+8CDRF1wp9wQqP6HKJVVMijoi3NOrMQTuHTesPURvve2xbkCYqQOVlMEonhOJF5vpnoQ==",
-          "requires": {
-            "ajv": "6.10.2",
-            "fast-json-stable-stringify": "2.0.0",
-            "magic-string": "0.25.3",
-            "rxjs": "6.4.0",
-            "source-map": "0.7.3"
-          }
-        },
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-          "requires": {
-            "fast-deep-equal": "2.0.1",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.4.1",
-            "uri-js": "4.2.2"
-          }
-        },
-        "rxjs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
-        }
-      }
-    },
-    "@nrwl/jest": {
-      "version": "8.5.2",
-      "resolved": "https://registry.npmjs.org/@nrwl/jest/-/jest-8.5.2.tgz",
-      "integrity": "sha512-jLPG8dJlEXVFLFFBORB0v2JPPW5mM4bIbWj/cWMJx5iWMI+ITJoG+5lGl8zKwCqBytuXzFDoCdfsfacLuVvp7A==",
-      "requires": {
-        "@angular-devkit/architect": "0.803.3",
-        "@angular-devkit/core": "8.3.3",
-        "@angular-devkit/schematics": "8.3.3"
-      },
-      "dependencies": {
-        "@angular-devkit/architect": {
-          "version": "0.803.3",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.3.tgz",
-          "integrity": "sha512-PInK3JTLZ+r/3MK52rocD0IwmxKVULnoed4XuxdklD1zh7e7Aj9WIoTGdVgzaTwdUFaeuBdAy4UqwfhHEmn5MQ==",
-          "requires": {
-            "@angular-devkit/core": "8.3.3",
-            "rxjs": "6.4.0"
-          }
-        },
-        "@angular-devkit/core": {
-          "version": "8.3.3",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.3.tgz",
-          "integrity": "sha512-E49GCnn06q79Xd5SC/+8CDRF1wp9wQqP6HKJVVMijoi3NOrMQTuHTesPURvve2xbkCYqQOVlMEonhOJF5vpnoQ==",
-          "requires": {
-            "ajv": "6.10.2",
-            "fast-json-stable-stringify": "2.0.0",
-            "magic-string": "0.25.3",
-            "rxjs": "6.4.0",
-            "source-map": "0.7.3"
-          }
-        },
-        "@angular-devkit/schematics": {
-          "version": "8.3.3",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.3.tgz",
-          "integrity": "sha512-t5I77YeRCWpr5PJMQn8iCu2zHqnQt7qqxt66ejmsDnFgCQDw2G1IQl48AzjegJybIoRCaWX12yUZaS5aaJm5Cg==",
-          "requires": {
-            "@angular-devkit/core": "8.3.3",
-            "rxjs": "6.4.0"
-          }
-        },
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-          "requires": {
-            "fast-deep-equal": "2.0.1",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.4.1",
-            "uri-js": "4.2.2"
-          }
-        },
-        "rxjs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
-        }
-      }
-    },
-    "@nrwl/tao": {
-      "version": "8.5.2",
-      "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-8.5.2.tgz",
-      "integrity": "sha512-nZq9k5YPO6N7uEDEt4T0f0Ai1gI5mWIUOjt5ey8oSKCaac4p8uHloGKbqEGS0zS23hBLOMPgXg+852XSfDW/pw==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/architect": "0.803.3",
-        "@angular-devkit/core": "8.3.3",
-        "@angular-devkit/schematics": "8.3.3",
-        "inquirer": "6.5.1",
-        "minimist": "1.2.0",
-        "strip-json-comments": "2.0.1"
-      },
-      "dependencies": {
-        "@angular-devkit/architect": {
-          "version": "0.803.3",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.3.tgz",
-          "integrity": "sha512-PInK3JTLZ+r/3MK52rocD0IwmxKVULnoed4XuxdklD1zh7e7Aj9WIoTGdVgzaTwdUFaeuBdAy4UqwfhHEmn5MQ==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "8.3.3",
-            "rxjs": "6.4.0"
-          }
-        },
-        "@angular-devkit/core": {
-          "version": "8.3.3",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.3.tgz",
-          "integrity": "sha512-E49GCnn06q79Xd5SC/+8CDRF1wp9wQqP6HKJVVMijoi3NOrMQTuHTesPURvve2xbkCYqQOVlMEonhOJF5vpnoQ==",
-          "dev": true,
-          "requires": {
-            "ajv": "6.10.2",
-            "fast-json-stable-stringify": "2.0.0",
-            "magic-string": "0.25.3",
-            "rxjs": "6.4.0",
-            "source-map": "0.7.3"
-          }
-        },
-        "@angular-devkit/schematics": {
-          "version": "8.3.3",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.3.tgz",
-          "integrity": "sha512-t5I77YeRCWpr5PJMQn8iCu2zHqnQt7qqxt66ejmsDnFgCQDw2G1IQl48AzjegJybIoRCaWX12yUZaS5aaJm5Cg==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "8.3.3",
-            "rxjs": "6.4.0"
-          }
-        },
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "2.0.1",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.4.1",
-            "uri-js": "4.2.2"
-          }
-        },
-        "rxjs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
-          "dev": true,
-          "requires": {
-            "tslib": "1.10.0"
-          }
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
-        }
-      }
-    },
-    "@nrwl/workspace": {
-      "version": "8.5.2",
-      "resolved": "https://registry.npmjs.org/@nrwl/workspace/-/workspace-8.5.2.tgz",
-      "integrity": "sha512-wbwqmVJKWZLsQJyLB6LK6/FVUH/lluFdqF5ULa8BupdV6jVz8htpyeiZn4uka46Y16JrzTyfEs1ihfKRa6tKIA==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/core": "8.3.3",
-        "@angular-devkit/schematics": "8.3.3",
-        "@nrwl/cli": "8.5.2",
-        "chalk": "2.4.2",
-        "cosmiconfig": "4.0.0",
-        "fs-extra": "6.0.0",
-        "graphviz": "0.0.8",
-        "ignore": "5.0.4",
-        "npm-run-all": "4.1.5",
-        "opn": "5.5.0",
-        "prettier": "1.18.2",
-        "rxjs": "6.5.3",
-        "semver": "5.4.1",
-        "strip-json-comments": "2.0.1",
-        "tmp": "0.0.33",
-        "viz.js": "1.8.2",
-        "yargs": "11.1.0",
-        "yargs-parser": "10.0.0"
-      },
-      "dependencies": {
-        "@angular-devkit/core": {
-          "version": "8.3.3",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.3.tgz",
-          "integrity": "sha512-E49GCnn06q79Xd5SC/+8CDRF1wp9wQqP6HKJVVMijoi3NOrMQTuHTesPURvve2xbkCYqQOVlMEonhOJF5vpnoQ==",
-          "dev": true,
-          "requires": {
-            "ajv": "6.10.2",
-            "fast-json-stable-stringify": "2.0.0",
-            "magic-string": "0.25.3",
-            "rxjs": "6.4.0",
-            "source-map": "0.7.3"
-          },
-          "dependencies": {
-            "rxjs": {
-              "version": "6.4.0",
-              "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-              "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
-              "dev": true,
-              "requires": {
-                "tslib": "1.10.0"
-              }
-            }
-          }
-        },
-        "@angular-devkit/schematics": {
-          "version": "8.3.3",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.3.tgz",
-          "integrity": "sha512-t5I77YeRCWpr5PJMQn8iCu2zHqnQt7qqxt66ejmsDnFgCQDw2G1IQl48AzjegJybIoRCaWX12yUZaS5aaJm5Cg==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "8.3.3",
-            "rxjs": "6.4.0"
-          },
-          "dependencies": {
-            "rxjs": {
-              "version": "6.4.0",
-              "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-              "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
-              "dev": true,
-              "requires": {
-                "tslib": "1.10.0"
-              }
-            }
-          }
-        },
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "2.0.1",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.4.1",
-            "uri-js": "4.2.2"
-          }
-        },
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        },
-        "cliui": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "2.1.1",
-            "strip-ansi": "4.0.0",
-            "wrap-ansi": "2.1.0"
-          }
-        },
-        "cosmiconfig": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
-          "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
-          "dev": true,
-          "requires": {
-            "is-directory": "0.3.1",
-            "js-yaml": "3.13.1",
-            "parse-json": "4.0.0",
-            "require-from-string": "2.0.2"
-          }
-        },
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-          "dev": true,
-          "requires": {
-            "lru-cache": "4.1.5",
-            "shebang-command": "1.2.0",
-            "which": "1.3.1"
-          }
-        },
-        "execa": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "5.1.0",
-            "get-stream": "3.0.0",
-            "is-stream": "1.1.0",
-            "npm-run-path": "2.0.2",
-            "p-finally": "1.0.0",
-            "signal-exit": "3.0.2",
-            "strip-eof": "1.0.0"
-          }
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "2.0.0"
-          }
-        },
-        "fs-extra": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.0.tgz",
-          "integrity": "sha512-lk2cUCo8QzbiEWEbt7Cw3m27WMiRG321xsssbcIpfMhpRjrlC08WBOVQqj1/nQYYNnPtyIhP1oqLO3QwT2tPCw==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "4.2.2",
-            "jsonfile": "4.0.0",
-            "universalify": "0.1.2"
-          }
-        },
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-          "dev": true
-        },
-        "ignore": {
-          "version": "5.0.4",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.0.4.tgz",
-          "integrity": "sha512-WLsTMEhsQuXpCiG173+f3aymI43SXa+fB1rSfbzyP4GkPP+ZFVuO0/3sFUGNBtifisPeDcl/uD/Y2NxZ7xFq4g==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "dev": true,
-          "requires": {
-            "p-locate": "2.0.0",
-            "path-exists": "3.0.0"
-          }
-        },
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
-          "requires": {
-            "pseudomap": "1.0.2",
-            "yallist": "2.1.2"
-          }
-        },
-        "mem": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
-          "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
-          "dev": true,
-          "requires": {
-            "mimic-fn": "1.2.0"
-          }
-        },
-        "mimic-fn": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-          "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-          "dev": true
-        },
-        "os-locale": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
-          "dev": true,
-          "requires": {
-            "execa": "0.7.0",
-            "lcid": "1.0.0",
-            "mem": "1.1.0"
-          }
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "dev": true,
-          "requires": {
-            "p-try": "1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "dev": true,
-          "requires": {
-            "p-limit": "1.3.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-          "dev": true
-        },
-        "parse-json": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-          "dev": true,
-          "requires": {
-            "error-ex": "1.3.2",
-            "json-parse-better-errors": "1.0.2"
-          }
-        },
-        "semver": {
-          "version": "5.4.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-          "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "3.0.0"
+            "ms": "^2.1.1"
           }
         },
-        "which-module": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-          "dev": true
-        },
-        "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+        "globals": {
+          "version": "11.12.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
           "dev": true
         },
-        "yallist": {
+        "ms": {
           "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
-        },
-        "yargs": {
-          "version": "11.1.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
-          "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
-          "dev": true,
-          "requires": {
-            "cliui": "4.1.0",
-            "decamelize": "1.2.0",
-            "find-up": "2.1.0",
-            "get-caller-file": "1.0.3",
-            "os-locale": "2.1.0",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "2.1.1",
-            "which-module": "2.0.0",
-            "y18n": "3.2.1",
-            "yargs-parser": "9.0.2"
-          },
-          "dependencies": {
-            "yargs-parser": {
-              "version": "9.0.2",
-              "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
-              "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
-              "dev": true,
-              "requires": {
-                "camelcase": "4.1.0"
-              }
-            }
-          }
-        },
-        "yargs-parser": {
-          "version": "10.0.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.0.0.tgz",
-          "integrity": "sha512-+DHejWujTVYeMHLff8U96rLc4uE4Emncoftvn5AjhB1Jw1pWxLzgBUT/WYbPrHmy6YPEBTZQx5myHhVcuuu64g==",
+        }
+      }
+    },
+    "@babel/types": {
+      "version": "7.6.1",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.6.1.tgz",
+      "integrity": "sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==",
+      "dev": true,
+      "requires": {
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.13",
+        "to-fast-properties": "^2.0.0"
+      },
+      "dependencies": {
+        "to-fast-properties": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+          "dev": true
+        }
+      }
+    },
+    "@ngrx/effects": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-8.3.0.tgz",
+      "integrity": "sha512-/DdBqCFpHOJZUAmIpefQ8EVwmJXXkcEdLhsV8aXncCNWkK61sy/MbZZfDAbee6Cd1is33bVXRUKD49Z+Upvw5A=="
+    },
+    "@ngrx/router-store": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-8.3.0.tgz",
+      "integrity": "sha512-wIWGW3ZyT9+lJEBXVsPx1/NLFQ8KoCbhlEmpmQHniXE3iIMnK25Or2JCNXfgrndQA9SSVlKIPP3uaDJMyoBotQ=="
+    },
+    "@ngrx/store": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-8.3.0.tgz",
+      "integrity": "sha512-QtM5T6/wTYqAlqeW60ptqqrsBwYF7jvQHsh0yE3AnwZIQvSbLFM2t5S2kN+753v4rHiXVRrA5pLaLzjGhAKcSg=="
+    },
+    "@ngrx/store-devtools": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-8.3.0.tgz",
+      "integrity": "sha512-7jsmN8wz6PMKrbqHnUulMvf8OSYUZbXXOwkcXRaGqIjlnEG9RCHQL0cXuF8zB6uX5xencdEXsRVQe3MdZXWQng=="
+    },
+    "@ngtools/webpack": {
+      "version": "8.3.7",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-8.3.7.tgz",
+      "integrity": "sha512-JPUzw08myovtT/x2dzzWVUNjFq8OHD81bvcBXdqPAQwQvHDSIdo6bKcu2qhakgagtXLJZnglKtefTJFrMG8ciw==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "8.3.7",
+        "enhanced-resolve": "4.1.0",
+        "rxjs": "6.4.0",
+        "tree-kill": "1.2.1",
+        "webpack-sources": "1.4.3"
+      },
+      "dependencies": {
+        "rxjs": {
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
+          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
           "dev": true,
           "requires": {
-            "camelcase": "4.1.0"
+            "tslib": "^1.9.0"
           }
         }
       }
     },
+    "@nodelib/fs.scandir": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.2.tgz",
+      "integrity": "sha512-wrIBsjA5pl13f0RN4Zx4FNWmU71lv03meGKnqRUoCyan17s4V3WL92f3w3AIuWbNnpcrQyFBU5qMavJoB8d27w==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.stat": "2.0.2",
+        "run-parallel": "^1.1.9"
+      }
+    },
+    "@nodelib/fs.stat": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.2.tgz",
+      "integrity": "sha512-z8+wGWV2dgUhLqrtRYa03yDx4HWMvXKi1z8g3m2JyxAx8F7xk74asqPk5LAETjqDSGLFML/6CDl0+yFunSYicw==",
+      "dev": true
+    },
+    "@nodelib/fs.walk": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.3.tgz",
+      "integrity": "sha512-l6t8xEhfK9Sa4YO5mIRdau7XSOADfmh3jCr0evNHdY+HNkW6xuQhgMH7D73VV6WpZOagrW0UludvMTiifiwTfA==",
+      "dev": true,
+      "requires": {
+        "@nodelib/fs.scandir": "2.1.2",
+        "fastq": "^1.6.0"
+      }
+    },
     "@schematics/angular": {
       "version": "8.3.7",
       "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.7.tgz",
@@ -2421,7 +1616,7 @@
           "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
           "dev": true,
           "requires": {
-            "tslib": "1.10.0"
+            "tslib": "^1.9.0"
           }
         },
         "semver": {
@@ -2443,18 +1638,18 @@
       "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-12.0.1.tgz",
       "integrity": "sha512-Dmm46eTtyKtTkku1ZIB39q/AHvUGdGIRJc7jPUucJLoSPWeD7AjvE6OFiIZYP48IkPwV0R3OI/ZmKyNA3DPkRQ==",
       "requires": {
-        "d3": "4.13.0",
-        "d3-array": "1.2.4",
-        "d3-brush": "1.1.3",
-        "d3-color": "1.4.0",
-        "d3-force": "1.2.1",
-        "d3-format": "1.4.1",
-        "d3-hierarchy": "1.1.8",
-        "d3-interpolate": "1.3.2",
-        "d3-scale": "1.0.7",
-        "d3-selection": "1.4.0",
-        "d3-shape": "1.3.5",
-        "d3-time-format": "2.1.3"
+        "d3": "^4.10.2",
+        "d3-array": "^1.2.1",
+        "d3-brush": "^1.0.4",
+        "d3-color": "^1.0.3",
+        "d3-force": "^1.1.0",
+        "d3-format": "^1.2.0",
+        "d3-hierarchy": "^1.1.5",
+        "d3-interpolate": "^1.1.5",
+        "d3-scale": "^1.0.6",
+        "d3-selection": "^1.1.0",
+        "d3-shape": "^1.2.0",
+        "d3-time-format": "^2.1.0"
       }
     },
     "@szmarczak/http-timer": {
@@ -2463,7 +1658,7 @@
       "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
       "dev": true,
       "requires": {
-        "defer-to-connect": "1.0.2"
+        "defer-to-connect": "^1.0.1"
       }
     },
     "@tootallnate/once": {
@@ -2512,9 +1707,9 @@
       "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
       "dev": true,
       "requires": {
-        "@types/events": "3.0.0",
-        "@types/minimatch": "3.0.3",
-        "@types/node": "12.7.9"
+        "@types/events": "*",
+        "@types/minimatch": "*",
+        "@types/node": "*"
       }
     },
     "@types/jasmine": {
@@ -2529,23 +1724,18 @@
       "integrity": "sha512-d9p31r7Nxk0ZH0U39PTH0hiDlJ+qNVGjlt1ucOoTUptxb2v+Y5VMnsxfwN+i3hK4yQnqBi3FMmoMFcd1JHDxdg==",
       "dev": true,
       "requires": {
-        "@types/jasmine": "3.4.2"
+        "@types/jasmine": "*"
       }
     },
-    "@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4="
-    },
     "@types/karma": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/karma/-/karma-3.0.3.tgz",
       "integrity": "sha512-mkJejrAacgignkBce2+qD9S4VncjEfAT0Dion0fRcqpav3Sd2KiLTHODZOXRP3S8b0ZY5sXr9meDB3P8MSH8Cg==",
       "dev": true,
       "requires": {
-        "@types/bluebird": "3.5.27",
-        "@types/node": "12.7.9",
-        "log4js": "3.0.6"
+        "@types/bluebird": "*",
+        "@types/node": "*",
+        "log4js": "^3.0.0"
       }
     },
     "@types/marked": {
@@ -2591,10 +1781,10 @@
       "integrity": "sha512-3Wo2jNYwqgXcIz/rrq18AdOZUQB8cQ34CXZo+LUwPJNpvRAL86+Kc2wwI8mqpz9Cr1V+enIox5v+WZhy/p3h8w==",
       "dev": true,
       "requires": {
-        "@types/caseless": "0.12.2",
-        "@types/node": "12.7.9",
-        "@types/tough-cookie": "2.3.5",
-        "form-data": "2.5.1"
+        "@types/caseless": "*",
+        "@types/node": "*",
+        "@types/tough-cookie": "*",
+        "form-data": "^2.5.0"
       },
       "dependencies": {
         "form-data": {
@@ -2603,9 +1793,9 @@
           "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==",
           "dev": true,
           "requires": {
-            "asynckit": "0.4.0",
-            "combined-stream": "1.0.8",
-            "mime-types": "2.1.24"
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.6",
+            "mime-types": "^2.1.12"
           }
         }
       }
@@ -2616,7 +1806,7 @@
       "integrity": "sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==",
       "dev": true,
       "requires": {
-        "@types/node": "12.7.9"
+        "@types/node": "*"
       }
     },
     "@types/selenium-webdriver": {
@@ -2712,7 +1902,7 @@
       "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
-        "mamacro": "0.0.3"
+        "mamacro": "^0.0.3"
       }
     },
     "@webassemblyjs/helper-wasm-bytecode": {
@@ -2739,7 +1929,7 @@
       "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
       "dev": true,
       "requires": {
-        "@xtuc/ieee754": "1.2.0"
+        "@xtuc/ieee754": "^1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
@@ -2877,7 +2067,7 @@
       "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
       "dev": true,
       "requires": {
-        "mime-types": "2.1.24",
+        "mime-types": "~2.1.24",
         "negotiator": "0.6.2"
       }
     },
@@ -2922,7 +2112,7 @@
       "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
       "dev": true,
       "requires": {
-        "es6-promisify": "5.0.0"
+        "es6-promisify": "^5.0.0"
       }
     },
     "agentkeepalive": {
@@ -2969,7 +2159,7 @@
       "resolved": "https://registry.npmjs.org/angular2-virtual-scroll/-/angular2-virtual-scroll-0.4.16.tgz",
       "integrity": "sha512-6NWk0DjCh4ebU8+LgfBoKYyp3McxDA/k5vTnEiV32VpVnyhN//eThZpVpggI1D2fJBqgTAY09C8v++qXHHLP7A==",
       "requires": {
-        "@tweenjs/tween.js": "17.4.0"
+        "@tweenjs/tween.js": "^17.1.0"
       }
     },
     "ansi-align": {
@@ -2978,7 +2168,7 @@
       "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
       "dev": true,
       "requires": {
-        "string-width": "3.1.0"
+        "string-width": "^3.0.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -3005,9 +2195,9 @@
           "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "dev": true,
           "requires": {
-            "emoji-regex": "7.0.3",
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "5.2.0"
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
           }
         },
         "strip-ansi": {
@@ -3016,7 +2206,7 @@
           "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "4.1.0"
+            "ansi-regex": "^4.1.0"
           }
         }
       }
@@ -3033,7 +2223,7 @@
       "integrity": "sha512-Cg3ymMAdN10wOk/VYfLV7KCQyv7EDirJ64500sU7n9UlmioEtDuU5Gd+hj73hXSU/ex7tHJSssmyftDdkMLO8Q==",
       "dev": true,
       "requires": {
-        "type-fest": "0.5.2"
+        "type-fest": "^0.5.2"
       }
     },
     "ansi-gray": {
@@ -3054,12 +2244,14 @@
     "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true
     },
     "ansi-styles": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
       "requires": {
         "color-convert": "^1.9.0"
       }
@@ -3074,6 +2266,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
       "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
       "requires": {
         "micromatch": "^3.1.4",
         "normalize-path": "^2.1.1"
@@ -3100,7 +2293,7 @@
       "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=",
       "dev": true,
       "requires": {
-        "default-require-extensions": "1.0.0"
+        "default-require-extensions": "^1.0.0"
       }
     },
     "aproba": {
@@ -3143,13 +2336,14 @@
       "dev": true,
       "requires": {
         "ast-types-flow": "0.0.7",
-        "commander": "2.20.0"
+        "commander": "^2.11.0"
       }
     },
     "arr-diff": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true
     },
     "arr-filter": {
       "version": "1.1.2",
@@ -3163,7 +2357,8 @@
     "arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
     },
     "arr-map": {
       "version": "2.0.2",
@@ -3177,7 +2372,8 @@
     "arr-union": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true
     },
     "array-each": {
       "version": "1.0.1",
@@ -3269,7 +2465,8 @@
     "array-unique": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "dev": true
     },
     "arraybuffer.slice": {
       "version": "0.0.7",
@@ -3295,7 +2492,7 @@
       "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
       "dev": true,
       "requires": {
-        "safer-buffer": "2.1.2"
+        "safer-buffer": "~2.1.0"
       }
     },
     "asn1.js": {
@@ -3315,7 +2512,7 @@
       "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
       "dev": true,
       "requires": {
-        "object-assign": "4.1.1",
+        "object-assign": "^4.1.1",
         "util": "0.10.3"
       },
       "dependencies": {
@@ -3345,7 +2542,8 @@
     "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true
     },
     "ast-types-flow": {
       "version": "0.0.7",
@@ -3359,7 +2557,7 @@
       "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
       "dev": true,
       "requires": {
-        "lodash": "4.17.15"
+        "lodash": "^4.17.14"
       }
     },
     "async-array-reduce": {
@@ -3374,16 +2572,17 @@
       "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
       "dev": true,
       "requires": {
-        "end-of-stream": "1.4.3",
-        "once": "1.4.0",
-        "process-nextick-args": "2.0.1",
-        "stream-exhaust": "1.0.2"
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.2",
+        "process-nextick-args": "^2.0.0",
+        "stream-exhaust": "^1.0.1"
       }
     },
     "async-each": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+      "dev": true
     },
     "async-limiter": {
       "version": "1.0.1",
@@ -3409,7 +2608,8 @@
     "atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true
     },
     "autoprefixer": {
       "version": "9.6.1",
@@ -3417,13 +2617,13 @@
       "integrity": "sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==",
       "dev": true,
       "requires": {
-        "browserslist": "4.6.6",
-        "caniuse-lite": "1.0.30000989",
-        "chalk": "2.4.2",
-        "normalize-range": "0.1.2",
-        "num2fraction": "1.2.2",
-        "postcss": "7.0.17",
-        "postcss-value-parser": "4.0.2"
+        "browserslist": "^4.6.3",
+        "caniuse-lite": "^1.0.30000980",
+        "chalk": "^2.4.2",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^7.0.17",
+        "postcss-value-parser": "^4.0.0"
       }
     },
     "aws-sign2": {
@@ -3451,6 +2651,7 @@
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
       "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "dev": true,
       "requires": {
         "chalk": "^1.1.3",
         "esutils": "^2.0.2",
@@ -3460,12 +2661,14 @@
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
         },
         "chalk": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
           "requires": {
             "ansi-styles": "^2.2.1",
             "escape-string-regexp": "^1.0.2",
@@ -3477,12 +2680,14 @@
         "js-tokens": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+          "dev": true
         },
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
         }
       }
     },
@@ -3516,37 +2721,6 @@
         }
       }
     },
-    "babel-loader": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz",
-      "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==",
-      "optional": true,
-      "requires": {
-        "find-cache-dir": "2.1.0",
-        "loader-utils": "1.2.3",
-        "mkdirp": "0.5.1",
-        "pify": "4.0.1"
-      },
-      "dependencies": {
-        "find-cache-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-          "optional": true,
-          "requires": {
-            "commondir": "1.0.1",
-            "make-dir": "2.1.0",
-            "pkg-dir": "3.0.0"
-          }
-        },
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "optional": true
-        }
-      }
-    },
     "babel-messages": {
       "version": "6.23.0",
       "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
@@ -3560,8 +2734,9 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz",
       "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==",
+      "dev": true,
       "requires": {
-        "object.assign": "4.1.0"
+        "object.assign": "^4.1.0"
       }
     },
     "babel-runtime": {
@@ -3662,12 +2837,14 @@
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
     },
     "base": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
       "requires": {
         "cache-base": "^1.0.1",
         "class-utils": "^0.3.5",
@@ -3682,6 +2859,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
           "requires": {
             "is-descriptor": "^1.0.0"
           }
@@ -3690,6 +2868,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -3698,6 +2877,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -3706,6 +2886,7 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -3744,7 +2925,7 @@
       "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
       "dev": true,
       "requires": {
-        "tweetnacl": "0.14.5"
+        "tweetnacl": "^0.14.3"
       }
     },
     "better-assert": {
@@ -3759,12 +2940,14 @@
     "big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "dev": true
     },
     "binary-extensions": {
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "dev": true
     },
     "blob": {
       "version": "0.0.5",
@@ -3800,15 +2983,15 @@
       "dev": true,
       "requires": {
         "bytes": "3.1.0",
-        "content-type": "1.0.4",
+        "content-type": "~1.0.4",
         "debug": "2.6.9",
-        "depd": "1.1.2",
+        "depd": "~1.1.2",
         "http-errors": "1.7.2",
         "iconv-lite": "0.4.24",
-        "on-finished": "2.3.0",
+        "on-finished": "~2.3.0",
         "qs": "6.7.0",
         "raw-body": "2.4.0",
-        "type-is": "1.6.18"
+        "type-is": "~1.6.17"
       },
       "dependencies": {
         "bytes": {
@@ -3845,14 +3028,14 @@
       "integrity": "sha512-cU4J/+NodM3IHdSL2yN8bqYqnmlBTidDR4RC7nJs61ZmtGz8VZzM3HLQX0zY5mrSmPtR3xWwsq2jOUQqFZN8+A==",
       "dev": true,
       "requires": {
-        "ansi-align": "3.0.0",
-        "camelcase": "5.3.1",
-        "chalk": "2.4.2",
-        "cli-boxes": "2.2.0",
-        "string-width": "3.1.0",
-        "term-size": "1.2.0",
-        "type-fest": "0.3.1",
-        "widest-line": "2.0.1"
+        "ansi-align": "^3.0.0",
+        "camelcase": "^5.3.1",
+        "chalk": "^2.4.2",
+        "cli-boxes": "^2.2.0",
+        "string-width": "^3.0.0",
+        "term-size": "^1.2.0",
+        "type-fest": "^0.3.0",
+        "widest-line": "^2.0.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -3879,9 +3062,9 @@
           "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "dev": true,
           "requires": {
-            "emoji-regex": "7.0.3",
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "5.2.0"
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
           }
         },
         "strip-ansi": {
@@ -3890,7 +3073,7 @@
           "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "4.1.0"
+            "ansi-regex": "^4.1.0"
           }
         },
         "type-fest": {
@@ -3905,6 +3088,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -3914,6 +3098,7 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
       "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
       "requires": {
         "arr-flatten": "^1.1.0",
         "array-unique": "^0.3.2",
@@ -3931,6 +3116,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -4018,10 +3204,11 @@
       "version": "4.6.6",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz",
       "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==",
+      "dev": true,
       "requires": {
-        "caniuse-lite": "1.0.30000989",
-        "electron-to-chromium": "1.3.273",
-        "node-releases": "1.1.33"
+        "caniuse-lite": "^1.0.30000984",
+        "electron-to-chromium": "^1.3.191",
+        "node-releases": "^1.1.25"
       }
     },
     "browserstack": {
@@ -4039,10 +3226,10 @@
       "integrity": "sha512-fRaynjF0MvtyyfPRy2NFnVwxLyNtD28K/v9xRsIjUVf7xLc80NIm7Nfr3KXlFmWizhG91PL/UAOXlHkoxQjaNw==",
       "dev": true,
       "requires": {
-        "https-proxy-agent": "2.2.2",
-        "is-running": "2.1.0",
-        "ps-tree": "1.1.1",
-        "temp-fs": "0.9.9"
+        "https-proxy-agent": "^2.2.1",
+        "is-running": "^2.0.0",
+        "ps-tree": "=1.1.1",
+        "temp-fs": "^0.9.9"
       }
     },
     "buffer": {
@@ -4138,21 +3325,21 @@
       "integrity": "sha512-ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg==",
       "dev": true,
       "requires": {
-        "bluebird": "3.7.0",
-        "chownr": "1.1.3",
-        "figgy-pudding": "3.5.1",
-        "glob": "7.1.4",
-        "graceful-fs": "4.2.2",
-        "infer-owner": "1.0.4",
-        "lru-cache": "5.1.1",
-        "mississippi": "3.0.0",
-        "mkdirp": "0.5.1",
-        "move-concurrently": "1.0.1",
-        "promise-inflight": "1.0.1",
-        "rimraf": "2.7.1",
-        "ssri": "6.0.1",
-        "unique-filename": "1.1.1",
-        "y18n": "4.0.0"
+        "bluebird": "^3.5.5",
+        "chownr": "^1.1.1",
+        "figgy-pudding": "^3.5.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.1.15",
+        "infer-owner": "^1.0.3",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "move-concurrently": "^1.0.1",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^2.6.3",
+        "ssri": "^6.0.1",
+        "unique-filename": "^1.1.1",
+        "y18n": "^4.0.0"
       },
       "dependencies": {
         "glob": {
@@ -4161,12 +3348,12 @@
           "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
           "dev": true,
           "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.4",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         }
       }
@@ -4175,6 +3362,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
       "requires": {
         "collection-visit": "^1.0.0",
         "component-emitter": "^1.2.1",
@@ -4193,13 +3381,13 @@
       "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
       "dev": true,
       "requires": {
-        "clone-response": "1.0.2",
-        "get-stream": "5.1.0",
-        "http-cache-semantics": "4.0.3",
-        "keyv": "3.1.0",
-        "lowercase-keys": "2.0.0",
-        "normalize-url": "4.5.0",
-        "responselike": "1.0.2"
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^3.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^4.1.0",
+        "responselike": "^1.0.2"
       },
       "dependencies": {
         "get-stream": {
@@ -4208,7 +3396,7 @@
           "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
           "dev": true,
           "requires": {
-            "pump": "3.0.0"
+            "pump": "^3.0.0"
           }
         },
         "http-cache-semantics": {
@@ -4235,8 +3423,8 @@
           "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
           "dev": true,
           "requires": {
-            "end-of-stream": "1.4.3",
-            "once": "1.4.0"
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
           }
         }
       }
@@ -4247,7 +3435,7 @@
       "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
       "dev": true,
       "requires": {
-        "callsites": "2.0.0"
+        "callsites": "^2.0.0"
       }
     },
     "caller-path": {
@@ -4256,7 +3444,7 @@
       "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
       "dev": true,
       "requires": {
-        "caller-callsite": "2.0.0"
+        "caller-callsite": "^2.0.0"
       }
     },
     "callsite": {
@@ -4280,7 +3468,8 @@
     "caniuse-lite": {
       "version": "1.0.30000989",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz",
-      "integrity": "sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw=="
+      "integrity": "sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw==",
+      "dev": true
     },
     "canonical-path": {
       "version": "1.0.0",
@@ -4298,18 +3487,20 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
       "requires": {
-        "ansi-styles": "3.2.1",
-        "escape-string-regexp": "1.0.5",
-        "supports-color": "5.5.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       },
       "dependencies": {
         "supports-color": {
           "version": "5.5.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
           "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
           "requires": {
-            "has-flag": "3.0.0"
+            "has-flag": "^3.0.0"
           }
         }
       }
@@ -4324,20 +3515,21 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz",
       "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==",
+      "dev": true,
       "requires": {
-        "anymatch": "2.0.0",
-        "async-each": "1.0.3",
-        "braces": "2.3.2",
-        "fsevents": "1.2.9",
-        "glob-parent": "3.1.0",
-        "inherits": "2.0.4",
-        "is-binary-path": "1.0.1",
-        "is-glob": "4.0.1",
-        "lodash.debounce": "4.0.8",
-        "normalize-path": "2.1.1",
-        "path-is-absolute": "1.0.1",
-        "readdirp": "2.2.1",
-        "upath": "1.2.0"
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.0",
+        "braces": "^2.3.0",
+        "fsevents": "^1.2.2",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.1",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "lodash.debounce": "^4.0.8",
+        "normalize-path": "^2.1.1",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.0.0",
+        "upath": "^1.0.5"
       }
     },
     "chownr": {
@@ -4352,7 +3544,7 @@
       "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
       "dev": true,
       "requires": {
-        "tslib": "1.10.0"
+        "tslib": "^1.9.0"
       }
     },
     "ci-info": {
@@ -4386,6 +3578,7 @@
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
         "define-property": "^0.2.5",
@@ -4397,6 +3590,7 @@
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
@@ -4432,7 +3626,7 @@
       "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
       "dev": true,
       "requires": {
-        "restore-cursor": "3.1.0"
+        "restore-cursor": "^3.1.0"
       }
     },
     "cli-width": {
@@ -4447,9 +3641,9 @@
       "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
       "dev": true,
       "requires": {
-        "string-width": "1.0.2",
-        "strip-ansi": "3.0.1",
-        "wrap-ansi": "2.1.0"
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
       }
     },
     "clone": {
@@ -4470,9 +3664,9 @@
       "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
       "dev": true,
       "requires": {
-        "is-plain-object": "2.0.4",
-        "kind-of": "6.0.2",
-        "shallow-clone": "3.0.1"
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
       }
     },
     "clone-response": {
@@ -4481,7 +3675,7 @@
       "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
       "dev": true,
       "requires": {
-        "mimic-response": "1.0.1"
+        "mimic-response": "^1.0.0"
       }
     },
     "clone-stats": {
@@ -4496,9 +3690,9 @@
       "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.4",
-        "process-nextick-args": "2.0.1",
-        "readable-stream": "2.3.6"
+        "inherits": "^2.0.1",
+        "process-nextick-args": "^2.0.0",
+        "readable-stream": "^2.3.5"
       }
     },
     "co": {
@@ -4543,15 +3737,15 @@
       "integrity": "sha512-izfUfhEOOgAizszPlEDxo71DK/C4wprZw0vkY6UWcOSTQvN1JyfXf9DXwaV7WX+/JC+hH0ShXfdtGLA9Rca7LA==",
       "dev": true,
       "requires": {
-        "app-root-path": "2.2.1",
-        "aria-query": "3.0.0",
-        "axobject-query": "2.0.2",
-        "css-selector-tokenizer": "0.7.1",
-        "cssauron": "1.4.0",
-        "damerau-levenshtein": "1.0.5",
-        "semver-dsl": "1.0.1",
-        "source-map": "0.5.7",
-        "sprintf-js": "1.1.2"
+        "app-root-path": "^2.2.1",
+        "aria-query": "^3.0.0",
+        "axobject-query": "^2.0.2",
+        "css-selector-tokenizer": "^0.7.1",
+        "cssauron": "^1.4.0",
+        "damerau-levenshtein": "^1.0.4",
+        "semver-dsl": "^1.0.1",
+        "source-map": "^0.5.7",
+        "sprintf-js": "^1.1.2"
       },
       "dependencies": {
         "source-map": {
@@ -4583,6 +3777,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
       "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "dev": true,
       "requires": {
         "map-visit": "^1.0.0",
         "object-visit": "^1.0.0"
@@ -4592,6 +3787,7 @@
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
       "requires": {
         "color-name": "1.1.3"
       }
@@ -4599,7 +3795,8 @@
     "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
     },
     "color-support": {
       "version": "1.1.3",
@@ -4619,7 +3816,7 @@
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dev": true,
       "requires": {
-        "delayed-stream": "1.0.0"
+        "delayed-stream": "~1.0.0"
       }
     },
     "commander": {
@@ -4630,7 +3827,8 @@
     "commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
     },
     "compare-versions": {
       "version": "3.5.1",
@@ -4647,7 +3845,8 @@
     "component-emitter": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true
     },
     "component-inherit": {
       "version": "0.0.3",
@@ -4661,7 +3860,7 @@
       "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==",
       "dev": true,
       "requires": {
-        "mime-db": "1.40.0"
+        "mime-db": ">= 1.40.0 < 2"
       }
     },
     "compression": {
@@ -4670,19 +3869,20 @@
       "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
       "dev": true,
       "requires": {
-        "accepts": "1.3.7",
+        "accepts": "~1.3.5",
         "bytes": "3.0.0",
-        "compressible": "2.0.17",
+        "compressible": "~2.0.16",
         "debug": "2.6.9",
-        "on-headers": "1.0.2",
+        "on-headers": "~1.0.2",
         "safe-buffer": "5.1.2",
-        "vary": "1.1.2"
+        "vary": "~1.1.2"
       }
     },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
     },
     "concat-stream": {
       "version": "1.6.2",
@@ -4702,12 +3902,12 @@
       "integrity": "sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==",
       "dev": true,
       "requires": {
-        "dot-prop": "4.2.0",
-        "graceful-fs": "4.2.2",
-        "make-dir": "1.3.0",
-        "unique-string": "1.0.0",
-        "write-file-atomic": "2.4.3",
-        "xdg-basedir": "3.0.0"
+        "dot-prop": "^4.1.0",
+        "graceful-fs": "^4.1.2",
+        "make-dir": "^1.0.0",
+        "unique-string": "^1.0.0",
+        "write-file-atomic": "^2.0.0",
+        "xdg-basedir": "^3.0.0"
       },
       "dependencies": {
         "make-dir": {
@@ -4716,7 +3916,7 @@
           "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
           "dev": true,
           "requires": {
-            "pify": "3.0.0"
+            "pify": "^3.0.0"
           }
         }
       }
@@ -4779,8 +3979,9 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
       "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+      "dev": true,
       "requires": {
-        "safe-buffer": "5.1.2"
+        "safe-buffer": "~5.1.1"
       }
     },
     "cookie": {
@@ -4812,7 +4013,8 @@
     "copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true
     },
     "copy-props": {
       "version": "2.0.4",
@@ -4830,18 +4032,18 @@
       "integrity": "sha512-YBuYGpSzoCHSSDGyHy6VJ7SHojKp6WHT4D7ItcQFNAYx2hrwkMe56e97xfVR0/ovDuMTrMffXUiltvQljtAGeg==",
       "dev": true,
       "requires": {
-        "cacache": "11.3.3",
-        "find-cache-dir": "2.1.0",
-        "glob-parent": "3.1.0",
-        "globby": "7.1.1",
-        "is-glob": "4.0.1",
-        "loader-utils": "1.2.3",
-        "minimatch": "3.0.4",
-        "normalize-path": "3.0.0",
-        "p-limit": "2.2.1",
-        "schema-utils": "1.0.0",
-        "serialize-javascript": "1.9.1",
-        "webpack-log": "2.0.0"
+        "cacache": "^11.3.3",
+        "find-cache-dir": "^2.1.0",
+        "glob-parent": "^3.1.0",
+        "globby": "^7.1.1",
+        "is-glob": "^4.0.1",
+        "loader-utils": "^1.2.3",
+        "minimatch": "^3.0.4",
+        "normalize-path": "^3.0.0",
+        "p-limit": "^2.2.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^1.7.0",
+        "webpack-log": "^2.0.0"
       },
       "dependencies": {
         "cacache": {
@@ -4850,20 +4052,20 @@
           "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==",
           "dev": true,
           "requires": {
-            "bluebird": "3.7.0",
-            "chownr": "1.1.3",
-            "figgy-pudding": "3.5.1",
-            "glob": "7.1.4",
-            "graceful-fs": "4.2.2",
-            "lru-cache": "5.1.1",
-            "mississippi": "3.0.0",
-            "mkdirp": "0.5.1",
-            "move-concurrently": "1.0.1",
-            "promise-inflight": "1.0.1",
-            "rimraf": "2.7.1",
-            "ssri": "6.0.1",
-            "unique-filename": "1.1.1",
-            "y18n": "4.0.0"
+            "bluebird": "^3.5.5",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.1.15",
+            "lru-cache": "^5.1.1",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.6.3",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
+            "y18n": "^4.0.0"
           }
         },
         "find-cache-dir": {
@@ -4872,9 +4074,9 @@
           "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
           "dev": true,
           "requires": {
-            "commondir": "1.0.1",
-            "make-dir": "2.1.0",
-            "pkg-dir": "3.0.0"
+            "commondir": "^1.0.1",
+            "make-dir": "^2.0.0",
+            "pkg-dir": "^3.0.0"
           }
         },
         "glob": {
@@ -4883,12 +4085,12 @@
           "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
           "dev": true,
           "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.4",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         },
         "globby": {
@@ -4897,12 +4099,12 @@
           "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
           "dev": true,
           "requires": {
-            "array-union": "1.0.2",
-            "dir-glob": "2.2.2",
-            "glob": "7.1.4",
-            "ignore": "3.3.10",
-            "pify": "3.0.0",
-            "slash": "1.0.0"
+            "array-union": "^1.0.1",
+            "dir-glob": "^2.0.0",
+            "glob": "^7.1.2",
+            "ignore": "^3.3.5",
+            "pify": "^3.0.0",
+            "slash": "^1.0.0"
           }
         },
         "normalize-path": {
@@ -4922,22 +4124,25 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.2.1.tgz",
       "integrity": "sha512-MwPZle5CF9dEaMYdDeWm73ao/IflDH+FjeJCWEADcEgFSE9TLimFKwJsfmkwzI8eC0Aj0mgvMDjeQjrElkz4/A==",
+      "dev": true,
       "requires": {
-        "browserslist": "4.6.6",
-        "semver": "6.3.0"
+        "browserslist": "^4.6.6",
+        "semver": "^6.3.0"
       },
       "dependencies": {
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
         }
       }
     },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
     },
     "cosmiconfig": {
       "version": "5.2.1",
@@ -4945,10 +4150,10 @@
       "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
       "dev": true,
       "requires": {
-        "import-fresh": "2.0.0",
-        "is-directory": "0.3.1",
-        "js-yaml": "3.13.1",
-        "parse-json": "4.0.0"
+        "import-fresh": "^2.0.0",
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.13.1",
+        "parse-json": "^4.0.0"
       },
       "dependencies": {
         "parse-json": {
@@ -4957,8 +4162,8 @@
           "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
           "dev": true,
           "requires": {
-            "error-ex": "1.3.2",
-            "json-parse-better-errors": "1.0.2"
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
           }
         }
       }
@@ -5006,11 +4211,11 @@
       "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
       "dev": true,
       "requires": {
-        "nice-try": "1.0.5",
-        "path-key": "2.0.1",
-        "semver": "5.6.0",
-        "shebang-command": "1.2.0",
-        "which": "1.3.1"
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
       }
     },
     "crypto-browserify": {
@@ -5061,9 +4266,9 @@
           "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
           "dev": true,
           "requires": {
-            "regenerate": "1.4.0",
-            "regjsgen": "0.2.0",
-            "regjsparser": "0.1.5"
+            "regenerate": "^1.2.1",
+            "regjsgen": "^0.2.0",
+            "regjsparser": "^0.1.4"
           }
         },
         "regjsgen": {
@@ -5078,7 +4283,7 @@
           "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
           "dev": true,
           "requires": {
-            "jsesc": "0.5.0"
+            "jsesc": "~0.5.0"
           }
         }
       }
@@ -5122,8 +4327,8 @@
       "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
       "dev": true,
       "requires": {
-        "es5-ext": "0.10.51",
-        "type": "1.2.0"
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
       }
     },
     "d3": {
@@ -5252,11 +4457,11 @@
       "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.1.3.tgz",
       "integrity": "sha512-v8bbYyCFKjyCzFk/tdWqXwDykY8YWqhXYjcYxfILIit085VZOpj4XJKOMccTsvWxgzSLMJQg5SiqHjslsipEDg==",
       "requires": {
-        "d3-dispatch": "1.0.3",
-        "d3-drag": "1.2.1",
-        "d3-interpolate": "1.3.2",
-        "d3-selection": "1.4.0",
-        "d3-transition": "1.1.1"
+        "d3-dispatch": "1",
+        "d3-drag": "1",
+        "d3-interpolate": "1",
+        "d3-selection": "1",
+        "d3-transition": "1"
       }
     },
     "d3-chord": {
@@ -5312,10 +4517,10 @@
       "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.2.1.tgz",
       "integrity": "sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==",
       "requires": {
-        "d3-collection": "1.0.4",
-        "d3-dispatch": "1.0.3",
-        "d3-quadtree": "1.0.3",
-        "d3-timer": "1.0.7"
+        "d3-collection": "1",
+        "d3-dispatch": "1",
+        "d3-quadtree": "1",
+        "d3-timer": "1"
       }
     },
     "d3-format": {
@@ -5404,7 +4609,7 @@
       "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.5.tgz",
       "integrity": "sha512-VKazVR3phgD+MUCldapHD7P9kcrvPcexeX/PkMJmkUov4JM8IxsSg1DvbYoYich9AtdTsa5nNk2++ImPiDiSxg==",
       "requires": {
-        "d3-path": "1.0.5"
+        "d3-path": "1"
       }
     },
     "d3-time": {
@@ -5486,6 +4691,7 @@
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
       "requires": {
         "ms": "2.0.0"
       }
@@ -5505,7 +4711,8 @@
     "decode-uri-component": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true
     },
     "decompress-response": {
       "version": "3.3.0",
@@ -5513,7 +4720,7 @@
       "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
       "dev": true,
       "requires": {
-        "mimic-response": "1.0.1"
+        "mimic-response": "^1.0.0"
       }
     },
     "deep-equal": {
@@ -5522,12 +4729,12 @@
       "integrity": "sha512-ZbfWJq/wN1Z273o7mUSjILYqehAktR2NVoSrOukDkU9kg2v/Uv89yU4Cvz8seJeAmtN5oqiefKq8FPuXOboqLw==",
       "dev": true,
       "requires": {
-        "is-arguments": "1.0.4",
-        "is-date-object": "1.0.1",
-        "is-regex": "1.0.4",
-        "object-is": "1.0.1",
-        "object-keys": "1.1.1",
-        "regexp.prototype.flags": "1.2.0"
+        "is-arguments": "^1.0.4",
+        "is-date-object": "^1.0.1",
+        "is-regex": "^1.0.4",
+        "object-is": "^1.0.1",
+        "object-keys": "^1.1.1",
+        "regexp.prototype.flags": "^1.2.0"
       }
     },
     "deep-extend": {
@@ -5570,8 +4777,8 @@
       "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
       "dev": true,
       "requires": {
-        "execa": "1.0.0",
-        "ip-regex": "2.1.0"
+        "execa": "^1.0.0",
+        "ip-regex": "^2.1.0"
       }
     },
     "default-require-extensions": {
@@ -5580,7 +4787,7 @@
       "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=",
       "dev": true,
       "requires": {
-        "strip-bom": "2.0.0"
+        "strip-bom": "^2.0.0"
       }
     },
     "default-resolution": {
@@ -5599,14 +4806,16 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
       "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
       "requires": {
-        "object-keys": "1.1.1"
+        "object-keys": "^1.0.12"
       }
     },
     "define-property": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
       "requires": {
         "is-descriptor": "^1.0.2",
         "isobject": "^3.0.1"
@@ -5616,6 +4825,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -5624,6 +4834,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -5632,6 +4843,7 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -5646,13 +4858,13 @@
       "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
       "dev": true,
       "requires": {
-        "@types/glob": "7.1.1",
-        "globby": "6.1.0",
-        "is-path-cwd": "2.2.0",
-        "is-path-in-cwd": "2.1.0",
-        "p-map": "2.1.0",
-        "pify": "4.0.1",
-        "rimraf": "2.7.1"
+        "@types/glob": "^7.1.1",
+        "globby": "^6.1.0",
+        "is-path-cwd": "^2.0.0",
+        "is-path-in-cwd": "^2.0.0",
+        "p-map": "^2.0.0",
+        "pify": "^4.0.1",
+        "rimraf": "^2.6.3"
       },
       "dependencies": {
         "globby": {
@@ -5661,11 +4873,11 @@
           "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
           "dev": true,
           "requires": {
-            "array-union": "1.0.2",
-            "glob": "7.1.3",
-            "object-assign": "4.1.1",
-            "pify": "2.3.0",
-            "pinkie-promise": "2.0.1"
+            "array-union": "^1.0.1",
+            "glob": "^7.0.3",
+            "object-assign": "^4.0.1",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
           },
           "dependencies": {
             "pify": {
@@ -5688,7 +4900,7 @@
           "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
           "dev": true,
           "requires": {
-            "is-path-inside": "2.1.0"
+            "is-path-inside": "^2.1.0"
           }
         },
         "is-path-inside": {
@@ -5697,7 +4909,7 @@
           "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
           "dev": true,
           "requires": {
-            "path-is-inside": "1.0.2"
+            "path-is-inside": "^1.0.2"
           }
         },
         "pify": {
@@ -5720,10 +4932,10 @@
       "integrity": "sha512-bdhJatRNYsJnOhSRx9Eej3ABBtxQQw/uz2RprpYL5R3jCC2XMYVBcQWwvQLl+iNDk4LCLEKhdIP3uZSqRWi/tw==",
       "dev": true,
       "requires": {
-        "async-each": "1.0.3",
-        "extend-shallow": "2.0.1",
-        "matched": "1.0.2",
-        "rimraf": "2.7.1"
+        "async-each": "^1.0.1",
+        "extend-shallow": "^2.0.1",
+        "matched": "^1.0.2",
+        "rimraf": "^2.6.1"
       },
       "dependencies": {
         "extend-shallow": {
@@ -5732,7 +4944,7 @@
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
-            "is-extendable": "0.1.1"
+            "is-extendable": "^0.1.0"
           }
         }
       }
@@ -5792,8 +5004,8 @@
       "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=",
       "dev": true,
       "requires": {
-        "asap": "2.0.6",
-        "wrappy": "1.0.2"
+        "asap": "^2.0.0",
+        "wrappy": "1"
       }
     },
     "di": {
@@ -5825,7 +5037,7 @@
       "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
       "dev": true,
       "requires": {
-        "path-type": "3.0.0"
+        "path-type": "^3.0.0"
       }
     },
     "dns-equal": {
@@ -5913,10 +5125,10 @@
       "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
       "dev": true,
       "requires": {
-        "end-of-stream": "1.4.3",
-        "inherits": "2.0.4",
-        "readable-stream": "2.3.6",
-        "stream-shift": "1.0.0"
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
       }
     },
     "each-props": {
@@ -5935,8 +5147,8 @@
       "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
       "dev": true,
       "requires": {
-        "jsbn": "0.1.1",
-        "safer-buffer": "2.1.2"
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
       }
     },
     "ee-first": {
@@ -5948,7 +5160,8 @@
     "electron-to-chromium": {
       "version": "1.3.273",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.273.tgz",
-      "integrity": "sha512-0kUppiHQvHEENHh+nTtvTt4eXMwcPyWmMaj73GPrSEm3ldKhmmHuOH6IjrmuW6YmyS/fpXcLvMQLNVpqRhpNWw=="
+      "integrity": "sha512-0kUppiHQvHEENHh+nTtvTt4eXMwcPyWmMaj73GPrSEm3ldKhmmHuOH6IjrmuW6YmyS/fpXcLvMQLNVpqRhpNWw==",
+      "dev": true
     },
     "elliptic": {
       "version": "6.5.1",
@@ -5956,13 +5169,13 @@
       "integrity": "sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==",
       "dev": true,
       "requires": {
-        "bn.js": "4.11.8",
-        "brorand": "1.1.0",
-        "hash.js": "1.1.7",
-        "hmac-drbg": "1.0.1",
-        "inherits": "2.0.4",
-        "minimalistic-assert": "1.0.1",
-        "minimalistic-crypto-utils": "1.0.1"
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
       }
     },
     "emoji-regex": {
@@ -5974,7 +5187,8 @@
     "emojis-list": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true
     },
     "encodeurl": {
       "version": "1.0.2",
@@ -5997,7 +5211,7 @@
       "integrity": "sha512-cbNhPFS6MlYlWTGncSiDYbdqKhwWFy7kNeb1YSOG6K65i/wPTkLVCJQj0hXA4j0m5Da+hBWnqopEnu1FFelisQ==",
       "dev": true,
       "requires": {
-        "once": "1.4.0"
+        "once": "^1.4.0"
       }
     },
     "engine.io": {
@@ -6035,9 +5249,9 @@
           "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
           "dev": true,
           "requires": {
-            "async-limiter": "1.0.1",
-            "safe-buffer": "5.1.2",
-            "ultron": "1.1.1"
+            "async-limiter": "~1.0.0",
+            "safe-buffer": "~5.1.0",
+            "ultron": "~1.1.0"
           }
         }
       }
@@ -6082,9 +5296,9 @@
           "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
           "dev": true,
           "requires": {
-            "async-limiter": "1.0.1",
-            "safe-buffer": "5.1.2",
-            "ultron": "1.1.1"
+            "async-limiter": "~1.0.0",
+            "safe-buffer": "~5.1.0",
+            "ultron": "~1.1.0"
           }
         }
       }
@@ -6106,6 +5320,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
       "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
+      "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
         "memory-fs": "^0.4.0",
@@ -6128,6 +5343,7 @@
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
       "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "dev": true,
       "requires": {
         "prr": "~1.0.1"
       }
@@ -6138,7 +5354,7 @@
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "dev": true,
       "requires": {
-        "is-arrayish": "0.2.1"
+        "is-arrayish": "^0.2.1"
       }
     },
     "error-stack-parser": {
@@ -6146,7 +5362,7 @@
       "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.4.tgz",
       "integrity": "sha512-fZ0KkoxSjLFmhW5lHbUT3tLwy3nX1qEzMYo8koY1vrsAco53CMT1djnBSeC/wUjTEZRhZl9iRw7PaMaxfJ4wzQ==",
       "requires": {
-        "stackframe": "1.1.0"
+        "stackframe": "^1.1.0"
       }
     },
     "es-abstract": {
@@ -6155,16 +5371,16 @@
       "integrity": "sha512-DgoQmbpFNOofkjJtKwr87Ma5EW4Dc8fWhD0R+ndq7Oc456ivUfGOOP6oAZTTKl5/CcNMP+EN+e3/iUzgE0veZg==",
       "dev": true,
       "requires": {
-        "es-to-primitive": "1.2.0",
-        "function-bind": "1.1.1",
-        "has": "1.0.3",
-        "has-symbols": "1.0.0",
-        "is-callable": "1.1.4",
-        "is-regex": "1.0.4",
-        "object-inspect": "1.6.0",
-        "object-keys": "1.1.1",
-        "string.prototype.trimleft": "2.1.0",
-        "string.prototype.trimright": "2.1.0"
+        "es-to-primitive": "^1.2.0",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.0",
+        "is-callable": "^1.1.4",
+        "is-regex": "^1.0.4",
+        "object-inspect": "^1.6.0",
+        "object-keys": "^1.1.1",
+        "string.prototype.trimleft": "^2.0.0",
+        "string.prototype.trimright": "^2.0.0"
       }
     },
     "es-to-primitive": {
@@ -6173,9 +5389,9 @@
       "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
       "dev": true,
       "requires": {
-        "is-callable": "1.1.4",
-        "is-date-object": "1.0.1",
-        "is-symbol": "1.0.2"
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
       }
     },
     "es5-ext": {
@@ -6184,9 +5400,9 @@
       "integrity": "sha512-oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==",
       "dev": true,
       "requires": {
-        "es6-iterator": "2.0.3",
-        "es6-symbol": "3.1.2",
-        "next-tick": "1.0.0"
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.1",
+        "next-tick": "^1.0.0"
       }
     },
     "es6-iterator": {
@@ -6248,8 +5464,8 @@
           "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
           "dev": true,
           "requires": {
-            "d": "1.0.1",
-            "es5-ext": "0.10.51"
+            "d": "1",
+            "es5-ext": "~0.10.14"
           }
         }
       }
@@ -6260,8 +5476,8 @@
       "integrity": "sha512-/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==",
       "dev": true,
       "requires": {
-        "d": "1.0.1",
-        "es5-ext": "0.10.51"
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.51"
       }
     },
     "es6-weak-map": {
@@ -6270,10 +5486,10 @@
       "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
       "dev": true,
       "requires": {
-        "d": "1.0.1",
-        "es5-ext": "0.10.51",
-        "es6-iterator": "2.0.3",
-        "es6-symbol": "3.1.2"
+        "d": "1",
+        "es5-ext": "^0.10.46",
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.1"
       }
     },
     "escape-html": {
@@ -6285,7 +5501,8 @@
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
     },
     "escodegen": {
       "version": "1.8.1",
@@ -6408,7 +5625,7 @@
           "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
           "dev": true,
           "requires": {
-            "restore-cursor": "1.0.1"
+            "restore-cursor": "^1.0.1"
           }
         },
         "figures": {
@@ -6417,8 +5634,8 @@
           "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
           "dev": true,
           "requires": {
-            "escape-string-regexp": "1.0.5",
-            "object-assign": "4.1.1"
+            "escape-string-regexp": "^1.0.5",
+            "object-assign": "^4.1.0"
           }
         },
         "inquirer": {
@@ -6427,19 +5644,19 @@
           "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
           "dev": true,
           "requires": {
-            "ansi-escapes": "1.4.0",
-            "ansi-regex": "2.1.1",
-            "chalk": "1.1.3",
-            "cli-cursor": "1.0.2",
-            "cli-width": "2.2.0",
-            "figures": "1.7.0",
-            "lodash": "4.17.15",
-            "readline2": "1.0.1",
-            "run-async": "0.1.0",
-            "rx-lite": "3.1.2",
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "through": "2.3.8"
+            "ansi-escapes": "^1.1.0",
+            "ansi-regex": "^2.0.0",
+            "chalk": "^1.0.0",
+            "cli-cursor": "^1.0.1",
+            "cli-width": "^2.0.0",
+            "figures": "^1.3.5",
+            "lodash": "^4.3.0",
+            "readline2": "^1.0.1",
+            "run-async": "^0.1.0",
+            "rx-lite": "^3.1.2",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.0",
+            "through": "^2.3.6"
           }
         },
         "onetime": {
@@ -6454,8 +5671,8 @@
           "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
           "dev": true,
           "requires": {
-            "exit-hook": "1.1.1",
-            "onetime": "1.1.0"
+            "exit-hook": "^1.0.0",
+            "onetime": "^1.0.0"
           }
         },
         "run-async": {
@@ -6464,7 +5681,7 @@
           "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
           "dev": true,
           "requires": {
-            "once": "1.4.0"
+            "once": "^1.3.0"
           }
         },
         "shelljs": {
@@ -6493,8 +5710,8 @@
       "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
       "dev": true,
       "requires": {
-        "esrecurse": "4.2.1",
-        "estraverse": "4.3.0"
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
       }
     },
     "espree": {
@@ -6545,7 +5762,8 @@
     "esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
     },
     "etag": {
       "version": "1.8.1",
@@ -6615,13 +5833,13 @@
       "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
       "dev": true,
       "requires": {
-        "cross-spawn": "6.0.5",
-        "get-stream": "4.1.0",
-        "is-stream": "1.1.0",
-        "npm-run-path": "2.0.2",
-        "p-finally": "1.0.0",
-        "signal-exit": "3.0.2",
-        "strip-eof": "1.0.0"
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
       }
     },
     "exit": {
@@ -6640,6 +5858,7 @@
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
       "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "dev": true,
       "requires": {
         "debug": "^2.3.3",
         "define-property": "^0.2.5",
@@ -6654,6 +5873,7 @@
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
@@ -6662,6 +5882,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -6674,7 +5895,7 @@
       "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "1.0.3"
+        "homedir-polyfill": "^1.0.1"
       }
     },
     "express": {
@@ -6683,36 +5904,36 @@
       "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
       "dev": true,
       "requires": {
-        "accepts": "1.3.7",
+        "accepts": "~1.3.7",
         "array-flatten": "1.1.1",
         "body-parser": "1.19.0",
         "content-disposition": "0.5.3",
-        "content-type": "1.0.4",
+        "content-type": "~1.0.4",
         "cookie": "0.4.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "1.1.2",
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "etag": "1.8.1",
-        "finalhandler": "1.1.2",
+        "depd": "~1.1.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "~1.1.2",
         "fresh": "0.5.2",
         "merge-descriptors": "1.0.1",
-        "methods": "1.1.2",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.3",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "2.0.5",
+        "proxy-addr": "~2.0.5",
         "qs": "6.7.0",
-        "range-parser": "1.2.1",
+        "range-parser": "~1.2.1",
         "safe-buffer": "5.1.2",
         "send": "0.17.1",
         "serve-static": "1.14.1",
         "setprototypeof": "1.1.1",
-        "statuses": "1.5.0",
-        "type-is": "1.6.18",
+        "statuses": "~1.5.0",
+        "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
-        "vary": "1.1.2"
+        "vary": "~1.1.2"
       },
       "dependencies": {
         "array-flatten": {
@@ -6739,6 +5960,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
       "requires": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
@@ -6748,6 +5970,7 @@
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
           "requires": {
             "is-plain-object": "^2.0.4"
           }
@@ -6760,15 +5983,16 @@
       "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
       "dev": true,
       "requires": {
-        "chardet": "0.7.0",
-        "iconv-lite": "0.4.24",
-        "tmp": "0.0.33"
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
       }
     },
     "extglob": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
       "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
       "requires": {
         "array-unique": "^0.3.2",
         "define-property": "^1.0.0",
@@ -6784,6 +6008,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
           "requires": {
             "is-descriptor": "^1.0.0"
           }
@@ -6792,6 +6017,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -6800,6 +6026,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -6808,6 +6035,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -6816,6 +6044,7 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -6845,7 +6074,8 @@
     "fast-deep-equal": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "dev": true
     },
     "fast-glob": {
       "version": "3.0.4",
@@ -6853,12 +6083,12 @@
       "integrity": "sha512-wkIbV6qg37xTJwqSsdnIphL1e+LaGz4AIQqr00mIubMaEhv1/HEmJ0uuCGZRNRUkZZmOB5mJKO0ZUTVq+SxMQg==",
       "dev": true,
       "requires": {
-        "@nodelib/fs.stat": "2.0.2",
-        "@nodelib/fs.walk": "1.2.3",
-        "glob-parent": "5.1.0",
-        "is-glob": "4.0.1",
-        "merge2": "1.3.0",
-        "micromatch": "4.0.2"
+        "@nodelib/fs.stat": "^2.0.1",
+        "@nodelib/fs.walk": "^1.2.1",
+        "glob-parent": "^5.0.0",
+        "is-glob": "^4.0.1",
+        "merge2": "^1.2.3",
+        "micromatch": "^4.0.2"
       },
       "dependencies": {
         "braces": {
@@ -6867,7 +6097,7 @@
           "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
           "dev": true,
           "requires": {
-            "fill-range": "7.0.1"
+            "fill-range": "^7.0.1"
           }
         },
         "fill-range": {
@@ -6876,7 +6106,7 @@
           "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
           "dev": true,
           "requires": {
-            "to-regex-range": "5.0.1"
+            "to-regex-range": "^5.0.1"
           }
         },
         "glob-parent": {
@@ -6885,7 +6115,7 @@
           "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
           "dev": true,
           "requires": {
-            "is-glob": "4.0.1"
+            "is-glob": "^4.0.1"
           }
         },
         "is-number": {
@@ -6900,8 +6130,8 @@
           "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
           "dev": true,
           "requires": {
-            "braces": "3.0.2",
-            "picomatch": "2.0.7"
+            "braces": "^3.0.1",
+            "picomatch": "^2.0.5"
           }
         },
         "to-regex-range": {
@@ -6910,7 +6140,7 @@
           "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
           "dev": true,
           "requires": {
-            "is-number": "7.0.0"
+            "is-number": "^7.0.0"
           }
         }
       }
@@ -6918,7 +6148,8 @@
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "dev": true
     },
     "fast-levenshtein": {
       "version": "2.0.6",
@@ -6938,7 +6169,7 @@
       "integrity": "sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA==",
       "dev": true,
       "requires": {
-        "reusify": "1.0.4"
+        "reusify": "^1.0.0"
       }
     },
     "faye-websocket": {
@@ -6962,7 +6193,7 @@
       "integrity": "sha512-HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g==",
       "dev": true,
       "requires": {
-        "escape-string-regexp": "1.0.5"
+        "escape-string-regexp": "^1.0.5"
       }
     },
     "file-entry-cache": {
@@ -6981,8 +6212,8 @@
       "integrity": "sha512-+xZnaK5R8kBJrHK0/6HRlrKNamvVS5rjyuju+rnyxRGuwUJwpAMsVzUl5dz6rK8brkzjV6JpcFNjp6NqV0g1OQ==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.2.3",
-        "schema-utils": "2.4.1"
+        "loader-utils": "^1.2.3",
+        "schema-utils": "^2.0.0"
       },
       "dependencies": {
         "ajv": {
@@ -6991,10 +6222,10 @@
           "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "2.0.1",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.4.1",
-            "uri-js": "4.2.2"
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
         "schema-utils": {
@@ -7003,8 +6234,8 @@
           "integrity": "sha512-RqYLpkPZX5Oc3fw/kHHHyP56fg5Y+XBpIpV8nCg0znIALfq3OH+Ea9Hfeac9BAMwG5IICltiZ0vxFvJQONfA5w==",
           "dev": true,
           "requires": {
-            "ajv": "6.10.2",
-            "ajv-keywords": "3.4.1"
+            "ajv": "^6.10.2",
+            "ajv-keywords": "^3.4.1"
           }
         }
       }
@@ -7023,6 +6254,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
       "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
       "requires": {
         "extend-shallow": "^2.0.1",
         "is-number": "^3.0.0",
@@ -7034,6 +6266,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -7047,12 +6280,12 @@
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.3",
-        "statuses": "1.5.0",
-        "unpipe": "1.0.0"
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
       }
     },
     "find-cache-dir": {
@@ -7061,9 +6294,9 @@
       "integrity": "sha512-t7ulV1fmbxh5G9l/492O1p5+EBbr3uwpt6odhFTMc+nWyhmbloe+ja9BZ8pIBtqFWhOmCWVjx+pTW4zDkFoclw==",
       "dev": true,
       "requires": {
-        "commondir": "1.0.1",
-        "make-dir": "3.0.0",
-        "pkg-dir": "4.2.0"
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.0",
+        "pkg-dir": "^4.1.0"
       },
       "dependencies": {
         "find-up": {
@@ -7072,8 +6305,8 @@
           "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
           "dev": true,
           "requires": {
-            "locate-path": "5.0.0",
-            "path-exists": "4.0.0"
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
           }
         },
         "locate-path": {
@@ -7082,7 +6315,7 @@
           "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
           "dev": true,
           "requires": {
-            "p-locate": "4.1.0"
+            "p-locate": "^4.1.0"
           }
         },
         "make-dir": {
@@ -7091,7 +6324,7 @@
           "integrity": "sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==",
           "dev": true,
           "requires": {
-            "semver": "6.3.0"
+            "semver": "^6.0.0"
           }
         },
         "p-locate": {
@@ -7100,7 +6333,7 @@
           "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
           "dev": true,
           "requires": {
-            "p-limit": "2.2.1"
+            "p-limit": "^2.2.0"
           }
         },
         "path-exists": {
@@ -7115,7 +6348,7 @@
           "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
           "dev": true,
           "requires": {
-            "find-up": "4.1.0"
+            "find-up": "^4.0.0"
           }
         },
         "semver": {
@@ -7136,8 +6369,9 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
       "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
       "requires": {
-        "locate-path": "3.0.0"
+        "locate-path": "^3.0.0"
       }
     },
     "findup-sync": {
@@ -7233,10 +6467,10 @@
       "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
       "dev": true,
       "requires": {
-        "circular-json": "0.3.3",
-        "graceful-fs": "4.2.2",
-        "rimraf": "2.6.3",
-        "write": "0.2.1"
+        "circular-json": "^0.3.1",
+        "graceful-fs": "^4.1.2",
+        "rimraf": "~2.6.2",
+        "write": "^0.2.1"
       },
       "dependencies": {
         "circular-json": {
@@ -7251,7 +6485,7 @@
           "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
           "dev": true,
           "requires": {
-            "glob": "7.1.3"
+            "glob": "^7.1.3"
           }
         }
       }
@@ -7268,8 +6502,8 @@
       "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.4",
-        "readable-stream": "2.3.6"
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.3.6"
       }
     },
     "follow-redirects": {
@@ -7278,7 +6512,7 @@
       "integrity": "sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==",
       "dev": true,
       "requires": {
-        "debug": "3.2.6"
+        "debug": "^3.0.0"
       },
       "dependencies": {
         "debug": {
@@ -7287,7 +6521,7 @@
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "ms": "^2.1.1"
           }
         },
         "ms": {
@@ -7301,7 +6535,8 @@
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
     },
     "for-own": {
       "version": "1.0.0",
@@ -7318,30 +6553,15 @@
       "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
       "dev": true
     },
-    "fork-ts-checker-webpack-plugin": {
-      "version": "0.4.15",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-0.4.15.tgz",
-      "integrity": "sha512-qNYuygh2GxXehBvQZ5rI5YlQFn+7ZV6kmkyD9Sgs33dWl73NZdUOB5aCp8v0EXJn176AhPrZP8YCMT3h01fs+g==",
-      "requires": {
-        "babel-code-frame": "6.26.0",
-        "chalk": "2.4.2",
-        "chokidar": "2.0.4",
-        "lodash": "4.17.15",
-        "micromatch": "3.1.10",
-        "minimatch": "3.0.4",
-        "resolve": "1.12.0",
-        "tapable": "1.1.3"
-      }
-    },
     "form-data": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
       "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
       "dev": true,
       "requires": {
-        "asynckit": "0.4.0",
-        "combined-stream": "1.0.8",
-        "mime-types": "2.1.24"
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
       }
     },
     "forwarded": {
@@ -7354,6 +6574,7 @@
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
       "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "dev": true,
       "requires": {
         "map-cache": "^0.2.2"
       }
@@ -7395,9 +6616,9 @@
       "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.2.2",
-        "jsonfile": "4.0.0",
-        "universalify": "0.1.2"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
       }
     },
     "fs-minipass": {
@@ -7406,7 +6627,7 @@
       "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
       "dev": true,
       "requires": {
-        "minipass": "2.9.0"
+        "minipass": "^2.6.0"
       }
     },
     "fs-mkdirp-stream": {
@@ -7441,52 +6662,59 @@
       "version": "1.2.9",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
       "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
+      "dev": true,
       "optional": true,
       "requires": {
-        "nan": "2.14.0",
-        "node-pre-gyp": "0.12.0"
+        "nan": "^2.12.1",
+        "node-pre-gyp": "^0.12.0"
       },
       "dependencies": {
         "abbrev": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
           "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+          "dev": true,
           "optional": true
         },
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
+          "dev": true,
           "optional": true
         },
         "aproba": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
           "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+          "dev": true,
           "optional": true
         },
         "are-we-there-yet": {
           "version": "1.1.5",
           "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
           "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+          "dev": true,
           "optional": true,
           "requires": {
-            "delegates": "1.0.0",
-            "readable-stream": "2.3.6"
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
           }
         },
         "balanced-match": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
           "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+          "dev": true,
           "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+          "dev": true,
           "optional": true,
           "requires": {
-            "balanced-match": "1.0.0",
+            "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
           }
         },
@@ -7494,203 +6722,229 @@
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
           "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
+          "dev": true,
           "optional": true
         },
         "code-point-at": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
           "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+          "dev": true,
           "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+          "dev": true,
           "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+          "dev": true,
           "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
           "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+          "dev": true,
           "optional": true
         },
         "debug": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
           "optional": true,
           "requires": {
-            "ms": "2.1.1"
+            "ms": "^2.1.1"
           }
         },
         "deep-extend": {
           "version": "0.6.0",
           "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
           "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+          "dev": true,
           "optional": true
         },
         "delegates": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
           "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+          "dev": true,
           "optional": true
         },
         "detect-libc": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
           "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+          "dev": true,
           "optional": true
         },
         "fs-minipass": {
           "version": "1.2.5",
           "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
           "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
+          "dev": true,
           "optional": true,
           "requires": {
-            "minipass": "2.3.5"
+            "minipass": "^2.2.1"
           }
         },
         "fs.realpath": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
           "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+          "dev": true,
           "optional": true
         },
         "gauge": {
           "version": "2.7.4",
           "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
           "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+          "dev": true,
           "optional": true,
           "requires": {
-            "aproba": "1.2.0",
-            "console-control-strings": "1.1.0",
-            "has-unicode": "2.0.1",
-            "object-assign": "4.1.1",
-            "signal-exit": "3.0.2",
-            "string-width": "1.0.2",
-            "strip-ansi": "3.0.1",
-            "wide-align": "1.1.3"
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
           }
         },
         "glob": {
           "version": "7.1.3",
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
           "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+          "dev": true,
           "optional": true,
           "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         },
         "has-unicode": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
           "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+          "dev": true,
           "optional": true
         },
         "iconv-lite": {
           "version": "0.4.24",
           "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
           "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+          "dev": true,
           "optional": true,
           "requires": {
-            "safer-buffer": "2.1.2"
+            "safer-buffer": ">= 2.1.2 < 3"
           }
         },
         "ignore-walk": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
           "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
+          "dev": true,
           "optional": true,
           "requires": {
-            "minimatch": "3.0.4"
+            "minimatch": "^3.0.4"
           }
         },
         "inflight": {
           "version": "1.0.6",
           "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
           "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+          "dev": true,
           "optional": true,
           "requires": {
-            "once": "1.4.0",
-            "wrappy": "1.0.2"
+            "once": "^1.3.0",
+            "wrappy": "1"
           }
         },
         "inherits": {
           "version": "2.0.3",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true,
           "optional": true
         },
         "ini": {
           "version": "1.3.5",
           "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
           "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+          "dev": true,
           "optional": true
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "dev": true,
           "optional": true,
           "requires": {
-            "number-is-nan": "1.0.1"
+            "number-is-nan": "^1.0.0"
           }
         },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true,
           "optional": true
         },
         "minimatch": {
           "version": "3.0.4",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+          "dev": true,
           "optional": true,
           "requires": {
-            "brace-expansion": "1.1.11"
+            "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
           "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "dev": true,
           "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
+          "dev": true,
           "optional": true,
           "requires": {
-            "safe-buffer": "5.1.2",
-            "yallist": "3.0.3"
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.0"
           }
         },
         "minizlib": {
           "version": "1.2.1",
           "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
           "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
+          "dev": true,
           "optional": true,
           "requires": {
-            "minipass": "2.3.5"
+            "minipass": "^2.2.1"
           }
         },
         "mkdirp": {
           "version": "0.5.1",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+          "dev": true,
           "optional": true,
           "requires": {
             "minimist": "0.0.8"
@@ -7700,146 +6954,163 @@
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
           "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true,
           "optional": true
         },
         "needle": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.0.tgz",
           "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
+          "dev": true,
           "optional": true,
           "requires": {
-            "debug": "4.1.1",
-            "iconv-lite": "0.4.24",
-            "sax": "1.2.4"
+            "debug": "^4.1.0",
+            "iconv-lite": "^0.4.4",
+            "sax": "^1.2.4"
           }
         },
         "node-pre-gyp": {
           "version": "0.12.0",
           "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz",
           "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
+          "dev": true,
           "optional": true,
           "requires": {
-            "detect-libc": "1.0.3",
-            "mkdirp": "0.5.1",
-            "needle": "2.3.0",
-            "nopt": "4.0.1",
-            "npm-packlist": "1.4.1",
-            "npmlog": "4.1.2",
-            "rc": "1.2.8",
-            "rimraf": "2.6.3",
-            "semver": "5.7.0",
-            "tar": "4.4.8"
+            "detect-libc": "^1.0.2",
+            "mkdirp": "^0.5.1",
+            "needle": "^2.2.1",
+            "nopt": "^4.0.1",
+            "npm-packlist": "^1.1.6",
+            "npmlog": "^4.0.2",
+            "rc": "^1.2.7",
+            "rimraf": "^2.6.1",
+            "semver": "^5.3.0",
+            "tar": "^4"
           }
         },
         "nopt": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
           "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+          "dev": true,
           "optional": true,
           "requires": {
-            "abbrev": "1.1.1",
-            "osenv": "0.1.5"
+            "abbrev": "1",
+            "osenv": "^0.1.4"
           }
         },
         "npm-bundled": {
           "version": "1.0.6",
           "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
           "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
+          "dev": true,
           "optional": true
         },
         "npm-packlist": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz",
           "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
+          "dev": true,
           "optional": true,
           "requires": {
-            "ignore-walk": "3.0.1",
-            "npm-bundled": "1.0.6"
+            "ignore-walk": "^3.0.1",
+            "npm-bundled": "^1.0.1"
           }
         },
         "npmlog": {
           "version": "4.1.2",
           "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
           "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+          "dev": true,
           "optional": true,
           "requires": {
-            "are-we-there-yet": "1.1.5",
-            "console-control-strings": "1.1.0",
-            "gauge": "2.7.4",
-            "set-blocking": "2.0.0"
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
           }
         },
         "number-is-nan": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
           "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+          "dev": true,
           "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+          "dev": true,
           "optional": true
         },
         "once": {
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+          "dev": true,
           "optional": true,
           "requires": {
-            "wrappy": "1.0.2"
+            "wrappy": "1"
           }
         },
         "os-homedir": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
           "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+          "dev": true,
           "optional": true
         },
         "os-tmpdir": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
           "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+          "dev": true,
           "optional": true
         },
         "osenv": {
           "version": "0.1.5",
           "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
           "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+          "dev": true,
           "optional": true,
           "requires": {
-            "os-homedir": "1.0.2",
-            "os-tmpdir": "1.0.2"
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
           }
         },
         "path-is-absolute": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
           "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+          "dev": true,
           "optional": true
         },
         "process-nextick-args": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
           "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+          "dev": true,
           "optional": true
         },
         "rc": {
           "version": "1.2.8",
           "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
           "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+          "dev": true,
           "optional": true,
           "requires": {
-            "deep-extend": "0.6.0",
-            "ini": "1.3.5",
-            "minimist": "1.2.0",
-            "strip-json-comments": "2.0.1"
+            "deep-extend": "^0.6.0",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
           },
           "dependencies": {
             "minimist": {
               "version": "1.2.0",
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
               "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+              "dev": true,
               "optional": true
             }
           }
@@ -7848,133 +7119,150 @@
           "version": "2.3.6",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "dev": true,
           "optional": true,
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.2",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
           }
         },
         "rimraf": {
           "version": "2.6.3",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
           "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+          "dev": true,
           "optional": true,
           "requires": {
-            "glob": "7.1.3"
+            "glob": "^7.1.3"
           }
         },
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
+          "dev": true,
           "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
           "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+          "dev": true,
           "optional": true
         },
         "sax": {
           "version": "1.2.4",
           "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
           "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+          "dev": true,
           "optional": true
         },
         "semver": {
           "version": "5.7.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
           "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+          "dev": true,
           "optional": true
         },
         "set-blocking": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
           "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+          "dev": true,
           "optional": true
         },
         "signal-exit": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
           "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+          "dev": true,
           "optional": true
         },
         "string-width": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "dev": true,
           "optional": true,
           "requires": {
-            "code-point-at": "1.1.0",
-            "is-fullwidth-code-point": "1.0.0",
-            "strip-ansi": "3.0.1"
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
           }
         },
         "string_decoder": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "dev": true,
           "optional": true,
           "requires": {
-            "safe-buffer": "5.1.2"
+            "safe-buffer": "~5.1.0"
           }
         },
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
+          "dev": true,
           "optional": true,
           "requires": {
-            "ansi-regex": "2.1.1"
+            "ansi-regex": "^2.0.0"
           }
         },
         "strip-json-comments": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
           "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+          "dev": true,
           "optional": true
         },
         "tar": {
           "version": "4.4.8",
           "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
           "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
+          "dev": true,
           "optional": true,
           "requires": {
-            "chownr": "1.1.1",
-            "fs-minipass": "1.2.5",
-            "minipass": "2.3.5",
-            "minizlib": "1.2.1",
-            "mkdirp": "0.5.1",
-            "safe-buffer": "5.1.2",
-            "yallist": "3.0.3"
+            "chownr": "^1.1.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.3.4",
+            "minizlib": "^1.1.1",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.2"
           }
         },
         "util-deprecate": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
           "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+          "dev": true,
           "optional": true
         },
         "wide-align": {
           "version": "1.1.3",
           "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
           "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+          "dev": true,
           "optional": true,
           "requires": {
-            "string-width": "1.0.2"
+            "string-width": "^1.0.2 || 2"
           }
         },
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
+          "dev": true,
           "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
+          "dev": true,
           "optional": true
         }
       }
@@ -7982,7 +7270,8 @@
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
     },
     "generate-function": {
       "version": "2.3.1",
@@ -7990,7 +7279,7 @@
       "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==",
       "dev": true,
       "requires": {
-        "is-property": "1.0.2"
+        "is-property": "^1.0.2"
       }
     },
     "generate-object-property": {
@@ -8020,7 +7309,7 @@
       "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
       "dev": true,
       "requires": {
-        "pump": "3.0.0"
+        "pump": "^3.0.0"
       },
       "dependencies": {
         "pump": {
@@ -8029,8 +7318,8 @@
           "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
           "dev": true,
           "requires": {
-            "end-of-stream": "1.4.3",
-            "once": "1.4.0"
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
           }
         }
       }
@@ -8038,7 +7327,8 @@
     "get-value": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true
     },
     "getpass": {
       "version": "0.1.7",
@@ -8055,18 +7345,19 @@
       "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
       "dev": true,
       "requires": {
-        "fs.realpath": "1.0.0",
-        "inflight": "1.0.6",
-        "inherits": "2.0.4",
-        "minimatch": "3.0.4",
-        "once": "1.4.0",
-        "path-is-absolute": "1.0.1"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       }
     },
     "glob-parent": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
       "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "dev": true,
       "requires": {
         "is-glob": "^3.1.0",
         "path-dirname": "^1.0.0"
@@ -8076,6 +7367,7 @@
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
           "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
           "requires": {
             "is-extglob": "^2.1.0"
           }
@@ -8129,9 +7421,9 @@
       "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
       "dev": true,
       "requires": {
-        "global-prefix": "1.0.2",
-        "is-windows": "1.0.2",
-        "resolve-dir": "1.0.1"
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
       }
     },
     "global-prefix": {
@@ -8140,11 +7432,11 @@
       "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
       "dev": true,
       "requires": {
-        "expand-tilde": "2.0.2",
-        "homedir-polyfill": "1.0.3",
-        "ini": "1.3.5",
-        "is-windows": "1.0.2",
-        "which": "1.3.1"
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
       }
     },
     "globals": {
@@ -8159,14 +7451,14 @@
       "integrity": "sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==",
       "dev": true,
       "requires": {
-        "@types/glob": "7.1.1",
-        "array-union": "2.1.0",
-        "dir-glob": "3.0.1",
-        "fast-glob": "3.0.4",
-        "glob": "7.1.3",
-        "ignore": "5.1.4",
-        "merge2": "1.3.0",
-        "slash": "3.0.0"
+        "@types/glob": "^7.1.1",
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.0.3",
+        "glob": "^7.1.3",
+        "ignore": "^5.1.1",
+        "merge2": "^1.2.3",
+        "slash": "^3.0.0"
       },
       "dependencies": {
         "array-union": {
@@ -8181,7 +7473,7 @@
           "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
           "dev": true,
           "requires": {
-            "path-type": "4.0.0"
+            "path-type": "^4.0.0"
           }
         },
         "ignore": {
@@ -8247,32 +7539,24 @@
       "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
       "dev": true,
       "requires": {
-        "@sindresorhus/is": "0.14.0",
-        "@szmarczak/http-timer": "1.1.2",
-        "cacheable-request": "6.1.0",
-        "decompress-response": "3.3.0",
-        "duplexer3": "0.1.4",
-        "get-stream": "4.1.0",
-        "lowercase-keys": "1.0.1",
-        "mimic-response": "1.0.1",
-        "p-cancelable": "1.1.0",
-        "to-readable-stream": "1.0.0",
-        "url-parse-lax": "3.0.0"
+        "@sindresorhus/is": "^0.14.0",
+        "@szmarczak/http-timer": "^1.1.2",
+        "cacheable-request": "^6.0.0",
+        "decompress-response": "^3.3.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^4.1.0",
+        "lowercase-keys": "^1.0.1",
+        "mimic-response": "^1.0.1",
+        "p-cancelable": "^1.0.0",
+        "to-readable-stream": "^1.0.0",
+        "url-parse-lax": "^3.0.0"
       }
     },
     "graceful-fs": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
-      "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="
-    },
-    "graphviz": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/graphviz/-/graphviz-0.0.8.tgz",
-      "integrity": "sha1-5ZnkBzPvgOFlO/6JpfAx7PKqSqo=",
-      "dev": true,
-      "requires": {
-        "temp": "~0.4.0"
-      }
+      "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
+      "dev": true
     },
     "gulp": {
       "version": "4.0.2",
@@ -8292,7 +7576,7 @@
           "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
           "dev": true,
           "requires": {
-            "ansi-wrap": "0.1.0"
+            "ansi-wrap": "^0.1.0"
           }
         },
         "gulp-cli": {
@@ -8329,11 +7613,11 @@
       "integrity": "sha512-oR3t8kn+ccHkSyRcBV5kBLPXrhqTh5d6wBAR7r7wqjNQNBhYvOwPedCwlAaGcNl1qSeXNDn6qOk1Qyxvx9Wrow==",
       "dev": true,
       "requires": {
-        "get-stream": "5.1.0",
-        "plugin-error": "1.0.1",
-        "through2": "3.0.1",
-        "vinyl": "2.2.0",
-        "yazl": "2.5.1"
+        "get-stream": "^5.1.0",
+        "plugin-error": "^1.0.1",
+        "through2": "^3.0.1",
+        "vinyl": "^2.1.0",
+        "yazl": "^2.5.1"
       },
       "dependencies": {
         "get-stream": {
@@ -8342,7 +7626,7 @@
           "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
           "dev": true,
           "requires": {
-            "pump": "3.0.0"
+            "pump": "^3.0.0"
           }
         },
         "pump": {
@@ -8351,8 +7635,8 @@
           "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
           "dev": true,
           "requires": {
-            "end-of-stream": "1.4.3",
-            "once": "1.4.0"
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
           }
         },
         "through2": {
@@ -8361,7 +7645,7 @@
           "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
           "dev": true,
           "requires": {
-            "readable-stream": "2.3.6"
+            "readable-stream": "2 || 3"
           }
         }
       }
@@ -8392,10 +7676,10 @@
       "integrity": "sha512-7XlnO8yBXOdi7AzowjZssQr47Ctidqm7GbgARapOaqSN9HQhlClnOkR9HieGauIT3A8MBC6u9wPCXs97PCYpWg==",
       "dev": true,
       "requires": {
-        "neo-async": "2.6.1",
-        "optimist": "0.6.1",
-        "source-map": "0.6.1",
-        "uglify-js": "3.6.0"
+        "neo-async": "^2.6.0",
+        "optimist": "^0.6.1",
+        "source-map": "^0.6.1",
+        "uglify-js": "^3.1.4"
       },
       "dependencies": {
         "source-map": {
@@ -8435,6 +7719,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
       }
@@ -8465,7 +7750,8 @@
     "has-flag": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true
     },
     "has-glob": {
       "version": "1.0.0",
@@ -8473,7 +7759,7 @@
       "integrity": "sha1-mqqe7b/7G6OZCnsAEPtnjuAIEgc=",
       "dev": true,
       "requires": {
-        "is-glob": "3.1.0"
+        "is-glob": "^3.0.0"
       },
       "dependencies": {
         "is-glob": {
@@ -8482,7 +7768,7 @@
           "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
           "dev": true,
           "requires": {
-            "is-extglob": "2.1.1"
+            "is-extglob": "^2.1.0"
           }
         }
       }
@@ -8490,12 +7776,14 @@
     "has-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
-      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
+      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
+      "dev": true
     },
     "has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
       "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
       "requires": {
         "get-value": "^2.0.6",
         "has-values": "^1.0.0",
@@ -8506,6 +7794,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
       "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
       "requires": {
         "is-number": "^3.0.0",
         "kind-of": "^4.0.0"
@@ -8515,6 +7804,7 @@
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -8564,7 +7854,7 @@
       "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
       "dev": true,
       "requires": {
-        "parse-passwd": "1.0.0"
+        "parse-passwd": "^1.0.0"
       }
     },
     "hosted-git-info": {
@@ -8609,10 +7899,10 @@
       "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
       "dev": true,
       "requires": {
-        "depd": "1.1.2",
+        "depd": "~1.1.2",
         "inherits": "2.0.3",
         "setprototypeof": "1.1.1",
-        "statuses": "1.5.0",
+        "statuses": ">= 1.5.0 < 2",
         "toidentifier": "1.0.0"
       },
       "dependencies": {
@@ -8636,9 +7926,9 @@
       "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==",
       "dev": true,
       "requires": {
-        "eventemitter3": "4.0.0",
-        "follow-redirects": "1.9.0",
-        "requires-port": "1.0.0"
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
       }
     },
     "http-proxy-agent": {
@@ -8668,10 +7958,10 @@
       "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
       "dev": true,
       "requires": {
-        "http-proxy": "1.18.0",
-        "is-glob": "4.0.1",
-        "lodash": "4.17.15",
-        "micromatch": "3.1.10"
+        "http-proxy": "^1.17.0",
+        "is-glob": "^4.0.0",
+        "lodash": "^4.17.11",
+        "micromatch": "^3.1.10"
       }
     },
     "http-signature": {
@@ -8697,8 +7987,8 @@
       "integrity": "sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==",
       "dev": true,
       "requires": {
-        "agent-base": "4.3.0",
-        "debug": "3.2.6"
+        "agent-base": "^4.3.0",
+        "debug": "^3.1.0"
       },
       "dependencies": {
         "debug": {
@@ -8707,7 +7997,7 @@
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "ms": "^2.1.1"
           }
         },
         "ms": {
@@ -8732,7 +8022,7 @@
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
       "requires": {
-        "safer-buffer": "2.1.2"
+        "safer-buffer": ">= 2.1.2 < 3"
       }
     },
     "ieee754": {
@@ -8759,7 +8049,7 @@
       "integrity": "sha512-EXyErtpHbn75ZTsOADsfx6J/FPo6/5cjev46PXrcTpd8z3BoRkXgYu9/JVqrI7tusjmwCZutGeRJeU0Wo1e4Cw==",
       "dev": true,
       "requires": {
-        "minimatch": "3.0.4"
+        "minimatch": "^3.0.4"
       }
     },
     "image-size": {
@@ -8795,8 +8085,8 @@
       "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
       "dev": true,
       "requires": {
-        "caller-path": "2.0.0",
-        "resolve-from": "3.0.0"
+        "caller-path": "^2.0.0",
+        "resolve-from": "^3.0.0"
       }
     },
     "import-from": {
@@ -8855,7 +8145,8 @@
     "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
     },
     "ini": {
       "version": "1.3.5",
@@ -8875,19 +8166,19 @@
       "integrity": "sha512-uxNHBeQhRXIoHWTSNYUFhQVrHYFThIt6IVo2fFmSe8aBwdR3/w6b58hJpiL/fMukFkvGzjg+hSxFtwvVmKZmXw==",
       "dev": true,
       "requires": {
-        "ansi-escapes": "4.2.1",
-        "chalk": "2.4.2",
-        "cli-cursor": "3.1.0",
-        "cli-width": "2.2.0",
-        "external-editor": "3.1.0",
-        "figures": "3.0.0",
-        "lodash": "4.17.15",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^2.4.2",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.15",
         "mute-stream": "0.0.8",
-        "run-async": "2.3.0",
-        "rxjs": "6.5.3",
-        "string-width": "4.1.0",
-        "strip-ansi": "5.2.0",
-        "through": "2.3.8"
+        "run-async": "^2.2.0",
+        "rxjs": "^6.4.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^5.1.0",
+        "through": "^2.3.6"
       },
       "dependencies": {
         "ansi-regex": {
@@ -8908,9 +8199,9 @@
           "integrity": "sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==",
           "dev": true,
           "requires": {
-            "emoji-regex": "8.0.0",
-            "is-fullwidth-code-point": "3.0.0",
-            "strip-ansi": "5.2.0"
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^5.2.0"
           }
         },
         "strip-ansi": {
@@ -8919,7 +8210,7 @@
           "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "4.1.0"
+            "ansi-regex": "^4.1.0"
           }
         }
       }
@@ -8930,8 +8221,8 @@
       "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
       "dev": true,
       "requires": {
-        "default-gateway": "4.2.0",
-        "ipaddr.js": "1.9.0"
+        "default-gateway": "^4.2.0",
+        "ipaddr.js": "^1.9.0"
       }
     },
     "interpret": {
@@ -8949,6 +8240,7 @@
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
       "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dev": true,
       "requires": {
         "loose-envify": "^1.0.0"
       }
@@ -8997,6 +8289,7 @@
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
       "requires": {
         "kind-of": "^3.0.2"
       },
@@ -9005,6 +8298,7 @@
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -9027,6 +8321,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
       "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
       "requires": {
         "binary-extensions": "^1.0.0"
       }
@@ -9034,7 +8329,8 @@
     "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
     },
     "is-callable": {
       "version": "1.1.4",
@@ -9048,13 +8344,14 @@
       "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
       "dev": true,
       "requires": {
-        "ci-info": "2.0.0"
+        "ci-info": "^2.0.0"
       }
     },
     "is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
       "requires": {
         "kind-of": "^3.0.2"
       },
@@ -9063,6 +8360,7 @@
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -9079,6 +8377,7 @@
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
       "requires": {
         "is-accessor-descriptor": "^0.1.6",
         "is-data-descriptor": "^0.1.4",
@@ -9088,7 +8387,8 @@
         "kind-of": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
         }
       }
     },
@@ -9101,12 +8401,14 @@
     "is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
     },
     "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "dev": true
     },
     "is-finite": {
       "version": "1.0.2",
@@ -9130,8 +8432,9 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
       "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dev": true,
       "requires": {
-        "is-extglob": "2.1.1"
+        "is-extglob": "^2.1.1"
       }
     },
     "is-installed-globally": {
@@ -9162,11 +8465,11 @@
       "integrity": "sha512-XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA==",
       "dev": true,
       "requires": {
-        "generate-function": "2.3.1",
-        "generate-object-property": "1.2.0",
-        "is-my-ip-valid": "1.0.0",
-        "jsonpointer": "4.0.1",
-        "xtend": "4.0.2"
+        "generate-function": "^2.0.0",
+        "generate-object-property": "^1.1.0",
+        "is-my-ip-valid": "^1.0.0",
+        "jsonpointer": "^4.0.0",
+        "xtend": "^4.0.0"
       }
     },
     "is-negated-glob": {
@@ -9185,6 +8488,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
       "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
       "requires": {
         "kind-of": "^3.0.2"
       },
@@ -9193,6 +8497,7 @@
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -9239,6 +8544,7 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
       "requires": {
         "isobject": "^3.0.1"
       }
@@ -9306,7 +8612,7 @@
       "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
       "dev": true,
       "requires": {
-        "has-symbols": "1.0.0"
+        "has-symbols": "^1.0.0"
       }
     },
     "is-typedarray": {
@@ -9339,7 +8645,8 @@
     "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
     },
     "is-wsl": {
       "version": "1.1.0",
@@ -9356,7 +8663,8 @@
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
     },
     "isbinaryfile": {
       "version": "3.0.3",
@@ -9376,7 +8684,8 @@
     "isobject": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true
     },
     "isstream": {
       "version": "0.1.2",
@@ -9466,17 +8775,17 @@
       "integrity": "sha512-kH5YRdqdbs5hiH4/Rr1Q0cSAGgjh3jTtg8vu9NLebBAoK3adVO4jk81J+TYOkTr2+Q4NLeb1ACvmEt65iG/Vbw==",
       "dev": true,
       "requires": {
-        "async": "2.6.3",
-        "fileset": "2.0.3",
-        "istanbul-lib-coverage": "1.2.1",
-        "istanbul-lib-hook": "1.2.2",
-        "istanbul-lib-instrument": "1.10.2",
-        "istanbul-lib-report": "1.1.5",
-        "istanbul-lib-source-maps": "1.2.6",
-        "istanbul-reports": "1.1.4",
-        "js-yaml": "3.13.1",
-        "mkdirp": "0.5.1",
-        "once": "1.4.0"
+        "async": "^2.1.4",
+        "fileset": "^2.0.2",
+        "istanbul-lib-coverage": "^1.1.2",
+        "istanbul-lib-hook": "^1.1.0",
+        "istanbul-lib-instrument": "^1.9.2",
+        "istanbul-lib-report": "^1.1.3",
+        "istanbul-lib-source-maps": "^1.2.3",
+        "istanbul-reports": "^1.1.4",
+        "js-yaml": "^3.7.0",
+        "mkdirp": "^0.5.1",
+        "once": "^1.4.0"
       }
     },
     "istanbul-instrumenter-loader": {
@@ -9538,7 +8847,7 @@
       "integrity": "sha512-/Jmq7Y1VeHnZEQ3TL10VHyb564mn6VrQXHchON9Jf/AEcmQ3ZIiyD1BVzNOKTZf/G3gE+kiGK6SmpF9y3qGPLw==",
       "dev": true,
       "requires": {
-        "append-transform": "0.4.0"
+        "append-transform": "^0.4.0"
       }
     },
     "istanbul-lib-instrument": {
@@ -9547,13 +8856,13 @@
       "integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
       "dev": true,
       "requires": {
-        "babel-generator": "6.26.1",
-        "babel-template": "6.26.0",
-        "babel-traverse": "6.26.0",
-        "babel-types": "6.26.0",
-        "babylon": "6.18.0",
-        "istanbul-lib-coverage": "1.2.1",
-        "semver": "5.6.0"
+        "babel-generator": "^6.18.0",
+        "babel-template": "^6.16.0",
+        "babel-traverse": "^6.18.0",
+        "babel-types": "^6.18.0",
+        "babylon": "^6.18.0",
+        "istanbul-lib-coverage": "^1.2.1",
+        "semver": "^5.3.0"
       }
     },
     "istanbul-lib-report": {
@@ -9562,10 +8871,10 @@
       "integrity": "sha512-UsYfRMoi6QO/doUshYNqcKJqVmFe9w51GZz8BS3WB0lYxAllQYklka2wP9+dGZeHYaWIdcXUx8JGdbqaoXRXzw==",
       "dev": true,
       "requires": {
-        "istanbul-lib-coverage": "1.2.1",
-        "mkdirp": "0.5.1",
-        "path-parse": "1.0.6",
-        "supports-color": "3.2.3"
+        "istanbul-lib-coverage": "^1.2.1",
+        "mkdirp": "^0.5.1",
+        "path-parse": "^1.0.5",
+        "supports-color": "^3.1.2"
       },
       "dependencies": {
         "has-flag": {
@@ -9580,7 +8889,7 @@
           "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
           "dev": true,
           "requires": {
-            "has-flag": "1.0.0"
+            "has-flag": "^1.0.0"
           }
         }
       }
@@ -9591,11 +8900,11 @@
       "integrity": "sha512-TtbsY5GIHgbMsMiRw35YBHGpZ1DVFEO19vxxeiDMYaeOFOCzfnYVxvl6pOUIZR4dtPhAGpSMup8OyF8ubsaqEg==",
       "dev": true,
       "requires": {
-        "debug": "3.2.6",
-        "istanbul-lib-coverage": "1.2.1",
-        "mkdirp": "0.5.1",
-        "rimraf": "2.7.1",
-        "source-map": "0.5.6"
+        "debug": "^3.1.0",
+        "istanbul-lib-coverage": "^1.2.1",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.6.1",
+        "source-map": "^0.5.3"
       },
       "dependencies": {
         "debug": {
@@ -9604,7 +8913,7 @@
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "ms": "^2.1.1"
           }
         },
         "ms": {
@@ -9621,7 +8930,7 @@
       "integrity": "sha512-DfSTVOTkuO+kRmbO8Gk650Wqm1WRGr6lrdi2EwDK1vxpS71vdlLd613EpzOKdIFioB5f/scJTjeWBnvd1FWejg==",
       "dev": true,
       "requires": {
-        "handlebars": "4.3.0"
+        "handlebars": "^4.0.3"
       }
     },
     "jasmine": {
@@ -9649,14 +8958,6 @@
       "integrity": "sha512-nCeAiw37MIMA9w9IXso7bRaLl+c/ef3wnxsoSAlYrzS+Ot0zTG6nU8G/cIfGkqpkjX2wNaIW9RFG0TwIFnG6bA==",
       "dev": true
     },
-    "jasmine-marbles": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/jasmine-marbles/-/jasmine-marbles-0.6.0.tgz",
-      "integrity": "sha512-1uzgjEesEeCb+r+v46qn5x326TiGqk5SUZa+A3O+XnMCjG/pGcUOhL9Xsg5L7gLC6RFHyWGTkB5fei4rcvIOiQ==",
-      "requires": {
-        "lodash": "4.17.15"
-      }
-    },
     "jasmine-spec-reporter": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
@@ -9678,19 +8979,21 @@
       "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
       "dev": true,
       "requires": {
-        "merge-stream": "2.0.0",
-        "supports-color": "6.1.0"
+        "merge-stream": "^2.0.0",
+        "supports-color": "^6.1.0"
       }
     },
     "js-levenshtein": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
-      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g=="
+      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
+      "dev": true
     },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
     },
     "js-yaml": {
       "version": "3.13.1",
@@ -9711,7 +9014,8 @@
     "jsesc": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
+      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+      "dev": true
     },
     "json-buffer": {
       "version": "3.0.0",
@@ -9734,7 +9038,8 @@
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
     },
     "json-stable-stringify": {
       "version": "1.0.1",
@@ -9767,6 +9072,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
       "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "dev": true,
       "requires": {
         "minimist": "^1.2.0"
       }
@@ -9777,7 +9083,7 @@
       "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.2.2"
+        "graceful-fs": "^4.1.6"
       }
     },
     "jsonify": {
@@ -9869,8 +9175,8 @@
           "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
           "dev": true,
           "requires": {
-            "normalize-path": "3.0.0",
-            "picomatch": "2.0.7"
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
           }
         },
         "binary-extensions": {
@@ -9894,14 +9200,14 @@
           "integrity": "sha512-/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w==",
           "dev": true,
           "requires": {
-            "anymatch": "3.1.1",
-            "braces": "3.0.2",
-            "fsevents": "2.1.0",
-            "glob-parent": "5.1.0",
-            "is-binary-path": "2.1.0",
-            "is-glob": "4.0.1",
-            "normalize-path": "3.0.0",
-            "readdirp": "3.1.3"
+            "anymatch": "~3.1.1",
+            "braces": "~3.0.2",
+            "fsevents": "~2.1.0",
+            "glob-parent": "~5.1.0",
+            "is-binary-path": "~2.1.0",
+            "is-glob": "~4.0.1",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.1.3"
           }
         },
         "date-format": {
@@ -9952,7 +9258,7 @@
           "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
           "dev": true,
           "requires": {
-            "is-glob": "4.0.1"
+            "is-glob": "^4.0.1"
           }
         },
         "is-binary-path": {
@@ -10007,7 +9313,7 @@
           "integrity": "sha512-ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q==",
           "dev": true,
           "requires": {
-            "picomatch": "2.0.7"
+            "picomatch": "^2.0.4"
           }
         },
         "source-map": {
@@ -10057,7 +9363,7 @@
       "integrity": "sha512-3dPs/n7vgz1rxxtynpzZTvb9y/GIaW8xjAwcIGttLbycqoFtI7yo1NGnQi6oFTherRE+GIhCAHZC4vEqWGhNvg==",
       "dev": true,
       "requires": {
-        "which": "1.3.1"
+        "which": "^1.2.1"
       }
     },
     "karma-cli": {
@@ -10066,7 +9372,7 @@
       "integrity": "sha512-1Kb28UILg1ZsfqQmeELbPzuEb5C6GZJfVIk0qOr8LNYQuYWmAaqP16WpbpKEjhejDrDYyYOwwJXSZO6u7q5Pvw==",
       "dev": true,
       "requires": {
-        "resolve": "1.12.0"
+        "resolve": "^1.3.3"
       }
     },
     "karma-coverage-istanbul-reporter": {
@@ -10075,8 +9381,8 @@
       "integrity": "sha512-UH0mXPJFJyK5uiK7EkwGtQ8f30lCBAfqRResnZ4pzLJ04SOp4SPlYkmwbbZ6iVJ6sQFVzlDUXlntBEsLRdgZpg==",
       "dev": true,
       "requires": {
-        "istanbul-api": "2.1.6",
-        "minimatch": "3.0.4"
+        "istanbul-api": "^2.1.6",
+        "minimatch": "^3.0.4"
       },
       "dependencies": {
         "append-transform": {
@@ -10085,7 +9391,7 @@
           "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==",
           "dev": true,
           "requires": {
-            "default-require-extensions": "2.0.0"
+            "default-require-extensions": "^2.0.0"
           }
         },
         "debug": {
@@ -10094,7 +9400,7 @@
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "ms": "^2.1.1"
           }
         },
         "default-require-extensions": {
@@ -10103,7 +9409,7 @@
           "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=",
           "dev": true,
           "requires": {
-            "strip-bom": "3.0.0"
+            "strip-bom": "^3.0.0"
           }
         },
         "istanbul-api": {
@@ -10112,19 +9418,19 @@
           "integrity": "sha512-x0Eicp6KsShG1k1rMgBAi/1GgY7kFGEBwQpw3PXGEmu+rBcBNhqU8g2DgY9mlepAsLPzrzrbqSgCGANnki4POA==",
           "dev": true,
           "requires": {
-            "async": "2.6.3",
-            "compare-versions": "3.5.1",
-            "fileset": "2.0.3",
-            "istanbul-lib-coverage": "2.0.5",
-            "istanbul-lib-hook": "2.0.7",
-            "istanbul-lib-instrument": "3.3.0",
-            "istanbul-lib-report": "2.0.8",
-            "istanbul-lib-source-maps": "3.0.6",
-            "istanbul-reports": "2.2.6",
-            "js-yaml": "3.13.1",
-            "make-dir": "2.1.0",
-            "minimatch": "3.0.4",
-            "once": "1.4.0"
+            "async": "^2.6.2",
+            "compare-versions": "^3.4.0",
+            "fileset": "^2.0.3",
+            "istanbul-lib-coverage": "^2.0.5",
+            "istanbul-lib-hook": "^2.0.7",
+            "istanbul-lib-instrument": "^3.3.0",
+            "istanbul-lib-report": "^2.0.8",
+            "istanbul-lib-source-maps": "^3.0.6",
+            "istanbul-reports": "^2.2.4",
+            "js-yaml": "^3.13.1",
+            "make-dir": "^2.1.0",
+            "minimatch": "^3.0.4",
+            "once": "^1.4.0"
           }
         },
         "istanbul-lib-coverage": {
@@ -10139,7 +9445,7 @@
           "integrity": "sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==",
           "dev": true,
           "requires": {
-            "append-transform": "1.0.0"
+            "append-transform": "^1.0.0"
           }
         },
         "istanbul-lib-instrument": {
@@ -10148,13 +9454,13 @@
           "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==",
           "dev": true,
           "requires": {
-            "@babel/generator": "7.6.2",
-            "@babel/parser": "7.6.2",
-            "@babel/template": "7.6.0",
-            "@babel/traverse": "7.6.2",
-            "@babel/types": "7.6.1",
-            "istanbul-lib-coverage": "2.0.5",
-            "semver": "6.3.0"
+            "@babel/generator": "^7.4.0",
+            "@babel/parser": "^7.4.3",
+            "@babel/template": "^7.4.0",
+            "@babel/traverse": "^7.4.3",
+            "@babel/types": "^7.4.0",
+            "istanbul-lib-coverage": "^2.0.5",
+            "semver": "^6.0.0"
           }
         },
         "istanbul-lib-report": {
@@ -10163,9 +9469,9 @@
           "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==",
           "dev": true,
           "requires": {
-            "istanbul-lib-coverage": "2.0.5",
-            "make-dir": "2.1.0",
-            "supports-color": "6.1.0"
+            "istanbul-lib-coverage": "^2.0.5",
+            "make-dir": "^2.1.0",
+            "supports-color": "^6.1.0"
           }
         },
         "istanbul-lib-source-maps": {
@@ -10174,11 +9480,11 @@
           "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==",
           "dev": true,
           "requires": {
-            "debug": "4.1.1",
-            "istanbul-lib-coverage": "2.0.5",
-            "make-dir": "2.1.0",
-            "rimraf": "2.7.1",
-            "source-map": "0.6.1"
+            "debug": "^4.1.1",
+            "istanbul-lib-coverage": "^2.0.5",
+            "make-dir": "^2.1.0",
+            "rimraf": "^2.6.3",
+            "source-map": "^0.6.1"
           }
         },
         "istanbul-reports": {
@@ -10187,7 +9493,7 @@
           "integrity": "sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==",
           "dev": true,
           "requires": {
-            "handlebars": "4.3.0"
+            "handlebars": "^4.1.2"
           }
         },
         "ms": {
@@ -10237,7 +9543,7 @@
       "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==",
       "dev": true,
       "requires": {
-        "source-map-support": "0.5.13"
+        "source-map-support": "^0.5.5"
       }
     },
     "karma-spec-reporter": {
@@ -10246,7 +9552,7 @@
       "integrity": "sha1-LpxyB+pyZ3EmAln4K+y1QyCeRAo=",
       "dev": true,
       "requires": {
-        "colors": "1.1.2"
+        "colors": "^1.1.2"
       }
     },
     "keyv": {
@@ -10267,7 +9573,8 @@
     "kind-of": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+      "dev": true
     },
     "klaw-sync": {
       "version": "2.1.0",
@@ -10300,7 +9607,7 @@
       "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
       "dev": true,
       "requires": {
-        "package-json": "6.5.0"
+        "package-json": "^6.3.0"
       }
     },
     "lazystream": {
@@ -10362,9 +9669,9 @@
       "integrity": "sha512-bquCU89mO/yWLaUq0Clk7qCsKhsF/TZpJUzETRvJa9KSVEL9SO3ovCvdEHISBhrC81OwC8QSVX7E0bzElZj9cg==",
       "dev": true,
       "requires": {
-        "clone": "2.1.2",
-        "loader-utils": "1.2.3",
-        "pify": "4.0.1"
+        "clone": "^2.1.1",
+        "loader-utils": "^1.1.0",
+        "pify": "^4.0.1"
       },
       "dependencies": {
         "pify": {
@@ -10418,8 +9725,8 @@
       "integrity": "sha512-7poZHRla+ae0eEButlwMrPpkXyhNVBf2EHePYWT0jyLnI6311/OXJkTI2sOIRungRpQgU2oDMpro5bSFPT5F0A==",
       "dev": true,
       "requires": {
-        "@types/webpack-sources": "0.1.5",
-        "webpack-sources": "1.4.3"
+        "@types/webpack-sources": "^0.1.5",
+        "webpack-sources": "^1.2.0"
       }
     },
     "lie": {
@@ -10484,6 +9791,7 @@
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
       "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+      "dev": true,
       "requires": {
         "big.js": "^5.2.2",
         "emojis-list": "^2.0.0",
@@ -10494,15 +9802,17 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
       "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
       "requires": {
-        "p-locate": "3.0.0",
-        "path-exists": "3.0.0"
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
       }
     },
     "lodash": {
       "version": "4.17.15",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+      "dev": true
     },
     "lodash-es": {
       "version": "4.17.15",
@@ -10524,7 +9834,8 @@
     "lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
+      "dev": true
     },
     "lodash.kebabcase": {
       "version": "4.1.1",
@@ -10572,8 +9883,9 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
       "requires": {
-        "js-tokens": "4.0.0"
+        "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
     "lowercase-keys": {
@@ -10588,30 +9900,33 @@
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
       "requires": {
-        "yallist": "3.1.1"
+        "yallist": "^3.0.2"
       }
     },
     "magic-string": {
       "version": "0.25.3",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.3.tgz",
       "integrity": "sha512-6QK0OpF/phMz0Q2AxILkX2mFhi7m+WMwTRg0LQKq/WBB0cDP4rYH3Wp4/d3OTXlrPLVJT/RFqj8tFeAR4nk8AA==",
+      "dev": true,
       "requires": {
-        "sourcemap-codec": "1.4.6"
+        "sourcemap-codec": "^1.4.4"
       }
     },
     "make-dir": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
       "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "dev": true,
       "requires": {
-        "pify": "4.0.1",
-        "semver": "5.6.0"
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
       },
       "dependencies": {
         "pify": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
         }
       }
     },
@@ -10627,17 +9942,17 @@
       "integrity": "sha512-nFr/vpL1Jc60etMVKeaLOqfGjMMb3tAHFVJWxHOFCFS04Zmd7kGlMxo0l1tzfhoQje0/UPnd0X8OeGUiXXnfPA==",
       "dev": true,
       "requires": {
-        "agentkeepalive": "3.5.2",
-        "cacache": "12.0.2",
-        "http-cache-semantics": "3.8.1",
-        "http-proxy-agent": "2.1.0",
-        "https-proxy-agent": "2.2.2",
-        "lru-cache": "5.1.1",
-        "mississippi": "3.0.0",
-        "node-fetch-npm": "2.0.2",
-        "promise-retry": "1.1.1",
-        "socks-proxy-agent": "4.0.2",
-        "ssri": "6.0.1"
+        "agentkeepalive": "^3.4.1",
+        "cacache": "^12.0.0",
+        "http-cache-semantics": "^3.8.1",
+        "http-proxy-agent": "^2.1.0",
+        "https-proxy-agent": "^2.2.1",
+        "lru-cache": "^5.1.1",
+        "mississippi": "^3.0.0",
+        "node-fetch-npm": "^2.0.2",
+        "promise-retry": "^1.1.1",
+        "socks-proxy-agent": "^4.0.0",
+        "ssri": "^6.0.0"
       }
     },
     "make-iterator": {
@@ -10667,7 +9982,8 @@
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true
     },
     "map-stream": {
       "version": "0.1.0",
@@ -10679,6 +9995,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
       "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
       "requires": {
         "object-visit": "^1.0.0"
       }
@@ -10777,12 +10094,12 @@
       "integrity": "sha512-7ivM1jFZVTOOS77QsR+TtYHH0ecdLclMkqbf5qiJdX2RorqfhsL65QHySPZgDE0ZjHoh+mQUNHTanNXIlzXd0Q==",
       "dev": true,
       "requires": {
-        "arr-union": "3.1.0",
-        "async-array-reduce": "0.2.1",
-        "glob": "7.1.3",
-        "has-glob": "1.0.0",
-        "is-valid-glob": "1.0.0",
-        "resolve-dir": "1.0.1"
+        "arr-union": "^3.1.0",
+        "async-array-reduce": "^0.2.1",
+        "glob": "^7.1.2",
+        "has-glob": "^1.0.0",
+        "is-valid-glob": "^1.0.0",
+        "resolve-dir": "^1.0.0"
       }
     },
     "md5.js": {
@@ -10808,15 +10125,16 @@
       "integrity": "sha512-qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw==",
       "dev": true,
       "requires": {
-        "map-age-cleaner": "0.1.3",
-        "mimic-fn": "2.1.0",
-        "p-is-promise": "2.1.0"
+        "map-age-cleaner": "^0.1.3",
+        "mimic-fn": "^2.1.0",
+        "p-is-promise": "^2.1.0"
       }
     },
     "memory-fs": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
       "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
       "requires": {
         "errno": "^0.1.3",
         "readable-stream": "^2.0.1"
@@ -10862,6 +10180,7 @@
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
       "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
       "requires": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
@@ -10927,10 +10246,10 @@
       "integrity": "sha512-MNpRGbNA52q6U92i0qbVpQNsgk7LExy41MdAlG84FeytfDOtRIf/mCHdEgG8rpTKOaNKiqUnZdlptF469hxqOw==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.2.3",
+        "loader-utils": "^1.1.0",
         "normalize-url": "1.9.1",
-        "schema-utils": "1.0.0",
-        "webpack-sources": "1.4.3"
+        "schema-utils": "^1.0.0",
+        "webpack-sources": "^1.1.0"
       }
     },
     "minimalistic-assert": {
@@ -10949,6 +10268,7 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -10956,7 +10276,8 @@
     "minimist": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "dev": true
     },
     "minipass": {
       "version": "2.9.0",
@@ -10964,8 +10285,8 @@
       "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
       "dev": true,
       "requires": {
-        "safe-buffer": "5.1.2",
-        "yallist": "3.1.1"
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.0"
       }
     },
     "minizlib": {
@@ -10974,7 +10295,7 @@
       "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
       "dev": true,
       "requires": {
-        "minipass": "2.9.0"
+        "minipass": "^2.9.0"
       }
     },
     "mississippi": {
@@ -10983,16 +10304,16 @@
       "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
       "dev": true,
       "requires": {
-        "concat-stream": "1.6.2",
-        "duplexify": "3.7.1",
-        "end-of-stream": "1.4.3",
-        "flush-write-stream": "1.1.1",
-        "from2": "2.3.0",
-        "parallel-transform": "1.2.0",
-        "pump": "3.0.0",
-        "pumpify": "1.5.1",
-        "stream-each": "1.2.3",
-        "through2": "2.0.5"
+        "concat-stream": "^1.5.0",
+        "duplexify": "^3.4.2",
+        "end-of-stream": "^1.1.0",
+        "flush-write-stream": "^1.0.0",
+        "from2": "^2.1.0",
+        "parallel-transform": "^1.1.0",
+        "pump": "^3.0.0",
+        "pumpify": "^1.3.3",
+        "stream-each": "^1.1.0",
+        "through2": "^2.0.0"
       },
       "dependencies": {
         "pump": {
@@ -11001,8 +10322,8 @@
           "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
           "dev": true,
           "requires": {
-            "end-of-stream": "1.4.3",
-            "once": "1.4.0"
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
           }
         }
       }
@@ -11011,6 +10332,7 @@
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
       "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
       "requires": {
         "for-in": "^1.0.2",
         "is-extendable": "^1.0.1"
@@ -11020,6 +10342,7 @@
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
           "requires": {
             "is-plain-object": "^2.0.4"
           }
@@ -11030,6 +10353,7 @@
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
       "requires": {
         "minimist": "0.0.8"
       },
@@ -11037,7 +10361,8 @@
         "minimist": {
           "version": "0.0.8",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "dev": true
         }
       }
     },
@@ -11057,7 +10382,7 @@
       "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.26.tgz",
       "integrity": "sha512-sFP4cgEKTCymBBKgoxZjYzlSovC20Y6J7y3nanDc5RoBIXKlZhoYwBoZGe3flwU6A372AcRwScH8KiwV6zjy1g==",
       "requires": {
-        "moment": "2.24.0"
+        "moment": ">= 2.9.0"
       }
     },
     "move-concurrently": {
@@ -11077,7 +10402,8 @@
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
     },
     "multicast-dns": {
       "version": "6.2.3",
@@ -11111,24 +10437,26 @@
       "version": "2.14.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
       "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+      "dev": true,
       "optional": true
     },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
       "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
       "requires": {
-        "arr-diff": "4.0.0",
-        "array-unique": "0.3.2",
-        "define-property": "2.0.2",
-        "extend-shallow": "3.0.2",
-        "fragment-cache": "0.2.1",
-        "is-windows": "1.0.2",
-        "kind-of": "6.0.2",
-        "object.pick": "1.3.0",
-        "regex-not": "1.0.2",
-        "snapdragon": "0.8.2",
-        "to-regex": "3.0.2"
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       }
     },
     "negotiator": {
@@ -11155,33 +10483,33 @@
       "integrity": "sha512-GT6QK5WAirQwALdeJPiXdgRd5PzRqcknb/C/G+cCDEbUFri4oGVmns2Nl4I0FGg/cRn6nXTxRiUunOSqZ3Lehw==",
       "dev": true,
       "requires": {
-        "ajv": "6.10.2",
-        "autoprefixer": "9.6.1",
-        "browserslist": "4.6.6",
-        "chalk": "2.4.2",
-        "chokidar": "3.2.1",
-        "clean-css": "4.2.1",
-        "commander": "3.0.2",
-        "fs-extra": "8.1.0",
-        "glob": "7.1.3",
-        "injection-js": "2.2.2",
-        "less": "3.9.0",
-        "less-plugin-npm-import": "2.1.0",
-        "node-sass-tilde-importer": "1.0.2",
-        "postcss": "7.0.17",
-        "postcss-url": "8.0.0",
-        "read-pkg-up": "5.0.0",
-        "rimraf": "3.0.0",
-        "rollup": "1.22.0",
-        "rollup-plugin-commonjs": "10.1.0",
-        "rollup-plugin-json": "4.0.0",
-        "rollup-plugin-node-resolve": "5.2.0",
-        "rollup-plugin-sourcemaps": "0.4.2",
-        "rxjs": "6.5.3",
-        "sass": "1.22.9",
-        "stylus": "0.54.5",
-        "terser": "4.1.4",
-        "update-notifier": "3.0.1"
+        "ajv": "^6.10.2",
+        "autoprefixer": "^9.6.0",
+        "browserslist": "^4.0.0",
+        "chalk": "^2.3.1",
+        "chokidar": "^3.0.0",
+        "clean-css": "^4.1.11",
+        "commander": "^3.0.0",
+        "fs-extra": "^8.0.0",
+        "glob": "^7.1.2",
+        "injection-js": "^2.2.1",
+        "less": "^3.8.0",
+        "less-plugin-npm-import": "^2.1.0",
+        "node-sass-tilde-importer": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-url": "^8.0.0",
+        "read-pkg-up": "^5.0.0",
+        "rimraf": "^3.0.0",
+        "rollup": "^1.12.1",
+        "rollup-plugin-commonjs": "^10.0.0",
+        "rollup-plugin-json": "^4.0.0",
+        "rollup-plugin-node-resolve": "^5.0.0",
+        "rollup-plugin-sourcemaps": "^0.4.2",
+        "rxjs": "^6.0.0",
+        "sass": "^1.17.3",
+        "stylus": "^0.54.5",
+        "terser": "^4.1.2",
+        "update-notifier": "^3.0.0"
       },
       "dependencies": {
         "ajv": {
@@ -11190,10 +10518,10 @@
           "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "2.0.1",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.4.1",
-            "uri-js": "4.2.2"
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
         "anymatch": {
@@ -11202,8 +10530,8 @@
           "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
           "dev": true,
           "requires": {
-            "normalize-path": "3.0.0",
-            "picomatch": "2.0.7"
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
           }
         },
         "binary-extensions": {
@@ -11218,7 +10546,7 @@
           "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
           "dev": true,
           "requires": {
-            "fill-range": "7.0.1"
+            "fill-range": "^7.0.1"
           }
         },
         "chokidar": {
@@ -11227,14 +10555,14 @@
           "integrity": "sha512-/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w==",
           "dev": true,
           "requires": {
-            "anymatch": "3.1.1",
-            "braces": "3.0.2",
-            "fsevents": "2.1.0",
-            "glob-parent": "5.1.0",
-            "is-binary-path": "2.1.0",
-            "is-glob": "4.0.1",
-            "normalize-path": "3.0.0",
-            "readdirp": "3.1.3"
+            "anymatch": "~3.1.1",
+            "braces": "~3.0.2",
+            "fsevents": "~2.1.0",
+            "glob-parent": "~5.1.0",
+            "is-binary-path": "~2.1.0",
+            "is-glob": "~4.0.1",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.1.3"
           }
         },
         "commander": {
@@ -11249,7 +10577,7 @@
           "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
           "dev": true,
           "requires": {
-            "to-regex-range": "5.0.1"
+            "to-regex-range": "^5.0.1"
           }
         },
         "fsevents": {
@@ -11265,7 +10593,7 @@
           "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
           "dev": true,
           "requires": {
-            "is-glob": "4.0.1"
+            "is-glob": "^4.0.1"
           }
         },
         "is-binary-path": {
@@ -11274,7 +10602,7 @@
           "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
           "dev": true,
           "requires": {
-            "binary-extensions": "2.0.0"
+            "binary-extensions": "^2.0.0"
           }
         },
         "is-number": {
@@ -11295,10 +10623,10 @@
           "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "7.5.5",
-            "error-ex": "1.3.2",
-            "json-parse-better-errors": "1.0.2",
-            "lines-and-columns": "1.1.6"
+            "@babel/code-frame": "^7.0.0",
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1",
+            "lines-and-columns": "^1.1.6"
           }
         },
         "read-pkg": {
@@ -11307,10 +10635,10 @@
           "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
           "dev": true,
           "requires": {
-            "@types/normalize-package-data": "2.4.0",
-            "normalize-package-data": "2.5.0",
-            "parse-json": "5.0.0",
-            "type-fest": "0.6.0"
+            "@types/normalize-package-data": "^2.4.0",
+            "normalize-package-data": "^2.5.0",
+            "parse-json": "^5.0.0",
+            "type-fest": "^0.6.0"
           }
         },
         "read-pkg-up": {
@@ -11319,8 +10647,8 @@
           "integrity": "sha512-XBQjqOBtTzyol2CpsQOw8LHV0XbDZVG7xMMjmXAJomlVY03WOBRmYgDJETlvcg0H63AJvPRwT7GFi5rvOzUOKg==",
           "dev": true,
           "requires": {
-            "find-up": "3.0.0",
-            "read-pkg": "5.2.0"
+            "find-up": "^3.0.0",
+            "read-pkg": "^5.0.0"
           }
         },
         "readdirp": {
@@ -11329,7 +10657,7 @@
           "integrity": "sha512-ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q==",
           "dev": true,
           "requires": {
-            "picomatch": "2.0.7"
+            "picomatch": "^2.0.4"
           }
         },
         "rimraf": {
@@ -11338,7 +10666,7 @@
           "integrity": "sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==",
           "dev": true,
           "requires": {
-            "glob": "7.1.3"
+            "glob": "^7.1.3"
           }
         },
         "to-regex-range": {
@@ -11347,7 +10675,7 @@
           "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
           "dev": true,
           "requires": {
-            "is-number": "7.0.0"
+            "is-number": "^7.0.0"
           }
         },
         "type-fest": {
@@ -11363,7 +10691,7 @@
       "resolved": "https://registry.npmjs.org/ngrx-store-localstorage/-/ngrx-store-localstorage-8.0.0.tgz",
       "integrity": "sha512-3AHqw1AeXDXU/Hgxlh5fjP/srgGuP8BJR2uQ6ViGLeKwMEQDZuQfwd8zu9+bPZcvIxbAcxjWoGCVJXYEkBlxmg==",
       "requires": {
-        "deepmerge": "3.3.0"
+        "deepmerge": "^3.2.0"
       }
     },
     "ngx-moment": {
@@ -11371,7 +10699,7 @@
       "resolved": "https://registry.npmjs.org/ngx-moment/-/ngx-moment-3.4.0.tgz",
       "integrity": "sha512-GEqzSsu12VsXXP35aerlQpuZ1ienEYQZxHmp+RH7EuJD7hWamKgLOpmbiDI9Ij3KLW/UApvonYzZvyRSv3ea/w==",
       "requires": {
-        "tslib": "1.10.0"
+        "tslib": "^1.9.0"
       }
     },
     "nice-try": {
@@ -11409,29 +10737,29 @@
       "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
       "dev": true,
       "requires": {
-        "assert": "1.5.0",
-        "browserify-zlib": "0.2.0",
-        "buffer": "4.9.1",
-        "console-browserify": "1.1.0",
-        "constants-browserify": "1.0.0",
-        "crypto-browserify": "3.12.0",
-        "domain-browser": "1.2.0",
-        "events": "3.0.0",
-        "https-browserify": "1.0.0",
-        "os-browserify": "0.3.0",
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
         "path-browserify": "0.0.1",
-        "process": "0.11.10",
-        "punycode": "1.4.1",
-        "querystring-es3": "0.2.1",
-        "readable-stream": "2.3.6",
-        "stream-browserify": "2.0.2",
-        "stream-http": "2.8.3",
-        "string_decoder": "1.1.1",
-        "timers-browserify": "2.0.11",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
         "tty-browserify": "0.0.0",
-        "url": "0.11.0",
-        "util": "0.11.1",
-        "vm-browserify": "1.1.0"
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "^1.0.1"
       },
       "dependencies": {
         "punycode": {
@@ -11446,8 +10774,9 @@
       "version": "1.1.33",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.33.tgz",
       "integrity": "sha512-I0V30bWQEoHb+10W8oedVoUrdjW5wIkYm0w7vvcrPO95pZY738m1k77GF5sO0vKg5eXYg9oGtrMAETbgZGm11A==",
+      "dev": true,
       "requires": {
-        "semver": "5.6.0"
+        "semver": "^5.3.0"
       }
     },
     "node-sass-tilde-importer": {
@@ -11474,16 +10803,17 @@
       "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
       "dev": true,
       "requires": {
-        "hosted-git-info": "2.8.4",
-        "resolve": "1.12.0",
-        "semver": "5.6.0",
-        "validate-npm-package-license": "3.0.4"
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
       }
     },
     "normalize-path": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
       "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
       "requires": {
         "remove-trailing-separator": "^1.0.1"
       }
@@ -11500,10 +10830,10 @@
       "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
       "dev": true,
       "requires": {
-        "object-assign": "4.1.1",
-        "prepend-http": "1.0.4",
-        "query-string": "4.3.4",
-        "sort-keys": "1.1.2"
+        "object-assign": "^4.0.1",
+        "prepend-http": "^1.0.0",
+        "query-string": "^4.1.0",
+        "sort-keys": "^1.0.0"
       }
     },
     "normalizr": {
@@ -11544,8 +10874,8 @@
       "integrity": "sha512-zTLo8UcVYtDU3gdeaFu2Xu0n0EvelfHDGuqtNIn5RO7yQj4H1TqNdBc/yZjxnWA0PVB8D3Woyp0i5B43JwQ6Vw==",
       "dev": true,
       "requires": {
-        "ignore-walk": "3.0.2",
-        "npm-bundled": "1.0.6"
+        "ignore-walk": "^3.0.1",
+        "npm-bundled": "^1.0.1"
       }
     },
     "npm-pick-manifest": {
@@ -11554,9 +10884,9 @@
       "integrity": "sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==",
       "dev": true,
       "requires": {
-        "figgy-pudding": "3.5.1",
-        "npm-package-arg": "6.1.0",
-        "semver": "5.6.0"
+        "figgy-pudding": "^3.5.1",
+        "npm-package-arg": "^6.0.0",
+        "semver": "^5.4.1"
       }
     },
     "npm-registry-fetch": {
@@ -11565,13 +10895,13 @@
       "integrity": "sha512-1ZQ+yjnxc698R5h9Yje9CASapzAZr7aYDkJDdERg9xg2hOEY0vRJwskOaJAXq8N/eLavzvW4g564YAfq6zMn/A==",
       "dev": true,
       "requires": {
-        "JSONStream": "1.3.5",
-        "bluebird": "3.7.0",
-        "figgy-pudding": "3.5.1",
-        "lru-cache": "5.1.1",
-        "make-fetch-happen": "5.0.0",
-        "npm-package-arg": "6.1.0",
-        "safe-buffer": "5.2.0"
+        "JSONStream": "^1.3.4",
+        "bluebird": "^3.5.1",
+        "figgy-pudding": "^3.4.1",
+        "lru-cache": "^5.1.1",
+        "make-fetch-happen": "^5.0.0",
+        "npm-package-arg": "^6.1.0",
+        "safe-buffer": "^5.2.0"
       },
       "dependencies": {
         "safe-buffer": {
@@ -11696,6 +11026,7 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
       "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
       "requires": {
         "copy-descriptor": "^0.1.0",
         "define-property": "^0.2.5",
@@ -11706,6 +11037,7 @@
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
@@ -11714,6 +11046,7 @@
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -11735,12 +11068,14 @@
     "object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true
     },
     "object-visit": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
       "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
       "requires": {
         "isobject": "^3.0.0"
       }
@@ -11749,6 +11084,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
       "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
       "requires": {
         "define-properties": "^1.1.2",
         "function-bind": "^1.1.1",
@@ -11792,6 +11128,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
       "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
       "requires": {
         "isobject": "^3.0.1"
       }
@@ -11842,7 +11179,7 @@
       "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
       "dev": true,
       "requires": {
-        "mimic-fn": "2.1.0"
+        "mimic-fn": "^2.1.0"
       }
     },
     "open": {
@@ -11851,7 +11188,7 @@
       "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
       "dev": true,
       "requires": {
-        "is-wsl": "1.1.0"
+        "is-wsl": "^1.1.0"
       }
     },
     "opn": {
@@ -11860,7 +11197,7 @@
       "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
       "dev": true,
       "requires": {
-        "is-wsl": "1.1.0"
+        "is-wsl": "^1.1.0"
       }
     },
     "optimist": {
@@ -11984,16 +11321,18 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
       "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
+      "dev": true,
       "requires": {
-        "p-try": "2.2.0"
+        "p-try": "^2.0.0"
       }
     },
     "p-locate": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
       "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
       "requires": {
-        "p-limit": "2.2.1"
+        "p-limit": "^2.0.0"
       }
     },
     "p-map": {
@@ -12008,13 +11347,14 @@
       "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
       "dev": true,
       "requires": {
-        "retry": "0.12.0"
+        "retry": "^0.12.0"
       }
     },
     "p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true
     },
     "package-json": {
       "version": "6.5.0",
@@ -12022,10 +11362,10 @@
       "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
       "dev": true,
       "requires": {
-        "got": "9.6.0",
-        "registry-auth-token": "4.0.0",
-        "registry-url": "5.1.0",
-        "semver": "6.3.0"
+        "got": "^9.6.0",
+        "registry-auth-token": "^4.0.0",
+        "registry-url": "^5.0.0",
+        "semver": "^6.2.0"
       },
       "dependencies": {
         "semver": {
@@ -12042,34 +11382,34 @@
       "integrity": "sha512-jAEP+Nqj4kyMWyNpfTU/Whx1jA7jEc5cCOlurm0/0oL+v8TAp1QSsK83N7bYe+2bEdFzMAtPG5TBebjzzGV0cA==",
       "dev": true,
       "requires": {
-        "bluebird": "3.7.0",
-        "cacache": "12.0.2",
-        "figgy-pudding": "3.5.1",
-        "get-stream": "4.1.0",
-        "glob": "7.1.3",
-        "infer-owner": "1.0.4",
-        "lru-cache": "5.1.1",
-        "make-fetch-happen": "5.0.0",
-        "minimatch": "3.0.4",
-        "minipass": "2.9.0",
-        "mississippi": "3.0.0",
-        "mkdirp": "0.5.1",
-        "normalize-package-data": "2.5.0",
-        "npm-package-arg": "6.1.0",
-        "npm-packlist": "1.4.4",
-        "npm-pick-manifest": "2.2.3",
-        "npm-registry-fetch": "4.0.1",
-        "osenv": "0.1.5",
-        "promise-inflight": "1.0.1",
-        "promise-retry": "1.1.1",
-        "protoduck": "5.0.1",
-        "rimraf": "2.7.1",
-        "safe-buffer": "5.1.2",
-        "semver": "5.6.0",
-        "ssri": "6.0.1",
-        "tar": "4.4.13",
-        "unique-filename": "1.1.1",
-        "which": "1.3.1"
+        "bluebird": "^3.5.3",
+        "cacache": "^12.0.2",
+        "figgy-pudding": "^3.5.1",
+        "get-stream": "^4.1.0",
+        "glob": "^7.1.3",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^5.1.1",
+        "make-fetch-happen": "^5.0.0",
+        "minimatch": "^3.0.4",
+        "minipass": "^2.3.5",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "normalize-package-data": "^2.4.0",
+        "npm-package-arg": "^6.1.0",
+        "npm-packlist": "^1.1.12",
+        "npm-pick-manifest": "^2.2.3",
+        "npm-registry-fetch": "^4.0.0",
+        "osenv": "^0.1.5",
+        "promise-inflight": "^1.0.1",
+        "promise-retry": "^1.1.1",
+        "protoduck": "^5.0.1",
+        "rimraf": "^2.6.2",
+        "safe-buffer": "^5.1.2",
+        "semver": "^5.6.0",
+        "ssri": "^6.0.1",
+        "tar": "^4.4.8",
+        "unique-filename": "^1.1.1",
+        "which": "^1.3.1"
       },
       "dependencies": {
         "npm-pick-manifest": {
@@ -12078,9 +11418,9 @@
           "integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==",
           "dev": true,
           "requires": {
-            "figgy-pudding": "3.5.1",
-            "npm-package-arg": "6.1.0",
-            "semver": "5.6.0"
+            "figgy-pudding": "^3.5.1",
+            "npm-package-arg": "^6.0.0",
+            "semver": "^5.4.1"
           }
         }
       }
@@ -12097,9 +11437,9 @@
       "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
       "dev": true,
       "requires": {
-        "cyclist": "1.0.1",
-        "inherits": "2.0.4",
-        "readable-stream": "2.3.6"
+        "cyclist": "^1.0.1",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.1.5"
       }
     },
     "parse-asn1": {
@@ -12108,12 +11448,12 @@
       "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
       "dev": true,
       "requires": {
-        "asn1.js": "4.10.1",
-        "browserify-aes": "1.2.0",
-        "create-hash": "1.2.0",
-        "evp_bytestokey": "1.0.3",
-        "pbkdf2": "3.0.17",
-        "safe-buffer": "5.1.2"
+        "asn1.js": "^4.0.0",
+        "browserify-aes": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
       }
     },
     "parse-filepath": {
@@ -12181,7 +11521,8 @@
     "pascalcase": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true
     },
     "path-browserify": {
       "version": "0.0.1",
@@ -12192,17 +11533,20 @@
     "path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA="
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+      "dev": true
     },
     "path-exists": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+      "dev": true
     },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
     },
     "path-is-inside": {
       "version": "1.0.2",
@@ -12219,7 +11563,8 @@
     "path-parse": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "dev": true
     },
     "path-root": {
       "version": "0.1.1",
@@ -12316,8 +11661,9 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
       "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+      "dev": true,
       "requires": {
-        "find-up": "3.0.0"
+        "find-up": "^3.0.0"
       }
     },
     "plugin-error": {
@@ -12326,10 +11672,10 @@
       "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
       "dev": true,
       "requires": {
-        "ansi-colors": "1.1.0",
-        "arr-diff": "4.0.0",
-        "arr-union": "3.1.0",
-        "extend-shallow": "3.0.2"
+        "ansi-colors": "^1.0.1",
+        "arr-diff": "^4.0.0",
+        "arr-union": "^3.1.0",
+        "extend-shallow": "^3.0.2"
       },
       "dependencies": {
         "ansi-colors": {
@@ -12338,7 +11684,7 @@
           "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
           "dev": true,
           "requires": {
-            "ansi-wrap": "0.1.0"
+            "ansi-wrap": "^0.1.0"
           }
         }
       }
@@ -12355,9 +11701,9 @@
       "integrity": "sha512-ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg==",
       "dev": true,
       "requires": {
-        "async": "1.5.2",
-        "debug": "2.6.9",
-        "mkdirp": "0.5.1"
+        "async": "^1.5.2",
+        "debug": "^2.2.0",
+        "mkdirp": "0.5.x"
       },
       "dependencies": {
         "async": {
@@ -12371,7 +11717,8 @@
     "posix-character-classes": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "dev": true
     },
     "postcss": {
       "version": "7.0.17",
@@ -12379,9 +11726,9 @@
       "integrity": "sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.2",
-        "source-map": "0.6.1",
-        "supports-color": "6.1.0"
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
       },
       "dependencies": {
         "source-map": {
@@ -12418,8 +11765,8 @@
       "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==",
       "dev": true,
       "requires": {
-        "cosmiconfig": "5.2.1",
-        "import-cwd": "2.1.0"
+        "cosmiconfig": "^5.0.0",
+        "import-cwd": "^2.0.0"
       }
     },
     "postcss-loader": {
@@ -12473,12 +11820,6 @@
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
       "dev": true
     },
-    "prettier": {
-      "version": "1.18.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz",
-      "integrity": "sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==",
-      "dev": true
-    },
     "pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
@@ -12488,7 +11829,8 @@
     "private": {
       "version": "0.1.8",
       "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+      "dev": true
     },
     "process": {
       "version": "0.11.10",
@@ -12499,7 +11841,8 @@
     "process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
     },
     "progress": {
       "version": "1.1.8",
@@ -12654,17 +11997,17 @@
           "integrity": "sha512-XINj6b8CYuUYC93SG3xPkxlyUc3IJbD6Vvo75CVGuG9uzsefDzWQrhz0Lq8vbPxtb4d63CZdYophF8k8Or/YiA==",
           "dev": true,
           "requires": {
-            "adm-zip": "0.4.13",
-            "chalk": "1.1.3",
-            "del": "2.2.2",
-            "glob": "7.1.3",
-            "ini": "1.3.5",
-            "minimist": "1.2.0",
-            "q": "1.4.1",
-            "request": "2.88.0",
-            "rimraf": "2.7.1",
-            "semver": "5.6.0",
-            "xml2js": "0.4.22"
+            "adm-zip": "^0.4.9",
+            "chalk": "^1.1.1",
+            "del": "^2.2.0",
+            "glob": "^7.0.3",
+            "ini": "^1.3.4",
+            "minimist": "^1.2.0",
+            "q": "^1.4.1",
+            "request": "^2.87.0",
+            "rimraf": "^2.5.2",
+            "semver": "^5.3.0",
+            "xml2js": "^0.4.17"
           }
         }
       }
@@ -12675,14 +12018,15 @@
       "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==",
       "dev": true,
       "requires": {
-        "forwarded": "0.1.2",
+        "forwarded": "~0.1.2",
         "ipaddr.js": "1.9.0"
       }
     },
     "prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+      "dev": true
     },
     "ps-node": {
       "version": "0.1.6",
@@ -12752,7 +12096,8 @@
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
     },
     "q": {
       "version": "1.5.1",
@@ -12778,8 +12123,8 @@
       "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
       "dev": true,
       "requires": {
-        "object-assign": "4.1.1",
-        "strict-uri-encode": "1.1.0"
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
       }
     },
     "querystring": {
@@ -12851,8 +12196,8 @@
       "integrity": "sha512-lzUVMuJ06HF4rYveaz9Tv0WRlUMxJ0Y1hgSkkgg+50iEdaI0TthyEDe08KIHb0XsF6rn8WYTqPCaGTZg3sX+qA==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.2.3",
-        "schema-utils": "2.4.1"
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^2.0.1"
       },
       "dependencies": {
         "ajv": {
@@ -12861,10 +12206,10 @@
           "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "2.0.1",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.4.1",
-            "uri-js": "4.2.2"
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
         "schema-utils": {
@@ -12873,8 +12218,8 @@
           "integrity": "sha512-RqYLpkPZX5Oc3fw/kHHHyP56fg5Y+XBpIpV8nCg0znIALfq3OH+Ea9Hfeac9BAMwG5IICltiZ0vxFvJQONfA5w==",
           "dev": true,
           "requires": {
-            "ajv": "6.10.2",
-            "ajv-keywords": "3.4.1"
+            "ajv": "^6.10.2",
+            "ajv-keywords": "^3.4.1"
           }
         }
       }
@@ -12914,11 +12259,11 @@
       "integrity": "sha512-KLhu8M1ZZNkMcrq1+0UJbR8Dii8KZUqB0Sha4mOx/bknfKI/fyrQVrG/YIt2UOtG667sD8+ee4EXMM91W9dC+A==",
       "dev": true,
       "requires": {
-        "glob": "7.1.3",
-        "graceful-fs": "4.2.2",
-        "json-parse-better-errors": "1.0.2",
-        "normalize-package-data": "2.5.0",
-        "slash": "1.0.0"
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.1.2",
+        "json-parse-better-errors": "^1.0.1",
+        "normalize-package-data": "^2.0.0",
+        "slash": "^1.0.0"
       }
     },
     "read-package-tree": {
@@ -12927,9 +12272,9 @@
       "integrity": "sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==",
       "dev": true,
       "requires": {
-        "read-package-json": "2.1.0",
-        "readdir-scoped-modules": "1.1.0",
-        "util-promisify": "2.1.0"
+        "read-package-json": "^2.0.0",
+        "readdir-scoped-modules": "^1.0.0",
+        "util-promisify": "^2.1.0"
       }
     },
     "read-pkg": {
@@ -12997,6 +12342,7 @@
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
       "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "dev": true,
       "requires": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -13013,20 +12359,21 @@
       "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==",
       "dev": true,
       "requires": {
-        "debuglog": "1.0.1",
-        "dezalgo": "1.0.3",
-        "graceful-fs": "4.2.2",
-        "once": "1.4.0"
+        "debuglog": "^1.0.1",
+        "dezalgo": "^1.0.0",
+        "graceful-fs": "^4.1.2",
+        "once": "^1.3.0"
       }
     },
     "readdirp": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
       "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "dev": true,
       "requires": {
-        "graceful-fs": "4.2.2",
-        "micromatch": "3.1.10",
-        "readable-stream": "2.3.6"
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.2"
       }
     },
     "readline2": {
@@ -13066,14 +12413,16 @@
     "regenerate": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
-      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="
+      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
+      "dev": true
     },
     "regenerate-unicode-properties": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz",
       "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==",
+      "dev": true,
       "requires": {
-        "regenerate": "1.4.0"
+        "regenerate": "^1.4.0"
       }
     },
     "regenerator-runtime": {
@@ -13086,14 +12435,16 @@
       "version": "0.14.1",
       "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz",
       "integrity": "sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==",
+      "dev": true,
       "requires": {
-        "private": "0.1.8"
+        "private": "^0.1.6"
       }
     },
     "regex-not": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
       "requires": {
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
@@ -13105,20 +12456,21 @@
       "integrity": "sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==",
       "dev": true,
       "requires": {
-        "define-properties": "1.1.3"
+        "define-properties": "^1.1.2"
       }
     },
     "regexpu-core": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz",
       "integrity": "sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==",
+      "dev": true,
       "requires": {
-        "regenerate": "1.4.0",
-        "regenerate-unicode-properties": "8.1.0",
-        "regjsgen": "0.5.0",
-        "regjsparser": "0.6.0",
-        "unicode-match-property-ecmascript": "1.0.4",
-        "unicode-match-property-value-ecmascript": "1.1.0"
+        "regenerate": "^1.4.0",
+        "regenerate-unicode-properties": "^8.1.0",
+        "regjsgen": "^0.5.0",
+        "regjsparser": "^0.6.0",
+        "unicode-match-property-ecmascript": "^1.0.4",
+        "unicode-match-property-value-ecmascript": "^1.1.0"
       }
     },
     "registry-auth-token": {
@@ -13127,8 +12479,8 @@
       "integrity": "sha512-lpQkHxd9UL6tb3k/aHAVfnVtn+Bcs9ob5InuFLLEDqSqeq+AljB8GZW9xY0x7F+xYwEcjKe07nyoxzEYz6yvkw==",
       "dev": true,
       "requires": {
-        "rc": "1.2.8",
-        "safe-buffer": "5.1.2"
+        "rc": "^1.2.8",
+        "safe-buffer": "^5.0.1"
       }
     },
     "registry-url": {
@@ -13137,20 +12489,22 @@
       "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
       "dev": true,
       "requires": {
-        "rc": "1.2.8"
+        "rc": "^1.2.8"
       }
     },
     "regjsgen": {
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz",
-      "integrity": "sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA=="
+      "integrity": "sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==",
+      "dev": true
     },
     "regjsparser": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz",
       "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==",
+      "dev": true,
       "requires": {
-        "jsesc": "0.5.0"
+        "jsesc": "~0.5.0"
       }
     },
     "remove-bom-buffer": {
@@ -13177,17 +12531,20 @@
     "remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true
     },
     "repeat-element": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+      "dev": true
     },
     "repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
     },
     "repeating": {
       "version": "2.0.1",
@@ -13221,9 +12578,9 @@
       "integrity": "sha512-x8uSfKKK/5YiJ8JYsNMwa1PJYvHfPdUABVXd21ro09Nh5BRZ5ATuACwrqCNpktwVqVbFTk/cIGFepeMqY0oX3g==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.2",
-        "glob": "7.1.4",
-        "yargs": "13.3.0"
+        "chalk": "^2.4.2",
+        "glob": "^7.1.4",
+        "yargs": "^13.3.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -13238,9 +12595,9 @@
           "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
           "dev": true,
           "requires": {
-            "string-width": "3.1.0",
-            "strip-ansi": "5.2.0",
-            "wrap-ansi": "5.1.0"
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
           }
         },
         "emoji-regex": {
@@ -13261,12 +12618,12 @@
           "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
           "dev": true,
           "requires": {
-            "fs.realpath": "1.0.0",
-            "inflight": "1.0.6",
-            "inherits": "2.0.4",
-            "minimatch": "3.0.4",
-            "once": "1.4.0",
-            "path-is-absolute": "1.0.1"
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
           }
         },
         "is-fullwidth-code-point": {
@@ -13287,9 +12644,9 @@
           "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "dev": true,
           "requires": {
-            "emoji-regex": "7.0.3",
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "5.2.0"
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
           }
         },
         "strip-ansi": {
@@ -13298,7 +12655,7 @@
           "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "4.1.0"
+            "ansi-regex": "^4.1.0"
           }
         },
         "which-module": {
@@ -13313,9 +12670,9 @@
           "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.1",
-            "string-width": "3.1.0",
-            "strip-ansi": "5.2.0"
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
           }
         },
         "yargs": {
@@ -13324,16 +12681,16 @@
           "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
           "dev": true,
           "requires": {
-            "cliui": "5.0.0",
-            "find-up": "3.0.0",
-            "get-caller-file": "2.0.5",
-            "require-directory": "2.1.1",
-            "require-main-filename": "2.0.0",
-            "set-blocking": "2.0.0",
-            "string-width": "3.1.0",
-            "which-module": "2.0.0",
-            "y18n": "4.0.0",
-            "yargs-parser": "13.1.1"
+            "cliui": "^5.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.1"
           }
         },
         "yargs-parser": {
@@ -13342,8 +12699,8 @@
           "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
           "dev": true,
           "requires": {
-            "camelcase": "5.3.1",
-            "decamelize": "1.2.0"
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
           }
         }
       }
@@ -13402,12 +12759,6 @@
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
       "dev": true
     },
-    "require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true
-    },
     "require-main-filename": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
@@ -13430,7 +12781,7 @@
           "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
           "dev": true,
           "requires": {
-            "callsites": "0.2.0"
+            "callsites": "^0.2.0"
           }
         },
         "callsites": {
@@ -13462,8 +12813,9 @@
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
       "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+      "dev": true,
       "requires": {
-        "path-parse": "1.0.6"
+        "path-parse": "^1.0.6"
       }
     },
     "resolve-cwd": {
@@ -13481,8 +12833,8 @@
       "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
       "dev": true,
       "requires": {
-        "expand-tilde": "2.0.2",
-        "global-modules": "1.0.0"
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
       }
     },
     "resolve-from": {
@@ -13503,7 +12855,8 @@
     "resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "dev": true
     },
     "responselike": {
       "version": "1.0.2",
@@ -13511,7 +12864,7 @@
       "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
       "dev": true,
       "requires": {
-        "lowercase-keys": "1.0.1"
+        "lowercase-keys": "^1.0.0"
       }
     },
     "restore-cursor": {
@@ -13520,14 +12873,15 @@
       "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
       "dev": true,
       "requires": {
-        "onetime": "5.1.0",
-        "signal-exit": "3.0.2"
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
       }
     },
     "ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true
     },
     "retry": {
       "version": "0.12.0",
@@ -13553,7 +12907,7 @@
       "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
       "dev": true,
       "requires": {
-        "glob": "7.1.3"
+        "glob": "^7.1.3"
       }
     },
     "ripemd160": {
@@ -13572,9 +12926,9 @@
       "integrity": "sha512-x4l4ZrV/Mr/x/jvFTmwROdEAhbZjx16yDRTVSKWh/i4oJDuW2dVEbECT853mybYCz7BAitU8ElGlhx7dNjw3qQ==",
       "dev": true,
       "requires": {
-        "@types/estree": "0.0.39",
-        "@types/node": "12.7.9",
-        "acorn": "7.1.0"
+        "@types/estree": "*",
+        "@types/node": "*",
+        "acorn": "^7.1.0"
       },
       "dependencies": {
         "acorn": {
@@ -13591,11 +12945,11 @@
       "integrity": "sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==",
       "dev": true,
       "requires": {
-        "estree-walker": "0.6.1",
-        "is-reference": "1.1.4",
-        "magic-string": "0.25.3",
-        "resolve": "1.12.0",
-        "rollup-pluginutils": "2.8.2"
+        "estree-walker": "^0.6.1",
+        "is-reference": "^1.1.2",
+        "magic-string": "^0.25.2",
+        "resolve": "^1.11.0",
+        "rollup-pluginutils": "^2.8.1"
       }
     },
     "rollup-plugin-json": {
@@ -13604,7 +12958,7 @@
       "integrity": "sha512-hgb8N7Cgfw5SZAkb3jf0QXii6QX/FOkiIq2M7BAQIEydjHvTyxXHQiIzZaTFgx1GK0cRCHOCBHIyEkkLdWKxow==",
       "dev": true,
       "requires": {
-        "rollup-pluginutils": "2.8.2"
+        "rollup-pluginutils": "^2.5.0"
       }
     },
     "rollup-plugin-node-resolve": {
@@ -13614,10 +12968,10 @@
       "dev": true,
       "requires": {
         "@types/resolve": "0.0.8",
-        "builtin-modules": "3.1.0",
-        "is-module": "1.0.0",
-        "resolve": "1.12.0",
-        "rollup-pluginutils": "2.8.2"
+        "builtin-modules": "^3.1.0",
+        "is-module": "^1.0.0",
+        "resolve": "^1.11.1",
+        "rollup-pluginutils": "^2.8.1"
       }
     },
     "rollup-plugin-sourcemaps": {
@@ -13645,7 +12999,7 @@
       "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
       "dev": true,
       "requires": {
-        "is-promise": "2.1.0"
+        "is-promise": "^2.1.0"
       }
     },
     "run-parallel": {
@@ -13679,7 +13033,7 @@
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
       "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
       "requires": {
-        "tslib": "1.10.0"
+        "tslib": "^1.9.0"
       }
     },
     "rxjs-spy": {
@@ -13687,11 +13041,11 @@
       "resolved": "https://registry.npmjs.org/rxjs-spy/-/rxjs-spy-7.5.1.tgz",
       "integrity": "sha512-dJ9mO4HvW2r16PsU15Qsc0RVkG7pFrfyCNTGx3vrxWje3kIgZ6QjMVnWblQxbniZ32lwLk/2x9+D2O6GhgXV/w==",
       "requires": {
-        "@types/circular-json": "0.4.0",
-        "@types/stacktrace-js": "0.0.32",
-        "circular-json": "0.5.9",
-        "error-stack-parser": "2.0.4",
-        "stacktrace-gps": "3.0.3"
+        "@types/circular-json": "^0.4.0",
+        "@types/stacktrace-js": "^0.0.32",
+        "circular-json": "^0.5.0",
+        "error-stack-parser": "^2.0.1",
+        "stacktrace-gps": "^3.0.2"
       }
     },
     "rxjs-tslint": {
@@ -13700,11 +13054,40 @@
       "integrity": "sha512-NnOfqutNfdT7VQnQm32JLYh2gDZjc0gdWZFtrxf/czNGkLKJ1nOO6jbKAFI09W0f9lCtv6P2ozxjbQH8TSPPFQ==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.2",
-        "optimist": "0.6.1",
-        "tslint": "5.20.0",
-        "tsutils": "2.29.0",
-        "typescript": "3.5.3"
+        "chalk": "^2.4.0",
+        "optimist": "^0.6.1",
+        "tslint": "^5.9.1",
+        "tsutils": "^2.25.0",
+        "typescript": ">=2.8.3"
+      },
+      "dependencies": {
+        "builtin-modules": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+          "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+          "dev": true
+        },
+        "tslint": {
+          "version": "5.20.1",
+          "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz",
+          "integrity": "sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.0.0",
+            "builtin-modules": "^1.1.1",
+            "chalk": "^2.3.0",
+            "commander": "^2.12.1",
+            "diff": "^4.0.1",
+            "glob": "^7.1.1",
+            "js-yaml": "^3.13.1",
+            "minimatch": "^3.0.4",
+            "mkdirp": "^0.5.1",
+            "resolve": "^1.3.2",
+            "semver": "^5.3.0",
+            "tslib": "^1.8.0",
+            "tsutils": "^2.29.0"
+          }
+        }
       }
     },
     "rxjs-websockets": {
@@ -13715,12 +13098,14 @@
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
     },
     "safe-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
       "requires": {
         "ret": "~0.1.10"
       }
@@ -13736,7 +13121,7 @@
       "integrity": "sha512-FzU1X2V8DlnqabrL4u7OBwD2vcOzNMongEJEx3xMEhWY/v26FFR3aG0hyeu2T965sfR0E9ufJwmG+Qjz78vFPQ==",
       "dev": true,
       "requires": {
-        "chokidar": "2.0.4"
+        "chokidar": ">=2.0.0 <4.0.0"
       }
     },
     "sass-lint": {
@@ -13745,20 +13130,20 @@
       "integrity": "sha512-DSyah8/MyjzW2BWYmQWekYEKir44BpLqrCFsgs9iaWiVTcwZfwXHF586hh3D1n+/9ihUNMfd8iHAyb9KkGgs7Q==",
       "dev": true,
       "requires": {
-        "commander": "2.20.0",
-        "eslint": "2.13.1",
+        "commander": "^2.8.1",
+        "eslint": "^2.7.0",
         "front-matter": "2.1.2",
-        "fs-extra": "3.0.1",
-        "glob": "7.1.3",
-        "globule": "1.2.1",
-        "gonzales-pe-sl": "4.2.3",
-        "js-yaml": "3.13.1",
-        "known-css-properties": "0.3.0",
-        "lodash.capitalize": "4.2.1",
-        "lodash.kebabcase": "4.1.1",
-        "merge": "1.2.1",
-        "path-is-absolute": "1.0.1",
-        "util": "0.10.4"
+        "fs-extra": "^3.0.1",
+        "glob": "^7.0.0",
+        "globule": "^1.0.0",
+        "gonzales-pe-sl": "^4.2.3",
+        "js-yaml": "^3.5.4",
+        "known-css-properties": "^0.3.0",
+        "lodash.capitalize": "^4.1.0",
+        "lodash.kebabcase": "^4.0.0",
+        "merge": "^1.2.0",
+        "path-is-absolute": "^1.0.0",
+        "util": "^0.10.3"
       },
       "dependencies": {
         "fs-extra": {
@@ -13767,9 +13152,9 @@
           "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.2.2",
-            "jsonfile": "3.0.1",
-            "universalify": "0.1.2"
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^3.0.0",
+            "universalify": "^0.1.0"
           }
         },
         "inherits": {
@@ -13784,7 +13169,7 @@
           "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.2.2"
+            "graceful-fs": "^4.1.6"
           }
         },
         "util": {
@@ -13804,11 +13189,11 @@
       "integrity": "sha512-h8yUWaWtsbuIiOCgR9fd9c2lRXZ2uG+h8Dzg/AGNj+Hg/3TO8+BBAW9mEP+mh8ei+qBKqSJ0F1FLlYjNBc61OA==",
       "dev": true,
       "requires": {
-        "clone-deep": "4.0.1",
-        "loader-utils": "1.2.3",
-        "neo-async": "2.6.1",
-        "pify": "4.0.1",
-        "semver": "5.6.0"
+        "clone-deep": "^4.0.1",
+        "loader-utils": "^1.0.1",
+        "neo-async": "^2.5.0",
+        "pify": "^4.0.1",
+        "semver": "^5.5.0"
       },
       "dependencies": {
         "pify": {
@@ -13886,7 +13271,8 @@
     "semver": {
       "version": "5.6.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
+      "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+      "dev": true
     },
     "semver-diff": {
       "version": "2.1.0",
@@ -13931,18 +13317,18 @@
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "depd": "1.1.2",
-        "destroy": "1.0.4",
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "etag": "1.8.1",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "1.7.2",
+        "http-errors": "~1.7.2",
         "mime": "1.6.0",
         "ms": "2.1.1",
-        "on-finished": "2.3.0",
-        "range-parser": "1.2.1",
-        "statuses": "1.5.0"
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.1",
+        "statuses": "~1.5.0"
       },
       "dependencies": {
         "ms": {
@@ -13980,10 +13366,10 @@
           "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
           "dev": true,
           "requires": {
-            "depd": "1.1.2",
+            "depd": "~1.1.2",
             "inherits": "2.0.3",
             "setprototypeof": "1.1.0",
-            "statuses": "1.5.0"
+            "statuses": ">= 1.4.0 < 2"
           }
         },
         "inherits": {
@@ -14006,9 +13392,9 @@
       "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
       "dev": true,
       "requires": {
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "parseurl": "1.3.3",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
         "send": "0.17.1"
       }
     },
@@ -14028,6 +13414,7 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
       "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
       "requires": {
         "extend-shallow": "^2.0.1",
         "is-extendable": "^0.1.1",
@@ -14039,6 +13426,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -14073,7 +13461,7 @@
       "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
       "dev": true,
       "requires": {
-        "kind-of": "6.0.2"
+        "kind-of": "^6.0.2"
       }
     },
     "shebang-command": {
@@ -14125,6 +13513,7 @@
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
       "requires": {
         "base": "^0.11.1",
         "debug": "^2.2.0",
@@ -14140,6 +13529,7 @@
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
@@ -14148,6 +13538,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -14158,6 +13549,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
       "requires": {
         "define-property": "^1.0.0",
         "isobject": "^3.0.0",
@@ -14168,6 +13560,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
           "requires": {
             "is-descriptor": "^1.0.0"
           }
@@ -14176,6 +13569,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -14184,6 +13578,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -14192,6 +13587,7 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -14204,6 +13600,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
       "requires": {
         "kind-of": "^3.2.0"
       },
@@ -14212,6 +13609,7 @@
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -14361,7 +13759,7 @@
           "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
           "dev": true,
           "requires": {
-            "websocket-driver": "0.7.3"
+            "websocket-driver": ">=0.5.1"
           }
         },
         "ms": {
@@ -14378,7 +13776,7 @@
       "integrity": "sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==",
       "dev": true,
       "requires": {
-        "ip": "1.1.5",
+        "ip": "^1.1.5",
         "smart-buffer": "4.0.2"
       }
     },
@@ -14388,8 +13786,8 @@
       "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
       "dev": true,
       "requires": {
-        "agent-base": "4.2.1",
-        "socks": "2.3.2"
+        "agent-base": "~4.2.1",
+        "socks": "~2.3.2"
       },
       "dependencies": {
         "agent-base": {
@@ -14398,7 +13796,7 @@
           "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
           "dev": true,
           "requires": {
-            "es6-promisify": "5.0.0"
+            "es6-promisify": "^5.0.0"
           }
         }
       }
@@ -14409,7 +13807,7 @@
       "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
       "dev": true,
       "requires": {
-        "is-plain-obj": "1.1.0"
+        "is-plain-obj": "^1.0.0"
       }
     },
     "source-list-map": {
@@ -14437,6 +13835,7 @@
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
       "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "dev": true,
       "requires": {
         "atob": "^2.1.1",
         "decode-uri-component": "^0.2.0",
@@ -14451,8 +13850,8 @@
       "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
       "dev": true,
       "requires": {
-        "buffer-from": "1.1.1",
-        "source-map": "0.6.1"
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
       },
       "dependencies": {
         "source-map": {
@@ -14466,12 +13865,14 @@
     "source-map-url": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+      "dev": true
     },
     "sourcemap-codec": {
       "version": "1.4.6",
       "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.6.tgz",
-      "integrity": "sha512-1ZooVLYFxC448piVLBbtOxFcXwnymH9oUF8nRd3CuYDVvkRBxRl6pB4Mtas5a4drtL+E8LDgFkQNcgIw6tc8Hg=="
+      "integrity": "sha512-1ZooVLYFxC448piVLBbtOxFcXwnymH9oUF8nRd3CuYDVvkRBxRl6pB4Mtas5a4drtL+E8LDgFkQNcgIw6tc8Hg==",
+      "dev": true
     },
     "sparkles": {
       "version": "1.0.1",
@@ -14485,8 +13886,8 @@
       "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
       "dev": true,
       "requires": {
-        "spdx-expression-parse": "3.0.0",
-        "spdx-license-ids": "3.0.5"
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
       }
     },
     "spdx-exceptions": {
@@ -14517,11 +13918,11 @@
       "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==",
       "dev": true,
       "requires": {
-        "debug": "4.1.1",
-        "handle-thing": "2.0.0",
-        "http-deceiver": "1.2.7",
-        "select-hose": "2.0.0",
-        "spdy-transport": "3.0.0"
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
+        "http-deceiver": "^1.2.7",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^3.0.0"
       },
       "dependencies": {
         "debug": {
@@ -14530,7 +13931,7 @@
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "ms": "^2.1.1"
           }
         },
         "ms": {
@@ -14576,9 +13977,9 @@
           "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
           "dev": true,
           "requires": {
-            "inherits": "2.0.4",
-            "string_decoder": "1.1.1",
-            "util-deprecate": "1.0.2"
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
           }
         }
       }
@@ -14589,7 +13990,7 @@
       "integrity": "sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==",
       "dev": true,
       "requires": {
-        "chalk": "2.4.2"
+        "chalk": "^2.0.1"
       }
     },
     "split": {
@@ -14605,6 +14006,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
       "requires": {
         "extend-shallow": "^3.0.0"
       }
@@ -14621,15 +14023,15 @@
       "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
       "dev": true,
       "requires": {
-        "asn1": "0.2.4",
-        "assert-plus": "1.0.0",
-        "bcrypt-pbkdf": "1.0.2",
-        "dashdash": "1.14.1",
-        "ecc-jsbn": "0.1.2",
-        "getpass": "0.1.7",
-        "jsbn": "0.1.1",
-        "safer-buffer": "2.1.2",
-        "tweetnacl": "0.14.5"
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
       }
     },
     "ssri": {
@@ -14638,7 +14040,7 @@
       "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
       "dev": true,
       "requires": {
-        "figgy-pudding": "3.5.1"
+        "figgy-pudding": "^3.5.1"
       }
     },
     "stack-trace": {
@@ -14658,13 +14060,14 @@
       "integrity": "sha512-51Rr7dXkyFUKNmhY/vqZWK+EvdsfFSRiQVtgHTFlAdNIYaDD7bVh21yBHXaNWAvTD+w+QSjxHg7/v6Tz4veExA==",
       "requires": {
         "source-map": "0.5.6",
-        "stackframe": "1.1.0"
+        "stackframe": "^1.1.0"
       }
     },
     "static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
       "requires": {
         "define-property": "^0.2.5",
         "object-copy": "^0.1.0"
@@ -14674,6 +14077,7 @@
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
@@ -14725,9 +14129,9 @@
           "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.2.2",
-            "jsonfile": "3.0.1",
-            "universalify": "0.1.2"
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^3.0.0",
+            "universalify": "^0.1.0"
           }
         },
         "jsonfile": {
@@ -14736,7 +14140,7 @@
           "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
           "dev": true,
           "requires": {
-            "graceful-fs": "4.2.2"
+            "graceful-fs": "^4.1.6"
           }
         },
         "mkdirp": {
@@ -14873,8 +14277,8 @@
       "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==",
       "dev": true,
       "requires": {
-        "define-properties": "1.1.3",
-        "function-bind": "1.1.1"
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
       }
     },
     "string.prototype.trimright": {
@@ -14883,14 +14287,15 @@
       "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==",
       "dev": true,
       "requires": {
-        "define-properties": "1.1.3",
-        "function-bind": "1.1.1"
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
       }
     },
     "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
       "requires": {
         "safe-buffer": "~5.1.0"
       }
@@ -14899,6 +14304,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
       }
@@ -14936,8 +14342,8 @@
       "integrity": "sha512-B0dOCFwv7/eY31a5PCieNwMgMhVGFe9w+rh7s/Bx8kfFkrth9zfTZquoYvdw8URgiqxObQKcpW51Ugz1HjfdZw==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.2.3",
-        "schema-utils": "2.4.1"
+        "loader-utils": "^1.2.3",
+        "schema-utils": "^2.0.1"
       },
       "dependencies": {
         "ajv": {
@@ -14946,10 +14352,10 @@
           "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "2.0.1",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.4.1",
-            "uri-js": "4.2.2"
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
         "schema-utils": {
@@ -14958,8 +14364,8 @@
           "integrity": "sha512-RqYLpkPZX5Oc3fw/kHHHyP56fg5Y+XBpIpV8nCg0znIALfq3OH+Ea9Hfeac9BAMwG5IICltiZ0vxFvJQONfA5w==",
           "dev": true,
           "requires": {
-            "ajv": "6.10.2",
-            "ajv-keywords": "3.4.1"
+            "ajv": "^6.10.2",
+            "ajv-keywords": "^3.4.1"
           }
         }
       }
@@ -15020,7 +14426,7 @@
       "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
       "dev": true,
       "requires": {
-        "has-flag": "3.0.0"
+        "has-flag": "^3.0.0"
       }
     },
     "sver-compat": {
@@ -15141,7 +14547,8 @@
     "tapable": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+      "dev": true
     },
     "tar": {
       "version": "4.4.13",
@@ -15149,13 +14556,13 @@
       "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
       "dev": true,
       "requires": {
-        "chownr": "1.1.3",
-        "fs-minipass": "1.2.7",
-        "minipass": "2.9.0",
-        "minizlib": "1.3.3",
-        "mkdirp": "0.5.1",
-        "safe-buffer": "5.1.2",
-        "yallist": "3.1.1"
+        "chownr": "^1.1.1",
+        "fs-minipass": "^1.2.5",
+        "minipass": "^2.8.6",
+        "minizlib": "^1.2.1",
+        "mkdirp": "^0.5.0",
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.3"
       }
     },
     "teeny-request": {
@@ -15226,12 +14633,6 @@
         }
       }
     },
-    "temp": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/temp/-/temp-0.4.0.tgz",
-      "integrity": "sha1-ZxrWPVe+D+nXKUZks/xABjZnimA=",
-      "dev": true
-    },
     "temp-fs": {
       "version": "0.9.9",
       "resolved": "https://registry.npmjs.org/temp-fs/-/temp-fs-0.9.9.tgz",
@@ -15267,9 +14668,9 @@
           "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
           "dev": true,
           "requires": {
-            "lru-cache": "4.1.5",
-            "shebang-command": "1.2.0",
-            "which": "1.3.1"
+            "lru-cache": "^4.0.1",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
           }
         },
         "execa": {
@@ -15278,13 +14679,13 @@
           "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
           "dev": true,
           "requires": {
-            "cross-spawn": "5.1.0",
-            "get-stream": "3.0.0",
-            "is-stream": "1.1.0",
-            "npm-run-path": "2.0.2",
-            "p-finally": "1.0.0",
-            "signal-exit": "3.0.2",
-            "strip-eof": "1.0.0"
+            "cross-spawn": "^5.0.1",
+            "get-stream": "^3.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
           }
         },
         "get-stream": {
@@ -15299,8 +14700,8 @@
           "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
           "dev": true,
           "requires": {
-            "pseudomap": "1.0.2",
-            "yallist": "2.1.2"
+            "pseudomap": "^1.0.2",
+            "yallist": "^2.1.2"
           }
         },
         "yallist": {
@@ -15317,9 +14718,9 @@
       "integrity": "sha512-+ZwXJvdSwbd60jG0Illav0F06GDJF0R4ydZ21Q3wGAFKoBGyJGo34F63vzJHgvYxc1ukOtIjvwEvl9MkjzM6Pg==",
       "dev": true,
       "requires": {
-        "commander": "2.20.0",
-        "source-map": "0.6.1",
-        "source-map-support": "0.5.13"
+        "commander": "^2.20.0",
+        "source-map": "~0.6.1",
+        "source-map-support": "~0.5.12"
       },
       "dependencies": {
         "source-map": {
@@ -15336,15 +14737,15 @@
       "integrity": "sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==",
       "dev": true,
       "requires": {
-        "cacache": "12.0.2",
-        "find-cache-dir": "2.1.0",
-        "is-wsl": "1.1.0",
-        "schema-utils": "1.0.0",
-        "serialize-javascript": "1.9.1",
-        "source-map": "0.6.1",
-        "terser": "4.1.4",
-        "webpack-sources": "1.4.3",
-        "worker-farm": "1.7.0"
+        "cacache": "^12.0.2",
+        "find-cache-dir": "^2.1.0",
+        "is-wsl": "^1.1.0",
+        "schema-utils": "^1.0.0",
+        "serialize-javascript": "^1.7.0",
+        "source-map": "^0.6.1",
+        "terser": "^4.1.2",
+        "webpack-sources": "^1.4.0",
+        "worker-farm": "^1.7.0"
       },
       "dependencies": {
         "find-cache-dir": {
@@ -15353,9 +14754,9 @@
           "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
           "dev": true,
           "requires": {
-            "commondir": "1.0.1",
-            "make-dir": "2.1.0",
-            "pkg-dir": "3.0.0"
+            "commondir": "^1.0.1",
+            "make-dir": "^2.0.0",
+            "pkg-dir": "^3.0.0"
           }
         },
         "source-map": {
@@ -15384,8 +14785,8 @@
       "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
       "dev": true,
       "requires": {
-        "readable-stream": "2.3.6",
-        "xtend": "4.0.2"
+        "readable-stream": "~2.3.6",
+        "xtend": "~4.0.1"
       }
     },
     "through2-filter": {
@@ -15416,7 +14817,7 @@
       "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
       "dev": true,
       "requires": {
-        "setimmediate": "1.0.5"
+        "setimmediate": "^1.0.4"
       }
     },
     "tmp": {
@@ -15460,6 +14861,7 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
       "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
       "requires": {
         "kind-of": "^3.0.2"
       },
@@ -15468,6 +14870,7 @@
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -15484,6 +14887,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
       "requires": {
         "define-property": "^2.0.2",
         "extend-shallow": "^3.0.2",
@@ -15495,6 +14899,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
       "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
       "requires": {
         "is-number": "^3.0.0",
         "repeat-string": "^1.6.1"
@@ -15536,7 +14941,8 @@
     "tree-kill": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
-      "integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q=="
+      "integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==",
+      "dev": true
     },
     "trim-right": {
       "version": "1.0.1",
@@ -15544,18 +14950,6 @@
       "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
       "dev": true
     },
-    "ts-loader": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-5.3.1.tgz",
-      "integrity": "sha512-fDDgpBH3SR8xlt2MasLdz3Yy611PQ/UY/KGyo7TgXhTRU/6sS8uGG0nJYnU1OdFBNKcoYbId1UTNaAOUn+i41g==",
-      "requires": {
-        "chalk": "2.4.2",
-        "enhanced-resolve": "4.1.0",
-        "loader-utils": "1.2.3",
-        "micromatch": "3.1.10",
-        "semver": "5.6.0"
-      }
-    },
     "ts-md5": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.2.6.tgz",
@@ -15567,39 +14961,11 @@
       "integrity": "sha512-5LpRN+mTiCs7lI5EtbXmF/HfMeCjzt7DH9CZwtkr6SywStrNQC723wG+aOWFiLNn7zT3kD/RnFqi3ZUfr4l5Qw==",
       "dev": true,
       "requires": {
-        "arg": "4.1.1",
-        "diff": "4.0.1",
-        "make-error": "1.3.5",
-        "source-map-support": "0.5.13",
-        "yn": "3.1.1"
-      }
-    },
-    "tsconfig-paths": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
-      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
-      "requires": {
-        "@types/json5": "0.0.29",
-        "json5": "1.0.1",
-        "minimist": "1.2.0",
-        "strip-bom": "3.0.0"
-      },
-      "dependencies": {
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
-        }
-      }
-    },
-    "tsconfig-paths-webpack-plugin": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.2.0.tgz",
-      "integrity": "sha512-S/gOOPOkV8rIL4LurZ1vUdYCVgo15iX9ZMJ6wx6w2OgcpT/G4wMyHB6WM+xheSqGMrWKuxFul+aXpCju3wmj/g==",
-      "requires": {
-        "chalk": "2.4.2",
-        "enhanced-resolve": "4.1.0",
-        "tsconfig-paths": "3.9.0"
+        "arg": "^4.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "source-map-support": "^0.5.6",
+        "yn": "^3.0.0"
       }
     },
     "tsickle": {
@@ -15608,9 +14974,9 @@
       "integrity": "sha512-ufUZqLUNqh+kOfr52N/hJ5JbiDO32/CO7ZCteZBX9HA2kiejwEgDaJeJe1GAj2TIu683IgTA/LPKvlns6Liw0w==",
       "dev": true,
       "requires": {
-        "minimist": "1.2.0",
-        "mkdirp": "0.5.1",
-        "source-map": "0.7.3"
+        "minimist": "^1.2.0",
+        "mkdirp": "^0.5.1",
+        "source-map": "^0.7.3"
       },
       "dependencies": {
         "source-map": {
@@ -15627,24 +14993,24 @@
       "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
     },
     "tslint": {
-      "version": "5.20.0",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.0.tgz",
-      "integrity": "sha512-2vqIvkMHbnx8acMogAERQ/IuINOq6DFqgF8/VDvhEkBqQh/x6SP0Y+OHnKth9/ZcHQSroOZwUQSN18v8KKF0/g==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.0.tgz",
+      "integrity": "sha512-fXjYd/61vU6da04E505OZQGb2VCN2Mq3doeWcOIryuG+eqdmFUXTYVwdhnbEu2k46LNLgUYt9bI5icQze/j0bQ==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "7.5.5",
-        "builtin-modules": "1.1.1",
-        "chalk": "2.4.2",
-        "commander": "2.20.0",
-        "diff": "4.0.1",
-        "glob": "7.1.3",
-        "js-yaml": "3.13.1",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.1",
-        "resolve": "1.12.0",
-        "semver": "5.6.0",
-        "tslib": "1.10.0",
-        "tsutils": "2.29.0"
+        "@babel/code-frame": "^7.0.0",
+        "builtin-modules": "^1.1.1",
+        "chalk": "^2.3.0",
+        "commander": "^2.12.1",
+        "diff": "^4.0.1",
+        "glob": "^7.1.1",
+        "js-yaml": "^3.13.1",
+        "minimatch": "^3.0.4",
+        "mkdirp": "^0.5.1",
+        "resolve": "^1.3.2",
+        "semver": "^5.3.0",
+        "tslib": "^1.10.0",
+        "tsutils": "^2.29.0"
       },
       "dependencies": {
         "builtin-modules": {
@@ -15661,7 +15027,7 @@
       "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
       "dev": true,
       "requires": {
-        "tslib": "1.10.0"
+        "tslib": "^1.8.1"
       }
     },
     "tty-browserify": {
@@ -15713,7 +15079,7 @@
       "dev": true,
       "requires": {
         "media-typer": "0.3.0",
-        "mime-types": "2.1.24"
+        "mime-types": "~2.1.24"
       }
     },
     "typedarray": {
@@ -15735,8 +15101,8 @@
       "dev": true,
       "optional": true,
       "requires": {
-        "commander": "2.20.0",
-        "source-map": "0.6.1"
+        "commander": "~2.20.0",
+        "source-map": "~0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -15792,31 +15158,36 @@
     "unicode-canonical-property-names-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="
+      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
+      "dev": true
     },
     "unicode-match-property-ecmascript": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
       "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+      "dev": true,
       "requires": {
-        "unicode-canonical-property-names-ecmascript": "1.0.4",
-        "unicode-property-aliases-ecmascript": "1.0.5"
+        "unicode-canonical-property-names-ecmascript": "^1.0.4",
+        "unicode-property-aliases-ecmascript": "^1.0.4"
       }
     },
     "unicode-match-property-value-ecmascript": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz",
-      "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g=="
+      "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==",
+      "dev": true
     },
     "unicode-property-aliases-ecmascript": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz",
-      "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw=="
+      "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==",
+      "dev": true
     },
     "union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
       "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
@@ -15839,7 +15210,7 @@
       "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
       "dev": true,
       "requires": {
-        "imurmurhash": "0.1.4"
+        "imurmurhash": "^0.1.4"
       }
     },
     "unique-stream": {
@@ -15867,9 +15238,9 @@
       "integrity": "sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==",
       "dev": true,
       "requires": {
-        "debug": "3.2.6",
-        "request": "2.88.0",
-        "uuid": "3.3.3"
+        "debug": "^3.0.0",
+        "request": "^2.88.0",
+        "uuid": "^3.0.0"
       },
       "dependencies": {
         "debug": {
@@ -15878,7 +15249,7 @@
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "ms": "^2.1.1"
           }
         },
         "ms": {
@@ -15905,6 +15276,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
       "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
       "requires": {
         "has-value": "^0.3.1",
         "isobject": "^3.0.0"
@@ -15914,6 +15286,7 @@
           "version": "0.3.1",
           "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
           "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "dev": true,
           "requires": {
             "get-value": "^2.0.3",
             "has-values": "^0.1.4",
@@ -15924,6 +15297,7 @@
               "version": "2.1.0",
               "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
               "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "dev": true,
               "requires": {
                 "isarray": "1.0.0"
               }
@@ -15933,14 +15307,16 @@
         "has-values": {
           "version": "0.1.4",
           "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+          "dev": true
         }
       }
     },
     "upath": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+      "dev": true
     },
     "update-notifier": {
       "version": "3.0.1",
@@ -15948,24 +15324,25 @@
       "integrity": "sha512-grrmrB6Zb8DUiyDIaeRTBCkgISYUgETNe7NglEbVsrLWXeESnlCSP50WfRSj/GmzMPl6Uchj24S/p80nP/ZQrQ==",
       "dev": true,
       "requires": {
-        "boxen": "3.2.0",
-        "chalk": "2.4.2",
-        "configstore": "4.0.0",
-        "has-yarn": "2.1.0",
-        "import-lazy": "2.1.0",
-        "is-ci": "2.0.0",
-        "is-installed-globally": "0.1.0",
-        "is-npm": "3.0.0",
-        "is-yarn-global": "0.3.0",
-        "latest-version": "5.1.0",
-        "semver-diff": "2.1.0",
-        "xdg-basedir": "3.0.0"
+        "boxen": "^3.0.0",
+        "chalk": "^2.0.1",
+        "configstore": "^4.0.0",
+        "has-yarn": "^2.1.0",
+        "import-lazy": "^2.1.0",
+        "is-ci": "^2.0.0",
+        "is-installed-globally": "^0.1.0",
+        "is-npm": "^3.0.0",
+        "is-yarn-global": "^0.3.0",
+        "latest-version": "^5.0.0",
+        "semver-diff": "^2.0.0",
+        "xdg-basedir": "^3.0.0"
       }
     },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
       "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -15973,7 +15350,8 @@
     "urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "dev": true
     },
     "url": {
       "version": "0.11.0",
@@ -15999,8 +15377,8 @@
       "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
       "dev": true,
       "requires": {
-        "querystringify": "2.1.1",
-        "requires-port": "1.0.0"
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
       }
     },
     "url-parse-lax": {
@@ -16009,7 +15387,7 @@
       "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
       "dev": true,
       "requires": {
-        "prepend-http": "2.0.0"
+        "prepend-http": "^2.0.0"
       },
       "dependencies": {
         "prepend-http": {
@@ -16029,7 +15407,8 @@
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true
     },
     "user-home": {
       "version": "2.0.0",
@@ -16056,8 +15435,8 @@
           "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
           "dev": true,
           "requires": {
-            "pseudomap": "1.0.2",
-            "yallist": "2.1.2"
+            "pseudomap": "^1.0.2",
+            "yallist": "^2.1.2"
           }
         },
         "yallist": {
@@ -16088,7 +15467,8 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
     },
     "util-promisify": {
       "version": "2.1.0",
@@ -16096,7 +15476,7 @@
       "integrity": "sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=",
       "dev": true,
       "requires": {
-        "object.getownpropertydescriptors": "2.0.3"
+        "object.getownpropertydescriptors": "^2.0.3"
       }
     },
     "util.promisify": {
@@ -16127,7 +15507,7 @@
       "integrity": "sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==",
       "dev": true,
       "requires": {
-        "homedir-polyfill": "1.0.3"
+        "homedir-polyfill": "^1.0.1"
       }
     },
     "validate-npm-package-license": {
@@ -16136,8 +15516,8 @@
       "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
       "dev": true,
       "requires": {
-        "spdx-correct": "3.1.0",
-        "spdx-expression-parse": "3.0.0"
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
       }
     },
     "validate-npm-package-name": {
@@ -16178,12 +15558,12 @@
       "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
       "dev": true,
       "requires": {
-        "clone": "2.1.2",
-        "clone-buffer": "1.0.0",
-        "clone-stats": "1.0.0",
-        "cloneable-readable": "1.1.3",
-        "remove-trailing-separator": "1.1.0",
-        "replace-ext": "1.0.0"
+        "clone": "^2.1.1",
+        "clone-buffer": "^1.0.0",
+        "clone-stats": "^1.0.0",
+        "cloneable-readable": "^1.0.0",
+        "remove-trailing-separator": "^1.0.1",
+        "replace-ext": "^1.0.0"
       }
     },
     "vinyl-fs": {
@@ -16234,12 +15614,6 @@
         "vinyl": "^2.0.0"
       }
     },
-    "viz.js": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/viz.js/-/viz.js-1.8.2.tgz",
-      "integrity": "sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ==",
-      "dev": true
-    },
     "vm-browserify": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz",
@@ -16297,25 +15671,25 @@
         "@webassemblyjs/helper-module-context": "1.8.5",
         "@webassemblyjs/wasm-edit": "1.8.5",
         "@webassemblyjs/wasm-parser": "1.8.5",
-        "acorn": "6.3.0",
-        "ajv": "6.10.2",
-        "ajv-keywords": "3.4.1",
-        "chrome-trace-event": "1.0.2",
-        "enhanced-resolve": "4.1.0",
-        "eslint-scope": "4.0.3",
-        "json-parse-better-errors": "1.0.2",
-        "loader-runner": "2.4.0",
-        "loader-utils": "1.2.3",
-        "memory-fs": "0.4.1",
-        "micromatch": "3.1.10",
-        "mkdirp": "0.5.1",
-        "neo-async": "2.6.1",
-        "node-libs-browser": "2.2.1",
-        "schema-utils": "1.0.0",
-        "tapable": "1.1.3",
-        "terser-webpack-plugin": "1.4.1",
-        "watchpack": "1.6.0",
-        "webpack-sources": "1.4.3"
+        "acorn": "^6.2.1",
+        "ajv": "^6.10.2",
+        "ajv-keywords": "^3.4.1",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^4.1.0",
+        "eslint-scope": "^4.0.3",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^2.4.0",
+        "loader-utils": "^1.2.3",
+        "memory-fs": "^0.4.1",
+        "micromatch": "^3.1.10",
+        "mkdirp": "^0.5.1",
+        "neo-async": "^2.6.1",
+        "node-libs-browser": "^2.2.1",
+        "schema-utils": "^1.0.0",
+        "tapable": "^1.1.3",
+        "terser-webpack-plugin": "^1.4.1",
+        "watchpack": "^1.6.0",
+        "webpack-sources": "^1.4.1"
       },
       "dependencies": {
         "acorn": {
@@ -16330,10 +15704,10 @@
           "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "2.0.1",
-            "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.4.1",
-            "uri-js": "4.2.2"
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         }
       }
@@ -16371,10 +15745,10 @@
       "integrity": "sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==",
       "dev": true,
       "requires": {
-        "memory-fs": "0.4.1",
-        "mime": "2.4.4",
-        "range-parser": "1.2.1",
-        "webpack-log": "2.0.0"
+        "memory-fs": "^0.4.1",
+        "mime": "^2.4.2",
+        "range-parser": "^1.2.1",
+        "webpack-log": "^2.0.0"
       },
       "dependencies": {
         "mime": {
@@ -16392,37 +15766,37 @@
       "dev": true,
       "requires": {
         "ansi-html": "0.0.7",
-        "bonjour": "3.5.0",
-        "chokidar": "2.1.8",
-        "compression": "1.7.4",
-        "connect-history-api-fallback": "1.6.0",
-        "debug": "4.1.1",
-        "del": "4.1.1",
-        "express": "4.17.1",
-        "html-entities": "1.2.1",
-        "http-proxy-middleware": "0.19.1",
-        "import-local": "2.0.0",
-        "internal-ip": "4.3.0",
-        "ip": "1.1.5",
-        "is-absolute-url": "3.0.3",
-        "killable": "1.0.1",
-        "loglevel": "1.6.4",
-        "opn": "5.5.0",
-        "p-retry": "3.0.1",
-        "portfinder": "1.0.24",
-        "schema-utils": "1.0.0",
-        "selfsigned": "1.10.7",
-        "semver": "6.3.0",
-        "serve-index": "1.9.1",
+        "bonjour": "^3.5.0",
+        "chokidar": "^2.1.6",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^1.6.0",
+        "debug": "^4.1.1",
+        "del": "^4.1.1",
+        "express": "^4.17.1",
+        "html-entities": "^1.2.1",
+        "http-proxy-middleware": "^0.19.1",
+        "import-local": "^2.0.0",
+        "internal-ip": "^4.3.0",
+        "ip": "^1.1.5",
+        "is-absolute-url": "^3.0.0",
+        "killable": "^1.0.1",
+        "loglevel": "^1.6.3",
+        "opn": "^5.5.0",
+        "p-retry": "^3.0.1",
+        "portfinder": "^1.0.21",
+        "schema-utils": "^1.0.0",
+        "selfsigned": "^1.10.4",
+        "semver": "^6.3.0",
+        "serve-index": "^1.9.1",
         "sockjs": "0.3.19",
         "sockjs-client": "1.3.0",
-        "spdy": "4.0.1",
-        "strip-ansi": "3.0.1",
-        "supports-color": "6.1.0",
-        "url": "0.11.0",
-        "webpack-dev-middleware": "3.7.0",
-        "webpack-log": "2.0.0",
-        "ws": "6.2.1",
+        "spdy": "^4.0.1",
+        "strip-ansi": "^3.0.1",
+        "supports-color": "^6.1.0",
+        "url": "^0.11.0",
+        "webpack-dev-middleware": "^3.7.0",
+        "webpack-log": "^2.0.0",
+        "ws": "^6.2.1",
         "yargs": "12.0.5"
       },
       "dependencies": {
@@ -16438,18 +15812,18 @@
           "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
           "dev": true,
           "requires": {
-            "anymatch": "2.0.0",
-            "async-each": "1.0.3",
-            "braces": "2.3.2",
-            "fsevents": "1.2.9",
-            "glob-parent": "3.1.0",
-            "inherits": "2.0.4",
-            "is-binary-path": "1.0.1",
-            "is-glob": "4.0.1",
-            "normalize-path": "3.0.0",
-            "path-is-absolute": "1.0.1",
-            "readdirp": "2.2.1",
-            "upath": "1.2.0"
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
           }
         },
         "cliui": {
@@ -16458,9 +15832,9 @@
           "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
           "dev": true,
           "requires": {
-            "string-width": "2.1.1",
-            "strip-ansi": "4.0.0",
-            "wrap-ansi": "2.1.0"
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
           },
           "dependencies": {
             "strip-ansi": {
@@ -16469,7 +15843,7 @@
               "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "3.0.0"
+                "ansi-regex": "^3.0.0"
               }
             }
           }
@@ -16480,7 +15854,7 @@
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "ms": "^2.1.1"
           }
         },
         "invert-kv": {
@@ -16501,7 +15875,7 @@
           "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
           "dev": true,
           "requires": {
-            "invert-kv": "2.0.0"
+            "invert-kv": "^2.0.0"
           }
         },
         "mem": {
@@ -16510,9 +15884,9 @@
           "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
           "dev": true,
           "requires": {
-            "map-age-cleaner": "0.1.3",
-            "mimic-fn": "2.1.0",
-            "p-is-promise": "2.1.0"
+            "map-age-cleaner": "^0.1.1",
+            "mimic-fn": "^2.0.0",
+            "p-is-promise": "^2.0.0"
           }
         },
         "ms": {
@@ -16533,9 +15907,9 @@
           "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
           "dev": true,
           "requires": {
-            "execa": "1.0.0",
-            "lcid": "2.0.0",
-            "mem": "4.3.0"
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.0"
           }
         },
         "semver": {
@@ -16550,8 +15924,8 @@
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "2.0.0",
-            "strip-ansi": "4.0.0"
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^4.0.0"
           },
           "dependencies": {
             "strip-ansi": {
@@ -16560,7 +15934,7 @@
               "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
               "dev": true,
               "requires": {
-                "ansi-regex": "3.0.0"
+                "ansi-regex": "^3.0.0"
               }
             }
           }
@@ -16577,18 +15951,18 @@
           "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
           "dev": true,
           "requires": {
-            "cliui": "4.1.0",
-            "decamelize": "1.2.0",
-            "find-up": "3.0.0",
-            "get-caller-file": "1.0.3",
-            "os-locale": "3.1.0",
-            "require-directory": "2.1.1",
-            "require-main-filename": "1.0.1",
-            "set-blocking": "2.0.0",
-            "string-width": "2.1.1",
-            "which-module": "2.0.0",
-            "y18n": "4.0.0",
-            "yargs-parser": "11.1.1"
+            "cliui": "^4.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^3.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1 || ^4.0.0",
+            "yargs-parser": "^11.1.1"
           }
         },
         "yargs-parser": {
@@ -16597,8 +15971,8 @@
           "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
           "dev": true,
           "requires": {
-            "camelcase": "5.3.1",
-            "decamelize": "1.2.0"
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
           }
         }
       }
@@ -16622,19 +15996,14 @@
         "lodash": "^4.17.5"
       }
     },
-    "webpack-node-externals": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.7.2.tgz",
-      "integrity": "sha512-ajerHZ+BJKeCLviLUUmnyd5B4RavLF76uv3cs6KNuO8W+HuQaEs0y0L7o40NQxdPy5w0pcv8Ew7yPUAQG0UdCg=="
-    },
     "webpack-sources": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
       "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
       "dev": true,
       "requires": {
-        "source-list-map": "2.0.1",
-        "source-map": "0.6.1"
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
       },
       "dependencies": {
         "source-map": {
@@ -16660,9 +16029,9 @@
       "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==",
       "dev": true,
       "requires": {
-        "http-parser-js": "0.4.10",
-        "safe-buffer": "5.1.2",
-        "websocket-extensions": "0.1.3"
+        "http-parser-js": ">=0.4.0 <0.4.11",
+        "safe-buffer": ">=5.1.0",
+        "websocket-extensions": ">=0.1.1"
       }
     },
     "websocket-extensions": {
@@ -16746,7 +16115,7 @@
       "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
       "dev": true,
       "requires": {
-        "errno": "0.1.7"
+        "errno": "~0.1.7"
       }
     },
     "worker-plugin": {
@@ -16755,7 +16124,7 @@
       "integrity": "sha512-W5nRkw7+HlbsEt3qRP6MczwDDISjiRj2GYt9+bpe8A2La00TmJdwzG5bpdMXhRt1qcWmwAvl1TiKaHRa+XDS9Q==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.2.3"
+        "loader-utils": "^1.1.0"
       }
     },
     "wrap-ansi": {
@@ -16789,9 +16158,9 @@
       "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
       "dev": true,
       "requires": {
-        "graceful-fs": "4.2.2",
-        "imurmurhash": "0.1.4",
-        "signal-exit": "3.0.2"
+        "graceful-fs": "^4.1.11",
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.2"
       }
     },
     "ws": {
@@ -16800,7 +16169,7 @@
       "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
       "dev": true,
       "requires": {
-        "async-limiter": "1.0.1"
+        "async-limiter": "~1.0.0"
       }
     },
     "xdg-basedir": {
@@ -16893,19 +16262,19 @@
       "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
       "dev": true,
       "requires": {
-        "camelcase": "3.0.0",
-        "cliui": "3.2.0",
-        "decamelize": "1.2.0",
-        "get-caller-file": "1.0.3",
-        "os-locale": "1.4.0",
-        "read-pkg-up": "1.0.1",
-        "require-directory": "2.1.1",
-        "require-main-filename": "1.0.1",
-        "set-blocking": "2.0.0",
-        "string-width": "1.0.2",
-        "which-module": "1.0.0",
-        "y18n": "3.2.1",
-        "yargs-parser": "5.0.0"
+        "camelcase": "^3.0.0",
+        "cliui": "^3.2.0",
+        "decamelize": "^1.1.1",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^1.4.0",
+        "read-pkg-up": "^1.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^1.0.2",
+        "which-module": "^1.0.0",
+        "y18n": "^3.2.1",
+        "yargs-parser": "^5.0.0"
       },
       "dependencies": {
         "camelcase": {
@@ -16945,7 +16314,7 @@
       "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
       "dev": true,
       "requires": {
-        "buffer-crc32": "0.2.13"
+        "buffer-crc32": "~0.2.3"
       }
     },
     "yeast": {

From 875c9c949d25e7a5288f010092d30ab3a2510281 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Sun, 5 Apr 2020 14:45:27 +0100
Subject: [PATCH 006/176] Package update

---
 package-lock.json | 90 ++++++++++++++++++++++++++++++++++++++++++++---
 package.json      |  2 +-
 2 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index de9410d41f..53ddb2da46 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3084,6 +3084,11 @@
         }
       }
     },
+    "brace": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/brace/-/brace-0.11.1.tgz",
+      "integrity": "sha1-SJb8ydVE7vRfS7dmDbMg07N5/lg="
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -14097,11 +14102,86 @@
       "dev": true
     },
     "stratos-angular6-json-schema-form": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/stratos-angular6-json-schema-form/-/stratos-angular6-json-schema-form-7.0.6.tgz",
-      "integrity": "sha512-S/yasSZ+1YNPsiTARCqaPOW8+5ob+9jfOO0XxJ/myDlSTtgoNb4nGnl3LWlEFwMUWiOjkOUVyyVlBsiK5vIBTg==",
-      "requires": {
-        "tslib": "^1.9.0"
+      "version": "github:nwmac/ajsf#8c88d9a8a6b75e8bf39ab0151bbcd7a85d3aef7a",
+      "from": "github:nwmac/ajsf",
+      "requires": {
+        "@angular/animations": "^9.0.4",
+        "@angular/cdk": "^9.2.0",
+        "@angular/common": "^9.0.4",
+        "@angular/compiler": "^9.0.4",
+        "@angular/core": "^9.0.4",
+        "@angular/flex-layout": "^9.0.0-beta.29",
+        "@angular/forms": "^9.0.4",
+        "@angular/material": "^9.2.0",
+        "@angular/platform-browser": "^9.0.4",
+        "@angular/platform-browser-dynamic": "^9.0.4",
+        "@angular/router": "^9.0.4",
+        "brace": "^0.11.1",
+        "core-js": "^3.6.4",
+        "lodash-es": "^4.17.15",
+        "rxjs": "^6.5.2",
+        "tslib": "^1.10.0",
+        "zone.js": "~0.10.2"
+      },
+      "dependencies": {
+        "@angular/animations": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-9.1.0.tgz",
+          "integrity": "sha512-o7X3HM+eocoryw3VrDUtG6Wci2KwtzyBFo3KBJXjQ16X6fwdkjTG+hLb7pp2CBFBEJW4tPYEy7cSBmEfMRTqag=="
+        },
+        "@angular/cdk": {
+          "version": "9.2.0",
+          "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-9.2.0.tgz",
+          "integrity": "sha512-jeeznvNDpR9POuxzz8Y0zFvMynG9HCJo3ZPTqOjlOq8Lj8876+rLsHDvKEMeLdwlkdi1EweYJW1CLQzI+TwqDA==",
+          "requires": {
+            "parse5": "^5.0.0"
+          }
+        },
+        "@angular/common": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/@angular/common/-/common-9.1.0.tgz",
+          "integrity": "sha512-6JPLNtMhI03bGTVQJeSwc+dTjV6DtP7M/BAyzIV0InZP1D6XsOh2QahLFIaaN2sSxYA2ClKuwfX1v+rx9AbXQA=="
+        },
+        "@angular/compiler": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.1.0.tgz",
+          "integrity": "sha512-QHw/JSeTXHiJQ2Ih0EtU7FGsYcOr+0hwZhqwSW3EEn8TtUgA3DS5lXeiDV66f+3DdvNZFPmgiZIvun3ypxn1HA=="
+        },
+        "@angular/core": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.1.0.tgz",
+          "integrity": "sha512-RVlyegdIAij0P1wLY5ObIdsBAzvmHkHfElnmfiNKhaDftP6U/3zRtaKDu0bq0jvn1WCQ8zXxFQ8AWyKZwyFS+w=="
+        },
+        "@angular/forms": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-9.1.0.tgz",
+          "integrity": "sha512-5GC8HQlPChPV+168zLlm4yj4syA6N9ChSKV0tmzj1zIfMcub1UAOaB9IYaXRHQsjPFh9OuQXwmkzScyAfhEVjA=="
+        },
+        "@angular/material": {
+          "version": "9.2.0",
+          "resolved": "https://registry.npmjs.org/@angular/material/-/material-9.2.0.tgz",
+          "integrity": "sha512-KKzEIVh6/m56m+Ao8p4PK0SyEr0574l3VP2swj1qPag3u+FYgemmXCGTaChrKdDsez+zeTCPXImBGXzE6NQ80Q=="
+        },
+        "@angular/platform-browser": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-9.1.0.tgz",
+          "integrity": "sha512-OsS/blUjl8ranmDaRADjFAmvnlmwbT6WNU7dVov7FhV0rqesbwaOJ5bR0LSYHYpej7Jaa6oYk0v0XWkaH9LTFg=="
+        },
+        "@angular/platform-browser-dynamic": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.1.0.tgz",
+          "integrity": "sha512-sMtz/poQ3TYaWZzWjrn9apKUZ/WKql2MYCWbpax7pql3GgC9OoTslc7ZEe7/d3ynfFE/CQqWBBOuWGD71Z0LMQ=="
+        },
+        "@angular/router": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.1.0.tgz",
+          "integrity": "sha512-cExO1nPnoPFiUJWZ28hTHozPLFoCmqr3xqcM57We0hhKE0esdrO+gRWKRH0EJERukLbU8coPKVhA8daGUpASiQ=="
+        },
+        "core-js": {
+          "version": "3.6.4",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
+          "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw=="
+        }
       }
     },
     "stratos-protractor-reporter": {
diff --git a/package.json b/package.json
index c9d8de8f45..fa7d7b6075 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "rxjs": "^6.2.0",
     "rxjs-spy": "^7.0.2",
     "rxjs-websockets": "~8.0.0",
-    "stratos-angular6-json-schema-form": "^7.0.6",
+    "stratos-angular6-json-schema-form": "nwmac/ajsf",
     "ts-md5": "^1.2.4",
     "web-animations-js": "^2.3.2",
     "xterm": "^4.0.2",

From bae8e49289cbd39975f73f8ad84634aec41c8cf7 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Sun, 5 Apr 2020 14:46:58 +0100
Subject: [PATCH 007/176] Package update

---
 package-lock.json | 23 +++++++++++++++++++----
 package.json      |  4 ++--
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 53ddb2da46..ed5e742515 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15073,9 +15073,9 @@
       "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
     },
     "tslint": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.0.tgz",
-      "integrity": "sha512-fXjYd/61vU6da04E505OZQGb2VCN2Mq3doeWcOIryuG+eqdmFUXTYVwdhnbEu2k46LNLgUYt9bI5icQze/j0bQ==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.1.tgz",
+      "integrity": "sha512-kd6AQ/IgPRpLn6g5TozqzPdGNZ0q0jtXW4//hRcj10qLYBaa3mTUU2y2MCG+RXZm8Zx+KZi0eA+YCrMyNlF4UA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
@@ -15086,7 +15086,7 @@
         "glob": "^7.1.1",
         "js-yaml": "^3.13.1",
         "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
+        "mkdirp": "^0.5.3",
         "resolve": "^1.3.2",
         "semver": "^5.3.0",
         "tslib": "^1.10.0",
@@ -15098,6 +15098,21 @@
           "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
           "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
           "dev": true
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
         }
       }
     },
diff --git a/package.json b/package.json
index fa7d7b6075..b61afba2d8 100644
--- a/package.json
+++ b/package.json
@@ -138,13 +138,13 @@
     "replace-in-file": "^4.1.3",
     "request": "^2.88.0",
     "request-promise-native": "^1.0.7",
-    "rxjs-tslint": "^0.1.5",
+    "rxjs-tslint": "^0.1.7",
     "sass-lint": "^1.12.1",
     "stratos-protractor-reporter": "^1.2.3",
     "ts-node": "~8.4.1",
     "tsickle": "^0.37.0",
     "tslib": "^1.9.0",
-    "tslint": "~6.1.0",
+    "tslint": "~6.1.1",
     "typescript": "<3.6.0"
   }
 }

From c2626495638980aa39d89babea901131db1ffa14 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 6 Apr 2020 19:49:52 +0100
Subject: [PATCH 008/176] Angular 9 migration

---
 .npmrc                                        |    2 +
 angular.json                                  |   37 +-
 package-lock.json                             | 9083 +++++++++++------
 package.json                                  |  126 +-
 .../card-autoscaler-default.component.ts      |    2 +-
 .../combo-chart/combo-chart.component.ts      |    2 +-
 .../cf-autoscaler/tsconfig.lib.prod.json      |    6 +
 .../log-stream-tab.component.ts               |    2 +-
 .../deploy-application-step2.component.ts     |    2 +-
 ...-foundry-organization-summary.component.ts |    2 +-
 .../manage-users-set-usernames.component.ts   |    2 +-
 .../add-service-instance.component.spec.ts    |    2 +-
 .../bind-apps-step.component.spec.ts          |    2 +-
 .../specify-details-step.component.spec.ts    |    2 +-
 .../shared/components/components.module.ts    |    2 +-
 .../event-metadata.component.ts               |    2 +-
 .../list-types/cf-users/cf-permission-cell.ts |    3 +-
 .../schema-form/schema-form.component.spec.ts |    2 +-
 .../schema-form/schema-form.component.ts      |    2 +-
 .../cloud-foundry/tsconfig.lib.prod.json      |    6 +
 src/frontend/packages/core/src/app.module.ts  |    7 +-
 .../packages/core/src/core/md.module.ts       |    2 +-
 .../edit-quota-step.component.ts              |    2 +-
 .../edit-space-quota-step.component.ts        |    2 +-
 .../dashboard-base.component.ts               |    8 +-
 .../create-endpoint-cf-step-1.component.ts    |    6 +-
 .../packages/core/src/route-reuse-stragegy.ts |    2 +
 .../dialog-confirm.component.spec.ts          |    2 +-
 .../app-table-cell-default.component.ts       |    5 +-
 .../list-table/table-cell-status.directive.ts |    2 +-
 .../endpoint-card/endpoint-card.component.ts  |    4 +-
 .../shared/components/list/list.component.ts  |    4 +-
 .../components/list/list.component.types.ts   |    2 +
 .../no-content-message.component.ts           |    2 +-
 src/frontend/packages/core/tsconfig.app.json  |   12 +-
 .../store/src/entity-catalog.module.ts        |    2 +-
 .../packages/store/tsconfig.lib.prod.json     |    6 +
 37 files changed, 6005 insertions(+), 3354 deletions(-)
 create mode 100644 .npmrc
 create mode 100644 src/frontend/packages/cf-autoscaler/tsconfig.lib.prod.json
 create mode 100644 src/frontend/packages/cloud-foundry/tsconfig.lib.prod.json
 create mode 100644 src/frontend/packages/store/tsconfig.lib.prod.json

diff --git a/.npmrc b/.npmrc
new file mode 100644
index 0000000000..dbde4965c9
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1,2 @@
+@nwmac:registry=https://npm.pkg.github.com
+
diff --git a/angular.json b/angular.json
index 43d24281ff..12d5d6f658 100644
--- a/angular.json
+++ b/angular.json
@@ -11,6 +11,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "aot": true,
             "preserveSymlinks": true,
             "outputPath": "dist",
             "index": "src/frontend/packages/core/src/index.html",
@@ -35,6 +36,12 @@
           },
           "configurations": {
             "production": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
@@ -101,6 +108,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "aot": true,
             "preserveSymlinks": true,
             "outputPath": "dist/core",
             "index": "src/frontend/packages/core/src/index.html",
@@ -124,6 +132,12 @@
           },
           "configurations": {
             "production": {
+              "budgets": [
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb"
+                }
+              ],
               "fileReplacements": [
                 {
                   "replace": "src/frontend/packages/core/src/environments/environment.ts",
@@ -216,7 +230,12 @@
             "tsConfig": "src/frontend/packages/store/tsconfig.lib.json",
             "project": "src/frontend/packages/store/ng-package.json"
           }
-        },
+        ,          "configurations": {
+            "production": {
+              "tsConfig": "src/frontend/packages/store/tsconfig.lib.prod.json"
+            }
+          }
+},
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
@@ -254,7 +273,12 @@
             "tsConfig": "src/frontend/packages/cloud-foundry/tsconfig.lib.json",
             "project": "src/frontend/packages/cloud-foundry/ng-package.json"
           }
-        },
+        ,          "configurations": {
+            "production": {
+              "tsConfig": "src/frontend/packages/cloud-foundry/tsconfig.lib.prod.json"
+            }
+          }
+},
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
@@ -292,7 +316,12 @@
             "tsConfig": "src/frontend/packages/cf-autoscaler/tsconfig.lib.json",
             "project": "src/frontend/packages/cf-autoscaler/ng-package.json"
           }
-        },
+        ,          "configurations": {
+            "production": {
+              "tsConfig": "src/frontend/packages/cf-autoscaler/tsconfig.lib.prod.json"
+            }
+          }
+},
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
@@ -323,7 +352,7 @@
   "schematics": {
     "@schematics/angular:component": {
       "prefix": "app",
-      "styleext": "scss"
+      "style": "scss"
     },
     "@schematics/angular:directive": {
       "prefix": "app"
diff --git a/package-lock.json b/package-lock.json
index ed5e742515..7110fb959f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,19 +5,19 @@
   "requires": true,
   "dependencies": {
     "@angular-devkit/architect": {
-      "version": "0.803.7",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.7.tgz",
-      "integrity": "sha512-8cjg4BnLNbCc3YwPzuAjnt4oKHJmYr7IvdcLockrp9MZqxaNbSs9cy55iFKZyz3eGahYpTxxRa4oTUQsxRT3fQ==",
+      "version": "0.901.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.0.tgz",
+      "integrity": "sha512-SlqEBkPrT40zMCy5344AsUqC76pEPCaGPaAkCIvadaz2dC9vNMzQrvubCPJHViD/TumkSX1kYmLS3iYASVM9GQ==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "8.3.7",
-        "rxjs": "6.4.0"
+        "@angular-devkit/core": "9.1.0",
+        "rxjs": "6.5.4"
       },
       "dependencies": {
         "rxjs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
+          "version": "6.5.4",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
+          "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
@@ -26,85 +26,78 @@
       }
     },
     "@angular-devkit/build-angular": {
-      "version": "0.803.7",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.803.7.tgz",
-      "integrity": "sha512-Rvd0JXstVWmdEY4+0lLJEdFEQuZD2fcVvIJPQGzJt1ExycDliP6ebrhjeWOpLuRCgUU2/CObHgh2rVEDDKeMHg==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/architect": "0.803.7",
-        "@angular-devkit/build-optimizer": "0.803.7",
-        "@angular-devkit/build-webpack": "0.803.7",
-        "@angular-devkit/core": "8.3.7",
-        "@babel/core": "7.5.5",
-        "@babel/preset-env": "7.5.5",
-        "@ngtools/webpack": "8.3.7",
-        "ajv": "6.10.2",
-        "autoprefixer": "9.6.1",
-        "browserslist": "4.6.6",
-        "cacache": "12.0.2",
-        "caniuse-lite": "1.0.30000989",
+      "version": "0.901.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.901.0.tgz",
+      "integrity": "sha512-ftJVNlKvIomqRfr5jFVraPqlLSUJu8YyVbFv/aCsvhNpuZGkYpTOMoJDwyywdslSTH608BIoU63IAnIz9PwUdw==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/architect": "0.901.0",
+        "@angular-devkit/build-optimizer": "0.901.0",
+        "@angular-devkit/build-webpack": "0.901.0",
+        "@angular-devkit/core": "9.1.0",
+        "@babel/core": "7.9.0",
+        "@babel/generator": "7.9.3",
+        "@babel/preset-env": "7.9.0",
+        "@babel/template": "7.8.6",
+        "@jsdevtools/coverage-istanbul-loader": "3.0.3",
+        "@ngtools/webpack": "9.1.0",
+        "ajv": "6.12.0",
+        "autoprefixer": "9.7.4",
+        "babel-loader": "8.0.6",
+        "browserslist": "^4.9.1",
+        "cacache": "15.0.0",
+        "caniuse-lite": "^1.0.30001032",
         "circular-dependency-plugin": "5.2.0",
-        "clean-css": "4.2.1",
-        "copy-webpack-plugin": "5.0.4",
-        "core-js": "3.2.1",
-        "file-loader": "4.2.0",
-        "find-cache-dir": "3.0.0",
-        "glob": "7.1.4",
-        "istanbul-instrumenter-loader": "3.0.1",
-        "jest-worker": "24.9.0",
+        "copy-webpack-plugin": "5.1.1",
+        "core-js": "3.6.4",
+        "cssnano": "4.1.10",
+        "file-loader": "6.0.0",
+        "find-cache-dir": "3.3.1",
+        "glob": "7.1.6",
+        "jest-worker": "25.1.0",
         "karma-source-map-support": "1.4.0",
-        "less": "3.9.0",
+        "less": "3.11.1",
         "less-loader": "5.0.0",
-        "license-webpack-plugin": "2.1.2",
-        "loader-utils": "1.2.3",
-        "mini-css-extract-plugin": "0.8.0",
+        "license-webpack-plugin": "2.1.4",
+        "loader-utils": "2.0.0",
+        "mini-css-extract-plugin": "0.9.0",
         "minimatch": "3.0.4",
-        "open": "6.4.0",
+        "open": "7.0.3",
         "parse5": "4.0.0",
-        "postcss": "7.0.17",
+        "postcss": "7.0.27",
         "postcss-import": "12.0.1",
         "postcss-loader": "3.0.0",
-        "raw-loader": "3.1.0",
-        "regenerator-runtime": "0.13.3",
-        "rxjs": "6.4.0",
-        "sass": "1.22.9",
-        "sass-loader": "7.2.0",
-        "semver": "6.3.0",
+        "raw-loader": "4.0.0",
+        "regenerator-runtime": "0.13.5",
+        "rimraf": "3.0.2",
+        "rollup": "2.1.0",
+        "rxjs": "6.5.4",
+        "sass": "1.26.3",
+        "sass-loader": "8.0.2",
+        "semver": "7.1.3",
         "source-map": "0.7.3",
         "source-map-loader": "0.2.4",
-        "source-map-support": "0.5.13",
+        "source-map-support": "0.5.16",
         "speed-measure-webpack-plugin": "1.3.1",
-        "style-loader": "1.0.0",
-        "stylus": "0.54.5",
+        "style-loader": "1.1.3",
+        "stylus": "0.54.7",
         "stylus-loader": "3.0.2",
-        "terser": "4.1.4",
-        "terser-webpack-plugin": "1.4.1",
-        "tree-kill": "1.2.1",
-        "webpack": "4.39.2",
-        "webpack-dev-middleware": "3.7.0",
-        "webpack-dev-server": "3.8.0",
-        "webpack-merge": "4.2.1",
+        "terser": "4.6.7",
+        "terser-webpack-plugin": "2.3.5",
+        "tree-kill": "1.2.2",
+        "webpack": "4.42.0",
+        "webpack-dev-middleware": "3.7.2",
+        "webpack-dev-server": "3.10.3",
+        "webpack-merge": "4.2.2",
         "webpack-sources": "1.4.3",
-        "webpack-subresource-integrity": "1.1.0-rc.6",
-        "worker-plugin": "3.2.0"
+        "webpack-subresource-integrity": "1.4.0",
+        "worker-plugin": "4.0.2"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
         "glob": {
-          "version": "7.1.4",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
           "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -121,19 +114,28 @@
           "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
           "dev": true
         },
+        "rimraf": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
         "rxjs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
+          "version": "6.5.4",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
+          "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
           }
         },
         "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "version": "7.1.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz",
+          "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==",
           "dev": true
         },
         "source-map": {
@@ -145,19 +147,19 @@
       }
     },
     "@angular-devkit/build-ng-packagr": {
-      "version": "0.803.7",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-ng-packagr/-/build-ng-packagr-0.803.7.tgz",
-      "integrity": "sha512-ZQG7ClH6BTbgaM6PMIjnUJNaSilP55yYVqnNQZ2dTisFrYNbu5OpNWzWcIME1znaW7VItXJELLgIwBjHJAWlpA==",
+      "version": "0.901.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-ng-packagr/-/build-ng-packagr-0.901.0.tgz",
+      "integrity": "sha512-cUQKK7+bYi3fOmq41cfr1ZFQwqAUUm0Yz7DgH34Ek7D98XudNOxJ63Xv4manId528WhqyGDP5/2tut7QNV3VJA==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.803.7",
-        "rxjs": "6.4.0"
+        "@angular-devkit/architect": "0.901.0",
+        "rxjs": "6.5.4"
       },
       "dependencies": {
         "rxjs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
+          "version": "6.5.4",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
+          "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
@@ -166,15 +168,15 @@
       }
     },
     "@angular-devkit/build-optimizer": {
-      "version": "0.803.7",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.803.7.tgz",
-      "integrity": "sha512-tk6z/QKw2OM++6OTUiUXp/pAwKFyyvfJmzrsXdHqmBZyrqGPU1fcSOfuJCSGjjwjpiQ7tjSVHf/ZvZHakdOoOQ==",
+      "version": "0.901.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.901.0.tgz",
+      "integrity": "sha512-Y9sz8uf2zjilhPUVYb0K9Mio6c1d5c+csuDc15CCKzELXJwyyDxilIFgn6Eu+edM0HNQGzbIwkjy4DkR9mtuTQ==",
       "dev": true,
       "requires": {
-        "loader-utils": "1.2.3",
+        "loader-utils": "2.0.0",
         "source-map": "0.7.3",
-        "tslib": "1.10.0",
-        "typescript": "3.5.3",
+        "tslib": "1.11.1",
+        "typescript": "3.8.3",
         "webpack-sources": "1.4.3"
       },
       "dependencies": {
@@ -183,31 +185,24 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
           "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
           "dev": true
-        },
-        "typescript": {
-          "version": "3.5.3",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz",
-          "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==",
-          "dev": true
         }
       }
     },
     "@angular-devkit/build-webpack": {
-      "version": "0.803.7",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.803.7.tgz",
-      "integrity": "sha512-hBFqPTMhQn0BhjhZ5kd69cknWeQu1o0v/+yJbF5otpn0c+QbjvI0Yq+ikF82rDFJIkO8UUjNCTBU6o6gdwW4pw==",
+      "version": "0.901.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.901.0.tgz",
+      "integrity": "sha512-Oze0VzIvHnoW12C80fiNH4HBu/GWmhJPXdNA7nRkU/tBQlIKnfngf8rQ0QbgecN2qdEXQpZJsP/XclTi3zugsg==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.803.7",
-        "@angular-devkit/core": "8.3.7",
-        "rxjs": "6.4.0",
-        "webpack-merge": "4.2.1"
+        "@angular-devkit/architect": "0.901.0",
+        "@angular-devkit/core": "9.1.0",
+        "rxjs": "6.5.4"
       },
       "dependencies": {
         "rxjs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
+          "version": "6.5.4",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
+          "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
@@ -216,34 +211,22 @@
       }
     },
     "@angular-devkit/core": {
-      "version": "8.3.7",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.7.tgz",
-      "integrity": "sha512-DByn3rUOg21rDZQXdIFbN7Dt0JgUc11kyP3TZb8kzXRKdpPZA4AwvtQ6tZveR4+n1dTDX38P1ZGDsO6bdMQivg==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.0.tgz",
+      "integrity": "sha512-vHTsrB4JaVUQ95FRnKrgo79Y3F6FokImrZdrmwkQmwAThpjXeXmpUEKZS+ZSTFRgesjiIysVGOFijARP4BQ7Bg==",
       "dev": true,
       "requires": {
-        "ajv": "6.10.2",
-        "fast-json-stable-stringify": "2.0.0",
-        "magic-string": "0.25.3",
-        "rxjs": "6.4.0",
+        "ajv": "6.12.0",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.5.4",
         "source-map": "0.7.3"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
         "rxjs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
+          "version": "6.5.4",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
+          "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
@@ -258,19 +241,20 @@
       }
     },
     "@angular-devkit/schematics": {
-      "version": "8.3.7",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.7.tgz",
-      "integrity": "sha512-xdWvSLU5tuFOaeAaeMQRY0VJbic1gWyPFifx6VcU5oxi9wQY6o1j7AWMeEcsGh+PCZEt0G9WJQIh73tcKRqkNg==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.0.tgz",
+      "integrity": "sha512-cb9PSvskMwWlL54fPfCcpJoyNDWAX6Wo7CzL5qpIB2cJCPLAuyfRUYYrkO77YUST+n2HvypHz0cZ5SNGMfaaBQ==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "8.3.7",
-        "rxjs": "6.4.0"
+        "@angular-devkit/core": "9.1.0",
+        "ora": "4.0.3",
+        "rxjs": "6.5.4"
       },
       "dependencies": {
         "rxjs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
+          "version": "6.5.4",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
+          "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
@@ -279,47 +263,44 @@
       }
     },
     "@angular/animations": {
-      "version": "8.2.9",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.9.tgz",
-      "integrity": "sha512-l30AF0d9P5okTPM1wieUHgcnDyGSNvyaBcxXSOkT790wAP2v5zs7VrKq9Lm+ICu4Nkx07KrOr5XLUHhqsg3VXA==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-9.1.0.tgz",
+      "integrity": "sha512-o7X3HM+eocoryw3VrDUtG6Wci2KwtzyBFo3KBJXjQ16X6fwdkjTG+hLb7pp2CBFBEJW4tPYEy7cSBmEfMRTqag=="
     },
     "@angular/cdk": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-8.2.2.tgz",
-      "integrity": "sha512-e+BtFab0Vd1q/ZVu6l850Q4vvgyVYiugSX31oMRlp86fKHPowlAO7jL3z5JcAG7TybpLIqd7oqF8XQBR/yw83w==",
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-9.2.0.tgz",
+      "integrity": "sha512-jeeznvNDpR9POuxzz8Y0zFvMynG9HCJo3ZPTqOjlOq8Lj8876+rLsHDvKEMeLdwlkdi1EweYJW1CLQzI+TwqDA==",
       "requires": {
-        "parse5": "^5.0.0",
-        "tslib": "^1.7.1"
+        "parse5": "^5.0.0"
       }
     },
     "@angular/cli": {
-      "version": "8.3.7",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-8.3.7.tgz",
-      "integrity": "sha512-YZvF/+4vReqChaBA4pbsHO9/e/A6h1MUjPcUtQO4Ssp6hxTDJUnZfaMUzY0w0aZQSO31Phcw12qWtXZLqYn9Ww==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-9.1.0.tgz",
+      "integrity": "sha512-ofum4gPE/W3fKyzuJrpdHeOS0ZL8x0eYCgsrMyUoFodSpb5LWPqeW+56NgDTpIeny+Trx3pM9dr9QTUVTJ0vYg==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.803.7",
-        "@angular-devkit/core": "8.3.7",
-        "@angular-devkit/schematics": "8.3.7",
-        "@schematics/angular": "8.3.7",
-        "@schematics/update": "0.803.7",
+        "@angular-devkit/architect": "0.901.0",
+        "@angular-devkit/core": "9.1.0",
+        "@angular-devkit/schematics": "9.1.0",
+        "@schematics/angular": "9.1.0",
+        "@schematics/update": "0.901.0",
         "@yarnpkg/lockfile": "1.1.0",
         "ansi-colors": "4.1.1",
-        "debug": "^4.1.1",
+        "debug": "4.1.1",
         "ini": "1.3.5",
-        "inquirer": "6.5.1",
-        "npm-package-arg": "6.1.0",
-        "npm-pick-manifest": "3.0.2",
-        "open": "6.4.0",
-        "pacote": "9.5.5",
+        "inquirer": "7.1.0",
+        "npm-package-arg": "8.0.1",
+        "npm-pick-manifest": "6.0.0",
+        "open": "7.0.3",
+        "pacote": "11.1.4",
         "read-package-tree": "5.3.1",
-        "semver": "6.3.0",
+        "rimraf": "3.0.2",
+        "semver": "7.1.3",
         "symbol-observable": "1.2.0",
-        "universal-analytics": "^0.4.20",
-        "uuid": "^3.3.2"
+        "universal-analytics": "0.4.20",
+        "uuid": "7.0.2"
       },
       "dependencies": {
         "ansi-colors": {
@@ -343,139 +324,222 @@
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
+        "rimraf": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
         "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "version": "7.1.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz",
+          "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==",
+          "dev": true
+        },
+        "uuid": {
+          "version": "7.0.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.2.tgz",
+          "integrity": "sha512-vy9V/+pKG+5ZTYKf+VcphF5Oc6EFiu3W8Nv3P3zIh0EqVI80ZxOzuPfe9EHjkFNvf8+xuTHVeei4Drydlx4zjw==",
           "dev": true
         }
       }
     },
     "@angular/common": {
-      "version": "8.2.9",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.9.tgz",
-      "integrity": "sha512-76WDU1USlI5vAzqCJ3gxCQGuu57aJEggNk/xoWmQEXipiFTFBh2wSKn/dE6Txr/q3COTPIcrmb9OCeal5kQPIA==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-9.1.0.tgz",
+      "integrity": "sha512-6JPLNtMhI03bGTVQJeSwc+dTjV6DtP7M/BAyzIV0InZP1D6XsOh2QahLFIaaN2sSxYA2ClKuwfX1v+rx9AbXQA=="
     },
     "@angular/compiler": {
-      "version": "8.2.9",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.9.tgz",
-      "integrity": "sha512-oQho19DnOhEDNerCOGuGK95tcZ2oy4dSA5SykJmmniRnZzPM2++bJD32qJehXHy1K+3hv2zN9x7HPhqT3ljT6g==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.1.0.tgz",
+      "integrity": "sha512-QHw/JSeTXHiJQ2Ih0EtU7FGsYcOr+0hwZhqwSW3EEn8TtUgA3DS5lXeiDV66f+3DdvNZFPmgiZIvun3ypxn1HA=="
     },
     "@angular/compiler-cli": {
-      "version": "8.2.9",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-8.2.9.tgz",
-      "integrity": "sha512-tqGBKPf3SRYNEGGJbmjom//U/eAjnecDhGUw6o+VkYE/wxYd9pPcLmcEwwyXBpIPJAsN8RsjTikPuH0gcNE8bw==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-9.1.0.tgz",
+      "integrity": "sha512-xZ8mVPmPporSTtvNA+cbFJQymLzuWfMX6HDDgztZ2eZ5WcQJYloRN4CcYMEzDhCxfV1Zw9Tfc2l14jZD8osi6g==",
       "dev": true,
       "requires": {
         "canonical-path": "1.0.0",
-        "chokidar": "^2.1.1",
+        "chokidar": "^3.0.0",
         "convert-source-map": "^1.5.1",
         "dependency-graph": "^0.7.2",
+        "fs-extra": "4.0.2",
         "magic-string": "^0.25.0",
         "minimist": "^1.2.0",
         "reflect-metadata": "^0.1.2",
+        "semver": "^6.3.0",
         "source-map": "^0.6.1",
-        "tslib": "^1.9.0",
-        "yargs": "13.1.0"
+        "sourcemap-codec": "^1.4.8",
+        "yargs": "15.3.0"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
         },
-        "chokidar": {
-          "version": "2.1.8",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "dev": true,
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
+        "anymatch": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
           "dev": true,
           "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.3",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
             "normalize-path": "^3.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.2.1",
-            "upath": "^1.1.1"
+            "picomatch": "^2.0.4"
+          }
+        },
+        "binary-extensions": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
+          "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
+          "dev": true
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "chokidar": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz",
+          "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==",
+          "dev": true,
+          "requires": {
+            "anymatch": "~3.1.1",
+            "braces": "~3.0.2",
+            "fsevents": "~2.1.2",
+            "glob-parent": "~5.1.0",
+            "is-binary-path": "~2.1.0",
+            "is-glob": "~4.0.1",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.3.0"
           }
         },
         "cliui": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
           "dev": true,
           "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
-          },
-          "dependencies": {
-            "string-width": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-              "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-              "dev": true,
-              "requires": {
-                "is-fullwidth-code-point": "^2.0.0",
-                "strip-ansi": "^4.0.0"
-              }
-            }
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^6.2.0"
           }
         },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "fs-extra": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz",
+          "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "fsevents": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
+          "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
+          "dev": true,
+          "optional": true
+        },
         "get-caller-file": {
           "version": "2.0.5",
           "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
           "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
           "dev": true
         },
-        "invert-kv": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
+        "glob-parent": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+          "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+          "dev": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
         },
-        "lcid": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+        "is-binary-path": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+          "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
           "dev": true,
           "requires": {
-            "invert-kv": "^2.0.0"
+            "binary-extensions": "^2.0.0"
           }
         },
-        "mem": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-          "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
           "dev": true,
           "requires": {
-            "map-age-cleaner": "^0.1.1",
-            "mimic-fn": "^2.0.0",
-            "p-is-promise": "^2.0.0"
+            "p-locate": "^4.1.0"
           }
         },
         "normalize-path": {
@@ -484,15 +548,43 @@
           "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
           "dev": true
         },
-        "os-locale": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+        "p-limit": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
+          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
           "dev": true,
           "requires": {
-            "execa": "^1.0.0",
-            "lcid": "^2.0.0",
-            "mem": "^4.0.0"
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "readdirp": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz",
+          "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==",
+          "dev": true,
+          "requires": {
+            "picomatch": "^2.0.7"
           }
         },
         "require-main-filename": {
@@ -501,6 +593,12 @@
           "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
           "dev": true
         },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -508,40 +606,32 @@
           "dev": true
         },
         "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
           "dev": true,
           "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "4.1.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-              "dev": true
-            },
-            "strip-ansi": {
-              "version": "5.2.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^4.1.0"
-              }
-            }
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
           }
         },
         "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "is-number": "^7.0.0"
           }
         },
         "which-module": {
@@ -550,29 +640,40 @@
           "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
           "dev": true
         },
+        "wrap-ansi": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
         "yargs": {
-          "version": "13.1.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.1.0.tgz",
-          "integrity": "sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==",
+          "version": "15.3.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.0.tgz",
+          "integrity": "sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA==",
           "dev": true,
           "requires": {
-            "cliui": "^4.0.0",
-            "find-up": "^3.0.0",
+            "cliui": "^6.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^4.1.0",
             "get-caller-file": "^2.0.1",
-            "os-locale": "^3.1.0",
             "require-directory": "^2.1.1",
             "require-main-filename": "^2.0.0",
             "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
+            "string-width": "^4.2.0",
             "which-module": "^2.0.0",
             "y18n": "^4.0.0",
-            "yargs-parser": "^13.0.0"
+            "yargs-parser": "^18.1.0"
           }
         },
         "yargs-parser": {
-          "version": "13.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
-          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+          "version": "18.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz",
+          "integrity": "sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==",
           "dev": true,
           "requires": {
             "camelcase": "^5.0.0",
@@ -582,12 +683,9 @@
       }
     },
     "@angular/core": {
-      "version": "8.2.9",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.9.tgz",
-      "integrity": "sha512-GpHAuLOlN9iioELCQBmAsjETTUCyFgVUI3LXwh3e63jnpd+ZuuZcZbjfTYhtgYVNMetn7cVEO6p88eb7qvpUWQ==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.1.0.tgz",
+      "integrity": "sha512-RVlyegdIAij0P1wLY5ObIdsBAzvmHkHfElnmfiNKhaDftP6U/3zRtaKDu0bq0jvn1WCQ8zXxFQ8AWyKZwyFS+w=="
     },
     "@angular/flex-layout": {
       "version": "9.0.0-beta.29",
@@ -595,68 +693,49 @@
       "integrity": "sha512-93sxR+kYfYMOdnlWL0Q77FZ428gg8XnBu0YZm6GsCdkw/vLggIT/G1ZAqHlCPIODt6pxmCJ5KXh4ShvniIYDsA=="
     },
     "@angular/forms": {
-      "version": "8.2.9",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.9.tgz",
-      "integrity": "sha512-kAdBuApC9PPOdPI8BmNhxCraAkXGbX/PkVan8pQ5xdumvgGqvVjbJvLaUSbJROPtgCRlQyiEDrHFd4gk/WU76A==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-9.1.0.tgz",
+      "integrity": "sha512-5GC8HQlPChPV+168zLlm4yj4syA6N9ChSKV0tmzj1zIfMcub1UAOaB9IYaXRHQsjPFh9OuQXwmkzScyAfhEVjA=="
     },
     "@angular/language-service": {
-      "version": "8.2.9",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-8.2.9.tgz",
-      "integrity": "sha512-F6ReN0cToHIkCjEM2ECkBxCTsvFjVae8FpIr3Fz8IHZHOOYcS5mx/BWdEO7odI5/tQKl+cCWol7NjvJYV0zolg==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-9.1.0.tgz",
+      "integrity": "sha512-2f8ECoXrj40oS1rtIfi+F8T4WPzundcZDs8WMFNBuWYbk14v1S9sTgMEmZyePHGkPjt6IfYiLJKJCvVgrt1nxQ==",
       "dev": true
     },
     "@angular/material": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/@angular/material/-/material-8.2.2.tgz",
-      "integrity": "sha512-mR2ppE+Z1S5As2SUFK8wUH76Fj7YgrefhrwVGaeCLcAen//RHPw043+KL2apPAUaltdIFlGFtUuA6yJN6av0nQ==",
-      "requires": {
-        "tslib": "^1.7.1"
-      }
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/@angular/material/-/material-9.2.0.tgz",
+      "integrity": "sha512-KKzEIVh6/m56m+Ao8p4PK0SyEr0574l3VP2swj1qPag3u+FYgemmXCGTaChrKdDsez+zeTCPXImBGXzE6NQ80Q=="
     },
     "@angular/material-moment-adapter": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-8.2.2.tgz",
-      "integrity": "sha512-HZYoVssNh+uon0SszUDtVTWmjah5vtEJOYVYl9BakE6dC+Z4910B+/hVQ1HfOdas5mHpjxVoYpbIoe4QG5sc5A==",
-      "requires": {
-        "tslib": "^1.7.1"
-      }
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-9.2.0.tgz",
+      "integrity": "sha512-DruanWMcAzOy8mFZ6Xr9sRqJ+KjF0hvFshxqrv0SD/rVpf9oi8ADnuACmHYXN5dYr/YtgmHDywq0Z7USY7SIoA=="
     },
     "@angular/platform-browser": {
-      "version": "8.2.9",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.9.tgz",
-      "integrity": "sha512-k3aNZy0OTqGn7HlHHV52QF6ZAP/VlQhWGD2u5e1dWIWMq39kdkdSCNu5tiuAf5hIzMBiSQ0tjnuVWA4MuDBYIQ==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-9.1.0.tgz",
+      "integrity": "sha512-OsS/blUjl8ranmDaRADjFAmvnlmwbT6WNU7dVov7FhV0rqesbwaOJ5bR0LSYHYpej7Jaa6oYk0v0XWkaH9LTFg=="
     },
     "@angular/platform-browser-dynamic": {
-      "version": "8.2.9",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.9.tgz",
-      "integrity": "sha512-GbE4TUy4n/a8yp8fLWwdG/QnjUPZZ8VufItZ7GvOpoyknzegvka111dLctvMoPzSAsrKyShL6cryuyDC5PShUA==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.1.0.tgz",
+      "integrity": "sha512-sMtz/poQ3TYaWZzWjrn9apKUZ/WKql2MYCWbpax7pql3GgC9OoTslc7ZEe7/d3ynfFE/CQqWBBOuWGD71Z0LMQ=="
     },
     "@angular/platform-server": {
-      "version": "8.2.9",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-8.2.9.tgz",
-      "integrity": "sha512-rr6h82+DdUGhpsF3WT3eLk5itjZDXe7SiNtRGHkPj+yTyFAxuTKA3cX0N7LWsGGIFax+s1vQhMreV4YcyHKGPQ==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-9.1.0.tgz",
+      "integrity": "sha512-JboTIUBgf9yHRjF93q8NJQoeIp5Zp4kg8Nmw1QLWO6SV+OpiOpKSrlScMVncCh0KiU6SIOmiuHJwBhLm78fi+Q==",
       "requires": {
         "domino": "^2.1.2",
-        "tslib": "^1.9.0",
         "xhr2": "^0.1.4"
       }
     },
     "@angular/router": {
-      "version": "8.2.9",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.9.tgz",
-      "integrity": "sha512-4P60CWNB/jxGjDBEuYN0Jobt76QlebAQeFBTDswRVwRlq/WJT4QhL3a8AVIRsHn9bQII0LUt/ZQBBPxn7h9lSA==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.1.0.tgz",
+      "integrity": "sha512-cExO1nPnoPFiUJWZ28hTHozPLFoCmqr3xqcM57We0hhKE0esdrO+gRWKRH0EJERukLbU8coPKVhA8daGUpASiQ=="
     },
     "@babel/code-frame": {
       "version": "7.5.5",
@@ -667,28 +746,70 @@
         "@babel/highlight": "^7.0.0"
       }
     },
+    "@babel/compat-data": {
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.0.tgz",
+      "integrity": "sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.9.1",
+        "invariant": "^2.2.4",
+        "semver": "^5.5.0"
+      }
+    },
     "@babel/core": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.5.5.tgz",
-      "integrity": "sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.5.5",
-        "@babel/generator": "^7.5.5",
-        "@babel/helpers": "^7.5.5",
-        "@babel/parser": "^7.5.5",
-        "@babel/template": "^7.4.4",
-        "@babel/traverse": "^7.5.5",
-        "@babel/types": "^7.5.5",
-        "convert-source-map": "^1.1.0",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz",
+      "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.8.3",
+        "@babel/generator": "^7.9.0",
+        "@babel/helper-module-transforms": "^7.9.0",
+        "@babel/helpers": "^7.9.0",
+        "@babel/parser": "^7.9.0",
+        "@babel/template": "^7.8.6",
+        "@babel/traverse": "^7.9.0",
+        "@babel/types": "^7.9.0",
+        "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
-        "json5": "^2.1.0",
+        "gensync": "^1.0.0-beta.1",
+        "json5": "^2.1.2",
         "lodash": "^4.17.13",
         "resolve": "^1.3.2",
         "semver": "^5.4.1",
         "source-map": "^0.5.0"
       },
       "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.8.3",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.8.3"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.9.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+          "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.9.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "convert-source-map": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+          "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.1"
+          }
+        },
         "debug": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -698,15 +819,6 @@
             "ms": "^2.1.1"
           }
         },
-        "json5": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz",
-          "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -716,226 +828,238 @@
       }
     },
     "@babel/generator": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.6.2.tgz",
-      "integrity": "sha512-j8iHaIW4gGPnViaIHI7e9t/Hl8qLjERI6DcV9kEpAIDJsAOrcnXqRS7t+QbhL76pwbtqP+QCQLL0z1CyVmtjjQ==",
+      "version": "7.9.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.3.tgz",
+      "integrity": "sha512-RpxM252EYsz9qLUIq6F7YJyK1sv0wWDBFuztfDGWaQKzHjqDHysxSiRUpA/X9jmfqo+WzkAVKFaUily5h+gDCQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.6.0",
+        "@babel/types": "^7.9.0",
         "jsesc": "^2.5.1",
         "lodash": "^4.17.13",
         "source-map": "^0.5.0"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-          "dev": true
-        }
       }
     },
     "@babel/helper-annotate-as-pure": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz",
-      "integrity": "sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz",
+      "integrity": "sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz",
-      "integrity": "sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz",
+      "integrity": "sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==",
       "dev": true,
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/helper-explode-assignable-expression": "^7.8.3",
+        "@babel/types": "^7.8.3"
       }
     },
-    "@babel/helper-call-delegate": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz",
-      "integrity": "sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==",
+    "@babel/helper-compilation-targets": {
+      "version": "7.8.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz",
+      "integrity": "sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.4.4",
-        "@babel/traverse": "^7.4.4",
-        "@babel/types": "^7.4.4"
+        "@babel/compat-data": "^7.8.6",
+        "browserslist": "^4.9.1",
+        "invariant": "^2.2.4",
+        "levenary": "^1.1.1",
+        "semver": "^5.5.0"
+      }
+    },
+    "@babel/helper-create-regexp-features-plugin": {
+      "version": "7.8.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz",
+      "integrity": "sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.8.3",
+        "@babel/helper-regex": "^7.8.3",
+        "regexpu-core": "^4.7.0"
       }
     },
     "@babel/helper-define-map": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz",
-      "integrity": "sha512-fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz",
+      "integrity": "sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/types": "^7.5.5",
+        "@babel/helper-function-name": "^7.8.3",
+        "@babel/types": "^7.8.3",
         "lodash": "^4.17.13"
       }
     },
     "@babel/helper-explode-assignable-expression": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz",
-      "integrity": "sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz",
+      "integrity": "sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==",
       "dev": true,
       "requires": {
-        "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/traverse": "^7.8.3",
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-function-name": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz",
-      "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz",
+      "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "^7.0.0",
-        "@babel/template": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/helper-get-function-arity": "^7.8.3",
+        "@babel/template": "^7.8.3",
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-get-function-arity": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz",
-      "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
+      "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz",
-      "integrity": "sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz",
+      "integrity": "sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.4.4"
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz",
-      "integrity": "sha512-5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz",
+      "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.5.5"
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz",
-      "integrity": "sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz",
+      "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz",
-      "integrity": "sha512-jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz",
+      "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/helper-simple-access": "^7.1.0",
-        "@babel/helper-split-export-declaration": "^7.4.4",
-        "@babel/template": "^7.4.4",
-        "@babel/types": "^7.5.5",
+        "@babel/helper-module-imports": "^7.8.3",
+        "@babel/helper-replace-supers": "^7.8.6",
+        "@babel/helper-simple-access": "^7.8.3",
+        "@babel/helper-split-export-declaration": "^7.8.3",
+        "@babel/template": "^7.8.6",
+        "@babel/types": "^7.9.0",
         "lodash": "^4.17.13"
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz",
-      "integrity": "sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz",
+      "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz",
-      "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
+      "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
       "dev": true
     },
     "@babel/helper-regex": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.5.5.tgz",
-      "integrity": "sha512-CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz",
+      "integrity": "sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==",
       "dev": true,
       "requires": {
         "lodash": "^4.17.13"
       }
     },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz",
-      "integrity": "sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz",
+      "integrity": "sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-wrap-function": "^7.1.0",
-        "@babel/template": "^7.1.0",
-        "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/helper-annotate-as-pure": "^7.8.3",
+        "@babel/helper-wrap-function": "^7.8.3",
+        "@babel/template": "^7.8.3",
+        "@babel/traverse": "^7.8.3",
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz",
-      "integrity": "sha512-XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg==",
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz",
+      "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==",
       "dev": true,
       "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.5.5",
-        "@babel/helper-optimise-call-expression": "^7.0.0",
-        "@babel/traverse": "^7.5.5",
-        "@babel/types": "^7.5.5"
+        "@babel/helper-member-expression-to-functions": "^7.8.3",
+        "@babel/helper-optimise-call-expression": "^7.8.3",
+        "@babel/traverse": "^7.8.6",
+        "@babel/types": "^7.8.6"
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz",
-      "integrity": "sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz",
+      "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/template": "^7.8.3",
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
-      "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
+      "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.4.4"
+        "@babel/types": "^7.8.3"
       }
     },
+    "@babel/helper-validator-identifier": {
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz",
+      "integrity": "sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==",
+      "dev": true
+    },
     "@babel/helper-wrap-function": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz",
-      "integrity": "sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz",
+      "integrity": "sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/template": "^7.1.0",
-        "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.2.0"
+        "@babel/helper-function-name": "^7.8.3",
+        "@babel/template": "^7.8.3",
+        "@babel/traverse": "^7.8.3",
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helpers": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.2.tgz",
-      "integrity": "sha512-3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA==",
+      "version": "7.9.2",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz",
+      "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.6.0",
-        "@babel/traverse": "^7.6.2",
-        "@babel/types": "^7.6.0"
+        "@babel/template": "^7.8.3",
+        "@babel/traverse": "^7.9.0",
+        "@babel/types": "^7.9.0"
       }
     },
     "@babel/highlight": {
@@ -958,170 +1082,235 @@
       }
     },
     "@babel/parser": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.6.2.tgz",
-      "integrity": "sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg==",
+      "version": "7.9.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
+      "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
       "dev": true
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz",
-      "integrity": "sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz",
+      "integrity": "sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-remap-async-to-generator": "^7.1.0",
-        "@babel/plugin-syntax-async-generators": "^7.2.0"
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-remap-async-to-generator": "^7.8.3",
+        "@babel/plugin-syntax-async-generators": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz",
-      "integrity": "sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-dynamic-import": "^7.2.0"
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-json-strings": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz",
-      "integrity": "sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz",
+      "integrity": "sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-json-strings": "^7.2.0"
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-numeric-separator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz",
+      "integrity": "sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz",
-      "integrity": "sha512-LDBXlmADCsMZV1Y9OQwMc0MyGZ8Ta/zlD9N67BfQT8uYwkRswiu2hU6nJKrjrt/58aH/vqfQlR/9yId/7A2gWw==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz",
+      "integrity": "sha512-UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.2.0"
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz",
-      "integrity": "sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0"
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-optional-chaining": {
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz",
+      "integrity": "sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.6.2.tgz",
-      "integrity": "sha512-NxHETdmpeSCtiatMRYWVJo7266rrvAC3DTeG5exQBIH/fMIUK7ejDNznBbn3HQl/o9peymRRg7Yqkx6PdUXmMw==",
+      "version": "7.8.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz",
+      "integrity": "sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.4.4",
-        "regexpu-core": "^4.6.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.8.8",
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-syntax-async-generators": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz",
-      "integrity": "sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==",
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
     "@babel/plugin-syntax-dynamic-import": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz",
-      "integrity": "sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
     "@babel/plugin-syntax-json-strings": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz",
-      "integrity": "sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-numeric-separator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz",
+      "integrity": "sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz",
-      "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
     "@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz",
-      "integrity": "sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-top-level-await": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz",
+      "integrity": "sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-arrow-functions": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz",
-      "integrity": "sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz",
+      "integrity": "sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz",
-      "integrity": "sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz",
+      "integrity": "sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-remap-async-to-generator": "^7.1.0"
+        "@babel/helper-module-imports": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-remap-async-to-generator": "^7.8.3"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz",
-      "integrity": "sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz",
+      "integrity": "sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.2.tgz",
-      "integrity": "sha512-zZT8ivau9LOQQaOGC7bQLQOT4XPkPXgN2ERfUgk1X8ql+mVkLc4E8eKk+FO3o0154kxzqenWCorfmEXpEZcrSQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz",
+      "integrity": "sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.8.3",
         "lodash": "^4.17.13"
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz",
-      "integrity": "sha512-U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-define-map": "^7.5.5",
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-optimise-call-expression": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.5.5",
-        "@babel/helper-split-export-declaration": "^7.4.4",
+      "version": "7.9.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz",
+      "integrity": "sha512-TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.8.3",
+        "@babel/helper-define-map": "^7.8.3",
+        "@babel/helper-function-name": "^7.8.3",
+        "@babel/helper-optimise-call-expression": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-replace-supers": "^7.8.6",
+        "@babel/helper-split-export-declaration": "^7.8.3",
         "globals": "^11.1.0"
       },
       "dependencies": {
@@ -1134,344 +1323,416 @@
       }
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz",
-      "integrity": "sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz",
+      "integrity": "sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz",
-      "integrity": "sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ==",
+      "version": "7.8.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz",
+      "integrity": "sha512-eRJu4Vs2rmttFCdhPUM3bV0Yo/xPSdPw6ML9KHs/bjB4bLA5HXlbvYXPOD5yASodGod+krjYx21xm1QmL8dCJQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.6.2.tgz",
-      "integrity": "sha512-KGKT9aqKV+9YMZSkowzYoYEiHqgaDhGmPNZlZxX6UeHC4z30nC1J9IrZuGqbYFB1jaIGdv91ujpze0exiVK8bA==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz",
+      "integrity": "sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.4.4",
-        "regexpu-core": "^4.6.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz",
-      "integrity": "sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz",
+      "integrity": "sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz",
-      "integrity": "sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz",
+      "integrity": "sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.1.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz",
-      "integrity": "sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz",
+      "integrity": "sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz",
-      "integrity": "sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz",
+      "integrity": "sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-function-name": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz",
-      "integrity": "sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz",
+      "integrity": "sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz",
-      "integrity": "sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz",
+      "integrity": "sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz",
-      "integrity": "sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz",
+      "integrity": "sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.1.0",
-        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-module-transforms": "^7.9.0",
+        "@babel/helper-plugin-utils": "^7.8.3",
         "babel-plugin-dynamic-import-node": "^2.3.0"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz",
-      "integrity": "sha512-Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz",
+      "integrity": "sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.4.4",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-simple-access": "^7.1.0",
+        "@babel/helper-module-transforms": "^7.9.0",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-simple-access": "^7.8.3",
         "babel-plugin-dynamic-import-node": "^2.3.0"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz",
-      "integrity": "sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz",
+      "integrity": "sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.4.4",
-        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-hoist-variables": "^7.8.3",
+        "@babel/helper-module-transforms": "^7.9.0",
+        "@babel/helper-plugin-utils": "^7.8.3",
         "babel-plugin-dynamic-import-node": "^2.3.0"
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz",
-      "integrity": "sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz",
+      "integrity": "sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.1.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-module-transforms": "^7.9.0",
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.2.tgz",
-      "integrity": "sha512-xBdB+XOs+lgbZc2/4F5BVDVcDNS4tcSKQc96KmlqLEAwz6tpYPEvPdmDfvVG0Ssn8lAhronaRs6Z6KSexIpK5g==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz",
+      "integrity": "sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==",
       "dev": true,
       "requires": {
-        "regexpu-core": "^4.6.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.8.3"
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz",
-      "integrity": "sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz",
+      "integrity": "sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz",
-      "integrity": "sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz",
+      "integrity": "sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.5.5"
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-replace-supers": "^7.8.3"
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz",
-      "integrity": "sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==",
+      "version": "7.9.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz",
+      "integrity": "sha512-fzrQFQhp7mIhOzmOtPiKffvCYQSK10NR8t6BBz2yPbeUHb9OLW8RZGtgDRBn8z2hGcwvKDL3vC7ojPTLNxmqEg==",
       "dev": true,
       "requires": {
-        "@babel/helper-call-delegate": "^7.4.4",
-        "@babel/helper-get-function-arity": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-get-function-arity": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-property-literals": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz",
-      "integrity": "sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz",
+      "integrity": "sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.4.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz",
-      "integrity": "sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==",
+      "version": "7.8.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz",
+      "integrity": "sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==",
       "dev": true,
       "requires": {
-        "regenerator-transform": "^0.14.0"
+        "regenerator-transform": "^0.14.2"
       }
     },
     "@babel/plugin-transform-reserved-words": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz",
-      "integrity": "sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz",
+      "integrity": "sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz",
-      "integrity": "sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz",
+      "integrity": "sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz",
-      "integrity": "sha512-DpSvPFryKdK1x+EDJYCy28nmAaIMdxmhot62jAXF/o99iA33Zj2Lmcp3vDmz+MUh0LNYVPvfj5iC3feb3/+PFg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz",
+      "integrity": "sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz",
-      "integrity": "sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz",
+      "integrity": "sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-regex": "^7.8.3"
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz",
-      "integrity": "sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz",
+      "integrity": "sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-annotate-as-pure": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz",
-      "integrity": "sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==",
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz",
+      "integrity": "sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.6.2.tgz",
-      "integrity": "sha512-orZI6cWlR3nk2YmYdb0gImrgCUwb5cBUwjf6Ks6dvNVvXERkwtJWOQaEOjPiu0Gu1Tq6Yq/hruCZZOOi9F34Dw==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz",
+      "integrity": "sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.4.4",
-        "regexpu-core": "^4.6.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/preset-env": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.5.5.tgz",
-      "integrity": "sha512-GMZQka/+INwsMz1A5UEql8tG015h5j/qjptpKY2gJ7giy8ohzU710YciJB5rcKsWGWHiW3RUnHib0E5/m3Tp3A==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.0.tgz",
+      "integrity": "sha512-712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.9.0",
+        "@babel/helper-compilation-targets": "^7.8.7",
+        "@babel/helper-module-imports": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-proposal-async-generator-functions": "^7.8.3",
+        "@babel/plugin-proposal-dynamic-import": "^7.8.3",
+        "@babel/plugin-proposal-json-strings": "^7.8.3",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-proposal-numeric-separator": "^7.8.3",
+        "@babel/plugin-proposal-object-rest-spread": "^7.9.0",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-proposal-optional-chaining": "^7.9.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.8.3",
+        "@babel/plugin-syntax-async-generators": "^7.8.0",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.0",
+        "@babel/plugin-syntax-json-strings": "^7.8.0",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.0",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3",
+        "@babel/plugin-transform-arrow-functions": "^7.8.3",
+        "@babel/plugin-transform-async-to-generator": "^7.8.3",
+        "@babel/plugin-transform-block-scoped-functions": "^7.8.3",
+        "@babel/plugin-transform-block-scoping": "^7.8.3",
+        "@babel/plugin-transform-classes": "^7.9.0",
+        "@babel/plugin-transform-computed-properties": "^7.8.3",
+        "@babel/plugin-transform-destructuring": "^7.8.3",
+        "@babel/plugin-transform-dotall-regex": "^7.8.3",
+        "@babel/plugin-transform-duplicate-keys": "^7.8.3",
+        "@babel/plugin-transform-exponentiation-operator": "^7.8.3",
+        "@babel/plugin-transform-for-of": "^7.9.0",
+        "@babel/plugin-transform-function-name": "^7.8.3",
+        "@babel/plugin-transform-literals": "^7.8.3",
+        "@babel/plugin-transform-member-expression-literals": "^7.8.3",
+        "@babel/plugin-transform-modules-amd": "^7.9.0",
+        "@babel/plugin-transform-modules-commonjs": "^7.9.0",
+        "@babel/plugin-transform-modules-systemjs": "^7.9.0",
+        "@babel/plugin-transform-modules-umd": "^7.9.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
+        "@babel/plugin-transform-new-target": "^7.8.3",
+        "@babel/plugin-transform-object-super": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.8.7",
+        "@babel/plugin-transform-property-literals": "^7.8.3",
+        "@babel/plugin-transform-regenerator": "^7.8.7",
+        "@babel/plugin-transform-reserved-words": "^7.8.3",
+        "@babel/plugin-transform-shorthand-properties": "^7.8.3",
+        "@babel/plugin-transform-spread": "^7.8.3",
+        "@babel/plugin-transform-sticky-regex": "^7.8.3",
+        "@babel/plugin-transform-template-literals": "^7.8.3",
+        "@babel/plugin-transform-typeof-symbol": "^7.8.4",
+        "@babel/plugin-transform-unicode-regex": "^7.8.3",
+        "@babel/preset-modules": "^0.1.3",
+        "@babel/types": "^7.9.0",
+        "browserslist": "^4.9.1",
+        "core-js-compat": "^3.6.2",
+        "invariant": "^2.2.2",
+        "levenary": "^1.1.1",
+        "semver": "^5.5.0"
+      }
+    },
+    "@babel/preset-modules": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz",
+      "integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.0.0",
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-async-generator-functions": "^7.2.0",
-        "@babel/plugin-proposal-dynamic-import": "^7.5.0",
-        "@babel/plugin-proposal-json-strings": "^7.2.0",
-        "@babel/plugin-proposal-object-rest-spread": "^7.5.5",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.2.0",
         "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-        "@babel/plugin-syntax-async-generators": "^7.2.0",
-        "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-        "@babel/plugin-syntax-json-strings": "^7.2.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.2.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.2.0",
-        "@babel/plugin-transform-arrow-functions": "^7.2.0",
-        "@babel/plugin-transform-async-to-generator": "^7.5.0",
-        "@babel/plugin-transform-block-scoped-functions": "^7.2.0",
-        "@babel/plugin-transform-block-scoping": "^7.5.5",
-        "@babel/plugin-transform-classes": "^7.5.5",
-        "@babel/plugin-transform-computed-properties": "^7.2.0",
-        "@babel/plugin-transform-destructuring": "^7.5.0",
         "@babel/plugin-transform-dotall-regex": "^7.4.4",
-        "@babel/plugin-transform-duplicate-keys": "^7.5.0",
-        "@babel/plugin-transform-exponentiation-operator": "^7.2.0",
-        "@babel/plugin-transform-for-of": "^7.4.4",
-        "@babel/plugin-transform-function-name": "^7.4.4",
-        "@babel/plugin-transform-literals": "^7.2.0",
-        "@babel/plugin-transform-member-expression-literals": "^7.2.0",
-        "@babel/plugin-transform-modules-amd": "^7.5.0",
-        "@babel/plugin-transform-modules-commonjs": "^7.5.0",
-        "@babel/plugin-transform-modules-systemjs": "^7.5.0",
-        "@babel/plugin-transform-modules-umd": "^7.2.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.4.5",
-        "@babel/plugin-transform-new-target": "^7.4.4",
-        "@babel/plugin-transform-object-super": "^7.5.5",
-        "@babel/plugin-transform-parameters": "^7.4.4",
-        "@babel/plugin-transform-property-literals": "^7.2.0",
-        "@babel/plugin-transform-regenerator": "^7.4.5",
-        "@babel/plugin-transform-reserved-words": "^7.2.0",
-        "@babel/plugin-transform-shorthand-properties": "^7.2.0",
-        "@babel/plugin-transform-spread": "^7.2.0",
-        "@babel/plugin-transform-sticky-regex": "^7.2.0",
-        "@babel/plugin-transform-template-literals": "^7.4.4",
-        "@babel/plugin-transform-typeof-symbol": "^7.2.0",
-        "@babel/plugin-transform-unicode-regex": "^7.4.4",
-        "@babel/types": "^7.5.5",
-        "browserslist": "^4.6.0",
-        "core-js-compat": "^3.1.1",
-        "invariant": "^2.2.2",
-        "js-levenshtein": "^1.1.3",
-        "semver": "^5.5.0"
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      }
+    },
+    "@babel/runtime": {
+      "version": "7.9.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz",
+      "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==",
+      "dev": true,
+      "requires": {
+        "regenerator-runtime": "^0.13.4"
       }
     },
     "@babel/template": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz",
-      "integrity": "sha512-5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ==",
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
+      "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.6.0",
-        "@babel/types": "^7.6.0"
+        "@babel/code-frame": "^7.8.3",
+        "@babel/parser": "^7.8.6",
+        "@babel/types": "^7.8.6"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.8.3",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.8.3"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.9.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+          "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.9.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        }
       }
     },
     "@babel/traverse": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.2.tgz",
-      "integrity": "sha512-8fRE76xNwNttVEF2TwxJDGBLWthUkHWSldmfuBzVRmEDWOtu4XdINTgN7TDWzuLg4bbeIMLvfMFD9we5YcWkRQ==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz",
+      "integrity": "sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.5.5",
-        "@babel/generator": "^7.6.2",
-        "@babel/helper-function-name": "^7.1.0",
-        "@babel/helper-split-export-declaration": "^7.4.4",
-        "@babel/parser": "^7.6.2",
-        "@babel/types": "^7.6.0",
+        "@babel/code-frame": "^7.8.3",
+        "@babel/generator": "^7.9.0",
+        "@babel/helper-function-name": "^7.8.3",
+        "@babel/helper-split-export-declaration": "^7.8.3",
+        "@babel/parser": "^7.9.0",
+        "@babel/types": "^7.9.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0",
         "lodash": "^4.17.13"
       },
       "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.8.3",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.8.3"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.9.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+          "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.9.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
         "debug": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -1496,61 +1757,102 @@
       }
     },
     "@babel/types": {
-      "version": "7.6.1",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.6.1.tgz",
-      "integrity": "sha512-X7gdiuaCmA0uRjCmRtYJNAVCc/q+5xSgsfKJHqMN4iNLILX39677fJE1O40arPMh0TTtS9ItH67yre6c7k6t0g==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz",
+      "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==",
       "dev": true,
       "requires": {
-        "esutils": "^2.0.2",
+        "@babel/helper-validator-identifier": "^7.9.0",
         "lodash": "^4.17.13",
         "to-fast-properties": "^2.0.0"
+      }
+    },
+    "@istanbuljs/schema": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
+      "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
+      "dev": true
+    },
+    "@jsdevtools/coverage-istanbul-loader": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.3.tgz",
+      "integrity": "sha512-TAdNkeGB5Fe4Og+ZkAr1Kvn9by2sfL44IAHFtxlh1BA1XJ5cLpO9iSNki5opWESv3l3vSHsZ9BNKuqFKbEbFaA==",
+      "dev": true,
+      "requires": {
+        "convert-source-map": "^1.7.0",
+        "istanbul-lib-instrument": "^4.0.1",
+        "loader-utils": "^1.4.0",
+        "merge-source-map": "^1.1.0",
+        "schema-utils": "^2.6.4"
       },
       "dependencies": {
-        "to-fast-properties": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-          "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-          "dev": true
+        "convert-source-map": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+          "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.1"
+          }
+        },
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
         }
       }
     },
     "@ngrx/effects": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-8.3.0.tgz",
-      "integrity": "sha512-/DdBqCFpHOJZUAmIpefQ8EVwmJXXkcEdLhsV8aXncCNWkK61sy/MbZZfDAbee6Cd1is33bVXRUKD49Z+Upvw5A=="
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-9.0.0.tgz",
+      "integrity": "sha512-6Rq7FsNZK26HqYlpOGCglKLenIkVOOKE0y6D/8KXjEJ1JlZWi00fdI7poclBGjm9pvMBGXfJA8a9MKuxb/t9cA=="
     },
     "@ngrx/router-store": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-8.3.0.tgz",
-      "integrity": "sha512-wIWGW3ZyT9+lJEBXVsPx1/NLFQ8KoCbhlEmpmQHniXE3iIMnK25Or2JCNXfgrndQA9SSVlKIPP3uaDJMyoBotQ=="
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-9.0.0.tgz",
+      "integrity": "sha512-eVgdRwK0twPgTgWnIpc2EBoz6LgWsGdlheDVKZ9MNU8ZkbPV8/ycivW5Oy5cm+ppi1QHHmkpgt+u5c2iGi68cg=="
     },
     "@ngrx/store": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-8.3.0.tgz",
-      "integrity": "sha512-QtM5T6/wTYqAlqeW60ptqqrsBwYF7jvQHsh0yE3AnwZIQvSbLFM2t5S2kN+753v4rHiXVRrA5pLaLzjGhAKcSg=="
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-9.0.0.tgz",
+      "integrity": "sha512-QnmfXJ4G2jp+vFaqT5Qfp6h0J9OHxfDKI2RbnMU93Tq1Xd/WVPzXnOQGjILBjwwWI6RFkSdIpUoQONr7VOW63g=="
     },
     "@ngrx/store-devtools": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-8.3.0.tgz",
-      "integrity": "sha512-7jsmN8wz6PMKrbqHnUulMvf8OSYUZbXXOwkcXRaGqIjlnEG9RCHQL0cXuF8zB6uX5xencdEXsRVQe3MdZXWQng=="
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-9.0.0.tgz",
+      "integrity": "sha512-Vj8sj8GclbSbnYCS8eqZXTOYDdip1nnjKhkYClUg2oFPh67haaCmvh7TXITnX8PpgDtj5akF84Xw9/1HRiG8mg=="
     },
     "@ngtools/webpack": {
-      "version": "8.3.7",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-8.3.7.tgz",
-      "integrity": "sha512-JPUzw08myovtT/x2dzzWVUNjFq8OHD81bvcBXdqPAQwQvHDSIdo6bKcu2qhakgagtXLJZnglKtefTJFrMG8ciw==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.1.0.tgz",
+      "integrity": "sha512-kQ+1N/F+5tuUXiiaoqJwhcOIM0I93EEvF3xwpTLRm91wl2i8R1261LvsD/uQPrgLrZNGR6eFhFF1Izn2PnIjQA==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "8.3.7",
-        "enhanced-resolve": "4.1.0",
-        "rxjs": "6.4.0",
-        "tree-kill": "1.2.1",
+        "@angular-devkit/core": "9.1.0",
+        "enhanced-resolve": "4.1.1",
+        "rxjs": "6.5.4",
         "webpack-sources": "1.4.3"
       },
       "dependencies": {
         "rxjs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
+          "version": "6.5.4",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
+          "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
@@ -1559,97 +1861,229 @@
       }
     },
     "@nodelib/fs.scandir": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.2.tgz",
-      "integrity": "sha512-wrIBsjA5pl13f0RN4Zx4FNWmU71lv03meGKnqRUoCyan17s4V3WL92f3w3AIuWbNnpcrQyFBU5qMavJoB8d27w==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
+      "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
       "dev": true,
       "requires": {
-        "@nodelib/fs.stat": "2.0.2",
+        "@nodelib/fs.stat": "2.0.3",
         "run-parallel": "^1.1.9"
       }
     },
     "@nodelib/fs.stat": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.2.tgz",
-      "integrity": "sha512-z8+wGWV2dgUhLqrtRYa03yDx4HWMvXKi1z8g3m2JyxAx8F7xk74asqPk5LAETjqDSGLFML/6CDl0+yFunSYicw==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
+      "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==",
       "dev": true
     },
     "@nodelib/fs.walk": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.3.tgz",
-      "integrity": "sha512-l6t8xEhfK9Sa4YO5mIRdau7XSOADfmh3jCr0evNHdY+HNkW6xuQhgMH7D73VV6WpZOagrW0UludvMTiifiwTfA==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
+      "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
       "dev": true,
       "requires": {
-        "@nodelib/fs.scandir": "2.1.2",
+        "@nodelib/fs.scandir": "2.1.3",
         "fastq": "^1.6.0"
       }
     },
-    "@schematics/angular": {
-      "version": "8.3.7",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.7.tgz",
-      "integrity": "sha512-RsUZofittMe+o8AGi2wbrWb10Avurl2VgDqlINF0fAEfdxzmjvNwXkP4IdAo5wsGl2URrxnJWeRP6geBqgueZQ==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/core": "8.3.7",
-        "@angular-devkit/schematics": "8.3.7"
-      }
+    "@npmcli/ci-detect": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/ci-detect/-/ci-detect-1.2.0.tgz",
+      "integrity": "sha512-JtktVH7ASBVIWsQTFlFpeOzhBJskvoBCTfeeRhhZy7ybATcUvwiwotZ8j5rkqUUyB69lIy/AvboiiiGBjYBKBA==",
+      "dev": true
     },
-    "@schematics/update": {
-      "version": "0.803.7",
-      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.803.7.tgz",
-      "integrity": "sha512-T8HM88+oY7bMBq0w1SoSNTpPJplwGcU3tMbX9p18h7rdsmH3j68+al84A8S3/x+mUiLmumTUXAUmxd1gtoTiKA==",
+    "@npmcli/git": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-2.0.1.tgz",
+      "integrity": "sha512-hVatexiBtx71F01Ars38Hr5AFUGmJgHAfQtRlO5fJlnAawRGSXwEFgjB5i3XdUUmElZU/RXy7fefN02dZKxgPw==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "8.3.7",
-        "@angular-devkit/schematics": "8.3.7",
-        "@yarnpkg/lockfile": "1.1.0",
-        "ini": "1.3.5",
-        "pacote": "9.5.5",
-        "rxjs": "6.4.0",
-        "semver": "6.3.0",
-        "semver-intersect": "1.4.0"
+        "@npmcli/promise-spawn": "^1.1.0",
+        "mkdirp": "^1.0.3",
+        "npm-pick-manifest": "^6.0.0",
+        "promise-inflight": "^1.0.1",
+        "promise-retry": "^1.1.1",
+        "unique-filename": "^1.1.1",
+        "which": "^2.0.2"
       },
       "dependencies": {
-        "rxjs": {
-          "version": "6.4.0",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz",
-          "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==",
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
           "dev": true,
           "requires": {
-            "tslib": "^1.9.0"
+            "isexe": "^2.0.0"
           }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
         }
       }
     },
-    "@sindresorhus/is": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
-      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
-      "dev": true
-    },
-    "@swimlane/ngx-charts": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-12.0.1.tgz",
-      "integrity": "sha512-Dmm46eTtyKtTkku1ZIB39q/AHvUGdGIRJc7jPUucJLoSPWeD7AjvE6OFiIZYP48IkPwV0R3OI/ZmKyNA3DPkRQ==",
-      "requires": {
-        "d3": "^4.10.2",
-        "d3-array": "^1.2.1",
-        "d3-brush": "^1.0.4",
-        "d3-color": "^1.0.3",
-        "d3-force": "^1.1.0",
-        "d3-format": "^1.2.0",
-        "d3-hierarchy": "^1.1.5",
-        "d3-interpolate": "^1.1.5",
-        "d3-scale": "^1.0.6",
-        "d3-selection": "^1.1.0",
-        "d3-shape": "^1.2.0",
-        "d3-time-format": "^2.1.0"
+    "@npmcli/installed-package-contents": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-1.0.5.tgz",
+      "integrity": "sha512-aKIwguaaqb6ViwSOFytniGvLPb9SMCUm39TgM3SfUo7n0TxUMbwoXfpwyvQ4blm10lzbAwTsvjr7QZ85LvTi4A==",
+      "dev": true,
+      "requires": {
+        "npm-bundled": "^1.1.1",
+        "npm-normalize-package-bin": "^1.0.1",
+        "read-package-json-fast": "^1.1.1",
+        "readdir-scoped-modules": "^1.1.0"
+      }
+    },
+    "@npmcli/promise-spawn": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.1.0.tgz",
+      "integrity": "sha512-FwbuYN9KXBkloLeIR3xRgI8dyOdfK/KzaJlChszNuwmUXD1lHXfLlSeo4n4KrKt2udIK9K9/TzlnyCA3ubM2fA==",
+      "dev": true,
+      "requires": {
+        "infer-owner": "^1.0.4"
+      }
+    },
+    "@nwmac/ajsf-core": {
+      "version": "0.1.4",
+      "resolved": "https://npm.pkg.github.com/download/@nwmac/ajsf-core/0.1.4/69a42e983ece036d34fffc0d2e9e30568322dac1ad1e40aecc143ef6e50bc093",
+      "integrity": "sha512-9emicHjVD13Y3+7pix9EVJpiksjrAtTEC6j+IHCrNncZSGH+bLlvBHzbFQas+m9eIyCIgpcxkbxQZZQLtClSVA==",
+      "requires": {
+        "ajv": "^6.10.0",
+        "lodash-es": "^4.17.15"
+      }
+    },
+    "@nwmac/ajsf-material": {
+      "version": "0.1.4",
+      "resolved": "https://npm.pkg.github.com/download/@nwmac/ajsf-material/0.1.4/2e339b3ba5be265afcce56bf2eaf266a4be454b2ac61b776ccbd664a7e21294d",
+      "integrity": "sha512-bpCwmN+C1Pd5pPieUVSTwrxBg4GNribmQFTMcDyloAvHGOzsS7aLcO9Q17uEajczspEoNqqoP1NY1BcJgP/UVg==",
+      "requires": {
+        "@nwmac/ajsf-core": "~0.1.4",
+        "lodash-es": "^4.17.15"
+      }
+    },
+    "@rollup/plugin-commonjs": {
+      "version": "11.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-11.0.2.tgz",
+      "integrity": "sha512-MPYGZr0qdbV5zZj8/2AuomVpnRVXRU5XKXb3HVniwRoRCreGlf5kOE081isNWeiLIi6IYkwTX9zE0/c7V8g81g==",
+      "dev": true,
+      "requires": {
+        "@rollup/pluginutils": "^3.0.0",
+        "estree-walker": "^1.0.1",
+        "is-reference": "^1.1.2",
+        "magic-string": "^0.25.2",
+        "resolve": "^1.11.0"
+      }
+    },
+    "@rollup/plugin-json": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.0.2.tgz",
+      "integrity": "sha512-t4zJMc98BdH42mBuzjhQA7dKh0t4vMJlUka6Fz0c+iO5IVnWaEMiYBy1uBj9ruHZzXBW23IPDGL9oCzBkQ9Udg==",
+      "dev": true,
+      "requires": {
+        "@rollup/pluginutils": "^3.0.4"
+      }
+    },
+    "@rollup/plugin-node-resolve": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.1.tgz",
+      "integrity": "sha512-14ddhD7TnemeHE97a4rLOhobfYvUVcaYuqTnL8Ti7Jxi9V9Jr5LY7Gko4HZ5k4h4vqQM0gBQt6tsp9xXW94WPA==",
+      "dev": true,
+      "requires": {
+        "@rollup/pluginutils": "^3.0.6",
+        "@types/resolve": "0.0.8",
+        "builtin-modules": "^3.1.0",
+        "is-module": "^1.0.0",
+        "resolve": "^1.14.2"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.15.1",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz",
+          "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
+          "dev": true,
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        }
+      }
+    },
+    "@rollup/pluginutils": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.8.tgz",
+      "integrity": "sha512-rYGeAc4sxcZ+kPG/Tw4/fwJODC3IXHYDH4qusdN/b6aLw5LPUbzpecYbEJh4sVQGPFJxd2dBU4kc1H3oy9/bnw==",
+      "dev": true,
+      "requires": {
+        "estree-walker": "^1.0.1"
+      }
+    },
+    "@schematics/angular": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.0.tgz",
+      "integrity": "sha512-qkehaITQ1S1udfnnBY5CXGWnk1iVFI8cZayjLUlRfD5w+6v9if3VIuqPssX96MqvkbjyRu1N214+ieaawzLmuA==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "9.1.0",
+        "@angular-devkit/schematics": "9.1.0"
+      }
+    },
+    "@schematics/update": {
+      "version": "0.901.0",
+      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.901.0.tgz",
+      "integrity": "sha512-u2VESL1dgOSGZK/wcWEz0WcCU/yv764zhzCQerCwUtbV1CISSSDZ6x+prVYDXOdxWBGtDos2MbCF3GEJJI1T+w==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "9.1.0",
+        "@angular-devkit/schematics": "9.1.0",
+        "@yarnpkg/lockfile": "1.1.0",
+        "ini": "1.3.5",
+        "npm-package-arg": "^8.0.0",
+        "pacote": "11.1.4",
+        "rxjs": "6.5.4",
+        "semver": "7.1.3",
+        "semver-intersect": "1.4.0"
+      },
+      "dependencies": {
+        "rxjs": {
+          "version": "6.5.4",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz",
+          "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "semver": {
+          "version": "7.1.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz",
+          "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==",
+          "dev": true
+        }
+      }
+    },
+    "@sindresorhus/is": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
+      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
+      "dev": true
+    },
+    "@swimlane/ngx-charts": {
+      "version": "13.0.2",
+      "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-13.0.2.tgz",
+      "integrity": "sha512-pKHw3DLsO2eso3SqMlHt9vumaU8gaDYZbrC8PNWteU49AFkX8kLVJIvsgjMSKwW/n3VpgHBpTMGnLkSlzHJORg==",
+      "requires": {
+        "d3-array": "^2.4.0",
+        "d3-brush": "^1.1.5",
+        "d3-color": "^1.4.0",
+        "d3-format": "^1.4.2",
+        "d3-hierarchy": "^1.1.9",
+        "d3-interpolate": "^1.4.0",
+        "d3-scale": "^3.2.1",
+        "d3-selection": "^1.4.1",
+        "d3-shape": "^1.3.7",
+        "d3-time-format": "^2.2.2",
+        "d3-transition": "^1.3.2"
       }
     },
     "@szmarczak/http-timer": {
@@ -1673,9 +2107,9 @@
       "integrity": "sha512-J3fzl1F6wvh8KXVVcIuHN12xi1ZDcPA/0Vix+ZcJYwZWVHUwfIqfvzYXXEw7ybeev6477KCTt9fKydU+ajUqcg=="
     },
     "@types/bluebird": {
-      "version": "3.5.27",
-      "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.27.tgz",
-      "integrity": "sha512-6BmYWSBea18+tSjjSC3QIyV93ZKAeNWGM7R6aYt1ryTZXrlHF+QLV0G2yV0viEGVyRkyQsWfMoJ0k/YghBX5sQ==",
+      "version": "3.5.30",
+      "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.30.tgz",
+      "integrity": "sha512-8LhzvcjIoqoi1TghEkRMkbbmM+jhHnBokPGkJWjclMK+Ks0MxEBow3/p2/iFTZ+OIbJHQDSfpgdZEb+af3gfVw==",
       "dev": true
     },
     "@types/caseless": {
@@ -1689,6 +2123,12 @@
       "resolved": "https://registry.npmjs.org/@types/circular-json/-/circular-json-0.4.0.tgz",
       "integrity": "sha512-7+kYB7x5a7nFWW1YPBh3KxhwKfiaI4PbZ1RvzBU91LZy7lWJO822CI+pqzSre/DZ7KsCuMKdHnLHHFu8AyXbQg=="
     },
+    "@types/color-name": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
+      "dev": true
+    },
     "@types/estree": {
       "version": "0.0.39",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
@@ -1713,9 +2153,9 @@
       }
     },
     "@types/jasmine": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.4.2.tgz",
-      "integrity": "sha512-SaSSGOzwUnBEn64c+HTyVTJhRf8F1CXZLnxYx2ww3UrgGBmEEw38RSux2l3fYiT9brVLP67DU5omWA6V9OHI5Q==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.5.10.tgz",
+      "integrity": "sha512-3F8qpwBAiVc5+HPJeXJpbrl+XjawGmciN5LgiO7Gv1pl1RHtjoMNqZpqEksaPJW05ViKe8snYInRs6xB25Xdew==",
       "dev": true
     },
     "@types/jasminewd2": {
@@ -1728,20 +2168,20 @@
       }
     },
     "@types/karma": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/karma/-/karma-3.0.3.tgz",
-      "integrity": "sha512-mkJejrAacgignkBce2+qD9S4VncjEfAT0Dion0fRcqpav3Sd2KiLTHODZOXRP3S8b0ZY5sXr9meDB3P8MSH8Cg==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@types/karma/-/karma-4.4.1.tgz",
+      "integrity": "sha512-Y2jH6yMPqVMCeewC6gn5Q3hljcbtffyjnhQC8rhp9zdek2zUXh6e6+TDLNlO2lCiNmjzxANiRxQR0cRxkkIYmQ==",
       "dev": true,
       "requires": {
         "@types/bluebird": "*",
         "@types/node": "*",
-        "log4js": "^3.0.0"
+        "log4js": "^4.0.0"
       }
     },
     "@types/marked": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/@types/marked/-/marked-0.6.5.tgz",
-      "integrity": "sha512-6kBKf64aVfx93UJrcyEZ+OBM5nGv4RLsI6sR1Ar34bpgvGVRoyTgpxn4ZmtxOM5aDTAaaznYuYUH8bUX3Nk3YA=="
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@types/marked/-/marked-0.7.3.tgz",
+      "integrity": "sha512-WXdEKuT3azHxLTThd5dwnpLt2Q9QiC8iKj09KZRtVqro3pX8hhY+GbD8FZOae6SBBEJ22yKJn3c7ejL0aucAcA=="
     },
     "@types/minimatch": {
       "version": "3.0.3",
@@ -1750,17 +2190,17 @@
       "dev": true
     },
     "@types/moment-timezone": {
-      "version": "0.5.12",
-      "resolved": "https://registry.npmjs.org/@types/moment-timezone/-/moment-timezone-0.5.12.tgz",
-      "integrity": "sha512-hnHH2+Efg2vExr/dSz+IX860nSiyk9Sk4pJF2EmS11lRpMcNXeB4KBW5xcgw2QPsb9amTXdsVNEe5IoJXiT0uw==",
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/@types/moment-timezone/-/moment-timezone-0.5.13.tgz",
+      "integrity": "sha512-SWk1qM8DRssS5YR9L4eEX7WUhK/wc96aIr4nMa6p0kTk9YhGGOJjECVhIdPEj13fvJw72Xun69gScXSZ/UmcPg==",
       "requires": {
         "moment": ">=2.14.0"
       }
     },
     "@types/node": {
-      "version": "12.7.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.9.tgz",
-      "integrity": "sha512-P57oKTJ/vYivL2BCfxCC5tQjlS8qW31pbOL6qt99Yrjm95YdHgNZwjrTTjMBh+C2/y6PXIX4oz253+jUzxKKfQ==",
+      "version": "12.12.34",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.34.tgz",
+      "integrity": "sha512-BneGN0J9ke24lBRn44hVHNeDlrXRYF+VRp0HbSUNnEZahXGAysHZIqnf/hER6aabdBgzM4YOV4jrR8gj4Zfi0g==",
       "dev": true
     },
     "@types/normalize-package-data": {
@@ -1770,15 +2210,15 @@
       "dev": true
     },
     "@types/q": {
-      "version": "0.0.32",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
-      "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz",
+      "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==",
       "dev": true
     },
     "@types/request": {
-      "version": "2.48.3",
-      "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.3.tgz",
-      "integrity": "sha512-3Wo2jNYwqgXcIz/rrq18AdOZUQB8cQ34CXZo+LUwPJNpvRAL86+Kc2wwI8mqpz9Cr1V+enIox5v+WZhy/p3h8w==",
+      "version": "2.48.4",
+      "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.4.tgz",
+      "integrity": "sha512-W1t1MTKYR8PxICH+A4HgEIPuAC3sbljoEVfyZbeFJJDbr30guDspJri2XOaM2E+Un7ZjrihaDi7cf6fPa2tbgw==",
       "dev": true,
       "requires": {
         "@types/caseless": "*",
@@ -1810,9 +2250,9 @@
       }
     },
     "@types/selenium-webdriver": {
-      "version": "3.0.16",
-      "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.16.tgz",
-      "integrity": "sha512-lMC2G0ItF2xv4UCiwbJGbnJlIuUixHrioOhNGHSCsYCJ8l4t9hMCUimCytvFv7qy6AfSzRxhRHoGa+UqaqwyeA==",
+      "version": "3.0.17",
+      "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.17.tgz",
+      "integrity": "sha512-tGomyEuzSC1H28y2zlW6XPCaDaXFaD6soTdb4GNdmte2qfHtrKqhy0ZFs4r/1hpazCfEZqeTSRLvSasmEx89uw==",
       "dev": true
     },
     "@types/source-list-map": {
@@ -1827,15 +2267,15 @@
       "integrity": "sha512-SdxmlrHfO0BxgbBP9HZWMUo2rima8lwMjPiWm6S0dyKkDa5CseamktFhXg8umu3TPVBkSlX6ZoB5uUDJK89yvg=="
     },
     "@types/tough-cookie": {
-      "version": "2.3.5",
-      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.5.tgz",
-      "integrity": "sha512-SCcK7mvGi3+ZNz833RRjFIxrn4gI1PPR3NtuIS+6vMkvmsGjosqTJwRt5bAEFLRz+wtJMWv8+uOnZf2hi2QXTg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz",
+      "integrity": "sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==",
       "dev": true
     },
     "@types/webpack-sources": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.5.tgz",
-      "integrity": "sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==",
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.7.tgz",
+      "integrity": "sha512-XyaHrJILjK1VHVC4aVlKsdNN5KBTwufMb43cQs+flGxtPAf/1Qwl8+Q0tp5BwEGaI8D6XT1L+9bSWXckgkjTLw==",
       "dev": true,
       "requires": {
         "@types/node": "*",
@@ -2045,16 +2485,6 @@
       "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
       "dev": true
     },
-    "JSONStream": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
-      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
-      "dev": true,
-      "requires": {
-        "jsonparse": "^1.2.0",
-        "through": ">=2.2.7 <3"
-      }
-    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -2095,9 +2525,9 @@
       }
     },
     "adm-zip": {
-      "version": "0.4.13",
-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.13.tgz",
-      "integrity": "sha512-fERNJX8sOXfel6qCBCMPvZLzENBEhZTzKqg6vrOW5pvoEaQuJhRU4ndTAh6lHOxn1I6jnz2NHra56ZODM751uw==",
+      "version": "0.4.14",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.14.tgz",
+      "integrity": "sha512-/9aQCnQHF+0IiCl0qhXoK7qs//SwYE7zX8lsr/DNk1BRAHYxeLZPL4pguwK29gUEqasYQjqPtEpDRSWEkdHn9g==",
       "dev": true
     },
     "after": {
@@ -2107,30 +2537,75 @@
       "dev": true
     },
     "agent-base": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
-      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.0.tgz",
+      "integrity": "sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw==",
       "dev": true,
       "requires": {
-        "es6-promisify": "^5.0.0"
+        "debug": "4"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "agentkeepalive": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz",
-      "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.0.tgz",
+      "integrity": "sha512-CW/n1wxF8RpEuuiq6Vbn9S8m0VSYDMnZESqaJ6F2cWN9fY8rei2qaxweIaRgq+ek8TqfoFIsUjaGNKGGEHElSg==",
       "dev": true,
       "requires": {
+        "debug": "^4.1.0",
+        "depd": "^1.1.2",
         "humanize-ms": "^1.2.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
-    "ajv": {
-      "version": "6.9.1",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.1.tgz",
-      "integrity": "sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==",
+    "aggregate-error": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz",
+      "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==",
       "dev": true,
       "requires": {
-        "fast-deep-equal": "^2.0.1",
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      }
+    },
+    "ajv": {
+      "version": "6.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
+      "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
+      "requires": {
+        "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
         "json-schema-traverse": "^0.4.1",
         "uri-js": "^4.2.2"
@@ -2148,11 +2623,18 @@
       "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
       "dev": true
     },
+    "alphanum-sort": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
+      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
+      "dev": true
+    },
     "amdefine": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "angular2-virtual-scroll": {
       "version": "0.4.16",
@@ -2218,12 +2700,12 @@
       "dev": true
     },
     "ansi-escapes": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.2.1.tgz",
-      "integrity": "sha512-Cg3ymMAdN10wOk/VYfLV7KCQyv7EDirJ64500sU7n9UlmioEtDuU5Gd+hj73hXSU/ex7tHJSssmyftDdkMLO8Q==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
       "dev": true,
       "requires": {
-        "type-fest": "^0.5.2"
+        "type-fest": "^0.11.0"
       }
     },
     "ansi-gray": {
@@ -2288,12 +2770,12 @@
       }
     },
     "append-transform": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz",
-      "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz",
+      "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==",
       "dev": true,
       "requires": {
-        "default-require-extensions": "^1.0.0"
+        "default-require-extensions": "^2.0.0"
       }
     },
     "aproba": {
@@ -2309,9 +2791,9 @@
       "dev": true
     },
     "arg": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.1.tgz",
-      "integrity": "sha512-SlmP3fEA88MBv0PypnXZ8ZfJhwmDeIE3SP71j37AiXQBXYosPV0x6uISAaHYSlSVhmHOVkomen0tbGk6Anlebw==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
       "dev": true
     },
     "argparse": {
@@ -2605,6 +3087,12 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
       "dev": true
     },
+    "at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+      "dev": true
+    },
     "atob": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
@@ -2612,18 +3100,18 @@
       "dev": true
     },
     "autoprefixer": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.1.tgz",
-      "integrity": "sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==",
+      "version": "9.7.4",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.4.tgz",
+      "integrity": "sha512-g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.6.3",
-        "caniuse-lite": "^1.0.30000980",
+        "browserslist": "^4.8.3",
+        "caniuse-lite": "^1.0.30001020",
         "chalk": "^2.4.2",
         "normalize-range": "^0.1.2",
         "num2fraction": "^1.2.2",
-        "postcss": "^7.0.17",
-        "postcss-value-parser": "^4.0.0"
+        "postcss": "^7.0.26",
+        "postcss-value-parser": "^4.0.2"
       }
     },
     "aws-sign2": {
@@ -2633,9 +3121,9 @@
       "dev": true
     },
     "aws4": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
+      "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==",
       "dev": true
     },
     "axobject-query": {
@@ -2647,89 +3135,57 @@
         "ast-types-flow": "0.0.7"
       }
     },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+    "babel-loader": {
+      "version": "8.0.6",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz",
+      "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==",
       "dev": true,
       "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
+        "find-cache-dir": "^2.0.0",
+        "loader-utils": "^1.0.2",
+        "mkdirp": "^0.5.1",
+        "pify": "^4.0.1"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+        "find-cache-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
+            "commondir": "^1.0.1",
+            "make-dir": "^2.0.0",
+            "pkg-dir": "^3.0.0"
           }
         },
-        "js-tokens": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-          "dev": true
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
         },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "babel-generator": {
-      "version": "6.26.1",
-      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
-      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
-      "dev": true,
-      "requires": {
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "detect-indent": "^4.0.0",
-        "jsesc": "^1.3.0",
-        "lodash": "^4.17.4",
-        "source-map": "^0.5.7",
-        "trim-right": "^1.0.1"
-      },
-      "dependencies": {
-        "jsesc": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-          "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
-          "dev": true
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
         },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
           "dev": true
         }
       }
     },
-    "babel-messages": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
     "babel-plugin-dynamic-import-node": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz",
@@ -2739,78 +3195,6 @@
         "object.assign": "^4.1.0"
       }
     },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
-      "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz",
-          "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==",
-          "dev": true
-        },
-        "regenerator-runtime": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-          "dev": true
-        }
-      }
-    },
-    "babel-template": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "lodash": "^4.17.4"
-      }
-    },
-    "babel-traverse": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "debug": "^2.6.8",
-        "globals": "^9.18.0",
-        "invariant": "^2.2.2",
-        "lodash": "^4.17.4"
-      }
-    },
-    "babel-types": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.4",
-        "to-fast-properties": "^1.0.3"
-      }
-    },
-    "babylon": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "dev": true
-    },
     "bach": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
@@ -2965,9 +3349,9 @@
       }
     },
     "bluebird": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.0.tgz",
-      "integrity": "sha512-aBQ1FxIa7kSWCcmKHlcHFlT2jt6J/l4FzC7KcPELkOJOsPOb/bccdhmIrKDfXhwFrmc7vDoDrrepFvGqjyXGJg==",
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
       "dev": true
     },
     "bn.js": {
@@ -3022,73 +3406,118 @@
         "multicast-dns-service-types": "^1.1.0"
       }
     },
+    "boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "dev": true
+    },
     "boxen": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-3.2.0.tgz",
-      "integrity": "sha512-cU4J/+NodM3IHdSL2yN8bqYqnmlBTidDR4RC7nJs61ZmtGz8VZzM3HLQX0zY5mrSmPtR3xWwsq2jOUQqFZN8+A==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz",
+      "integrity": "sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ==",
       "dev": true,
       "requires": {
         "ansi-align": "^3.0.0",
         "camelcase": "^5.3.1",
-        "chalk": "^2.4.2",
+        "chalk": "^3.0.0",
         "cli-boxes": "^2.2.0",
-        "string-width": "^3.0.0",
-        "term-size": "^1.2.0",
-        "type-fest": "^0.3.0",
-        "widest-line": "^2.0.0"
+        "string-width": "^4.1.0",
+        "term-size": "^2.1.0",
+        "type-fest": "^0.8.1",
+        "widest-line": "^3.1.0"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
         },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "dev": true,
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
           "dev": true
         },
         "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
           "dev": true,
           "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
           }
         },
         "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^4.1.0"
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
           }
         },
         "type-fest": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
-          "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==",
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
           "dev": true
         }
       }
     },
-    "brace": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/brace/-/brace-0.11.1.tgz",
-      "integrity": "sha1-SJb8ydVE7vRfS7dmDbMg07N5/lg="
-    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -3206,14 +3635,15 @@
       }
     },
     "browserslist": {
-      "version": "4.6.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz",
-      "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==",
+      "version": "4.11.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.11.1.tgz",
+      "integrity": "sha512-DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30000984",
-        "electron-to-chromium": "^1.3.191",
-        "node-releases": "^1.1.25"
+        "caniuse-lite": "^1.0.30001038",
+        "electron-to-chromium": "^1.3.390",
+        "node-releases": "^1.1.53",
+        "pkg-up": "^2.0.0"
       }
     },
     "browserstack": {
@@ -3223,24 +3653,93 @@
       "dev": true,
       "requires": {
         "https-proxy-agent": "^2.2.1"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+          "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+          "dev": true,
+          "requires": {
+            "es6-promisify": "^5.0.0"
+          }
+        },
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "https-proxy-agent": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
+          "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
+          "dev": true,
+          "requires": {
+            "agent-base": "^4.3.0",
+            "debug": "^3.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "browserstack-local": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/browserstack-local/-/browserstack-local-1.4.2.tgz",
-      "integrity": "sha512-fRaynjF0MvtyyfPRy2NFnVwxLyNtD28K/v9xRsIjUVf7xLc80NIm7Nfr3KXlFmWizhG91PL/UAOXlHkoxQjaNw==",
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/browserstack-local/-/browserstack-local-1.4.5.tgz",
+      "integrity": "sha512-0/VdSv2YVXmcnwBb64XThMvjM1HnZJnPdv7CUgQbC5y/N9Wsr0Fu+j1oknE9fC/VPx9CpoSC6CJ0kza42skMSA==",
       "dev": true,
       "requires": {
-        "https-proxy-agent": "^2.2.1",
-        "is-running": "^2.0.0",
-        "ps-tree": "=1.1.1",
+        "https-proxy-agent": "^4.0.0",
+        "is-running": "^2.1.0",
+        "ps-tree": "=1.2.0",
         "temp-fs": "^0.9.9"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
+          "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==",
+          "dev": true
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "https-proxy-agent": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
+          "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
+          "dev": true,
+          "requires": {
+            "agent-base": "5",
+            "debug": "4"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "buffer": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
-      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+      "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
       "dev": true,
       "requires": {
         "base64-js": "^1.0.2",
@@ -3325,32 +3824,34 @@
       "dev": true
     },
     "cacache": {
-      "version": "12.0.2",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.2.tgz",
-      "integrity": "sha512-ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg==",
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.0.tgz",
+      "integrity": "sha512-L0JpXHhplbJSiDGzyJJnJCTL7er7NzbBgxzVqLswEb4bO91Zbv17OUMuUeu/q0ZwKn3V+1HM4wb9tO4eVE/K8g==",
       "dev": true,
       "requires": {
-        "bluebird": "^3.5.5",
-        "chownr": "^1.1.1",
-        "figgy-pudding": "^3.5.1",
+        "chownr": "^1.1.2",
+        "fs-minipass": "^2.0.0",
         "glob": "^7.1.4",
-        "graceful-fs": "^4.1.15",
-        "infer-owner": "^1.0.3",
+        "infer-owner": "^1.0.4",
         "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
+        "minipass": "^3.1.1",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.2",
+        "mkdirp": "^1.0.3",
         "move-concurrently": "^1.0.1",
+        "p-map": "^3.0.0",
         "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.3",
-        "ssri": "^6.0.1",
-        "unique-filename": "^1.1.1",
-        "y18n": "^4.0.0"
+        "rimraf": "^2.7.1",
+        "ssri": "^8.0.0",
+        "tar": "^6.0.1",
+        "unique-filename": "^1.1.1"
       },
       "dependencies": {
         "glob": {
-          "version": "7.1.4",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
           "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -3360,6 +3861,12 @@
             "once": "^1.3.0",
             "path-is-absolute": "^1.0.0"
           }
+        },
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
         }
       }
     },
@@ -3404,12 +3911,6 @@
             "pump": "^3.0.0"
           }
         },
-        "http-cache-semantics": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz",
-          "integrity": "sha512-TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew==",
-          "dev": true
-        },
         "lowercase-keys": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
@@ -3470,10 +3971,22 @@
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true
     },
+    "caniuse-api": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-lite": "^1.0.0",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
+      }
+    },
     "caniuse-lite": {
-      "version": "1.0.30000989",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz",
-      "integrity": "sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw==",
+      "version": "1.0.30001039",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001039.tgz",
+      "integrity": "sha512-SezbWCTT34eyFoWHgx8UWso7YtvtM7oosmFoXbCkdC6qJzRfBTeTgE9REtKtiuKXuMwWTZEvdnFNGAyVMorv8Q==",
       "dev": true
     },
     "canonical-path": {
@@ -3538,9 +4051,9 @@
       }
     },
     "chownr": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
-      "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
       "dev": true
     },
     "chrome-trace-event": {
@@ -3603,9 +4116,9 @@
       }
     },
     "clean-css": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
-      "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
+      "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
       "dev": true,
       "requires": {
         "source-map": "~0.6.0"
@@ -3619,6 +4132,12 @@
         }
       }
     },
+    "clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true
+    },
     "cli-boxes": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.0.tgz",
@@ -3634,6 +4153,12 @@
         "restore-cursor": "^3.1.0"
       }
     },
+    "cli-spinners": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.2.0.tgz",
+      "integrity": "sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==",
+      "dev": true
+    },
     "cli-width": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
@@ -3706,6 +4231,17 @@
       "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
       "dev": true
     },
+    "coa": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
+      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
+      "dev": true,
+      "requires": {
+        "@types/q": "^1.5.1",
+        "chalk": "^2.4.1",
+        "q": "^1.1.2"
+      }
+    },
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@ -3737,14 +4273,14 @@
       }
     },
     "codelyzer": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-5.2.0.tgz",
-      "integrity": "sha512-izfUfhEOOgAizszPlEDxo71DK/C4wprZw0vkY6UWcOSTQvN1JyfXf9DXwaV7WX+/JC+hH0ShXfdtGLA9Rca7LA==",
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-5.2.2.tgz",
+      "integrity": "sha512-jB4FZ1Sx7kZhvZVdf+N2BaKTdrrNZOL0Bj10RRfrhHrb3zEvXjJvvq298JPMJAiyiCS/v4zs1QlGU0ip7xGqeA==",
       "dev": true,
       "requires": {
         "app-root-path": "^2.2.1",
         "aria-query": "^3.0.0",
-        "axobject-query": "^2.0.2",
+        "axobject-query": "2.0.2",
         "css-selector-tokenizer": "^0.7.1",
         "cssauron": "^1.4.0",
         "damerau-levenshtein": "^1.0.4",
@@ -3788,6 +4324,16 @@
         "object-visit": "^1.0.0"
       }
     },
+    "color": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz",
+      "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==",
+      "dev": true,
+      "requires": {
+        "color-convert": "^1.9.1",
+        "color-string": "^1.5.2"
+      }
+    },
     "color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -3803,6 +4349,16 @@
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
     },
+    "color-string": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz",
+      "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==",
+      "dev": true,
+      "requires": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
     "color-support": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
@@ -3827,7 +4383,8 @@
     "commander": {
       "version": "2.20.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
+      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
+      "dev": true
     },
     "commondir": {
       "version": "1.0.1",
@@ -3836,9 +4393,9 @@
       "dev": true
     },
     "compare-versions": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.5.1.tgz",
-      "integrity": "sha512-9fGPIB7C6AyM18CJJBHt5EnCZDG3oiTJYy0NjfIAGjKpzv0tkxWko7TNQHF5ymqm7IH03tqmeuBxtvD+Izh6mg==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz",
+      "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==",
       "dev": true
     },
     "component-bind": {
@@ -3860,12 +4417,12 @@
       "dev": true
     },
     "compressible": {
-      "version": "2.0.17",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz",
-      "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==",
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
       "dev": true,
       "requires": {
-        "mime-db": ">= 1.40.0 < 2"
+        "mime-db": ">= 1.43.0 < 2"
       }
     },
     "compression": {
@@ -3902,27 +4459,33 @@
       }
     },
     "configstore": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-4.0.0.tgz",
-      "integrity": "sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
+      "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
       "dev": true,
       "requires": {
-        "dot-prop": "^4.1.0",
+        "dot-prop": "^5.2.0",
         "graceful-fs": "^4.1.2",
-        "make-dir": "^1.0.0",
-        "unique-string": "^1.0.0",
-        "write-file-atomic": "^2.0.0",
-        "xdg-basedir": "^3.0.0"
+        "make-dir": "^3.0.0",
+        "unique-string": "^2.0.0",
+        "write-file-atomic": "^3.0.0",
+        "xdg-basedir": "^4.0.0"
       },
       "dependencies": {
         "make-dir": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-          "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz",
+          "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==",
           "dev": true,
           "requires": {
-            "pify": "^3.0.0"
+            "semver": "^6.0.0"
           }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
         }
       }
     },
@@ -3951,13 +4514,10 @@
       "dev": true
     },
     "console-browserify": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
-      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-      "dev": true,
-      "requires": {
-        "date-now": "^0.1.4"
-      }
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+      "dev": true
     },
     "constants-browserify": {
       "version": "1.0.0",
@@ -4032,12 +4592,12 @@
       }
     },
     "copy-webpack-plugin": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.0.4.tgz",
-      "integrity": "sha512-YBuYGpSzoCHSSDGyHy6VJ7SHojKp6WHT4D7ItcQFNAYx2hrwkMe56e97xfVR0/ovDuMTrMffXUiltvQljtAGeg==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz",
+      "integrity": "sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg==",
       "dev": true,
       "requires": {
-        "cacache": "^11.3.3",
+        "cacache": "^12.0.3",
         "find-cache-dir": "^2.1.0",
         "glob-parent": "^3.1.0",
         "globby": "^7.1.1",
@@ -4045,16 +4605,16 @@
         "loader-utils": "^1.2.3",
         "minimatch": "^3.0.4",
         "normalize-path": "^3.0.0",
-        "p-limit": "^2.2.0",
+        "p-limit": "^2.2.1",
         "schema-utils": "^1.0.0",
-        "serialize-javascript": "^1.7.0",
+        "serialize-javascript": "^2.1.2",
         "webpack-log": "^2.0.0"
       },
       "dependencies": {
         "cacache": {
-          "version": "11.3.3",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz",
-          "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==",
+          "version": "12.0.4",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+          "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
           "dev": true,
           "requires": {
             "bluebird": "^3.5.5",
@@ -4062,6 +4622,7 @@
             "figgy-pudding": "^3.5.1",
             "glob": "^7.1.4",
             "graceful-fs": "^4.1.15",
+            "infer-owner": "^1.0.3",
             "lru-cache": "^5.1.1",
             "mississippi": "^3.0.0",
             "mkdirp": "^0.5.1",
@@ -4085,9 +4646,9 @@
           }
         },
         "glob": {
-          "version": "7.1.4",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
           "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -4112,33 +4673,88 @@
             "slash": "^1.0.0"
           }
         },
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        },
         "normalize-path": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
           "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
           "dev": true
+        },
+        "p-limit": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
+          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        },
+        "ssri": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1"
+          }
         }
       }
     },
     "core-js": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.2.1.tgz",
-      "integrity": "sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw=="
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
+      "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw=="
     },
     "core-js-compat": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.2.1.tgz",
-      "integrity": "sha512-MwPZle5CF9dEaMYdDeWm73ao/IflDH+FjeJCWEADcEgFSE9TLimFKwJsfmkwzI8eC0Aj0mgvMDjeQjrElkz4/A==",
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.4.tgz",
+      "integrity": "sha512-zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.6.6",
-        "semver": "^6.3.0"
+        "browserslist": "^4.8.3",
+        "semver": "7.0.0"
       },
       "dependencies": {
         "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
           "dev": true
         }
       }
@@ -4243,71 +4859,234 @@
       }
     },
     "crypto-random-string": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
-      "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=",
-      "dev": true
-    },
-    "css-parse": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz",
-      "integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
+      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
       "dev": true
     },
-    "css-selector-tokenizer": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz",
-      "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==",
+    "css": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
+      "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
       "dev": true,
       "requires": {
-        "cssesc": "^0.1.0",
-        "fastparse": "^1.1.1",
-        "regexpu-core": "^1.0.0"
+        "inherits": "^2.0.3",
+        "source-map": "^0.6.1",
+        "source-map-resolve": "^0.5.2",
+        "urix": "^0.1.0"
       },
       "dependencies": {
-        "regexpu-core": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
-          "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
-          "dev": true,
-          "requires": {
-            "regenerate": "^1.2.1",
-            "regjsgen": "^0.2.0",
-            "regjsparser": "^0.1.4"
-          }
-        },
-        "regjsgen": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-          "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "regjsparser": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
-          "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
-          "dev": true,
-          "requires": {
-            "jsesc": "~0.5.0"
-          }
         }
       }
     },
-    "cssauron": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz",
-      "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=",
+    "css-color-names": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
+      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
+      "dev": true
+    },
+    "css-declaration-sorter": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
+      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
       "dev": true,
       "requires": {
-        "through": "X.X.X"
+        "postcss": "^7.0.1",
+        "timsort": "^0.3.0"
+      }
+    },
+    "css-parse": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
+      "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
+      "dev": true,
+      "requires": {
+        "css": "^2.0.0"
+      }
+    },
+    "css-select": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
+      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
+      "dev": true,
+      "requires": {
+        "boolbase": "^1.0.0",
+        "css-what": "^3.2.1",
+        "domutils": "^1.7.0",
+        "nth-check": "^1.0.2"
+      }
+    },
+    "css-select-base-adapter": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
+      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
+      "dev": true
+    },
+    "css-selector-tokenizer": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.2.tgz",
+      "integrity": "sha512-yj856NGuAymN6r8bn8/Jl46pR+OC3eEvAhfGYDUe7YPtTPAYrSSw4oAniZ9Y8T5B92hjhwTBLUen0/vKPxf6pw==",
+      "dev": true,
+      "requires": {
+        "cssesc": "^3.0.0",
+        "fastparse": "^1.1.2",
+        "regexpu-core": "^4.6.0"
+      }
+    },
+    "css-tree": {
+      "version": "1.0.0-alpha.37",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
+      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
+      "dev": true,
+      "requires": {
+        "mdn-data": "2.0.4",
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "css-what": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.2.1.tgz",
+      "integrity": "sha512-WwOrosiQTvyms+Ti5ZC5vGEK0Vod3FTt1ca+payZqvKuGJF+dq7bG63DstxtN0dpm6FxY27a/zS3Wten+gEtGw==",
+      "dev": true
+    },
+    "cssauron": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz",
+      "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=",
+      "dev": true,
+      "requires": {
+        "through": "X.X.X"
       }
     },
     "cssesc": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
-      "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true
+    },
+    "cssnano": {
+      "version": "4.1.10",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
+      "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "^5.0.0",
+        "cssnano-preset-default": "^4.0.7",
+        "is-resolvable": "^1.0.0",
+        "postcss": "^7.0.0"
+      }
+    },
+    "cssnano-preset-default": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz",
+      "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
+      "dev": true,
+      "requires": {
+        "css-declaration-sorter": "^4.0.1",
+        "cssnano-util-raw-cache": "^4.0.1",
+        "postcss": "^7.0.0",
+        "postcss-calc": "^7.0.1",
+        "postcss-colormin": "^4.0.3",
+        "postcss-convert-values": "^4.0.1",
+        "postcss-discard-comments": "^4.0.2",
+        "postcss-discard-duplicates": "^4.0.2",
+        "postcss-discard-empty": "^4.0.1",
+        "postcss-discard-overridden": "^4.0.1",
+        "postcss-merge-longhand": "^4.0.11",
+        "postcss-merge-rules": "^4.0.3",
+        "postcss-minify-font-values": "^4.0.2",
+        "postcss-minify-gradients": "^4.0.2",
+        "postcss-minify-params": "^4.0.2",
+        "postcss-minify-selectors": "^4.0.2",
+        "postcss-normalize-charset": "^4.0.1",
+        "postcss-normalize-display-values": "^4.0.2",
+        "postcss-normalize-positions": "^4.0.2",
+        "postcss-normalize-repeat-style": "^4.0.2",
+        "postcss-normalize-string": "^4.0.2",
+        "postcss-normalize-timing-functions": "^4.0.2",
+        "postcss-normalize-unicode": "^4.0.1",
+        "postcss-normalize-url": "^4.0.1",
+        "postcss-normalize-whitespace": "^4.0.2",
+        "postcss-ordered-values": "^4.1.2",
+        "postcss-reduce-initial": "^4.0.3",
+        "postcss-reduce-transforms": "^4.0.2",
+        "postcss-svgo": "^4.0.2",
+        "postcss-unique-selectors": "^4.0.1"
+      }
+    },
+    "cssnano-util-get-arguments": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
+      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=",
+      "dev": true
+    },
+    "cssnano-util-get-match": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
+      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=",
+      "dev": true
+    },
+    "cssnano-util-raw-cache": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
+      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "cssnano-util-same-parent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
+      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
       "dev": true
     },
+    "csso": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz",
+      "integrity": "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==",
+      "dev": true,
+      "requires": {
+        "css-tree": "1.0.0-alpha.39"
+      },
+      "dependencies": {
+        "css-tree": {
+          "version": "1.0.0-alpha.39",
+          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz",
+          "integrity": "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==",
+          "dev": true,
+          "requires": {
+            "mdn-data": "2.0.6",
+            "source-map": "^0.6.1"
+          }
+        },
+        "mdn-data": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz",
+          "integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
     "cuint": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz",
@@ -4336,131 +5115,15 @@
         "type": "^1.0.1"
       }
     },
-    "d3": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npmjs.org/d3/-/d3-4.13.0.tgz",
-      "integrity": "sha512-l8c4+0SldjVKLaE2WG++EQlqD7mh/dmQjvi2L2lKPadAVC+TbJC4ci7Uk9bRi+To0+ansgsS0iWfPjD7DBy+FQ==",
-      "requires": {
-        "d3-array": "1.2.1",
-        "d3-axis": "1.0.8",
-        "d3-brush": "1.0.4",
-        "d3-chord": "1.0.4",
-        "d3-collection": "1.0.4",
-        "d3-color": "1.0.3",
-        "d3-dispatch": "1.0.3",
-        "d3-drag": "1.2.1",
-        "d3-dsv": "1.0.8",
-        "d3-ease": "1.0.3",
-        "d3-force": "1.1.0",
-        "d3-format": "1.2.2",
-        "d3-geo": "1.9.1",
-        "d3-hierarchy": "1.1.5",
-        "d3-interpolate": "1.1.6",
-        "d3-path": "1.0.5",
-        "d3-polygon": "1.0.3",
-        "d3-quadtree": "1.0.3",
-        "d3-queue": "3.0.7",
-        "d3-random": "1.1.0",
-        "d3-request": "1.0.6",
-        "d3-scale": "1.0.7",
-        "d3-selection": "1.3.0",
-        "d3-shape": "1.2.0",
-        "d3-time": "1.0.8",
-        "d3-time-format": "2.1.1",
-        "d3-timer": "1.0.7",
-        "d3-transition": "1.1.1",
-        "d3-voronoi": "1.1.2",
-        "d3-zoom": "1.7.1"
-      },
-      "dependencies": {
-        "d3-array": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.1.tgz",
-          "integrity": "sha512-CyINJQ0SOUHojDdFDH4JEM0552vCR1utGyLHegJHyYH0JyCpSeTPxi4OBqHMA2jJZq4NH782LtaJWBImqI/HBw=="
-        },
-        "d3-brush": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.0.4.tgz",
-          "integrity": "sha1-AMLyOAGfJPbAoZSibUGhUw/+e8Q=",
-          "requires": {
-            "d3-dispatch": "1",
-            "d3-drag": "1",
-            "d3-interpolate": "1",
-            "d3-selection": "1",
-            "d3-transition": "1"
-          }
-        },
-        "d3-color": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.0.3.tgz",
-          "integrity": "sha1-vHZD/KjlOoNH4vva/6I2eWtYUJs="
-        },
-        "d3-force": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.1.0.tgz",
-          "integrity": "sha512-2HVQz3/VCQs0QeRNZTYb7GxoUCeb6bOzMp/cGcLa87awY9ZsPvXOGeZm0iaGBjXic6I1ysKwMn+g+5jSAdzwcg==",
-          "requires": {
-            "d3-collection": "1",
-            "d3-dispatch": "1",
-            "d3-quadtree": "1",
-            "d3-timer": "1"
-          }
-        },
-        "d3-format": {
-          "version": "1.2.2",
-          "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.2.2.tgz",
-          "integrity": "sha512-zH9CfF/3C8zUI47nsiKfD0+AGDEuM8LwBIP7pBVpyR4l/sKkZqITmMtxRp04rwBrlshIZ17XeFAaovN3++wzkw=="
-        },
-        "d3-hierarchy": {
-          "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.5.tgz",
-          "integrity": "sha1-ochFxC+Eoga88cAcAQmOpN2qeiY="
-        },
-        "d3-interpolate": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.1.6.tgz",
-          "integrity": "sha512-mOnv5a+pZzkNIHtw/V6I+w9Lqm9L5bG3OTXPM5A+QO0yyVMQ4W1uZhR+VOJmazaOZXri2ppbiZ5BUNWT0pFM9A==",
-          "requires": {
-            "d3-color": "1"
-          }
-        },
-        "d3-selection": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.3.0.tgz",
-          "integrity": "sha512-qgpUOg9tl5CirdqESUAu0t9MU/t3O9klYfGfyKsXEmhyxyzLpzpeh08gaxBUTQw1uXIOkr/30Ut2YRjSSxlmHA=="
-        },
-        "d3-shape": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.2.0.tgz",
-          "integrity": "sha1-RdAVOPBkuv0F6j1tLLdI/YxB93c=",
-          "requires": {
-            "d3-path": "1"
-          }
-        },
-        "d3-time-format": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.1.1.tgz",
-          "integrity": "sha512-8kAkymq2WMfzW7e+s/IUNAtN/y3gZXGRrdGfo6R8NKPAA85UBTxZg5E61bR6nLwjPjj4d3zywSQe1CkYLPFyrw==",
-          "requires": {
-            "d3-time": "1"
-          }
-        }
-      }
-    },
     "d3-array": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz",
-      "integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="
-    },
-    "d3-axis": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-1.0.8.tgz",
-      "integrity": "sha1-MacFoLU15ldZ3hQXOjGTMTfxjvo="
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.4.0.tgz",
+      "integrity": "sha512-KQ41bAF2BMakf/HdKT865ALd4cgND6VcIztVQZUTt0+BH3RWy6ZYnHghVXf6NFjt2ritLr8H1T8LreAAlfiNcw=="
     },
     "d3-brush": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.1.3.tgz",
-      "integrity": "sha512-v8bbYyCFKjyCzFk/tdWqXwDykY8YWqhXYjcYxfILIit085VZOpj4XJKOMccTsvWxgzSLMJQg5SiqHjslsipEDg==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.1.5.tgz",
+      "integrity": "sha512-rEaJ5gHlgLxXugWjIkolTA0OyMvw8UWU1imYXy1v642XyyswmI1ybKOv05Ft+ewq+TFmdliD3VuK0pRp1VT/5A==",
       "requires": {
         "d3-dispatch": "1",
         "d3-drag": "1",
@@ -4469,176 +5132,100 @@
         "d3-transition": "1"
       }
     },
-    "d3-chord": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-1.0.4.tgz",
-      "integrity": "sha1-fexPC6iG9xP+ERxF92NBT290yiw=",
-      "requires": {
-        "d3-array": "1",
-        "d3-path": "1"
-      }
-    },
-    "d3-collection": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.4.tgz",
-      "integrity": "sha1-NC39EoN8kJdPM/HMCnha6lcNzcI="
-    },
     "d3-color": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.0.tgz",
       "integrity": "sha512-TzNPeJy2+iEepfiL92LAAB7fvnp/dV2YwANPVHdDWmYMm23qIJBYww3qT8I8C1wXrmrg4UWs7BKc2tKIgyjzHg=="
     },
     "d3-dispatch": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.3.tgz",
-      "integrity": "sha1-RuFJHqqbWMNY/OW+TovtYm54cfg="
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz",
+      "integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA=="
     },
     "d3-drag": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.1.tgz",
-      "integrity": "sha512-Cg8/K2rTtzxzrb0fmnYOUeZHvwa4PHzwXOLZZPwtEs2SKLLKLXeYwZKBB+DlOxUvFmarOnmt//cU4+3US2lyyQ==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.5.tgz",
+      "integrity": "sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w==",
       "requires": {
         "d3-dispatch": "1",
         "d3-selection": "1"
       }
     },
-    "d3-dsv": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.0.8.tgz",
-      "integrity": "sha512-IVCJpQ+YGe3qu6odkPQI0KPqfxkhbP/oM1XhhE/DFiYmcXKfCRub4KXyiuehV1d4drjWVXHUWx4gHqhdZb6n/A==",
-      "requires": {
-        "commander": "2",
-        "iconv-lite": "0.4",
-        "rw": "1"
-      }
-    },
     "d3-ease": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.3.tgz",
-      "integrity": "sha1-aL+8NJM4o4DETYrMT7wzBKotjA4="
-    },
-    "d3-force": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.2.1.tgz",
-      "integrity": "sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==",
-      "requires": {
-        "d3-collection": "1",
-        "d3-dispatch": "1",
-        "d3-quadtree": "1",
-        "d3-timer": "1"
-      }
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.6.tgz",
+      "integrity": "sha512-SZ/lVU7LRXafqp7XtIcBdxnWl8yyLpgOmzAk0mWBI9gXNzLDx5ybZgnRbH9dN/yY5tzVBqCQ9avltSnqVwessQ=="
     },
     "d3-format": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.1.tgz",
-      "integrity": "sha512-TUswGe6hfguUX1CtKxyG2nymO+1lyThbkS1ifLX0Sr+dOQtAD5gkrffpHnx+yHNKUZ0Bmg5T4AjUQwugPDrm0g=="
-    },
-    "d3-geo": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.9.1.tgz",
-      "integrity": "sha512-l9wL/cEQkyZQYXw3xbmLsH3eQ5ij+icNfo4r0GrLa5rOCZR/e/3am45IQ0FvQ5uMsv+77zBRunLc9ufTWSQYFA==",
-      "requires": {
-        "d3-array": "1"
-      }
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.4.tgz",
+      "integrity": "sha512-TWks25e7t8/cqctxCmxpUuzZN11QxIA7YrMbram94zMQ0PXjE4LVIMe/f6a4+xxL8HQ3OsAFULOINQi1pE62Aw=="
     },
     "d3-hierarchy": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.8.tgz",
-      "integrity": "sha512-L+GHMSZNwTpiq4rt9GEsNcpLa4M96lXMR8M/nMG9p5hBE0jy6C+3hWtyZMenPQdwla249iJy7Nx0uKt3n+u9+w=="
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz",
+      "integrity": "sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ=="
     },
     "d3-interpolate": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.3.2.tgz",
-      "integrity": "sha512-NlNKGopqaz9qM1PXh9gBF1KSCVh+jSFErrSlD/4hybwoNX/gt1d8CDbDW+3i+5UOHhjC6s6nMvRxcuoMVNgL2w==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
+      "integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
       "requires": {
         "d3-color": "1"
       }
     },
     "d3-path": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.5.tgz",
-      "integrity": "sha1-JB6xhJvZ6egCHA0KeZ+KDo5EF2Q="
-    },
-    "d3-polygon": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-1.0.3.tgz",
-      "integrity": "sha1-FoiOkCZGCTPysXllKtN4Ik04LGI="
-    },
-    "d3-quadtree": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.3.tgz",
-      "integrity": "sha1-rHmH4+I/6AWpkPKOG1DTj8uCJDg="
-    },
-    "d3-queue": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/d3-queue/-/d3-queue-3.0.7.tgz",
-      "integrity": "sha1-yTouVLQXwJWRKdfXP2z31Ckudhg="
-    },
-    "d3-random": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-1.1.0.tgz",
-      "integrity": "sha1-ZkLlBsb6OmSFldKyRpeIqNElKdM="
-    },
-    "d3-request": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-request/-/d3-request-1.0.6.tgz",
-      "integrity": "sha512-FJj8ySY6GYuAJHZMaCQ83xEYE4KbkPkmxZ3Hu6zA1xxG2GD+z6P+Lyp+zjdsHf0xEbp2xcluDI50rCS855EQ6w==",
-      "requires": {
-        "d3-collection": "1",
-        "d3-dispatch": "1",
-        "d3-dsv": "1",
-        "xmlhttprequest": "1"
-      }
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz",
+      "integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="
     },
     "d3-scale": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-1.0.7.tgz",
-      "integrity": "sha512-KvU92czp2/qse5tUfGms6Kjig0AhHOwkzXG0+PqIJB3ke0WUv088AHMZI0OssO9NCkXt4RP8yju9rpH8aGB7Lw==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.1.tgz",
+      "integrity": "sha512-huz5byJO/6MPpz6Q8d4lg7GgSpTjIZW/l+1MQkzKfu2u8P6hjaXaStOpmyrD6ymKoW87d2QVFCKvSjLwjzx/rA==",
       "requires": {
-        "d3-array": "^1.2.0",
-        "d3-collection": "1",
-        "d3-color": "1",
+        "d3-array": "1.2.0 - 2",
         "d3-format": "1",
-        "d3-interpolate": "1",
+        "d3-interpolate": "^1.2.0",
         "d3-time": "1",
         "d3-time-format": "2"
       }
     },
     "d3-selection": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.0.tgz",
-      "integrity": "sha512-EYVwBxQGEjLCKF2pJ4+yrErskDnz5v403qvAid96cNdCMr8rmCYfY5RGzWz24mdIbxmDf6/4EAH+K9xperD5jg=="
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.1.tgz",
+      "integrity": "sha512-BTIbRjv/m5rcVTfBs4AMBLKs4x8XaaLkwm28KWu9S2vKNqXkXt2AH2Qf0sdPZHjFxcWg/YL53zcqAz+3g4/7PA=="
     },
     "d3-shape": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.5.tgz",
-      "integrity": "sha512-VKazVR3phgD+MUCldapHD7P9kcrvPcexeX/PkMJmkUov4JM8IxsSg1DvbYoYich9AtdTsa5nNk2++ImPiDiSxg==",
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz",
+      "integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==",
       "requires": {
         "d3-path": "1"
       }
     },
     "d3-time": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.0.8.tgz",
-      "integrity": "sha512-YRZkNhphZh3KcnBfitvF3c6E0JOFGikHZ4YqD+Lzv83ZHn1/u6yGenRU1m+KAk9J1GnZMnKcrtfvSktlA1DXNQ=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz",
+      "integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA=="
     },
     "d3-time-format": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.1.3.tgz",
-      "integrity": "sha512-6k0a2rZryzGm5Ihx+aFMuO1GgelgIz+7HhB4PH4OEndD5q2zGn1mDfRdNrulspOfR6JXkb2sThhDK41CSK85QA==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.2.3.tgz",
+      "integrity": "sha512-RAHNnD8+XvC4Zc4d2A56Uw0yJoM7bsvOlJR33bclxq399Rak/b9bhvu/InjxdWhPtkgU53JJcleJTGkNRnN6IA==",
       "requires": {
         "d3-time": "1"
       }
     },
     "d3-timer": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.7.tgz",
-      "integrity": "sha512-vMZXR88XujmG/L5oB96NNKH5lCWwiLM/S2HyyAQLcjWJCloK5shxta4CwOFYLZoY3AWX73v8Lgv4cCAdWtRmOA=="
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.10.tgz",
+      "integrity": "sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw=="
     },
     "d3-transition": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.1.1.tgz",
-      "integrity": "sha512-xeg8oggyQ+y5eb4J13iDgKIjUcEfIOZs2BqV/eEmXm2twx80wTzJ4tB4vaZ5BKfz7XsI/DFmQL5me6O27/5ykQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.3.2.tgz",
+      "integrity": "sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==",
       "requires": {
         "d3-color": "1",
         "d3-dispatch": "1",
@@ -4648,27 +5235,10 @@
         "d3-timer": "1"
       }
     },
-    "d3-voronoi": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.2.tgz",
-      "integrity": "sha1-Fodmfo8TotFYyAwUgMWinLDYlzw="
-    },
-    "d3-zoom": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.7.1.tgz",
-      "integrity": "sha512-sZHQ55DGq5BZBFGnRshUT8tm2sfhPHFnOlmPbbwTkAoPeVdRTkB4Xsf9GCY0TSHrTD8PeJPZGmP/TpGicwJDJQ==",
-      "requires": {
-        "d3-dispatch": "1",
-        "d3-drag": "1",
-        "d3-interpolate": "1",
-        "d3-selection": "1",
-        "d3-transition": "1"
-      }
-    },
     "damerau-levenshtein": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz",
-      "integrity": "sha512-CBCRqFnpu715iPmw1KrdOrzRqbdFwQTwAWyyyYS42+iAgHCuXZ+/TdMgQkUENPomxEz9z1BEzuQU2Xw0kUuAgA==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz",
+      "integrity": "sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug==",
       "dev": true
     },
     "dashdash": {
@@ -4681,15 +5251,9 @@
       }
     },
     "date-format": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz",
-      "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=",
-      "dev": true
-    },
-    "date-now": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
-      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz",
+      "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==",
       "dev": true
     },
     "debug": {
@@ -4729,9 +5293,9 @@
       }
     },
     "deep-equal": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.0.tgz",
-      "integrity": "sha512-ZbfWJq/wN1Z273o7mUSjILYqehAktR2NVoSrOukDkU9kg2v/Uv89yU4Cvz8seJeAmtN5oqiefKq8FPuXOboqLw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
+      "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
       "dev": true,
       "requires": {
         "is-arguments": "^1.0.4",
@@ -4787,12 +5351,20 @@
       }
     },
     "default-require-extensions": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz",
-      "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz",
+      "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=",
       "dev": true,
       "requires": {
-        "strip-bom": "^2.0.0"
+        "strip-bom": "^3.0.0"
+      },
+      "dependencies": {
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        }
       }
     },
     "default-resolution": {
@@ -4801,10 +5373,27 @@
       "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
       "dev": true
     },
+    "defaults": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
+      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+      "dev": true,
+      "requires": {
+        "clone": "^1.0.2"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+          "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+          "dev": true
+        }
+      }
+    },
     "defer-to-connect": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.0.2.tgz",
-      "integrity": "sha512-k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
+      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
       "dev": true
     },
     "define-properties": {
@@ -4893,29 +5482,11 @@
             }
           }
         },
-        "is-path-cwd": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-          "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-          "dev": true
-        },
-        "is-path-in-cwd": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-          "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
-          "dev": true,
-          "requires": {
-            "is-path-inside": "^2.1.0"
-          }
-        },
-        "is-path-inside": {
+        "p-map": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-          "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
-          "dev": true,
-          "requires": {
-            "path-is-inside": "^1.0.2"
-          }
+          "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+          "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+          "dev": true
         },
         "pify": {
           "version": "4.0.1",
@@ -4967,9 +5538,9 @@
       "dev": true
     },
     "des.js": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
-      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
       "dev": true,
       "requires": {
         "inherits": "^2.0.1",
@@ -4988,15 +5559,6 @@
       "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
       "dev": true
     },
-    "detect-indent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
-      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
-      "dev": true,
-      "requires": {
-        "repeating": "^2.0.0"
-      }
-    },
     "detect-node": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
@@ -5092,24 +5654,58 @@
         "void-elements": "^2.0.0"
       }
     },
-    "domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+    "dom-serializer": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
+          "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
+          "dev": true
+        }
+      }
+    },
+    "domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+      "dev": true
+    },
+    "domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
       "dev": true
     },
     "domino": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.3.tgz",
-      "integrity": "sha512-EwjTbUv1Q/RLQOdn9k7ClHutrQcWGsfXaRQNOnM/KgK4xDBoLFEcIRFuBSxAx13Vfa63X029gXYrNFrSy+DOSg=="
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.4.tgz",
+      "integrity": "sha512-l70mlQ7IjPKC8kT7GljQXJZmt5OqFL+RE91ik5y5WWQtsd9wP8R7gpFnNu96fK5MqAAZRXfLLsnzKtkty5fWGQ=="
+    },
+    "domutils": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+      "dev": true,
+      "requires": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
     },
     "dot-prop": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz",
+      "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==",
       "dev": true,
       "requires": {
-        "is-obj": "^1.0.0"
+        "is-obj": "^2.0.0"
       }
     },
     "duplexer": {
@@ -5163,15 +5759,15 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.273",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.273.tgz",
-      "integrity": "sha512-0kUppiHQvHEENHh+nTtvTt4eXMwcPyWmMaj73GPrSEm3ldKhmmHuOH6IjrmuW6YmyS/fpXcLvMQLNVpqRhpNWw==",
+      "version": "1.3.397",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.397.tgz",
+      "integrity": "sha512-zcUd1p/7yzTSdWkCTrqGvbnEOASy96d0RJL/lc5BDJoO23Z3G/VHd0yIPbguDU9n8QNUTCigLO7oEdtOb7fp2A==",
       "dev": true
     },
     "elliptic": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz",
-      "integrity": "sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==",
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz",
+      "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==",
       "dev": true,
       "requires": {
         "bn.js": "^4.4.0",
@@ -5190,9 +5786,9 @@
       "dev": true
     },
     "emojis-list": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
       "dev": true
     },
     "encodeurl": {
@@ -5206,6 +5802,7 @@
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
       "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
       "dev": true,
+      "optional": true,
       "requires": {
         "iconv-lite": "~0.4.13"
       }
@@ -5322,13 +5919,13 @@
       }
     },
     "enhanced-resolve": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
-      "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz",
+      "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
-        "memory-fs": "^0.4.0",
+        "memory-fs": "^0.5.0",
         "tapable": "^1.0.0"
       }
     },
@@ -5338,6 +5935,12 @@
       "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
       "dev": true
     },
+    "entities": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
+      "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
+      "dev": true
+    },
     "err-code": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
@@ -5497,6 +6100,12 @@
         "es6-symbol": "^3.1.1"
       }
     },
+    "escape-goat": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
+      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
+      "dev": true
+    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -5759,9 +6368,9 @@
       "dev": true
     },
     "estree-walker": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
-      "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
+      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
       "dev": true
     },
     "esutils": {
@@ -5808,9 +6417,9 @@
       "dev": true
     },
     "events": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
-      "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz",
+      "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==",
       "dev": true
     },
     "eventsource": {
@@ -6077,23 +6686,22 @@
       }
     },
     "fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-      "dev": true
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
+      "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="
     },
     "fast-glob": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.0.4.tgz",
-      "integrity": "sha512-wkIbV6qg37xTJwqSsdnIphL1e+LaGz4AIQqr00mIubMaEhv1/HEmJ0uuCGZRNRUkZZmOB5mJKO0ZUTVq+SxMQg==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz",
+      "integrity": "sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==",
       "dev": true,
       "requires": {
-        "@nodelib/fs.stat": "^2.0.1",
-        "@nodelib/fs.walk": "^1.2.1",
-        "glob-parent": "^5.0.0",
-        "is-glob": "^4.0.1",
-        "merge2": "^1.2.3",
-        "micromatch": "^4.0.2"
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.0",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.2",
+        "picomatch": "^2.2.1"
       },
       "dependencies": {
         "braces": {
@@ -6115,9 +6723,9 @@
           }
         },
         "glob-parent": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
-          "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+          "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
           "dev": true,
           "requires": {
             "is-glob": "^4.0.1"
@@ -6151,10 +6759,9 @@
       }
     },
     "fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-      "dev": true
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
     "fast-levenshtein": {
       "version": "2.0.6",
@@ -6169,12 +6776,12 @@
       "dev": true
     },
     "fastq": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz",
-      "integrity": "sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.7.0.tgz",
+      "integrity": "sha512-YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ==",
       "dev": true,
       "requires": {
-        "reusify": "^1.0.0"
+        "reusify": "^1.0.4"
       }
     },
     "faye-websocket": {
@@ -6187,15 +6794,15 @@
       }
     },
     "figgy-pudding": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
-      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
+      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
       "dev": true
     },
     "figures": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.0.0.tgz",
-      "integrity": "sha512-HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
       "dev": true,
       "requires": {
         "escape-string-regexp": "^1.0.5"
@@ -6212,37 +6819,13 @@
       }
     },
     "file-loader": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.2.0.tgz",
-      "integrity": "sha512-+xZnaK5R8kBJrHK0/6HRlrKNamvVS5rjyuju+rnyxRGuwUJwpAMsVzUl5dz6rK8brkzjV6JpcFNjp6NqV0g1OQ==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz",
+      "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.2.3",
-        "schema-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "schema-utils": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.4.1.tgz",
-          "integrity": "sha512-RqYLpkPZX5Oc3fw/kHHHyP56fg5Y+XBpIpV8nCg0znIALfq3OH+Ea9Hfeac9BAMwG5IICltiZ0vxFvJQONfA5w==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.10.2",
-            "ajv-keywords": "^3.4.1"
-          }
-        }
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^2.6.5"
       }
     },
     "fileset": {
@@ -6294,13 +6877,13 @@
       }
     },
     "find-cache-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.0.0.tgz",
-      "integrity": "sha512-t7ulV1fmbxh5G9l/492O1p5+EBbr3uwpt6odhFTMc+nWyhmbloe+ja9BZ8pIBtqFWhOmCWVjx+pTW4zDkFoclw==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+      "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
       "dev": true,
       "requires": {
         "commondir": "^1.0.1",
-        "make-dir": "^3.0.0",
+        "make-dir": "^3.0.2",
         "pkg-dir": "^4.1.0"
       },
       "dependencies": {
@@ -6324,14 +6907,23 @@
           }
         },
         "make-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz",
-          "integrity": "sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==",
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz",
+          "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==",
           "dev": true,
           "requires": {
             "semver": "^6.0.0"
           }
         },
+        "p-limit": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
+          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
         "p-locate": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
@@ -6341,6 +6933,12 @@
             "p-limit": "^2.2.0"
           }
         },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
         "path-exists": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -6371,12 +6969,12 @@
       "dev": true
     },
     "find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
       "dev": true,
       "requires": {
-        "locate-path": "^3.0.0"
+        "locate-path": "^2.0.0"
       }
     },
     "findup-sync": {
@@ -6496,9 +7094,9 @@
       }
     },
     "flatted": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
-      "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
+      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
       "dev": true
     },
     "flush-write-stream": {
@@ -6512,9 +7110,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz",
-      "integrity": "sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.11.0.tgz",
+      "integrity": "sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA==",
       "dev": true,
       "requires": {
         "debug": "^3.0.0"
@@ -6616,23 +7214,42 @@
       }
     },
     "fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz",
+      "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==",
       "dev": true,
       "requires": {
+        "at-least-node": "^1.0.0",
         "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
+        "jsonfile": "^6.0.1",
+        "universalify": "^1.0.0"
+      },
+      "dependencies": {
+        "jsonfile": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
+          "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.6",
+            "universalify": "^1.0.0"
+          }
+        },
+        "universalify": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
+          "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
+          "dev": true
+        }
       }
     },
     "fs-minipass": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
-      "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
       "dev": true,
       "requires": {
-        "minipass": "^2.6.0"
+        "minipass": "^3.0.0"
       }
     },
     "fs-mkdirp-stream": {
@@ -7296,10 +7913,10 @@
         "is-property": "^1.0.0"
       }
     },
-    "genfun": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
-      "integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
+    "gensync": {
+      "version": "1.0.0-beta.1",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
+      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
       "dev": true
     },
     "get-caller-file": {
@@ -7412,12 +8029,12 @@
       }
     },
     "global-dirs": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
-      "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz",
+      "integrity": "sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A==",
       "dev": true,
       "requires": {
-        "ini": "^1.3.4"
+        "ini": "^1.3.5"
       }
     },
     "global-modules": {
@@ -7451,18 +8068,16 @@
       "dev": true
     },
     "globby": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz",
-      "integrity": "sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.0.tgz",
+      "integrity": "sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==",
       "dev": true,
       "requires": {
-        "@types/glob": "^7.1.1",
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.0.3",
-        "glob": "^7.1.3",
-        "ignore": "^5.1.1",
-        "merge2": "^1.2.3",
+        "fast-glob": "^3.1.1",
+        "ignore": "^5.1.4",
+        "merge2": "^1.3.0",
         "slash": "^3.0.0"
       },
       "dependencies": {
@@ -7613,9 +8228,9 @@
       }
     },
     "gulp-zip": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-zip/-/gulp-zip-5.0.0.tgz",
-      "integrity": "sha512-oR3t8kn+ccHkSyRcBV5kBLPXrhqTh5d6wBAR7r7wqjNQNBhYvOwPedCwlAaGcNl1qSeXNDn6qOk1Qyxvx9Wrow==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/gulp-zip/-/gulp-zip-5.0.1.tgz",
+      "integrity": "sha512-M/IWLh9RvOpuofDZkgDirtiyz9J3yIqnDOJ3muzk2D/XnZ1ruqPlPLRIpXnl/aZU+xXwKPdOIxjRzkUcVEQyZQ==",
       "dev": true,
       "requires": {
         "get-stream": "^5.1.0",
@@ -7664,15 +8279,10 @@
         "glogg": "^1.0.0"
       }
     },
-    "hammerjs": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
-      "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
-    },
     "handle-thing": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
-      "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
       "dev": true
     },
     "handlebars": {
@@ -7842,6 +8452,12 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
+    "hex-color-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
+      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
+      "dev": true
+    },
     "hmac-drbg": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -7880,16 +8496,40 @@
         "wbuf": "^1.1.0"
       }
     },
+    "hsl-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
+      "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=",
+      "dev": true
+    },
+    "hsla-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
+      "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
+      "dev": true
+    },
+    "html-comment-regex": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
+      "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==",
+      "dev": true
+    },
     "html-entities": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
       "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
       "dev": true
     },
+    "html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
+    },
     "http-cache-semantics": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
-      "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+      "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
       "dev": true
     },
     "http-deceiver": {
@@ -7937,23 +8577,30 @@
       }
     },
     "http-proxy-agent": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
-      "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
       "dev": true,
       "requires": {
-        "agent-base": "4",
-        "debug": "3.1.0"
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
       },
       "dependencies": {
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         }
       }
     },
@@ -7987,19 +8634,19 @@
       "dev": true
     },
     "https-proxy-agent": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz",
-      "integrity": "sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
       "dev": true,
       "requires": {
-        "agent-base": "^4.3.0",
-        "debug": "^3.1.0"
+        "agent-base": "6",
+        "debug": "4"
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
@@ -8026,6 +8673,7 @@
       "version": "0.4.24",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
       "requires": {
         "safer-buffer": ">= 2.1.2 < 3"
       }
@@ -8049,9 +8697,9 @@
       "dev": true
     },
     "ignore-walk": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.2.tgz",
-      "integrity": "sha512-EXyErtpHbn75ZTsOADsfx6J/FPo6/5cjev46PXrcTpd8z3BoRkXgYu9/JVqrI7tusjmwCZutGeRJeU0Wo1e4Cw==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
+      "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
       "dev": true,
       "requires": {
         "minimatch": "^3.0.4"
@@ -8071,9 +8719,9 @@
       "dev": true
     },
     "immer": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-4.0.0.tgz",
-      "integrity": "sha512-374/m+biF/6Z24jiqR/u49SH095oIgYr/qLiQnR88svojs5RNJh/h9i0Qq0pqhgUon3Txx8PgUWH+obRy6jbKw=="
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-6.0.3.tgz",
+      "integrity": "sha512-12VvNrfSrXZdm/BJgi/KDW2soq5freVSf3I1+4CLunUM8mAGx2/0Njy0xBVzi5zewQZiwM7z1/1T+8VaI7NkmQ=="
     },
     "import-cwd": {
       "version": "2.1.0",
@@ -8125,6 +8773,18 @@
       "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
       "dev": true
     },
+    "indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true
+    },
+    "indexes-of": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+      "dev": true
+    },
     "indexof": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
@@ -8160,36 +8820,77 @@
       "dev": true
     },
     "injection-js": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/injection-js/-/injection-js-2.2.2.tgz",
-      "integrity": "sha512-9K4fW2NNPG3JCvORx5G/T6q/PZYIr43RFgxBvtk3OV4omh5iqvpK4cChuBfhgPnRbXSgZRfuROh0XG5KNA8Xlg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/injection-js/-/injection-js-2.3.0.tgz",
+      "integrity": "sha512-rhS6E5jv603kbaO72ylOt0hGF1LT03oqQ4GU5KOO0qSaRbIWmdUCHjXq+VT79jL6/NmXtw9ccfK6dh/CzjoYjA==",
       "dev": true
     },
     "inquirer": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.1.tgz",
-      "integrity": "sha512-uxNHBeQhRXIoHWTSNYUFhQVrHYFThIt6IVo2fFmSe8aBwdR3/w6b58hJpiL/fMukFkvGzjg+hSxFtwvVmKZmXw==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
+      "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
       "dev": true,
       "requires": {
         "ansi-escapes": "^4.2.1",
-        "chalk": "^2.4.2",
+        "chalk": "^3.0.0",
         "cli-cursor": "^3.1.0",
         "cli-width": "^2.0.0",
         "external-editor": "^3.0.3",
         "figures": "^3.0.0",
         "lodash": "^4.17.15",
         "mute-stream": "0.0.8",
-        "run-async": "^2.2.0",
-        "rxjs": "^6.4.0",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.5.3",
         "string-width": "^4.1.0",
-        "strip-ansi": "^5.1.0",
+        "strip-ansi": "^6.0.0",
         "through": "^2.3.6"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "dev": true,
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "is-fullwidth-code-point": {
@@ -8199,23 +8900,32 @@
           "dev": true
         },
         "string-width": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.1.0.tgz",
-          "integrity": "sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
           "dev": true,
           "requires": {
             "emoji-regex": "^8.0.0",
             "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^5.2.0"
+            "strip-ansi": "^6.0.0"
           }
         },
         "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^4.1.0"
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
           }
         }
       }
@@ -8269,9 +8979,9 @@
       "dev": true
     },
     "ipaddr.js": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
-      "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
       "dev": true
     },
     "is-absolute": {
@@ -8285,9 +8995,9 @@
       }
     },
     "is-absolute-url": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
-      "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
+      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
       "dev": true
     },
     "is-accessor-descriptor": {
@@ -8352,6 +9062,20 @@
         "ci-info": "^2.0.0"
       }
     },
+    "is-color-stop": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
+      "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
+      "dev": true,
+      "requires": {
+        "css-color-names": "^0.0.4",
+        "hex-color-regex": "^1.1.0",
+        "hsl-regex": "^1.0.0",
+        "hsla-regex": "^1.0.0",
+        "rgb-regex": "^1.0.1",
+        "rgba-regex": "^1.0.0"
+      }
+    },
     "is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -8403,6 +9127,12 @@
       "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
       "dev": true
     },
+    "is-docker": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz",
+      "integrity": "sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==",
+      "dev": true
+    },
     "is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
@@ -8415,15 +9145,6 @@
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
       "dev": true
     },
-    "is-finite": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-      "dev": true,
-      "requires": {
-        "number-is-nan": "^1.0.0"
-      }
-    },
     "is-fullwidth-code-point": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
@@ -8443,15 +9164,35 @@
       }
     },
     "is-installed-globally": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz",
-      "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.1.tgz",
+      "integrity": "sha512-oiEcGoQbGc+3/iijAijrK2qFpkNoNjsHOm/5V5iaeydyrS/hnwaRCEgH5cpW0P3T1lSjV5piB7S5b5lEugNLhg==",
       "dev": true,
       "requires": {
-        "global-dirs": "^0.1.0",
-        "is-path-inside": "^1.0.0"
+        "global-dirs": "^2.0.1",
+        "is-path-inside": "^3.0.1"
+      },
+      "dependencies": {
+        "is-path-inside": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz",
+          "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==",
+          "dev": true
+        }
       }
     },
+    "is-interactive": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
+      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
+      "dev": true
+    },
+    "is-lambda": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
+      "integrity": "sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=",
+      "dev": true
+    },
     "is-module": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
@@ -8484,9 +9225,9 @@
       "dev": true
     },
     "is-npm": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-3.0.0.tgz",
-      "integrity": "sha512-wsigDr1Kkschp2opC4G3yA6r9EgVA6NjRpWzIi9axXqeIaAATPRJc4uLujXe3Nd9uO8KoDyA4MD6aZSeXTADhA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz",
+      "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==",
       "dev": true
     },
     "is-number": {
@@ -8510,33 +9251,33 @@
       }
     },
     "is-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
       "dev": true
     },
     "is-path-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
       "dev": true
     },
     "is-path-in-cwd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
-      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
       "dev": true,
       "requires": {
-        "is-path-inside": "^1.0.0"
+        "is-path-inside": "^2.1.0"
       }
     },
     "is-path-inside": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
       "dev": true,
       "requires": {
-        "path-is-inside": "^1.0.1"
+        "path-is-inside": "^1.0.2"
       }
     },
     "is-plain-obj": {
@@ -8611,6 +9352,15 @@
       "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
       "dev": true
     },
+    "is-svg": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
+      "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
+      "dev": true,
+      "requires": {
+        "html-comment-regex": "^1.1.0"
+      }
+    },
     "is-symbol": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
@@ -8654,9 +9404,9 @@
       "dev": true
     },
     "is-wsl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz",
+      "integrity": "sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==",
       "dev": true
     },
     "is-yarn-global": {
@@ -8775,167 +9525,214 @@
       }
     },
     "istanbul-api": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.2.2.tgz",
-      "integrity": "sha512-kH5YRdqdbs5hiH4/Rr1Q0cSAGgjh3jTtg8vu9NLebBAoK3adVO4jk81J+TYOkTr2+Q4NLeb1ACvmEt65iG/Vbw==",
-      "dev": true,
-      "requires": {
-        "async": "^2.1.4",
-        "fileset": "^2.0.2",
-        "istanbul-lib-coverage": "^1.1.2",
-        "istanbul-lib-hook": "^1.1.0",
-        "istanbul-lib-instrument": "^1.9.2",
-        "istanbul-lib-report": "^1.1.3",
-        "istanbul-lib-source-maps": "^1.2.3",
-        "istanbul-reports": "^1.1.4",
-        "js-yaml": "^3.7.0",
-        "mkdirp": "^0.5.1",
-        "once": "^1.4.0"
-      }
-    },
-    "istanbul-instrumenter-loader": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz",
-      "integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==",
-      "dev": true,
-      "requires": {
-        "convert-source-map": "^1.5.0",
-        "istanbul-lib-instrument": "^1.7.3",
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^0.3.0"
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.1.6.tgz",
+      "integrity": "sha512-x0Eicp6KsShG1k1rMgBAi/1GgY7kFGEBwQpw3PXGEmu+rBcBNhqU8g2DgY9mlepAsLPzrzrbqSgCGANnki4POA==",
+      "dev": true,
+      "requires": {
+        "async": "^2.6.2",
+        "compare-versions": "^3.4.0",
+        "fileset": "^2.0.3",
+        "istanbul-lib-coverage": "^2.0.5",
+        "istanbul-lib-hook": "^2.0.7",
+        "istanbul-lib-instrument": "^3.3.0",
+        "istanbul-lib-report": "^2.0.8",
+        "istanbul-lib-source-maps": "^3.0.6",
+        "istanbul-reports": "^2.2.4",
+        "js-yaml": "^3.13.1",
+        "make-dir": "^2.1.0",
+        "minimatch": "^3.0.4",
+        "once": "^1.4.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "5.5.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
-          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+        "istanbul-lib-coverage": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
+          "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
+          "dev": true
+        },
+        "istanbul-lib-instrument": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz",
+          "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==",
           "dev": true,
           "requires": {
-            "co": "^4.6.0",
-            "fast-deep-equal": "^1.0.0",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.3.0"
+            "@babel/generator": "^7.4.0",
+            "@babel/parser": "^7.4.3",
+            "@babel/template": "^7.4.0",
+            "@babel/traverse": "^7.4.3",
+            "@babel/types": "^7.4.0",
+            "istanbul-lib-coverage": "^2.0.5",
+            "semver": "^6.0.0"
           }
         },
-        "fast-deep-equal": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
-          "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
-          "dev": true
-        },
-        "json-schema-traverse": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-          "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
-          "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
+        "istanbul-reports": {
+          "version": "2.2.7",
+          "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz",
+          "integrity": "sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==",
           "dev": true,
           "requires": {
-            "ajv": "^5.0.0"
+            "html-escaper": "^2.0.0"
           }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
         }
       }
     },
     "istanbul-lib-coverage": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz",
-      "integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
+      "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
       "dev": true
     },
     "istanbul-lib-hook": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.2.2.tgz",
-      "integrity": "sha512-/Jmq7Y1VeHnZEQ3TL10VHyb564mn6VrQXHchON9Jf/AEcmQ3ZIiyD1BVzNOKTZf/G3gE+kiGK6SmpF9y3qGPLw==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz",
+      "integrity": "sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==",
       "dev": true,
       "requires": {
-        "append-transform": "^0.4.0"
+        "append-transform": "^1.0.0"
       }
     },
     "istanbul-lib-instrument": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz",
-      "integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz",
+      "integrity": "sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==",
       "dev": true,
       "requires": {
-        "babel-generator": "^6.18.0",
-        "babel-template": "^6.16.0",
-        "babel-traverse": "^6.18.0",
-        "babel-types": "^6.18.0",
-        "babylon": "^6.18.0",
-        "istanbul-lib-coverage": "^1.2.1",
-        "semver": "^5.3.0"
+        "@babel/core": "^7.7.5",
+        "@babel/parser": "^7.7.5",
+        "@babel/template": "^7.7.4",
+        "@babel/traverse": "^7.7.4",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.0.0",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
       }
     },
     "istanbul-lib-report": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.5.tgz",
-      "integrity": "sha512-UsYfRMoi6QO/doUshYNqcKJqVmFe9w51GZz8BS3WB0lYxAllQYklka2wP9+dGZeHYaWIdcXUx8JGdbqaoXRXzw==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz",
+      "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==",
       "dev": true,
       "requires": {
-        "istanbul-lib-coverage": "^1.2.1",
-        "mkdirp": "^0.5.1",
-        "path-parse": "^1.0.5",
-        "supports-color": "^3.1.2"
+        "istanbul-lib-coverage": "^2.0.5",
+        "make-dir": "^2.1.0",
+        "supports-color": "^6.1.0"
       },
       "dependencies": {
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+        "istanbul-lib-coverage": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
+          "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
         }
       }
     },
     "istanbul-lib-source-maps": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.6.tgz",
-      "integrity": "sha512-TtbsY5GIHgbMsMiRw35YBHGpZ1DVFEO19vxxeiDMYaeOFOCzfnYVxvl6pOUIZR4dtPhAGpSMup8OyF8ubsaqEg==",
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz",
+      "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==",
       "dev": true,
       "requires": {
-        "debug": "^3.1.0",
-        "istanbul-lib-coverage": "^1.2.1",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.6.1",
-        "source-map": "^0.5.3"
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^2.0.5",
+        "make-dir": "^2.1.0",
+        "rimraf": "^2.6.3",
+        "source-map": "^0.6.1"
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
           }
         },
+        "istanbul-lib-coverage": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
+          "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
+          "dev": true
+        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         }
       }
     },
     "istanbul-reports": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.1.4.tgz",
-      "integrity": "sha512-DfSTVOTkuO+kRmbO8Gk650Wqm1WRGr6lrdi2EwDK1vxpS71vdlLd613EpzOKdIFioB5f/scJTjeWBnvd1FWejg==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
+      "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
       "dev": true,
       "requires": {
-        "handlebars": "^4.0.3"
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "istanbul-lib-report": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+          "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+          "dev": true,
+          "requires": {
+            "istanbul-lib-coverage": "^3.0.0",
+            "make-dir": "^3.0.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "make-dir": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz",
+          "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==",
+          "dev": true,
+          "requires": {
+            "semver": "^6.0.0"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "jasmine": {
@@ -8964,12 +9761,20 @@
       "dev": true
     },
     "jasmine-spec-reporter": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
-      "integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-5.0.1.tgz",
+      "integrity": "sha512-RrOZ+bSPnbk1/9KKs5lm0Nl0cqDCh/XXVlCmu3nkhEJH6HTDh4hoJZu3q8e9aq37C0eXEf/JEJnYy+t4m3arZQ==",
       "dev": true,
       "requires": {
-        "colors": "1.1.2"
+        "colors": "1.4.0"
+      },
+      "dependencies": {
+        "colors": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+          "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+          "dev": true
+        }
       }
     },
     "jasminewd2": {
@@ -8979,21 +9784,32 @@
       "dev": true
     },
     "jest-worker": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
-      "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
+      "version": "25.1.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.1.0.tgz",
+      "integrity": "sha512-ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg==",
       "dev": true,
       "requires": {
         "merge-stream": "^2.0.0",
-        "supports-color": "^6.1.0"
+        "supports-color": "^7.0.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
-    "js-levenshtein": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
-      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
-      "dev": true
-    },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -9017,9 +9833,9 @@
       "dev": true
     },
     "jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true
     },
     "json-buffer": {
@@ -9034,6 +9850,12 @@
       "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
       "dev": true
     },
+    "json-parse-even-better-errors": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.2.0.tgz",
+      "integrity": "sha512-2tLgY7LRNZ9Hd6gmCuBG5/OjRHQpSgJQqJoYyLLOhUgn8LdOYrjaZLcxkWnDads+AD/haWWioPNziXQcgvQJ/g==",
+      "dev": true
+    },
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -9043,8 +9865,7 @@
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
     },
     "json-stable-stringify": {
       "version": "1.0.1",
@@ -9074,12 +9895,12 @@
       "dev": true
     },
     "json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
+      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
       "dev": true,
       "requires": {
-        "minimist": "^1.2.0"
+        "minimist": "^1.2.5"
       }
     },
     "jsonfile": {
@@ -9122,9 +9943,9 @@
       }
     },
     "jszip": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.2.2.tgz",
-      "integrity": "sha512-NmKajvAFQpbg3taXQXr/ccS2wcucR1AZ+NtyWp2Nq7HHVsXhcJFR8p0Baf32C2yVvBylFWVeKf+WI2AnvlPhpA==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.3.0.tgz",
+      "integrity": "sha512-EJ9k766htB1ZWnsV5ZMDkKLgA+201r/ouFF8R2OigVjVdcm2rurcBrrdXaeqBJbqnUVMko512PYmlncBKE1Huw==",
       "dev": true,
       "requires": {
         "lie": "~3.3.0",
@@ -9140,9 +9961,9 @@
       "dev": true
     },
     "karma": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-4.3.0.tgz",
-      "integrity": "sha512-NSPViHOt+RW38oJklvYxQC4BSQsv737oQlr/r06pCM+slDOr4myuI1ivkRmp+3dVpJDfZt2DmaPJ2wkx+ZZuMQ==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-4.4.1.tgz",
+      "integrity": "sha512-L5SIaXEYqzrh6b1wqYC42tNsFMx2PWuxky84pK9coK09MvmL7mxii3G3bZBh/0rvD27lqDd0le9jyhzvwif73A==",
       "dev": true,
       "requires": {
         "bluebird": "^3.3.0",
@@ -9151,7 +9972,6 @@
         "chokidar": "^3.0.0",
         "colors": "^1.1.0",
         "connect": "^3.6.0",
-        "core-js": "^3.1.3",
         "di": "^0.0.1",
         "dom-serialize": "^2.2.0",
         "flatted": "^2.0.0",
@@ -9200,34 +10020,19 @@
           }
         },
         "chokidar": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.2.1.tgz",
-          "integrity": "sha512-/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w==",
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz",
+          "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==",
           "dev": true,
           "requires": {
             "anymatch": "~3.1.1",
             "braces": "~3.0.2",
-            "fsevents": "~2.1.0",
+            "fsevents": "~2.1.2",
             "glob-parent": "~5.1.0",
             "is-binary-path": "~2.1.0",
             "is-glob": "~4.0.1",
             "normalize-path": "~3.0.0",
-            "readdirp": "~3.1.3"
-          }
-        },
-        "date-format": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz",
-          "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==",
-          "dev": true
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
+            "readdirp": "~3.3.0"
           }
         },
         "fill-range": {
@@ -9239,28 +10044,17 @@
             "to-regex-range": "^5.0.1"
           }
         },
-        "fs-extra": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
         "fsevents": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.0.tgz",
-          "integrity": "sha512-+iXhW3LuDQsno8dOIrCIT/CBjeBWuP7PXe8w9shnj9Lebny/Gx1ZjVBYwexLz36Ri2jKuXMNpV6CYNh8lHHgrQ==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
+          "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
           "dev": true,
           "optional": true
         },
         "glob-parent": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
-          "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+          "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
           "dev": true,
           "requires": {
             "is-glob": "^4.0.1"
@@ -9281,31 +10075,12 @@
           "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
           "dev": true
         },
-        "log4js": {
-          "version": "4.5.1",
-          "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.5.1.tgz",
-          "integrity": "sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==",
-          "dev": true,
-          "requires": {
-            "date-format": "^2.0.0",
-            "debug": "^4.1.1",
-            "flatted": "^2.0.0",
-            "rfdc": "^1.1.4",
-            "streamroller": "^1.0.6"
-          }
-        },
         "mime": {
           "version": "2.4.4",
           "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
           "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
           "dev": true
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
         "normalize-path": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -9313,12 +10088,12 @@
           "dev": true
         },
         "readdirp": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.1.3.tgz",
-          "integrity": "sha512-ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q==",
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz",
+          "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==",
           "dev": true,
           "requires": {
-            "picomatch": "^2.0.4"
+            "picomatch": "^2.0.7"
           }
         },
         "source-map": {
@@ -9327,30 +10102,6 @@
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
-        "streamroller": {
-          "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.6.tgz",
-          "integrity": "sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==",
-          "dev": true,
-          "requires": {
-            "async": "^2.6.2",
-            "date-format": "^2.0.0",
-            "debug": "^3.2.6",
-            "fs-extra": "^7.0.1",
-            "lodash": "^4.17.14"
-          },
-          "dependencies": {
-            "debug": {
-              "version": "3.2.6",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-              "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-              "dev": true,
-              "requires": {
-                "ms": "^2.1.1"
-              }
-            }
-          }
-        },
         "to-regex-range": {
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -9381,165 +10132,28 @@
       }
     },
     "karma-coverage-istanbul-reporter": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.1.0.tgz",
-      "integrity": "sha512-UH0mXPJFJyK5uiK7EkwGtQ8f30lCBAfqRResnZ4pzLJ04SOp4SPlYkmwbbZ6iVJ6sQFVzlDUXlntBEsLRdgZpg==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.1.1.tgz",
+      "integrity": "sha512-CH8lTi8+kKXGvrhy94+EkEMldLCiUA0xMOiL31vvli9qK0T+qcXJAwWBRVJWnVWxYkTmyWar8lPz63dxX6/z1A==",
       "dev": true,
       "requires": {
         "istanbul-api": "^2.1.6",
         "minimatch": "^3.0.4"
-      },
-      "dependencies": {
-        "append-transform": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz",
-          "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==",
-          "dev": true,
-          "requires": {
-            "default-require-extensions": "^2.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "default-require-extensions": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz",
-          "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=",
-          "dev": true,
-          "requires": {
-            "strip-bom": "^3.0.0"
-          }
-        },
-        "istanbul-api": {
-          "version": "2.1.6",
-          "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.1.6.tgz",
-          "integrity": "sha512-x0Eicp6KsShG1k1rMgBAi/1GgY7kFGEBwQpw3PXGEmu+rBcBNhqU8g2DgY9mlepAsLPzrzrbqSgCGANnki4POA==",
-          "dev": true,
-          "requires": {
-            "async": "^2.6.2",
-            "compare-versions": "^3.4.0",
-            "fileset": "^2.0.3",
-            "istanbul-lib-coverage": "^2.0.5",
-            "istanbul-lib-hook": "^2.0.7",
-            "istanbul-lib-instrument": "^3.3.0",
-            "istanbul-lib-report": "^2.0.8",
-            "istanbul-lib-source-maps": "^3.0.6",
-            "istanbul-reports": "^2.2.4",
-            "js-yaml": "^3.13.1",
-            "make-dir": "^2.1.0",
-            "minimatch": "^3.0.4",
-            "once": "^1.4.0"
-          }
-        },
-        "istanbul-lib-coverage": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
-          "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
-          "dev": true
-        },
-        "istanbul-lib-hook": {
-          "version": "2.0.7",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz",
-          "integrity": "sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==",
-          "dev": true,
-          "requires": {
-            "append-transform": "^1.0.0"
-          }
-        },
-        "istanbul-lib-instrument": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz",
-          "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==",
-          "dev": true,
-          "requires": {
-            "@babel/generator": "^7.4.0",
-            "@babel/parser": "^7.4.3",
-            "@babel/template": "^7.4.0",
-            "@babel/traverse": "^7.4.3",
-            "@babel/types": "^7.4.0",
-            "istanbul-lib-coverage": "^2.0.5",
-            "semver": "^6.0.0"
-          }
-        },
-        "istanbul-lib-report": {
-          "version": "2.0.8",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz",
-          "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==",
-          "dev": true,
-          "requires": {
-            "istanbul-lib-coverage": "^2.0.5",
-            "make-dir": "^2.1.0",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "istanbul-lib-source-maps": {
-          "version": "3.0.6",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz",
-          "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==",
-          "dev": true,
-          "requires": {
-            "debug": "^4.1.1",
-            "istanbul-lib-coverage": "^2.0.5",
-            "make-dir": "^2.1.0",
-            "rimraf": "^2.6.3",
-            "source-map": "^0.6.1"
-          }
-        },
-        "istanbul-reports": {
-          "version": "2.2.6",
-          "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz",
-          "integrity": "sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==",
-          "dev": true,
-          "requires": {
-            "handlebars": "^4.1.2"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-          "dev": true
-        }
       }
     },
     "karma-jasmine": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-2.0.1.tgz",
-      "integrity": "sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-3.1.1.tgz",
+      "integrity": "sha512-pxBmv5K7IkBRLsFSTOpgiK/HzicQT3mfFF+oHAC7nxMfYKhaYFgxOa5qjnHW4sL5rUnmdkSajoudOnnOdPyW4Q==",
       "dev": true,
       "requires": {
-        "jasmine-core": "^3.3"
+        "jasmine-core": "^3.5.0"
       }
     },
     "karma-jasmine-html-reporter": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.4.2.tgz",
-      "integrity": "sha512-7g0gPj8+9JepCNJR9WjDyQ2RkZ375jpdurYQyAYv8PorUCadepl8vrD6LmMqOGcM17cnrynBawQYZHaumgDjBw==",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.5.3.tgz",
+      "integrity": "sha512-ci0VrjuCaFj+9d1tYlTE3KIPUCp0rz874zWWU3JgCMqGIyw5ke+BXWFPOAGAqUdCJcrMwneyvp1zFXA74MiPUA==",
       "dev": true
     },
     "karma-source-map-support": {
@@ -9643,9 +10257,9 @@
       }
     },
     "less": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/less/-/less-3.9.0.tgz",
-      "integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==",
+      "version": "3.11.1",
+      "resolved": "https://registry.npmjs.org/less/-/less-3.11.1.tgz",
+      "integrity": "sha512-tlWX341RECuTOvoDIvtFqXsKj072hm3+9ymRBe76/mD6O5ZZecnlAOVDlWAleF2+aohFrxNidXhv2773f6kY7g==",
       "dev": true,
       "requires": {
         "clone": "^2.1.2",
@@ -9656,7 +10270,8 @@
         "mkdirp": "^0.5.0",
         "promise": "^7.1.1",
         "request": "^2.83.0",
-        "source-map": "~0.6.0"
+        "source-map": "~0.6.0",
+        "tslib": "^1.10.0"
       },
       "dependencies": {
         "source-map": {
@@ -9679,6 +10294,26 @@
         "pify": "^4.0.1"
       },
       "dependencies": {
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        },
         "pify": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
@@ -9687,31 +10322,19 @@
         }
       }
     },
-    "less-plugin-npm-import": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/less-plugin-npm-import/-/less-plugin-npm-import-2.1.0.tgz",
-      "integrity": "sha1-gj5phskzGKmBccqFiEi2vq1Vvz4=",
+    "leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true
+    },
+    "levenary": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
+      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
       "dev": true,
       "requires": {
-        "promise": "~7.0.1",
-        "resolve": "~1.1.6"
-      },
-      "dependencies": {
-        "promise": {
-          "version": "7.0.4",
-          "resolved": "https://registry.npmjs.org/promise/-/promise-7.0.4.tgz",
-          "integrity": "sha1-Nj6EpMNsg1a4kP7WLJHOhdAu1Tk=",
-          "dev": true,
-          "requires": {
-            "asap": "~2.0.3"
-          }
-        },
-        "resolve": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-          "dev": true
-        }
+        "leven": "^3.1.0"
       }
     },
     "levn": {
@@ -9725,9 +10348,9 @@
       }
     },
     "license-webpack-plugin": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.1.2.tgz",
-      "integrity": "sha512-7poZHRla+ae0eEButlwMrPpkXyhNVBf2EHePYWT0jyLnI6311/OXJkTI2sOIRungRpQgU2oDMpro5bSFPT5F0A==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.1.4.tgz",
+      "integrity": "sha512-1Xq72fmPbTg5KofXs+yI5L4QqPFjQ6mZxoeI6D7gfiEDOtaEIk6PGrdLaej90bpDqKNHNxlQ/MW4tMAL6xMPJQ==",
       "dev": true,
       "requires": {
         "@types/webpack-sources": "^0.1.5",
@@ -9793,23 +10416,23 @@
       "dev": true
     },
     "loader-utils": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
       "dev": true,
       "requires": {
         "big.js": "^5.2.2",
-        "emojis-list": "^2.0.0",
-        "json5": "^1.0.1"
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
       }
     },
     "locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
       "dev": true,
       "requires": {
-        "p-locate": "^3.0.0",
+        "p-locate": "^2.0.0",
         "path-exists": "^3.0.0"
       }
     },
@@ -9848,23 +10471,44 @@
       "integrity": "sha1-hImxyw0p/4gZXM7KRI/21swpXDY=",
       "dev": true
     },
+    "lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
+      "dev": true
+    },
+    "lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
+      "dev": true
+    },
+    "log-symbols": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
+      "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.2"
+      }
+    },
     "log4js": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz",
-      "integrity": "sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==",
+      "version": "4.5.1",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.5.1.tgz",
+      "integrity": "sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==",
       "dev": true,
       "requires": {
-        "circular-json": "^0.5.5",
-        "date-format": "^1.2.0",
-        "debug": "^3.1.0",
-        "rfdc": "^1.1.2",
-        "streamroller": "0.7.0"
+        "date-format": "^2.0.0",
+        "debug": "^4.1.1",
+        "flatted": "^2.0.0",
+        "rfdc": "^1.1.4",
+        "streamroller": "^1.0.6"
       },
       "dependencies": {
         "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
@@ -9879,9 +10523,9 @@
       }
     },
     "loglevel": {
-      "version": "1.6.4",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz",
-      "integrity": "sha512-p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g==",
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz",
+      "integrity": "sha512-cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A==",
       "dev": true
     },
     "loose-envify": {
@@ -9906,12 +10550,20 @@
       "dev": true,
       "requires": {
         "yallist": "^3.0.2"
+      },
+      "dependencies": {
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
+        }
       }
     },
     "magic-string": {
-      "version": "0.25.3",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.3.tgz",
-      "integrity": "sha512-6QK0OpF/phMz0Q2AxILkX2mFhi7m+WMwTRg0LQKq/WBB0cDP4rYH3Wp4/d3OTXlrPLVJT/RFqj8tFeAR4nk8AA==",
+      "version": "0.25.7",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
+      "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
       "dev": true,
       "requires": {
         "sourcemap-codec": "^1.4.4"
@@ -9936,28 +10588,32 @@
       }
     },
     "make-error": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz",
-      "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==",
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
       "dev": true
     },
     "make-fetch-happen": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.0.tgz",
-      "integrity": "sha512-nFr/vpL1Jc60etMVKeaLOqfGjMMb3tAHFVJWxHOFCFS04Zmd7kGlMxo0l1tzfhoQje0/UPnd0X8OeGUiXXnfPA==",
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.4.tgz",
+      "integrity": "sha512-hIFoqGq1db0QMiy/Atr/pI1Rs4rDV+ZdGSey2SQyF3KK3u1z4aj9mS5UdNnZkdQpA+H3pGn0J3KlEwsi2x4EqA==",
       "dev": true,
       "requires": {
-        "agentkeepalive": "^3.4.1",
-        "cacache": "^12.0.0",
-        "http-cache-semantics": "^3.8.1",
-        "http-proxy-agent": "^2.1.0",
-        "https-proxy-agent": "^2.2.1",
+        "agentkeepalive": "^4.1.0",
+        "cacache": "^15.0.0",
+        "http-cache-semantics": "^4.0.4",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-lambda": "^1.0.1",
         "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
-        "node-fetch-npm": "^2.0.2",
+        "minipass": "^3.0.0",
+        "minipass-collect": "^1.0.2",
+        "minipass-fetch": "^1.1.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.2",
         "promise-retry": "^1.1.1",
-        "socks-proxy-agent": "^4.0.0",
-        "ssri": "^6.0.0"
+        "socks-proxy-agent": "^5.0.0",
+        "ssri": "^8.0.0"
       }
     },
     "make-iterator": {
@@ -10011,9 +10667,9 @@
       "integrity": "sha1-55ZqFe6louprSJXSW364It199Fs="
     },
     "marked": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
-      "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.8.2.tgz",
+      "integrity": "sha512-EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw=="
     },
     "matchdep": {
       "version": "2.0.0",
@@ -10118,6 +10774,12 @@
         "safe-buffer": "^5.1.2"
       }
     },
+    "mdn-data": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
+      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
+      "dev": true
+    },
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -10125,20 +10787,27 @@
       "dev": true
     },
     "mem": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-5.1.1.tgz",
-      "integrity": "sha512-qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-6.0.1.tgz",
+      "integrity": "sha512-uIRYASflIsXqvKe+7aXbLrydaRzz4qiK6amqZDQI++eRtW3UoKtnDcGeCAOREgll7YMxO5E4VB9+3B0LFmy96g==",
       "dev": true,
       "requires": {
         "map-age-cleaner": "^0.1.3",
-        "mimic-fn": "^2.1.0",
-        "p-is-promise": "^2.1.0"
+        "mimic-fn": "^3.0.0"
+      },
+      "dependencies": {
+        "mimic-fn": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.0.0.tgz",
+          "integrity": "sha512-PiVO95TKvhiwgSwg1IdLYlCTdul38yZxZMIcnDSFIBUm4BNZha2qpQ4GpJ++15bHoKDtrW2D69lMfFwdFYtNZQ==",
+          "dev": true
+        }
       }
     },
     "memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
+      "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
       "dev": true,
       "requires": {
         "errno": "^0.1.3",
@@ -10163,6 +10832,23 @@
       "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
       "dev": true
     },
+    "merge-source-map": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
+      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
+      "dev": true,
+      "requires": {
+        "source-map": "^0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
     "merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -10219,18 +10905,18 @@
       "dev": true
     },
     "mime-db": {
-      "version": "1.40.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
-      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
+      "version": "1.43.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz",
+      "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==",
       "dev": true
     },
     "mime-types": {
-      "version": "2.1.24",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
-      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+      "version": "2.1.26",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz",
+      "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==",
       "dev": true,
       "requires": {
-        "mime-db": "1.40.0"
+        "mime-db": "1.43.0"
       }
     },
     "mimic-fn": {
@@ -10246,15 +10932,60 @@
       "dev": true
     },
     "mini-css-extract-plugin": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.0.tgz",
-      "integrity": "sha512-MNpRGbNA52q6U92i0qbVpQNsgk7LExy41MdAlG84FeytfDOtRIf/mCHdEgG8rpTKOaNKiqUnZdlptF469hxqOw==",
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz",
+      "integrity": "sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==",
       "dev": true,
       "requires": {
         "loader-utils": "^1.1.0",
         "normalize-url": "1.9.1",
         "schema-utils": "^1.0.0",
         "webpack-sources": "^1.1.0"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        },
+        "normalize-url": {
+          "version": "1.9.1",
+          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
+          "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
+          "dev": true,
+          "requires": {
+            "object-assign": "^4.0.1",
+            "prepend-http": "^1.0.0",
+            "query-string": "^4.1.0",
+            "sort-keys": "^1.0.0"
+          }
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
       }
     },
     "minimalistic-assert": {
@@ -10279,28 +11010,87 @@
       }
     },
     "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
       "dev": true
     },
     "minipass": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
-      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz",
+      "integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==",
       "dev": true,
       "requires": {
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.0"
+        "yallist": "^4.0.0"
+      }
+    },
+    "minipass-collect": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
+      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
+      "dev": true,
+      "requires": {
+        "minipass": "^3.0.0"
+      }
+    },
+    "minipass-fetch": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.2.1.tgz",
+      "integrity": "sha512-ssHt0dkljEDaKmTgQ04DQgx2ag6G2gMPxA5hpcsoeTbfDgRf2fC2gNSRc6kISjD7ckCpHwwQvXxuTBK8402fXg==",
+      "dev": true,
+      "requires": {
+        "encoding": "^0.1.12",
+        "minipass": "^3.1.0",
+        "minipass-pipeline": "^1.2.2",
+        "minipass-sized": "^1.0.3",
+        "minizlib": "^2.0.0"
+      }
+    },
+    "minipass-flush": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+      "dev": true,
+      "requires": {
+        "minipass": "^3.0.0"
+      }
+    },
+    "minipass-json-stream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz",
+      "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==",
+      "dev": true,
+      "requires": {
+        "jsonparse": "^1.3.1",
+        "minipass": "^3.0.0"
+      }
+    },
+    "minipass-pipeline": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz",
+      "integrity": "sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA==",
+      "dev": true,
+      "requires": {
+        "minipass": "^3.0.0"
+      }
+    },
+    "minipass-sized": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
+      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
+      "dev": true,
+      "requires": {
+        "minipass": "^3.0.0"
       }
     },
     "minizlib": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
-      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz",
+      "integrity": "sha512-EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA==",
       "dev": true,
       "requires": {
-        "minipass": "^2.9.0"
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
       }
     },
     "mississippi": {
@@ -10383,9 +11173,9 @@
       "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
     },
     "moment-timezone": {
-      "version": "0.5.26",
-      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.26.tgz",
-      "integrity": "sha512-sFP4cgEKTCymBBKgoxZjYzlSovC20Y6J7y3nanDc5RoBIXKlZhoYwBoZGe3flwU6A372AcRwScH8KiwV6zjy1g==",
+      "version": "0.5.28",
+      "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.28.tgz",
+      "integrity": "sha512-TDJkZvAyKIVWg5EtVqRzU97w0Rb0YVbfpqyjgu6GwXCAohVRqwZjf4fOzDE6p1Ch98Sro/8hQQi65WDXW5STPw==",
       "requires": {
         "moment": ">= 2.9.0"
       }
@@ -10483,50 +11273,47 @@
       "dev": true
     },
     "ng-packagr": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-5.5.1.tgz",
-      "integrity": "sha512-GT6QK5WAirQwALdeJPiXdgRd5PzRqcknb/C/G+cCDEbUFri4oGVmns2Nl4I0FGg/cRn6nXTxRiUunOSqZ3Lehw==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-9.1.0.tgz",
+      "integrity": "sha512-783WCTa+qQl8QQefQ3n8cDzYF3PpsQUnY87SwuXIxaJ1p8NjBq/3vCZmTiI3AXzDZFhRacbCqghtaJGU1qcFrQ==",
       "dev": true,
       "requires": {
+        "@rollup/plugin-commonjs": "^11.0.2",
+        "@rollup/plugin-json": "^4.0.0",
+        "@rollup/plugin-node-resolve": "^7.1.0",
         "ajv": "^6.10.2",
-        "autoprefixer": "^9.6.0",
-        "browserslist": "^4.0.0",
-        "chalk": "^2.3.1",
-        "chokidar": "^3.0.0",
+        "autoprefixer": "^9.6.5",
+        "browserslist": "^4.7.0",
+        "chalk": "^3.0.0",
+        "chokidar": "^3.2.1",
         "clean-css": "^4.1.11",
-        "commander": "^3.0.0",
-        "fs-extra": "^8.0.0",
+        "commander": "^4.0.0",
+        "fs-extra": "^9.0.0",
         "glob": "^7.1.2",
         "injection-js": "^2.2.1",
-        "less": "^3.8.0",
-        "less-plugin-npm-import": "^2.1.0",
+        "less": "^3.10.3",
         "node-sass-tilde-importer": "^1.0.0",
-        "postcss": "^7.0.0",
+        "postcss": "^7.0.18",
         "postcss-url": "^8.0.0",
         "read-pkg-up": "^5.0.0",
         "rimraf": "^3.0.0",
-        "rollup": "^1.12.1",
-        "rollup-plugin-commonjs": "^10.0.0",
-        "rollup-plugin-json": "^4.0.0",
-        "rollup-plugin-node-resolve": "^5.0.0",
-        "rollup-plugin-sourcemaps": "^0.4.2",
-        "rxjs": "^6.0.0",
-        "sass": "^1.17.3",
-        "stylus": "^0.54.5",
-        "terser": "^4.1.2",
-        "update-notifier": "^3.0.0"
+        "rollup": "2.2.0",
+        "rollup-plugin-sourcemaps": "^0.5.0",
+        "rxjs": "^6.5.0",
+        "sass": "^1.23.0",
+        "stylus": "^0.54.7",
+        "terser": "^4.3.8",
+        "update-notifier": "^4.0.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
           }
         },
         "anymatch": {
@@ -10554,26 +11341,51 @@
             "fill-range": "^7.0.1"
           }
         },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
         "chokidar": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.2.1.tgz",
-          "integrity": "sha512-/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w==",
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz",
+          "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==",
           "dev": true,
           "requires": {
             "anymatch": "~3.1.1",
             "braces": "~3.0.2",
-            "fsevents": "~2.1.0",
+            "fsevents": "~2.1.2",
             "glob-parent": "~5.1.0",
             "is-binary-path": "~2.1.0",
             "is-glob": "~4.0.1",
             "normalize-path": "~3.0.0",
-            "readdirp": "~3.1.3"
+            "readdirp": "~3.3.0"
           }
         },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
         "commander": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz",
-          "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+          "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
           "dev": true
         },
         "fill-range": {
@@ -10585,22 +11397,37 @@
             "to-regex-range": "^5.0.1"
           }
         },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
         "fsevents": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.0.tgz",
-          "integrity": "sha512-+iXhW3LuDQsno8dOIrCIT/CBjeBWuP7PXe8w9shnj9Lebny/Gx1ZjVBYwexLz36Ri2jKuXMNpV6CYNh8lHHgrQ==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
+          "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
           "dev": true,
           "optional": true
         },
         "glob-parent": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
-          "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+          "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
           "dev": true,
           "requires": {
             "is-glob": "^4.0.1"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "is-binary-path": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
@@ -10616,12 +11443,46 @@
           "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
           "dev": true
         },
-        "normalize-path": {
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "normalize-path": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
           "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
           "dev": true
         },
+        "p-limit": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
+          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
         "parse-json": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
@@ -10657,23 +11518,41 @@
           }
         },
         "readdirp": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.1.3.tgz",
-          "integrity": "sha512-ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q==",
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz",
+          "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==",
           "dev": true,
           "requires": {
-            "picomatch": "^2.0.4"
+            "picomatch": "^2.0.7"
           }
         },
         "rimraf": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz",
-          "integrity": "sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==",
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
           "dev": true,
           "requires": {
             "glob": "^7.1.3"
           }
         },
+        "rollup": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.2.0.tgz",
+          "integrity": "sha512-iAu/j9/WJ0i+zT0sAMuQnsEbmOKzdQ4Yxu5rbPs9aUCyqveI1Kw3H4Fi9NWfCOpb8luEySD2lDyFWL9CrLE8iw==",
+          "dev": true,
+          "requires": {
+            "fsevents": "~2.1.2"
+          }
+        },
+        "supports-color": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
         "to-regex-range": {
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -10692,17 +11571,17 @@
       }
     },
     "ngrx-store-localstorage": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/ngrx-store-localstorage/-/ngrx-store-localstorage-8.0.0.tgz",
-      "integrity": "sha512-3AHqw1AeXDXU/Hgxlh5fjP/srgGuP8BJR2uQ6ViGLeKwMEQDZuQfwd8zu9+bPZcvIxbAcxjWoGCVJXYEkBlxmg==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/ngrx-store-localstorage/-/ngrx-store-localstorage-9.0.0.tgz",
+      "integrity": "sha512-F69yiNruZe9jgXcPykfbyKFuM/1JzL+wsBUM+TTfMDXIoaFO7xwuZF9yLG8zbvdglibtJ0OG2M8fy3oadWuV4A==",
       "requires": {
         "deepmerge": "^3.2.0"
       }
     },
     "ngx-moment": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/ngx-moment/-/ngx-moment-3.4.0.tgz",
-      "integrity": "sha512-GEqzSsu12VsXXP35aerlQpuZ1ienEYQZxHmp+RH7EuJD7hWamKgLOpmbiDI9Ij3KLW/UApvonYzZvyRSv3ea/w==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/ngx-moment/-/ngx-moment-3.5.0.tgz",
+      "integrity": "sha512-QC/5XNC0BW6WkJkwZT4r2A29j/8sJAmhuQJrEnEdpW35GvkemccuxEUAwo/PwkzPB/CHaquR00E6P2HVEQ1iEg==",
       "requires": {
         "tslib": "^1.9.0"
       }
@@ -10719,17 +11598,6 @@
       "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==",
       "dev": true
     },
-    "node-fetch-npm": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz",
-      "integrity": "sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==",
-      "dev": true,
-      "requires": {
-        "encoding": "^0.1.11",
-        "json-parse-better-errors": "^1.0.0",
-        "safe-buffer": "^5.1.1"
-      }
-    },
     "node-forge": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz",
@@ -10776,13 +11644,10 @@
       }
     },
     "node-releases": {
-      "version": "1.1.33",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.33.tgz",
-      "integrity": "sha512-I0V30bWQEoHb+10W8oedVoUrdjW5wIkYm0w7vvcrPO95pZY738m1k77GF5sO0vKg5eXYg9oGtrMAETbgZGm11A==",
-      "dev": true,
-      "requires": {
-        "semver": "^5.3.0"
-      }
+      "version": "1.1.53",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz",
+      "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==",
+      "dev": true
     },
     "node-sass-tilde-importer": {
       "version": "1.0.2",
@@ -10830,21 +11695,15 @@
       "dev": true
     },
     "normalize-url": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
-      "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
-      "dev": true,
-      "requires": {
-        "object-assign": "^4.0.1",
-        "prepend-http": "^1.0.0",
-        "query-string": "^4.1.0",
-        "sort-keys": "^1.0.0"
-      }
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
+      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
+      "dev": true
     },
     "normalizr": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/normalizr/-/normalizr-3.4.1.tgz",
-      "integrity": "sha512-gei+tJucERU8vYN6TFQL2k5YMLX2Yh7nlylKMJC65+Uu/LS3xQCDJc8cies72aHouycKYyVgcnyLRbaJsigXKw=="
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/normalizr/-/normalizr-3.6.0.tgz",
+      "integrity": "sha512-25cd8DiDu+pL46KIaxtVVvvEPjGacJgv0yUg950evr62dQ/ks2JO1kf7+Vi5/rMFjaSTSTls7aCnmRlUSljtiA=="
     },
     "now-and-later": {
       "version": "2.0.1",
@@ -10856,65 +11715,126 @@
       }
     },
     "npm-bundled": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
-      "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
+      "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
+      "dev": true,
+      "requires": {
+        "npm-normalize-package-bin": "^1.0.1"
+      }
+    },
+    "npm-install-checks": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-4.0.0.tgz",
+      "integrity": "sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==",
+      "dev": true,
+      "requires": {
+        "semver": "^7.1.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.1.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz",
+          "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==",
+          "dev": true
+        }
+      }
+    },
+    "npm-normalize-package-bin": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
+      "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
       "dev": true
     },
     "npm-package-arg": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz",
-      "integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==",
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.0.1.tgz",
+      "integrity": "sha512-/h5Fm6a/exByzFSTm7jAyHbgOqErl9qSNJDQF32Si/ZzgwT2TERVxRxn3Jurw1wflgyVVAxnFR4fRHPM7y1ClQ==",
       "dev": true,
       "requires": {
-        "hosted-git-info": "^2.6.0",
-        "osenv": "^0.1.5",
-        "semver": "^5.5.0",
+        "hosted-git-info": "^3.0.2",
+        "semver": "^7.0.0",
         "validate-npm-package-name": "^3.0.0"
+      },
+      "dependencies": {
+        "hosted-git-info": {
+          "version": "3.0.4",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.4.tgz",
+          "integrity": "sha512-4oT62d2jwSDBbLLFLZE+1vPuQ1h8p9wjrJ8Mqx5TjsyWmBMV5B13eJqn8pvluqubLf3cJPTfiYCIwNwDNmzScQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^5.1.1"
+          }
+        },
+        "semver": {
+          "version": "7.1.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz",
+          "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==",
+          "dev": true
+        }
       }
     },
     "npm-packlist": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.4.tgz",
-      "integrity": "sha512-zTLo8UcVYtDU3gdeaFu2Xu0n0EvelfHDGuqtNIn5RO7yQj4H1TqNdBc/yZjxnWA0PVB8D3Woyp0i5B43JwQ6Vw==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.1.1.tgz",
+      "integrity": "sha512-95TSDvGwujIhqfSpIiRRLodEF+y6mJMopuZdahoGzqtRDFZXGav46S0p6ngeWaiAkb5R72w6eVARhzej0HvZeQ==",
       "dev": true,
       "requires": {
-        "ignore-walk": "^3.0.1",
-        "npm-bundled": "^1.0.1"
+        "glob": "^7.1.6",
+        "ignore-walk": "^3.0.3",
+        "npm-bundled": "^1.1.1",
+        "npm-normalize-package-bin": "^1.0.1"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
       }
     },
     "npm-pick-manifest": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz",
-      "integrity": "sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.0.0.tgz",
+      "integrity": "sha512-PdJpXMvjqt4nftNEDpCgjBUF8yI3Q3MyuAmVB9nemnnCg32F4BPL/JFBfdj8DubgHCYUFQhtLWmBPvdsFtjWMg==",
       "dev": true,
       "requires": {
-        "figgy-pudding": "^3.5.1",
-        "npm-package-arg": "^6.0.0",
-        "semver": "^5.4.1"
+        "npm-install-checks": "^4.0.0",
+        "npm-package-arg": "^8.0.0",
+        "semver": "^7.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.1.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz",
+          "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==",
+          "dev": true
+        }
       }
     },
     "npm-registry-fetch": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.1.tgz",
-      "integrity": "sha512-1ZQ+yjnxc698R5h9Yje9CASapzAZr7aYDkJDdERg9xg2hOEY0vRJwskOaJAXq8N/eLavzvW4g564YAfq6zMn/A==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.0.0.tgz",
+      "integrity": "sha512-975WwLvZjX97y9UWWQ8nAyr7bw02s9xKPHqvEm5T900LQsB1HXb8Gb9ebYtCBLSX+K8gSOrO5KS/9yV/naLZmQ==",
       "dev": true,
       "requires": {
-        "JSONStream": "^1.3.4",
-        "bluebird": "^3.5.1",
-        "figgy-pudding": "^3.4.1",
+        "@npmcli/ci-detect": "^1.0.0",
         "lru-cache": "^5.1.1",
-        "make-fetch-happen": "^5.0.0",
-        "npm-package-arg": "^6.1.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-          "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
-          "dev": true
-        }
+        "make-fetch-happen": "^8.0.2",
+        "minipass": "^3.0.0",
+        "minipass-fetch": "^1.1.2",
+        "minipass-json-stream": "^1.0.1",
+        "minizlib": "^2.0.0",
+        "npm-package-arg": "^8.0.0"
       }
     },
     "npm-run-all": {
@@ -10997,6 +11917,15 @@
         "path-key": "^2.0.0"
       }
     },
+    "nth-check": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+      "dev": true,
+      "requires": {
+        "boolbase": "~1.0.0"
+      }
+    },
     "num2fraction": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
@@ -11065,9 +11994,9 @@
       "dev": true
     },
     "object-is": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz",
-      "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz",
+      "integrity": "sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==",
       "dev": true
     },
     "object-keys": {
@@ -11110,13 +12039,94 @@
       }
     },
     "object.getownpropertydescriptors": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
-      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
+      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.5.1"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.5",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+          "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.1.5",
+            "is-regex": "^1.0.5",
+            "object-inspect": "^1.7.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.0",
+            "string.prototype.trimleft": "^2.1.1",
+            "string.prototype.trimright": "^2.1.1"
+          }
+        },
+        "es-to-primitive": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+          "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+          "dev": true,
+          "requires": {
+            "is-callable": "^1.1.4",
+            "is-date-object": "^1.0.1",
+            "is-symbol": "^1.0.2"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+          "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+          "dev": true
+        },
+        "is-callable": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
+          "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
+          "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+          "dev": true,
+          "requires": {
+            "has": "^1.0.3"
+          }
+        },
+        "object-inspect": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
+          "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
+          "dev": true
+        },
+        "string.prototype.trimleft": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz",
+          "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==",
+          "dev": true,
+          "requires": {
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.17.5",
+            "string.prototype.trimstart": "^1.0.0"
+          }
+        },
+        "string.prototype.trimright": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz",
+          "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==",
+          "dev": true,
+          "requires": {
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.17.5",
+            "string.prototype.trimend": "^1.0.0"
+          }
+        }
       }
     },
     "object.map": {
@@ -11148,6 +12158,99 @@
         "make-iterator": "^1.0.0"
       }
     },
+    "object.values": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
+      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.5",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+          "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.1.5",
+            "is-regex": "^1.0.5",
+            "object-inspect": "^1.7.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.0",
+            "string.prototype.trimleft": "^2.1.1",
+            "string.prototype.trimright": "^2.1.1"
+          }
+        },
+        "es-to-primitive": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+          "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+          "dev": true,
+          "requires": {
+            "is-callable": "^1.1.4",
+            "is-date-object": "^1.0.1",
+            "is-symbol": "^1.0.2"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+          "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+          "dev": true
+        },
+        "is-callable": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
+          "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
+          "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+          "dev": true,
+          "requires": {
+            "has": "^1.0.3"
+          }
+        },
+        "object-inspect": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
+          "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
+          "dev": true
+        },
+        "string.prototype.trimleft": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz",
+          "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==",
+          "dev": true,
+          "requires": {
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.17.5",
+            "string.prototype.trimstart": "^1.0.0"
+          }
+        },
+        "string.prototype.trimright": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz",
+          "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==",
+          "dev": true,
+          "requires": {
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.17.5",
+            "string.prototype.trimend": "^1.0.0"
+          }
+        }
+      }
+    },
     "obuf": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
@@ -11188,12 +12291,13 @@
       }
     },
     "open": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
-      "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.0.3.tgz",
+      "integrity": "sha512-sP2ru2v0P290WFfv49Ap8MF6PkzGNnGlAwHweB4WR4mr5d2d0woiCluUeJ218w7/+PmoBy9JmYgD5A4mLcWOFA==",
       "dev": true,
       "requires": {
-        "is-wsl": "^1.1.0"
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
       }
     },
     "opn": {
@@ -11203,6 +12307,14 @@
       "dev": true,
       "requires": {
         "is-wsl": "^1.1.0"
+      },
+      "dependencies": {
+        "is-wsl": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+          "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+          "dev": true
+        }
       }
     },
     "optimist": {
@@ -11243,6 +12355,89 @@
         "wordwrap": "~1.0.0"
       }
     },
+    "ora": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-4.0.3.tgz",
+      "integrity": "sha512-fnDebVFyz309A73cqCipVL1fBZewq4vwgSHfxh43vVy31mbyoQ8sCH3Oeaog/owYOs/lLlGVPCISQonTneg6Pg==",
+      "dev": true,
+      "requires": {
+        "chalk": "^3.0.0",
+        "cli-cursor": "^3.1.0",
+        "cli-spinners": "^2.2.0",
+        "is-interactive": "^1.0.0",
+        "log-symbols": "^3.0.0",
+        "mute-stream": "0.0.8",
+        "strip-ansi": "^6.0.0",
+        "wcwidth": "^1.0.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "dev": true,
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
     "ordered-read-streams": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
@@ -11288,16 +12483,6 @@
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
       "dev": true
     },
-    "osenv": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "dev": true,
-      "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
-      }
-    },
     "p-cancelable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
@@ -11323,28 +12508,31 @@
       "dev": true
     },
     "p-limit": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-      "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
       "dev": true,
       "requires": {
-        "p-try": "^2.0.0"
+        "p-try": "^1.0.0"
       }
     },
     "p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
       "dev": true,
       "requires": {
-        "p-limit": "^2.0.0"
+        "p-limit": "^1.1.0"
       }
     },
     "p-map": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-      "dev": true
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
+      "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
+      "dev": true,
+      "requires": {
+        "aggregate-error": "^3.0.0"
+      }
     },
     "p-retry": {
       "version": "3.0.1",
@@ -11356,9 +12544,9 @@
       }
     },
     "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
       "dev": true
     },
     "package-json": {
@@ -11382,58 +12570,63 @@
       }
     },
     "pacote": {
-      "version": "9.5.5",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.5.tgz",
-      "integrity": "sha512-jAEP+Nqj4kyMWyNpfTU/Whx1jA7jEc5cCOlurm0/0oL+v8TAp1QSsK83N7bYe+2bEdFzMAtPG5TBebjzzGV0cA==",
+      "version": "11.1.4",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.1.4.tgz",
+      "integrity": "sha512-eUGJvSSpWFZKn3z8gig/HgnBmUl6gIWByIIaHzSyEr3tOWX0w8tFEADXtpu8HGv5E0ShCeTP6enRq8iHKCHSvw==",
       "dev": true,
       "requires": {
-        "bluebird": "^3.5.3",
-        "cacache": "^12.0.2",
-        "figgy-pudding": "^3.5.1",
-        "get-stream": "^4.1.0",
-        "glob": "^7.1.3",
+        "@npmcli/git": "^2.0.1",
+        "@npmcli/installed-package-contents": "^1.0.5",
+        "@npmcli/promise-spawn": "^1.1.0",
+        "cacache": "^15.0.0",
+        "chownr": "^1.1.4",
+        "fs-minipass": "^2.1.0",
         "infer-owner": "^1.0.4",
         "lru-cache": "^5.1.1",
-        "make-fetch-happen": "^5.0.0",
-        "minimatch": "^3.0.4",
-        "minipass": "^2.3.5",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "normalize-package-data": "^2.4.0",
-        "npm-package-arg": "^6.1.0",
-        "npm-packlist": "^1.1.12",
-        "npm-pick-manifest": "^2.2.3",
-        "npm-registry-fetch": "^4.0.0",
-        "osenv": "^0.1.5",
+        "minipass": "^3.0.1",
+        "minipass-fetch": "^1.2.1",
+        "mkdirp": "^1.0.3",
+        "npm-package-arg": "^8.0.1",
+        "npm-packlist": "^2.1.0",
+        "npm-pick-manifest": "^6.0.0",
+        "npm-registry-fetch": "^8.0.0",
         "promise-inflight": "^1.0.1",
         "promise-retry": "^1.1.1",
-        "protoduck": "^5.0.1",
-        "rimraf": "^2.6.2",
-        "safe-buffer": "^5.1.2",
-        "semver": "^5.6.0",
-        "ssri": "^6.0.1",
-        "tar": "^4.4.8",
-        "unique-filename": "^1.1.1",
-        "which": "^1.3.1"
+        "read-package-json-fast": "^1.1.3",
+        "rimraf": "^2.7.1",
+        "semver": "^7.1.3",
+        "ssri": "^8.0.0",
+        "tar": "^6.0.1",
+        "which": "^2.0.2"
       },
       "dependencies": {
-        "npm-pick-manifest": {
-          "version": "2.2.3",
-          "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz",
-          "integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==",
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        },
+        "semver": {
+          "version": "7.1.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz",
+          "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
           "dev": true,
           "requires": {
-            "figgy-pudding": "^3.5.1",
-            "npm-package-arg": "^6.0.0",
-            "semver": "^5.4.1"
+            "isexe": "^2.0.0"
           }
         }
       }
     },
     "pako": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
-      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
       "dev": true
     },
     "parallel-transform": {
@@ -11630,9 +12823,9 @@
       "dev": true
     },
     "picomatch": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.0.7.tgz",
-      "integrity": "sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
       "dev": true
     },
     "pidtree": {
@@ -11669,6 +12862,60 @@
       "dev": true,
       "requires": {
         "find-up": "^3.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
+          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        }
+      }
+    },
+    "pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
+      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
+      "dev": true,
+      "requires": {
+        "find-up": "^2.1.0"
       }
     },
     "plugin-error": {
@@ -11701,20 +12948,29 @@
       "dev": true
     },
     "portfinder": {
-      "version": "1.0.24",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.24.tgz",
-      "integrity": "sha512-ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg==",
+      "version": "1.0.25",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz",
+      "integrity": "sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==",
       "dev": true,
       "requires": {
-        "async": "^1.5.2",
-        "debug": "^2.2.0",
-        "mkdirp": "0.5.x"
+        "async": "^2.6.2",
+        "debug": "^3.1.1",
+        "mkdirp": "^0.5.1"
       },
       "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         }
       }
@@ -11726,9 +12982,9 @@
       "dev": true
     },
     "postcss": {
-      "version": "7.0.17",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz",
-      "integrity": "sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==",
+      "version": "7.0.27",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz",
+      "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==",
       "dev": true,
       "requires": {
         "chalk": "^2.4.2",
@@ -11744,6 +13000,92 @@
         }
       }
     },
+    "postcss-calc": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz",
+      "integrity": "sha512-rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.27",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.0.2"
+      }
+    },
+    "postcss-colormin": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
+      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "color": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-convert-values": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
+      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-discard-comments": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
+      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-discard-duplicates": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
+      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-discard-empty": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
+      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-discard-overridden": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
+      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
     "postcss-import": {
       "version": "12.0.1",
       "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz",
@@ -11782,8 +13124,429 @@
       "requires": {
         "loader-utils": "^1.1.0",
         "postcss": "^7.0.0",
-        "postcss-load-config": "^2.0.0",
-        "schema-utils": "^1.0.0"
+        "postcss-load-config": "^2.0.0",
+        "schema-utils": "^1.0.0"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
+    "postcss-merge-longhand": {
+      "version": "4.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
+      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
+      "dev": true,
+      "requires": {
+        "css-color-names": "0.0.4",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "stylehacks": "^4.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-merge-rules": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
+      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-api": "^3.0.0",
+        "cssnano-util-same-parent": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0",
+        "vendors": "^1.0.0"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+          "dev": true,
+          "requires": {
+            "dot-prop": "^5.2.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "postcss-minify-font-values": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
+      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-minify-gradients": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
+      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "is-color-stop": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-minify-params": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
+      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
+      "dev": true,
+      "requires": {
+        "alphanum-sort": "^1.0.0",
+        "browserslist": "^4.0.0",
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "uniqs": "^2.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-minify-selectors": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
+      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
+      "dev": true,
+      "requires": {
+        "alphanum-sort": "^1.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+          "dev": true,
+          "requires": {
+            "dot-prop": "^5.2.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        }
+      }
+    },
+    "postcss-normalize-charset": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
+      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-normalize-display-values": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
+      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-positions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
+      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-repeat-style": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
+      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-string": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
+      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-timing-functions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
+      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-match": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-unicode": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
+      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-url": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
+      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
+      "dev": true,
+      "requires": {
+        "is-absolute-url": "^2.0.0",
+        "normalize-url": "^3.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-normalize-whitespace": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
+      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-ordered-values": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
+      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-arguments": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-reduce-initial": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
+      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-api": "^3.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0"
+      }
+    },
+    "postcss-reduce-transforms": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
+      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
+      "dev": true,
+      "requires": {
+        "cssnano-util-get-match": "^4.0.0",
+        "has": "^1.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-selector-parser": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
+      "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
+      "dev": true,
+      "requires": {
+        "cssesc": "^3.0.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      }
+    },
+    "postcss-svgo": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
+      "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
+      "dev": true,
+      "requires": {
+        "is-svg": "^3.0.0",
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0",
+        "svgo": "^1.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-unique-selectors": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
+      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
+      "dev": true,
+      "requires": {
+        "alphanum-sort": "^1.0.0",
+        "postcss": "^7.0.0",
+        "uniqs": "^2.0.0"
       }
     },
     "postcss-url": {
@@ -11808,9 +13571,9 @@
       }
     },
     "postcss-value-parser": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz",
-      "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz",
+      "integrity": "sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==",
       "dev": true
     },
     "prelude-ls": {
@@ -11889,19 +13652,10 @@
         }
       }
     },
-    "protoduck": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz",
-      "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==",
-      "dev": true,
-      "requires": {
-        "genfun": "^5.0.0"
-      }
-    },
     "protractor": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.4.2.tgz",
-      "integrity": "sha512-zlIj64Cr6IOWP7RwxVeD8O4UskLYPoyIcg0HboWJL9T79F1F0VWtKkGTr/9GN6BKL+/Q/GmM7C9kFVCfDbP5sA==",
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.4.3.tgz",
+      "integrity": "sha512-7pMAolv8Ah1yJIqaorDTzACtn3gk7BamVKPTeO5lqIGOrfosjPgXFx/z1dqSI+m5EeZc2GMJHPr5DYlodujDNA==",
       "dev": true,
       "requires": {
         "@types/q": "^0.0.32",
@@ -11921,6 +13675,12 @@
         "webdriver-manager": "^12.0.6"
       },
       "dependencies": {
+        "@types/q": {
+          "version": "0.0.32",
+          "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz",
+          "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=",
+          "dev": true
+        },
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
@@ -11969,6 +13729,30 @@
             "pinkie-promise": "^2.0.0"
           }
         },
+        "is-path-cwd": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+          "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+          "dev": true
+        },
+        "is-path-in-cwd": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+          "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
+          "dev": true,
+          "requires": {
+            "is-path-inside": "^1.0.0"
+          }
+        },
+        "is-path-inside": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+          "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
+          "dev": true,
+          "requires": {
+            "path-is-inside": "^1.0.1"
+          }
+        },
         "pify": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
@@ -12018,13 +13802,13 @@
       }
     },
     "proxy-addr": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
-      "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
+      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
       "dev": true,
       "requires": {
         "forwarded": "~0.1.2",
-        "ipaddr.js": "1.9.0"
+        "ipaddr.js": "1.9.1"
       }
     },
     "prr": {
@@ -12043,9 +13827,9 @@
       }
     },
     "ps-tree": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.1.tgz",
-      "integrity": "sha512-kef7fYYSKVqQffmzTMsVcUD1ObNJMp8sNSmHGlGKsZQyL/ht9MZKk86u0Rd1NhpTOAuhqwKCLLpktwkqz+MF8A==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz",
+      "integrity": "sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==",
       "dev": true,
       "requires": {
         "event-stream": "=3.3.4"
@@ -12058,9 +13842,9 @@
       "dev": true
     },
     "psl": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
-      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
       "dev": true
     },
     "public-encrypt": {
@@ -12101,8 +13885,16 @@
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+    },
+    "pupa": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.0.1.tgz",
+      "integrity": "sha512-hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA==",
+      "dev": true,
+      "requires": {
+        "escape-goat": "^2.0.0"
+      }
     },
     "q": {
       "version": "1.5.1",
@@ -12196,35 +13988,33 @@
       }
     },
     "raw-loader": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-3.1.0.tgz",
-      "integrity": "sha512-lzUVMuJ06HF4rYveaz9Tv0WRlUMxJ0Y1hgSkkgg+50iEdaI0TthyEDe08KIHb0XsF6rn8WYTqPCaGTZg3sX+qA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.0.tgz",
+      "integrity": "sha512-iINUOYvl1cGEmfoaLjnZXt4bKfT2LJnZZib5N/LLyAphC+Dd11vNP9CNVb38j+SAJpFI1uo8j9frmih53ASy7Q==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^2.0.1"
+        "loader-utils": "^1.2.3",
+        "schema-utils": "^2.5.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "minimist": "^1.2.0"
           }
         },
-        "schema-utils": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.4.1.tgz",
-          "integrity": "sha512-RqYLpkPZX5Oc3fw/kHHHyP56fg5Y+XBpIpV8nCg0znIALfq3OH+Ea9Hfeac9BAMwG5IICltiZ0vxFvJQONfA5w==",
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
           "dev": true,
           "requires": {
-            "ajv": "^6.10.2",
-            "ajv-keywords": "^3.4.1"
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
           }
         }
       }
@@ -12259,16 +14049,26 @@
       }
     },
     "read-package-json": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.0.tgz",
-      "integrity": "sha512-KLhu8M1ZZNkMcrq1+0UJbR8Dii8KZUqB0Sha4mOx/bknfKI/fyrQVrG/YIt2UOtG667sD8+ee4EXMM91W9dC+A==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.1.tgz",
+      "integrity": "sha512-dAiqGtVc/q5doFz6096CcnXhpYk0ZN8dEKVkGLU0CsASt8SrgF6SF7OTKAYubfvFhWaqofl+Y8HK19GR8jwW+A==",
       "dev": true,
       "requires": {
         "glob": "^7.1.1",
         "graceful-fs": "^4.1.2",
         "json-parse-better-errors": "^1.0.1",
         "normalize-package-data": "^2.0.0",
-        "slash": "^1.0.0"
+        "npm-normalize-package-bin": "^1.0.0"
+      }
+    },
+    "read-package-json-fast": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-1.1.3.tgz",
+      "integrity": "sha512-MmFqiyfCXV2Dmm4jH24DEGhxdkUDFivJQj4oPZQPOKywxR7HWBE6WnMWDAapfFHi3wm1b+mhR+XHlUH0CL8axg==",
+      "dev": true,
+      "requires": {
+        "json-parse-even-better-errors": "^2.0.1",
+        "npm-normalize-package-bin": "^1.0.1"
       }
     },
     "read-package-tree": {
@@ -12422,27 +14222,28 @@
       "dev": true
     },
     "regenerate-unicode-properties": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz",
-      "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
+      "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
       "dev": true,
       "requires": {
         "regenerate": "^1.4.0"
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
-      "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==",
+      "version": "0.13.5",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+      "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
       "dev": true
     },
     "regenerator-transform": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz",
-      "integrity": "sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==",
+      "version": "0.14.4",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz",
+      "integrity": "sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==",
       "dev": true,
       "requires": {
-        "private": "^0.1.6"
+        "@babel/runtime": "^7.8.4",
+        "private": "^0.1.8"
       }
     },
     "regex-not": {
@@ -12456,36 +14257,117 @@
       }
     },
     "regexp.prototype.flags": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz",
-      "integrity": "sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz",
+      "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0-next.1"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.5",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+          "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.1.5",
+            "is-regex": "^1.0.5",
+            "object-inspect": "^1.7.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.0",
+            "string.prototype.trimleft": "^2.1.1",
+            "string.prototype.trimright": "^2.1.1"
+          }
+        },
+        "es-to-primitive": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+          "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+          "dev": true,
+          "requires": {
+            "is-callable": "^1.1.4",
+            "is-date-object": "^1.0.1",
+            "is-symbol": "^1.0.2"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+          "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+          "dev": true
+        },
+        "is-callable": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
+          "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
+          "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+          "dev": true,
+          "requires": {
+            "has": "^1.0.3"
+          }
+        },
+        "object-inspect": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
+          "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
+          "dev": true
+        },
+        "string.prototype.trimleft": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz",
+          "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==",
+          "dev": true,
+          "requires": {
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.17.5",
+            "string.prototype.trimstart": "^1.0.0"
+          }
+        },
+        "string.prototype.trimright": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz",
+          "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==",
+          "dev": true,
+          "requires": {
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.17.5",
+            "string.prototype.trimend": "^1.0.0"
+          }
+        }
       }
     },
     "regexpu-core": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz",
-      "integrity": "sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz",
+      "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==",
       "dev": true,
       "requires": {
         "regenerate": "^1.4.0",
-        "regenerate-unicode-properties": "^8.1.0",
-        "regjsgen": "^0.5.0",
-        "regjsparser": "^0.6.0",
+        "regenerate-unicode-properties": "^8.2.0",
+        "regjsgen": "^0.5.1",
+        "regjsparser": "^0.6.4",
         "unicode-match-property-ecmascript": "^1.0.4",
-        "unicode-match-property-value-ecmascript": "^1.1.0"
+        "unicode-match-property-value-ecmascript": "^1.2.0"
       }
     },
     "registry-auth-token": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.0.0.tgz",
-      "integrity": "sha512-lpQkHxd9UL6tb3k/aHAVfnVtn+Bcs9ob5InuFLLEDqSqeq+AljB8GZW9xY0x7F+xYwEcjKe07nyoxzEYz6yvkw==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.1.1.tgz",
+      "integrity": "sha512-9bKS7nTl9+/A1s7tnPeGrUpRcVY+LUh7bfFgzpndALdPfXQBfQV77rQVtqgUV3ti4vc/Ik81Ex8UJDWDQ12zQA==",
       "dev": true,
       "requires": {
-        "rc": "^1.2.8",
-        "safe-buffer": "^5.0.1"
+        "rc": "^1.2.8"
       }
     },
     "registry-url": {
@@ -12498,18 +14380,26 @@
       }
     },
     "regjsgen": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz",
-      "integrity": "sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==",
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz",
+      "integrity": "sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==",
       "dev": true
     },
     "regjsparser": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz",
-      "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
+      "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
       "dev": true,
       "requires": {
         "jsesc": "~0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+          "dev": true
+        }
       }
     },
     "remove-bom-buffer": {
@@ -12551,15 +14441,6 @@
       "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
       "dev": true
     },
-    "repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true,
-      "requires": {
-        "is-finite": "^1.0.0"
-      }
-    },
     "replace-ext": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
@@ -12578,39 +14459,78 @@
       }
     },
     "replace-in-file": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/replace-in-file/-/replace-in-file-4.1.3.tgz",
-      "integrity": "sha512-x8uSfKKK/5YiJ8JYsNMwa1PJYvHfPdUABVXd21ro09Nh5BRZ5ATuACwrqCNpktwVqVbFTk/cIGFepeMqY0oX3g==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/replace-in-file/-/replace-in-file-5.0.2.tgz",
+      "integrity": "sha512-1Vc7Sbr/rTuHgU1PZuBb7tGsFx3D4NKdhV4BpEF2MuN/6+SoXcFtx+dZ1Zz+5Dq4k5x9js87Y+gXQYPTQ9ppkA==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.2",
-        "glob": "^7.1.4",
-        "yargs": "^13.3.0"
+        "chalk": "^3.0.0",
+        "glob": "^7.1.6",
+        "yargs": "^15.0.2"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "dev": true,
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
         "cliui": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
           "dev": true,
           "requires": {
-            "string-width": "^3.1.0",
-            "strip-ansi": "^5.2.0",
-            "wrap-ansi": "^5.1.0"
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^6.2.0"
           }
         },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
         "get-caller-file": {
           "version": "2.0.5",
           "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -12618,9 +14538,9 @@
           "dev": true
         },
         "glob": {
-          "version": "7.1.4",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
           "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -12631,10 +14551,55 @@
             "path-is-absolute": "^1.0.0"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
+          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
           "dev": true
         },
         "require-main-filename": {
@@ -12644,23 +14609,32 @@
           "dev": true
         },
         "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
           "dev": true,
           "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
           }
         },
         "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^4.1.0"
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
           }
         },
         "which-module": {
@@ -12670,38 +14644,39 @@
           "dev": true
         },
         "wrap-ansi": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.0",
-            "string-width": "^3.0.0",
-            "strip-ansi": "^5.0.0"
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
           }
         },
         "yargs": {
-          "version": "13.3.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
-          "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
+          "version": "15.3.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
+          "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
           "dev": true,
           "requires": {
-            "cliui": "^5.0.0",
-            "find-up": "^3.0.0",
+            "cliui": "^6.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^4.1.0",
             "get-caller-file": "^2.0.1",
             "require-directory": "^2.1.1",
             "require-main-filename": "^2.0.0",
             "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
+            "string-width": "^4.2.0",
             "which-module": "^2.0.0",
             "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.1"
+            "yargs-parser": "^18.1.1"
           }
         },
         "yargs-parser": {
-          "version": "13.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
-          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+          "version": "18.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz",
+          "integrity": "sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==",
           "dev": true,
           "requires": {
             "camelcase": "^5.0.0",
@@ -12711,9 +14686,9 @@
       }
     },
     "request": {
-      "version": "2.88.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
       "dev": true,
       "requires": {
         "aws-sign2": "~0.7.0",
@@ -12723,7 +14698,7 @@
         "extend": "~3.0.2",
         "forever-agent": "~0.6.1",
         "form-data": "~2.3.2",
-        "har-validator": "~5.1.0",
+        "har-validator": "~5.1.3",
         "http-signature": "~1.2.0",
         "is-typedarray": "~1.0.0",
         "isstream": "~0.1.2",
@@ -12733,27 +14708,27 @@
         "performance-now": "^2.1.0",
         "qs": "~6.5.2",
         "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.4.3",
+        "tough-cookie": "~2.5.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.3.2"
       }
     },
     "request-promise-core": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz",
-      "integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz",
+      "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.11"
+        "lodash": "^4.17.15"
       }
     },
     "request-promise-native": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz",
-      "integrity": "sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz",
+      "integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==",
       "dev": true,
       "requires": {
-        "request-promise-core": "1.1.2",
+        "request-promise-core": "1.1.3",
         "stealthy-require": "^1.1.1",
         "tough-cookie": "^2.3.3"
       }
@@ -12906,102 +14881,84 @@
       "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==",
       "dev": true
     },
+    "rgb-regex": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
+      "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=",
+      "dev": true
+    },
+    "rgba-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
+      "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
+      "dev": true
+    },
     "rimraf": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
       "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
       "dev": true,
       "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
-    "rollup": {
-      "version": "1.22.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.22.0.tgz",
-      "integrity": "sha512-x4l4ZrV/Mr/x/jvFTmwROdEAhbZjx16yDRTVSKWh/i4oJDuW2dVEbECT853mybYCz7BAitU8ElGlhx7dNjw3qQ==",
-      "dev": true,
-      "requires": {
-        "@types/estree": "*",
-        "@types/node": "*",
-        "acorn": "^7.1.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
-          "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
-          "dev": true
-        }
-      }
-    },
-    "rollup-plugin-commonjs": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz",
-      "integrity": "sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==",
-      "dev": true,
-      "requires": {
-        "estree-walker": "^0.6.1",
-        "is-reference": "^1.1.2",
-        "magic-string": "^0.25.2",
-        "resolve": "^1.11.0",
-        "rollup-pluginutils": "^2.8.1"
-      }
-    },
-    "rollup-plugin-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-json/-/rollup-plugin-json-4.0.0.tgz",
-      "integrity": "sha512-hgb8N7Cgfw5SZAkb3jf0QXii6QX/FOkiIq2M7BAQIEydjHvTyxXHQiIzZaTFgx1GK0cRCHOCBHIyEkkLdWKxow==",
-      "dev": true,
-      "requires": {
-        "rollup-pluginutils": "^2.5.0"
+        "glob": "^7.1.3"
       }
     },
-    "rollup-plugin-node-resolve": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz",
-      "integrity": "sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==",
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
       "dev": true,
       "requires": {
-        "@types/resolve": "0.0.8",
-        "builtin-modules": "^3.1.0",
-        "is-module": "^1.0.0",
-        "resolve": "^1.11.1",
-        "rollup-pluginutils": "^2.8.1"
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
       }
     },
-    "rollup-plugin-sourcemaps": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.4.2.tgz",
-      "integrity": "sha1-YhJaqUCHqt97g+9N+vYptHMTXoc=",
+    "rollup": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.1.0.tgz",
+      "integrity": "sha512-gfE1455AEazVVTJoeQtcOq/U6GSxwoj4XPSWVsuWmgIxj7sBQNLDOSA82PbdMe+cP8ql8fR1jogPFe8Wg8g4SQ==",
       "dev": true,
       "requires": {
-        "rollup-pluginutils": "^2.0.1",
-        "source-map-resolve": "^0.5.0"
+        "fsevents": "~2.1.2"
+      },
+      "dependencies": {
+        "fsevents": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
+          "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
-    "rollup-pluginutils": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
-      "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==",
+    "rollup-plugin-sourcemaps": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.5.0.tgz",
+      "integrity": "sha512-xp2vvRvgnYiXydgf/JFFFgYxrqMaQaOrK/g6yZvgwT9R1TSYjD3HKku1pD7iQNjQHkl5yGpokvJLp7cP/lR+aQ==",
       "dev": true,
       "requires": {
-        "estree-walker": "^0.6.1"
+        "@rollup/pluginutils": "^3.0.1",
+        "source-map-resolve": "^0.5.3"
+      },
+      "dependencies": {
+        "source-map-resolve": {
+          "version": "0.5.3",
+          "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+          "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+          "dev": true,
+          "requires": {
+            "atob": "^2.1.2",
+            "decode-uri-component": "^0.2.0",
+            "resolve-url": "^0.2.1",
+            "source-map-url": "^0.4.0",
+            "urix": "^0.1.0"
+          }
+        }
       }
     },
     "run-async": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz",
+      "integrity": "sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==",
       "dev": true,
       "requires": {
         "is-promise": "^2.1.0"
@@ -13022,11 +14979,6 @@
         "aproba": "^1.1.1"
       }
     },
-    "rw": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
-      "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q="
-    },
     "rx-lite": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz",
@@ -13034,9 +14986,9 @@
       "dev": true
     },
     "rxjs": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
-      "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
+      "version": "6.5.5",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
+      "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
       "requires": {
         "tslib": "^1.9.0"
       }
@@ -13096,9 +15048,9 @@
       }
     },
     "rxjs-websockets": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/rxjs-websockets/-/rxjs-websockets-8.0.0.tgz",
-      "integrity": "sha512-8t3nE350u+6vPcJ5E5DCdsxXCJePQPNHWZmUFbs0tfYHTNdc4Hth4nNaEHAoxsJ4HrsRT9e5YutfMmstTl0afQ=="
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/rxjs-websockets/-/rxjs-websockets-8.0.1.tgz",
+      "integrity": "sha512-j1U2uGxJxwxwKlDnRVWViFdpWgvESEWwS0+3/PKg8ygAqTLEB77hVxUqmqZcp45fcgtkrvl1/0i7qy9wEFO29g=="
     },
     "safe-buffer": {
       "version": "5.1.2",
@@ -13118,12 +15070,13 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
     },
     "sass": {
-      "version": "1.22.9",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.22.9.tgz",
-      "integrity": "sha512-FzU1X2V8DlnqabrL4u7OBwD2vcOzNMongEJEx3xMEhWY/v26FFR3aG0hyeu2T965sfR0E9ufJwmG+Qjz78vFPQ==",
+      "version": "1.26.3",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.3.tgz",
+      "integrity": "sha512-5NMHI1+YFYw4sN3yfKjpLuV9B5l7MqQ6FlkTcC4FT+oHbBRUZoSjHrrt/mE0nFXJyY2kQtU9ou9HxvFVjLFuuw==",
       "dev": true,
       "requires": {
         "chokidar": ">=2.0.0 <4.0.0"
@@ -13189,22 +15142,42 @@
       }
     },
     "sass-loader": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.2.0.tgz",
-      "integrity": "sha512-h8yUWaWtsbuIiOCgR9fd9c2lRXZ2uG+h8Dzg/AGNj+Hg/3TO8+BBAW9mEP+mh8ei+qBKqSJ0F1FLlYjNBc61OA==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
+      "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
       "dev": true,
       "requires": {
         "clone-deep": "^4.0.1",
-        "loader-utils": "^1.0.1",
-        "neo-async": "^2.5.0",
-        "pify": "^4.0.1",
-        "semver": "^5.5.0"
+        "loader-utils": "^1.2.3",
+        "neo-async": "^2.6.1",
+        "schema-utils": "^2.6.1",
+        "semver": "^6.3.0"
       },
       "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         }
       }
@@ -13216,23 +15189,58 @@
       "dev": true,
       "requires": {
         "https-proxy-agent": "^2.2.1"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+          "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
+          "dev": true,
+          "requires": {
+            "es6-promisify": "^5.0.0"
+          }
+        },
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "https-proxy-agent": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
+          "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
+          "dev": true,
+          "requires": {
+            "agent-base": "^4.3.0",
+            "debug": "^3.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "sax": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz",
-      "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
       "dev": true
     },
     "schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+      "version": "2.6.5",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz",
+      "integrity": "sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==",
       "dev": true,
       "requires": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
+        "ajv": "^6.12.0",
+        "ajv-keywords": "^3.4.1"
       }
     },
     "select-hose": {
@@ -13280,12 +15288,20 @@
       "dev": true
     },
     "semver-diff": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
-      "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
+      "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
       "dev": true,
       "requires": {
-        "semver": "^5.0.3"
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
       }
     },
     "semver-dsl": {
@@ -13345,9 +15361,9 @@
       }
     },
     "serialize-javascript": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz",
-      "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
+      "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==",
       "dev": true
     },
     "serve-index": {
@@ -13491,11 +15507,28 @@
       "dev": true
     },
     "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
       "dev": true
     },
+    "simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+      "dev": true,
+      "requires": {
+        "is-arrayish": "^0.3.1"
+      },
+      "dependencies": {
+        "is-arrayish": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+          "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+          "dev": true
+        }
+      }
+    },
     "slash": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
@@ -13509,9 +15542,9 @@
       "dev": true
     },
     "smart-buffer": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.0.2.tgz",
-      "integrity": "sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz",
+      "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==",
       "dev": true
     },
     "snapdragon": {
@@ -13647,9 +15680,9 @@
       }
     },
     "socket.io-adapter": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz",
-      "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz",
+      "integrity": "sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==",
       "dev": true
     },
     "socket.io-client": {
@@ -13736,9 +15769,9 @@
       }
     },
     "sockjs-client": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz",
-      "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz",
+      "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==",
       "dev": true,
       "requires": {
         "debug": "^3.2.5",
@@ -13776,33 +15809,40 @@
       }
     },
     "socks": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.2.tgz",
-      "integrity": "sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz",
+      "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==",
       "dev": true,
       "requires": {
-        "ip": "^1.1.5",
-        "smart-buffer": "4.0.2"
+        "ip": "1.1.5",
+        "smart-buffer": "^4.1.0"
       }
     },
     "socks-proxy-agent": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz",
-      "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
       "dev": true,
       "requires": {
-        "agent-base": "~4.2.1",
-        "socks": "~2.3.2"
+        "agent-base": "6",
+        "debug": "4",
+        "socks": "^2.3.3"
       },
       "dependencies": {
-        "agent-base": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
-          "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "es6-promisify": "^5.0.0"
+            "ms": "^2.1.1"
           }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
         }
       }
     },
@@ -13834,6 +15874,28 @@
       "requires": {
         "async": "^2.5.0",
         "loader-utils": "^1.1.0"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        }
       }
     },
     "source-map-resolve": {
@@ -13850,9 +15912,9 @@
       }
     },
     "source-map-support": {
-      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+      "version": "0.5.16",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
+      "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
       "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
@@ -13874,9 +15936,9 @@
       "dev": true
     },
     "sourcemap-codec": {
-      "version": "1.4.6",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.6.tgz",
-      "integrity": "sha512-1ZooVLYFxC448piVLBbtOxFcXwnymH9oUF8nRd3CuYDVvkRBxRl6pB4Mtas5a4drtL+E8LDgFkQNcgIw6tc8Hg==",
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
       "dev": true
     },
     "sparkles": {
@@ -13918,9 +15980,9 @@
       "dev": true
     },
     "spdy": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz",
-      "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
       "dev": true,
       "requires": {
         "debug": "^4.1.0",
@@ -13977,9 +16039,9 @@
           "dev": true
         },
         "readable-stream": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
-          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
           "dev": true,
           "requires": {
             "inherits": "^2.0.3",
@@ -14040,14 +16102,20 @@
       }
     },
     "ssri": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz",
+      "integrity": "sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==",
       "dev": true,
       "requires": {
-        "figgy-pudding": "^3.5.1"
+        "minipass": "^3.1.1"
       }
     },
+    "stable": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "dev": true
+    },
     "stack-trace": {
       "version": "0.0.10",
       "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
@@ -14101,89 +16169,6 @@
       "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
       "dev": true
     },
-    "stratos-angular6-json-schema-form": {
-      "version": "github:nwmac/ajsf#8c88d9a8a6b75e8bf39ab0151bbcd7a85d3aef7a",
-      "from": "github:nwmac/ajsf",
-      "requires": {
-        "@angular/animations": "^9.0.4",
-        "@angular/cdk": "^9.2.0",
-        "@angular/common": "^9.0.4",
-        "@angular/compiler": "^9.0.4",
-        "@angular/core": "^9.0.4",
-        "@angular/flex-layout": "^9.0.0-beta.29",
-        "@angular/forms": "^9.0.4",
-        "@angular/material": "^9.2.0",
-        "@angular/platform-browser": "^9.0.4",
-        "@angular/platform-browser-dynamic": "^9.0.4",
-        "@angular/router": "^9.0.4",
-        "brace": "^0.11.1",
-        "core-js": "^3.6.4",
-        "lodash-es": "^4.17.15",
-        "rxjs": "^6.5.2",
-        "tslib": "^1.10.0",
-        "zone.js": "~0.10.2"
-      },
-      "dependencies": {
-        "@angular/animations": {
-          "version": "9.1.0",
-          "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-9.1.0.tgz",
-          "integrity": "sha512-o7X3HM+eocoryw3VrDUtG6Wci2KwtzyBFo3KBJXjQ16X6fwdkjTG+hLb7pp2CBFBEJW4tPYEy7cSBmEfMRTqag=="
-        },
-        "@angular/cdk": {
-          "version": "9.2.0",
-          "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-9.2.0.tgz",
-          "integrity": "sha512-jeeznvNDpR9POuxzz8Y0zFvMynG9HCJo3ZPTqOjlOq8Lj8876+rLsHDvKEMeLdwlkdi1EweYJW1CLQzI+TwqDA==",
-          "requires": {
-            "parse5": "^5.0.0"
-          }
-        },
-        "@angular/common": {
-          "version": "9.1.0",
-          "resolved": "https://registry.npmjs.org/@angular/common/-/common-9.1.0.tgz",
-          "integrity": "sha512-6JPLNtMhI03bGTVQJeSwc+dTjV6DtP7M/BAyzIV0InZP1D6XsOh2QahLFIaaN2sSxYA2ClKuwfX1v+rx9AbXQA=="
-        },
-        "@angular/compiler": {
-          "version": "9.1.0",
-          "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.1.0.tgz",
-          "integrity": "sha512-QHw/JSeTXHiJQ2Ih0EtU7FGsYcOr+0hwZhqwSW3EEn8TtUgA3DS5lXeiDV66f+3DdvNZFPmgiZIvun3ypxn1HA=="
-        },
-        "@angular/core": {
-          "version": "9.1.0",
-          "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.1.0.tgz",
-          "integrity": "sha512-RVlyegdIAij0P1wLY5ObIdsBAzvmHkHfElnmfiNKhaDftP6U/3zRtaKDu0bq0jvn1WCQ8zXxFQ8AWyKZwyFS+w=="
-        },
-        "@angular/forms": {
-          "version": "9.1.0",
-          "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-9.1.0.tgz",
-          "integrity": "sha512-5GC8HQlPChPV+168zLlm4yj4syA6N9ChSKV0tmzj1zIfMcub1UAOaB9IYaXRHQsjPFh9OuQXwmkzScyAfhEVjA=="
-        },
-        "@angular/material": {
-          "version": "9.2.0",
-          "resolved": "https://registry.npmjs.org/@angular/material/-/material-9.2.0.tgz",
-          "integrity": "sha512-KKzEIVh6/m56m+Ao8p4PK0SyEr0574l3VP2swj1qPag3u+FYgemmXCGTaChrKdDsez+zeTCPXImBGXzE6NQ80Q=="
-        },
-        "@angular/platform-browser": {
-          "version": "9.1.0",
-          "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-9.1.0.tgz",
-          "integrity": "sha512-OsS/blUjl8ranmDaRADjFAmvnlmwbT6WNU7dVov7FhV0rqesbwaOJ5bR0LSYHYpej7Jaa6oYk0v0XWkaH9LTFg=="
-        },
-        "@angular/platform-browser-dynamic": {
-          "version": "9.1.0",
-          "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.1.0.tgz",
-          "integrity": "sha512-sMtz/poQ3TYaWZzWjrn9apKUZ/WKql2MYCWbpax7pql3GgC9OoTslc7ZEe7/d3ynfFE/CQqWBBOuWGD71Z0LMQ=="
-        },
-        "@angular/router": {
-          "version": "9.1.0",
-          "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.1.0.tgz",
-          "integrity": "sha512-cExO1nPnoPFiUJWZ28hTHozPLFoCmqr3xqcM57We0hhKE0esdrO+gRWKRH0EJERukLbU8coPKVhA8daGUpASiQ=="
-        },
-        "core-js": {
-          "version": "3.6.4",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-          "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw=="
-        }
-      }
-    },
     "stratos-protractor-reporter": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/stratos-protractor-reporter/-/stratos-protractor-reporter-1.2.3.tgz",
@@ -14295,15 +16280,16 @@
       "dev": true
     },
     "streamroller": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
-      "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.6.tgz",
+      "integrity": "sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==",
       "dev": true,
       "requires": {
-        "date-format": "^1.2.0",
-        "debug": "^3.1.0",
-        "mkdirp": "^0.5.1",
-        "readable-stream": "^2.3.0"
+        "async": "^2.6.2",
+        "date-format": "^2.0.0",
+        "debug": "^3.2.6",
+        "fs-extra": "^7.0.1",
+        "lodash": "^4.17.14"
       },
       "dependencies": {
         "debug": {
@@ -14315,6 +16301,17 @@
             "ms": "^2.1.1"
           }
         },
+        "fs-extra": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -14351,6 +16348,97 @@
         "function-bind": "^1.0.2"
       }
     },
+    "string.prototype.trimend": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz",
+      "integrity": "sha512-EEJnGqa/xNfIg05SxiPSqRS7S9qwDhYts1TSLR1BQfYUfPe1stofgGKvwERK9+9yf+PpfBMlpBaCHucXGPQfUA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.5",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+          "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.1.5",
+            "is-regex": "^1.0.5",
+            "object-inspect": "^1.7.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.0",
+            "string.prototype.trimleft": "^2.1.1",
+            "string.prototype.trimright": "^2.1.1"
+          }
+        },
+        "es-to-primitive": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+          "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+          "dev": true,
+          "requires": {
+            "is-callable": "^1.1.4",
+            "is-date-object": "^1.0.1",
+            "is-symbol": "^1.0.2"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+          "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+          "dev": true
+        },
+        "is-callable": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
+          "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
+          "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+          "dev": true,
+          "requires": {
+            "has": "^1.0.3"
+          }
+        },
+        "object-inspect": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
+          "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
+          "dev": true
+        },
+        "string.prototype.trimleft": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz",
+          "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==",
+          "dev": true,
+          "requires": {
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.17.5",
+            "string.prototype.trimstart": "^1.0.0"
+          }
+        },
+        "string.prototype.trimright": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz",
+          "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==",
+          "dev": true,
+          "requires": {
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.17.5",
+            "string.prototype.trimend": "^1.0.0"
+          }
+        }
+      }
+    },
     "string.prototype.trimleft": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz",
@@ -14371,6 +16459,97 @@
         "function-bind": "^1.1.1"
       }
     },
+    "string.prototype.trimstart": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz",
+      "integrity": "sha512-iCP8g01NFYiiBOnwG1Xc3WZLyoo+RuBymwIlWncShXDDJYWN6DbnM3odslBJdgCdRlq94B5s63NWAZlcn2CS4w==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.5",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+          "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.1.5",
+            "is-regex": "^1.0.5",
+            "object-inspect": "^1.7.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.0",
+            "string.prototype.trimleft": "^2.1.1",
+            "string.prototype.trimright": "^2.1.1"
+          }
+        },
+        "es-to-primitive": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+          "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+          "dev": true,
+          "requires": {
+            "is-callable": "^1.1.4",
+            "is-date-object": "^1.0.1",
+            "is-symbol": "^1.0.2"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+          "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+          "dev": true
+        },
+        "is-callable": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
+          "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
+          "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+          "dev": true,
+          "requires": {
+            "has": "^1.0.3"
+          }
+        },
+        "object-inspect": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
+          "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
+          "dev": true
+        },
+        "string.prototype.trimleft": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz",
+          "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==",
+          "dev": true,
+          "requires": {
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.17.5",
+            "string.prototype.trimstart": "^1.0.0"
+          }
+        },
+        "string.prototype.trimright": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz",
+          "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==",
+          "dev": true,
+          "requires": {
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.17.5",
+            "string.prototype.trimend": "^1.0.0"
+          }
+        }
+      }
+    },
     "string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -14417,75 +16596,97 @@
       "dev": true
     },
     "style-loader": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.0.0.tgz",
-      "integrity": "sha512-B0dOCFwv7/eY31a5PCieNwMgMhVGFe9w+rh7s/Bx8kfFkrth9zfTZquoYvdw8URgiqxObQKcpW51Ugz1HjfdZw==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.1.3.tgz",
+      "integrity": "sha512-rlkH7X/22yuwFYK357fMN/BxYOorfnfq0eD7+vqlemSK4wEcejFF1dg4zxP0euBW8NrYx2WZzZ8PPFevr7D+Kw==",
       "dev": true,
       "requires": {
         "loader-utils": "^1.2.3",
-        "schema-utils": "^2.0.1"
+        "schema-utils": "^2.6.4"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "minimist": "^1.2.0"
           }
         },
-        "schema-utils": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.4.1.tgz",
-          "integrity": "sha512-RqYLpkPZX5Oc3fw/kHHHyP56fg5Y+XBpIpV8nCg0znIALfq3OH+Ea9Hfeac9BAMwG5IICltiZ0vxFvJQONfA5w==",
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
           "dev": true,
           "requires": {
-            "ajv": "^6.10.2",
-            "ajv-keywords": "^3.4.1"
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
           }
         }
       }
     },
-    "stylus": {
-      "version": "0.54.5",
-      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz",
-      "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=",
+    "stylehacks": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
+      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
       "dev": true,
       "requires": {
-        "css-parse": "1.7.x",
-        "debug": "*",
-        "glob": "7.0.x",
-        "mkdirp": "0.5.x",
-        "sax": "0.5.x",
-        "source-map": "0.1.x"
+        "browserslist": "^4.0.0",
+        "postcss": "^7.0.0",
+        "postcss-selector-parser": "^3.0.0"
       },
       "dependencies": {
-        "glob": {
-          "version": "7.0.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz",
-          "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=",
+        "postcss-selector-parser": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.2",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "dot-prop": "^5.2.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
           }
-        },
-        "source-map": {
-          "version": "0.1.43",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
-          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+        }
+      }
+    },
+    "stylus": {
+      "version": "0.54.7",
+      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.7.tgz",
+      "integrity": "sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug==",
+      "dev": true,
+      "requires": {
+        "css-parse": "~2.0.0",
+        "debug": "~3.1.0",
+        "glob": "^7.1.3",
+        "mkdirp": "~0.5.x",
+        "safer-buffer": "^2.1.2",
+        "sax": "~1.2.4",
+        "semver": "^6.0.0",
+        "source-map": "^0.7.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "ms": "2.0.0"
           }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.7.3",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+          "dev": true
         }
       }
     },
@@ -14498,6 +16699,28 @@
         "loader-utils": "^1.0.2",
         "lodash.clonedeep": "^4.5.0",
         "when": "~3.6.x"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        }
       }
     },
     "supports-color": {
@@ -14519,6 +16742,27 @@
         "es6-symbol": "^3.1.1"
       }
     },
+    "svgo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
+      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.1",
+        "coa": "^2.0.2",
+        "css-select": "^2.0.0",
+        "css-select-base-adapter": "^0.1.1",
+        "css-tree": "1.0.0-alpha.37",
+        "csso": "^4.0.2",
+        "js-yaml": "^3.13.1",
+        "mkdirp": "~0.5.1",
+        "object.values": "^1.1.0",
+        "sax": "~1.2.4",
+        "stable": "^0.1.8",
+        "unquote": "~1.1.1",
+        "util.promisify": "~1.0.0"
+      }
+    },
     "symbol-observable": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
@@ -14631,18 +16875,25 @@
       "dev": true
     },
     "tar": {
-      "version": "4.4.13",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
-      "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.1.tgz",
+      "integrity": "sha512-bKhKrrz2FJJj5s7wynxy/fyxpE0CmCjmOQ1KV4KkgXFWOgoIT/NbTMnB1n+LFNrNk0SSBVGGxcK5AGsyC+pW5Q==",
       "dev": true,
       "requires": {
-        "chownr": "^1.1.1",
-        "fs-minipass": "^1.2.5",
-        "minipass": "^2.8.6",
-        "minizlib": "^1.2.1",
-        "mkdirp": "^0.5.0",
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.3"
+        "chownr": "^1.1.3",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^3.0.0",
+        "minizlib": "^2.1.0",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+          "dev": true
+        }
       }
     },
     "teeny-request": {
@@ -14734,68 +16985,15 @@
       }
     },
     "term-size": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
-      "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
-      "dev": true,
-      "requires": {
-        "execa": "^0.7.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^4.0.1",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "execa": {
-          "version": "0.7.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
-          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^5.0.1",
-            "get-stream": "^3.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-          "dev": true
-        },
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-          "dev": true
-        }
-      }
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz",
+      "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==",
+      "dev": true
     },
     "terser": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.1.4.tgz",
-      "integrity": "sha512-+ZwXJvdSwbd60jG0Illav0F06GDJF0R4ydZ21Q3wGAFKoBGyJGo34F63vzJHgvYxc1ukOtIjvwEvl9MkjzM6Pg==",
+      "version": "4.6.7",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.7.tgz",
+      "integrity": "sha512-fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
@@ -14812,38 +17010,92 @@
       }
     },
     "terser-webpack-plugin": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz",
-      "integrity": "sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==",
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.5.tgz",
+      "integrity": "sha512-WlWksUoq+E4+JlJ+h+U+QUzXpcsMSSNXkDy9lBVkSqDn1w23Gg29L/ary9GeJVYCGiNJJX7LnVc4bwL1N3/g1w==",
       "dev": true,
       "requires": {
-        "cacache": "^12.0.2",
-        "find-cache-dir": "^2.1.0",
-        "is-wsl": "^1.1.0",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^1.7.0",
+        "cacache": "^13.0.1",
+        "find-cache-dir": "^3.2.0",
+        "jest-worker": "^25.1.0",
+        "p-limit": "^2.2.2",
+        "schema-utils": "^2.6.4",
+        "serialize-javascript": "^2.1.2",
         "source-map": "^0.6.1",
-        "terser": "^4.1.2",
-        "webpack-sources": "^1.4.0",
-        "worker-farm": "^1.7.0"
+        "terser": "^4.4.3",
+        "webpack-sources": "^1.4.3"
       },
       "dependencies": {
-        "find-cache-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+        "cacache": {
+          "version": "13.0.1",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz",
+          "integrity": "sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==",
           "dev": true,
           "requires": {
-            "commondir": "^1.0.1",
-            "make-dir": "^2.0.0",
-            "pkg-dir": "^3.0.0"
+            "chownr": "^1.1.2",
+            "figgy-pudding": "^3.5.1",
+            "fs-minipass": "^2.0.0",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.2.2",
+            "infer-owner": "^1.0.4",
+            "lru-cache": "^5.1.1",
+            "minipass": "^3.0.0",
+            "minipass-collect": "^1.0.2",
+            "minipass-flush": "^1.0.5",
+            "minipass-pipeline": "^1.2.2",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "p-map": "^3.0.0",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.7.1",
+            "ssri": "^7.0.0",
+            "unique-filename": "^1.1.1"
+          }
+        },
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
+          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
           }
         },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        },
+        "ssri": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-7.1.0.tgz",
+          "integrity": "sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g==",
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1",
+            "minipass": "^3.1.1"
+          }
         }
       }
     },
@@ -14880,9 +17132,9 @@
       }
     },
     "thunky": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
-      "integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
       "dev": true
     },
     "time-stamp": {
@@ -14900,6 +17152,12 @@
         "setimmediate": "^1.0.4"
       }
     },
+    "timsort": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
+      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
+      "dev": true
+    },
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -14932,9 +17190,9 @@
       "dev": true
     },
     "to-fast-properties": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
       "dev": true
     },
     "to-object-path": {
@@ -15001,76 +17259,43 @@
       "dev": true
     },
     "tough-cookie": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
       "dev": true,
       "requires": {
-        "psl": "^1.1.24",
-        "punycode": "^1.4.1"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
-        }
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
       }
     },
     "tree-kill": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
-      "integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==",
-      "dev": true
-    },
-    "trim-right": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
       "dev": true
     },
     "ts-md5": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.2.6.tgz",
-      "integrity": "sha512-VFW6O4CTZsgTPDBhF31i83hPhfwd9Dcp5RnbfGOIJPDRro9IhvXMYd8xBycD0yXqHZiAvv+iDG8F+UFrPEyQ5w=="
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/ts-md5/-/ts-md5-1.2.7.tgz",
+      "integrity": "sha512-emODogvKGWi1KO1l9c6YxLMBn6CEH3VrH5mVPIyOtxBG52BvV4jP3GWz6bOZCz61nLgBc3ffQYE4+EHfCD+V7w=="
     },
     "ts-node": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.4.1.tgz",
-      "integrity": "sha512-5LpRN+mTiCs7lI5EtbXmF/HfMeCjzt7DH9CZwtkr6SywStrNQC723wG+aOWFiLNn7zT3kD/RnFqi3ZUfr4l5Qw==",
+      "version": "8.8.2",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.8.2.tgz",
+      "integrity": "sha512-duVj6BpSpUpD/oM4MfhO98ozgkp3Gt9qIp3jGxwU2DFvl/3IRaEAvbLa8G60uS7C77457e/m5TMowjedeRxI1Q==",
       "dev": true,
       "requires": {
         "arg": "^4.1.0",
         "diff": "^4.0.1",
         "make-error": "^1.1.1",
         "source-map-support": "^0.5.6",
-        "yn": "^3.0.0"
-      }
-    },
-    "tsickle": {
-      "version": "0.37.0",
-      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.37.0.tgz",
-      "integrity": "sha512-ufUZqLUNqh+kOfr52N/hJ5JbiDO32/CO7ZCteZBX9HA2kiejwEgDaJeJe1GAj2TIu683IgTA/LPKvlns6Liw0w==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.0",
-        "mkdirp": "^0.5.1",
-        "source-map": "^0.7.3"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
-        }
+        "yn": "3.1.1"
       }
     },
     "tslib": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
+      "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA=="
     },
     "tslint": {
       "version": "6.1.1",
@@ -15162,9 +17387,9 @@
       }
     },
     "type-fest": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz",
-      "integrity": "sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw==",
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
       "dev": true
     },
     "type-is": {
@@ -15183,10 +17408,19 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
+    "typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "dev": true,
+      "requires": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
     "typescript": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz",
-      "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==",
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz",
+      "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==",
       "dev": true
     },
     "uglify-js": {
@@ -15267,15 +17501,15 @@
       }
     },
     "unicode-match-property-value-ecmascript": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz",
-      "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
+      "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==",
       "dev": true
     },
     "unicode-property-aliases-ecmascript": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz",
-      "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
+      "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
       "dev": true
     },
     "union-value": {
@@ -15290,6 +17524,18 @@
         "set-value": "^2.0.1"
       }
     },
+    "uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+      "dev": true
+    },
+    "uniqs": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
+      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
+      "dev": true
+    },
     "unique-filename": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
@@ -15319,12 +17565,12 @@
       }
     },
     "unique-string": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
-      "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
+      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
       "dev": true,
       "requires": {
-        "crypto-random-string": "^1.0.0"
+        "crypto-random-string": "^2.0.0"
       }
     },
     "universal-analytics": {
@@ -15367,6 +17613,12 @@
       "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
       "dev": true
     },
+    "unquote": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
+      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
+      "dev": true
+    },
     "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -15414,30 +17666,82 @@
       "dev": true
     },
     "update-notifier": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-3.0.1.tgz",
-      "integrity": "sha512-grrmrB6Zb8DUiyDIaeRTBCkgISYUgETNe7NglEbVsrLWXeESnlCSP50WfRSj/GmzMPl6Uchj24S/p80nP/ZQrQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.0.tgz",
+      "integrity": "sha512-w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew==",
       "dev": true,
       "requires": {
-        "boxen": "^3.0.0",
-        "chalk": "^2.0.1",
-        "configstore": "^4.0.0",
+        "boxen": "^4.2.0",
+        "chalk": "^3.0.0",
+        "configstore": "^5.0.1",
         "has-yarn": "^2.1.0",
         "import-lazy": "^2.1.0",
         "is-ci": "^2.0.0",
-        "is-installed-globally": "^0.1.0",
-        "is-npm": "^3.0.0",
+        "is-installed-globally": "^0.3.1",
+        "is-npm": "^4.0.0",
         "is-yarn-global": "^0.3.0",
         "latest-version": "^5.0.0",
-        "semver-diff": "^2.0.0",
-        "xdg-basedir": "^3.0.0"
+        "pupa": "^2.0.1",
+        "semver-diff": "^3.1.1",
+        "xdg-basedir": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "dev": true,
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "uri-js": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
       "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -15575,13 +17879,96 @@
       }
     },
     "util.promisify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
+      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.2",
+        "has-symbols": "^1.0.1",
+        "object.getownpropertydescriptors": "^2.1.0"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.5",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+          "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.1.5",
+            "is-regex": "^1.0.5",
+            "object-inspect": "^1.7.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.0",
+            "string.prototype.trimleft": "^2.1.1",
+            "string.prototype.trimright": "^2.1.1"
+          }
+        },
+        "es-to-primitive": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+          "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+          "dev": true,
+          "requires": {
+            "is-callable": "^1.1.4",
+            "is-date-object": "^1.0.1",
+            "is-symbol": "^1.0.2"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+          "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+          "dev": true
+        },
+        "is-callable": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
+          "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
+          "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+          "dev": true,
+          "requires": {
+            "has": "^1.0.3"
+          }
+        },
+        "object-inspect": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
+          "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
+          "dev": true
+        },
+        "string.prototype.trimleft": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz",
+          "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==",
+          "dev": true,
+          "requires": {
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.17.5",
+            "string.prototype.trimstart": "^1.0.0"
+          }
+        },
+        "string.prototype.trimright": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz",
+          "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==",
+          "dev": true,
+          "requires": {
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.17.5",
+            "string.prototype.trimend": "^1.0.0"
+          }
+        }
       }
     },
     "utils-merge": {
@@ -15636,6 +18023,12 @@
       "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
       "dev": true
     },
+    "vendors": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
+      "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==",
+      "dev": true
+    },
     "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
@@ -15710,9 +18103,9 @@
       }
     },
     "vm-browserify": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz",
-      "integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
       "dev": true
     },
     "void-elements": {
@@ -15722,14 +18115,42 @@
       "dev": true
     },
     "watchpack": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
-      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz",
+      "integrity": "sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==",
       "dev": true,
       "requires": {
-        "chokidar": "^2.0.2",
+        "chokidar": "^2.1.8",
         "graceful-fs": "^4.1.2",
         "neo-async": "^2.5.0"
+      },
+      "dependencies": {
+        "chokidar": {
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "dev": true,
+          "requires": {
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
+          }
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        }
       }
     },
     "wbuf": {
@@ -15741,6 +18162,15 @@
         "minimalistic-assert": "^1.0.0"
       }
     },
+    "wcwidth": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
+      "dev": true,
+      "requires": {
+        "defaults": "^1.0.3"
+      }
+    },
     "web-animations-js": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.2.tgz",
@@ -15757,9 +18187,9 @@
       }
     },
     "webpack": {
-      "version": "4.39.2",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.39.2.tgz",
-      "integrity": "sha512-AKgTfz3xPSsEibH00JfZ9sHXGUwIQ6eZ9tLN8+VLzachk1Cw2LVmy+4R7ZiwTa9cZZ15tzySjeMui/UnSCAZhA==",
+      "version": "4.42.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz",
+      "integrity": "sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w==",
       "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
@@ -15782,70 +18212,169 @@
         "node-libs-browser": "^2.2.1",
         "schema-utils": "^1.0.0",
         "tapable": "^1.1.3",
-        "terser-webpack-plugin": "^1.4.1",
+        "terser-webpack-plugin": "^1.4.3",
         "watchpack": "^1.6.0",
         "webpack-sources": "^1.4.1"
       },
       "dependencies": {
         "acorn": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
-          "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==",
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+          "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
           "dev": true
         },
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+        "cacache": {
+          "version": "12.0.4",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+          "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
+            "bluebird": "^3.5.5",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.1.15",
+            "infer-owner": "^1.0.3",
+            "lru-cache": "^5.1.1",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.6.3",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
+            "y18n": "^4.0.0"
           }
-        }
-      }
-    },
-    "webpack-core": {
-      "version": "0.6.9",
-      "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
-      "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
-      "dev": true,
-      "requires": {
-        "source-list-map": "~0.1.7",
-        "source-map": "~0.4.1"
-      },
-      "dependencies": {
-        "source-list-map": {
-          "version": "0.1.8",
-          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
-          "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
+        },
+        "find-cache-dir": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+          "dev": true,
+          "requires": {
+            "commondir": "^1.0.1",
+            "make-dir": "^2.0.0",
+            "pkg-dir": "^3.0.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "is-wsl": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+          "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
           "dev": true
         },
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        },
+        "memory-fs": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+          "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+          "dev": true,
+          "requires": {
+            "errno": "^0.1.3",
+            "readable-stream": "^2.0.1"
+          }
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        },
         "source-map": {
-          "version": "0.4.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
-          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "ssri": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
           "dev": true,
           "requires": {
-            "amdefine": ">=0.0.4"
+            "figgy-pudding": "^3.5.1"
+          }
+        },
+        "terser-webpack-plugin": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz",
+          "integrity": "sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==",
+          "dev": true,
+          "requires": {
+            "cacache": "^12.0.2",
+            "find-cache-dir": "^2.1.0",
+            "is-wsl": "^1.1.0",
+            "schema-utils": "^1.0.0",
+            "serialize-javascript": "^2.1.2",
+            "source-map": "^0.6.1",
+            "terser": "^4.1.2",
+            "webpack-sources": "^1.4.0",
+            "worker-farm": "^1.7.0"
           }
         }
       }
     },
     "webpack-dev-middleware": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz",
-      "integrity": "sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==",
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz",
+      "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==",
       "dev": true,
       "requires": {
         "memory-fs": "^0.4.1",
-        "mime": "^2.4.2",
+        "mime": "^2.4.4",
+        "mkdirp": "^0.5.1",
         "range-parser": "^1.2.1",
         "webpack-log": "^2.0.0"
       },
       "dependencies": {
+        "memory-fs": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+          "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+          "dev": true,
+          "requires": {
+            "errno": "^0.1.3",
+            "readable-stream": "^2.0.1"
+          }
+        },
         "mime": {
           "version": "2.4.4",
           "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
@@ -15855,41 +18384,41 @@
       }
     },
     "webpack-dev-server": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.8.0.tgz",
-      "integrity": "sha512-Hs8K9yI6pyMvGkaPTeTonhD6JXVsigXDApYk9JLW4M7viVBspQvb1WdAcWxqtmttxNW4zf2UFLsLNe0y87pIGQ==",
+      "version": "3.10.3",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz",
+      "integrity": "sha512-e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ==",
       "dev": true,
       "requires": {
         "ansi-html": "0.0.7",
         "bonjour": "^3.5.0",
-        "chokidar": "^2.1.6",
+        "chokidar": "^2.1.8",
         "compression": "^1.7.4",
         "connect-history-api-fallback": "^1.6.0",
         "debug": "^4.1.1",
         "del": "^4.1.1",
         "express": "^4.17.1",
         "html-entities": "^1.2.1",
-        "http-proxy-middleware": "^0.19.1",
+        "http-proxy-middleware": "0.19.1",
         "import-local": "^2.0.0",
         "internal-ip": "^4.3.0",
         "ip": "^1.1.5",
-        "is-absolute-url": "^3.0.0",
+        "is-absolute-url": "^3.0.3",
         "killable": "^1.0.1",
-        "loglevel": "^1.6.3",
+        "loglevel": "^1.6.6",
         "opn": "^5.5.0",
         "p-retry": "^3.0.1",
-        "portfinder": "^1.0.21",
+        "portfinder": "^1.0.25",
         "schema-utils": "^1.0.0",
-        "selfsigned": "^1.10.4",
+        "selfsigned": "^1.10.7",
         "semver": "^6.3.0",
         "serve-index": "^1.9.1",
         "sockjs": "0.3.19",
-        "sockjs-client": "1.3.0",
+        "sockjs-client": "1.4.0",
         "spdy": "^4.0.1",
         "strip-ansi": "^3.0.1",
         "supports-color": "^6.1.0",
         "url": "^0.11.0",
-        "webpack-dev-middleware": "^3.7.0",
+        "webpack-dev-middleware": "^3.7.2",
         "webpack-log": "^2.0.0",
         "ws": "^6.2.1",
         "yargs": "12.0.5"
@@ -15952,12 +18481,27 @@
             "ms": "^2.1.1"
           }
         },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
         "invert-kv": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
           "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
           "dev": true
         },
+        "is-absolute-url": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
+          "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
+          "dev": true
+        },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
@@ -15973,6 +18517,16 @@
             "invert-kv": "^2.0.0"
           }
         },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
         "mem": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
@@ -16007,6 +18561,41 @@
             "mem": "^4.0.0"
           }
         },
+        "p-limit": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
+          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -16083,12 +18672,12 @@
       }
     },
     "webpack-merge": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz",
-      "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
+      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.5"
+        "lodash": "^4.17.15"
       }
     },
     "webpack-sources": {
@@ -16110,12 +18699,12 @@
       }
     },
     "webpack-subresource-integrity": {
-      "version": "1.1.0-rc.6",
-      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz",
-      "integrity": "sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.4.0.tgz",
+      "integrity": "sha512-GB1kB/LwAWC3CxwcedGhMkxGpNZxSheCe1q+KJP1bakuieAdX/rGHEcf5zsEzhKXpqsGqokgsDoD9dIkr61VDQ==",
       "dev": true,
       "requires": {
-        "webpack-core": "^0.6.8"
+        "webpack-sources": "^1.3.0"
       }
     },
     "websocket-driver": {
@@ -16157,43 +18746,44 @@
       "dev": true
     },
     "widest-line": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz",
-      "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
+      "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
       "dev": true,
       "requires": {
-        "string-width": "^2.1.1"
+        "string-width": "^4.0.0"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
         },
         "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
           "dev": true
         },
         "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
           "dev": true,
           "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
           }
         },
         "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "ansi-regex": "^5.0.0"
           }
         }
       }
@@ -16214,12 +18804,34 @@
       }
     },
     "worker-plugin": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-3.2.0.tgz",
-      "integrity": "sha512-W5nRkw7+HlbsEt3qRP6MczwDDISjiRj2GYt9+bpe8A2La00TmJdwzG5bpdMXhRt1qcWmwAvl1TiKaHRa+XDS9Q==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-4.0.2.tgz",
+      "integrity": "sha512-V+1zSZMOOKk+uBzKyNIODLQLsx59zSIOaI75J1EMS0iR1qy+KQR3y/pQ3T0vIhvPfDFapGRMsoMvQNEL3okqSA==",
       "dev": true,
       "requires": {
         "loader-utils": "^1.1.0"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        }
       }
     },
     "wrap-ansi": {
@@ -16248,14 +18860,15 @@
       }
     },
     "write-file-atomic": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
-      "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.11",
         "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.2"
+        "is-typedarray": "^1.0.0",
+        "signal-exit": "^3.0.2",
+        "typedarray-to-buffer": "^3.1.5"
       }
     },
     "ws": {
@@ -16268,9 +18881,9 @@
       }
     },
     "xdg-basedir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
-      "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
+      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
       "dev": true
     },
     "xhr2": {
@@ -16279,22 +18892,13 @@
       "integrity": "sha1-f4dliEdxbbUCYyOBL4GMras4el8="
     },
     "xml2js": {
-      "version": "0.4.22",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.22.tgz",
-      "integrity": "sha512-MWTbxAQqclRSTnehWWe5nMKzI3VmJ8ltiJEco8akcC6j3miOhjjfzKum5sId+CWhfxdOs/1xauYr8/ZDBtQiRw==",
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
       "dev": true,
       "requires": {
         "sax": ">=0.6.0",
-        "util.promisify": "~1.0.0",
         "xmlbuilder": "~11.0.0"
-      },
-      "dependencies": {
-        "sax": {
-          "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-          "dev": true
-        }
       }
     },
     "xmlbuilder": {
@@ -16303,11 +18907,6 @@
       "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
       "dev": true
     },
-    "xmlhttprequest": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
-      "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw="
-    },
     "xmlhttprequest-ssl": {
       "version": "1.5.5",
       "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
@@ -16321,9 +18920,9 @@
       "dev": true
     },
     "xterm": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xterm/-/xterm-4.0.2.tgz",
-      "integrity": "sha512-NIr11b6C782TZznU8e6K/IMfmwlWMWRI6ba9GEDG9uX25SadkpjoMnzvxOS0Z/15sfrbn0rghPiarGDmmP0uhQ=="
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/xterm/-/xterm-4.4.0.tgz",
+      "integrity": "sha512-JGIpigWM3EBWvnS3rtBuefkiToIILSK1HYMXy4BCsUpO+O4UeeV+/U1AdAXgCB6qJrnPNb7yLgBsVCQUNMteig=="
     },
     "xterm-addon-fit": {
       "version": "0.3.0",
@@ -16346,9 +18945,9 @@
       "dev": true
     },
     "yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true
     },
     "yargs": {
@@ -16425,9 +19024,9 @@
       "dev": true
     },
     "zone.js": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.2.tgz",
-      "integrity": "sha512-UAYfiuvxLN4oyuqhJwd21Uxb4CNawrq6fPS/05Su5L4G+1TN+HVDJMUHNMobVQDFJRir2cLAODXwluaOKB7HFg=="
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz",
+      "integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg=="
     }
   }
 }
diff --git a/package.json b/package.json
index b61afba2d8..9ce08c3ea2 100644
--- a/package.json
+++ b/package.json
@@ -46,47 +46,47 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "@angular/animations": "^8.2.9",
-    "@angular/cdk": "^8.2.2",
-    "@angular/common": "^8.2.9",
-    "@angular/compiler": "^8.2.9",
-    "@angular/core": "^8.2.9",
+    "@angular/animations": "^9.1.0",
+    "@angular/cdk": "^9.2.0",
+    "@angular/common": "^9.1.0",
+    "@angular/compiler": "^9.1.0",
+    "@angular/core": "^9.1.0",
     "@angular/flex-layout": "^9.0.0-beta.29",
-    "@angular/forms": "^8.2.9",
-    "@angular/material": "^8.2.2",
-    "@angular/material-moment-adapter": "^8.2.2",
-    "@angular/platform-browser": "^8.2.9",
-    "@angular/platform-browser-dynamic": "^8.2.9",
-    "@angular/platform-server": "^8.2.9",
-    "@angular/router": "^8.2.9",
-    "@ngrx/effects": "^8.3.0",
-    "@ngrx/router-store": "^8.3.0",
-    "@ngrx/store": "^8.3.0",
-    "@ngrx/store-devtools": "^8.3.0",
-    "@swimlane/ngx-charts": "^12.0.1",
-    "@types/moment-timezone": "^0.5.12",
-    "@types/marked": "^0.6.5",
+    "@angular/forms": "^9.1.0",
+    "@angular/material": "^9.2.0",
+    "@angular/material-moment-adapter": "^9.2.0",
+    "@angular/platform-browser": "^9.1.0",
+    "@angular/platform-browser-dynamic": "^9.1.0",
+    "@angular/platform-server": "^9.1.0",
+    "@angular/router": "^9.1.0",
+    "@ngrx/effects": "^9.0.0",
+    "@ngrx/router-store": "^9.0.0",
+    "@ngrx/store": "^9.0.0",
+    "@ngrx/store-devtools": "^9.0.0",
+    "@swimlane/ngx-charts": "^13.0.2",
+    "@types/moment-timezone": "^0.5.13",
+    "@types/marked": "^0.7.3",
     "angular2-virtual-scroll": "^0.4.16",
-    "core-js": "^3.2.1",
-    "hammerjs": "^2.0.8",
-    "immer": "^4.0.0",
+    "core-js": "^3.6.4",
+    "immer": "^6.0.3",
     "lodash-es": "^4.17.14",
     "mappy-breakpoints": "^0.2.3",
-    "marked": "^0.7.0",
+    "marked": "^0.8.2",
     "intersect": "^1.0.1",
     "moment": "^2.24.0",
-    "moment-timezone": "^0.5.12",
-    "ngrx-store-localstorage": "8.0.0",
-    "ngx-moment": "^3.3.0",
-    "normalizr": "^3.2.3",
+    "moment-timezone": "^0.5.28",
+    "ngrx-store-localstorage": "9.0.0",
+    "ngx-moment": "^3.5.0",
+    "normalizr": "^3.6.0",
     "reselect": "^4.0.0",
-    "rxjs": "^6.2.0",
+    "rxjs": "^6.5.5",
     "rxjs-spy": "^7.0.2",
-    "rxjs-websockets": "~8.0.0",
-    "stratos-angular6-json-schema-form": "nwmac/ajsf",
-    "ts-md5": "^1.2.4",
+    "rxjs-websockets": "~8.0.1",
+    "@nwmac/ajsf-material": "^0.1.4",
+    "ts-md5": "^1.2.7",
+    "tslib": "^1.10.0",
     "web-animations-js": "^2.3.2",
-    "xterm": "^4.0.2",
+    "xterm": "^4.4.0",
     "xterm-addon-fit": "^0.3.0",
     "zone.js": "~0.10.2"
   },
@@ -94,57 +94,55 @@
     "node": "12.13.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.803.7",
-    "@angular-devkit/build-ng-packagr": "~0.803.7",
-    "@angular-devkit/schematics": "^8.3.7",
-    "@angular/cli": "^8.3.7",
-    "@angular/compiler-cli": "^8.2.9",
-    "@angular/language-service": "^8.2.9",
-    "@types/jasmine": "^3.4.2",
+    "@angular-devkit/build-angular": "~0.901.0",
+    "@angular-devkit/build-ng-packagr": "~0.901.0",
+    "@angular-devkit/schematics": "^9.1.0",
+    "@angular/cli": "^9.1.0",
+    "@angular/compiler-cli": "^9.1.0",
+    "@angular/language-service": "^9.1.0",
+    "@types/jasmine": "^3.5.10",
     "@types/jasminewd2": "~2.0.8",
-    "@types/karma": "^3.0.2",
-    "@types/node": "^12.7.9",
-    "@types/request": "^2.48.1",
+    "@types/karma": "^4.4.1",
+    "@types/node": "^12.11.1",
+    "@types/request": "^2.48.4",
     "acorn": "^7.1.1",
-    "browserstack-local": "^1.4.0",
+    "browserstack-local": "^1.4.5",
     "codecov": "^3.6.5",
-    "codelyzer": "^5.2.0",
+    "codelyzer": "^5.1.2",
     "delete": "^1.1.0",
-    "fs-extra": "^8.1.0",
-    "globby": "^10.0.1",
+    "fs-extra": "^9.0.0",
+    "globby": "^11.0.0",
     "gulp": "^4.0.2",
-    "gulp-zip": "^5.0.0",
+    "gulp-zip": "^5.0.1",
     "istanbul": "^0.4.5",
-    "istanbul-api": "1.2.2",
-    "istanbul-reports": "1.1.4",
+    "istanbul-api": "2.1.6",
+    "istanbul-reports": "3.0.2",
     "jasmine-core": "~3.5.0",
-    "jasmine-spec-reporter": "~4.2.1",
+    "jasmine-spec-reporter": "~5.0.1",
     "js-yaml": "~3.13.1",
-    "karma": "~4.3.0",
+    "karma": "~4.4.1",
     "karma-chrome-launcher": "~3.1.0",
     "karma-cli": "~2.0.0",
-    "karma-coverage-istanbul-reporter": "^2.0.1",
-    "karma-jasmine": "~2.0.1",
-    "karma-jasmine-html-reporter": "^1.4.0",
+    "karma-coverage-istanbul-reporter": "^2.1.1",
+    "karma-jasmine": "~3.1.1",
+    "karma-jasmine-html-reporter": "^1.5.3",
     "karma-spec-reporter": "0.0.32",
     "lodash": "^4.17.13",
-    "mem": "5.1.1",
+    "mem": "6.0.1",
     "mktemp": "^1.0.0",
-    "ng-packagr": "^5.4.0",
+    "ng-packagr": "^9.0.0",
     "npm-run-all": "^4.1.5",
-    "protractor": "^5.4.2",
+    "protractor": "^5.4.3",
     "ps-node": "^0.1.6",
     "q": "^1.4.1",
-    "replace-in-file": "^4.1.3",
-    "request": "^2.88.0",
-    "request-promise-native": "^1.0.7",
+    "replace-in-file": "^5.0.2",
+    "request": "^2.88.2",
+    "request-promise-native": "^1.0.8",
     "rxjs-tslint": "^0.1.7",
     "sass-lint": "^1.12.1",
     "stratos-protractor-reporter": "^1.2.3",
-    "ts-node": "~8.4.1",
-    "tsickle": "^0.37.0",
-    "tslib": "^1.9.0",
+    "ts-node": "~8.8.2",
     "tslint": "~6.1.1",
-    "typescript": "<3.6.0"
+    "typescript": "3.8.3"
   }
 }
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.ts b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.ts
index 24fa63f843..2dc9dc7c7b 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.ts
@@ -17,7 +17,7 @@ import { AppAutoscalerPolicyLocal } from '../../store/app-autoscaler.types';
 })
 export class CardAutoscalerDefaultComponent implements OnInit {
 
-  @ViewChild('instanceField', { static: false }) instanceField: ElementRef;
+  @ViewChild('instanceField') instanceField: ElementRef;
 
   constructor(
     public appService: ApplicationService,
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts
index 776886571c..f7e5a8b01f 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-chart.component.ts
@@ -27,7 +27,7 @@ import { curveLinear } from 'd3-shape';
 })
 export class AppAutoscalerComboChartComponent extends BaseChartComponent {
 
-  @ViewChild(LineSeriesComponent, { static: false }) lineSeriesComponent: LineSeriesComponent;
+  @ViewChild(LineSeriesComponent) lineSeriesComponent: LineSeriesComponent;
 
   @Input() curve: any = curveLinear;
   @Input() legend = false;
diff --git a/src/frontend/packages/cf-autoscaler/tsconfig.lib.prod.json b/src/frontend/packages/cf-autoscaler/tsconfig.lib.prod.json
new file mode 100644
index 0000000000..b1d501abbc
--- /dev/null
+++ b/src/frontend/packages/cf-autoscaler/tsconfig.lib.prod.json
@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig.lib.json",
+  "angularCompilerOptions": {
+    "enableIvy": false
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component.ts
index 866fdf61f7..e4226d87c0 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component.ts
@@ -30,7 +30,7 @@ export class LogStreamTabComponent implements OnInit {
   private connectionStatusSubject = new Subject<number>();
   public connectionStatus: Observable<number>;
 
-  @ViewChild('searchFilter', { static: false }) searchFilter: NgModel;
+  @ViewChild('searchFilter') searchFilter: NgModel;
 
   filter;
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.ts
index 5ed53069a7..418d485bbf 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.ts
@@ -123,7 +123,7 @@ export class DeployApplicationStep2Component
   @ViewChild('sourceSelectionForm', { static: true }) sourceSelectionForm: NgForm;
   subscriptions: Array<Subscription> = [];
 
-  @ViewChild('fsChooser', { static: false }) fsChooser;
+  @ViewChild('fsChooser') fsChooser;
 
   public selectedSourceType: SourceType = null;
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.ts
index d9f8b8ce43..62d4b84115 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.ts
@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { MatSnackBar } from '@angular/material';
+import { MatSnackBar } from '@angular/material/snack-bar';
 import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
 import { filter, first, map, pairwise, startWith, tap } from 'rxjs/operators';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.ts
index 3080140c03..5fbcc666f4 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { MatRadioChange } from '@angular/material';
+import { MatRadioChange } from '@angular/material/radio';
 import { Store } from '@ngrx/store';
 import { BehaviorSubject, combineLatest, Observable, of } from 'rxjs';
 import { first, map, publishReplay, refCount, startWith, switchMap, take, tap } from 'rxjs/operators';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.spec.ts
index 2ed822d223..972c915d01 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.spec.ts
@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { MaterialDesignFrameworkModule } from 'stratos-angular6-json-schema-form';
+import { MaterialDesignFrameworkModule } from '@nwmac/ajsf-material';
 
 import {
   AppNameUniqueDirective,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/bind-apps-step/bind-apps-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/bind-apps-step/bind-apps-step.component.spec.ts
index 022c3db64a..1b88f8916c 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/bind-apps-step/bind-apps-step.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/bind-apps-step/bind-apps-step.component.spec.ts
@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { MaterialDesignFrameworkModule } from 'stratos-angular6-json-schema-form';
+import { MaterialDesignFrameworkModule } from '@nwmac/ajsf-material';
 
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.spec.ts
index 2f022f71c7..081f0b26e0 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.spec.ts
@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { MaterialDesignFrameworkModule } from 'stratos-angular6-json-schema-form';
+import { MaterialDesignFrameworkModule } from '@nwmac/ajsf-material';
 
 import { EntityMonitorFactory } from '../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts b/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
index 197aca9173..74063bbeb7 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { ApplicationModule, NgModule, Type } from '@angular/core';
-import { MaterialDesignFrameworkModule } from 'stratos-angular6-json-schema-form';
+import { MaterialDesignFrameworkModule } from '@nwmac/ajsf-material';
 
 import { CoreModule } from '../../../../core/src/core/core.module';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/event-metadata/event-metadata.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/event-metadata/event-metadata.component.ts
index 276baed544..004d469c97 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/event-metadata/event-metadata.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/event-metadata/event-metadata.component.ts
@@ -1,5 +1,5 @@
 import { Component, Inject, Input, OnInit, Optional } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialog } from '@angular/material';
+import { MAT_DIALOG_DATA, MatDialog } from '@angular/material/dialog';
 
 @Component({
   selector: 'app-event-metadata',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-permission-cell.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-permission-cell.ts
index 766069ffca..8708f3cb6b 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-permission-cell.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-permission-cell.ts
@@ -1,4 +1,4 @@
-import { Input } from '@angular/core';
+import { Input, Directive } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
 import { filter, first, map, switchMap } from 'rxjs/operators';
@@ -27,6 +27,7 @@ export interface ICellPermissionList<T> extends IUserRole<T> {
   spaceGuid?: string;
 }
 
+@Directive()
 export abstract class CfPermissionCell<T> extends TableCellCustom<APIResource<CfUser>> {
   userEntity: BehaviorSubject<CfUser> = new BehaviorSubject(null);
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.spec.ts
index 0a9036194e..c9849036a7 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.spec.ts
@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { MaterialDesignFrameworkModule } from 'stratos-angular6-json-schema-form';
+import { MaterialDesignFrameworkModule } from '@nwmac/ajsf-material';
 
 import { generateCfBaseTestModulesNoShared } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { SchemaFormComponent } from './schema-form.component';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.ts
index 296555d433..7020c83d18 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.ts
@@ -3,7 +3,7 @@ import { FormControl, FormGroup } from '@angular/forms';
 import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material/core';
 import { BehaviorSubject, Subscription } from 'rxjs';
 import { delay } from 'rxjs/operators';
-import { JsonPointer } from 'stratos-angular6-json-schema-form';
+import { JsonPointer } from '@nwmac/ajsf-material';
 
 import { safeStringToObj } from '../../../../../core/src/core/utils.service';
 import { isValidJsonValidator } from '../../../../../core/src/shared/form-validators';
diff --git a/src/frontend/packages/cloud-foundry/tsconfig.lib.prod.json b/src/frontend/packages/cloud-foundry/tsconfig.lib.prod.json
new file mode 100644
index 0000000000..b1d501abbc
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/tsconfig.lib.prod.json
@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig.lib.json",
+  "angularCompilerOptions": {
+    "enableIvy": false
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/app.module.ts b/src/frontend/packages/core/src/app.module.ts
index bfeef7669a..ccb6f826d9 100644
--- a/src/frontend/packages/core/src/app.module.ts
+++ b/src/frontend/packages/core/src/app.module.ts
@@ -1,8 +1,8 @@
-import { NgModule } from '@angular/core';
+import { NgModule, Injectable } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { Params, RouteReuseStrategy, RouterStateSnapshot } from '@angular/router';
-import { RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router-store';
+import { RouterStateSerializer, StoreRouterConnectingModule, DefaultRouterStateSerializer } from '@ngrx/router-store';
 import { Store } from '@ngrx/store';
 import { debounceTime, filter, withLatestFrom } from 'rxjs/operators';
 
@@ -59,6 +59,7 @@ export interface RouterStateUrl {
   params: Params;
   queryParams: Params;
 }
+@Injectable()
 export class CustomRouterStateSerializer
   implements RouterStateSerializer<RouterStateUrl> {
   serialize(routerState: RouterStateSnapshot): RouterStateUrl {
@@ -99,7 +100,7 @@ export class CustomRouterStateSerializer
     LoginModule,
     HomeModule,
     DashboardModule,
-    StoreRouterConnectingModule.forRoot(), // Create action for router navigation
+    StoreRouterConnectingModule.forRoot({ serializer: DefaultRouterStateSerializer }), // Create action for router navigation
     AboutModule,
     CustomImportModule,
     XSRFModule,
diff --git a/src/frontend/packages/core/src/core/md.module.ts b/src/frontend/packages/core/src/core/md.module.ts
index e7d83f0e50..0e401fd3a8 100644
--- a/src/frontend/packages/core/src/core/md.module.ts
+++ b/src/frontend/packages/core/src/core/md.module.ts
@@ -1,4 +1,4 @@
-import 'hammerjs';
+
 
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts b/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts
index 5bb4a1ef34..fd580a6b16 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts
+++ b/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts
@@ -42,7 +42,7 @@ export class EditQuotaStepComponent implements OnDestroy {
   quotaSubscription: Subscription;
   quota: IQuotaDefinition;
 
-  @ViewChild('form', { static: false })
+  @ViewChild('form')
   form: QuotaDefinitionFormComponent;
 
   constructor(
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts b/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
index cd832da790..0a4862894d 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
+++ b/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
@@ -38,7 +38,7 @@ export class EditSpaceQuotaStepComponent implements OnDestroy {
   spaceQuotaDefinition$: Observable<APIResource<IQuotaDefinition>>;
   quota: IQuotaDefinition;
 
-  @ViewChild('form', { static: false })
+  @ViewChild('form')
   form: SpaceQuotaDefinitionFormComponent;
 
   constructor(
diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts
index 91e4819fba..52489e46a3 100644
--- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts
+++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts
@@ -1,7 +1,7 @@
 import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
 import { Portal } from '@angular/cdk/portal';
 import { AfterViewInit, Component, NgZone, OnDestroy, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
-import { MatDrawer } from '@angular/material';
+import { MatDrawer } from '@angular/material/sidenav';
 import { ActivatedRoute, ActivatedRouteSnapshot, NavigationEnd, Route, Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog.service';
@@ -54,9 +54,9 @@ export class DashboardBaseComponent implements OnInit, OnDestroy, AfterViewInit
   sideNavTabs: SideNavItem[] = this.getNavigationRoutes();
   sideNaveMode = 'side';
 
-  @ViewChild('previewPanelContainer', { read: ViewContainerRef, static: false }) previewPanelContainer: ViewContainerRef;
+  @ViewChild('previewPanelContainer', { read: ViewContainerRef }) previewPanelContainer: ViewContainerRef;
 
-  @ViewChild('content', { static: false }) public content;
+  @ViewChild('content') public content;
 
   constructor(
     public pageHeaderService: PageHeaderService,
@@ -103,7 +103,7 @@ export class DashboardBaseComponent implements OnInit, OnDestroy, AfterViewInit
       .subscribe(isMobile => isMobile ? this.store.dispatch(new EnableMobileNav()) : this.store.dispatch(new DisableMobileNav()));
   }
 
-  @ViewChild('sidenav', { static: false }) set sidenav(drawer: MatDrawer) {
+  @ViewChild('sidenav') set sidenav(drawer: MatDrawer) {
     this.drawer = drawer;
     if (!this.closeSub) {
       // We need this for mobile to ensure the state is synced when the dashboard is closed by clicking on the backdrop.
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 ba2f90ec84..5f977037ae 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
@@ -42,11 +42,11 @@ export class CreateEndpointCfStep1Component implements IStepperStep, AfterConten
   @ViewChild('nameField', { static: true }) nameField: NgModel;
   @ViewChild('urlField', { static: true }) urlField: NgModel;
   @ViewChild('skipSllField', { static: true }) skipSllField: NgModel;
-  @ViewChild('ssoAllowedField', { static: false }) ssoAllowedField: NgModel;
+  @ViewChild('ssoAllowedField') ssoAllowedField: NgModel;
 
   // Optional Client ID and Client Secret
-  @ViewChild('clientIDField', { static: false }) clientIDField: NgModel;
-  @ViewChild('clientSecretField', { static: false }) clientSecretField: NgModel;
+  @ViewChild('clientIDField') clientIDField: NgModel;
+  @ViewChild('clientSecretField') clientSecretField: NgModel;
 
   urlValidation: string;
 
diff --git a/src/frontend/packages/core/src/route-reuse-stragegy.ts b/src/frontend/packages/core/src/route-reuse-stragegy.ts
index a82b053d35..d350557f57 100644
--- a/src/frontend/packages/core/src/route-reuse-stragegy.ts
+++ b/src/frontend/packages/core/src/route-reuse-stragegy.ts
@@ -2,8 +2,10 @@ import { ActivatedRouteSnapshot, DetachedRouteHandle, RouteReuseStrategy } from
 
 import { AppComponent } from './app.component';
 import { DashboardBaseComponent } from './features/dashboard/dashboard-base/dashboard-base.component';
+import { Injectable } from "@angular/core";
 
 
+@Injectable()
 export class CustomReuseStrategy extends RouteReuseStrategy {
   shouldDetach(route: ActivatedRouteSnapshot): boolean { return false; }
   store(route: ActivatedRouteSnapshot, detachedTree: DetachedRouteHandle): void { }
diff --git a/src/frontend/packages/core/src/shared/components/dialog-confirm/dialog-confirm.component.spec.ts b/src/frontend/packages/core/src/shared/components/dialog-confirm/dialog-confirm.component.spec.ts
index 34186fa3b8..64c2904cc1 100644
--- a/src/frontend/packages/core/src/shared/components/dialog-confirm/dialog-confirm.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/dialog-confirm/dialog-confirm.component.spec.ts
@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
 import { RequestInfoState } from '../../../../../store/src/reducers/api-request-reducer/types';
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/app-table-cell-default/app-table-cell-default.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/app-table-cell-default/app-table-cell-default.component.ts
index 883f11b3fe..979c260eb6 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/app-table-cell-default/app-table-cell-default.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/app-table-cell-default/app-table-cell-default.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, OnDestroy } from '@angular/core';
-import { Subscription } from 'rxjs';
+import { Subscription, Observable } from 'rxjs';
 
 import { objectHelper } from '../../../../../core/helper-classes/object.helpers';
 import { pathGet } from '../../../../../core/utils.service';
@@ -7,7 +7,6 @@ import { TableCellCustom } from '../../list.types';
 import { ICellDefinition } from '../table.types';
 
 @Component({
-  moduleId: module.id,
   selector: 'app-table-cell-default',
   templateUrl: 'app-table-cell-default.component.html',
   styleUrls: ['app-table-cell-default.component.scss']
@@ -43,7 +42,7 @@ export class TableCellDefaultComponent<T> extends TableCellCustom<T> implements
   public isExternalLink = false;
   public linkValue: string;
   public linkTarget = '_self';
-  public valueGenerator: (row: T, schemaKey?: string) => string;
+  public valueGenerator: (row: T, schemaKey?: string) => string | Observable<string>;
   public showShortLink = false;
 
   public init() {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-status.directive.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-status.directive.ts
index 1cdbabb6d8..d5e2509f1b 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-status.directive.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-status.directive.ts
@@ -1,4 +1,4 @@
-import { Directive, ElementRef, Input, OnChanges, SimpleChanges, Renderer, Renderer2 } from '@angular/core';
+import { Directive, ElementRef, Input, OnChanges, SimpleChanges, Renderer2 } from '@angular/core';
 
 @Directive({
   selector: '[appTableCellStatus]'
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 3e5313ddf1..91549ffc34 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
@@ -56,12 +56,12 @@ export class EndpointCardComponent extends CardCell<EndpointModel> implements On
 
   @Input() component: EndpointListDetailsComponent;
   private endpointDetails: ViewContainerRef;
-  @ViewChild('endpointDetails', { read: ViewContainerRef, static: false }) set content(content: ViewContainerRef) {
+  @ViewChild('endpointDetails', { read: ViewContainerRef }) set content(content: ViewContainerRef) {
     this.endpointDetails = content;
     this.updateInnerComponent();
   }
 
-  @ViewChild('copyToClipboard', { static: false }) copyToClipboard: CopyToClipboardComponent;
+  @ViewChild('copyToClipboard') copyToClipboard: CopyToClipboardComponent;
 
   private pRow: EndpointModel;
   @Input('row')
diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.ts b/src/frontend/packages/core/src/shared/components/list/list.component.ts
index ee00ac9187..8cd259d872 100644
--- a/src/frontend/packages/core/src/shared/components/list/list.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list.component.ts
@@ -118,7 +118,7 @@ export class ListComponent<T> implements OnInit, OnChanges, OnDestroy, AfterView
   pPaginator: MatPaginator;
   private filterString: string;
 
-  @ViewChild(MatPaginator, { static: false }) set setPaginator(paginator: MatPaginator) {
+  @ViewChild(MatPaginator) set setPaginator(paginator: MatPaginator) {
     if (!paginator || this.paginationWidgetToStore) {
       return;
     }
@@ -145,7 +145,7 @@ export class ListComponent<T> implements OnInit, OnChanges, OnDestroy, AfterView
     });
   }
 
-  @ViewChild('filter', { static: false }) set setFilter(filterValue: NgModel) {
+  @ViewChild('filter') set setFilter(filterValue: NgModel) {
     if (!filterValue || this.filterWidgetToStore) {
       return;
     }
diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.types.ts b/src/frontend/packages/core/src/shared/components/list/list.component.types.ts
index fb42367cfb..cf547290d9 100644
--- a/src/frontend/packages/core/src/shared/components/list/list.component.types.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list.component.types.ts
@@ -12,6 +12,7 @@ import { ListDataSource } from './data-sources-controllers/list-data-source';
 import { IListDataSource } from './data-sources-controllers/list-data-source-types';
 import { CardTypes } from './list-cards/card/card.component';
 import { ITableColumn, ITableText } from './list-table/table.types';
+import { Injectable } from "@angular/core";
 
 export enum ListViewTypes {
   CARD_ONLY = 'cardOnly',
@@ -142,6 +143,7 @@ export interface IListMultiFilterConfigItem {
 export const defaultPaginationPageSizeOptionsCards = [defaultClientPaginationPageSize, 30, 80];
 export const defaultPaginationPageSizeOptionsTable = [defaultClientPaginationPageSize, 20, 80];
 
+@Injectable()
 export class ListConfig<T> implements IListConfig<T> {
   isLocal = false;
   pageSizeOptions = defaultPaginationPageSizeOptionsCards;
diff --git a/src/frontend/packages/core/src/shared/components/no-content-message/no-content-message.component.ts b/src/frontend/packages/core/src/shared/components/no-content-message/no-content-message.component.ts
index dcb09ca95e..60b5e2992b 100644
--- a/src/frontend/packages/core/src/shared/components/no-content-message/no-content-message.component.ts
+++ b/src/frontend/packages/core/src/shared/components/no-content-message/no-content-message.component.ts
@@ -22,7 +22,7 @@ export class NoContentMessageComponent implements AfterViewInit {
 
   @Input() mode: string;
 
-  @ViewChild('toolBarLinkElement', {static: false}) toolBarLinkElement: ElementRef;
+  @ViewChild('toolBarLinkElement') toolBarLinkElement: ElementRef;
 
   constructor(private renderer: Renderer2) { }
 
diff --git a/src/frontend/packages/core/tsconfig.app.json b/src/frontend/packages/core/tsconfig.app.json
index 335a6a7b4a..4dbcf96be1 100644
--- a/src/frontend/packages/core/tsconfig.app.json
+++ b/src/frontend/packages/core/tsconfig.app.json
@@ -3,11 +3,11 @@
   "compilerOptions": {
     "outDir": "../../../../out-tsc"
   },
-  "exclude": [
-    "./src/test.ts",
-    "**/*.spec.ts",
-    "**/*.spec.helpers.ts",
-    "**/node_modules/**",
-    "./test-framework/**"
+  "files": [
+    "src/main.ts",
+    "src/polyfills.ts"
+  ],
+  "include": [
+    "src/frontend/packages/**/*.d.ts"
   ]
 }
diff --git a/src/frontend/packages/store/src/entity-catalog.module.ts b/src/frontend/packages/store/src/entity-catalog.module.ts
index ce1830c9af..dc10b701cb 100644
--- a/src/frontend/packages/store/src/entity-catalog.module.ts
+++ b/src/frontend/packages/store/src/entity-catalog.module.ts
@@ -31,7 +31,7 @@ export class EntityCatalogFeatureModule {
 export class EntityCatalogModule {
   // TODO: this does not allow for lazy loading, work out if we can allow this.
   // https://github.com/cloudfoundry-incubator/stratos/issues/3741
-  static forFeature(entityFactory: () => StratosBaseCatalogEntity[]): ModuleWithProviders {
+  static forFeature(entityFactory: () => StratosBaseCatalogEntity[]): ModuleWithProviders<EntityCatalogFeatureModule> {
     // Note - If you place any code here before `return` you get funky errors.
     return {
       ngModule: EntityCatalogFeatureModule,
diff --git a/src/frontend/packages/store/tsconfig.lib.prod.json b/src/frontend/packages/store/tsconfig.lib.prod.json
new file mode 100644
index 0000000000..b1d501abbc
--- /dev/null
+++ b/src/frontend/packages/store/tsconfig.lib.prod.json
@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig.lib.json",
+  "angularCompilerOptions": {
+    "enableIvy": false
+  }
+}
\ No newline at end of file

From adc0804ebb0bdf062a73042416119ca37c04b39e Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 7 Apr 2020 14:03:39 +0100
Subject: [PATCH 009/176] Fixes for angular 9 issues observed

---
 package-lock.json                             | 20 +++++++++----------
 package.json                                  |  4 ++--
 .../cli-info-cloud-foundry.component.ts       |  3 ++-
 .../schema-form/schema-form.component.ts      |  2 +-
 .../cloud-foundry/src/shared/q-param.ts       |  2 +-
 .../meta-card-base/meta-card.component.ts     |  4 +++-
 6 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7110fb959f..5b9abb4086 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1946,20 +1946,20 @@
       }
     },
     "@nwmac/ajsf-core": {
-      "version": "0.1.4",
-      "resolved": "https://npm.pkg.github.com/download/@nwmac/ajsf-core/0.1.4/69a42e983ece036d34fffc0d2e9e30568322dac1ad1e40aecc143ef6e50bc093",
-      "integrity": "sha512-9emicHjVD13Y3+7pix9EVJpiksjrAtTEC6j+IHCrNncZSGH+bLlvBHzbFQas+m9eIyCIgpcxkbxQZZQLtClSVA==",
+      "version": "0.1.5",
+      "resolved": "https://npm.pkg.github.com/download/@nwmac/ajsf-core/0.1.5/d423cd589ae903c35402220402097c9081224ea251dac22d17c284d677d5d75f",
+      "integrity": "sha512-5dvyatsVdgTC+2AK9wlnTcWyHHkJO+ovQlhysE7SkBUMoZDzUCr3NVvnsSAHLMKWxqmdffVMaLaqYNimVuNL8w==",
       "requires": {
         "ajv": "^6.10.0",
         "lodash-es": "^4.17.15"
       }
     },
     "@nwmac/ajsf-material": {
-      "version": "0.1.4",
-      "resolved": "https://npm.pkg.github.com/download/@nwmac/ajsf-material/0.1.4/2e339b3ba5be265afcce56bf2eaf266a4be454b2ac61b776ccbd664a7e21294d",
-      "integrity": "sha512-bpCwmN+C1Pd5pPieUVSTwrxBg4GNribmQFTMcDyloAvHGOzsS7aLcO9Q17uEajczspEoNqqoP1NY1BcJgP/UVg==",
+      "version": "0.1.5",
+      "resolved": "https://npm.pkg.github.com/download/@nwmac/ajsf-material/0.1.5/0581fd7f119119b7db9afbee92d7d5195dcd72fc5d29aad7374e6a63dfdb0263",
+      "integrity": "sha512-NtsmLpgOuMHjDgMRoL1lTQjH2SyunYBya+1hw4xnxlTK7Vw7FOzadfm1N2KeKgEjgB1vKM7nDC/BkBlpfgGVBg==",
       "requires": {
-        "@nwmac/ajsf-core": "~0.1.4",
+        "@nwmac/ajsf-core": "~0.1.5",
         "lodash-es": "^4.17.15"
       }
     },
@@ -2198,9 +2198,9 @@
       }
     },
     "@types/node": {
-      "version": "12.12.34",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.34.tgz",
-      "integrity": "sha512-BneGN0J9ke24lBRn44hVHNeDlrXRYF+VRp0HbSUNnEZahXGAysHZIqnf/hER6aabdBgzM4YOV4jrR8gj4Zfi0g==",
+      "version": "13.11.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.11.0.tgz",
+      "integrity": "sha512-uM4mnmsIIPK/yeO+42F2RQhGUIs39K2RFmugcJANppXe6J1nvH87PvzPZYpza7Xhhs8Yn9yIAVdLZ84z61+0xQ==",
       "dev": true
     },
     "@types/normalize-package-data": {
diff --git a/package.json b/package.json
index 9ce08c3ea2..aa4b4dd956 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "rxjs": "^6.5.5",
     "rxjs-spy": "^7.0.2",
     "rxjs-websockets": "~8.0.1",
-    "@nwmac/ajsf-material": "^0.1.4",
+    "@nwmac/ajsf-material": "^0.1.5",
     "ts-md5": "^1.2.7",
     "tslib": "^1.10.0",
     "web-animations-js": "^2.3.2",
@@ -103,7 +103,7 @@
     "@types/jasmine": "^3.5.10",
     "@types/jasminewd2": "~2.0.8",
     "@types/karma": "^4.4.1",
-    "@types/node": "^12.11.1",
+    "@types/node": "^13.11.0",
     "@types/request": "^2.48.4",
     "acorn": "^7.1.1",
     "browserstack-local": "^1.4.5",
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
index 7f168ba8c3..aeaedd7552 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
@@ -97,9 +97,10 @@ export class CliInfoCloudFoundryComponent implements OnInit {
   private setupRouteObservable(defaultBackLink: string) {
     this.route$ = this.store.select(getPreviousRoutingState).pipe(
       map(route => {
+        console.log(route);
         return {
           url: route && route.state ? route.state.url : defaultBackLink,
-          queryParams: route && route.state.queryParams ? route.state.queryParams : {}
+          queryParams: route && route.state && route.state.queryParams ? route.state.queryParams : {}
         };
       })
     );
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.ts
index 7020c83d18..6db64ca9a9 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.ts
@@ -3,7 +3,7 @@ import { FormControl, FormGroup } from '@angular/forms';
 import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material/core';
 import { BehaviorSubject, Subscription } from 'rxjs';
 import { delay } from 'rxjs/operators';
-import { JsonPointer } from '@nwmac/ajsf-material';
+import { JsonPointer } from '@nwmac/ajsf-core';
 
 import { safeStringToObj } from '../../../../../core/src/core/utils.service';
 import { isValidJsonValidator } from '../../../../../core/src/shared/form-validators';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/q-param.ts b/src/frontend/packages/cloud-foundry/src/shared/q-param.ts
index 9ef97937e5..d179deaeb0 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/q-param.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/q-param.ts
@@ -23,7 +23,7 @@ export class QParam {
       return new QParam(
         qParamComponents[0],
         qParamComponents[1],
-        qParamComponents[2]
+        QParamJoiners[qParamComponents[2]]
       );
     }
     return null;
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 600657089c..9592815e71 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
@@ -68,7 +68,9 @@ export class MetaCardComponent implements OnDestroy {
       if (!this.favorite) {
         this.entityMonitorSub = entityMonitor.entity$.pipe(
           first(),
-          tap(entity => this.favorite = getFavoriteFromCfEntity(entity, entityConfig.schema.key, this.favoritesConfigMapper))
+          tap(entity => {
+            this.favorite = getFavoriteFromCfEntity(entity, entityConfig.schema.entityType, this.favoritesConfigMapper)
+          })
         ).subscribe();
       }
     }

From 7486a8cd3366eec11573d4e52ffd2f276b385937 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 7 Apr 2020 23:10:54 +0100
Subject: [PATCH 010/176] Use npm registry

---
 .npmrc                                        |  2 -
 package-lock.json                             | 46 +++++++++----------
 package.json                                  |  2 +-
 .../add-service-instance.component.spec.ts    |  2 +-
 .../bind-apps-step.component.spec.ts          |  2 +-
 .../specify-details-step.component.spec.ts    |  2 +-
 .../shared/components/components.module.ts    |  2 +-
 .../schema-form/schema-form.component.spec.ts |  2 +-
 .../schema-form/schema-form.component.ts      |  2 +-
 9 files changed, 28 insertions(+), 34 deletions(-)
 delete mode 100644 .npmrc

diff --git a/.npmrc b/.npmrc
deleted file mode 100644
index dbde4965c9..0000000000
--- a/.npmrc
+++ /dev/null
@@ -1,2 +0,0 @@
-@nwmac:registry=https://npm.pkg.github.com
-
diff --git a/package-lock.json b/package-lock.json
index 5b9abb4086..da2d42c291 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1767,6 +1767,14 @@
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@cfstratos/ajsf-material": {
+      "version": "0.1.5",
+      "resolved": "https://npm.pkg.github.com/download/@cfstratos/ajsf-material/0.1.5/0581fd7f119119b7db9afbee92d7d5195dcd72fc5d29aad7374e6a63dfdb0263",
+      "integrity": "sha512-NtsmLpgOuMHjDgMRoL1lTQjH2SyunYBya+1hw4xnxlTK7Vw7FOzadfm1N2KeKgEjgB1vKM7nDC/BkBlpfgGVBg==",
+      "requires": {
+        "lodash-es": "^4.17.15"
+      }
+    },
     "@istanbuljs/schema": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
@@ -1945,24 +1953,6 @@
         "infer-owner": "^1.0.4"
       }
     },
-    "@nwmac/ajsf-core": {
-      "version": "0.1.5",
-      "resolved": "https://npm.pkg.github.com/download/@nwmac/ajsf-core/0.1.5/d423cd589ae903c35402220402097c9081224ea251dac22d17c284d677d5d75f",
-      "integrity": "sha512-5dvyatsVdgTC+2AK9wlnTcWyHHkJO+ovQlhysE7SkBUMoZDzUCr3NVvnsSAHLMKWxqmdffVMaLaqYNimVuNL8w==",
-      "requires": {
-        "ajv": "^6.10.0",
-        "lodash-es": "^4.17.15"
-      }
-    },
-    "@nwmac/ajsf-material": {
-      "version": "0.1.5",
-      "resolved": "https://npm.pkg.github.com/download/@nwmac/ajsf-material/0.1.5/0581fd7f119119b7db9afbee92d7d5195dcd72fc5d29aad7374e6a63dfdb0263",
-      "integrity": "sha512-NtsmLpgOuMHjDgMRoL1lTQjH2SyunYBya+1hw4xnxlTK7Vw7FOzadfm1N2KeKgEjgB1vKM7nDC/BkBlpfgGVBg==",
-      "requires": {
-        "@nwmac/ajsf-core": "~0.1.5",
-        "lodash-es": "^4.17.15"
-      }
-    },
     "@rollup/plugin-commonjs": {
       "version": "11.0.2",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-11.0.2.tgz",
@@ -2604,6 +2594,7 @@
       "version": "6.12.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
       "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
+      "dev": true,
       "requires": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -6688,7 +6679,8 @@
     "fast-deep-equal": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
-      "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="
+      "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
+      "dev": true
     },
     "fast-glob": {
       "version": "3.2.2",
@@ -6761,7 +6753,8 @@
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
     },
     "fast-levenshtein": {
       "version": "2.0.6",
@@ -9865,7 +9858,8 @@
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
     },
     "json-stable-stringify": {
       "version": "1.0.1",
@@ -10190,9 +10184,9 @@
       "dev": true
     },
     "kind-of": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true
     },
     "klaw-sync": {
@@ -13885,7 +13879,8 @@
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
     },
     "pupa": {
       "version": "2.0.1",
@@ -17742,6 +17737,7 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
       "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       }
diff --git a/package.json b/package.json
index e691359e4e..7bab803ace 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "rxjs": "^6.5.5",
     "rxjs-spy": "^7.0.2",
     "rxjs-websockets": "~8.0.1",
-    "@nwmac/ajsf-material": "^0.1.5",
+    "@cfstratos/ajsf-material": "^0.1.5",
     "ts-md5": "^1.2.7",
     "tslib": "^1.10.0",
     "web-animations-js": "^2.3.2",
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.spec.ts
index 972c915d01..d1770c3adc 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.spec.ts
@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { MaterialDesignFrameworkModule } from '@nwmac/ajsf-material';
+import { MaterialDesignFrameworkModule } from '@cfstratos/ajsf-material';
 
 import {
   AppNameUniqueDirective,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/bind-apps-step/bind-apps-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/bind-apps-step/bind-apps-step.component.spec.ts
index 1b88f8916c..499fafe49f 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/bind-apps-step/bind-apps-step.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/bind-apps-step/bind-apps-step.component.spec.ts
@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { MaterialDesignFrameworkModule } from '@nwmac/ajsf-material';
+import { MaterialDesignFrameworkModule } from '@cfstratos/ajsf-material';
 
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.spec.ts
index 081f0b26e0..164820d39a 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.spec.ts
@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { MaterialDesignFrameworkModule } from '@nwmac/ajsf-material';
+import { MaterialDesignFrameworkModule } from '@cfstratos/ajsf-material';
 
 import { EntityMonitorFactory } from '../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts b/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
index 74063bbeb7..4e0e716513 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { ApplicationModule, NgModule, Type } from '@angular/core';
-import { MaterialDesignFrameworkModule } from '@nwmac/ajsf-material';
+import { MaterialDesignFrameworkModule } from '@cfstratos/ajsf-material';
 
 import { CoreModule } from '../../../../core/src/core/core.module';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.spec.ts
index c9849036a7..047a72ebe7 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.spec.ts
@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { MaterialDesignFrameworkModule } from '@nwmac/ajsf-material';
+import { MaterialDesignFrameworkModule } from '@cfstratos/ajsf-material';
 
 import { generateCfBaseTestModulesNoShared } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { SchemaFormComponent } from './schema-form.component';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.ts
index 6db64ca9a9..ab7ea7ac55 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/schema-form/schema-form.component.ts
@@ -3,7 +3,7 @@ import { FormControl, FormGroup } from '@angular/forms';
 import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material/core';
 import { BehaviorSubject, Subscription } from 'rxjs';
 import { delay } from 'rxjs/operators';
-import { JsonPointer } from '@nwmac/ajsf-core';
+import { JsonPointer } from '@cfstratos/ajsf-core';
 
 import { safeStringToObj } from '../../../../../core/src/core/utils.service';
 import { isValidJsonValidator } from '../../../../../core/src/shared/form-validators';

From 574a7dee4bc7fa17688422764ced044b40328adc Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 7 Apr 2020 23:15:46 +0100
Subject: [PATCH 011/176] Fix package lock

---
 package-lock.json | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index da2d42c291..4471d07a75 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1767,11 +1767,21 @@
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@cfstratos/ajsf-core": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@cfstratos/ajsf-core/-/ajsf-core-0.1.5.tgz",
+      "integrity": "sha512-IMLZJW8I173XovjV7k4hQBXWwr3dPsUa8mLvdVNVUY1RUIv6fY6+QsJXggMb+VMxTSqn+HOq7S1WfEH/Xrt1Dg==",
+      "requires": {
+        "ajv": "^6.10.0",
+        "lodash-es": "^4.17.15"
+      }
+    },
     "@cfstratos/ajsf-material": {
       "version": "0.1.5",
-      "resolved": "https://npm.pkg.github.com/download/@cfstratos/ajsf-material/0.1.5/0581fd7f119119b7db9afbee92d7d5195dcd72fc5d29aad7374e6a63dfdb0263",
-      "integrity": "sha512-NtsmLpgOuMHjDgMRoL1lTQjH2SyunYBya+1hw4xnxlTK7Vw7FOzadfm1N2KeKgEjgB1vKM7nDC/BkBlpfgGVBg==",
+      "resolved": "https://registry.npmjs.org/@cfstratos/ajsf-material/-/ajsf-material-0.1.5.tgz",
+      "integrity": "sha512-e0BSgFho4D4H76YhRBt9xg5zGuoJlcuMs7eWdSABZhW7LKHKKpLWqoGHo6qX4Q3rFTADxXiljKk86FjrMaYfrQ==",
       "requires": {
+        "@cfstratos/ajsf-core": "~0.1.5",
         "lodash-es": "^4.17.15"
       }
     },
@@ -2594,7 +2604,6 @@
       "version": "6.12.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
       "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
-      "dev": true,
       "requires": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -6679,8 +6688,7 @@
     "fast-deep-equal": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
-      "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
-      "dev": true
+      "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="
     },
     "fast-glob": {
       "version": "3.2.2",
@@ -6753,8 +6761,7 @@
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
     "fast-levenshtein": {
       "version": "2.0.6",
@@ -9858,8 +9865,7 @@
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
     },
     "json-stable-stringify": {
       "version": "1.0.1",
@@ -13879,8 +13885,7 @@
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
     "pupa": {
       "version": "2.0.1",
@@ -17737,7 +17742,6 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
       "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       }

From 0c1b43accbdcd9fb8b7f6efbc76bd8e85b01d5c6 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 7 Apr 2020 23:58:40 +0100
Subject: [PATCH 012/176] Fix front-end unit test

---
 .../core/src/shared/user-permission.directive.spec.ts  | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/user-permission.directive.spec.ts b/src/frontend/packages/core/src/shared/user-permission.directive.spec.ts
index 86d356647a..6e3ea57118 100644
--- a/src/frontend/packages/core/src/shared/user-permission.directive.spec.ts
+++ b/src/frontend/packages/core/src/shared/user-permission.directive.spec.ts
@@ -1,16 +1,15 @@
 import { Component, TemplateRef } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { BaseTestModules } from '../../test-framework/core-test.helper';
+import { BaseTestModules, generateBaseTestStoreModules } from '../../test-framework/core-test.helper';
+import { UserPermissionDirective } from './user-permission.directive';
 
 @Component({
-  template: `<input type="text" appUserPermission>`
+  template: `<input type="text" *appUserPermission="">`
 })
 class TestUserPermissionComponent {
 }
 
-class MockTemplateRef { }
-
 describe('UserPermissionDirective', () => {
   let component: TestUserPermissionComponent;
   let fixture: ComponentFixture<TestUserPermissionComponent>;
@@ -19,9 +18,6 @@ describe('UserPermissionDirective', () => {
       imports: [
         ...BaseTestModules
       ],
-      providers: [
-        { provide: TemplateRef, useClass: MockTemplateRef },
-      ],
       declarations: [TestUserPermissionComponent]
     });
     fixture = TestBed.createComponent(TestUserPermissionComponent);

From 8051743f1da58d052ed0e9af16db7489f56c85bc Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 6 Apr 2020 17:33:14 +0100
Subject: [PATCH 013/176] Add initial UI for backup/restore

---
 .../shared/components/components.module.ts    |   6 +-
 .../backup-endpoints.service.ts               | 198 ++++++++++++++
 .../backup-endpoints.component.html           |  32 +++
 .../backup-endpoints.component.scss           |  15 +
 .../backup-endpoints.component.spec.ts        |  25 ++
 .../backup-endpoints.component.ts             | 184 +++++++++++++
 .../backup-restore-cell.component.html        |   2 +
 .../backup-restore-cell.component.scss        |   0
 .../backup-restore-cell.component.spec.ts     |  25 ++
 .../backup-restore-cell.component.ts          |  25 ++
 .../backup-restore-endpoints.service.ts       | 213 +++++++++++++++
 .../backup-restore-endpoints.component.html   |  13 +
 .../backup-restore-endpoints.component.scss   |   3 +
 ...backup-restore-endpoints.component.spec.ts |  25 ++
 .../backup-restore-endpoints.component.ts     |  48 ++++
 .../restore-endpoints.service.ts              |  76 ++++++
 .../restore-endpoints.component.html          |  27 ++
 .../restore-endpoints.component.scss          |  18 ++
 .../restore-endpoints.component.spec.ts       |  25 ++
 .../restore-endpoints.component.ts            | 176 ++++++++++++
 .../features/endpoints/endpoints.module.ts    |  17 +-
 .../features/endpoints/endpoints.routing.ts   |  19 +-
 .../table-cell/table-cell.component.ts        |   1 +
 .../endpoint/endpoints-list-config.service.ts |  25 +-
 .../store/src/actions/endpoint.actions.ts     |   2 +-
 src/jetstream/cnsi.go                         | 257 +++++++++++++++++-
 src/jetstream/main.go                         |   4 +
 src/jetstream/repository/cnsis/cnsis.go       |   1 +
 src/jetstream/repository/cnsis/pgsql_cnsis.go |  32 +++
 .../repository/interfaces/portal_proxy.go     |   2 +-
 .../repository/interfaces/structs.go          |  22 +-
 .../repository/tokens/pgsql_tokens.go         | 244 +++++++++++++++++
 src/jetstream/repository/tokens/tokens.go     |   3 +
 src/jetstream/stringutils/utils.go            |   2 +-
 34 files changed, 1744 insertions(+), 23 deletions(-)
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.scss
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.spec.ts
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.html
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.scss
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.spec.ts
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.ts
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints.service.ts
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.html
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.scss
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.spec.ts
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.ts
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.scss
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.spec.ts
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts

diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts b/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
index 197aca9173..0eab5d7bd5 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
@@ -100,6 +100,9 @@ import {
 import {
   TableCellEventTypeComponent,
 } from './list/list-types/cf-events/table-cell-event-type/table-cell-event-type.component';
+import {
+  TableCellFeatureFlagDescriptionComponent,
+} from './list/list-types/cf-feature-flags/table-cell-feature-flag-description/table-cell-feature-flag-description.component';
 import {
   TableCellFeatureFlagStateComponent,
 } from './list/list-types/cf-feature-flags/table-cell-feature-flag-state/table-cell-feature-flag-state.component';
@@ -175,7 +178,6 @@ import { SelectServiceComponent } from './select-service/select-service.componen
 import { ServiceIconComponent } from './service-icon/service-icon.component';
 import { ServicePlanPriceComponent } from './service-plan-price/service-plan-price.component';
 import { ServicePlanPublicComponent } from './service-plan-public/service-plan-public.component';
-import { TableCellFeatureFlagDescriptionComponent } from './list/list-types/cf-feature-flags/table-cell-feature-flag-description/table-cell-feature-flag-description.component';
 
 // tslint:disable:max-line-length
 // tslint:enable:max-line-length
@@ -219,7 +221,7 @@ const cfListTableCells: Type<TableCellCustom<any>>[] = [
   TableCellServiceBindableComponent,
   TableCellServiceActiveComponent,
   TableCellServiceReferencesComponent,
-  TableCellServiceInstanceTagsComponent
+  TableCellServiceInstanceTagsComponent,
 ];
 
 const cfListCards: Type<CardCell<any>>[] = [
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
new file mode 100644
index 0000000000..80cc1c5f43
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
@@ -0,0 +1,198 @@
+import { HttpClient, HttpParams } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { filter, first, map, switchMap } from 'rxjs/operators';
+
+import { GeneralEntityAppState } from '../../../../../store/src/app-state';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
+import { AuthState } from '../../../../../store/src/reducers/auth.reducer';
+import { SessionData } from '../../../../../store/src/types/auth.types';
+import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
+import { BrowserStandardEncoder } from '../../../helper';
+import {
+  BackupEndpointConfigUI,
+  BackupEndpointsConfig,
+  BackupEndpointTypes,
+  BackupRestoreEndpointService,
+  BaseEndpointConfig,
+} from './backup-restore-endpoints.service';
+
+interface BackupEndpointConfigRequest extends BaseEndpointConfig {
+  // connectedUser: string;
+}
+
+interface BackupEndpointRequestData {
+  state: BackupEndpointsConfig<BackupEndpointConfigRequest>;
+  userId: string;
+  password: string;
+}
+
+@Injectable()
+export class BackupEndpointsService extends BackupRestoreEndpointService {
+
+  hasChanges = new BehaviorSubject(false);
+  hasChanges$ = this.hasChanges.asObservable();
+  allChanged = new BehaviorSubject(false);
+  allChanged$ = this.allChanged.asObservable();
+
+  state: BackupEndpointsConfig<BackupEndpointConfigUI> = {};
+  password: string;
+
+  constructor(
+    private store: Store<GeneralEntityAppState>,
+    private http: HttpClient
+  ) {
+    super();
+  }
+
+  // State Related
+  initialize(endpoints: EndpointModel[]) {
+    endpoints.forEach(entity => {
+      this.state[entity.guid] = {
+        [BackupEndpointTypes.ENDPOINT]: false,
+        [BackupEndpointTypes.CONNECT]: false,
+        [BackupEndpointTypes.ALL_CONNECT]: false,
+        entity
+      };
+    });
+    this.validate();
+  }
+
+  validate() {
+    const endpoints = Object.values(this.state);
+    endpoints.forEach(endpoint => {
+      if (!endpoint[BackupEndpointTypes.ENDPOINT]) {
+        endpoint[BackupEndpointTypes.CONNECT] = false;
+        endpoint[BackupEndpointTypes.ALL_CONNECT] = false;
+      }
+      if (endpoint[BackupEndpointTypes.ALL_CONNECT] && this.canBackup(endpoint.entity, BackupEndpointTypes.CONNECT)) {
+        endpoint[BackupEndpointTypes.CONNECT] = true;
+      }
+    });
+
+    const hasChanges = !!endpoints.find(endpoint =>
+      endpoint[BackupEndpointTypes.ENDPOINT] ||
+      endpoint[BackupEndpointTypes.CONNECT] ||
+      endpoint[BackupEndpointTypes.ALL_CONNECT]
+    );
+    this.hasChanges.next(hasChanges);
+    const allChanged = endpoints.every(endpoint => {
+      const e = !this.canBackup(endpoint.entity, BackupEndpointTypes.ENDPOINT) || endpoint[BackupEndpointTypes.ENDPOINT];
+      const c = !this.canBackup(endpoint.entity, BackupEndpointTypes.CONNECT) || endpoint[BackupEndpointTypes.CONNECT];
+      const aC = !this.canBackup(endpoint.entity, BackupEndpointTypes.ALL_CONNECT) || endpoint[BackupEndpointTypes.ALL_CONNECT];
+      return e && c && aC;
+    }
+
+    );
+    this.allChanged.next(allChanged);
+  }
+
+  canBackup(endpoint: EndpointModel, type: BackupEndpointTypes): boolean {
+    // Can always back up endpoint
+    if (type === BackupEndpointTypes.ENDPOINT) {
+      return true;
+    }
+
+    // All other settings require endpoint to be backed up
+    if (!this.state[endpoint.guid][BackupEndpointTypes.ENDPOINT]) {
+      return false;
+    }
+
+    const epType = entityCatalog.getEndpoint(endpoint.cnsi_type, endpoint.sub_type).definition;
+    // The endpoint type supports connection details
+    if (epType.unConnectable) {
+      return false;
+    }
+
+    // Are all connection details backed up anyway?
+    // Does the user have connection details for this endpoint?
+    if (type === BackupEndpointTypes.CONNECT) {
+      return !this.state[endpoint.guid][BackupEndpointTypes.ALL_CONNECT] &&
+        endpoint.connectionStatus === 'connected';
+      // return !this.service.state[endpoint.guid][BackupRestoreTypes.CONNECT];
+    }
+
+    return true;
+  }
+
+  selectAll() {
+    Object.values(this.state).forEach(endpoint => {
+      if (this.canBackup(endpoint.entity, BackupEndpointTypes.ENDPOINT)) {
+        endpoint[BackupEndpointTypes.ENDPOINT] = true;
+      }
+      if (this.canBackup(endpoint.entity, BackupEndpointTypes.CONNECT)) {
+        endpoint[BackupEndpointTypes.CONNECT] = true;
+      }
+      if (this.canBackup(endpoint.entity, BackupEndpointTypes.ALL_CONNECT)) {
+        endpoint[BackupEndpointTypes.ALL_CONNECT] = true;
+      }
+    });
+    this.validate();
+  }
+
+  selectNone() {
+    Object.values(this.state).forEach(endpoint => {
+      endpoint[BackupEndpointTypes.ENDPOINT] = false;
+      endpoint[BackupEndpointTypes.CONNECT] = false;
+      endpoint[BackupEndpointTypes.ALL_CONNECT] = false;
+    });
+    this.validate();
+  }
+
+  // Request Related
+
+  createBackup(): Observable<Blob> {
+    const url = '/pp/v1/endpoints/backup';
+    const fromObject = {};
+    const params: HttpParams = new HttpParams({
+      fromObject,
+      encoder: new BrowserStandardEncoder()
+    });
+
+    return this.getSessionData().pipe(
+      switchMap(ses => this.http.post(url, this.createBodyToSend(ses), {
+        params
+      })),
+      map(res => {
+        console.log('Response: ', res);
+        return new Blob([JSON.stringify(res)]);
+      }),
+      first(),
+    );
+  }
+
+  private createBodyToSend(sd: SessionData): BackupEndpointRequestData {
+    const state: BackupEndpointsConfig<BackupEndpointConfigRequest> = Object.entries(this.state).reduce((res, [endpointId, endpoint]) => {
+      const { entity, ...rest } = endpoint;
+      const requestConfig: BackupEndpointConfigRequest = {
+        ...rest,
+      };
+      res[endpointId] = requestConfig;
+      return res;
+    }, {});
+    return {
+      state,
+      userId: this.getUserIdFromSessionData(sd),
+      password: this.password
+    };
+  }
+
+  private getUserIdFromSessionData(sd: SessionData): string {
+    if (sd && sd.user) {
+      return sd.user.guid;
+    }
+    return null;
+  }
+
+  private getSessionData(): Observable<SessionData> {
+    return this.store.select(s => s.auth).pipe(
+      filter(auth => !!(auth && auth.sessionData)),
+      map((auth: AuthState) => auth.sessionData),
+      first()
+    );
+  }
+
+
+
+}
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html
new file mode 100644
index 0000000000..e6dd32385c
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html
@@ -0,0 +1,32 @@
+<app-page-header>
+  <h1>Backup Endpoints</h1>
+</app-page-header>
+
+<app-steppers cancel="/endpoints" [basePreviousRedirect]="{
+  path: '/endpoints/backup-restore'
+  }">
+  <app-step title="Select" [valid]="selectValid$ | async">
+    <div class="select-step">
+      <p>Select the endpoints and connection details that you would like to backup</p>
+      <div class="select-step__buttons">
+        <button mat-raised-button color="primary" [disabled]="disableSelectAll$ | async"
+          (click)="service.selectAll()">Select All</button>
+        <button mat-raised-button color="primary" [disabled]="disableSelectNone$ | async"
+          (click)="service.selectNone()">Select None</button>
+      </div>
+      <app-table [dataSource]="endpointDataSource" [columns]="columns"></app-table>
+    </div>
+  </app-step>
+  <app-step title="Password" finishButtonText="Download" [onNext]="onNext" [valid]="passwordValid$ | async">
+    <div class="password-step">
+      <p>Protect the backup by providing as password. You will need this password when restoring from this backup</p>
+      <form [formGroup]="passwordForm" class="stepper-form">
+        <mat-form-field>
+          <input matInput formControlName="password" placeholder="Password" required type="password">
+        </mat-form-field>
+      </form>
+    </div>
+  </app-step>
+</app-steppers>
+
+<!-- // TODO: RC test - no tokens in db -->
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.scss b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.scss
new file mode 100644
index 0000000000..de139e1b04
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.scss
@@ -0,0 +1,15 @@
+:host {
+  flex: 1;
+}
+.select-step {
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+
+  &__buttons {
+    padding-bottom: 12px;
+    button {
+      margin-right: 24px;
+    }
+  }
+}
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.spec.ts
new file mode 100644
index 0000000000..16cf213f81
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { BackupEndpointsComponent } from './backup-endpoints.component';
+
+describe('BackupEndpointsComponent', () => {
+  let component: BackupEndpointsComponent;
+  let fixture: ComponentFixture<BackupEndpointsComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ BackupEndpointsComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BackupEndpointsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
new file mode 100644
index 0000000000..23f5216ab3
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
@@ -0,0 +1,184 @@
+import { Component, OnInit } from '@angular/core';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { Store } from '@ngrx/store';
+import * as moment from 'moment';
+import { Observable, of, Subject } from 'rxjs';
+import { filter, first, map, tap } from 'rxjs/operators';
+
+import { GetAllEndpoints } from '../../../../../../store/src/actions/endpoint.actions';
+import { AppState } from '../../../../../../store/src/app-state';
+import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
+import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+import { EndpointModel } from '../../../../../../store/src/types/endpoint.types';
+import { ConfirmationDialogConfig } from '../../../../shared/components/confirmation-dialog.config';
+import { ConfirmationDialogService } from '../../../../shared/components/confirmation-dialog.service';
+import { ITableListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source-types';
+import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
+import { StepOnNextFunction, StepOnNextResult } from '../../../../shared/components/stepper/step/step.component';
+import { BackupEndpointsService } from '../backup-endpoints.service';
+import { BackupRestoreCellComponent } from '../backup-restore-cell/backup-restore-cell.component';
+import { BackupEndpointTypes } from '../backup-restore-endpoints.service';
+
+@Component({
+  selector: 'app-backup-endpoints',
+  templateUrl: './backup-endpoints.component.html',
+  styleUrls: ['./backup-endpoints.component.scss'],
+  providers: [
+    BackupEndpointsService
+  ]
+})
+export class BackupEndpointsComponent implements OnInit {
+
+  // Step 1
+  columns: ITableColumn<EndpointModel>[] = [
+    {
+      columnId: 'name',
+      headerCell: () => 'Name',
+      cellDefinition: {
+        valuePath: 'name'
+      }
+    },
+    {
+      columnId: 'endpoint',
+      headerCell: () => 'Backup',
+      cellComponent: BackupRestoreCellComponent,
+      cellConfig: {
+        type: BackupEndpointTypes.ENDPOINT
+      }
+    },
+    {
+      columnId: 'connect',
+      headerCell: () => 'Backup Your Connection Details',
+      cellComponent: BackupRestoreCellComponent,
+      cellConfig: {
+        type: BackupEndpointTypes.CONNECT
+      }
+    },
+    {
+      columnId: 'all-connect',
+      headerCell: () => 'Backup All Users Connection Details',
+      cellComponent: BackupRestoreCellComponent,
+      cellConfig: {
+        type: BackupEndpointTypes.ALL_CONNECT
+      }
+    },
+  ];
+  endpointDataSource: ITableListDataSource<EndpointModel>;
+  disableSelectAll$: Observable<boolean>;
+  disableSelectNone$: Observable<boolean>;
+  selectValid$: Observable<boolean>;
+
+  // Step 2
+  passwordValid$: Observable<boolean>;
+  passwordForm: FormGroup;
+
+  constructor(
+    public service: BackupEndpointsService,
+    private store: Store<AppState>,
+    private paginationMonitorFactory: PaginationMonitorFactory,
+    private confirmDialog: ConfirmationDialogService,
+  ) {
+    this.setupSelectStep();
+    this.setupPasswordStep();
+  }
+
+  setupSelectStep() {
+    const action = new GetAllEndpoints();
+    const endpointObs = getPaginationObservables<EndpointModel>({
+      store: this.store,
+      action,
+      paginationMonitor: this.paginationMonitorFactory.create(
+        action.paginationKey,
+        action,
+        true
+      )
+    }, true);
+
+
+    const endpoints$ = endpointObs.entities$.pipe(
+      filter(entities => !!entities),
+      map(endpoints => endpoints.sort((a, b) => a.name.localeCompare(b.name)))
+    );
+
+    endpoints$.pipe(first()).subscribe(entities => this.service.initialize(entities));
+
+    this.endpointDataSource = {
+      isTableLoading$: endpointObs.fetchingEntities$,
+      connect: () => endpoints$,
+      disconnect: () => { },
+      trackBy: (index, row) => row.guid
+    };
+
+    this.disableSelectAll$ = this.service.allChanged$;
+    this.disableSelectNone$ = this.service.hasChanges$.pipe(
+      map(hasChanges => !hasChanges)
+    );
+
+    this.selectValid$ = this.service.hasChanges$;
+  }
+
+  setupPasswordStep() {
+    this.passwordForm = new FormGroup({
+      password: new FormControl('', [Validators.required]),
+    });
+    this.passwordValid$ = this.passwordForm.statusChanges.pipe(
+      map(() => {
+        this.service.password = this.passwordForm.controls.password.value;
+        return this.passwordForm.valid;
+      })
+    );
+  }
+
+  ngOnInit() {
+  }
+
+  onNext: StepOnNextFunction = () => {
+    // TODO: RC Complete/Finish token warning
+    const confirmation = new ConfirmationDialogConfig(
+      'Backup',
+      'Backing up connection details ?????????',
+      'Continue',
+      true
+    );
+    const result = new Subject<StepOnNextResult>();
+
+    const userCancelledDialog = () => {
+      result.next({
+        success: false
+      });
+    };
+
+    const backupSuccess = data => {
+      result.next({
+        success: true,
+        redirect: true,
+      });
+
+      const downloadURL = window.URL.createObjectURL(data);
+      const link = document.createElement('a');
+      link.href = downloadURL;
+      const dateTime = moment().format('YYYYMMDD-HHmmss'); // TODO: RC timezone?
+      link.download = `stratos_backup_${dateTime}.bk`;
+      link.click();
+    };
+
+    const backupFailure = err => {
+      const errorMessage = this.service.createError(err);
+      result.next({
+        success: false,
+        message: `Failed to create backup` + (errorMessage ? `: ${errorMessage}` : '')
+      });
+      return of(false);
+    };
+
+    const createBackup = () => this.service.createBackup().pipe(first()).subscribe(backupSuccess, backupFailure);
+
+    // TODO: RC tie in progress indicator (not sure if possible)
+    this.confirmDialog.openWithCancel(confirmation, createBackup, userCancelledDialog);
+
+    // TODO: RC Remove console.log
+    return result.asObservable().pipe(tap(console.log));
+  }
+
+
+}
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.html
new file mode 100644
index 0000000000..3f240bbf9e
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.html
@@ -0,0 +1,2 @@
+<mat-checkbox [(ngModel)]="service.state[row.guid][config.type]" [disabled]="disabled()" (change)="validate()">
+</mat-checkbox>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.scss b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.spec.ts
new file mode 100644
index 0000000000..1809ff8d89
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { BackupRestoreCellComponent } from './backup-restore-cell.component';
+
+describe('BackupRestoreCellComponent', () => {
+  let component: BackupRestoreCellComponent;
+  let fixture: ComponentFixture<BackupRestoreCellComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ BackupRestoreCellComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BackupRestoreCellComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.ts
new file mode 100644
index 0000000000..97a05e5198
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.ts
@@ -0,0 +1,25 @@
+import { Component } from '@angular/core';
+
+import { EndpointModel } from '../../../../../../store/src/types/endpoint.types';
+import { TableCellCustom } from '../../../../shared/components/list/list.types';
+import { BackupEndpointsService } from '../backup-endpoints.service';
+
+@Component({
+  selector: 'app-backup-restore-cell',
+  templateUrl: './backup-restore-cell.component.html',
+  styleUrls: ['./backup-restore-cell.component.scss']
+})
+export class BackupRestoreCellComponent extends TableCellCustom<EndpointModel> {
+
+  constructor(public service: BackupEndpointsService) {
+    super();
+  }
+
+  validate() {
+    this.service.validate();
+  }
+
+  disabled(): boolean {
+    return !this.service.canBackup(this.row, this.config.type);
+  }
+}
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints.service.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints.service.ts
new file mode 100644
index 0000000000..29b19d45f2
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints.service.ts
@@ -0,0 +1,213 @@
+import { HttpErrorResponse } from '@angular/common/http';
+
+import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
+import { isHttpErrorResponse } from '../../../jetstream.helpers';
+
+// TODO: RC move to types
+
+export enum BackupEndpointTypes {
+  ENDPOINT = 'endpoint',
+  CONNECT = 'connect',
+  ALL_CONNECT = 'all_connect'
+}
+
+export interface BackupEndpointsConfig<T> {
+  [endpointId: string]: T;
+}
+
+export interface BaseEndpointConfig {
+  [BackupEndpointTypes.ENDPOINT]: boolean;
+  [BackupEndpointTypes.CONNECT]: boolean;
+  [BackupEndpointTypes.ALL_CONNECT]: boolean;
+}
+
+// type BackupEndpoint = Omit<BackupEndpointConfig, 'entity'>;
+
+export interface BackupEndpointConfigUI extends BaseEndpointConfig {
+  entity: EndpointModel;
+}
+
+// @Injectable()
+export class BackupRestoreEndpointService {
+
+  createError(err: any): string {
+    // TODO: RC tidy. move generic
+    const httpResponse: HttpErrorResponse = isHttpErrorResponse(err);
+    if (httpResponse) {
+      if (httpResponse.error) {
+        if (typeof (httpResponse.error) === 'string') {
+          return httpResponse.error + ` (${httpResponse.status})`;
+        }
+        return httpResponse.error.error + ` (${httpResponse.status})`;
+      }
+      return JSON.stringify(httpResponse.error) + ` (${httpResponse.status})`;
+    }
+    return err.message;
+  }
+
+  // hasChanges = new BehaviorSubject(false);
+  // hasChanges$ = this.hasChanges.asObservable();
+  // allChanged = new BehaviorSubject(false);
+  // allChanged$ = this.allChanged.asObservable();
+
+  // state: BackupEndpointsConfig<BackupEndpointConfigUI> = {};
+  // password: string;
+
+
+  // constructor(
+  //   private store: Store<GeneralEntityAppState>,
+  //   private http: HttpClient
+  // ) {
+
+  // }
+
+  // // State Related
+  // initialize(endpoints: EndpointModel[]) {
+  //   endpoints.forEach(entity => {
+  //     this.state[entity.guid] = {
+  //       [BackupRestoreTypes.ENDPOINT]: false,
+  //       [BackupRestoreTypes.CONNECT]: false,
+  //       [BackupRestoreTypes.ALL_CONNECT]: false,
+  //       entity
+  //     };
+  //   });
+  //   this.validate();
+  // }
+
+  // validate() {
+  //   const endpoints = Object.values(this.state);
+  //   endpoints.forEach(endpoint => {
+  //     if (!endpoint[BackupRestoreTypes.ENDPOINT]) {
+  //       endpoint[BackupRestoreTypes.CONNECT] = false;
+  //       endpoint[BackupRestoreTypes.ALL_CONNECT] = false;
+  //     }
+  //     if (endpoint[BackupRestoreTypes.ALL_CONNECT] && this.canBackup(endpoint.entity, BackupRestoreTypes.CONNECT)) {
+  //       endpoint[BackupRestoreTypes.CONNECT] = true;
+  //     }
+  //   });
+
+  //   const hasChanges = !!endpoints.find(endpoint =>
+  //     endpoint[BackupRestoreTypes.ENDPOINT] ||
+  //     endpoint[BackupRestoreTypes.CONNECT] ||
+  //     endpoint[BackupRestoreTypes.ALL_CONNECT]
+  //   );
+  //   this.hasChanges.next(hasChanges);
+  //   const allChanged = endpoints.every(endpoint => {
+  //     const e = !this.canBackup(endpoint.entity, BackupRestoreTypes.ENDPOINT) || endpoint[BackupRestoreTypes.ENDPOINT];
+  //     const c = !this.canBackup(endpoint.entity, BackupRestoreTypes.CONNECT) || endpoint[BackupRestoreTypes.CONNECT];
+  //     const aC = !this.canBackup(endpoint.entity, BackupRestoreTypes.ALL_CONNECT) || endpoint[BackupRestoreTypes.ALL_CONNECT];
+  //     return e && c && aC;
+  //   }
+
+  //   );
+  //   this.allChanged.next(allChanged);
+  // }
+
+  // canBackup(endpoint: EndpointModel, type: BackupRestoreTypes): boolean {
+  //   // Can always back up endpoint
+  //   if (type === BackupRestoreTypes.ENDPOINT) {
+  //     return true;
+  //   }
+
+  //   // All other settings require endpoint to be backed up
+  //   if (!this.state[endpoint.guid][BackupRestoreTypes.ENDPOINT]) {
+  //     return false;
+  //   }
+
+  //   const epType = entityCatalog.getEndpoint(endpoint.cnsi_type, endpoint.sub_type).definition;
+  //   // The endpoint type supports connection details
+  //   if (epType.unConnectable) {
+  //     return false;
+  //   }
+
+  //   // Are all connection details backed up anyway?
+  //   // Does the user have connection details for this endpoint?
+  //   if (type === BackupRestoreTypes.CONNECT) {
+  //     return !this.state[endpoint.guid][BackupRestoreTypes.ALL_CONNECT] &&
+  //       endpoint.connectionStatus === 'connected';
+  //     // return !this.service.state[endpoint.guid][BackupRestoreTypes.CONNECT];
+  //   }
+
+  //   return true;
+  // }
+
+  // selectAll() {
+  //   Object.values(this.state).forEach(endpoint => {
+  //     if (this.canBackup(endpoint.entity, BackupRestoreTypes.ENDPOINT)) {
+  //       endpoint[BackupRestoreTypes.ENDPOINT] = true;
+  //     }
+  //     if (this.canBackup(endpoint.entity, BackupRestoreTypes.CONNECT)) {
+  //       endpoint[BackupRestoreTypes.CONNECT] = true;
+  //     }
+  //     if (this.canBackup(endpoint.entity, BackupRestoreTypes.ALL_CONNECT)) {
+  //       endpoint[BackupRestoreTypes.ALL_CONNECT] = true;
+  //     }
+  //   });
+  //   this.validate();
+  // }
+
+  // selectNone() {
+  //   Object.values(this.state).forEach(endpoint => {
+  //     endpoint[BackupRestoreTypes.ENDPOINT] = false;
+  //     endpoint[BackupRestoreTypes.CONNECT] = false;
+  //     endpoint[BackupRestoreTypes.ALL_CONNECT] = false;
+  //   });
+  //   this.validate();
+  // }
+
+  // // Request Related
+
+  // createBackup(): Observable<Blob> {
+  //   const url = '/pp/v1/backup/endpoints';
+  //   const fromObject = {};
+  //   const params: HttpParams = new HttpParams({
+  //     fromObject,
+  //     encoder: new BrowserStandardEncoder()
+  //   });
+
+  //   return this.getSessionData().pipe(
+  //     switchMap(ses => this.http.post(url, this.createBodyToSend(ses), {
+  //       params
+  //     })),
+  //     map(res => {
+  //       console.log('Response: ', res);
+  //       return new Blob([JSON.stringify(res)]);
+  //     }),
+  //     first(),
+  //   );
+  // }
+
+  // private createBodyToSend(sd: SessionData): BackupEndpointRequestData {
+  //   const state: BackupEndpointsConfig<BackupEndpointConfigRequest> = Object.entries(this.state).reduce((res, [endpointId, endpoint]) => {
+  //     const { entity, ...rest } = endpoint;
+  //     const requestConfig: BackupEndpointConfigRequest = {
+  //       ...rest,
+  //     };
+  //     res[endpointId] = requestConfig;
+  //     return res;
+  //   }, {});
+  //   return {
+  //     state,
+  //     userId: this.getUserIdFromSessionData(sd),
+  //     password: this.password
+  //   };
+  // }
+
+  // private getUserIdFromSessionData(sd: SessionData): string {
+  //   if (sd && sd.user) {
+  //     return sd.user.guid;
+  //   }
+  //   return null;
+  // }
+
+  // private getSessionData(): Observable<SessionData> {
+  //   return this.store.select(s => s.auth).pipe(
+  //     filter(auth => !!(auth && auth.sessionData)),
+  //     map((auth: AuthState) => auth.sessionData),
+  //     first()
+  //   );
+  // }
+
+
+
+}
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.html
new file mode 100644
index 0000000000..d1ea1197f7
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.html
@@ -0,0 +1,13 @@
+<app-page-header>
+  <h1>Backup/Restore Endpoints</h1>
+</app-page-header>
+
+<app-steppers cancel="/endpoints">
+  <app-step [hideNextButton]="true">
+    <div class="tiles">
+      <!-- <h3>Select Type</h3> -->
+      <p>Create a backup of Endpoints and their connection details or restore from an existing backup.</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/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.scss b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.scss
new file mode 100644
index 0000000000..712926fb2c
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.scss
@@ -0,0 +1,3 @@
+.tiles {
+  flex: 1;
+}
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.spec.ts
new file mode 100644
index 0000000000..587eefc846
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { BackupRestoreEndpointsComponent } from './backup-restore-endpoints.component';
+
+describe('BackupRestoreEndpointsComponent', () => {
+  let component: BackupRestoreEndpointsComponent;
+  let fixture: ComponentFixture<BackupRestoreEndpointsComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ BackupRestoreEndpointsComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BackupRestoreEndpointsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.ts
new file mode 100644
index 0000000000..90b1e4cc2d
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.ts
@@ -0,0 +1,48 @@
+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 { ITileConfig, ITileData } from '../../../../shared/components/tile/tile-selector.types';
+
+interface IAppTileData extends ITileData {
+  type: string;
+}
+
+
+@Component({
+  selector: 'app-backup-restore-endpoints',
+  templateUrl: './backup-restore-endpoints.component.html',
+  styleUrls: ['./backup-restore-endpoints.component.scss'],
+})
+export class BackupRestoreEndpointsComponent {
+
+  // static BACKUP_RESTORE_PARAM = 'backup';
+
+  public serviceType: string;
+  public tileSelectorConfig: ITileConfig<IAppTileData>[];
+
+  set selectedTile(tile: ITileConfig<IAppTileData>) {
+    if (tile) {
+      const url = 'endpoints/backup-restore/' + tile.data.type;
+      this.store.dispatch(new RouterNav({ path: url }));
+    }
+  }
+
+  constructor(
+    private store: Store<AppState>) {
+    this.tileSelectorConfig = [
+      new ITileConfig<IAppTileData>(
+        'Backup',
+        { matIcon: 'cloud_download' },
+        { type: 'backup' }
+      ),
+      new ITileConfig<IAppTileData>(
+        'Restore',
+        { matIcon: 'cloud_upload' },
+        { type: 'restore' }
+      )
+    ];
+  }
+
+}
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts
new file mode 100644
index 0000000000..ca3daa19b9
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts
@@ -0,0 +1,76 @@
+import { HttpClient, HttpParams } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { BehaviorSubject, Observable } from 'rxjs';
+
+import { GeneralEntityAppState } from '../../../../../store/src/app-state';
+import { BrowserStandardEncoder } from '../../../helper';
+import { BackupRestoreEndpointService } from './backup-restore-endpoints.service';
+
+interface RestoreEndpointsData {
+  data: string;
+  password: string;
+}
+
+@Injectable()
+export class RestoreEndpointsService extends BackupRestoreEndpointService {
+
+  validFile = new BehaviorSubject(false);
+  validFile$ = this.validFile.asObservable();
+  password: string; // TODO: RC use set password in both services
+  fileName: string;
+  private fileContent: string;
+
+  constructor(
+    private store: Store<GeneralEntityAppState>,
+    private http: HttpClient
+  ) {
+    super();
+  }
+
+  setFile(file): Promise<string> {
+    return new Promise((resolve, reject) => {
+      const reader = new FileReader();
+      reader.onload = () => {
+        const res = reader.result as string;
+        this.setFileResult(res, file.name);
+        resolve(res);
+      };
+      reader.onerror = () => this.setFileResult(null, null);
+      reader.onabort = () => this.setFileResult(null, null);
+      reader.readAsText(file);
+    });
+  }
+
+  private setFileResult(content: string, fileName: string) {
+    if (!!content) {
+      this.validFile.next(true);
+      this.fileName = fileName;
+      this.fileContent = content;
+    } else {
+      this.validFile.next(false);
+      this.fileName = '';
+      this.fileContent = '';
+    }
+  }
+
+
+  restoreBackup(): Observable<any> {
+    const url = '/pp/v1/endpoints/restore';
+    const fromObject = {};
+    const params: HttpParams = new HttpParams({
+      fromObject,
+      encoder: new BrowserStandardEncoder()
+    });
+    return this.http.post(url, this.createBodyToSend(), {
+      params
+    });
+  }
+
+  createBodyToSend(): RestoreEndpointsData {
+    return {
+      data: this.fileContent,
+      password: this.password
+    };
+  }
+}
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html
new file mode 100644
index 0000000000..7b9ef8f1f0
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html
@@ -0,0 +1,27 @@
+<app-page-header>
+  <h1>Restore Endpoints</h1>
+</app-page-header>
+
+<app-steppers cancel="/endpoints" [basePreviousRedirect]="{ path: '/endpoints/backup-restore' }">
+  <app-step title="File" [valid]="fileValid$ | async">
+    <div class="file-step">
+      <p>Provide the backup file to restore from.</p>
+      <div class="file-step__input">
+        <input #localPathSelectFile fileread="localPathFile" type="file" class="file-step__input--input"
+          name="localPathSelectFile" id="localPathSelectFile" (change)="onFileChange($event)" />Choose
+        <button (click)="localPathSelectFile.click()" color="primary" mat-button mat-raised-button>File</button>
+        {{service.fileName}}
+      </div>
+    </div>
+  </app-step>
+  <app-step title="Password" finishButtonText="Restore" [onNext]="restore" [valid]="passwordValid$ | async">
+    <div class="password-step">
+      <p>Provide the password that was given at the time the backup was created</p>
+      <form [formGroup]="passwordForm" class="stepper-form">
+        <mat-form-field>
+          <input matInput formControlName="password" placeholder="Password" required type="password">
+        </mat-form-field>
+      </form>
+    </div>
+  </app-step>
+</app-steppers>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.scss b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.scss
new file mode 100644
index 0000000000..89184f73a4
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.scss
@@ -0,0 +1,18 @@
+:host {
+  flex: 1;
+}
+.file-step {
+  display: flex;
+  flex-direction: column;
+  &__input {
+    &--input {
+      height: 0;
+      visibility: hidden;
+      width: 0;
+    }
+    button {
+      margin-right: 5px;
+    }
+  }
+
+}
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.spec.ts
new file mode 100644
index 0000000000..b260285638
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { RestoreEndpointsComponent } from './restore-endpoints.component';
+
+describe('RestoreEndpointsComponent', () => {
+  let component: RestoreEndpointsComponent;
+  let fixture: ComponentFixture<RestoreEndpointsComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ RestoreEndpointsComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(RestoreEndpointsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
new file mode 100644
index 0000000000..0bfb63a132
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
@@ -0,0 +1,176 @@
+import { Component, OnInit } from '@angular/core';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { Store } from '@ngrx/store';
+import { Observable, of, Subject } from 'rxjs';
+import { first, map, tap } from 'rxjs/operators';
+
+import { AppState } from '../../../../../../store/src/app-state';
+import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
+import { EndpointModel } from '../../../../../../store/src/types/endpoint.types';
+import { getEventFiles } from '../../../../core/browser-helper';
+import { ConfirmationDialogConfig } from '../../../../shared/components/confirmation-dialog.config';
+import { ConfirmationDialogService } from '../../../../shared/components/confirmation-dialog.service';
+import { ITableListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source-types';
+import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
+import { StepOnNextFunction, StepOnNextResult } from '../../../../shared/components/stepper/step/step.component';
+import { BackupRestoreCellComponent } from '../backup-restore-cell/backup-restore-cell.component';
+import { BackupEndpointTypes } from '../backup-restore-endpoints.service';
+import { RestoreEndpointsService } from '../restore-endpoints.service';
+
+
+@Component({
+  selector: 'app-restore-endpoints',
+  templateUrl: './restore-endpoints.component.html',
+  styleUrls: ['./restore-endpoints.component.scss'],
+  providers: [
+    RestoreEndpointsService
+  ]
+})
+export class RestoreEndpointsComponent implements OnInit {
+
+  // Step 1
+  columns: ITableColumn<EndpointModel>[] = [
+    {
+      columnId: 'name',
+      headerCell: () => 'Name',
+      cellDefinition: {
+        valuePath: 'name'
+      }
+    },
+    {
+      columnId: 'endpoint',
+      headerCell: () => 'Restore',
+      cellComponent: BackupRestoreCellComponent,
+      cellConfig: {
+        type: BackupEndpointTypes.ENDPOINT,
+
+      }
+    },
+    {
+      columnId: 'connect',
+      headerCell: () => 'Include Connection',
+      cellComponent: BackupRestoreCellComponent,
+      cellConfig: {
+        type: BackupEndpointTypes.CONNECT
+      }
+    },
+    // TODO: RC disable backup token if unconnectable
+  ];
+  endpointDataSource: ITableListDataSource<EndpointModel>;
+  fileValid$: Observable<boolean>;
+  fileName: string;
+
+  // Step 2
+  passwordValid$: Observable<boolean>;
+  passwordForm: FormGroup;
+
+  constructor(
+    public service: RestoreEndpointsService,
+    store: Store<AppState>,
+    paginationMonitorFactory: PaginationMonitorFactory,
+    private confirmDialog: ConfirmationDialogService,
+  ) {
+
+    // const endpoints$ = of([]);
+    // this.endpointDataSource = {
+    //   isTableLoading$: of(false),
+    //   connect: () => endpoints$.pipe(
+    //     map(endpoints => endpoints.sort((a, b) => a.name.localeCompare(b.name)))
+    //   ),
+    //   disconnect: () => { },
+    //   trackBy: (index, row) => row.guid
+    // };
+
+    this.setupFileStep();
+
+    this.setupPasswordStep();
+
+  }
+
+  setupFileStep() {
+    this.fileValid$ = this.service.validFile$;
+  }
+
+  setupPasswordStep() {
+    this.passwordForm = new FormGroup({
+      password: new FormControl('', [Validators.required]),
+    });
+    this.passwordValid$ = this.passwordForm.statusChanges.pipe(
+      map(() => {
+        this.service.password = this.passwordForm.controls.password.value;
+        return this.passwordForm.valid;
+      })
+    );
+  }
+
+  ngOnInit() {
+  }
+
+  onFileChange(event) {
+    const files = getEventFiles(event);
+    if (!files.length) {
+      return;
+    }
+    const file = files[0];
+    console.log(event, file);
+    this.service.setFile(file);
+
+    // console.log(files);
+    // TODO: RC file load - get content of file
+    // TODO: RC file load - validate correct file
+    // TODO: RC file load - parse file
+    // TODO: RC file load - enable next step
+
+
+    // const utils = new DeployApplicationFsUtils();
+    // utils.handleFileInputSelection(files).pipe(
+    //   filter(res => !!res),
+    //   first()
+    // ).subscribe((res) => {
+    //   this.propagateChange(res);
+    //   this.sourceData$.next(res);
+    // });
+  }
+
+  restore: StepOnNextFunction = () => {
+    const confirmation = new ConfirmationDialogConfig(
+      'Restore',
+      'This will overwrite any matching endpoints and connection details',
+      'Continue',
+      true
+    );
+    const result = new Subject<StepOnNextResult>();
+
+    const userCancelledDialog = () => {
+      result.next({
+        success: false
+      });
+    };
+
+    const restoreSuccess = data => {
+      result.next({
+        success: true,
+        redirect: true,
+      });
+    };
+
+    const backupFailure = err => {
+      const errorMessage = this.service.createError(err);
+      result.next({
+        success: false,
+        message: `Failed to restore backup` + (errorMessage ? `: ${errorMessage}` : '')
+      });
+      return of(false);
+    };
+    // TODO: RC make generic in base
+
+    const createBackup = () => this.service.restoreBackup().pipe(first()).subscribe(restoreSuccess, backupFailure);
+
+    // TODO: RC tie in progress indicator (not sure if possible)
+    this.confirmDialog.openWithCancel(confirmation, createBackup, userCancelledDialog);
+
+    // TODO: RC Remove console.log
+    return result.asObservable().pipe(tap(console.log));
+  }
+
+}
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 b68dec67b8..c3704479ff 100644
--- a/src/frontend/packages/core/src/features/endpoints/endpoints.module.ts
+++ b/src/frontend/packages/core/src/features/endpoints/endpoints.module.ts
@@ -1,16 +1,22 @@
-import { EditEndpointStepComponent } from './edit-endpoint/edit-endpoint-step/edit-endpoint-step.component';
 import { NgModule } from '@angular/core';
 
 import { CoreModule } from '../../core/core.module';
 import { SharedModule } from '../../shared/shared.module';
+import { BackupEndpointsComponent } from './backup-restore/backup-endpoints/backup-endpoints.component';
+import { BackupRestoreCellComponent } from './backup-restore/backup-restore-cell/backup-restore-cell.component';
+import {
+  BackupRestoreEndpointsComponent,
+} from './backup-restore/backup-restore-endpoints/backup-restore-endpoints.component';
+import { RestoreEndpointsComponent } from './backup-restore/restore-endpoints/restore-endpoints.component';
 import { CredentialsAuthFormComponent } from './connect-endpoint-dialog/auth-forms/credentials-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 { EditEndpointStepComponent } from './edit-endpoint/edit-endpoint-step/edit-endpoint-step.component';
+import { EditEndpointComponent } from './edit-endpoint/edit-endpoint.component';
 import { EndpointsPageComponent } from './endpoints-page/endpoints-page.component';
 import { EndpointsRoutingModule } from './endpoints.routing';
-import { EditEndpointComponent } from './edit-endpoint/edit-endpoint.component';
 
 @NgModule({
   imports: [
@@ -27,12 +33,17 @@ import { EditEndpointComponent } from './edit-endpoint/edit-endpoint.component';
     NoneAuthFormComponent,
     EditEndpointComponent,
     EditEndpointStepComponent,
+    BackupRestoreEndpointsComponent,
+    BackupEndpointsComponent,
+    RestoreEndpointsComponent,
+    BackupRestoreCellComponent,
   ],
   entryComponents: [
     ConnectEndpointDialogComponent,
     CredentialsAuthFormComponent,
     SSOAuthFormComponent,
-    NoneAuthFormComponent
+    NoneAuthFormComponent,
+    BackupRestoreCellComponent
   ]
 })
 export class EndpointsModule { }
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 2b9fcb25c4..194357b894 100644
--- a/src/frontend/packages/core/src/features/endpoints/endpoints.routing.ts
+++ b/src/frontend/packages/core/src/features/endpoints/endpoints.routing.ts
@@ -4,12 +4,17 @@ import { RouterModule, Routes } from '@angular/router';
 import { DynamicExtensionRoutes } from '../../core/extension/dynamic-extension-routes';
 import { StratosActionType } from '../../core/extension/extension-service';
 import { PageNotFoundComponentComponent } from '../../core/page-not-found-component/page-not-found-component.component';
+import { BackupEndpointsComponent } from './backup-restore/backup-endpoints/backup-endpoints.component';
+import {
+  BackupRestoreEndpointsComponent,
+} from './backup-restore/backup-restore-endpoints/backup-restore-endpoints.component';
+import { RestoreEndpointsComponent } from './backup-restore/restore-endpoints/restore-endpoints.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';
 import { EditEndpointComponent } from './edit-endpoint/edit-endpoint.component';
+import { EndpointsPageComponent } from './endpoints-page/endpoints-page.component';
 
 const endpointsRoutes: Routes = [
   {
@@ -34,6 +39,18 @@ const endpointsRoutes: Routes = [
     path: 'edit/:id',
     component: EditEndpointComponent
   },
+  {
+    path: 'backup-restore',
+    component: BackupRestoreEndpointsComponent
+  },
+  {
+    path: 'backup-restore/backup',
+    component: BackupEndpointsComponent
+  },
+  {
+    path: 'backup-restore/restore',
+    component: RestoreEndpointsComponent
+  },
   {
     path: '**',
     component: PageNotFoundComponentComponent,
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.ts
index 2b101101aa..d27c1f175f 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.ts
@@ -55,6 +55,7 @@ export const listTableCells: Type<TableCellCustom<any>>[] = [
   TableCellFavoriteComponent,
   TableCellEndpointDetailsComponent,
   TableCellSidePanelComponent,
+  // BackupRestoreCellComponent,
   ...coreEndpointListDetailsComponents
 ];
 
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 6955532041..429f68fafd 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
@@ -1,18 +1,22 @@
 import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
+import { of } from 'rxjs';
+import { filter, map } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
-import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
 import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { getFullEndpointApiUrl } from '../../../../../features/endpoints/endpoint-helpers';
 import { EntityMonitorFactory } from '../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { InternalEventMonitorFactory } from '../../../../../../../store/src/monitors/internal-event-monitor.factory';
 import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory';
+import { AuthState } from '../../../../../../../store/src/reducers/auth.reducer';
+import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
+import { getFullEndpointApiUrl } from '../../../../../features/endpoints/endpoint-helpers';
 import { FavoritesConfigMapper } from '../../../favorites-meta-card/favorite-config-mapper';
 import { createTableColumnFavorite } from '../../list-table/table-cell-favorite/table-cell-favorite.component';
 import { ITableColumn } from '../../list-table/table.types';
-import { IListAction, IListConfig, ListViewTypes } from '../../list.component.types';
+import { IGlobalListAction, IListAction, IListConfig, ListViewTypes } from '../../list.component.types';
 import { EndpointCardComponent } from './endpoint-card/endpoint-card.component';
 import { EndpointListHelper } from './endpoint-list.helpers';
 import { EndpointsDataSource } from './endpoints-data-source';
@@ -28,7 +32,18 @@ export class EndpointsListConfigService implements IListConfig<EndpointModel> {
 
   private singleActions: IListAction<EndpointModel>[];
 
-  private globalActions = [];
+  private globalActions: IGlobalListAction<EndpointModel>[] = [{
+    action: () => this.router.navigate(['endpoints/backup-restore']),
+    icon: 'settings_backup_restore',
+    label: 'Backup/Restore Endpoints',
+    description: 'Backup or Restore Endpoints',
+    visible$: this.store.select(s => s.auth).pipe(
+      filter(auth => !!auth && !!auth.sessionData),
+      map((auth: AuthState) => auth.sessionData),
+      map(session => session.user && session.user.admin)
+    ),
+    enabled$: of(true), // Table is not shown when there's no endpoints, so this should always be true
+  }];
 
   public readonly columns: ITableColumn<EndpointModel>[] = [
     {
@@ -109,7 +124,7 @@ export class EndpointsListConfigService implements IListConfig<EndpointModel> {
     internalEventMonitorFactory: InternalEventMonitorFactory,
     endpointListHelper: EndpointListHelper,
     favoritesConfigMapper: FavoritesConfigMapper,
-
+    private router: Router
   ) {
     this.singleActions = endpointListHelper.endpointActions();
     const favoriteCell = createTableColumnFavorite(
diff --git a/src/frontend/packages/store/src/actions/endpoint.actions.ts b/src/frontend/packages/store/src/actions/endpoint.actions.ts
index 21504086a8..c0a728eb06 100644
--- a/src/frontend/packages/store/src/actions/endpoint.actions.ts
+++ b/src/frontend/packages/store/src/actions/endpoint.actions.ts
@@ -160,4 +160,4 @@ export class UpdateEndpoint extends EndpointAction {
   ) {
     super();
   }
-}
\ No newline at end of file
+}
diff --git a/src/jetstream/cnsi.go b/src/jetstream/cnsi.go
index 3e01345e77..048a912ce8 100644
--- a/src/jetstream/cnsi.go
+++ b/src/jetstream/cnsi.go
@@ -4,6 +4,7 @@ import (
 	"crypto/x509"
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strconv"
@@ -278,8 +279,8 @@ func marshalClusterList(clusterList []*interfaces.ConnectedEndpoint) ([]byte, er
 	return jsonString, nil
 }
 
-func (p *portalProxy) UpdateEndointMetadata(guid string, metadata string) error {
-	log.Debug("UpdateEndointMetadata")
+func (p *portalProxy) UpdateEndpointMetadata(guid string, metadata string) error {
+	log.Debug("UpdateEndpointMetadata")
 
 	cnsiRepo, err := cnsis.NewPostgresCNSIRepository(p.DatabaseConnectionPool)
 	if err != nil {
@@ -635,3 +636,255 @@ func (p *portalProxy) updateEndpoint(c echo.Context) error {
 
 	return nil
 }
+
+// TODO: RC position
+type BackupDataRequest struct {
+	State    map[string]BackupEndpointsState `json:"state"`
+	UserID   string                          `json:"userId"`
+	Password string                          `json:"password"`
+}
+
+type BackupEndpointsState struct {
+	Endpoint   bool `json:"endpoint"`
+	Connect    bool `json:"connect"`
+	AllConnect bool `json:"all_connect"`
+}
+
+type BackupRestoreState struct {
+	Endpoints []*interfaces.CNSIRecord
+	Tokens    []interfaces.BackupTokenRecord
+}
+
+type RestoreDataRequest struct {
+	Data     string `json:"data"`
+	Password string `json:"password"`
+}
+
+// TODO: RC split out to new file?
+func (p *portalProxy) backupEndpoints(c echo.Context) error {
+	log.Debug("backupEndpoints")
+
+	// Check we can unmarshall the request
+	body, err := ioutil.ReadAll(c.Request().Body)
+	if err != nil {
+		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body")
+	}
+
+	data := &BackupDataRequest{}
+	if err = json.Unmarshal(body, data); err != nil {
+		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body - could not parse JSON")
+	}
+	// log.Infof("BODY: %+v", data)
+
+	if data.State == nil || len(data.State) == 0 {
+		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body - no endpoints to backup")
+	}
+
+	response, err := p.createBackup(data)
+	if err != nil {
+		return err
+	}
+
+	// Send back the response to the client
+	// TODO: RC Missing client_secret when serialised, `-` in definition
+	jsonString, err := json.Marshal(response)
+	if err != nil {
+		return interfaces.NewHTTPError(http.StatusInternalServerError, "Failed to serialize response")
+	}
+
+	// Encrypt data (see above) // TODO: RC leave until last
+	encryptedResponse := jsonString
+
+	// Return data
+	c.Response().Header().Set("Content-Type", "application/json")
+	c.Response().Write(encryptedResponse)
+	return nil
+}
+
+func (p *portalProxy) createBackup(data *BackupDataRequest) (*BackupRestoreState, error) {
+	log.Debug("createBackup")
+	allEndpoints, err := p.ListEndpoints()
+	if err != nil {
+		return nil, interfaces.NewHTTPError(http.StatusBadGateway, "Failed to fetch endpoints")
+	}
+
+	// Fetch/Format required data
+	endpoints := make([]*interfaces.CNSIRecord, 0)
+	// allTokensFrom := make([]string, 0)
+	// userTokenFrom := make([]string, 0)
+	tokens := make([]interfaces.BackupTokenRecord, 0)
+
+	for endpointID, endpoint := range data.State {
+
+		if !endpoint.Endpoint {
+			continue
+		}
+
+		for _, e := range allEndpoints {
+			if endpointID == e.GUID {
+				endpoints = append(endpoints, e)
+				break
+			}
+		}
+
+		if endpoint.AllConnect {
+			// allTokensFrom = append(allTokensFrom, endpointID)
+			if tokenRecords, ok := p.getCNSITokenRecordsBackup(endpointID); ok {
+				log.Warn("tokens for AllConnect")
+				tokens = append(tokens, tokenRecords...)
+			} else {
+				log.Warn("No tokens for AllConnect")
+				// TODO: RC
+			}
+		} else if endpoint.Connect {
+			// userTokenFrom = append(userTokenFrom, endpointID)
+			if tokenRecord, ok := p.GetCNSITokenRecordWithDisconnected(endpointID, data.UserID); ok {
+				log.Warn("tokens for Connect")
+				// var btr BackupTokenRecord
+				// TODO: RC Q This will be the linked token as if it were the users token
+				var btr = interfaces.BackupTokenRecord{
+					// tokenRecord: tokenRecord,
+					TokenRecord:  tokenRecord,
+					EndpointGUID: endpointID,
+					TokenType:    "CNSI",
+					UserGUID:     data.UserID,
+				}
+
+				tokens = append(tokens, btr)
+			} else {
+				log.Warnf("No tokens for Connect: %+v,%+v", endpointID, data.UserID)
+				// TODO: RC
+				// msg := "Unable to retrieve CNSI token record."
+				// log.Debug(msg)
+				// return nil, nil, false
+			}
+		}
+	}
+
+	log.Infof("endpoints: %+v", endpoints)
+	// log.Infof("allTokensFrom: %+v", allTokensFrom)
+	// log.Infof("userTokenFrom: %+v", userTokenFrom)
+	log.Infof("tokens: %+v", tokens)
+
+	response := &BackupRestoreState{
+		Endpoints: endpoints,
+		Tokens:    tokens,
+	}
+
+	return response, nil
+}
+
+// func (p *portalProxy) GetCNSITokens(cnsiGUID string) ([]interfaces.TokenRecord, bool) {
+// 	log.Debug("GetCNSITokens")
+// 	tokenRepo, err := tokens.NewPgsqlTokenRepository(p.DatabaseConnectionPool)
+// 	if err != nil {
+// 		return make([]interfaces.TokenRecord, 0), false
+// 	}
+
+// 	trs, err := tokenRepo.FindAllCNSITokenIncludeDisconnected(cnsiGUID, p.Config.EncryptionKeyInBytes)
+// 	if err != nil {
+// 		return make([]interfaces.TokenRecord, 0), false
+// 	}
+
+// 	return trs, true
+// }
+
+func (p *portalProxy) getCNSITokenRecordsBackup(endpointID string) ([]interfaces.BackupTokenRecord, bool) {
+	log.Debug("getCNSITokenRecordsBackup")
+	tokenRepo, err := tokens.NewPgsqlTokenRepository(p.DatabaseConnectionPool)
+	if err != nil {
+		return make([]interfaces.BackupTokenRecord, 0), false
+	}
+
+	trs, err := tokenRepo.FindAllCNSITokenBackup(endpointID, p.Config.EncryptionKeyInBytes)
+	if err != nil {
+		return make([]interfaces.BackupTokenRecord, 0), false
+	}
+
+	return trs, true
+}
+
+func (p *portalProxy) restoreEndpoints(c echo.Context) error {
+	log.Debug("restoreEndpoints")
+
+	// Check we can unmarshall the request
+	body, err := ioutil.ReadAll(c.Request().Body)
+	if err != nil {
+		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body")
+	}
+
+	data := &RestoreDataRequest{}
+	if err = json.Unmarshal(body, data); err != nil {
+		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body - could not parse JSON")
+	}
+
+	backup := &BackupRestoreState{}
+	if err = json.Unmarshal([]byte(data.Data), backup); err != nil {
+		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid backup - could not parse JSON")
+	}
+
+	err = p.restoreBackup(backup)
+	if err != nil {
+		return err
+	}
+
+	// log.Warnf("BACKUP DATA: %+v", backup)
+	c.Response().WriteHeader(http.StatusOK)
+	return nil
+
+}
+
+func (p *portalProxy) restoreBackup(backup *BackupRestoreState) error {
+	log.Debug("restoreBackup")
+	cnsiRepo, err := cnsis.NewPostgresCNSIRepository(p.DatabaseConnectionPool)
+	if err != nil {
+		return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to connect to db", "Failed to connect to db: %+v", err)
+	}
+
+	for _, endpoint := range backup.Endpoints {
+		if err := cnsiRepo.Overwrite(*endpoint, p.Config.EncryptionKeyInBytes); err != nil {
+			return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to overwrite endpoints", "Failed to overwrite endpoint: %+v", endpoint.Name)
+		}
+	}
+
+	tokenRepo, err := tokens.NewPgsqlTokenRepository(p.DatabaseConnectionPool)
+	if err != nil {
+		return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to connect to db", "Failed to connect to db: %+v", err)
+	}
+
+	for _, tr := range backup.Tokens {
+		if err := tokenRepo.SaveCNSIToken(tr.EndpointGUID, tr.UserGUID, tr.TokenRecord, p.Config.EncryptionKeyInBytes); err != nil {
+			return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to overwrite token", "Failed to overwrite token: %+v", tr.TokenRecord.TokenGUID)
+		}
+	}
+
+	return nil
+}
+
+// find := func(a interfaces.CNSIRecord) bool {
+// 	return endpointID == a.GUID
+// }
+
+// endpointPos := sliceContainsFn(find, allEndpoints)
+// if endpointPos >= 0 {
+// 	endpoints = append(endpoints, endpoints[endpointPos])
+// }
+
+// // TODO:RC pos
+// func sliceContains(what interface{}, where []interface{}) (idx int) {
+// 	for i, v := range where {
+// 		if v == what {
+// 			return i
+// 		}
+// 	}
+// 	return -1
+// }
+
+// func sliceContainsFn(is func(a interface{}) bool, where []interface{}) (idx int) {
+// 	for i, v := range where {
+// 		if is(v) {
+// 			return i
+// 		}
+// 	}
+// 	return -1
+// }
diff --git a/src/jetstream/main.go b/src/jetstream/main.go
index 9b649da31d..ea8da57516 100644
--- a/src/jetstream/main.go
+++ b/src/jetstream/main.go
@@ -973,6 +973,10 @@ func (p *portalProxy) registerRoutes(e *echo.Echo, needSetupMiddleware bool) {
 	// Apply edits for the given endpoint
 	adminGroup.POST("/endpoint/:id", p.updateEndpoint)
 
+	// TODO: RC Q better as `/backup` & `/restore`?
+	adminGroup.POST("/endpoints/backup", p.backupEndpoints)
+	adminGroup.POST("/endpoints/restore", p.restoreEndpoints)
+
 	adminGroup.POST("/unregister", p.unregisterCluster)
 	// sessionGroup.DELETE("/cnsis", p.removeCluster)
 
diff --git a/src/jetstream/repository/cnsis/cnsis.go b/src/jetstream/repository/cnsis/cnsis.go
index d18ddda5ef..b1e5bcc4bc 100644
--- a/src/jetstream/repository/cnsis/cnsis.go
+++ b/src/jetstream/repository/cnsis/cnsis.go
@@ -14,6 +14,7 @@ type Repository interface {
 	Save(guid string, cnsiRecord interfaces.CNSIRecord, encryptionKey []byte) error
 	Update(endpoint interfaces.CNSIRecord, encryptionKey []byte) error
 	UpdateMetadata(guid string, metadata string) error
+	Overwrite(endpoint interfaces.CNSIRecord, encryptionKey []byte) error
 }
 
 type Endpoint interface {
diff --git a/src/jetstream/repository/cnsis/pgsql_cnsis.go b/src/jetstream/repository/cnsis/pgsql_cnsis.go
index 7d8db3b2ff..6ba5344004 100644
--- a/src/jetstream/repository/cnsis/pgsql_cnsis.go
+++ b/src/jetstream/repository/cnsis/pgsql_cnsis.go
@@ -38,6 +38,8 @@ var updateCNSI = `UPDATE cnsis SET name = $1, skip_ssl_validation = $2, sso_allo
 // Update the metadata
 var updateCNSIMetadata = `UPDATE cnsis SET meta_data = $1 WHERE guid = $2`
 
+var countCNSI = `SELECT COUNT(*) FROM cnsis WHERE guid=$1`
+
 // PostgresCNSIRepository is a PostgreSQL-backed CNSI repository
 type PostgresCNSIRepository struct {
 	db *sql.DB
@@ -349,3 +351,33 @@ func (p *PostgresCNSIRepository) UpdateMetadata(guid string, metadata string) er
 
 	return nil
 }
+
+// Overwrite - Creates or Updates CNSI Record
+func (p *PostgresCNSIRepository) Overwrite(endpoint interfaces.CNSIRecord, encryptionKey []byte) error {
+	log.Debug("Overwrite CNSI")
+
+	// Is there an existing token?
+	var count int
+	err := p.db.QueryRow(countCNSI, endpoint.GUID).Scan(&count)
+	if err != nil {
+		log.Errorf("Unknown error attempting to find CNSI: %v", err)
+	}
+
+	// if _, err := p.Find(endpoint.GUID, encryptionKey); err != nil {
+	// 	// Found, so update endpoint
+	// 	// TODO: RC ALL STRINGS?
+	// 	return p.Update(endpoint, encryptionKey)
+	// } else {
+	// 	// Not Found, create endpoint
+	// 	return p.Save(endpoint.GUID, endpoint, encryptionKey)
+	// 	// TODO: RC Q could actually be error
+	// }
+
+	switch count {
+	case 0:
+		return p.Save(endpoint.GUID, endpoint, encryptionKey)
+	default:
+
+		return p.Update(endpoint, encryptionKey)
+	}
+}
diff --git a/src/jetstream/repository/interfaces/portal_proxy.go b/src/jetstream/repository/interfaces/portal_proxy.go
index d965601156..4f7ec4eefd 100644
--- a/src/jetstream/repository/interfaces/portal_proxy.go
+++ b/src/jetstream/repository/interfaces/portal_proxy.go
@@ -44,7 +44,7 @@ type PortalProxy interface {
 	Env() *env.VarSet
 	ListEndpointsByUser(userGUID string) ([]*ConnectedEndpoint, error)
 	ListEndpoints() ([]*CNSIRecord, error)
-	UpdateEndointMetadata(guid string, metadata string) error
+	UpdateEndpointMetadata(guid string, metadata string) error
 
 	// UAA Token
 	GetUAATokenRecord(userGUID string) (TokenRecord, error)
diff --git a/src/jetstream/repository/interfaces/structs.go b/src/jetstream/repository/interfaces/structs.go
index 041f2ebea0..bdca5a0493 100644
--- a/src/jetstream/repository/interfaces/structs.go
+++ b/src/jetstream/repository/interfaces/structs.go
@@ -85,13 +85,21 @@ const (
 	AuthConnectTypeNone = "none"
 )
 
-// Token record for an endpoint (includes the Endpoint GUID)
-type EndpointTokenRecord struct {
-	*TokenRecord
-	EndpointGUID    string
-	EndpointType    string
-	APIEndpint      string
-	LoggingEndpoint string
+// // Token record for an endpoint (includes the Endpoint GUID)
+// type EndpointTokenRecord struct {
+// 	*TokenRecord
+// 	EndpointGUID    string
+// 	EndpointType    string
+// 	APIEndpint      string
+// 	LoggingEndpoint string
+// }
+
+// BackupTokenRecord used when backing up tokens
+type BackupTokenRecord struct {
+	TokenRecord  TokenRecord
+	UserGUID     string
+	EndpointGUID string
+	TokenType    string
 }
 
 // TokenRecord repsrents and endpoint or uaa token
diff --git a/src/jetstream/repository/tokens/pgsql_tokens.go b/src/jetstream/repository/tokens/pgsql_tokens.go
index 37e715551c..ddb7dfc3f3 100644
--- a/src/jetstream/repository/tokens/pgsql_tokens.go
+++ b/src/jetstream/repository/tokens/pgsql_tokens.go
@@ -43,6 +43,19 @@ var findCNSITokenConnected = `SELECT token_guid, auth_token, refresh_token, toke
 										FROM tokens
 										WHERE cnsi_guid = $1 AND (user_guid = $2 OR user_guid = $3) AND token_type = 'cnsi' AND disconnected = '0'`
 
+// TODO: RC
+var findAllCNSIToken2 = `SELECT token_guid, auth_token, refresh_token, token_expiry, disconnected, auth_type, meta_data, user_guid, linked_token
+										FROM tokens
+										WHERE cnsi_guid = $1 AND token_type = 'cnsi'`
+
+var findAllCNSITokenConnected = `SELECT token_guid, auth_token, refresh_token, token_expiry, disconnected, auth_type, meta_data, user_guid, linked_token
+										FROM tokens
+										WHERE cnsi_guid = $1 AND token_type = 'cnsi' AND disconnected = '0'`
+
+var findAllCNSIToken = `SELECT user_guid, token_guid, auth_token, refresh_token, token_expiry, disconnected, auth_type, meta_data, user_guid, linked_token
+										FROM tokens
+										WHERE cnsi_guid = $1 AND token_type = 'cnsi'`
+
 var countCNSITokens = `SELECT COUNT(*)
 											FROM tokens
 											WHERE cnsi_guid=$1 AND user_guid = $2 AND token_type = 'cnsi'`
@@ -82,12 +95,15 @@ func InitRepositoryProvider(databaseProvider string) {
 	updateAuthToken = datastore.ModifySQLStatement(updateAuthToken, databaseProvider)
 	findCNSIToken = datastore.ModifySQLStatement(findCNSIToken, databaseProvider)
 	findCNSITokenConnected = datastore.ModifySQLStatement(findCNSITokenConnected, databaseProvider)
+	findAllCNSIToken2 = datastore.ModifySQLStatement(findAllCNSIToken2, databaseProvider)
+	findAllCNSITokenConnected = datastore.ModifySQLStatement(findAllCNSITokenConnected, databaseProvider)
 	countCNSITokens = datastore.ModifySQLStatement(countCNSITokens, databaseProvider)
 	insertCNSIToken = datastore.ModifySQLStatement(insertCNSIToken, databaseProvider)
 	updateCNSIToken = datastore.ModifySQLStatement(updateCNSIToken, databaseProvider)
 	deleteCNSIToken = datastore.ModifySQLStatement(deleteCNSIToken, databaseProvider)
 	deleteCNSITokens = datastore.ModifySQLStatement(deleteCNSITokens, databaseProvider)
 	updateToken = datastore.ModifySQLStatement(updateToken, databaseProvider)
+	findAllCNSIToken = datastore.ModifySQLStatement(findAllCNSIToken, databaseProvider)
 }
 
 // saveAuthToken - Save the Auth token to the datastore
@@ -313,6 +329,129 @@ func (p *PgsqlTokenRepository) SaveCNSIToken(cnsiGUID string, userGUID string, t
 	return nil
 }
 
+// TODO: RC remove all `all`
+func (p *PgsqlTokenRepository) FindAllCNSIToken(cnsiGUID string, encryptionKey []byte) ([]interfaces.TokenRecord, error) {
+	log.Debug("FindAllCNSIToken")
+	return p.findAllCNSIToken(cnsiGUID, encryptionKey, false)
+}
+
+func (p *PgsqlTokenRepository) FindAllCNSITokenIncludeDisconnected(cnsiGUID string, encryptionKey []byte) ([]interfaces.TokenRecord, error) {
+	log.Debug("FindAllCNSITokenIncludeDisconnected")
+	return p.findAllCNSIToken(cnsiGUID, encryptionKey, true)
+}
+
+func (p *PgsqlTokenRepository) findAllCNSIToken(cnsiGUID string, encryptionKey []byte, includeDisconnected bool) ([]interfaces.TokenRecord, error) {
+	log.Debug("findAllCNSIToken")
+	if cnsiGUID == "" {
+		msg := "Unable to find CNSI Token without a valid CNSI GUID."
+		log.Debug(msg)
+		return make([]interfaces.TokenRecord, 0), errors.New(msg)
+	}
+
+	var rows *sql.Rows
+	var err error
+	if includeDisconnected {
+		rows, err = p.db.Query(findAllCNSIToken, cnsiGUID)
+	} else {
+		rows, err = p.db.Query(findAllCNSITokenConnected, cnsiGUID)
+	}
+	if err != nil {
+		msg := "Unable to Find All CNSI tokens: %v"
+		if err == sql.ErrNoRows {
+			log.Debugf(msg, err)
+		} else {
+			log.Errorf(msg, err)
+		}
+		return make([]interfaces.TokenRecord, 0), fmt.Errorf(msg, err)
+	}
+
+	// TODO: RC Q should this close come before returning? it doesn't in cnsi List(encryptionKey []byte) ([]*interfaces.CNSIRecord, error) {
+	defer rows.Close()
+
+	trs := make([]interfaces.TokenRecord, 0)
+	for rows.Next() {
+		// temp vars to retrieve db data
+		var (
+			tokenGUID              sql.NullString
+			ciphertextAuthToken    []byte
+			ciphertextRefreshToken []byte
+			tokenExpiry            sql.NullInt64
+			disconnected           bool
+			authType               string
+			metadata               sql.NullString
+			tokenUserGUID          sql.NullString
+			linkedTokenGUID        sql.NullString
+		)
+		err = rows.Scan(&tokenGUID, &ciphertextAuthToken, &ciphertextRefreshToken, &tokenExpiry, &disconnected, &authType, &metadata, &tokenUserGUID, &linkedTokenGUID)
+		if err != nil {
+			return nil, fmt.Errorf("Unable to scan CNSI records: %v", err)
+		}
+
+		log.Debug("Decrypting Auth Token")
+		plaintextAuthToken, err := crypto.DecryptToken(encryptionKey, ciphertextAuthToken)
+		if err != nil {
+			return make([]interfaces.TokenRecord, 0), err
+		}
+
+		log.Debug("Decrypting Refresh Token")
+		plaintextRefreshToken, err := crypto.DecryptToken(encryptionKey, ciphertextRefreshToken)
+		if err != nil {
+			return make([]interfaces.TokenRecord, 0), err
+		}
+
+		// Build a new TokenRecord based on the decrypted tokens
+		tr := new(interfaces.TokenRecord)
+		if tokenGUID.Valid {
+			tr.TokenGUID = tokenGUID.String
+		}
+		tr.AuthToken = plaintextAuthToken
+		tr.RefreshToken = plaintextRefreshToken
+		if tokenExpiry.Valid {
+			tr.TokenExpiry = tokenExpiry.Int64
+		}
+		tr.Disconnected = disconnected
+		tr.AuthType = authType
+		if metadata.Valid {
+			tr.Metadata = metadata.String
+		}
+		if tokenUserGUID.Valid {
+			tr.SystemShared = tokenUserGUID.String == SystemSharedUserGuid
+		}
+		if linkedTokenGUID.Valid {
+			tr.LinkedGUID = linkedTokenGUID.String
+		}
+
+		trs = append(trs, *tr)
+
+	}
+
+	// TODO: RC merge with find single
+	// TODO: RC Use?
+	// // If this token is linked - fetch that token and use it instead
+	// // Currently we don't recurse - we only support one level of linked token - you can't link to another linked token
+	// if linkedTokenGUID.Valid {
+	// 	if includeDisconnected {
+	// 		err = p.db.QueryRow(getToken, userGUID, linkedTokenGUID.String).Scan(&tokenGUID, &ciphertextAuthToken, &ciphertextRefreshToken, &tokenExpiry, &disconnected, &authType, &metadata, &tokenUserGUID, &linkedTokenGUID)
+	// 	} else {
+	// 		err = p.db.QueryRow(getTokenConnected, userGUID, linkedTokenGUID.String).Scan(&tokenGUID, &ciphertextAuthToken, &ciphertextRefreshToken, &tokenExpiry, &disconnected, &authType, &metadata, &tokenUserGUID, &linkedTokenGUID)
+	// 	}
+
+	// 	if err != nil {
+	// 		msg := "Unable to Find CNSI token: %v"
+	// 		if err == sql.ErrNoRows {
+	// 			log.Debugf(msg, err)
+	// 		} else {
+	// 			log.Errorf(msg, err)
+	// 		}
+	// 		return interfaces.TokenRecord{}, fmt.Errorf(msg, err)
+	// 	}
+	// }
+
+	// TODO: RC Finish off
+
+	return trs, nil
+}
+
 func (p *PgsqlTokenRepository) FindCNSIToken(cnsiGUID string, userGUID string, encryptionKey []byte) (interfaces.TokenRecord, error) {
 	log.Debug("FindCNSIToken")
 	return p.findCNSIToken(cnsiGUID, userGUID, encryptionKey, false)
@@ -323,6 +462,97 @@ func (p *PgsqlTokenRepository) FindCNSITokenIncludeDisconnected(cnsiGUID string,
 	return p.findCNSIToken(cnsiGUID, userGUID, encryptionKey, true)
 }
 
+func (p *PgsqlTokenRepository) FindAllCNSITokenBackup(cnsiGUID string, encryptionKey []byte) ([]interfaces.BackupTokenRecord, error) {
+	log.Debug("FindAllCNSITokenBackup")
+	if cnsiGUID == "" {
+		msg := "Unable to find CNSI Token without a valid CNSI GUID."
+		log.Debug(msg)
+		return make([]interfaces.BackupTokenRecord, 0), errors.New(msg)
+	}
+
+	var rows *sql.Rows
+	var err error
+	rows, err = p.db.Query(findAllCNSIToken, cnsiGUID)
+	if err != nil {
+		msg := "Unable to Find All CNSI tokens: %v"
+		if err == sql.ErrNoRows {
+			log.Debugf(msg, err)
+		} else {
+			log.Errorf(msg, err)
+		}
+		return make([]interfaces.BackupTokenRecord, 0), fmt.Errorf(msg, err)
+	}
+
+	// TODO: RC Q should this close come before returning? it doesn't in cnsi List(encryptionKey []byte) ([]*interfaces.CNSIRecord, error) {
+	defer rows.Close()
+
+	btrs := make([]interfaces.BackupTokenRecord, 0)
+	for rows.Next() {
+		// temp vars to retrieve db data
+		var (
+			userGUID               string
+			tokenGUID              sql.NullString
+			ciphertextAuthToken    []byte
+			ciphertextRefreshToken []byte
+			tokenExpiry            sql.NullInt64
+			disconnected           bool
+			authType               string
+			metadata               sql.NullString
+			tokenUserGUID          sql.NullString
+			linkedTokenGUID        sql.NullString
+		)
+		err = rows.Scan(&userGUID, &tokenGUID, &ciphertextAuthToken, &ciphertextRefreshToken, &tokenExpiry, &disconnected, &authType, &metadata, &tokenUserGUID, &linkedTokenGUID)
+		if err != nil {
+			return nil, fmt.Errorf("Unable to scan CNSI records: %v", err)
+		}
+
+		log.Debug("Decrypting Auth Token")
+		plaintextAuthToken, err := crypto.DecryptToken(encryptionKey, ciphertextAuthToken)
+		if err != nil {
+			return make([]interfaces.BackupTokenRecord, 0), err
+		}
+
+		log.Debug("Decrypting Refresh Token")
+		plaintextRefreshToken, err := crypto.DecryptToken(encryptionKey, ciphertextRefreshToken)
+		if err != nil {
+			return make([]interfaces.BackupTokenRecord, 0), err
+		}
+
+		// Build a new TokenRecord based on the decrypted tokens
+		tr := new(interfaces.TokenRecord)
+		if tokenGUID.Valid {
+			tr.TokenGUID = tokenGUID.String
+		}
+		tr.AuthToken = plaintextAuthToken
+		tr.RefreshToken = plaintextRefreshToken
+		if tokenExpiry.Valid {
+			tr.TokenExpiry = tokenExpiry.Int64
+		}
+		tr.Disconnected = disconnected
+		tr.AuthType = authType
+		if metadata.Valid {
+			tr.Metadata = metadata.String
+		}
+		if tokenUserGUID.Valid {
+			tr.SystemShared = tokenUserGUID.String == SystemSharedUserGuid
+		}
+		if linkedTokenGUID.Valid {
+			tr.LinkedGUID = linkedTokenGUID.String
+		}
+
+		btr := new(interfaces.BackupTokenRecord)
+		btr.TokenRecord = *tr
+		btr.EndpointGUID = cnsiGUID
+		btr.TokenType = "cnsi"
+		btr.UserGUID = userGUID
+
+		btrs = append(btrs, *btr)
+
+	}
+
+	return btrs, nil
+}
+
 func (p *PgsqlTokenRepository) findCNSIToken(cnsiGUID string, userGUID string, encryptionKey []byte, includeDisconnected bool) (interfaces.TokenRecord, error) {
 	log.Debug("findCNSIToken")
 	if cnsiGUID == "" {
@@ -545,3 +775,17 @@ func (p *PgsqlTokenRepository) UpdateTokenAuth(userGUID string, tr interfaces.To
 
 	return nil
 }
+
+// func (p *PgsqlTokenRepository) Overwrite(tr interfaces.TokenRecord, encryptionKey []byte) error {
+// 	log.Debug("Overwrite Token")
+
+// 	if _, err := p.FindCNSITokenIncludeDisconnected(endpointGuid, userGuid, encryptionKey); err != nil {
+// 		// Found, so update endpoint
+// 		// TODO: RC ALL STRINGS?
+// 		return p. Update(endpoint, encryptionKey)
+// 	} else {
+// 		// Not Found, create endpoint
+// 		return p.SaveCNSIToken(endpointGuid, userGuid, tr, encryptionKey)
+// 		// TODO: RC Q could actually be error
+// 	}
+// }
diff --git a/src/jetstream/repository/tokens/tokens.go b/src/jetstream/repository/tokens/tokens.go
index 05384df430..354baa58b6 100644
--- a/src/jetstream/repository/tokens/tokens.go
+++ b/src/jetstream/repository/tokens/tokens.go
@@ -18,6 +18,9 @@ type Repository interface {
 
 	FindCNSIToken(cnsiGUID string, userGUID string, encryptionKey []byte) (interfaces.TokenRecord, error)
 	FindCNSITokenIncludeDisconnected(cnsiGUID string, userGUID string, encryptionKey []byte) (interfaces.TokenRecord, error)
+	FindAllCNSIToken(cnsiGUID string, encryptionKey []byte) ([]interfaces.TokenRecord, error)
+	FindAllCNSITokenIncludeDisconnected(cnsiGUID string, encryptionKey []byte) ([]interfaces.TokenRecord, error)
+	FindAllCNSITokenBackup(cnsiGUID string, encryptionKey []byte) ([]interfaces.BackupTokenRecord, error)
 	DeleteCNSIToken(cnsiGUID string, userGUID string) error
 	DeleteCNSITokens(cnsiGUID string) error
 	SaveCNSIToken(cnsiGUID string, userGUID string, tokenRecord interfaces.TokenRecord, encryptionKey []byte) error
diff --git a/src/jetstream/stringutils/utils.go b/src/jetstream/stringutils/utils.go
index 2ea9baa5cb..b34c4c22ec 100644
--- a/src/jetstream/stringutils/utils.go
+++ b/src/jetstream/stringutils/utils.go
@@ -1,9 +1,9 @@
 package stringutils
 
 import (
+	"net/url"
 	"strings"
 	"unicode"
-	"net/url"
 )
 
 // ArrayContainsString checks the string array to see if it contains the specifed value

From 354aa08eecc7e656e002ffa304a06e117751e448 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 9 Apr 2020 16:05:00 +0100
Subject: [PATCH 014/176] E2E test fix

---
 protractor.conf.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/protractor.conf.js b/protractor.conf.js
index 5c7242d12d..8595858cf8 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -179,6 +179,11 @@ const config = {
     //   upload_throughput: 500 * 1024 * 1024 // Maximal aggregated upload throughput.
     // });
 
+    // Ensuer base URL does NOT end with a /
+    if (browser.baseUrl.endsWith('/')) {
+      browser.baseUrl = browser.baseUrl.substr(0, browser.baseUrl.length -1);
+    }
+
     skipPlugin.install(jasmine);
     require('ts-node').register({
       project: 'src/test-e2e/tsconfig.e2e.json'

From 77628e8ce623aea0f44b0abde1d1ddcd799c1bfc Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 10 Apr 2020 12:10:43 +0100
Subject: [PATCH 015/176] Fix mat-select option selection for e2e tests

---
 protractor.conf.js              |  5 ++++-
 src/test-e2e/po/component.po.ts | 14 ++++++++++++--
 src/test-e2e/po/form.po.ts      | 30 +++++++++++++++++-------------
 3 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/protractor.conf.js b/protractor.conf.js
index 8595858cf8..dd282d35ae 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -199,7 +199,10 @@ const config = {
     }).getJasmine2Reporter());
     jasmine.getEnv().addReporter(new SpecReporter({
       spec: {
-        displayStacktrace: true,
+        displayStacktrace: 'pretty',
+      },
+      summary: {
+        displayStacktrace: 'pretty',
       },
       customProcessors: specReporterCustomProcessors
     }));
diff --git a/src/test-e2e/po/component.po.ts b/src/test-e2e/po/component.po.ts
index 2f1c9ab62c..32149348fb 100644
--- a/src/test-e2e/po/component.po.ts
+++ b/src/test-e2e/po/component.po.ts
@@ -1,4 +1,4 @@
-import { browser, promise } from 'protractor';
+import { browser, promise, ElementArrayFinder, Locator } from 'protractor';
 import { ElementFinder, protractor } from 'protractor/built';
 
 import { E2EHelpers } from '../helpers/e2e-helpers';
@@ -10,8 +10,14 @@ const until = protractor.ExpectedConditions;
  */
 export class Component {
 
+  public static waitUntilShown(elm): promise.Promise<void> {
+    const comp = new Component(elm);
+    return comp.waitUntilShown();
+  }
+
   public static waitUntilNotShown(elm): promise.Promise<void> {
-    return browser.wait(until.invisibilityOf(elm), 5000);
+    const comp = new Component(elm);
+    return comp.waitUntilNotShown();
   }
 
   public static scrollIntoView(elm: ElementFinder): promise.Promise<void> {
@@ -20,6 +26,10 @@ export class Component {
 
   constructor(protected locator: ElementFinder) { }
 
+  all(allLocator: Locator): ElementArrayFinder {
+    return this.locator.all(allLocator);
+  }
+
   getComponent(): ElementFinder {
     return this.locator;
   }
diff --git a/src/test-e2e/po/form.po.ts b/src/test-e2e/po/form.po.ts
index 292ec3b189..f9697d2e42 100644
--- a/src/test-e2e/po/form.po.ts
+++ b/src/test-e2e/po/form.po.ts
@@ -20,9 +20,9 @@ export interface FormItem {
   checked: boolean;
   type: string;
   class: string;
-  sendKeys: Function;
-  clear: Function;
-  click: Function;
+  sendKeys: (text) => void;
+  clear: () => void;
+  click: () => void;
   tag: string;
   valid: string;
   error: string;
@@ -223,18 +223,22 @@ export class FormComponent extends Component {
               ctrl.sendKeys(Key.ESCAPE);
               break;
             }
-            let strValue = value as string;
-            // Handle spaces in text. (sendKeys sends space bar.. which closes drop down)
-            // Bonus - Sending string without space works... up until last character...which deselects desired option and selects top option
-            const containsSpace = strValue.indexOf(' ');
-            if (containsSpace >= 0) {
-              strValue = strValue.slice(0, containsSpace);
-            }
+
+            // Options are presented in a .mat-select-panel
+            // Open the selector
             ctrl.click();
-            ctrl.sendKeys(strValue);
-            ctrl.sendKeys(Key.RETURN);
+            const selectMenu = new Component(element(by.css('.mat-select-panel')));
+            selectMenu.waitUntilShown();
+            selectMenu.all(by.tagName('mat-option')).map(this.mapField).then(options => {
+              const opt: any = options.find((option: FormItem) => option.text === value);
+              if (opt) {
+                opt.click();
+                selectMenu.waitUntilNotShown();
+              }
+            });
+
             if (!expectFailure) {
-              expect(this.getText(field)).toBe(value, `Failed to set field '${field}' with '${strValue}'`);
+              expect(this.getText(field)).toBe(value, `Failed to set field '${field}' with '${value}'`);
             } else {
               expect(this.getText(field)).not.toBe(value);
             }

From 0efa6dc79fbf807d084a70198f17cdb8385a33d5 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 10 Apr 2020 14:20:47 +0100
Subject: [PATCH 016/176] Fix git ignore with secrets.yaml

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index ed422405e2..fc81bdc82b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,7 +86,7 @@ src/backend/*/vendor/
 .v8flags*
 
 *.bak
-./secrets.yaml
+/secrets.yaml
 build/dev_config.json
 e2e-reports/
 .stratos-git-metadata.json

From da8a57d771e1ef9a026b9e542f695ad28a7aca8b Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 10 Apr 2020 14:22:43 +0100
Subject: [PATCH 017/176] Update angular to fix prod build issue

---
 package-lock.json | 1258 ++++++++++++++++++++++++++-------------------
 package.json      |   44 +-
 2 files changed, 761 insertions(+), 541 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4471d07a75..e17ce6468b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,12 +5,12 @@
   "requires": true,
   "dependencies": {
     "@angular-devkit/architect": {
-      "version": "0.901.0",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.0.tgz",
-      "integrity": "sha512-SlqEBkPrT40zMCy5344AsUqC76pEPCaGPaAkCIvadaz2dC9vNMzQrvubCPJHViD/TumkSX1kYmLS3iYASVM9GQ==",
+      "version": "0.901.1",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.1.tgz",
+      "integrity": "sha512-foWDAurMfBDYLAJxHpTFkJBub1c2A8+eWHbBjgqIHmT8xadnE7t8nSA9XDl+k/kIoWw/qFU+6IttPirudYc/vw==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "9.1.0",
+        "@angular-devkit/core": "9.1.1",
         "rxjs": "6.5.4"
       },
       "dependencies": {
@@ -26,21 +26,21 @@
       }
     },
     "@angular-devkit/build-angular": {
-      "version": "0.901.0",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.901.0.tgz",
-      "integrity": "sha512-ftJVNlKvIomqRfr5jFVraPqlLSUJu8YyVbFv/aCsvhNpuZGkYpTOMoJDwyywdslSTH608BIoU63IAnIz9PwUdw==",
+      "version": "0.901.1",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.901.1.tgz",
+      "integrity": "sha512-6uEvo5htsJoxQHBVwHOGmM6YWq5q6m9UWMv/ughlek0RtSLFfOt9TZQ/yQHgtGQsCQvscD/jBzVoD0zD5Ax/SQ==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.901.0",
-        "@angular-devkit/build-optimizer": "0.901.0",
-        "@angular-devkit/build-webpack": "0.901.0",
-        "@angular-devkit/core": "9.1.0",
+        "@angular-devkit/architect": "0.901.1",
+        "@angular-devkit/build-optimizer": "0.901.1",
+        "@angular-devkit/build-webpack": "0.901.1",
+        "@angular-devkit/core": "9.1.1",
         "@babel/core": "7.9.0",
         "@babel/generator": "7.9.3",
         "@babel/preset-env": "7.9.0",
         "@babel/template": "7.8.6",
         "@jsdevtools/coverage-istanbul-loader": "3.0.3",
-        "@ngtools/webpack": "9.1.0",
+        "@ngtools/webpack": "9.1.1",
         "ajv": "6.12.0",
         "autoprefixer": "9.7.4",
         "babel-loader": "8.0.6",
@@ -82,7 +82,7 @@
         "style-loader": "1.1.3",
         "stylus": "0.54.7",
         "stylus-loader": "3.0.2",
-        "terser": "4.6.7",
+        "terser": "4.6.10",
         "terser-webpack-plugin": "2.3.5",
         "tree-kill": "1.2.2",
         "webpack": "4.42.0",
@@ -94,6 +94,12 @@
         "worker-plugin": "4.0.2"
       },
       "dependencies": {
+        "core-js": {
+          "version": "3.6.4",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
+          "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+          "dev": true
+        },
         "glob": {
           "version": "7.1.6",
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
@@ -143,16 +149,35 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
           "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
           "dev": true
+        },
+        "terser": {
+          "version": "4.6.10",
+          "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.10.tgz",
+          "integrity": "sha512-qbF/3UOo11Hggsbsqm2hPa6+L4w7bkr+09FNseEe8xrcVD3APGLFqE+Oz1ZKAxjYnFsj80rLOfgAtJ0LNJjtTA==",
+          "dev": true,
+          "requires": {
+            "commander": "^2.20.0",
+            "source-map": "~0.6.1",
+            "source-map-support": "~0.5.12"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.6.1",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+              "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+              "dev": true
+            }
+          }
         }
       }
     },
     "@angular-devkit/build-ng-packagr": {
-      "version": "0.901.0",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-ng-packagr/-/build-ng-packagr-0.901.0.tgz",
-      "integrity": "sha512-cUQKK7+bYi3fOmq41cfr1ZFQwqAUUm0Yz7DgH34Ek7D98XudNOxJ63Xv4manId528WhqyGDP5/2tut7QNV3VJA==",
+      "version": "0.901.1",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-ng-packagr/-/build-ng-packagr-0.901.1.tgz",
+      "integrity": "sha512-shoWppF08glJmfZV3NdZ48MMjZWETAaiZHGV/TBWzgr3O84Sl6juauqeApHZW27inpjEqyJUktp3PA7eMnpeag==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.901.0",
+        "@angular-devkit/architect": "0.901.1",
         "rxjs": "6.5.4"
       },
       "dependencies": {
@@ -168,15 +193,15 @@
       }
     },
     "@angular-devkit/build-optimizer": {
-      "version": "0.901.0",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.901.0.tgz",
-      "integrity": "sha512-Y9sz8uf2zjilhPUVYb0K9Mio6c1d5c+csuDc15CCKzELXJwyyDxilIFgn6Eu+edM0HNQGzbIwkjy4DkR9mtuTQ==",
+      "version": "0.901.1",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.901.1.tgz",
+      "integrity": "sha512-o0A9CcyDQSUnC5CQIKf92VH8amIYRYrMgLf2kdhSMcy0QV+rEJyN81dSvwX/Yxgnr9NbWEAQg7jnyKk06vfhOw==",
       "dev": true,
       "requires": {
         "loader-utils": "2.0.0",
         "source-map": "0.7.3",
         "tslib": "1.11.1",
-        "typescript": "3.8.3",
+        "typescript": "3.6.5",
         "webpack-sources": "1.4.3"
       },
       "dependencies": {
@@ -185,17 +210,23 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
           "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
           "dev": true
+        },
+        "typescript": {
+          "version": "3.6.5",
+          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.5.tgz",
+          "integrity": "sha512-BEjlc0Z06ORZKbtcxGrIvvwYs5hAnuo6TKdNFL55frVDlB+na3z5bsLhFaIxmT+dPWgBIjMo6aNnTOgHHmHgiQ==",
+          "dev": true
         }
       }
     },
     "@angular-devkit/build-webpack": {
-      "version": "0.901.0",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.901.0.tgz",
-      "integrity": "sha512-Oze0VzIvHnoW12C80fiNH4HBu/GWmhJPXdNA7nRkU/tBQlIKnfngf8rQ0QbgecN2qdEXQpZJsP/XclTi3zugsg==",
+      "version": "0.901.1",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.901.1.tgz",
+      "integrity": "sha512-9oNI+wPSk8yECy+f0EebfMx4PH3uDJRrifYZAxcr84IpzEbpfpRuYhE3ecwqd7k0zu2Kdjw1uUrGxBuH4/sbGg==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.901.0",
-        "@angular-devkit/core": "9.1.0",
+        "@angular-devkit/architect": "0.901.1",
+        "@angular-devkit/core": "9.1.1",
         "rxjs": "6.5.4"
       },
       "dependencies": {
@@ -211,9 +242,9 @@
       }
     },
     "@angular-devkit/core": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.0.tgz",
-      "integrity": "sha512-vHTsrB4JaVUQ95FRnKrgo79Y3F6FokImrZdrmwkQmwAThpjXeXmpUEKZS+ZSTFRgesjiIysVGOFijARP4BQ7Bg==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.1.tgz",
+      "integrity": "sha512-57MNew2u1QwVb69jxZyhXgdW9kqcGyWyRy2ui/hWCkWLg7RumWtyypmdTs89FNExB4HqtXlQ2eO3JZxfs7QR3w==",
       "dev": true,
       "requires": {
         "ajv": "6.12.0",
@@ -241,12 +272,12 @@
       }
     },
     "@angular-devkit/schematics": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.0.tgz",
-      "integrity": "sha512-cb9PSvskMwWlL54fPfCcpJoyNDWAX6Wo7CzL5qpIB2cJCPLAuyfRUYYrkO77YUST+n2HvypHz0cZ5SNGMfaaBQ==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.1.tgz",
+      "integrity": "sha512-6wx2HcvafHvEjEa1tjDzW2hXrOiSE8ALqJUArb3+NoO1BDM42aGcqyPo0ODzKtDk12CgSsFXdNKRpQ5AmpSPtw==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "9.1.0",
+        "@angular-devkit/core": "9.1.1",
         "ora": "4.0.3",
         "rxjs": "6.5.4"
       },
@@ -263,9 +294,9 @@
       }
     },
     "@angular/animations": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-9.1.0.tgz",
-      "integrity": "sha512-o7X3HM+eocoryw3VrDUtG6Wci2KwtzyBFo3KBJXjQ16X6fwdkjTG+hLb7pp2CBFBEJW4tPYEy7cSBmEfMRTqag=="
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-9.1.1.tgz",
+      "integrity": "sha512-IvKv8sV0ymbzDEX2ZLW+F6nOTQqDYallHexuzRVT9txvNE8TNHyySvLcyC5dTmX9fj9LA72NZ6nFyhxq0LFvtQ=="
     },
     "@angular/cdk": {
       "version": "9.2.0",
@@ -276,16 +307,16 @@
       }
     },
     "@angular/cli": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-9.1.0.tgz",
-      "integrity": "sha512-ofum4gPE/W3fKyzuJrpdHeOS0ZL8x0eYCgsrMyUoFodSpb5LWPqeW+56NgDTpIeny+Trx3pM9dr9QTUVTJ0vYg==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-9.1.1.tgz",
+      "integrity": "sha512-sjRAV4UF8M5v+2gw+EwCYSgciBZDc05AbNxQt+uUdxdfR1QU9hifWq8WDxfOR6jdDP5YqMtQsNaFNwrUyjJJoQ==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.901.0",
-        "@angular-devkit/core": "9.1.0",
-        "@angular-devkit/schematics": "9.1.0",
-        "@schematics/angular": "9.1.0",
-        "@schematics/update": "0.901.0",
+        "@angular-devkit/architect": "0.901.1",
+        "@angular-devkit/core": "9.1.1",
+        "@angular-devkit/schematics": "9.1.1",
+        "@schematics/angular": "9.1.1",
+        "@schematics/update": "0.901.1",
         "@yarnpkg/lockfile": "1.1.0",
         "ansi-colors": "4.1.1",
         "debug": "4.1.1",
@@ -294,7 +325,7 @@
         "npm-package-arg": "8.0.1",
         "npm-pick-manifest": "6.0.0",
         "open": "7.0.3",
-        "pacote": "11.1.4",
+        "pacote": "9.5.12",
         "read-package-tree": "5.3.1",
         "rimraf": "3.0.2",
         "semver": "7.1.3",
@@ -348,19 +379,19 @@
       }
     },
     "@angular/common": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-9.1.0.tgz",
-      "integrity": "sha512-6JPLNtMhI03bGTVQJeSwc+dTjV6DtP7M/BAyzIV0InZP1D6XsOh2QahLFIaaN2sSxYA2ClKuwfX1v+rx9AbXQA=="
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-9.1.1.tgz",
+      "integrity": "sha512-bS13veMs7//YqYjYJ+JI78ylaCyVcdFKZKikd5SZa6+r6fajcyvLnSKqrKypG3O1BeJ8vOG/Pq54P5gWhbR6eA=="
     },
     "@angular/compiler": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.1.0.tgz",
-      "integrity": "sha512-QHw/JSeTXHiJQ2Ih0EtU7FGsYcOr+0hwZhqwSW3EEn8TtUgA3DS5lXeiDV66f+3DdvNZFPmgiZIvun3ypxn1HA=="
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.1.1.tgz",
+      "integrity": "sha512-u1IP6IzUgK6lIzrG1cxp96umXgtThyhuFn/KPoyVt7wPxZ6vVR0ZxjM7zycEcrMGzk0nf0nyOKaksJk9sTXTbg=="
     },
     "@angular/compiler-cli": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-9.1.0.tgz",
-      "integrity": "sha512-xZ8mVPmPporSTtvNA+cbFJQymLzuWfMX6HDDgztZ2eZ5WcQJYloRN4CcYMEzDhCxfV1Zw9Tfc2l14jZD8osi6g==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-9.1.1.tgz",
+      "integrity": "sha512-2jGp0ck2kkLNMzXUo/3iJkrQqJ7oGXE8h2tksxBsH2ptnhexRYTHZ626t7Np128tduY5JeC7J1Jxz7MUuYsJ2Q==",
       "dev": true,
       "requires": {
         "canonical-path": "1.0.0",
@@ -549,9 +580,9 @@
           "dev": true
         },
         "p-limit": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
-          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -683,9 +714,9 @@
       }
     },
     "@angular/core": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.1.0.tgz",
-      "integrity": "sha512-RVlyegdIAij0P1wLY5ObIdsBAzvmHkHfElnmfiNKhaDftP6U/3zRtaKDu0bq0jvn1WCQ8zXxFQ8AWyKZwyFS+w=="
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.1.1.tgz",
+      "integrity": "sha512-6lDlUlePafr/392hOvvTZZl6xPHT50U6658sHUAVIr0Un4mJ2MHNHKZtO45bpn3hM4gjFcYRQ7Rpd0umW74iTA=="
     },
     "@angular/flex-layout": {
       "version": "9.0.0-beta.29",
@@ -693,14 +724,14 @@
       "integrity": "sha512-93sxR+kYfYMOdnlWL0Q77FZ428gg8XnBu0YZm6GsCdkw/vLggIT/G1ZAqHlCPIODt6pxmCJ5KXh4ShvniIYDsA=="
     },
     "@angular/forms": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-9.1.0.tgz",
-      "integrity": "sha512-5GC8HQlPChPV+168zLlm4yj4syA6N9ChSKV0tmzj1zIfMcub1UAOaB9IYaXRHQsjPFh9OuQXwmkzScyAfhEVjA=="
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-9.1.1.tgz",
+      "integrity": "sha512-NX+LuK8JFisiq3uHCOK6YoN/yIb2R9Ye5mwiOPkuZA3lZLKCnUXqCHZbM8VHy/WdjIxxeUaFMJc38yV8RVoabg=="
     },
     "@angular/language-service": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-9.1.0.tgz",
-      "integrity": "sha512-2f8ECoXrj40oS1rtIfi+F8T4WPzundcZDs8WMFNBuWYbk14v1S9sTgMEmZyePHGkPjt6IfYiLJKJCvVgrt1nxQ==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-9.1.1.tgz",
+      "integrity": "sha512-T+/0X2VnmgW/vzynqYTVv29qtebNvrCB/yJqtNIlqXvBjcB8XRRwZPDZvRyl5BiwEPSsJnjdRFNH9krQHxYp+g==",
       "dev": true
     },
     "@angular/material": {
@@ -714,28 +745,28 @@
       "integrity": "sha512-DruanWMcAzOy8mFZ6Xr9sRqJ+KjF0hvFshxqrv0SD/rVpf9oi8ADnuACmHYXN5dYr/YtgmHDywq0Z7USY7SIoA=="
     },
     "@angular/platform-browser": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-9.1.0.tgz",
-      "integrity": "sha512-OsS/blUjl8ranmDaRADjFAmvnlmwbT6WNU7dVov7FhV0rqesbwaOJ5bR0LSYHYpej7Jaa6oYk0v0XWkaH9LTFg=="
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-9.1.1.tgz",
+      "integrity": "sha512-tjALKhdAWPErj0euIIdvx/31AHEZ7is7ADsMu+nYn2NY2gcPUuiqq3RCUJVxBYJ2Cclq1nlF0i2rEDKh7TrBKg=="
     },
     "@angular/platform-browser-dynamic": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.1.0.tgz",
-      "integrity": "sha512-sMtz/poQ3TYaWZzWjrn9apKUZ/WKql2MYCWbpax7pql3GgC9OoTslc7ZEe7/d3ynfFE/CQqWBBOuWGD71Z0LMQ=="
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.1.1.tgz",
+      "integrity": "sha512-kEox5UOwkRLjGKXLh5o5SYopoAylpKgrXtRrKRKTCMmZTpYSe1bLlXMjpwMAMZ9ZFSTvWp9iX94aT5bJDpLrRQ=="
     },
     "@angular/platform-server": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-9.1.0.tgz",
-      "integrity": "sha512-JboTIUBgf9yHRjF93q8NJQoeIp5Zp4kg8Nmw1QLWO6SV+OpiOpKSrlScMVncCh0KiU6SIOmiuHJwBhLm78fi+Q==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-9.1.1.tgz",
+      "integrity": "sha512-Azvras7WpRtVw4jfEfmlrz5JBIDpXCZMab/5A1dFv3Z9Dbykp5czkZ/XXCpMCVcli7xxthF1uv/FD4nQoJdzSw==",
       "requires": {
         "domino": "^2.1.2",
-        "xhr2": "^0.1.4"
+        "xhr2": "^0.2.0"
       }
     },
     "@angular/router": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.1.0.tgz",
-      "integrity": "sha512-cExO1nPnoPFiUJWZ28hTHozPLFoCmqr3xqcM57We0hhKE0esdrO+gRWKRH0EJERukLbU8coPKVhA8daGUpASiQ=="
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.1.1.tgz",
+      "integrity": "sha512-OQ5Ctd+swF7ZNlgUxrkGKk2B4yBFqJm0QCxkM86kFDCKQV/4OButZ+4HPy1HxeozBIAmm2pbQA+YjsAUs0VZcQ=="
     },
     "@babel/code-frame": {
       "version": "7.5.5",
@@ -1139,13 +1170,14 @@
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz",
-      "integrity": "sha512-UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow==",
+      "version": "7.9.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz",
+      "integrity": "sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.3",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0"
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+        "@babel/plugin-transform-parameters": "^7.9.5"
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
@@ -1299,14 +1331,14 @@
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.9.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz",
-      "integrity": "sha512-TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ==",
+      "version": "7.9.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz",
+      "integrity": "sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.8.3",
         "@babel/helper-define-map": "^7.8.3",
-        "@babel/helper-function-name": "^7.8.3",
+        "@babel/helper-function-name": "^7.9.5",
         "@babel/helper-optimise-call-expression": "^7.8.3",
         "@babel/helper-plugin-utils": "^7.8.3",
         "@babel/helper-replace-supers": "^7.8.6",
@@ -1314,6 +1346,34 @@
         "globals": "^11.1.0"
       },
       "dependencies": {
+        "@babel/helper-function-name": {
+          "version": "7.9.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
+          "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.8.3",
+            "@babel/template": "^7.8.3",
+            "@babel/types": "^7.9.5"
+          }
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.9.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz",
+          "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==",
+          "dev": true
+        },
+        "@babel/types": {
+          "version": "7.9.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
+          "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.9.5",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
         "globals": {
           "version": "11.12.0",
           "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -1332,9 +1392,9 @@
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.8.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz",
-      "integrity": "sha512-eRJu4Vs2rmttFCdhPUM3bV0Yo/xPSdPw6ML9KHs/bjB4bLA5HXlbvYXPOD5yASodGod+krjYx21xm1QmL8dCJQ==",
+      "version": "7.9.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz",
+      "integrity": "sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.3"
@@ -1480,9 +1540,9 @@
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.9.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz",
-      "integrity": "sha512-fzrQFQhp7mIhOzmOtPiKffvCYQSK10NR8t6BBz2yPbeUHb9OLW8RZGtgDRBn8z2hGcwvKDL3vC7ojPTLNxmqEg==",
+      "version": "7.9.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz",
+      "integrity": "sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==",
       "dev": true,
       "requires": {
         "@babel/helper-get-function-arity": "^7.8.3",
@@ -1836,32 +1896,32 @@
       }
     },
     "@ngrx/effects": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-9.0.0.tgz",
-      "integrity": "sha512-6Rq7FsNZK26HqYlpOGCglKLenIkVOOKE0y6D/8KXjEJ1JlZWi00fdI7poclBGjm9pvMBGXfJA8a9MKuxb/t9cA=="
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-9.1.0.tgz",
+      "integrity": "sha512-DPMtp/2YTrvuxMqaehQ39FeoNODuMcRB6xDImvrnMFPIkUcP3mDHnIg6UB5c2JvfHlZZClKR+Fb+RE2nuVub8w=="
     },
     "@ngrx/router-store": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-9.0.0.tgz",
-      "integrity": "sha512-eVgdRwK0twPgTgWnIpc2EBoz6LgWsGdlheDVKZ9MNU8ZkbPV8/ycivW5Oy5cm+ppi1QHHmkpgt+u5c2iGi68cg=="
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-9.1.0.tgz",
+      "integrity": "sha512-zdIBUsfyrrA64mUqajHMARSwttOAOJ5FSyVJLHQfBlz9/vil6Kby1KhVLEG7mGmkz799YYlIM135QsrJhgf7wA=="
     },
     "@ngrx/store": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-9.0.0.tgz",
-      "integrity": "sha512-QnmfXJ4G2jp+vFaqT5Qfp6h0J9OHxfDKI2RbnMU93Tq1Xd/WVPzXnOQGjILBjwwWI6RFkSdIpUoQONr7VOW63g=="
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-9.1.0.tgz",
+      "integrity": "sha512-Ah2nApPZXTvKl7ybaFMIFwEdMg8b7PvIKATigbDTUftAsFxked2+T7blNv6aCgSfEqbOVMBTYPk7OsLCYZoz4Q=="
     },
     "@ngrx/store-devtools": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-9.0.0.tgz",
-      "integrity": "sha512-Vj8sj8GclbSbnYCS8eqZXTOYDdip1nnjKhkYClUg2oFPh67haaCmvh7TXITnX8PpgDtj5akF84Xw9/1HRiG8mg=="
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-9.1.0.tgz",
+      "integrity": "sha512-KDvuNBxfTgDHjESiouEoPXq8GCUYbHnA+jOs8MzzwVDmxNLeZuDy3amaVzKv9Q5nncI6mNGcXOzTKWzapET8Sw=="
     },
     "@ngtools/webpack": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.1.0.tgz",
-      "integrity": "sha512-kQ+1N/F+5tuUXiiaoqJwhcOIM0I93EEvF3xwpTLRm91wl2i8R1261LvsD/uQPrgLrZNGR6eFhFF1Izn2PnIjQA==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.1.1.tgz",
+      "integrity": "sha512-4RPlk6aIlYhk9isTvXbMaA2G0LhxOzcZ+2iG7zV9Yj/Vm8+lrRexpQ/kC/Dh0GI/oCtKIkVpUzx5LTozYeTLdQ==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "9.1.0",
+        "@angular-devkit/core": "9.1.1",
         "enhanced-resolve": "4.1.1",
         "rxjs": "6.5.4",
         "webpack-sources": "1.4.3"
@@ -1904,65 +1964,6 @@
         "fastq": "^1.6.0"
       }
     },
-    "@npmcli/ci-detect": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/ci-detect/-/ci-detect-1.2.0.tgz",
-      "integrity": "sha512-JtktVH7ASBVIWsQTFlFpeOzhBJskvoBCTfeeRhhZy7ybATcUvwiwotZ8j5rkqUUyB69lIy/AvboiiiGBjYBKBA==",
-      "dev": true
-    },
-    "@npmcli/git": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-2.0.1.tgz",
-      "integrity": "sha512-hVatexiBtx71F01Ars38Hr5AFUGmJgHAfQtRlO5fJlnAawRGSXwEFgjB5i3XdUUmElZU/RXy7fefN02dZKxgPw==",
-      "dev": true,
-      "requires": {
-        "@npmcli/promise-spawn": "^1.1.0",
-        "mkdirp": "^1.0.3",
-        "npm-pick-manifest": "^6.0.0",
-        "promise-inflight": "^1.0.1",
-        "promise-retry": "^1.1.1",
-        "unique-filename": "^1.1.1",
-        "which": "^2.0.2"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-          "dev": true
-        },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
-    },
-    "@npmcli/installed-package-contents": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-1.0.5.tgz",
-      "integrity": "sha512-aKIwguaaqb6ViwSOFytniGvLPb9SMCUm39TgM3SfUo7n0TxUMbwoXfpwyvQ4blm10lzbAwTsvjr7QZ85LvTi4A==",
-      "dev": true,
-      "requires": {
-        "npm-bundled": "^1.1.1",
-        "npm-normalize-package-bin": "^1.0.1",
-        "read-package-json-fast": "^1.1.1",
-        "readdir-scoped-modules": "^1.1.0"
-      }
-    },
-    "@npmcli/promise-spawn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.1.0.tgz",
-      "integrity": "sha512-FwbuYN9KXBkloLeIR3xRgI8dyOdfK/KzaJlChszNuwmUXD1lHXfLlSeo4n4KrKt2udIK9K9/TzlnyCA3ubM2fA==",
-      "dev": true,
-      "requires": {
-        "infer-owner": "^1.0.4"
-      }
-    },
     "@rollup/plugin-commonjs": {
       "version": "11.0.2",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-11.0.2.tgz",
@@ -2019,27 +2020,27 @@
       }
     },
     "@schematics/angular": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.0.tgz",
-      "integrity": "sha512-qkehaITQ1S1udfnnBY5CXGWnk1iVFI8cZayjLUlRfD5w+6v9if3VIuqPssX96MqvkbjyRu1N214+ieaawzLmuA==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.1.tgz",
+      "integrity": "sha512-V0DcDNgHQ2YR+PGZI6+pf/mUNNxt5SusShkZ1PbwIMk/HUQpzEGkLjm3v1Jw9eIZKiuDx615GNU1xDzQ/KyNRQ==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "9.1.0",
-        "@angular-devkit/schematics": "9.1.0"
+        "@angular-devkit/core": "9.1.1",
+        "@angular-devkit/schematics": "9.1.1"
       }
     },
     "@schematics/update": {
-      "version": "0.901.0",
-      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.901.0.tgz",
-      "integrity": "sha512-u2VESL1dgOSGZK/wcWEz0WcCU/yv764zhzCQerCwUtbV1CISSSDZ6x+prVYDXOdxWBGtDos2MbCF3GEJJI1T+w==",
+      "version": "0.901.1",
+      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.901.1.tgz",
+      "integrity": "sha512-g5B8hjXKCbUNLKCkWQxc5r2D9lOQXRTLZJNIqva+l/ck0AML5MpelxkqQId9ZGLfQqfFk/XjdSHRWgcmUs1WnA==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "9.1.0",
-        "@angular-devkit/schematics": "9.1.0",
+        "@angular-devkit/core": "9.1.1",
+        "@angular-devkit/schematics": "9.1.1",
         "@yarnpkg/lockfile": "1.1.0",
         "ini": "1.3.5",
         "npm-package-arg": "^8.0.0",
-        "pacote": "11.1.4",
+        "pacote": "9.5.12",
         "rxjs": "6.5.4",
         "semver": "7.1.3",
         "semver-intersect": "1.4.0"
@@ -2198,9 +2199,9 @@
       }
     },
     "@types/node": {
-      "version": "13.11.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.11.0.tgz",
-      "integrity": "sha512-uM4mnmsIIPK/yeO+42F2RQhGUIs39K2RFmugcJANppXe6J1nvH87PvzPZYpza7Xhhs8Yn9yIAVdLZ84z61+0xQ==",
+      "version": "13.11.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.11.1.tgz",
+      "integrity": "sha512-eWQGP3qtxwL8FGneRrC5DwrJLGN4/dH1clNTuLfN81HCrxVtxRjygDTUoZJ5ASlDEeo0ppYFQjQIlXhtXpOn6g==",
       "dev": true
     },
     "@types/normalize-package-data": {
@@ -2485,6 +2486,16 @@
       "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
       "dev": true
     },
+    "JSONStream": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz",
+      "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==",
+      "dev": true,
+      "requires": {
+        "jsonparse": "^1.2.0",
+        "through": ">=2.2.7 <3"
+      }
+    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -2537,57 +2548,21 @@
       "dev": true
     },
     "agent-base": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.0.tgz",
-      "integrity": "sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz",
+      "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==",
       "dev": true,
       "requires": {
-        "debug": "4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
+        "es6-promisify": "^5.0.0"
       }
     },
     "agentkeepalive": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.0.tgz",
-      "integrity": "sha512-CW/n1wxF8RpEuuiq6Vbn9S8m0VSYDMnZESqaJ6F2cWN9fY8rei2qaxweIaRgq+ek8TqfoFIsUjaGNKGGEHElSg==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz",
+      "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==",
       "dev": true,
       "requires": {
-        "debug": "^4.1.0",
-        "depd": "^1.1.2",
         "humanize-ms": "^1.2.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
       }
     },
     "aggregate-error": {
@@ -3747,22 +3722,6 @@
         "isarray": "^1.0.0"
       }
     },
-    "buffer-alloc": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
-      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
-      "dev": true,
-      "requires": {
-        "buffer-alloc-unsafe": "^1.1.0",
-        "buffer-fill": "^1.0.0"
-      }
-    },
-    "buffer-alloc-unsafe": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
-      "dev": true
-    },
     "buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
@@ -3775,12 +3734,6 @@
       "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
       "dev": true
     },
-    "buffer-fill": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
-      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
-      "dev": true
-    },
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
@@ -4154,9 +4107,9 @@
       }
     },
     "cli-spinners": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.2.0.tgz",
-      "integrity": "sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.3.0.tgz",
+      "integrity": "sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==",
       "dev": true
     },
     "cli-width": {
@@ -4700,9 +4653,9 @@
           "dev": true
         },
         "p-limit": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
-          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -4737,9 +4690,9 @@
       }
     },
     "core-js": {
-      "version": "3.6.4",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
-      "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw=="
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+      "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
     },
     "core-js-compat": {
       "version": "3.6.4",
@@ -5802,7 +5755,6 @@
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
       "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
       "dev": true,
-      "optional": true,
       "requires": {
         "iconv-lite": "~0.4.13"
       }
@@ -6916,9 +6868,9 @@
           }
         },
         "p-limit": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
-          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -7913,6 +7865,12 @@
         "is-property": "^1.0.0"
       }
     },
+    "genfun": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
+      "integrity": "sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==",
+      "dev": true
+    },
     "gensync": {
       "version": "1.0.0-beta.1",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
@@ -8577,30 +8535,23 @@
       }
     },
     "http-proxy-agent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
-      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
+      "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
       "dev": true,
       "requires": {
-        "@tootallnate/once": "1",
-        "agent-base": "6",
-        "debug": "4"
+        "agent-base": "4",
+        "debug": "3.1.0"
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.0.0"
           }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
         }
       }
     },
@@ -8634,19 +8585,19 @@
       "dev": true
     },
     "https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz",
+      "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==",
       "dev": true,
       "requires": {
-        "agent-base": "6",
-        "debug": "4"
+        "agent-base": "^4.3.0",
+        "debug": "^3.1.0"
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
             "ms": "^2.1.1"
@@ -9187,12 +9138,6 @@
       "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
       "dev": true
     },
-    "is-lambda": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
-      "integrity": "sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=",
-      "dev": true
-    },
     "is-module": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
@@ -9422,13 +9367,10 @@
       "dev": true
     },
     "isbinaryfile": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
-      "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
-      "dev": true,
-      "requires": {
-        "buffer-alloc": "^1.2.0"
-      }
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.6.tgz",
+      "integrity": "sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==",
+      "dev": true
     },
     "isexe": {
       "version": "2.0.0",
@@ -9850,12 +9792,6 @@
       "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
       "dev": true
     },
-    "json-parse-even-better-errors": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.2.0.tgz",
-      "integrity": "sha512-2tLgY7LRNZ9Hd6gmCuBG5/OjRHQpSgJQqJoYyLLOhUgn8LdOYrjaZLcxkWnDads+AD/haWWioPNziXQcgvQJ/g==",
-      "dev": true
-    },
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -9961,12 +9897,11 @@
       "dev": true
     },
     "karma": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-4.4.1.tgz",
-      "integrity": "sha512-L5SIaXEYqzrh6b1wqYC42tNsFMx2PWuxky84pK9coK09MvmL7mxii3G3bZBh/0rvD27lqDd0le9jyhzvwif73A==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-5.0.1.tgz",
+      "integrity": "sha512-xrDGtZ0mykEQjx1BUHOP1ITi39MDsCGocmSvLJWHxUQpxuKwxk3ZUrC6HI2VWh1plLC6+7cA3B19m12yzO/FRw==",
       "dev": true,
       "requires": {
-        "bluebird": "^3.3.0",
         "body-parser": "^1.16.1",
         "braces": "^3.0.2",
         "chokidar": "^3.0.0",
@@ -9978,22 +9913,37 @@
         "glob": "^7.1.1",
         "graceful-fs": "^4.1.2",
         "http-proxy": "^1.13.0",
-        "isbinaryfile": "^3.0.0",
+        "isbinaryfile": "^4.0.2",
         "lodash": "^4.17.14",
         "log4js": "^4.0.0",
         "mime": "^2.3.1",
         "minimatch": "^3.0.2",
-        "optimist": "^0.6.1",
         "qjobs": "^1.1.4",
         "range-parser": "^1.2.0",
         "rimraf": "^2.6.0",
-        "safe-buffer": "^5.0.1",
         "socket.io": "2.1.1",
         "source-map": "^0.6.1",
         "tmp": "0.0.33",
-        "useragent": "2.3.0"
+        "ua-parser-js": "0.7.21",
+        "yargs": "^15.3.1"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "dev": true,
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
         "anymatch": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
@@ -10035,6 +9985,32 @@
             "readdirp": "~3.3.0"
           }
         },
+        "cliui": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^6.2.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
         "fill-range": {
           "version": "7.0.1",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -10044,6 +10020,16 @@
             "to-regex-range": "^5.0.1"
           }
         },
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
         "fsevents": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
@@ -10051,9 +10037,15 @@
           "dev": true,
           "optional": true
         },
-        "glob-parent": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+        "get-caller-file": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+          "dev": true
+        },
+        "glob-parent": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
           "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
           "dev": true,
           "requires": {
@@ -10069,12 +10061,27 @@
             "binary-extensions": "^2.0.0"
           }
         },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
         "is-number": {
           "version": "7.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
           "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
           "dev": true
         },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
         "mime": {
           "version": "2.4.4",
           "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
@@ -10087,6 +10094,36 @@
           "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
           "dev": true
         },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
         "readdirp": {
           "version": "3.3.0",
           "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz",
@@ -10096,12 +10133,38 @@
             "picomatch": "^2.0.7"
           }
         },
+        "require-main-filename": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+          "dev": true
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
+        "string-width": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
         "to-regex-range": {
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -10110,6 +10173,52 @@
           "requires": {
             "is-number": "^7.0.0"
           }
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+          "dev": true
+        },
+        "wrap-ansi": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "yargs": {
+          "version": "15.3.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
+          "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
+          "dev": true,
+          "requires": {
+            "cliui": "^6.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^4.1.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^4.2.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^18.1.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "18.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz",
+          "integrity": "sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
         }
       }
     },
@@ -10594,26 +10703,76 @@
       "dev": true
     },
     "make-fetch-happen": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.4.tgz",
-      "integrity": "sha512-hIFoqGq1db0QMiy/Atr/pI1Rs4rDV+ZdGSey2SQyF3KK3u1z4aj9mS5UdNnZkdQpA+H3pGn0J3KlEwsi2x4EqA==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz",
+      "integrity": "sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==",
       "dev": true,
       "requires": {
-        "agentkeepalive": "^4.1.0",
-        "cacache": "^15.0.0",
-        "http-cache-semantics": "^4.0.4",
-        "http-proxy-agent": "^4.0.1",
-        "https-proxy-agent": "^5.0.0",
-        "is-lambda": "^1.0.1",
+        "agentkeepalive": "^3.4.1",
+        "cacache": "^12.0.0",
+        "http-cache-semantics": "^3.8.1",
+        "http-proxy-agent": "^2.1.0",
+        "https-proxy-agent": "^2.2.3",
         "lru-cache": "^5.1.1",
-        "minipass": "^3.0.0",
-        "minipass-collect": "^1.0.2",
-        "minipass-fetch": "^1.1.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.2",
+        "mississippi": "^3.0.0",
+        "node-fetch-npm": "^2.0.2",
         "promise-retry": "^1.1.1",
-        "socks-proxy-agent": "^5.0.0",
-        "ssri": "^8.0.0"
+        "socks-proxy-agent": "^4.0.0",
+        "ssri": "^6.0.0"
+      },
+      "dependencies": {
+        "cacache": {
+          "version": "12.0.4",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+          "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.5",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.1.15",
+            "infer-owner": "^1.0.3",
+            "lru-cache": "^5.1.1",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.6.3",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
+            "y18n": "^4.0.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.6",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "http-cache-semantics": {
+          "version": "3.8.1",
+          "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz",
+          "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==",
+          "dev": true
+        },
+        "ssri": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1"
+          }
+        }
       }
     },
     "make-iterator": {
@@ -11033,19 +11192,6 @@
         "minipass": "^3.0.0"
       }
     },
-    "minipass-fetch": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.2.1.tgz",
-      "integrity": "sha512-ssHt0dkljEDaKmTgQ04DQgx2ag6G2gMPxA5hpcsoeTbfDgRf2fC2gNSRc6kISjD7ckCpHwwQvXxuTBK8402fXg==",
-      "dev": true,
-      "requires": {
-        "encoding": "^0.1.12",
-        "minipass": "^3.1.0",
-        "minipass-pipeline": "^1.2.2",
-        "minipass-sized": "^1.0.3",
-        "minizlib": "^2.0.0"
-      }
-    },
     "minipass-flush": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
@@ -11055,16 +11201,6 @@
         "minipass": "^3.0.0"
       }
     },
-    "minipass-json-stream": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz",
-      "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==",
-      "dev": true,
-      "requires": {
-        "jsonparse": "^1.3.1",
-        "minipass": "^3.0.0"
-      }
-    },
     "minipass-pipeline": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz",
@@ -11074,15 +11210,6 @@
         "minipass": "^3.0.0"
       }
     },
-    "minipass-sized": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
-      "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
-      "dev": true,
-      "requires": {
-        "minipass": "^3.0.0"
-      }
-    },
     "minizlib": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz",
@@ -11598,6 +11725,17 @@
       "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==",
       "dev": true
     },
+    "node-fetch-npm": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz",
+      "integrity": "sha512-iOuIQDWDyjhv9qSDrj9aq/klt6F9z1p2otB3AV7v3zBDcL/x+OfGsvGQZZCcMZbUf4Ujw1xGNQkjvGnVT22cKg==",
+      "dev": true,
+      "requires": {
+        "encoding": "^0.1.11",
+        "json-parse-better-errors": "^1.0.0",
+        "safe-buffer": "^5.1.1"
+      }
+    },
     "node-forge": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz",
@@ -11733,9 +11871,9 @@
       },
       "dependencies": {
         "semver": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz",
-          "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==",
+          "version": "7.2.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.2.1.tgz",
+          "integrity": "sha512-aHhm1pD02jXXkyIpq25qBZjr3CQgg8KST8uX0OWXch3xE6jw+1bfbWnCjzMwojsTquroUmKFHNzU6x26mEiRxw==",
           "dev": true
         }
       }
@@ -11767,39 +11905,22 @@
           }
         },
         "semver": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz",
-          "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==",
+          "version": "7.2.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.2.1.tgz",
+          "integrity": "sha512-aHhm1pD02jXXkyIpq25qBZjr3CQgg8KST8uX0OWXch3xE6jw+1bfbWnCjzMwojsTquroUmKFHNzU6x26mEiRxw==",
           "dev": true
         }
       }
     },
     "npm-packlist": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.1.1.tgz",
-      "integrity": "sha512-95TSDvGwujIhqfSpIiRRLodEF+y6mJMopuZdahoGzqtRDFZXGav46S0p6ngeWaiAkb5R72w6eVARhzej0HvZeQ==",
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
+      "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
       "dev": true,
       "requires": {
-        "glob": "^7.1.6",
-        "ignore-walk": "^3.0.3",
-        "npm-bundled": "^1.1.1",
+        "ignore-walk": "^3.0.1",
+        "npm-bundled": "^1.0.1",
         "npm-normalize-package-bin": "^1.0.1"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
       }
     },
     "npm-pick-manifest": {
@@ -11814,27 +11935,46 @@
       },
       "dependencies": {
         "semver": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz",
-          "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==",
+          "version": "7.2.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.2.1.tgz",
+          "integrity": "sha512-aHhm1pD02jXXkyIpq25qBZjr3CQgg8KST8uX0OWXch3xE6jw+1bfbWnCjzMwojsTquroUmKFHNzU6x26mEiRxw==",
           "dev": true
         }
       }
     },
     "npm-registry-fetch": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.0.0.tgz",
-      "integrity": "sha512-975WwLvZjX97y9UWWQ8nAyr7bw02s9xKPHqvEm5T900LQsB1HXb8Gb9ebYtCBLSX+K8gSOrO5KS/9yV/naLZmQ==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.3.tgz",
+      "integrity": "sha512-WGvUx0lkKFhu9MbiGFuT9nG2NpfQ+4dCJwRwwtK2HK5izJEvwDxMeUyqbuMS7N/OkpVCqDorV6rO5E4V9F8lJw==",
       "dev": true,
       "requires": {
-        "@npmcli/ci-detect": "^1.0.0",
+        "JSONStream": "^1.3.4",
+        "bluebird": "^3.5.1",
+        "figgy-pudding": "^3.4.1",
         "lru-cache": "^5.1.1",
-        "make-fetch-happen": "^8.0.2",
-        "minipass": "^3.0.0",
-        "minipass-fetch": "^1.1.2",
-        "minipass-json-stream": "^1.0.1",
-        "minizlib": "^2.0.0",
-        "npm-package-arg": "^8.0.0"
+        "make-fetch-happen": "^5.0.0",
+        "npm-package-arg": "^6.1.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "dependencies": {
+        "npm-package-arg": {
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
+          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+          "dev": true,
+          "requires": {
+            "hosted-git-info": "^2.7.1",
+            "osenv": "^0.1.5",
+            "semver": "^5.6.0",
+            "validate-npm-package-name": "^3.0.0"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+          "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
+          "dev": true
+        }
       }
     },
     "npm-run-all": {
@@ -12483,6 +12623,16 @@
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
       "dev": true
     },
+    "osenv": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "dev": true,
+      "requires": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
+      }
+    },
     "p-cancelable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
@@ -12570,56 +12720,162 @@
       }
     },
     "pacote": {
-      "version": "11.1.4",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.1.4.tgz",
-      "integrity": "sha512-eUGJvSSpWFZKn3z8gig/HgnBmUl6gIWByIIaHzSyEr3tOWX0w8tFEADXtpu8HGv5E0ShCeTP6enRq8iHKCHSvw==",
+      "version": "9.5.12",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.12.tgz",
+      "integrity": "sha512-BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ==",
       "dev": true,
       "requires": {
-        "@npmcli/git": "^2.0.1",
-        "@npmcli/installed-package-contents": "^1.0.5",
-        "@npmcli/promise-spawn": "^1.1.0",
-        "cacache": "^15.0.0",
-        "chownr": "^1.1.4",
-        "fs-minipass": "^2.1.0",
+        "bluebird": "^3.5.3",
+        "cacache": "^12.0.2",
+        "chownr": "^1.1.2",
+        "figgy-pudding": "^3.5.1",
+        "get-stream": "^4.1.0",
+        "glob": "^7.1.3",
         "infer-owner": "^1.0.4",
         "lru-cache": "^5.1.1",
-        "minipass": "^3.0.1",
-        "minipass-fetch": "^1.2.1",
-        "mkdirp": "^1.0.3",
-        "npm-package-arg": "^8.0.1",
-        "npm-packlist": "^2.1.0",
-        "npm-pick-manifest": "^6.0.0",
-        "npm-registry-fetch": "^8.0.0",
+        "make-fetch-happen": "^5.0.0",
+        "minimatch": "^3.0.4",
+        "minipass": "^2.3.5",
+        "mississippi": "^3.0.0",
+        "mkdirp": "^0.5.1",
+        "normalize-package-data": "^2.4.0",
+        "npm-normalize-package-bin": "^1.0.0",
+        "npm-package-arg": "^6.1.0",
+        "npm-packlist": "^1.1.12",
+        "npm-pick-manifest": "^3.0.0",
+        "npm-registry-fetch": "^4.0.0",
+        "osenv": "^0.1.5",
         "promise-inflight": "^1.0.1",
         "promise-retry": "^1.1.1",
-        "read-package-json-fast": "^1.1.3",
-        "rimraf": "^2.7.1",
-        "semver": "^7.1.3",
-        "ssri": "^8.0.0",
-        "tar": "^6.0.1",
-        "which": "^2.0.2"
+        "protoduck": "^5.0.1",
+        "rimraf": "^2.6.2",
+        "safe-buffer": "^5.1.2",
+        "semver": "^5.6.0",
+        "ssri": "^6.0.1",
+        "tar": "^4.4.10",
+        "unique-filename": "^1.1.1",
+        "which": "^1.3.1"
       },
       "dependencies": {
-        "mkdirp": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-          "dev": true
+        "cacache": {
+          "version": "12.0.4",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+          "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.5",
+            "chownr": "^1.1.1",
+            "figgy-pudding": "^3.5.1",
+            "glob": "^7.1.4",
+            "graceful-fs": "^4.1.15",
+            "infer-owner": "^1.0.3",
+            "lru-cache": "^5.1.1",
+            "mississippi": "^3.0.0",
+            "mkdirp": "^0.5.1",
+            "move-concurrently": "^1.0.1",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^2.6.3",
+            "ssri": "^6.0.1",
+            "unique-filename": "^1.1.1",
+            "y18n": "^4.0.0"
+          },
+          "dependencies": {
+            "glob": {
+              "version": "7.1.6",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+              "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+              "dev": true,
+              "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            }
+          }
         },
-        "semver": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz",
-          "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==",
-          "dev": true
+        "fs-minipass": {
+          "version": "1.2.7",
+          "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+          "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+          "dev": true,
+          "requires": {
+            "minipass": "^2.6.0"
+          }
         },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+        "minipass": {
+          "version": "2.9.0",
+          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+          "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
           "dev": true,
           "requires": {
-            "isexe": "^2.0.0"
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.0"
           }
+        },
+        "minizlib": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+          "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+          "dev": true,
+          "requires": {
+            "minipass": "^2.9.0"
+          }
+        },
+        "npm-package-arg": {
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz",
+          "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==",
+          "dev": true,
+          "requires": {
+            "hosted-git-info": "^2.7.1",
+            "osenv": "^0.1.5",
+            "semver": "^5.6.0",
+            "validate-npm-package-name": "^3.0.0"
+          }
+        },
+        "npm-pick-manifest": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz",
+          "integrity": "sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==",
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1",
+            "npm-package-arg": "^6.0.0",
+            "semver": "^5.4.1"
+          }
+        },
+        "ssri": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1"
+          }
+        },
+        "tar": {
+          "version": "4.4.13",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
+          "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
+          "dev": true,
+          "requires": {
+            "chownr": "^1.1.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.8.6",
+            "minizlib": "^1.2.1",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.3"
+          }
+        },
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
         }
       }
     },
@@ -12884,9 +13140,9 @@
           }
         },
         "p-limit": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
-          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -13652,6 +13908,15 @@
         }
       }
     },
+    "protoduck": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz",
+      "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==",
+      "dev": true,
+      "requires": {
+        "genfun": "^5.0.0"
+      }
+    },
     "protractor": {
       "version": "5.4.3",
       "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.4.3.tgz",
@@ -13835,12 +14100,6 @@
         "event-stream": "=3.3.4"
       }
     },
-    "pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-      "dev": true
-    },
     "psl": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
@@ -14061,16 +14320,6 @@
         "npm-normalize-package-bin": "^1.0.0"
       }
     },
-    "read-package-json-fast": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-1.1.3.tgz",
-      "integrity": "sha512-MmFqiyfCXV2Dmm4jH24DEGhxdkUDFivJQj4oPZQPOKywxR7HWBE6WnMWDAapfFHi3wm1b+mhR+XHlUH0CL8axg==",
-      "dev": true,
-      "requires": {
-        "json-parse-even-better-errors": "^2.0.1",
-        "npm-normalize-package-bin": "^1.0.1"
-      }
-    },
     "read-package-tree": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz",
@@ -15819,30 +16068,23 @@
       }
     },
     "socks-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz",
+      "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==",
       "dev": true,
       "requires": {
-        "agent-base": "6",
-        "debug": "4",
-        "socks": "^2.3.3"
+        "agent-base": "~4.2.1",
+        "socks": "~2.3.2"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+        "agent-base": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
+          "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "es6-promisify": "^5.0.0"
           }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
         }
       }
     },
@@ -16349,9 +16591,9 @@
       }
     },
     "string.prototype.trimend": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz",
-      "integrity": "sha512-EEJnGqa/xNfIg05SxiPSqRS7S9qwDhYts1TSLR1BQfYUfPe1stofgGKvwERK9+9yf+PpfBMlpBaCHucXGPQfUA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
+      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
       "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
@@ -16460,9 +16702,9 @@
       }
     },
     "string.prototype.trimstart": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz",
-      "integrity": "sha512-iCP8g01NFYiiBOnwG1Xc3WZLyoo+RuBymwIlWncShXDDJYWN6DbnM3odslBJdgCdRlq94B5s63NWAZlcn2CS4w==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
+      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
       "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
@@ -17067,9 +17309,9 @@
           }
         },
         "p-limit": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
-          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -17423,6 +17665,12 @@
       "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==",
       "dev": true
     },
+    "ua-parser-js": {
+      "version": "0.7.21",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz",
+      "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==",
+      "dev": true
+    },
     "uglify-js": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz",
@@ -17818,34 +18066,6 @@
         "os-homedir": "^1.0.0"
       }
     },
-    "useragent": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
-      "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
-      "dev": true,
-      "requires": {
-        "lru-cache": "4.1.x",
-        "tmp": "0.0.x"
-      },
-      "dependencies": {
-        "lru-cache": {
-          "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-          "dev": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          }
-        },
-        "yallist": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-          "dev": true
-        }
-      }
-    },
     "util": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
@@ -18562,9 +18782,9 @@
           }
         },
         "p-limit": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
-          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -18887,9 +19107,9 @@
       "dev": true
     },
     "xhr2": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.1.4.tgz",
-      "integrity": "sha1-f4dliEdxbbUCYyOBL4GMras4el8="
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.2.0.tgz",
+      "integrity": "sha512-BDtiD0i2iKPK/S8OAZfpk6tyzEDnKKSjxWHcMBVmh+LuqJ8A32qXTyOx+TVOg2dKvq6zGBq2sgKPkEeRs1qTRA=="
     },
     "xml2js": {
       "version": "0.4.23",
diff --git a/package.json b/package.json
index 7bab803ace..34e5101cef 100644
--- a/package.json
+++ b/package.json
@@ -46,28 +46,28 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "@angular/animations": "^9.1.0",
+    "@angular/animations": "^9.1.1",
     "@angular/cdk": "^9.2.0",
-    "@angular/common": "^9.1.0",
-    "@angular/compiler": "^9.1.0",
-    "@angular/core": "^9.1.0",
+    "@angular/common": "^9.1.1",
+    "@angular/compiler": "^9.1.1",
+    "@angular/core": "^9.1.1",
     "@angular/flex-layout": "^9.0.0-beta.29",
-    "@angular/forms": "^9.1.0",
+    "@angular/forms": "^9.1.1",
     "@angular/material": "^9.2.0",
     "@angular/material-moment-adapter": "^9.2.0",
-    "@angular/platform-browser": "^9.1.0",
-    "@angular/platform-browser-dynamic": "^9.1.0",
-    "@angular/platform-server": "^9.1.0",
-    "@angular/router": "^9.1.0",
-    "@ngrx/effects": "^9.0.0",
-    "@ngrx/router-store": "^9.0.0",
-    "@ngrx/store": "^9.0.0",
-    "@ngrx/store-devtools": "^9.0.0",
+    "@angular/platform-browser": "^9.1.1",
+    "@angular/platform-browser-dynamic": "^9.1.1",
+    "@angular/platform-server": "^9.1.1",
+    "@angular/router": "^9.1.1",
+    "@ngrx/effects": "^9.1.0",
+    "@ngrx/router-store": "^9.1.0",
+    "@ngrx/store": "^9.1.0",
+    "@ngrx/store-devtools": "^9.1.0",
     "@swimlane/ngx-charts": "^13.0.2",
     "@types/moment-timezone": "^0.5.13",
     "@types/marked": "^0.7.3",
     "angular2-virtual-scroll": "^0.4.16",
-    "core-js": "^3.6.4",
+    "core-js": "^3.6.5",
     "immer": "^6.0.3",
     "lodash-es": "^4.17.14",
     "mappy-breakpoints": "^0.2.3",
@@ -94,16 +94,16 @@
     "node": "12.13.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.901.0",
-    "@angular-devkit/build-ng-packagr": "~0.901.0",
-    "@angular-devkit/schematics": "^9.1.0",
-    "@angular/cli": "^9.1.0",
-    "@angular/compiler-cli": "^9.1.0",
-    "@angular/language-service": "^9.1.0",
+    "@angular-devkit/build-angular": "~0.901.1",
+    "@angular-devkit/build-ng-packagr": "~0.901.1",
+    "@angular-devkit/schematics": "^9.1.1",
+    "@angular/cli": "^9.1.1",
+    "@angular/compiler-cli": "^9.1.1",
+    "@angular/language-service": "^9.1.1",
     "@types/jasmine": "^3.5.10",
     "@types/jasminewd2": "~2.0.8",
     "@types/karma": "^4.4.1",
-    "@types/node": "^13.11.0",
+    "@types/node": "^13.11.1",
     "@types/request": "^2.48.4",
     "acorn": "^7.1.1",
     "browserstack-local": "^1.4.5",
@@ -120,7 +120,7 @@
     "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~5.0.1",
     "js-yaml": "~3.13.1",
-    "karma": "~4.4.1",
+    "karma": "~5.0.1",
     "karma-chrome-launcher": "~3.1.0",
     "karma-cli": "~2.0.0",
     "karma-coverage-istanbul-reporter": "^2.1.1",

From 2a8457ab76389c680e2941df9dadfb18f2d037f1 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Sun, 12 Apr 2020 15:40:42 +0100
Subject: [PATCH 018/176] Fix routing event change

---
 .../packages/store/src/reducers/routing.reducer.ts        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/frontend/packages/store/src/reducers/routing.reducer.ts b/src/frontend/packages/store/src/reducers/routing.reducer.ts
index d7556182b4..e1c86325c3 100644
--- a/src/frontend/packages/store/src/reducers/routing.reducer.ts
+++ b/src/frontend/packages/store/src/reducers/routing.reducer.ts
@@ -20,11 +20,17 @@ export function routingReducer(state: RoutingHistory = defaultRoutingState, acti
         return state;
       }
 
+      // This changed in Anagular 9 - state no longer embdedded
+      // This deuiplicated the rotuerState
+      // We will keep it as before
       return {
         // ATM don't track change of route history
         // history: state.history.concat([action.payload.event]),
         previousState: state.currentState ? state.currentState : null,
-        currentState: action.payload.event
+        currentState: {
+          ...action.payload.event,
+          state: action.payload.routerState
+        }
       };
 
     default:

From c2189079c289ff960ea093ab721ada0197cbd12e Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 14 Apr 2020 15:55:34 +0100
Subject: [PATCH 019/176] Convert connection details checkbox to drop down

---
 .../backup-connection-cell.component.html     |   8 +
 .../backup-connection-cell.component.scss     |   0
 .../backup-connection-cell.component.spec.ts  |  25 +++
 .../backup-connection-cell.component.ts       |  22 +++
 .../backup-endpoints.service.ts               |  34 +---
 .../backup-endpoints.component.html           |   7 +-
 .../backup-endpoints.component.ts             |  29 +--
 .../backup-restore-endpoints.service.ts       | 179 +-----------------
 .../restore-endpoints.component.ts            |  33 ----
 .../endpoints-page.component.html             |   7 +-
 .../features/endpoints/endpoints.module.ts    |   5 +-
 .../endpoint/endpoints-list-config.service.ts |  25 +--
 src/jetstream/cnsi.go                         |  51 ++++-
 13 files changed, 152 insertions(+), 273 deletions(-)
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.html
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.scss
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.spec.ts
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.ts

diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.html
new file mode 100644
index 0000000000..752618ca1a
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.html
@@ -0,0 +1,8 @@
+<mat-form-field>
+  <mat-select [(value)]="service.state[row.guid][backupType.CONNECT]"
+    [disabled]="!service.state[row.guid][backupType.ENDPOINT]">
+    <mat-option [value]="connectionTypes.NONE">None</mat-option>
+    <mat-option [value]="connectionTypes.CURRENT">Current User</mat-option>
+    <mat-option [value]="connectionTypes.ALL">All Users</mat-option>
+  </mat-select>
+</mat-form-field>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.scss b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.spec.ts
new file mode 100644
index 0000000000..9f1d8760e4
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { BackupConnectionCellComponent } from './backup-connection-cell.component';
+
+describe('BackupConnectionCellComponent', () => {
+  let component: BackupConnectionCellComponent;
+  let fixture: ComponentFixture<BackupConnectionCellComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ BackupConnectionCellComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BackupConnectionCellComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.ts
new file mode 100644
index 0000000000..60a5190361
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.ts
@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+
+import { EndpointModel } from '../../../../../../store/src/types/endpoint.types';
+import { TableCellCustom } from '../../../../shared/components/list/list.types';
+import { BackupEndpointsService } from '../backup-endpoints.service';
+import { BackupEndpointConnectionTypes, BackupEndpointTypes } from '../backup-restore-endpoints.service';
+
+@Component({
+  selector: 'app-backup-connection-cell',
+  templateUrl: './backup-connection-cell.component.html',
+  styleUrls: ['./backup-connection-cell.component.scss']
+})
+export class BackupConnectionCellComponent extends TableCellCustom<EndpointModel> {
+
+  backupType = BackupEndpointTypes;
+  connectionTypes = BackupEndpointConnectionTypes;
+  selected: BackupEndpointConnectionTypes;
+
+  constructor(public service: BackupEndpointsService) {
+    super();
+  }
+}
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
index 80cc1c5f43..9b5479d444 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
@@ -12,6 +12,7 @@ import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
 import { BrowserStandardEncoder } from '../../../helper';
 import {
   BackupEndpointConfigUI,
+  BackupEndpointConnectionTypes,
   BackupEndpointsConfig,
   BackupEndpointTypes,
   BackupRestoreEndpointService,
@@ -51,8 +52,7 @@ export class BackupEndpointsService extends BackupRestoreEndpointService {
     endpoints.forEach(entity => {
       this.state[entity.guid] = {
         [BackupEndpointTypes.ENDPOINT]: false,
-        [BackupEndpointTypes.CONNECT]: false,
-        [BackupEndpointTypes.ALL_CONNECT]: false,
+        [BackupEndpointTypes.CONNECT]: BackupEndpointConnectionTypes.NONE,
         entity
       };
     });
@@ -63,25 +63,19 @@ export class BackupEndpointsService extends BackupRestoreEndpointService {
     const endpoints = Object.values(this.state);
     endpoints.forEach(endpoint => {
       if (!endpoint[BackupEndpointTypes.ENDPOINT]) {
-        endpoint[BackupEndpointTypes.CONNECT] = false;
-        endpoint[BackupEndpointTypes.ALL_CONNECT] = false;
-      }
-      if (endpoint[BackupEndpointTypes.ALL_CONNECT] && this.canBackup(endpoint.entity, BackupEndpointTypes.CONNECT)) {
-        endpoint[BackupEndpointTypes.CONNECT] = true;
+        endpoint[BackupEndpointTypes.CONNECT] = BackupEndpointConnectionTypes.NONE;
       }
     });
 
     const hasChanges = !!endpoints.find(endpoint =>
       endpoint[BackupEndpointTypes.ENDPOINT] ||
-      endpoint[BackupEndpointTypes.CONNECT] ||
-      endpoint[BackupEndpointTypes.ALL_CONNECT]
+      endpoint[BackupEndpointTypes.CONNECT] !== BackupEndpointConnectionTypes.NONE
     );
     this.hasChanges.next(hasChanges);
     const allChanged = endpoints.every(endpoint => {
       const e = !this.canBackup(endpoint.entity, BackupEndpointTypes.ENDPOINT) || endpoint[BackupEndpointTypes.ENDPOINT];
-      const c = !this.canBackup(endpoint.entity, BackupEndpointTypes.CONNECT) || endpoint[BackupEndpointTypes.CONNECT];
-      const aC = !this.canBackup(endpoint.entity, BackupEndpointTypes.ALL_CONNECT) || endpoint[BackupEndpointTypes.ALL_CONNECT];
-      return e && c && aC;
+      const c = !this.canBackup(endpoint.entity, BackupEndpointTypes.CONNECT) || endpoint[BackupEndpointTypes.CONNECT] !== BackupEndpointConnectionTypes.NONE;
+      return e && c;
     }
 
     );
@@ -105,14 +99,6 @@ export class BackupEndpointsService extends BackupRestoreEndpointService {
       return false;
     }
 
-    // Are all connection details backed up anyway?
-    // Does the user have connection details for this endpoint?
-    if (type === BackupEndpointTypes.CONNECT) {
-      return !this.state[endpoint.guid][BackupEndpointTypes.ALL_CONNECT] &&
-        endpoint.connectionStatus === 'connected';
-      // return !this.service.state[endpoint.guid][BackupRestoreTypes.CONNECT];
-    }
-
     return true;
   }
 
@@ -122,10 +108,7 @@ export class BackupEndpointsService extends BackupRestoreEndpointService {
         endpoint[BackupEndpointTypes.ENDPOINT] = true;
       }
       if (this.canBackup(endpoint.entity, BackupEndpointTypes.CONNECT)) {
-        endpoint[BackupEndpointTypes.CONNECT] = true;
-      }
-      if (this.canBackup(endpoint.entity, BackupEndpointTypes.ALL_CONNECT)) {
-        endpoint[BackupEndpointTypes.ALL_CONNECT] = true;
+        endpoint[BackupEndpointTypes.CONNECT] = BackupEndpointConnectionTypes.CURRENT;
       }
     });
     this.validate();
@@ -134,8 +117,7 @@ export class BackupEndpointsService extends BackupRestoreEndpointService {
   selectNone() {
     Object.values(this.state).forEach(endpoint => {
       endpoint[BackupEndpointTypes.ENDPOINT] = false;
-      endpoint[BackupEndpointTypes.CONNECT] = false;
-      endpoint[BackupEndpointTypes.ALL_CONNECT] = false;
+      endpoint[BackupEndpointTypes.CONNECT] = BackupEndpointConnectionTypes.NONE;
     });
     this.validate();
   }
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html
index e6dd32385c..14a8f6bf96 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html
@@ -22,7 +22,12 @@ <h1>Backup Endpoints</h1>
       <p>Protect the backup by providing as password. You will need this password when restoring from this backup</p>
       <form [formGroup]="passwordForm" class="stepper-form">
         <mat-form-field>
-          <input matInput formControlName="password" placeholder="Password" required type="password">
+          <mat-label>Password</mat-label>
+          <input matInput formControlName="password" required [type]="!show ? 'password' : 'text'">
+          <button mat-icon-button matSuffix (click)="show = !show" [attr.aria-label]="'Hide password'"
+            [attr.aria-pressed]="!show">
+            <mat-icon>{{!show ? 'visibility_off' : 'visibility'}}</mat-icon>
+          </button>
         </mat-form-field>
       </form>
     </div>
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
index 23f5216ab3..a32fa6f617 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
@@ -7,6 +7,7 @@ import { filter, first, map, tap } from 'rxjs/operators';
 
 import { GetAllEndpoints } from '../../../../../../store/src/actions/endpoint.actions';
 import { AppState } from '../../../../../../store/src/app-state';
+import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { EndpointModel } from '../../../../../../store/src/types/endpoint.types';
@@ -15,6 +16,7 @@ import { ConfirmationDialogService } from '../../../../shared/components/confirm
 import { ITableListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source-types';
 import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
 import { StepOnNextFunction, StepOnNextResult } from '../../../../shared/components/stepper/step/step.component';
+import { BackupConnectionCellComponent } from '../backup-connection-cell/backup-connection-cell.component';
 import { BackupEndpointsService } from '../backup-endpoints.service';
 import { BackupRestoreCellComponent } from '../backup-restore-cell/backup-restore-cell.component';
 import { BackupEndpointTypes } from '../backup-restore-endpoints.service';
@@ -38,6 +40,13 @@ export class BackupEndpointsComponent implements OnInit {
         valuePath: 'name'
       }
     },
+    {
+      columnId: 'type',
+      headerCell: () => 'Type',
+      cellDefinition: {
+        getValue: this.getEndpointTypeString
+      },
+    },
     {
       columnId: 'endpoint',
       headerCell: () => 'Backup',
@@ -48,19 +57,8 @@ export class BackupEndpointsComponent implements OnInit {
     },
     {
       columnId: 'connect',
-      headerCell: () => 'Backup Your Connection Details',
-      cellComponent: BackupRestoreCellComponent,
-      cellConfig: {
-        type: BackupEndpointTypes.CONNECT
-      }
-    },
-    {
-      columnId: 'all-connect',
-      headerCell: () => 'Backup All Users Connection Details',
-      cellComponent: BackupRestoreCellComponent,
-      cellConfig: {
-        type: BackupEndpointTypes.ALL_CONNECT
-      }
+      headerCell: () => 'Connection Details',
+      cellComponent: BackupConnectionCellComponent,
     },
   ];
   endpointDataSource: ITableListDataSource<EndpointModel>;
@@ -71,6 +69,7 @@ export class BackupEndpointsComponent implements OnInit {
   // Step 2
   passwordValid$: Observable<boolean>;
   passwordForm: FormGroup;
+  show = false;
 
   constructor(
     public service: BackupEndpointsService,
@@ -82,6 +81,7 @@ export class BackupEndpointsComponent implements OnInit {
     this.setupPasswordStep();
   }
 
+
   setupSelectStep() {
     const action = new GetAllEndpoints();
     const endpointObs = getPaginationObservables<EndpointModel>({
@@ -181,4 +181,7 @@ export class BackupEndpointsComponent implements OnInit {
   }
 
 
+  private getEndpointTypeString(endpoint: EndpointModel): string {
+    return entityCatalog.getEndpoint(endpoint.cnsi_type, endpoint.sub_type).definition.label;
+  }
 }
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints.service.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints.service.ts
index 29b19d45f2..abb46f3628 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints.service.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints.service.ts
@@ -8,7 +8,12 @@ import { isHttpErrorResponse } from '../../../jetstream.helpers';
 export enum BackupEndpointTypes {
   ENDPOINT = 'endpoint',
   CONNECT = 'connect',
-  ALL_CONNECT = 'all_connect'
+}
+
+export enum BackupEndpointConnectionTypes {
+  NONE = 'NONE',
+  CURRENT = 'CURRENT',
+  ALL = 'ALL'
 }
 
 export interface BackupEndpointsConfig<T> {
@@ -17,17 +22,13 @@ export interface BackupEndpointsConfig<T> {
 
 export interface BaseEndpointConfig {
   [BackupEndpointTypes.ENDPOINT]: boolean;
-  [BackupEndpointTypes.CONNECT]: boolean;
-  [BackupEndpointTypes.ALL_CONNECT]: boolean;
+  [BackupEndpointTypes.CONNECT]: BackupEndpointConnectionTypes;
 }
 
-// type BackupEndpoint = Omit<BackupEndpointConfig, 'entity'>;
-
 export interface BackupEndpointConfigUI extends BaseEndpointConfig {
   entity: EndpointModel;
 }
 
-// @Injectable()
 export class BackupRestoreEndpointService {
 
   createError(err: any): string {
@@ -44,170 +45,4 @@ export class BackupRestoreEndpointService {
     }
     return err.message;
   }
-
-  // hasChanges = new BehaviorSubject(false);
-  // hasChanges$ = this.hasChanges.asObservable();
-  // allChanged = new BehaviorSubject(false);
-  // allChanged$ = this.allChanged.asObservable();
-
-  // state: BackupEndpointsConfig<BackupEndpointConfigUI> = {};
-  // password: string;
-
-
-  // constructor(
-  //   private store: Store<GeneralEntityAppState>,
-  //   private http: HttpClient
-  // ) {
-
-  // }
-
-  // // State Related
-  // initialize(endpoints: EndpointModel[]) {
-  //   endpoints.forEach(entity => {
-  //     this.state[entity.guid] = {
-  //       [BackupRestoreTypes.ENDPOINT]: false,
-  //       [BackupRestoreTypes.CONNECT]: false,
-  //       [BackupRestoreTypes.ALL_CONNECT]: false,
-  //       entity
-  //     };
-  //   });
-  //   this.validate();
-  // }
-
-  // validate() {
-  //   const endpoints = Object.values(this.state);
-  //   endpoints.forEach(endpoint => {
-  //     if (!endpoint[BackupRestoreTypes.ENDPOINT]) {
-  //       endpoint[BackupRestoreTypes.CONNECT] = false;
-  //       endpoint[BackupRestoreTypes.ALL_CONNECT] = false;
-  //     }
-  //     if (endpoint[BackupRestoreTypes.ALL_CONNECT] && this.canBackup(endpoint.entity, BackupRestoreTypes.CONNECT)) {
-  //       endpoint[BackupRestoreTypes.CONNECT] = true;
-  //     }
-  //   });
-
-  //   const hasChanges = !!endpoints.find(endpoint =>
-  //     endpoint[BackupRestoreTypes.ENDPOINT] ||
-  //     endpoint[BackupRestoreTypes.CONNECT] ||
-  //     endpoint[BackupRestoreTypes.ALL_CONNECT]
-  //   );
-  //   this.hasChanges.next(hasChanges);
-  //   const allChanged = endpoints.every(endpoint => {
-  //     const e = !this.canBackup(endpoint.entity, BackupRestoreTypes.ENDPOINT) || endpoint[BackupRestoreTypes.ENDPOINT];
-  //     const c = !this.canBackup(endpoint.entity, BackupRestoreTypes.CONNECT) || endpoint[BackupRestoreTypes.CONNECT];
-  //     const aC = !this.canBackup(endpoint.entity, BackupRestoreTypes.ALL_CONNECT) || endpoint[BackupRestoreTypes.ALL_CONNECT];
-  //     return e && c && aC;
-  //   }
-
-  //   );
-  //   this.allChanged.next(allChanged);
-  // }
-
-  // canBackup(endpoint: EndpointModel, type: BackupRestoreTypes): boolean {
-  //   // Can always back up endpoint
-  //   if (type === BackupRestoreTypes.ENDPOINT) {
-  //     return true;
-  //   }
-
-  //   // All other settings require endpoint to be backed up
-  //   if (!this.state[endpoint.guid][BackupRestoreTypes.ENDPOINT]) {
-  //     return false;
-  //   }
-
-  //   const epType = entityCatalog.getEndpoint(endpoint.cnsi_type, endpoint.sub_type).definition;
-  //   // The endpoint type supports connection details
-  //   if (epType.unConnectable) {
-  //     return false;
-  //   }
-
-  //   // Are all connection details backed up anyway?
-  //   // Does the user have connection details for this endpoint?
-  //   if (type === BackupRestoreTypes.CONNECT) {
-  //     return !this.state[endpoint.guid][BackupRestoreTypes.ALL_CONNECT] &&
-  //       endpoint.connectionStatus === 'connected';
-  //     // return !this.service.state[endpoint.guid][BackupRestoreTypes.CONNECT];
-  //   }
-
-  //   return true;
-  // }
-
-  // selectAll() {
-  //   Object.values(this.state).forEach(endpoint => {
-  //     if (this.canBackup(endpoint.entity, BackupRestoreTypes.ENDPOINT)) {
-  //       endpoint[BackupRestoreTypes.ENDPOINT] = true;
-  //     }
-  //     if (this.canBackup(endpoint.entity, BackupRestoreTypes.CONNECT)) {
-  //       endpoint[BackupRestoreTypes.CONNECT] = true;
-  //     }
-  //     if (this.canBackup(endpoint.entity, BackupRestoreTypes.ALL_CONNECT)) {
-  //       endpoint[BackupRestoreTypes.ALL_CONNECT] = true;
-  //     }
-  //   });
-  //   this.validate();
-  // }
-
-  // selectNone() {
-  //   Object.values(this.state).forEach(endpoint => {
-  //     endpoint[BackupRestoreTypes.ENDPOINT] = false;
-  //     endpoint[BackupRestoreTypes.CONNECT] = false;
-  //     endpoint[BackupRestoreTypes.ALL_CONNECT] = false;
-  //   });
-  //   this.validate();
-  // }
-
-  // // Request Related
-
-  // createBackup(): Observable<Blob> {
-  //   const url = '/pp/v1/backup/endpoints';
-  //   const fromObject = {};
-  //   const params: HttpParams = new HttpParams({
-  //     fromObject,
-  //     encoder: new BrowserStandardEncoder()
-  //   });
-
-  //   return this.getSessionData().pipe(
-  //     switchMap(ses => this.http.post(url, this.createBodyToSend(ses), {
-  //       params
-  //     })),
-  //     map(res => {
-  //       console.log('Response: ', res);
-  //       return new Blob([JSON.stringify(res)]);
-  //     }),
-  //     first(),
-  //   );
-  // }
-
-  // private createBodyToSend(sd: SessionData): BackupEndpointRequestData {
-  //   const state: BackupEndpointsConfig<BackupEndpointConfigRequest> = Object.entries(this.state).reduce((res, [endpointId, endpoint]) => {
-  //     const { entity, ...rest } = endpoint;
-  //     const requestConfig: BackupEndpointConfigRequest = {
-  //       ...rest,
-  //     };
-  //     res[endpointId] = requestConfig;
-  //     return res;
-  //   }, {});
-  //   return {
-  //     state,
-  //     userId: this.getUserIdFromSessionData(sd),
-  //     password: this.password
-  //   };
-  // }
-
-  // private getUserIdFromSessionData(sd: SessionData): string {
-  //   if (sd && sd.user) {
-  //     return sd.user.guid;
-  //   }
-  //   return null;
-  // }
-
-  // private getSessionData(): Observable<SessionData> {
-  //   return this.store.select(s => s.auth).pipe(
-  //     filter(auth => !!(auth && auth.sessionData)),
-  //     map((auth: AuthState) => auth.sessionData),
-  //     first()
-  //   );
-  // }
-
-
-
 }
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
index 0bfb63a132..e35d5af48a 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
@@ -6,15 +6,10 @@ import { first, map, tap } from 'rxjs/operators';
 
 import { AppState } from '../../../../../../store/src/app-state';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
-import { EndpointModel } from '../../../../../../store/src/types/endpoint.types';
 import { getEventFiles } from '../../../../core/browser-helper';
 import { ConfirmationDialogConfig } from '../../../../shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../shared/components/confirmation-dialog.service';
-import { ITableListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source-types';
-import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
 import { StepOnNextFunction, StepOnNextResult } from '../../../../shared/components/stepper/step/step.component';
-import { BackupRestoreCellComponent } from '../backup-restore-cell/backup-restore-cell.component';
-import { BackupEndpointTypes } from '../backup-restore-endpoints.service';
 import { RestoreEndpointsService } from '../restore-endpoints.service';
 
 
@@ -29,34 +24,6 @@ import { RestoreEndpointsService } from '../restore-endpoints.service';
 export class RestoreEndpointsComponent implements OnInit {
 
   // Step 1
-  columns: ITableColumn<EndpointModel>[] = [
-    {
-      columnId: 'name',
-      headerCell: () => 'Name',
-      cellDefinition: {
-        valuePath: 'name'
-      }
-    },
-    {
-      columnId: 'endpoint',
-      headerCell: () => 'Restore',
-      cellComponent: BackupRestoreCellComponent,
-      cellConfig: {
-        type: BackupEndpointTypes.ENDPOINT,
-
-      }
-    },
-    {
-      columnId: 'connect',
-      headerCell: () => 'Include Connection',
-      cellComponent: BackupRestoreCellComponent,
-      cellConfig: {
-        type: BackupEndpointTypes.CONNECT
-      }
-    },
-    // TODO: RC disable backup token if unconnectable
-  ];
-  endpointDataSource: ITableListDataSource<EndpointModel>;
   fileValid$: Observable<boolean>;
   fileName: string;
 
diff --git a/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.html b/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.html
index ee90c52f27..c8e3f991c3 100644
--- a/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/endpoints-page/endpoints-page.component.html
@@ -1,9 +1,14 @@
 <app-page-header>
   <h1>Endpoints</h1>
   <div class="page-header-right">
-    <button id="stratos-add-endpoint" *appUserPermission="canRegisterEndpoint" mat-icon-button [routerLink]="'/endpoints/new/'">
+    <button id="stratos-add-endpoint" *appUserPermission="canRegisterEndpoint" mat-icon-button
+      [routerLink]="'/endpoints/new/'" matTooltip="Register Endpoint">
       <mat-icon>add</mat-icon>
     </button>
+    <button id="stratos-add-endpoint" *appUserPermission="canRegisterEndpoint" mat-icon-button
+      [routerLink]="'/endpoints/backup-restore'" matTooltip="Backup/Restore Endpoints">
+      <mat-icon>settings_backup_restore</mat-icon>
+    </button>
   </div>
 </app-page-header>
 
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 c3704479ff..307379946a 100644
--- a/src/frontend/packages/core/src/features/endpoints/endpoints.module.ts
+++ b/src/frontend/packages/core/src/features/endpoints/endpoints.module.ts
@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
 
 import { CoreModule } from '../../core/core.module';
 import { SharedModule } from '../../shared/shared.module';
+import { BackupConnectionCellComponent } from './backup-restore/backup-connection-cell/backup-connection-cell.component';
 import { BackupEndpointsComponent } from './backup-restore/backup-endpoints/backup-endpoints.component';
 import { BackupRestoreCellComponent } from './backup-restore/backup-restore-cell/backup-restore-cell.component';
 import {
@@ -37,13 +38,15 @@ import { EndpointsRoutingModule } from './endpoints.routing';
     BackupEndpointsComponent,
     RestoreEndpointsComponent,
     BackupRestoreCellComponent,
+    BackupConnectionCellComponent,
   ],
   entryComponents: [
     ConnectEndpointDialogComponent,
     CredentialsAuthFormComponent,
     SSOAuthFormComponent,
     NoneAuthFormComponent,
-    BackupRestoreCellComponent
+    BackupRestoreCellComponent,
+    BackupConnectionCellComponent
   ]
 })
 export class EndpointsModule { }
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 67ef1c43ca..44e7281b6a 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
@@ -1,8 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { of } from 'rxjs';
-import { filter, map } from 'rxjs/operators';
+import { filter } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
@@ -10,13 +8,12 @@ import { entityCatalog } from '../../../../../../../store/src/entity-catalog/ent
 import { EntityMonitorFactory } from '../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { InternalEventMonitorFactory } from '../../../../../../../store/src/monitors/internal-event-monitor.factory';
 import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory';
-import { AuthState } from '../../../../../../../store/src/reducers/auth.reducer';
 import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
 import { getFullEndpointApiUrl } from '../../../../../features/endpoints/endpoint-helpers';
 import { FavoritesConfigMapper } from '../../../favorites-meta-card/favorite-config-mapper';
 import { createTableColumnFavorite } from '../../list-table/table-cell-favorite/table-cell-favorite.component';
 import { ITableColumn } from '../../list-table/table.types';
-import { IGlobalListAction, IListAction, IListConfig, ListViewTypes } from '../../list.component.types';
+import { IListAction, IListConfig, ListViewTypes } from '../../list.component.types';
 import { EndpointCardComponent } from './endpoint-card/endpoint-card.component';
 import { EndpointListHelper } from './endpoint-list.helpers';
 import { EndpointsDataSource } from './endpoints-data-source';
@@ -32,19 +29,6 @@ export class EndpointsListConfigService implements IListConfig<EndpointModel> {
 
   private singleActions: IListAction<EndpointModel>[];
 
-  private globalActions: IGlobalListAction<EndpointModel>[] = [{
-    action: () => this.router.navigate(['endpoints/backup-restore']),
-    icon: 'settings_backup_restore',
-    label: 'Backup/Restore Endpoints',
-    description: 'Backup or Restore Endpoints',
-    visible$: this.store.select(s => s.auth).pipe(
-      filter(auth => !!auth && !!auth.sessionData),
-      map((auth: AuthState) => auth.sessionData),
-      map(session => session.user && session.user.admin)
-    ),
-    enabled$: of(true), // Table is not shown when there's no endpoints, so this should always be true
-  }];
-
   public readonly columns: ITableColumn<EndpointModel>[] = [
     {
       columnId: 'name',
@@ -105,7 +89,6 @@ export class EndpointsListConfigService implements IListConfig<EndpointModel> {
     }
   ];
 
-
   isLocal = true;
   dataSource: EndpointsDataSource;
   viewType = ListViewTypes.BOTH;
@@ -123,7 +106,7 @@ export class EndpointsListConfigService implements IListConfig<EndpointModel> {
     internalEventMonitorFactory: InternalEventMonitorFactory,
     endpointListHelper: EndpointListHelper,
     favoritesConfigMapper: FavoritesConfigMapper,
-    private router: Router
+    // private router: Router
   ) {
     this.singleActions = endpointListHelper.endpointActions();
     const favoriteCell = createTableColumnFavorite(
@@ -139,7 +122,7 @@ export class EndpointsListConfigService implements IListConfig<EndpointModel> {
     );
   }
 
-  public getGlobalActions = () => this.globalActions;
+  public getGlobalActions = () => [];
   public getMultiActions = () => [];
   public getSingleActions = () => this.singleActions;
   public getColumns = () => this.columns;
diff --git a/src/jetstream/cnsi.go b/src/jetstream/cnsi.go
index 048a912ce8..779645b1ba 100644
--- a/src/jetstream/cnsi.go
+++ b/src/jetstream/cnsi.go
@@ -637,6 +637,14 @@ func (p *portalProxy) updateEndpoint(c echo.Context) error {
 	return nil
 }
 
+type BackupConnectionType string
+
+const (
+	BACKUP_CONNECTION_NONE    BackupConnectionType = "NONE"
+	BACKUP_CONNECTION_CURRENT                      = "CURRENT"
+	BACKUP_CONNECTION_ALL                          = "ALL"
+)
+
 // TODO: RC position
 type BackupDataRequest struct {
 	State    map[string]BackupEndpointsState `json:"state"`
@@ -645,9 +653,8 @@ type BackupDataRequest struct {
 }
 
 type BackupEndpointsState struct {
-	Endpoint   bool `json:"endpoint"`
-	Connect    bool `json:"connect"`
-	AllConnect bool `json:"all_connect"`
+	Endpoint bool                 `json:"endpoint"`
+	Connect  BackupConnectionType `json:"connect"`
 }
 
 type BackupRestoreState struct {
@@ -727,7 +734,8 @@ func (p *portalProxy) createBackup(data *BackupDataRequest) (*BackupRestoreState
 			}
 		}
 
-		if endpoint.AllConnect {
+		switch connectionType := endpoint.Connect; connectionType {
+		case BACKUP_CONNECTION_ALL:
 			// allTokensFrom = append(allTokensFrom, endpointID)
 			if tokenRecords, ok := p.getCNSITokenRecordsBackup(endpointID); ok {
 				log.Warn("tokens for AllConnect")
@@ -736,7 +744,7 @@ func (p *portalProxy) createBackup(data *BackupDataRequest) (*BackupRestoreState
 				log.Warn("No tokens for AllConnect")
 				// TODO: RC
 			}
-		} else if endpoint.Connect {
+		case BACKUP_CONNECTION_CURRENT:
 			// userTokenFrom = append(userTokenFrom, endpointID)
 			if tokenRecord, ok := p.GetCNSITokenRecordWithDisconnected(endpointID, data.UserID); ok {
 				log.Warn("tokens for Connect")
@@ -759,6 +767,39 @@ func (p *portalProxy) createBackup(data *BackupDataRequest) (*BackupRestoreState
 				// return nil, nil, false
 			}
 		}
+
+		// if endpoint.Connect == BACKUP_CONNECTION_ALL {
+		// 	// allTokensFrom = append(allTokensFrom, endpointID)
+		// 	if tokenRecords, ok := p.getCNSITokenRecordsBackup(endpointID); ok {
+		// 		log.Warn("tokens for AllConnect")
+		// 		tokens = append(tokens, tokenRecords...)
+		// 	} else {
+		// 		log.Warn("No tokens for AllConnect")
+		// 		// TODO: RC
+		// 	}
+		// } else if endpoint.Connect {
+		// 	// userTokenFrom = append(userTokenFrom, endpointID)
+		// 	if tokenRecord, ok := p.GetCNSITokenRecordWithDisconnected(endpointID, data.UserID); ok {
+		// 		log.Warn("tokens for Connect")
+		// 		// var btr BackupTokenRecord
+		// 		// TODO: RC Q This will be the linked token as if it were the users token
+		// 		var btr = interfaces.BackupTokenRecord{
+		// 			// tokenRecord: tokenRecord,
+		// 			TokenRecord:  tokenRecord,
+		// 			EndpointGUID: endpointID,
+		// 			TokenType:    "CNSI",
+		// 			UserGUID:     data.UserID,
+		// 		}
+
+		// 		tokens = append(tokens, btr)
+		// 	} else {
+		// 		log.Warnf("No tokens for Connect: %+v,%+v", endpointID, data.UserID)
+		// 		// TODO: RC
+		// 		// msg := "Unable to retrieve CNSI token record."
+		// 		// log.Debug(msg)
+		// 		// return nil, nil, false
+		// 	}
+		// }
 	}
 
 	log.Infof("endpoints: %+v", endpoints)

From 4f3c6b4eda806662d46d10d0254157d9ae33758b Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 15 Apr 2020 15:18:48 +0100
Subject: [PATCH 020/176] Add docs for max list feature

---
 docs/cf-entity-scaling.md | 43 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 docs/cf-entity-scaling.md

diff --git a/docs/cf-entity-scaling.md b/docs/cf-entity-scaling.md
new file mode 100644
index 0000000000..6055137d25
--- /dev/null
+++ b/docs/cf-entity-scaling.md
@@ -0,0 +1,43 @@
+# Cloud Foundry Scaling - How Stratos Handles Large Lists
+
+Stratos presents collections of entities via the Stratos list component. The list component presents the collection in a paginated, sortable and searchable way in either a set of cards or a table.
+In order to achieve this, due to the limitations of the APIs used, the list may fetch all entities (as opposed to fetching entities for the visible page only) and paginate, sort and search locally.
+
+## Protecting Stratos from Large Collections
+In some cases the number of entities in a collection can be incredibly high. Stratos can decide to not fetch them all in order to protect the CF from
+a substantial number of requests. To do this the first page is fetched and the total number of entities is checked against a limit. If under
+the limit the remaining pages are asynchronously fetched. If over then the remaining pages are ignored and the user is informed that the list could not fetch all entities.
+
+Depending on the list, the user can then try to filter the collection such that the number of entities is below the limit. Depending on configuration
+the user also has the option to fetch all entities regardless of the limit.
+
+## Applicable Lists
+Currently, in 3.1.0, this large collection protection is only applicable to the following lists
+
+- Application Wall
+- Marketplace (Services)
+- Services (Service & User Provided Service Instances)
+- CF, Organisation and Space Users
+- CF Routes
+
+In the future we hope to expand this to all lists.
+
+## Determining the List Limit
+The limit at which we won't fetch all entities is determined, in least important to most important order, by
+
+1) The global CF default - 600
+2) The Jetstream override for all lists - by default not set
+
+In the future we hope to allow each end user of Stratos to determine their own limit (if they have the correct permissions).
+
+## Fetch All feature
+If the list hits the limit the user will be presented with a button to `Fetch All` entities. Clicking this button ensures the list reverts
+back as if there were no limit and thus fetching all entities. This feature is disabled by default and can be enabled by a Jetstream override.
+
+## Configuration
+The Jetstream overrides can be set via environment variable, or if in helm, as values.
+
+Environment Variable|Helm Value|Description|Default|
+|---|---|---|---|
+|`UI_LIST_MAX_SIZE`|`console.ui.listMaxSize`|Override the default maximum number of entities that a configured list can fetch. When a list meets this amount additional pages are not fetched||
+|`UI_LIST_ALLOW_LOAD_MAXED`|`console.ui.listAllowLoadMaxed`|If the maximum list size is met give the user the option to fetch all results|false|
\ No newline at end of file

From ca7929bae59641d77cd4587f06118de019ea0bb5 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 14 Apr 2020 17:25:36 +0100
Subject: [PATCH 021/176] Add db version check

---
 .../backup-endpoints.service.ts               |  16 ++-
 .../restore-endpoints.service.ts              | 107 ++++++++++++++----
 .../restore-endpoints.component.html          |  26 +++--
 .../restore-endpoints.component.scss          |   9 +-
 .../restore-endpoints.component.ts            |  54 +--------
 .../store/src/reducers/auth.reducer.ts        |   2 +-
 src/jetstream/cnsi.go                         |  98 +++++++++++-----
 7 files changed, 197 insertions(+), 115 deletions(-)

diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
index 9b5479d444..51b4d4ecf5 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
@@ -19,12 +19,10 @@ import {
   BaseEndpointConfig,
 } from './backup-restore-endpoints.service';
 
-interface BackupEndpointConfigRequest extends BaseEndpointConfig {
-  // connectedUser: string;
-}
 
-interface BackupEndpointRequestData {
-  state: BackupEndpointsConfig<BackupEndpointConfigRequest>;
+
+interface BackupRequest {
+  state: BackupEndpointsConfig<BaseEndpointConfig>;
   userId: string;
   password: string;
 }
@@ -144,10 +142,10 @@ export class BackupEndpointsService extends BackupRestoreEndpointService {
     );
   }
 
-  private createBodyToSend(sd: SessionData): BackupEndpointRequestData {
-    const state: BackupEndpointsConfig<BackupEndpointConfigRequest> = Object.entries(this.state).reduce((res, [endpointId, endpoint]) => {
+  private createBodyToSend(sd: SessionData): BackupRequest {
+    const state: BackupEndpointsConfig<BaseEndpointConfig> = Object.entries(this.state).reduce((res, [endpointId, endpoint]) => {
       const { entity, ...rest } = endpoint;
-      const requestConfig: BackupEndpointConfigRequest = {
+      const requestConfig: BaseEndpointConfig = {
         ...rest,
       };
       res[endpointId] = requestConfig;
@@ -156,7 +154,7 @@ export class BackupEndpointsService extends BackupRestoreEndpointService {
     return {
       state,
       userId: this.getUserIdFromSessionData(sd),
-      password: this.password
+      password: this.password,
     };
   }
 
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts
index ca3daa19b9..b0b977d388 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts
@@ -1,31 +1,79 @@
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { BehaviorSubject, Observable } from 'rxjs';
+import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
 
 import { GeneralEntityAppState } from '../../../../../store/src/app-state';
+import { selectSessionData } from '../../../../../store/src/reducers/auth.reducer';
+import { SessionData } from '../../../../../store/src/types/auth.types';
+import { LoggerService } from '../../../core/logger.service';
 import { BrowserStandardEncoder } from '../../../helper';
 import { BackupRestoreEndpointService } from './backup-restore-endpoints.service';
 
+interface BackupContent {
+  payload: string;
+  dbVersion: number;
+}
+
 interface RestoreEndpointsData {
   data: string;
   password: string;
+  ignoreDbVersion: boolean;
 }
 
 @Injectable()
 export class RestoreEndpointsService extends BackupRestoreEndpointService {
 
-  validFile = new BehaviorSubject(false);
-  validFile$ = this.validFile.asObservable();
+  // Step 1
+  validFileContent = new BehaviorSubject(false);
+  validFileContent$: Observable<boolean> = this.validFileContent.asObservable();
+
+  file = new BehaviorSubject<{
+    name: string,
+    content: BackupContent
+  }>(null);
+  file$ = this.file.asObservable();
+
+  validDb = new BehaviorSubject(false);
+  validDb$: Observable<boolean>;
+  currentDbVersion$: Observable<number>;
+  ignoreDbVersion = new BehaviorSubject(false);
+  ignoreDbVersion$ = this.ignoreDbVersion.asObservable();
+
+  // Step 2
   password: string; // TODO: RC use set password in both services
-  fileName: string;
-  private fileContent: string;
 
   constructor(
     private store: Store<GeneralEntityAppState>,
-    private http: HttpClient
+    private http: HttpClient,
+    private logger: LoggerService
   ) {
     super();
+    this.setupStep1();
+  }
+
+  private setupStep1() {
+    this.currentDbVersion$ = this.store.select(selectSessionData()).pipe(
+      map((sd: SessionData) => sd.version.database_version)
+    );
+
+    this.validDb$ = combineLatest([
+      this.file$,
+      this.currentDbVersion$
+    ]).pipe(
+      map(([file, currentDbVersion]) => {
+        return file && file.content.dbVersion === currentDbVersion;
+      })
+    );
+
+    this.validFileContent$ = combineLatest([
+      this.file$,
+      this.validDb$,
+      this.ignoreDbVersion$
+    ]).pipe(
+      map(([file, validDb, ignoreDb]) => !!file && (ignoreDb || validDb))
+    );
   }
 
   setFile(file): Promise<string> {
@@ -43,17 +91,28 @@ export class RestoreEndpointsService extends BackupRestoreEndpointService {
   }
 
   private setFileResult(content: string, fileName: string) {
-    if (!!content) {
-      this.validFile.next(true);
-      this.fileName = fileName;
-      this.fileContent = content;
+    let parsedContent: BackupContent;
+    try {
+      parsedContent = JSON.parse(content);
+    } catch (e) {
+      this.logger.warn('Failed to parse file contents: ', e);
+    }
+
+    if (!!parsedContent) {
+      this.file.next({
+        name: fileName,
+        content: parsedContent
+      });
     } else {
-      this.validFile.next(false);
-      this.fileName = '';
-      this.fileContent = '';
+      this.file.next(null);
     }
+
+    // this.updateFileContentValidation();
   }
 
+  setIgnoreDbVersion(ignore: boolean) {
+    this.ignoreDbVersion.next(ignore);
+  }
 
   restoreBackup(): Observable<any> {
     const url = '/pp/v1/endpoints/restore';
@@ -62,15 +121,19 @@ export class RestoreEndpointsService extends BackupRestoreEndpointService {
       fromObject,
       encoder: new BrowserStandardEncoder()
     });
-    return this.http.post(url, this.createBodyToSend(), {
-      params
-    });
-  }
 
-  createBodyToSend(): RestoreEndpointsData {
-    return {
-      data: this.fileContent,
-      password: this.password
-    };
+    return combineLatest([
+      this.file$,
+      this.ignoreDbVersion$
+    ]).pipe(
+      switchMap(([file, ignoreDb]) => {
+        const body: RestoreEndpointsData = {
+          data: JSON.stringify(file.content),
+          password: this.password,
+          ignoreDbVersion: ignoreDb
+        };
+        return this.http.post(url, body, { params });
+      })
+    );
   }
 }
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html
index 7b9ef8f1f0..2611a539fd 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html
@@ -3,15 +3,27 @@ <h1>Restore Endpoints</h1>
 </app-page-header>
 
 <app-steppers cancel="/endpoints" [basePreviousRedirect]="{ path: '/endpoints/backup-restore' }">
-  <app-step title="File" [valid]="fileValid$ | async">
+  <app-step title="File" [valid]="service.validFileContent$ | async">
     <div class="file-step">
-      <p>Provide the backup file to restore from.</p>
-      <div class="file-step__input">
-        <input #localPathSelectFile fileread="localPathFile" type="file" class="file-step__input--input"
-          name="localPathSelectFile" id="localPathSelectFile" (change)="onFileChange($event)" />Choose
-        <button (click)="localPathSelectFile.click()" color="primary" mat-button mat-raised-button>File</button>
-        {{service.fileName}}
+      <div class="file-step__chunk">
+        <p>Provide the backup file to restore from.</p>
+        <div class="file-step__input">
+          <input #localPathSelectFile fileread="localPathFile" type="file" class="file-step__input--input"
+            name="localPathSelectFile" id="localPathSelectFile" (change)="onFileChange($event)" />Choose
+          <button (click)="localPathSelectFile.click()" color="primary" mat-button mat-raised-button>File</button>
+          <ng-container *ngIf="service.file$ | async as file">{{file.name}}</ng-container>
+        </div>
       </div>
+      <ng-container *ngIf="service.file$ | async as file">
+        <div *ngIf="!(service.validDb$ | async)" class="file-step__chunk">
+          <p>The database version of Stratos (<code>{{service.currentDbVersion$ | async}}</code>) and the backup
+            (<code>{{file.content.dbVersion}}</code>) are different. Restoring this file may have adverse affects.
+          </p>
+          <mat-checkbox (change)="onIgnoreDbChange($event)">
+            Ignore different database versions
+          </mat-checkbox>
+        </div>
+      </ng-container>
     </div>
   </app-step>
   <app-step title="Password" finishButtonText="Restore" [onNext]="restore" [valid]="passwordValid$ | async">
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.scss b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.scss
index 89184f73a4..60b6ddd949 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.scss
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.scss
@@ -2,8 +2,13 @@
   flex: 1;
 }
 .file-step {
-  display: flex;
-  flex-direction: column;
+
+  &,
+  &__chunk {
+    display: flex;
+    flex-direction: column;
+  }
+  
   &__input {
     &--input {
       height: 0;
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
index e35d5af48a..8762a498f2 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
@@ -1,11 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
-import { Store } from '@ngrx/store';
+import { MatCheckboxChange } from '@angular/material';
 import { Observable, of, Subject } from 'rxjs';
 import { first, map, tap } from 'rxjs/operators';
 
-import { AppState } from '../../../../../../store/src/app-state';
-import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { getEventFiles } from '../../../../core/browser-helper';
 import { ConfirmationDialogConfig } from '../../../../shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../shared/components/confirmation-dialog.service';
@@ -21,11 +19,7 @@ import { RestoreEndpointsService } from '../restore-endpoints.service';
     RestoreEndpointsService
   ]
 })
-export class RestoreEndpointsComponent implements OnInit {
-
-  // Step 1
-  fileValid$: Observable<boolean>;
-  fileName: string;
+export class RestoreEndpointsComponent {
 
   // Step 2
   passwordValid$: Observable<boolean>;
@@ -33,29 +27,9 @@ export class RestoreEndpointsComponent implements OnInit {
 
   constructor(
     public service: RestoreEndpointsService,
-    store: Store<AppState>,
-    paginationMonitorFactory: PaginationMonitorFactory,
     private confirmDialog: ConfirmationDialogService,
   ) {
-
-    // const endpoints$ = of([]);
-    // this.endpointDataSource = {
-    //   isTableLoading$: of(false),
-    //   connect: () => endpoints$.pipe(
-    //     map(endpoints => endpoints.sort((a, b) => a.name.localeCompare(b.name)))
-    //   ),
-    //   disconnect: () => { },
-    //   trackBy: (index, row) => row.guid
-    // };
-
-    this.setupFileStep();
-
     this.setupPasswordStep();
-
-  }
-
-  setupFileStep() {
-    this.fileValid$ = this.service.validFile$;
   }
 
   setupPasswordStep() {
@@ -70,33 +44,17 @@ export class RestoreEndpointsComponent implements OnInit {
     );
   }
 
-  ngOnInit() {
-  }
-
   onFileChange(event) {
     const files = getEventFiles(event);
     if (!files.length) {
       return;
     }
     const file = files[0];
-    console.log(event, file);
     this.service.setFile(file);
+  }
 
-    // console.log(files);
-    // TODO: RC file load - get content of file
-    // TODO: RC file load - validate correct file
-    // TODO: RC file load - parse file
-    // TODO: RC file load - enable next step
-
-
-    // const utils = new DeployApplicationFsUtils();
-    // utils.handleFileInputSelection(files).pipe(
-    //   filter(res => !!res),
-    //   first()
-    // ).subscribe((res) => {
-    //   this.propagateChange(res);
-    //   this.sourceData$.next(res);
-    // });
+  onIgnoreDbChange(event: MatCheckboxChange) {
+    this.service.setIgnoreDbVersion(event.checked);
   }
 
   restore: StepOnNextFunction = () => {
diff --git a/src/frontend/packages/store/src/reducers/auth.reducer.ts b/src/frontend/packages/store/src/reducers/auth.reducer.ts
index 06294413ef..c8ae1c2dd7 100644
--- a/src/frontend/packages/store/src/reducers/auth.reducer.ts
+++ b/src/frontend/packages/store/src/reducers/auth.reducer.ts
@@ -103,5 +103,5 @@ export function authReducer(state: AuthState = defaultState, action): AuthState
 }
 
 export function selectSessionData() {
-  return (state: AuthOnlyAppState) => state.auth.sessionData;
+  return (state: AuthOnlyAppState): SessionData => state.auth.sessionData;
 }
diff --git a/src/jetstream/cnsi.go b/src/jetstream/cnsi.go
index 779645b1ba..d32e53fa6d 100644
--- a/src/jetstream/cnsi.go
+++ b/src/jetstream/cnsi.go
@@ -3,6 +3,7 @@ package main
 import (
 	"crypto/x509"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -646,25 +647,34 @@ const (
 )
 
 // TODO: RC position
-type BackupDataRequest struct {
-	State    map[string]BackupEndpointsState `json:"state"`
-	UserID   string                          `json:"userId"`
-	Password string                          `json:"password"`
-}
-
 type BackupEndpointsState struct {
 	Endpoint bool                 `json:"endpoint"`
 	Connect  BackupConnectionType `json:"connect"`
 }
 
-type BackupRestoreState struct {
+// Sent to backup
+type BackupRequest struct {
+	State     map[string]BackupEndpointsState `json:"state"`
+	UserID    string                          `json:"userId"`
+	DBVersion string                          `json:"dbVersion"`
+	Password  string                          `json:"password"`
+}
+
+type BackupRequestEndpointsResponse struct {
 	Endpoints []*interfaces.CNSIRecord
 	Tokens    []interfaces.BackupTokenRecord
 }
 
-type RestoreDataRequest struct {
-	Data     string `json:"data"`
-	Password string `json:"password"`
+type BackupContent struct {
+	payload   BackupRequestEndpointsResponse `json:"payload"`
+	DBVersion int64                          `json:"dbVersion"`
+}
+
+type RestoreRequest struct {
+	// Data - Encrypted version of BackupContent
+	Data            string `json:"data"`
+	Password        string `json:"password"`
+	IgnoreDbVersion bool   `json:"ignoreDbVersion"`
 }
 
 // TODO: RC split out to new file?
@@ -677,7 +687,7 @@ func (p *portalProxy) backupEndpoints(c echo.Context) error {
 		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body")
 	}
 
-	data := &BackupDataRequest{}
+	data := &BackupRequest{}
 	if err = json.Unmarshal(body, data); err != nil {
 		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body - could not parse JSON")
 	}
@@ -692,6 +702,8 @@ func (p *portalProxy) backupEndpoints(c echo.Context) error {
 		return err
 	}
 
+	log.Infof("response: %+v", response)
+
 	// Send back the response to the client
 	// TODO: RC Missing client_secret when serialised, `-` in definition
 	jsonString, err := json.Marshal(response)
@@ -699,16 +711,15 @@ func (p *portalProxy) backupEndpoints(c echo.Context) error {
 		return interfaces.NewHTTPError(http.StatusInternalServerError, "Failed to serialize response")
 	}
 
-	// Encrypt data (see above) // TODO: RC leave until last
-	encryptedResponse := jsonString
+	log.Infof("jsonString: %+v", jsonString)
 
 	// Return data
 	c.Response().Header().Set("Content-Type", "application/json")
-	c.Response().Write(encryptedResponse)
+	c.Response().Write(jsonString)
 	return nil
 }
 
-func (p *portalProxy) createBackup(data *BackupDataRequest) (*BackupRestoreState, error) {
+func (p *portalProxy) createBackup(data *BackupRequest) (*BackupContent, error) {
 	log.Debug("createBackup")
 	allEndpoints, err := p.ListEndpoints()
 	if err != nil {
@@ -807,11 +818,28 @@ func (p *portalProxy) createBackup(data *BackupDataRequest) (*BackupRestoreState
 	// log.Infof("userTokenFrom: %+v", userTokenFrom)
 	log.Infof("tokens: %+v", tokens)
 
-	response := &BackupRestoreState{
+	payload := &BackupRequestEndpointsResponse{
 		Endpoints: endpoints,
 		Tokens:    tokens,
 	}
 
+	// Encrypt data (see above) // TODO: RC leave until last
+	// encryptedPayload := payload
+
+	versions, err := p.getVersionsData()
+	if err != nil {
+		return nil, errors.New("Could not find database version")
+	}
+
+	// log.Infof("payload: %+v", payload)
+
+	response := &BackupContent{
+		payload:   *payload,
+		DBVersion: versions.DatabaseVersion,
+	}
+
+	// log.Infof("response: %+v", response)
+
 	return response, nil
 }
 
@@ -854,18 +882,14 @@ func (p *portalProxy) restoreEndpoints(c echo.Context) error {
 		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body")
 	}
 
-	data := &RestoreDataRequest{}
+	data := &RestoreRequest{}
 	if err = json.Unmarshal(body, data); err != nil {
 		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body - could not parse JSON")
 	}
 
-	backup := &BackupRestoreState{}
-	if err = json.Unmarshal([]byte(data.Data), backup); err != nil {
-		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid backup - could not parse JSON")
-	}
-
-	err = p.restoreBackup(backup)
+	err = p.restoreBackup(data)
 	if err != nil {
+		// TODO: RC write error?
 		return err
 	}
 
@@ -875,14 +899,36 @@ func (p *portalProxy) restoreEndpoints(c echo.Context) error {
 
 }
 
-func (p *portalProxy) restoreBackup(backup *BackupRestoreState) error {
+func (p *portalProxy) restoreBackup(backup *RestoreRequest) error {
 	log.Debug("restoreBackup")
+
+	// TODO: RC check return types of these functions... if we return shadow error
+
+	data := &BackupContent{}
+	if err := json.Unmarshal([]byte(backup.Data), backup); err != nil {
+		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid backup - could not parse JSON")
+	}
+
+	if backup.IgnoreDbVersion == false {
+		versions, err := p.getVersionsData()
+		if err != nil {
+			return errors.New("Could not find database version")
+		}
+
+		if versions.DatabaseVersion != data.DBVersion {
+			errorStr := fmt.Sprintf("Incompatible database versions. Expected %+v but got %+v", versions.DatabaseVersion, data.DBVersion)
+			return interfaces.NewHTTPShadowError(http.StatusBadRequest, errorStr, errorStr)
+		}
+	}
+
+	unencryptedBackup := data.payload
+
 	cnsiRepo, err := cnsis.NewPostgresCNSIRepository(p.DatabaseConnectionPool)
 	if err != nil {
 		return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to connect to db", "Failed to connect to db: %+v", err)
 	}
 
-	for _, endpoint := range backup.Endpoints {
+	for _, endpoint := range unencryptedBackup.Endpoints {
 		if err := cnsiRepo.Overwrite(*endpoint, p.Config.EncryptionKeyInBytes); err != nil {
 			return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to overwrite endpoints", "Failed to overwrite endpoint: %+v", endpoint.Name)
 		}
@@ -893,7 +939,7 @@ func (p *portalProxy) restoreBackup(backup *BackupRestoreState) error {
 		return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to connect to db", "Failed to connect to db: %+v", err)
 	}
 
-	for _, tr := range backup.Tokens {
+	for _, tr := range unencryptedBackup.Tokens {
 		if err := tokenRepo.SaveCNSIToken(tr.EndpointGUID, tr.UserGUID, tr.TokenRecord, p.Config.EncryptionKeyInBytes); err != nil {
 			return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to overwrite token", "Failed to overwrite token: %+v", tr.TokenRecord.TokenGUID)
 		}

From a5cfd7a682446168c3d823596ecc7b6effc517f8 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 16 Apr 2020 15:39:55 +0100
Subject: [PATCH 022/176] Fix autoscaler issue with the mat-select fill

---
 protractor.conf.js         |  4 ++--
 src/test-e2e/po/form.po.ts | 22 +++++++++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/protractor.conf.js b/protractor.conf.js
index dd282d35ae..ddd98076e7 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -199,10 +199,10 @@ const config = {
     }).getJasmine2Reporter());
     jasmine.getEnv().addReporter(new SpecReporter({
       spec: {
-        displayStacktrace: 'pretty',
+        displayStacktrace: 'raw',
       },
       summary: {
-        displayStacktrace: 'pretty',
+        displayStacktrace: 'raw',
       },
       customProcessors: specReporterCustomProcessors
     }));
diff --git a/src/test-e2e/po/form.po.ts b/src/test-e2e/po/form.po.ts
index f9697d2e42..6695d20590 100644
--- a/src/test-e2e/po/form.po.ts
+++ b/src/test-e2e/po/form.po.ts
@@ -1,8 +1,10 @@
+import { e2e } from './../e2e';
 import { browser, by, element, promise } from 'protractor';
 import { ElementArrayFinder, ElementFinder, protractor } from 'protractor/built';
 import { Key } from 'selenium-webdriver';
 
 import { Component } from './component.po';
+import { P } from '@angular/cdk/keycodes';
 
 const until = protractor.ExpectedConditions;
 
@@ -109,6 +111,15 @@ export class FormComponent extends Component {
     };
   }
 
+  quickMapField(elm: ElementFinder, index: number): FormItem | any {
+    return {
+      index,
+      name: elm.getAttribute('name'),
+      text: elm.getText(),
+      click: elm.click,
+    };
+  }
+
   // Get the form field with the specified name or formcontrolname
   getField(ctrlName: string): ElementFinder {
     const fields = this.getFields();
@@ -229,7 +240,16 @@ export class FormComponent extends Component {
             ctrl.click();
             const selectMenu = new Component(element(by.css('.mat-select-panel')));
             selectMenu.waitUntilShown();
-            selectMenu.all(by.tagName('mat-option')).map(this.mapField).then(options => {
+            // Filter down so that the item we want appears in the list
+            let strValue = value as string;
+            // Handle spaces in text. (sendKeys sends space bar.. which closes drop down)
+            // Bonus - Sending string without space works... up until last character...which deselects desired option and selects top option
+            const containsSpace = strValue.indexOf(' ');
+            if (containsSpace >= 0) {
+              strValue = strValue.slice(0, containsSpace);
+            }
+            ctrl.sendKeys(strValue);
+            selectMenu.all(by.tagName('mat-option')).map(this.quickMapField).then(options => {
               const opt: any = options.find((option: FormItem) => option.text === value);
               if (opt) {
                 opt.click();

From 6b9e79a6b976af98ea282d52f28ff4eb6108df71 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 16 Apr 2020 16:08:04 +0100
Subject: [PATCH 023/176] Tidy up #1

---
 .../backup-connection-cell.component.html     |   2 +-
 .../backup-connection-cell.component.ts       |   2 +-
 .../backup-endpoints.service.ts               |  25 +-
 .../backup-endpoints.component.ts             |  18 +-
 .../backup-restore-endpoints.service.ts       |  48 ---
 .../backup-restore/backup-restore.types.ts    |  25 ++
 .../restore-endpoints.service.ts              |  10 +-
 .../restore-endpoints.component.html          |   7 +-
 .../restore-endpoints.component.ts            |   8 +-
 .../packages/core/src/jetstream.helpers.ts    |  17 +
 src/jetstream/cnsi.go                         | 336 +-----------------
 src/jetstream/cnsi_token_backup.go            | 303 ++++++++++++++++
 src/jetstream/repository/cnsis/pgsql_cnsis.go |  11 -
 .../repository/tokens/pgsql_tokens.go         | 149 --------
 src/jetstream/repository/tokens/tokens.go     |   2 -
 15 files changed, 397 insertions(+), 566 deletions(-)
 delete mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints.service.ts
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore.types.ts
 create mode 100644 src/jetstream/cnsi_token_backup.go

diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.html
index 752618ca1a..818fadc297 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.html
@@ -2,7 +2,7 @@
   <mat-select [(value)]="service.state[row.guid][backupType.CONNECT]"
     [disabled]="!service.state[row.guid][backupType.ENDPOINT]">
     <mat-option [value]="connectionTypes.NONE">None</mat-option>
-    <mat-option [value]="connectionTypes.CURRENT">Current User</mat-option>
+    <mat-option *ngIf="!!row.user" [value]="connectionTypes.CURRENT">Current User</mat-option>
     <mat-option [value]="connectionTypes.ALL">All Users</mat-option>
   </mat-select>
 </mat-form-field>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.ts
index 60a5190361..528b256c22 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.ts
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 import { EndpointModel } from '../../../../../../store/src/types/endpoint.types';
 import { TableCellCustom } from '../../../../shared/components/list/list.types';
 import { BackupEndpointsService } from '../backup-endpoints.service';
-import { BackupEndpointConnectionTypes, BackupEndpointTypes } from '../backup-restore-endpoints.service';
+import { BackupEndpointConnectionTypes, BackupEndpointTypes } from '../backup-restore.types';
 
 @Component({
   selector: 'app-backup-connection-cell',
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
index 51b4d4ecf5..ee1f06fc80 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
@@ -15,10 +15,8 @@ import {
   BackupEndpointConnectionTypes,
   BackupEndpointsConfig,
   BackupEndpointTypes,
-  BackupRestoreEndpointService,
   BaseEndpointConfig,
-} from './backup-restore-endpoints.service';
-
+} from './backup-restore.types';
 
 
 interface BackupRequest {
@@ -28,7 +26,7 @@ interface BackupRequest {
 }
 
 @Injectable()
-export class BackupEndpointsService extends BackupRestoreEndpointService {
+export class BackupEndpointsService {
 
   hasChanges = new BehaviorSubject(false);
   hasChanges$ = this.hasChanges.asObservable();
@@ -42,7 +40,6 @@ export class BackupEndpointsService extends BackupRestoreEndpointService {
     private store: Store<GeneralEntityAppState>,
     private http: HttpClient
   ) {
-    super();
   }
 
   // State Related
@@ -106,7 +103,7 @@ export class BackupEndpointsService extends BackupRestoreEndpointService {
         endpoint[BackupEndpointTypes.ENDPOINT] = true;
       }
       if (this.canBackup(endpoint.entity, BackupEndpointTypes.CONNECT)) {
-        endpoint[BackupEndpointTypes.CONNECT] = BackupEndpointConnectionTypes.CURRENT;
+        endpoint[BackupEndpointTypes.CONNECT] = BackupEndpointConnectionTypes.ALL;
       }
     });
     this.validate();
@@ -120,6 +117,10 @@ export class BackupEndpointsService extends BackupRestoreEndpointService {
     this.validate();
   }
 
+  hasConnectionDetails(): boolean {
+    return !!Object.values(this.state).find(e => e[BackupEndpointTypes.CONNECT] !== BackupEndpointConnectionTypes.NONE);
+  }
+
   // Request Related
 
   createBackup(): Observable<Blob> {
@@ -144,11 +145,13 @@ export class BackupEndpointsService extends BackupRestoreEndpointService {
 
   private createBodyToSend(sd: SessionData): BackupRequest {
     const state: BackupEndpointsConfig<BaseEndpointConfig> = Object.entries(this.state).reduce((res, [endpointId, endpoint]) => {
-      const { entity, ...rest } = endpoint;
-      const requestConfig: BaseEndpointConfig = {
-        ...rest,
-      };
-      res[endpointId] = requestConfig;
+      if (endpoint[BackupEndpointTypes.ENDPOINT]) {
+        const { entity, ...rest } = endpoint;
+        const requestConfig: BaseEndpointConfig = {
+          ...rest,
+        };
+        res[endpointId] = requestConfig;
+      }
       return res;
     }, {});
     return {
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
index a32fa6f617..882d6113f8 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
@@ -11,6 +11,7 @@ import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { EndpointModel } from '../../../../../../store/src/types/endpoint.types';
+import { httpErrorResponseToSafeString } from '../../../../jetstream.helpers';
 import { ConfirmationDialogConfig } from '../../../../shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../shared/components/confirmation-dialog.service';
 import { ITableListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source-types';
@@ -19,7 +20,7 @@ import { StepOnNextFunction, StepOnNextResult } from '../../../../shared/compone
 import { BackupConnectionCellComponent } from '../backup-connection-cell/backup-connection-cell.component';
 import { BackupEndpointsService } from '../backup-endpoints.service';
 import { BackupRestoreCellComponent } from '../backup-restore-cell/backup-restore-cell.component';
-import { BackupEndpointTypes } from '../backup-restore-endpoints.service';
+import { BackupEndpointTypes } from '../backup-restore.types';
 
 @Component({
   selector: 'app-backup-endpoints',
@@ -133,10 +134,9 @@ export class BackupEndpointsComponent implements OnInit {
   }
 
   onNext: StepOnNextFunction = () => {
-    // TODO: RC Complete/Finish token warning
     const confirmation = new ConfirmationDialogConfig(
       'Backup',
-      'Backing up connection details ?????????',
+      'This backup contains endpoint connection details. The contents will be encrypted, but please still ensure the safety of the file',
       'Continue',
       true
     );
@@ -157,13 +157,14 @@ export class BackupEndpointsComponent implements OnInit {
       const downloadURL = window.URL.createObjectURL(data);
       const link = document.createElement('a');
       link.href = downloadURL;
-      const dateTime = moment().format('YYYYMMDD-HHmmss'); // TODO: RC timezone?
+      // Time of client, not server
+      const dateTime = moment().format('YYYYMMDD-HHmmss');
       link.download = `stratos_backup_${dateTime}.bk`;
       link.click();
     };
 
     const backupFailure = err => {
-      const errorMessage = this.service.createError(err);
+      const errorMessage = httpErrorResponseToSafeString(err);
       result.next({
         success: false,
         message: `Failed to create backup` + (errorMessage ? `: ${errorMessage}` : '')
@@ -173,8 +174,11 @@ export class BackupEndpointsComponent implements OnInit {
 
     const createBackup = () => this.service.createBackup().pipe(first()).subscribe(backupSuccess, backupFailure);
 
-    // TODO: RC tie in progress indicator (not sure if possible)
-    this.confirmDialog.openWithCancel(confirmation, createBackup, userCancelledDialog);
+    if (this.service.hasConnectionDetails()) {
+      this.confirmDialog.openWithCancel(confirmation, createBackup, userCancelledDialog);
+    } else {
+      createBackup();
+    }
 
     // TODO: RC Remove console.log
     return result.asObservable().pipe(tap(console.log));
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints.service.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints.service.ts
deleted file mode 100644
index abb46f3628..0000000000
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints.service.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { HttpErrorResponse } from '@angular/common/http';
-
-import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
-import { isHttpErrorResponse } from '../../../jetstream.helpers';
-
-// TODO: RC move to types
-
-export enum BackupEndpointTypes {
-  ENDPOINT = 'endpoint',
-  CONNECT = 'connect',
-}
-
-export enum BackupEndpointConnectionTypes {
-  NONE = 'NONE',
-  CURRENT = 'CURRENT',
-  ALL = 'ALL'
-}
-
-export interface BackupEndpointsConfig<T> {
-  [endpointId: string]: T;
-}
-
-export interface BaseEndpointConfig {
-  [BackupEndpointTypes.ENDPOINT]: boolean;
-  [BackupEndpointTypes.CONNECT]: BackupEndpointConnectionTypes;
-}
-
-export interface BackupEndpointConfigUI extends BaseEndpointConfig {
-  entity: EndpointModel;
-}
-
-export class BackupRestoreEndpointService {
-
-  createError(err: any): string {
-    // TODO: RC tidy. move generic
-    const httpResponse: HttpErrorResponse = isHttpErrorResponse(err);
-    if (httpResponse) {
-      if (httpResponse.error) {
-        if (typeof (httpResponse.error) === 'string') {
-          return httpResponse.error + ` (${httpResponse.status})`;
-        }
-        return httpResponse.error.error + ` (${httpResponse.status})`;
-      }
-      return JSON.stringify(httpResponse.error) + ` (${httpResponse.status})`;
-    }
-    return err.message;
-  }
-}
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore.types.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore.types.ts
new file mode 100644
index 0000000000..edda11d612
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore.types.ts
@@ -0,0 +1,25 @@
+import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
+
+export enum BackupEndpointTypes {
+  ENDPOINT = 'endpoint',
+  CONNECT = 'connect',
+}
+
+export enum BackupEndpointConnectionTypes {
+  NONE = 'NONE',
+  CURRENT = 'CURRENT',
+  ALL = 'ALL'
+}
+
+export interface BackupEndpointsConfig<T> {
+  [endpointId: string]: T;
+}
+
+export interface BaseEndpointConfig {
+  [BackupEndpointTypes.ENDPOINT]: boolean;
+  [BackupEndpointTypes.CONNECT]: BackupEndpointConnectionTypes;
+}
+
+export interface BackupEndpointConfigUI extends BaseEndpointConfig {
+  entity: EndpointModel;
+}
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts
index b0b977d388..50d678f33d 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts
@@ -9,7 +9,6 @@ import { selectSessionData } from '../../../../../store/src/reducers/auth.reduce
 import { SessionData } from '../../../../../store/src/types/auth.types';
 import { LoggerService } from '../../../core/logger.service';
 import { BrowserStandardEncoder } from '../../../helper';
-import { BackupRestoreEndpointService } from './backup-restore-endpoints.service';
 
 interface BackupContent {
   payload: string;
@@ -23,7 +22,7 @@ interface RestoreEndpointsData {
 }
 
 @Injectable()
-export class RestoreEndpointsService extends BackupRestoreEndpointService {
+export class RestoreEndpointsService {
 
   // Step 1
   validFileContent = new BehaviorSubject(false);
@@ -42,14 +41,13 @@ export class RestoreEndpointsService extends BackupRestoreEndpointService {
   ignoreDbVersion$ = this.ignoreDbVersion.asObservable();
 
   // Step 2
-  password: string; // TODO: RC use set password in both services
+  private password: string;
 
   constructor(
     private store: Store<GeneralEntityAppState>,
     private http: HttpClient,
     private logger: LoggerService
   ) {
-    super();
     this.setupStep1();
   }
 
@@ -114,6 +112,10 @@ export class RestoreEndpointsService extends BackupRestoreEndpointService {
     this.ignoreDbVersion.next(ignore);
   }
 
+  setPassword(password: string) {
+    this.password = password;
+  }
+
   restoreBackup(): Observable<any> {
     const url = '/pp/v1/endpoints/restore';
     const fromObject = {};
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html
index 2611a539fd..c99ad6600f 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html
@@ -31,7 +31,12 @@ <h1>Restore Endpoints</h1>
       <p>Provide the password that was given at the time the backup was created</p>
       <form [formGroup]="passwordForm" class="stepper-form">
         <mat-form-field>
-          <input matInput formControlName="password" placeholder="Password" required type="password">
+          <mat-label>Password</mat-label>
+          <input matInput formControlName="password" required [type]="!show ? 'password' : 'text'">
+          <button mat-icon-button matSuffix (click)="show = !show" [attr.aria-label]="'Hide password'"
+            [attr.aria-pressed]="!show">
+            <mat-icon>{{!show ? 'visibility_off' : 'visibility'}}</mat-icon>
+          </button>
         </mat-form-field>
       </form>
     </div>
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
index 8762a498f2..bfd419aad2 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
@@ -5,6 +5,7 @@ import { Observable, of, Subject } from 'rxjs';
 import { first, map, tap } from 'rxjs/operators';
 
 import { getEventFiles } from '../../../../core/browser-helper';
+import { httpErrorResponseToSafeString } from '../../../../jetstream.helpers';
 import { ConfirmationDialogConfig } from '../../../../shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../shared/components/confirmation-dialog.service';
 import { StepOnNextFunction, StepOnNextResult } from '../../../../shared/components/stepper/step/step.component';
@@ -24,6 +25,7 @@ export class RestoreEndpointsComponent {
   // Step 2
   passwordValid$: Observable<boolean>;
   passwordForm: FormGroup;
+  show = false;
 
   constructor(
     public service: RestoreEndpointsService,
@@ -38,7 +40,7 @@ export class RestoreEndpointsComponent {
     });
     this.passwordValid$ = this.passwordForm.statusChanges.pipe(
       map(() => {
-        this.service.password = this.passwordForm.controls.password.value;
+        this.service.setPassword(this.passwordForm.controls.password.value);
         return this.passwordForm.valid;
       })
     );
@@ -80,18 +82,16 @@ export class RestoreEndpointsComponent {
     };
 
     const backupFailure = err => {
-      const errorMessage = this.service.createError(err);
+      const errorMessage = httpErrorResponseToSafeString(err);
       result.next({
         success: false,
         message: `Failed to restore backup` + (errorMessage ? `: ${errorMessage}` : '')
       });
       return of(false);
     };
-    // TODO: RC make generic in base
 
     const createBackup = () => this.service.restoreBackup().pipe(first()).subscribe(restoreSuccess, backupFailure);
 
-    // TODO: RC tie in progress indicator (not sure if possible)
     this.confirmDialog.openWithCancel(confirmation, createBackup, userCancelledDialog);
 
     // TODO: RC Remove console.log
diff --git a/src/frontend/packages/core/src/jetstream.helpers.ts b/src/frontend/packages/core/src/jetstream.helpers.ts
index 36bbac53ea..1a29978099 100644
--- a/src/frontend/packages/core/src/jetstream.helpers.ts
+++ b/src/frontend/packages/core/src/jetstream.helpers.ts
@@ -53,3 +53,20 @@ export function isHttpErrorResponse(obj: any): HttpErrorResponse {
   ) ? obj as HttpErrorResponse : null;
 }
 
+/**
+ * Attempt to create a sensible string explaining the error object returned from a failed http request
+ * @param err The raw error from a http request
+ */
+export function httpErrorResponseToSafeString(err: any): string {
+  const httpResponse: HttpErrorResponse = isHttpErrorResponse(err);
+  if (httpResponse) {
+    if (httpResponse.error) {
+      if (typeof (httpResponse.error) === 'string') {
+        return httpResponse.error + ` (${httpResponse.status})`;
+      }
+      return httpResponse.error.error + ` (${httpResponse.status})`;
+    }
+    return JSON.stringify(httpResponse.error) + ` (${httpResponse.status})`;
+  }
+  return err.message;
+}
diff --git a/src/jetstream/cnsi.go b/src/jetstream/cnsi.go
index d32e53fa6d..f5c6c501a3 100644
--- a/src/jetstream/cnsi.go
+++ b/src/jetstream/cnsi.go
@@ -3,9 +3,7 @@ package main
 import (
 	"crypto/x509"
 	"encoding/json"
-	"errors"
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strconv"
@@ -638,340 +636,24 @@ func (p *portalProxy) updateEndpoint(c echo.Context) error {
 	return nil
 }
 
-type BackupConnectionType string
-
-const (
-	BACKUP_CONNECTION_NONE    BackupConnectionType = "NONE"
-	BACKUP_CONNECTION_CURRENT                      = "CURRENT"
-	BACKUP_CONNECTION_ALL                          = "ALL"
-)
-
-// TODO: RC position
-type BackupEndpointsState struct {
-	Endpoint bool                 `json:"endpoint"`
-	Connect  BackupConnectionType `json:"connect"`
-}
-
-// Sent to backup
-type BackupRequest struct {
-	State     map[string]BackupEndpointsState `json:"state"`
-	UserID    string                          `json:"userId"`
-	DBVersion string                          `json:"dbVersion"`
-	Password  string                          `json:"password"`
-}
-
-type BackupRequestEndpointsResponse struct {
-	Endpoints []*interfaces.CNSIRecord
-	Tokens    []interfaces.BackupTokenRecord
-}
-
-type BackupContent struct {
-	payload   BackupRequestEndpointsResponse `json:"payload"`
-	DBVersion int64                          `json:"dbVersion"`
-}
-
-type RestoreRequest struct {
-	// Data - Encrypted version of BackupContent
-	Data            string `json:"data"`
-	Password        string `json:"password"`
-	IgnoreDbVersion bool   `json:"ignoreDbVersion"`
-}
-
-// TODO: RC split out to new file?
 func (p *portalProxy) backupEndpoints(c echo.Context) error {
-	log.Debug("backupEndpoints")
-
-	// Check we can unmarshall the request
-	body, err := ioutil.ReadAll(c.Request().Body)
-	if err != nil {
-		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body")
-	}
-
-	data := &BackupRequest{}
-	if err = json.Unmarshal(body, data); err != nil {
-		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body - could not parse JSON")
-	}
-	// log.Infof("BODY: %+v", data)
-
-	if data.State == nil || len(data.State) == 0 {
-		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body - no endpoints to backup")
-	}
-
-	response, err := p.createBackup(data)
-	if err != nil {
-		return err
-	}
-
-	log.Infof("response: %+v", response)
-
-	// Send back the response to the client
-	// TODO: RC Missing client_secret when serialised, `-` in definition
-	jsonString, err := json.Marshal(response)
-	if err != nil {
-		return interfaces.NewHTTPError(http.StatusInternalServerError, "Failed to serialize response")
-	}
-
-	log.Infof("jsonString: %+v", jsonString)
-
-	// Return data
-	c.Response().Header().Set("Content-Type", "application/json")
-	c.Response().Write(jsonString)
-	return nil
-}
-
-func (p *portalProxy) createBackup(data *BackupRequest) (*BackupContent, error) {
-	log.Debug("createBackup")
-	allEndpoints, err := p.ListEndpoints()
-	if err != nil {
-		return nil, interfaces.NewHTTPError(http.StatusBadGateway, "Failed to fetch endpoints")
-	}
-
-	// Fetch/Format required data
-	endpoints := make([]*interfaces.CNSIRecord, 0)
-	// allTokensFrom := make([]string, 0)
-	// userTokenFrom := make([]string, 0)
-	tokens := make([]interfaces.BackupTokenRecord, 0)
-
-	for endpointID, endpoint := range data.State {
-
-		if !endpoint.Endpoint {
-			continue
-		}
-
-		for _, e := range allEndpoints {
-			if endpointID == e.GUID {
-				endpoints = append(endpoints, e)
-				break
-			}
-		}
-
-		switch connectionType := endpoint.Connect; connectionType {
-		case BACKUP_CONNECTION_ALL:
-			// allTokensFrom = append(allTokensFrom, endpointID)
-			if tokenRecords, ok := p.getCNSITokenRecordsBackup(endpointID); ok {
-				log.Warn("tokens for AllConnect")
-				tokens = append(tokens, tokenRecords...)
-			} else {
-				log.Warn("No tokens for AllConnect")
-				// TODO: RC
-			}
-		case BACKUP_CONNECTION_CURRENT:
-			// userTokenFrom = append(userTokenFrom, endpointID)
-			if tokenRecord, ok := p.GetCNSITokenRecordWithDisconnected(endpointID, data.UserID); ok {
-				log.Warn("tokens for Connect")
-				// var btr BackupTokenRecord
-				// TODO: RC Q This will be the linked token as if it were the users token
-				var btr = interfaces.BackupTokenRecord{
-					// tokenRecord: tokenRecord,
-					TokenRecord:  tokenRecord,
-					EndpointGUID: endpointID,
-					TokenType:    "CNSI",
-					UserGUID:     data.UserID,
-				}
-
-				tokens = append(tokens, btr)
-			} else {
-				log.Warnf("No tokens for Connect: %+v,%+v", endpointID, data.UserID)
-				// TODO: RC
-				// msg := "Unable to retrieve CNSI token record."
-				// log.Debug(msg)
-				// return nil, nil, false
-			}
-		}
-
-		// if endpoint.Connect == BACKUP_CONNECTION_ALL {
-		// 	// allTokensFrom = append(allTokensFrom, endpointID)
-		// 	if tokenRecords, ok := p.getCNSITokenRecordsBackup(endpointID); ok {
-		// 		log.Warn("tokens for AllConnect")
-		// 		tokens = append(tokens, tokenRecords...)
-		// 	} else {
-		// 		log.Warn("No tokens for AllConnect")
-		// 		// TODO: RC
-		// 	}
-		// } else if endpoint.Connect {
-		// 	// userTokenFrom = append(userTokenFrom, endpointID)
-		// 	if tokenRecord, ok := p.GetCNSITokenRecordWithDisconnected(endpointID, data.UserID); ok {
-		// 		log.Warn("tokens for Connect")
-		// 		// var btr BackupTokenRecord
-		// 		// TODO: RC Q This will be the linked token as if it were the users token
-		// 		var btr = interfaces.BackupTokenRecord{
-		// 			// tokenRecord: tokenRecord,
-		// 			TokenRecord:  tokenRecord,
-		// 			EndpointGUID: endpointID,
-		// 			TokenType:    "CNSI",
-		// 			UserGUID:     data.UserID,
-		// 		}
-
-		// 		tokens = append(tokens, btr)
-		// 	} else {
-		// 		log.Warnf("No tokens for Connect: %+v,%+v", endpointID, data.UserID)
-		// 		// TODO: RC
-		// 		// msg := "Unable to retrieve CNSI token record."
-		// 		// log.Debug(msg)
-		// 		// return nil, nil, false
-		// 	}
-		// }
-	}
-
-	log.Infof("endpoints: %+v", endpoints)
-	// log.Infof("allTokensFrom: %+v", allTokensFrom)
-	// log.Infof("userTokenFrom: %+v", userTokenFrom)
-	log.Infof("tokens: %+v", tokens)
-
-	payload := &BackupRequestEndpointsResponse{
-		Endpoints: endpoints,
-		Tokens:    tokens,
-	}
+	log.Debug("BackupEndpoints")
 
-	// Encrypt data (see above) // TODO: RC leave until last
-	// encryptedPayload := payload
-
-	versions, err := p.getVersionsData()
-	if err != nil {
-		return nil, errors.New("Could not find database version")
-	}
-
-	// log.Infof("payload: %+v", payload)
-
-	response := &BackupContent{
-		payload:   *payload,
-		DBVersion: versions.DatabaseVersion,
-	}
-
-	// log.Infof("response: %+v", response)
-
-	return response, nil
-}
-
-// func (p *portalProxy) GetCNSITokens(cnsiGUID string) ([]interfaces.TokenRecord, bool) {
-// 	log.Debug("GetCNSITokens")
-// 	tokenRepo, err := tokens.NewPgsqlTokenRepository(p.DatabaseConnectionPool)
-// 	if err != nil {
-// 		return make([]interfaces.TokenRecord, 0), false
-// 	}
-
-// 	trs, err := tokenRepo.FindAllCNSITokenIncludeDisconnected(cnsiGUID, p.Config.EncryptionKeyInBytes)
-// 	if err != nil {
-// 		return make([]interfaces.TokenRecord, 0), false
-// 	}
-
-// 	return trs, true
-// }
-
-func (p *portalProxy) getCNSITokenRecordsBackup(endpointID string) ([]interfaces.BackupTokenRecord, bool) {
-	log.Debug("getCNSITokenRecordsBackup")
-	tokenRepo, err := tokens.NewPgsqlTokenRepository(p.DatabaseConnectionPool)
-	if err != nil {
-		return make([]interfaces.BackupTokenRecord, 0), false
-	}
-
-	trs, err := tokenRepo.FindAllCNSITokenBackup(endpointID, p.Config.EncryptionKeyInBytes)
-	if err != nil {
-		return make([]interfaces.BackupTokenRecord, 0), false
+	ctb := &cnsiTokenBackup{
+		databaseConnectionPool: p.DatabaseConnectionPool,
+		p:                      p,
 	}
 
-	return trs, true
+	return ctb.BackupEndpoints(c)
 }
 
 func (p *portalProxy) restoreEndpoints(c echo.Context) error {
 	log.Debug("restoreEndpoints")
 
-	// Check we can unmarshall the request
-	body, err := ioutil.ReadAll(c.Request().Body)
-	if err != nil {
-		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body")
-	}
-
-	data := &RestoreRequest{}
-	if err = json.Unmarshal(body, data); err != nil {
-		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body - could not parse JSON")
-	}
-
-	err = p.restoreBackup(data)
-	if err != nil {
-		// TODO: RC write error?
-		return err
-	}
-
-	// log.Warnf("BACKUP DATA: %+v", backup)
-	c.Response().WriteHeader(http.StatusOK)
-	return nil
-
-}
-
-func (p *portalProxy) restoreBackup(backup *RestoreRequest) error {
-	log.Debug("restoreBackup")
-
-	// TODO: RC check return types of these functions... if we return shadow error
-
-	data := &BackupContent{}
-	if err := json.Unmarshal([]byte(backup.Data), backup); err != nil {
-		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid backup - could not parse JSON")
-	}
-
-	if backup.IgnoreDbVersion == false {
-		versions, err := p.getVersionsData()
-		if err != nil {
-			return errors.New("Could not find database version")
-		}
-
-		if versions.DatabaseVersion != data.DBVersion {
-			errorStr := fmt.Sprintf("Incompatible database versions. Expected %+v but got %+v", versions.DatabaseVersion, data.DBVersion)
-			return interfaces.NewHTTPShadowError(http.StatusBadRequest, errorStr, errorStr)
-		}
-	}
-
-	unencryptedBackup := data.payload
-
-	cnsiRepo, err := cnsis.NewPostgresCNSIRepository(p.DatabaseConnectionPool)
-	if err != nil {
-		return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to connect to db", "Failed to connect to db: %+v", err)
-	}
-
-	for _, endpoint := range unencryptedBackup.Endpoints {
-		if err := cnsiRepo.Overwrite(*endpoint, p.Config.EncryptionKeyInBytes); err != nil {
-			return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to overwrite endpoints", "Failed to overwrite endpoint: %+v", endpoint.Name)
-		}
-	}
-
-	tokenRepo, err := tokens.NewPgsqlTokenRepository(p.DatabaseConnectionPool)
-	if err != nil {
-		return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to connect to db", "Failed to connect to db: %+v", err)
+	ctb := &cnsiTokenBackup{
+		databaseConnectionPool: p.DatabaseConnectionPool,
+		p:                      p,
 	}
 
-	for _, tr := range unencryptedBackup.Tokens {
-		if err := tokenRepo.SaveCNSIToken(tr.EndpointGUID, tr.UserGUID, tr.TokenRecord, p.Config.EncryptionKeyInBytes); err != nil {
-			return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to overwrite token", "Failed to overwrite token: %+v", tr.TokenRecord.TokenGUID)
-		}
-	}
-
-	return nil
+	return ctb.RestoreEndpoints(c)
 }
-
-// find := func(a interfaces.CNSIRecord) bool {
-// 	return endpointID == a.GUID
-// }
-
-// endpointPos := sliceContainsFn(find, allEndpoints)
-// if endpointPos >= 0 {
-// 	endpoints = append(endpoints, endpoints[endpointPos])
-// }
-
-// // TODO:RC pos
-// func sliceContains(what interface{}, where []interface{}) (idx int) {
-// 	for i, v := range where {
-// 		if v == what {
-// 			return i
-// 		}
-// 	}
-// 	return -1
-// }
-
-// func sliceContainsFn(is func(a interface{}) bool, where []interface{}) (idx int) {
-// 	for i, v := range where {
-// 		if is(v) {
-// 			return i
-// 		}
-// 	}
-// 	return -1
-// }
diff --git a/src/jetstream/cnsi_token_backup.go b/src/jetstream/cnsi_token_backup.go
new file mode 100644
index 0000000000..8e23318e48
--- /dev/null
+++ b/src/jetstream/cnsi_token_backup.go
@@ -0,0 +1,303 @@
+package main
+
+import (
+	"database/sql"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/cnsis"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/tokens"
+	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
+)
+
+type cnsiTokenBackup struct {
+	databaseConnectionPool *sql.DB
+	p                      *portalProxy
+}
+
+// BackupConnectionType - Determine what kind of connection details are stored for an endpoint
+type BackupConnectionType string
+
+const (
+	BACKUP_CONNECTION_NONE    BackupConnectionType = "NONE"
+	BACKUP_CONNECTION_CURRENT                      = "CURRENT"
+	BACKUP_CONNECTION_ALL                          = "ALL"
+)
+
+// BackupEndpointsState - For a given endpoint define what's backed up
+type BackupEndpointsState struct {
+	Endpoint bool                 `json:"endpoint"`
+	Connect  BackupConnectionType `json:"connect"`
+}
+
+// BackupRequest - Request from client to create a back up file
+type BackupRequest struct {
+	State     map[string]BackupEndpointsState `json:"state"`
+	UserID    string                          `json:"userId"`
+	DBVersion string                          `json:"dbVersion"`
+	Password  string                          `json:"password"`
+}
+
+// BackupContentPayload - Encrypted part of the backup
+type BackupContentPayload struct {
+	Endpoints []*interfaces.CNSIRecord
+	Tokens    []interfaces.BackupTokenRecord
+}
+
+// BackupContent - Everything that's backed up and stored in a file client side
+type BackupContent struct {
+	Payload   BackupContentPayload `json:"payload"`
+	DBVersion int64                `json:"dbVersion"`
+}
+
+// RestoreRequest - Request from client to restore content from payload
+type RestoreRequest struct {
+	// Payload - Encrypted version of BackupContent
+	Payload         string `json:"data"`
+	Password        string `json:"password"`
+	IgnoreDbVersion bool   `json:"ignoreDbVersion"`
+}
+
+func (ctb *cnsiTokenBackup) BackupEndpoints(c echo.Context) error {
+	log.Debug("BackupEndpoints")
+
+	// Check we can unmarshall the request
+	body, err := ioutil.ReadAll(c.Request().Body)
+	if err != nil {
+		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body")
+	}
+
+	data := &BackupRequest{}
+	if err = json.Unmarshal(body, data); err != nil {
+		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body - could not parse JSON")
+	}
+
+	if data.State == nil || len(data.State) == 0 {
+		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body - no endpoints to backup")
+	}
+
+	response, err := ctb.createBackup(data)
+	if err != nil {
+		return err
+	}
+
+	log.Infof("response: %+v", response) // TODO: RC REMOVE
+
+	// Send back the response to the client
+	// TODO: RC Missing client_secret when serialised, `-` in definition
+	jsonString, err := json.Marshal(response)
+	if err != nil {
+		return interfaces.NewHTTPError(http.StatusInternalServerError, "Failed to serialize response")
+	}
+
+	log.Infof("jsonString: %+v", jsonString) // TODO: RC REMOVE
+
+	// Return data
+	c.Response().Header().Set("Content-Type", "application/json")
+	c.Response().Write(jsonString)
+	return nil
+}
+
+func (ctb *cnsiTokenBackup) createBackup(data *BackupRequest) (*BackupContent, error) {
+	log.Debug("createBackup")
+	allEndpoints, err := ctb.p.ListEndpoints()
+	if err != nil {
+		return nil, interfaces.NewHTTPError(http.StatusBadGateway, "Failed to fetch endpoints")
+	}
+
+	// Fetch/Format required data
+	endpoints := make([]*interfaces.CNSIRecord, 0)
+	tokens := make([]interfaces.BackupTokenRecord, 0)
+
+	for endpointID, endpoint := range data.State {
+
+		if !endpoint.Endpoint {
+			continue
+		}
+
+		for _, e := range allEndpoints {
+			if endpointID == e.GUID {
+				endpoints = append(endpoints, e)
+				break
+			}
+		}
+
+		switch connectionType := endpoint.Connect; connectionType {
+		case BACKUP_CONNECTION_ALL:
+			// allTokensFrom = append(allTokensFrom, endpointID)
+			if tokenRecords, ok := ctb.getCNSITokenRecordsBackup(endpointID); ok {
+				log.Warn("tokens for AllConnect") // TODO: RC REMOVE
+				tokens = append(tokens, tokenRecords...)
+			} else {
+				log.Warn("No tokens for AllConnect") // TODO: RC REMOVE
+			}
+		case BACKUP_CONNECTION_CURRENT:
+			// userTokenFrom = append(userTokenFrom, endpointID)
+			if tokenRecord, ok := ctb.p.GetCNSITokenRecordWithDisconnected(endpointID, data.UserID); ok {
+				log.Warn("tokens for Connect")
+				// TODO: RC Q This will be the linked token as if it were the users token
+				var btr = interfaces.BackupTokenRecord{
+					// tokenRecord: tokenRecord,
+					TokenRecord:  tokenRecord,
+					EndpointGUID: endpointID,
+					TokenType:    "CNSI",
+					UserGUID:     data.UserID,
+				}
+
+				tokens = append(tokens, btr)
+			} else {
+				log.Infof("Request to back up connected user's (%+v) token for endpoint (%+v) failed. No token for user.", endpointID, data.UserID)
+			}
+		}
+
+	}
+
+	log.Infof("endpoints: %+v", endpoints) // TODO: RC REMOVE
+	log.Infof("tokens: %+v", tokens)       // TODO: RC REMOVE
+
+	payload := &BackupContentPayload{
+		Endpoints: endpoints,
+		Tokens:    tokens,
+	}
+
+	// Encrypt data (see above) // TODO: RC leave until last
+	// encryptedPayload := payload
+
+	versions, err := ctb.p.getVersionsData()
+	if err != nil {
+		return nil, errors.New("Could not find database version")
+	}
+
+	// log.Infof("payload: %+v", payload)
+
+	response := &BackupContent{
+		Payload:   *payload,
+		DBVersion: versions.DatabaseVersion,
+	}
+
+	// log.Infof("response: %+v", response)
+
+	return response, nil
+}
+
+func (ctb *cnsiTokenBackup) getCNSITokenRecordsBackup(endpointID string) ([]interfaces.BackupTokenRecord, bool) {
+	log.Debug("getCNSITokenRecordsBackup")
+	tokenRepo, err := tokens.NewPgsqlTokenRepository(ctb.databaseConnectionPool)
+	if err != nil {
+		return make([]interfaces.BackupTokenRecord, 0), false
+	}
+
+	trs, err := tokenRepo.FindAllCNSITokenBackup(endpointID, ctb.p.Config.EncryptionKeyInBytes)
+	if err != nil {
+		return make([]interfaces.BackupTokenRecord, 0), false
+	}
+
+	return trs, true
+}
+
+func (ctb *cnsiTokenBackup) RestoreEndpoints(c echo.Context) error {
+	log.Debug("RestoreEndpoints")
+
+	// Check we can unmarshall the request
+	body, err := ioutil.ReadAll(c.Request().Body)
+	if err != nil {
+		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body")
+	}
+
+	data := &RestoreRequest{}
+	if err = json.Unmarshal(body, data); err != nil {
+		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body - could not parse JSON")
+	}
+
+	err = ctb.restoreBackup(data)
+	if err != nil {
+		return err
+	}
+
+	// log.Warnf("BACKUP DATA: %+v", backup) // TODO: RC REMOVE
+	c.Response().WriteHeader(http.StatusOK)
+	return nil
+
+}
+
+func (ctb *cnsiTokenBackup) restoreBackup(backup *RestoreRequest) error {
+	log.Debug("restoreBackup")
+
+	// TODO: RC Q all errors are NewHTTPError
+
+	data := &BackupContent{}
+	if err := json.Unmarshal([]byte(backup.Payload), backup); err != nil {
+		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid backup - could not parse JSON")
+	}
+
+	if backup.IgnoreDbVersion == false {
+		versions, err := ctb.p.getVersionsData()
+		if err != nil {
+			return errors.New("Could not find database version")
+		}
+
+		if versions.DatabaseVersion != data.DBVersion {
+			errorStr := fmt.Sprintf("Incompatible database versions. Expected %+v but got %+v", versions.DatabaseVersion, data.DBVersion)
+			return interfaces.NewHTTPShadowError(http.StatusBadRequest, errorStr, errorStr)
+		}
+	}
+
+	unencryptedBackup := data.Payload
+
+	cnsiRepo, err := cnsis.NewPostgresCNSIRepository(ctb.databaseConnectionPool)
+	if err != nil {
+		return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to connect to db", "Failed to connect to db: %+v", err)
+	}
+
+	for _, endpoint := range unencryptedBackup.Endpoints {
+		if err := cnsiRepo.Overwrite(*endpoint, ctb.p.Config.EncryptionKeyInBytes); err != nil {
+			return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to overwrite endpoints", "Failed to overwrite endpoint: %+v", endpoint.Name)
+		}
+	}
+
+	tokenRepo, err := tokens.NewPgsqlTokenRepository(ctb.databaseConnectionPool)
+	if err != nil {
+		return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to connect to db", "Failed to connect to db: %+v", err)
+	}
+
+	for _, tr := range unencryptedBackup.Tokens {
+		if err := tokenRepo.SaveCNSIToken(tr.EndpointGUID, tr.UserGUID, tr.TokenRecord, ctb.p.Config.EncryptionKeyInBytes); err != nil {
+			return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to overwrite token", "Failed to overwrite token: %+v", tr.TokenRecord.TokenGUID)
+		}
+	}
+
+	return nil
+}
+
+// find := func(a interfaces.CNSIRecord) bool {
+// 	return endpointID == a.GUID
+// }
+
+// endpointPos := sliceContainsFn(find, allEndpoints)
+// if endpointPos >= 0 {
+// 	endpoints = append(endpoints, endpoints[endpointPos])
+// }
+
+// // TODO:RC pos
+// func sliceContains(what interface{}, where []interface{}) (idx int) {
+// 	for i, v := range where {
+// 		if v == what {
+// 			return i
+// 		}
+// 	}
+// 	return -1
+// }
+
+// func sliceContainsFn(is func(a interface{}) bool, where []interface{}) (idx int) {
+// 	for i, v := range where {
+// 		if is(v) {
+// 			return i
+// 		}
+// 	}
+// 	return -1
+// }
diff --git a/src/jetstream/repository/cnsis/pgsql_cnsis.go b/src/jetstream/repository/cnsis/pgsql_cnsis.go
index 6ba5344004..9582f3e1a4 100644
--- a/src/jetstream/repository/cnsis/pgsql_cnsis.go
+++ b/src/jetstream/repository/cnsis/pgsql_cnsis.go
@@ -363,21 +363,10 @@ func (p *PostgresCNSIRepository) Overwrite(endpoint interfaces.CNSIRecord, encry
 		log.Errorf("Unknown error attempting to find CNSI: %v", err)
 	}
 
-	// if _, err := p.Find(endpoint.GUID, encryptionKey); err != nil {
-	// 	// Found, so update endpoint
-	// 	// TODO: RC ALL STRINGS?
-	// 	return p.Update(endpoint, encryptionKey)
-	// } else {
-	// 	// Not Found, create endpoint
-	// 	return p.Save(endpoint.GUID, endpoint, encryptionKey)
-	// 	// TODO: RC Q could actually be error
-	// }
-
 	switch count {
 	case 0:
 		return p.Save(endpoint.GUID, endpoint, encryptionKey)
 	default:
-
 		return p.Update(endpoint, encryptionKey)
 	}
 }
diff --git a/src/jetstream/repository/tokens/pgsql_tokens.go b/src/jetstream/repository/tokens/pgsql_tokens.go
index ddb7dfc3f3..427541747c 100644
--- a/src/jetstream/repository/tokens/pgsql_tokens.go
+++ b/src/jetstream/repository/tokens/pgsql_tokens.go
@@ -43,15 +43,6 @@ var findCNSITokenConnected = `SELECT token_guid, auth_token, refresh_token, toke
 										FROM tokens
 										WHERE cnsi_guid = $1 AND (user_guid = $2 OR user_guid = $3) AND token_type = 'cnsi' AND disconnected = '0'`
 
-// TODO: RC
-var findAllCNSIToken2 = `SELECT token_guid, auth_token, refresh_token, token_expiry, disconnected, auth_type, meta_data, user_guid, linked_token
-										FROM tokens
-										WHERE cnsi_guid = $1 AND token_type = 'cnsi'`
-
-var findAllCNSITokenConnected = `SELECT token_guid, auth_token, refresh_token, token_expiry, disconnected, auth_type, meta_data, user_guid, linked_token
-										FROM tokens
-										WHERE cnsi_guid = $1 AND token_type = 'cnsi' AND disconnected = '0'`
-
 var findAllCNSIToken = `SELECT user_guid, token_guid, auth_token, refresh_token, token_expiry, disconnected, auth_type, meta_data, user_guid, linked_token
 										FROM tokens
 										WHERE cnsi_guid = $1 AND token_type = 'cnsi'`
@@ -95,15 +86,12 @@ func InitRepositoryProvider(databaseProvider string) {
 	updateAuthToken = datastore.ModifySQLStatement(updateAuthToken, databaseProvider)
 	findCNSIToken = datastore.ModifySQLStatement(findCNSIToken, databaseProvider)
 	findCNSITokenConnected = datastore.ModifySQLStatement(findCNSITokenConnected, databaseProvider)
-	findAllCNSIToken2 = datastore.ModifySQLStatement(findAllCNSIToken2, databaseProvider)
-	findAllCNSITokenConnected = datastore.ModifySQLStatement(findAllCNSITokenConnected, databaseProvider)
 	countCNSITokens = datastore.ModifySQLStatement(countCNSITokens, databaseProvider)
 	insertCNSIToken = datastore.ModifySQLStatement(insertCNSIToken, databaseProvider)
 	updateCNSIToken = datastore.ModifySQLStatement(updateCNSIToken, databaseProvider)
 	deleteCNSIToken = datastore.ModifySQLStatement(deleteCNSIToken, databaseProvider)
 	deleteCNSITokens = datastore.ModifySQLStatement(deleteCNSITokens, databaseProvider)
 	updateToken = datastore.ModifySQLStatement(updateToken, databaseProvider)
-	findAllCNSIToken = datastore.ModifySQLStatement(findAllCNSIToken, databaseProvider)
 }
 
 // saveAuthToken - Save the Auth token to the datastore
@@ -329,129 +317,6 @@ func (p *PgsqlTokenRepository) SaveCNSIToken(cnsiGUID string, userGUID string, t
 	return nil
 }
 
-// TODO: RC remove all `all`
-func (p *PgsqlTokenRepository) FindAllCNSIToken(cnsiGUID string, encryptionKey []byte) ([]interfaces.TokenRecord, error) {
-	log.Debug("FindAllCNSIToken")
-	return p.findAllCNSIToken(cnsiGUID, encryptionKey, false)
-}
-
-func (p *PgsqlTokenRepository) FindAllCNSITokenIncludeDisconnected(cnsiGUID string, encryptionKey []byte) ([]interfaces.TokenRecord, error) {
-	log.Debug("FindAllCNSITokenIncludeDisconnected")
-	return p.findAllCNSIToken(cnsiGUID, encryptionKey, true)
-}
-
-func (p *PgsqlTokenRepository) findAllCNSIToken(cnsiGUID string, encryptionKey []byte, includeDisconnected bool) ([]interfaces.TokenRecord, error) {
-	log.Debug("findAllCNSIToken")
-	if cnsiGUID == "" {
-		msg := "Unable to find CNSI Token without a valid CNSI GUID."
-		log.Debug(msg)
-		return make([]interfaces.TokenRecord, 0), errors.New(msg)
-	}
-
-	var rows *sql.Rows
-	var err error
-	if includeDisconnected {
-		rows, err = p.db.Query(findAllCNSIToken, cnsiGUID)
-	} else {
-		rows, err = p.db.Query(findAllCNSITokenConnected, cnsiGUID)
-	}
-	if err != nil {
-		msg := "Unable to Find All CNSI tokens: %v"
-		if err == sql.ErrNoRows {
-			log.Debugf(msg, err)
-		} else {
-			log.Errorf(msg, err)
-		}
-		return make([]interfaces.TokenRecord, 0), fmt.Errorf(msg, err)
-	}
-
-	// TODO: RC Q should this close come before returning? it doesn't in cnsi List(encryptionKey []byte) ([]*interfaces.CNSIRecord, error) {
-	defer rows.Close()
-
-	trs := make([]interfaces.TokenRecord, 0)
-	for rows.Next() {
-		// temp vars to retrieve db data
-		var (
-			tokenGUID              sql.NullString
-			ciphertextAuthToken    []byte
-			ciphertextRefreshToken []byte
-			tokenExpiry            sql.NullInt64
-			disconnected           bool
-			authType               string
-			metadata               sql.NullString
-			tokenUserGUID          sql.NullString
-			linkedTokenGUID        sql.NullString
-		)
-		err = rows.Scan(&tokenGUID, &ciphertextAuthToken, &ciphertextRefreshToken, &tokenExpiry, &disconnected, &authType, &metadata, &tokenUserGUID, &linkedTokenGUID)
-		if err != nil {
-			return nil, fmt.Errorf("Unable to scan CNSI records: %v", err)
-		}
-
-		log.Debug("Decrypting Auth Token")
-		plaintextAuthToken, err := crypto.DecryptToken(encryptionKey, ciphertextAuthToken)
-		if err != nil {
-			return make([]interfaces.TokenRecord, 0), err
-		}
-
-		log.Debug("Decrypting Refresh Token")
-		plaintextRefreshToken, err := crypto.DecryptToken(encryptionKey, ciphertextRefreshToken)
-		if err != nil {
-			return make([]interfaces.TokenRecord, 0), err
-		}
-
-		// Build a new TokenRecord based on the decrypted tokens
-		tr := new(interfaces.TokenRecord)
-		if tokenGUID.Valid {
-			tr.TokenGUID = tokenGUID.String
-		}
-		tr.AuthToken = plaintextAuthToken
-		tr.RefreshToken = plaintextRefreshToken
-		if tokenExpiry.Valid {
-			tr.TokenExpiry = tokenExpiry.Int64
-		}
-		tr.Disconnected = disconnected
-		tr.AuthType = authType
-		if metadata.Valid {
-			tr.Metadata = metadata.String
-		}
-		if tokenUserGUID.Valid {
-			tr.SystemShared = tokenUserGUID.String == SystemSharedUserGuid
-		}
-		if linkedTokenGUID.Valid {
-			tr.LinkedGUID = linkedTokenGUID.String
-		}
-
-		trs = append(trs, *tr)
-
-	}
-
-	// TODO: RC merge with find single
-	// TODO: RC Use?
-	// // If this token is linked - fetch that token and use it instead
-	// // Currently we don't recurse - we only support one level of linked token - you can't link to another linked token
-	// if linkedTokenGUID.Valid {
-	// 	if includeDisconnected {
-	// 		err = p.db.QueryRow(getToken, userGUID, linkedTokenGUID.String).Scan(&tokenGUID, &ciphertextAuthToken, &ciphertextRefreshToken, &tokenExpiry, &disconnected, &authType, &metadata, &tokenUserGUID, &linkedTokenGUID)
-	// 	} else {
-	// 		err = p.db.QueryRow(getTokenConnected, userGUID, linkedTokenGUID.String).Scan(&tokenGUID, &ciphertextAuthToken, &ciphertextRefreshToken, &tokenExpiry, &disconnected, &authType, &metadata, &tokenUserGUID, &linkedTokenGUID)
-	// 	}
-
-	// 	if err != nil {
-	// 		msg := "Unable to Find CNSI token: %v"
-	// 		if err == sql.ErrNoRows {
-	// 			log.Debugf(msg, err)
-	// 		} else {
-	// 			log.Errorf(msg, err)
-	// 		}
-	// 		return interfaces.TokenRecord{}, fmt.Errorf(msg, err)
-	// 	}
-	// }
-
-	// TODO: RC Finish off
-
-	return trs, nil
-}
-
 func (p *PgsqlTokenRepository) FindCNSIToken(cnsiGUID string, userGUID string, encryptionKey []byte) (interfaces.TokenRecord, error) {
 	log.Debug("FindCNSIToken")
 	return p.findCNSIToken(cnsiGUID, userGUID, encryptionKey, false)
@@ -775,17 +640,3 @@ func (p *PgsqlTokenRepository) UpdateTokenAuth(userGUID string, tr interfaces.To
 
 	return nil
 }
-
-// func (p *PgsqlTokenRepository) Overwrite(tr interfaces.TokenRecord, encryptionKey []byte) error {
-// 	log.Debug("Overwrite Token")
-
-// 	if _, err := p.FindCNSITokenIncludeDisconnected(endpointGuid, userGuid, encryptionKey); err != nil {
-// 		// Found, so update endpoint
-// 		// TODO: RC ALL STRINGS?
-// 		return p. Update(endpoint, encryptionKey)
-// 	} else {
-// 		// Not Found, create endpoint
-// 		return p.SaveCNSIToken(endpointGuid, userGuid, tr, encryptionKey)
-// 		// TODO: RC Q could actually be error
-// 	}
-// }
diff --git a/src/jetstream/repository/tokens/tokens.go b/src/jetstream/repository/tokens/tokens.go
index 354baa58b6..f473885e15 100644
--- a/src/jetstream/repository/tokens/tokens.go
+++ b/src/jetstream/repository/tokens/tokens.go
@@ -18,8 +18,6 @@ type Repository interface {
 
 	FindCNSIToken(cnsiGUID string, userGUID string, encryptionKey []byte) (interfaces.TokenRecord, error)
 	FindCNSITokenIncludeDisconnected(cnsiGUID string, userGUID string, encryptionKey []byte) (interfaces.TokenRecord, error)
-	FindAllCNSIToken(cnsiGUID string, encryptionKey []byte) ([]interfaces.TokenRecord, error)
-	FindAllCNSITokenIncludeDisconnected(cnsiGUID string, encryptionKey []byte) ([]interfaces.TokenRecord, error)
 	FindAllCNSITokenBackup(cnsiGUID string, encryptionKey []byte) ([]interfaces.BackupTokenRecord, error)
 	DeleteCNSIToken(cnsiGUID string, userGUID string) error
 	DeleteCNSITokens(cnsiGUID string) error

From 0821dac2ba4cca40bbf5754f33c99ec337919db7 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 16 Apr 2020 16:54:13 +0100
Subject: [PATCH 024/176] Bump rxjs-tslint

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index db55ac40e9..f0bb97db88 100644
--- a/package.json
+++ b/package.json
@@ -139,7 +139,7 @@
     "replace-in-file": "^5.0.2",
     "request": "^2.88.2",
     "request-promise-native": "^1.0.8",
-    "rxjs-tslint": "^0.1.7",
+    "rxjs-tslint": "^0.1.8",
     "sass-lint": "^1.12.1",
     "stratos-protractor-reporter": "^1.2.3",
     "ts-node": "~8.8.2",

From d78b23c5d267b0f7eedc91236aa0a4121a217862 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 16 Apr 2020 18:08:49 +0100
Subject: [PATCH 025/176] Tidying & bug fixes. Handle client_secret

---
 .../backup-connection-cell.component.html     |   5 +-
 .../backup-connection-cell.component.ts       |  13 ++-
 .../backup-endpoints.service.ts               |  14 ++-
 .../backup-endpoints.component.html           |   5 +-
 .../backup-restore-cell.component.ts          |   2 +-
 .../restore-endpoints.component.ts            |   7 +-
 src/jetstream/cnsi_token_backup.go            | 108 ++++++++++--------
 7 files changed, 95 insertions(+), 59 deletions(-)

diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.html
index 818fadc297..c964d79408 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.html
@@ -1,8 +1,9 @@
-<mat-form-field>
+<mat-form-field *ngIf="connectable; else unConnectable">
   <mat-select [(value)]="service.state[row.guid][backupType.CONNECT]"
     [disabled]="!service.state[row.guid][backupType.ENDPOINT]">
     <mat-option [value]="connectionTypes.NONE">None</mat-option>
     <mat-option *ngIf="!!row.user" [value]="connectionTypes.CURRENT">Current User</mat-option>
     <mat-option [value]="connectionTypes.ALL">All Users</mat-option>
   </mat-select>
-</mat-form-field>
\ No newline at end of file
+</mat-form-field>
+<ng-template #unConnectable>N/A</ng-template>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.ts
index 528b256c22..67c64ab19e 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.ts
@@ -1,5 +1,6 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 
+import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { EndpointModel } from '../../../../../../store/src/types/endpoint.types';
 import { TableCellCustom } from '../../../../shared/components/list/list.types';
 import { BackupEndpointsService } from '../backup-endpoints.service';
@@ -10,8 +11,9 @@ import { BackupEndpointConnectionTypes, BackupEndpointTypes } from '../backup-re
   templateUrl: './backup-connection-cell.component.html',
   styleUrls: ['./backup-connection-cell.component.scss']
 })
-export class BackupConnectionCellComponent extends TableCellCustom<EndpointModel> {
+export class BackupConnectionCellComponent extends TableCellCustom<EndpointModel> implements OnInit {
 
+  connectable = false;
   backupType = BackupEndpointTypes;
   connectionTypes = BackupEndpointConnectionTypes;
   selected: BackupEndpointConnectionTypes;
@@ -19,4 +21,11 @@ export class BackupConnectionCellComponent extends TableCellCustom<EndpointModel
   constructor(public service: BackupEndpointsService) {
     super();
   }
+
+  ngOnInit(): void {
+    const epType = entityCatalog.getEndpoint(this.row.cnsi_type, this.row.sub_type);
+    const epEntity = epType.definition;
+    this.connectable = !epEntity.unConnectable;
+  }
+
 }
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
index ee1f06fc80..faffbeeef1 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
@@ -68,8 +68,8 @@ export class BackupEndpointsService {
     );
     this.hasChanges.next(hasChanges);
     const allChanged = endpoints.every(endpoint => {
-      const e = !this.canBackup(endpoint.entity, BackupEndpointTypes.ENDPOINT) || endpoint[BackupEndpointTypes.ENDPOINT];
-      const c = !this.canBackup(endpoint.entity, BackupEndpointTypes.CONNECT) || endpoint[BackupEndpointTypes.CONNECT] !== BackupEndpointConnectionTypes.NONE;
+      const e = !this.canBackupEndpoint(endpoint.entity, BackupEndpointTypes.ENDPOINT) || endpoint[BackupEndpointTypes.ENDPOINT];
+      const c = !this.canBackupEndpoint(endpoint.entity, BackupEndpointTypes.CONNECT) || endpoint[BackupEndpointTypes.CONNECT] !== BackupEndpointConnectionTypes.NONE;
       return e && c;
     }
 
@@ -77,7 +77,7 @@ export class BackupEndpointsService {
     this.allChanged.next(allChanged);
   }
 
-  canBackup(endpoint: EndpointModel, type: BackupEndpointTypes): boolean {
+  canBackupEndpoint(endpoint: EndpointModel, type: BackupEndpointTypes): boolean {
     // Can always back up endpoint
     if (type === BackupEndpointTypes.ENDPOINT) {
       return true;
@@ -97,12 +97,16 @@ export class BackupEndpointsService {
     return true;
   }
 
+  canBackup(): boolean {
+    return !!Object.values(this.state).length;
+  }
+
   selectAll() {
     Object.values(this.state).forEach(endpoint => {
-      if (this.canBackup(endpoint.entity, BackupEndpointTypes.ENDPOINT)) {
+      if (this.canBackupEndpoint(endpoint.entity, BackupEndpointTypes.ENDPOINT)) {
         endpoint[BackupEndpointTypes.ENDPOINT] = true;
       }
-      if (this.canBackup(endpoint.entity, BackupEndpointTypes.CONNECT)) {
+      if (this.canBackupEndpoint(endpoint.entity, BackupEndpointTypes.CONNECT)) {
         endpoint[BackupEndpointTypes.CONNECT] = BackupEndpointConnectionTypes.ALL;
       }
     });
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html
index 14a8f6bf96..5344aaa34a 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html
@@ -6,7 +6,7 @@ <h1>Backup Endpoints</h1>
   path: '/endpoints/backup-restore'
   }">
   <app-step title="Select" [valid]="selectValid$ | async">
-    <div class="select-step">
+    <div *ngIf="service.canBackup(); else noEndpoints" class="select-step">
       <p>Select the endpoints and connection details that you would like to backup</p>
       <div class="select-step__buttons">
         <button mat-raised-button color="primary" [disabled]="disableSelectAll$ | async"
@@ -16,6 +16,9 @@ <h1>Backup Endpoints</h1>
       </div>
       <app-table [dataSource]="endpointDataSource" [columns]="columns"></app-table>
     </div>
+    <ng-template #noEndpoints>
+      <p>There are no endpoints to backup</p>
+    </ng-template>
   </app-step>
   <app-step title="Password" finishButtonText="Download" [onNext]="onNext" [valid]="passwordValid$ | async">
     <div class="password-step">
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.ts
index 97a05e5198..0a1b80d52d 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.ts
@@ -20,6 +20,6 @@ export class BackupRestoreCellComponent extends TableCellCustom<EndpointModel> {
   }
 
   disabled(): boolean {
-    return !this.service.canBackup(this.row, this.config.type);
+    return !this.service.canBackupEndpoint(this.row, this.config.type);
   }
 }
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
index bfd419aad2..53fca1dcc1 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
@@ -1,9 +1,12 @@
 import { Component } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { MatCheckboxChange } from '@angular/material';
+import { Store } from '@ngrx/store';
 import { Observable, of, Subject } from 'rxjs';
 import { first, map, tap } from 'rxjs/operators';
 
+import { GetAllEndpoints } from '../../../../../../store/src/actions/endpoint.actions';
+import { GeneralEntityAppState } from '../../../../../../store/src/app-state';
 import { getEventFiles } from '../../../../core/browser-helper';
 import { httpErrorResponseToSafeString } from '../../../../jetstream.helpers';
 import { ConfirmationDialogConfig } from '../../../../shared/components/confirmation-dialog.config';
@@ -28,6 +31,7 @@ export class RestoreEndpointsComponent {
   show = false;
 
   constructor(
+    private store: Store<GeneralEntityAppState>,
     public service: RestoreEndpointsService,
     private confirmDialog: ConfirmationDialogService,
   ) {
@@ -62,7 +66,7 @@ export class RestoreEndpointsComponent {
   restore: StepOnNextFunction = () => {
     const confirmation = new ConfirmationDialogConfig(
       'Restore',
-      'This will overwrite any matching endpoints and connection details',
+      'This will overwrite any matching endpoints and connection details.',
       'Continue',
       true
     );
@@ -75,6 +79,7 @@ export class RestoreEndpointsComponent {
     };
 
     const restoreSuccess = data => {
+      this.store.dispatch(new GetAllEndpoints());
       result.next({
         success: true,
         redirect: true,
diff --git a/src/jetstream/cnsi_token_backup.go b/src/jetstream/cnsi_token_backup.go
index 8e23318e48..b3d25e6543 100644
--- a/src/jetstream/cnsi_token_backup.go
+++ b/src/jetstream/cnsi_token_backup.go
@@ -8,6 +8,7 @@ import (
 	"io/ioutil"
 	"net/http"
 
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/crypto"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/cnsis"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/tokens"
@@ -45,20 +46,20 @@ type BackupRequest struct {
 
 // BackupContentPayload - Encrypted part of the backup
 type BackupContentPayload struct {
-	Endpoints []*interfaces.CNSIRecord
+	Endpoints []map[string]interface{}
 	Tokens    []interfaces.BackupTokenRecord
 }
 
 // BackupContent - Everything that's backed up and stored in a file client side
 type BackupContent struct {
-	Payload   BackupContentPayload `json:"payload"`
-	DBVersion int64                `json:"dbVersion"`
+	Payload   []byte `json:"payload"`
+	DBVersion int64  `json:"dbVersion"`
 }
 
 // RestoreRequest - Request from client to restore content from payload
 type RestoreRequest struct {
-	// Payload - Encrypted version of BackupContent
-	Payload         string `json:"data"`
+	// Data - Content of backup file. This should be of type BackupContent (//TODO: RC test as BackupContent)
+	Data            string `json:"data"`
 	Password        string `json:"password"`
 	IgnoreDbVersion bool   `json:"ignoreDbVersion"`
 }
@@ -89,7 +90,6 @@ func (ctb *cnsiTokenBackup) BackupEndpoints(c echo.Context) error {
 	log.Infof("response: %+v", response) // TODO: RC REMOVE
 
 	// Send back the response to the client
-	// TODO: RC Missing client_secret when serialised, `-` in definition
 	jsonString, err := json.Marshal(response)
 	if err != nil {
 		return interfaces.NewHTTPError(http.StatusInternalServerError, "Failed to serialize response")
@@ -111,7 +111,7 @@ func (ctb *cnsiTokenBackup) createBackup(data *BackupRequest) (*BackupContent, e
 	}
 
 	// Fetch/Format required data
-	endpoints := make([]*interfaces.CNSIRecord, 0)
+	endpoints := make([]map[string]interface{}, 0)
 	tokens := make([]interfaces.BackupTokenRecord, 0)
 
 	for endpointID, endpoint := range data.State {
@@ -122,19 +122,19 @@ func (ctb *cnsiTokenBackup) createBackup(data *BackupRequest) (*BackupContent, e
 
 		for _, e := range allEndpoints {
 			if endpointID == e.GUID {
-				endpoints = append(endpoints, e)
+				endpoints = append(endpoints, serializeEndpoint(e))
 				break
 			}
 		}
 
 		switch connectionType := endpoint.Connect; connectionType {
 		case BACKUP_CONNECTION_ALL:
-			// allTokensFrom = append(allTokensFrom, endpointID)
 			if tokenRecords, ok := ctb.getCNSITokenRecordsBackup(endpointID); ok {
 				log.Warn("tokens for AllConnect") // TODO: RC REMOVE
 				tokens = append(tokens, tokenRecords...)
 			} else {
-				log.Warn("No tokens for AllConnect") // TODO: RC REMOVE
+				text := fmt.Sprintf("Failed to fetch tokens for endpoint %+v", endpointID)
+				return nil, interfaces.NewHTTPError(http.StatusBadGateway, text)
 			}
 		case BACKUP_CONNECTION_CURRENT:
 			// userTokenFrom = append(userTokenFrom, endpointID)
@@ -151,10 +151,10 @@ func (ctb *cnsiTokenBackup) createBackup(data *BackupRequest) (*BackupContent, e
 
 				tokens = append(tokens, btr)
 			} else {
-				log.Infof("Request to back up connected user's (%+v) token for endpoint (%+v) failed. No token for user.", endpointID, data.UserID)
+				text := fmt.Sprintf("Request to back up connected user's (%+v) token for endpoint (%+v) failed.", endpointID, data.UserID)
+				return nil, interfaces.NewHTTPError(http.StatusBadGateway, text)
 			}
 		}
-
 	}
 
 	log.Infof("endpoints: %+v", endpoints) // TODO: RC REMOVE
@@ -166,7 +166,9 @@ func (ctb *cnsiTokenBackup) createBackup(data *BackupRequest) (*BackupContent, e
 	}
 
 	// Encrypt data (see above) // TODO: RC leave until last
-	// encryptedPayload := payload
+
+	bPayload, _ := json.Marshal(payload)
+	encryptedPayload, err := crypto.EncryptToken(encryptionKey, fmt.Sprintf("%+v", bPayload)) //TODO: RC error handling
 
 	versions, err := ctb.p.getVersionsData()
 	if err != nil {
@@ -176,7 +178,7 @@ func (ctb *cnsiTokenBackup) createBackup(data *BackupRequest) (*BackupContent, e
 	// log.Infof("payload: %+v", payload)
 
 	response := &BackupContent{
-		Payload:   *payload,
+		Payload:   encryptedPayload,
 		DBVersion: versions.DatabaseVersion,
 	}
 
@@ -231,7 +233,7 @@ func (ctb *cnsiTokenBackup) restoreBackup(backup *RestoreRequest) error {
 	// TODO: RC Q all errors are NewHTTPError
 
 	data := &BackupContent{}
-	if err := json.Unmarshal([]byte(backup.Payload), backup); err != nil {
+	if err := json.Unmarshal([]byte(backup.Data), data); err != nil {
 		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid backup - could not parse JSON")
 	}
 
@@ -247,16 +249,25 @@ func (ctb *cnsiTokenBackup) restoreBackup(backup *RestoreRequest) error {
 		}
 	}
 
-	unencryptedBackup := data.Payload
+	unencryptedBackup, err := crypto.DecryptToken(encryptionKey, data.Payload) //TODO: RC error handling, comments
+	if err != nil {
+		return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to decrypt payload", "Failed to decrypt payload: %+v", err)
+	}
+
+	payload := &BackupContentPayload{}
+	if err = json.Unmarshal([]byte(unencryptedBackup), payload); err != nil {
+		return interfaces.NewHTTPError(http.StatusBadRequest, "Could not parse payload")
+	}
 
 	cnsiRepo, err := cnsis.NewPostgresCNSIRepository(ctb.databaseConnectionPool)
 	if err != nil {
 		return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to connect to db", "Failed to connect to db: %+v", err)
 	}
 
-	for _, endpoint := range unencryptedBackup.Endpoints {
-		if err := cnsiRepo.Overwrite(*endpoint, ctb.p.Config.EncryptionKeyInBytes); err != nil {
-			return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to overwrite endpoints", "Failed to overwrite endpoint: %+v", endpoint.Name)
+	for _, endpoint := range payload.Endpoints {
+		e := deSerializeEndpoint(endpoint)
+		if err := cnsiRepo.Overwrite(e, ctb.p.Config.EncryptionKeyInBytes); err != nil {
+			return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to overwrite endpoints", "Failed to overwrite endpoint: %+v", e.Name)
 		}
 	}
 
@@ -265,7 +276,7 @@ func (ctb *cnsiTokenBackup) restoreBackup(backup *RestoreRequest) error {
 		return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to connect to db", "Failed to connect to db: %+v", err)
 	}
 
-	for _, tr := range unencryptedBackup.Tokens {
+	for _, tr := range payload.Tokens {
 		if err := tokenRepo.SaveCNSIToken(tr.EndpointGUID, tr.UserGUID, tr.TokenRecord, ctb.p.Config.EncryptionKeyInBytes); err != nil {
 			return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to overwrite token", "Failed to overwrite token: %+v", tr.TokenRecord.TokenGUID)
 		}
@@ -274,30 +285,33 @@ func (ctb *cnsiTokenBackup) restoreBackup(backup *RestoreRequest) error {
 	return nil
 }
 
-// find := func(a interfaces.CNSIRecord) bool {
-// 	return endpointID == a.GUID
-// }
-
-// endpointPos := sliceContainsFn(find, allEndpoints)
-// if endpointPos >= 0 {
-// 	endpoints = append(endpoints, endpoints[endpointPos])
-// }
-
-// // TODO:RC pos
-// func sliceContains(what interface{}, where []interface{}) (idx int) {
-// 	for i, v := range where {
-// 		if v == what {
-// 			return i
-// 		}
-// 	}
-// 	return -1
-// }
-
-// func sliceContainsFn(is func(a interface{}) bool, where []interface{}) (idx int) {
-// 	for i, v := range where {
-// 		if is(v) {
-// 			return i
-// 		}
-// 	}
-// 	return -1
-// }
+// Work around the omission of the client secret when serialising the cnsi record
+func serializeEndpoint(endpoint *interfaces.CNSIRecord) map[string]interface{} {
+	// encode the original
+	m, _ := json.Marshal(endpoint)
+
+	// decode it back to get a map
+	var a interface{}
+	json.Unmarshal(m, &a)
+	newEndpoint := a.(map[string]interface{})
+
+	// Replace the map key
+	newEndpoint["client_secret"] = endpoint.ClientSecret
+
+	return newEndpoint
+}
+
+// Work around the omission of the client secret when serialising the cnsi record
+func deSerializeEndpoint(endpoint map[string]interface{}) interfaces.CNSIRecord {
+	// encode the endpoint map
+	m, _ := json.Marshal(endpoint)
+
+	// decode it back to get a record with all values except client secret
+	var a interfaces.CNSIRecord
+	json.Unmarshal(m, &a)
+
+	// manually add the client secret
+	a.ClientSecret = fmt.Sprintf("%v", endpoint["client_secret"])
+	log.Errorf("CLIENT SECRET: %+v", a.ClientSecret) // TODO: RC REMOVE
+	return a
+}

From 7d62b61766e03a44483ebf6c91a8f05551369f00 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 17 Apr 2020 11:44:41 +0100
Subject: [PATCH 026/176] Update to 9.1.2

---
 package-lock.json | 425 ++++++++++++++++++++++++++++++++++------------
 package.json      |  42 ++---
 2 files changed, 342 insertions(+), 125 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3520d7ddb3..e611c6e04e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -294,14 +294,14 @@
       }
     },
     "@angular/animations": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-9.1.1.tgz",
-      "integrity": "sha512-IvKv8sV0ymbzDEX2ZLW+F6nOTQqDYallHexuzRVT9txvNE8TNHyySvLcyC5dTmX9fj9LA72NZ6nFyhxq0LFvtQ=="
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-9.1.2.tgz",
+      "integrity": "sha512-5UJ8SzCtFj4vZChVsni4K9oa4qE9tQ67bwnP6DKxkLEJKQWWyasYp+2siAi/7zD2ro2XA0qRMYhgQz5Vj6eBoQ=="
     },
     "@angular/cdk": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-9.2.0.tgz",
-      "integrity": "sha512-jeeznvNDpR9POuxzz8Y0zFvMynG9HCJo3ZPTqOjlOq8Lj8876+rLsHDvKEMeLdwlkdi1EweYJW1CLQzI+TwqDA==",
+      "version": "9.2.1",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-9.2.1.tgz",
+      "integrity": "sha512-aSG1UNPszkSnpNuDCNd7ZgT29oQ8vqHPmoqjvJI0JkEv3i6uEs5tRuhWl3TK39wDNuwdlq0AY47XTa/0Ppb5RQ==",
       "requires": {
         "parse5": "^5.0.0"
       }
@@ -379,19 +379,19 @@
       }
     },
     "@angular/common": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-9.1.1.tgz",
-      "integrity": "sha512-bS13veMs7//YqYjYJ+JI78ylaCyVcdFKZKikd5SZa6+r6fajcyvLnSKqrKypG3O1BeJ8vOG/Pq54P5gWhbR6eA=="
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-9.1.2.tgz",
+      "integrity": "sha512-MAQW0DGq2NhvJSETLTwuImdzwI+wboG+5Uzgc0L8C/hX7SrEE65Hmz4nIjmGi2CPGLpodfWEcCPlV0R0dHun4A=="
     },
     "@angular/compiler": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.1.1.tgz",
-      "integrity": "sha512-u1IP6IzUgK6lIzrG1cxp96umXgtThyhuFn/KPoyVt7wPxZ6vVR0ZxjM7zycEcrMGzk0nf0nyOKaksJk9sTXTbg=="
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.1.2.tgz",
+      "integrity": "sha512-82DitvlZA5DoE++qiiJdgx6HE71h96sfLHCjjvYJHApoOcnX+zBZFBrflpbXK9W4YdvydU4Lc1Ql1eleQPeT/g=="
     },
     "@angular/compiler-cli": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-9.1.1.tgz",
-      "integrity": "sha512-2jGp0ck2kkLNMzXUo/3iJkrQqJ7oGXE8h2tksxBsH2ptnhexRYTHZ626t7Np128tduY5JeC7J1Jxz7MUuYsJ2Q==",
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-9.1.2.tgz",
+      "integrity": "sha512-zC/oIuT68vtuiYrgXqWsDNi/0DQ1Ti6J6gMTrXVvZXlEDikEExTAJKrrBV5jo6B0bpUofe/dDcJaKR3Ys3cM3Q==",
       "dev": true,
       "requires": {
         "canonical-path": "1.0.0",
@@ -714,9 +714,9 @@
       }
     },
     "@angular/core": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.1.1.tgz",
-      "integrity": "sha512-6lDlUlePafr/392hOvvTZZl6xPHT50U6658sHUAVIr0Un4mJ2MHNHKZtO45bpn3hM4gjFcYRQ7Rpd0umW74iTA=="
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.1.2.tgz",
+      "integrity": "sha512-nAqRl+5drAnZlBT7AgSo2JJubmPNrGCvhZ83dosPEUqJoLr69/lYipnF/iqKzYn5xo4MM1O27WIhSNDtDjBmzQ=="
     },
     "@angular/flex-layout": {
       "version": "9.0.0-beta.29",
@@ -724,49 +724,49 @@
       "integrity": "sha512-93sxR+kYfYMOdnlWL0Q77FZ428gg8XnBu0YZm6GsCdkw/vLggIT/G1ZAqHlCPIODt6pxmCJ5KXh4ShvniIYDsA=="
     },
     "@angular/forms": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-9.1.1.tgz",
-      "integrity": "sha512-NX+LuK8JFisiq3uHCOK6YoN/yIb2R9Ye5mwiOPkuZA3lZLKCnUXqCHZbM8VHy/WdjIxxeUaFMJc38yV8RVoabg=="
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-9.1.2.tgz",
+      "integrity": "sha512-/f2WhMiKDo1/RoisTI71Dy4Z4+sAsAuzgIxJEXvgDGSYvzLl9G8erFx4N6be8Cy/xXwErmp3JOwXIAXjzxF8tA=="
     },
     "@angular/language-service": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-9.1.1.tgz",
-      "integrity": "sha512-T+/0X2VnmgW/vzynqYTVv29qtebNvrCB/yJqtNIlqXvBjcB8XRRwZPDZvRyl5BiwEPSsJnjdRFNH9krQHxYp+g==",
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-9.1.2.tgz",
+      "integrity": "sha512-0BnDIFbIAtFKS/2HDI0efcnW3DSkAAFhUWluBnssvwGzuMHikOKGeamuWM27ki3IzPQKGJ7fGS2fz8A7sMeIYQ==",
       "dev": true
     },
     "@angular/material": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/@angular/material/-/material-9.2.0.tgz",
-      "integrity": "sha512-KKzEIVh6/m56m+Ao8p4PK0SyEr0574l3VP2swj1qPag3u+FYgemmXCGTaChrKdDsez+zeTCPXImBGXzE6NQ80Q=="
+      "version": "9.2.1",
+      "resolved": "https://registry.npmjs.org/@angular/material/-/material-9.2.1.tgz",
+      "integrity": "sha512-nqn/0Eg04DxwnkRGSM1xnmGgtfHYOBcEPbFeTu8c1qAbjFEozd6tpw4y6dQrCCL/JLNIRQPsxsUsVnKeWDF/4Q=="
     },
     "@angular/material-moment-adapter": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-9.2.0.tgz",
-      "integrity": "sha512-DruanWMcAzOy8mFZ6Xr9sRqJ+KjF0hvFshxqrv0SD/rVpf9oi8ADnuACmHYXN5dYr/YtgmHDywq0Z7USY7SIoA=="
+      "version": "9.2.1",
+      "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-9.2.1.tgz",
+      "integrity": "sha512-i3tbL3DJQspO23cPAgW6pAvztuv2D8tkGhxl+bTUlq8FgGBqKrOa0T/maN1fik46AXZojowUVZoCG7EvV2T7nQ=="
     },
     "@angular/platform-browser": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-9.1.1.tgz",
-      "integrity": "sha512-tjALKhdAWPErj0euIIdvx/31AHEZ7is7ADsMu+nYn2NY2gcPUuiqq3RCUJVxBYJ2Cclq1nlF0i2rEDKh7TrBKg=="
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-9.1.2.tgz",
+      "integrity": "sha512-/3L4DdvnebvaJUurusaq8RJBFfr/SHWG6DMmV1VVpADxe8kjREyN0LdNDSkZgVf/QcUSwNEA6153iwcF92Otew=="
     },
     "@angular/platform-browser-dynamic": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.1.1.tgz",
-      "integrity": "sha512-kEox5UOwkRLjGKXLh5o5SYopoAylpKgrXtRrKRKTCMmZTpYSe1bLlXMjpwMAMZ9ZFSTvWp9iX94aT5bJDpLrRQ=="
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.1.2.tgz",
+      "integrity": "sha512-BWHxy8S71z+NmUQmtR+/Dkohlj3LQIXltOqeVdCSpjV9cultBNN3bE1w0Rjp3BmCRGCIDH7qFlr4U5woHa7ldw=="
     },
     "@angular/platform-server": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-9.1.1.tgz",
-      "integrity": "sha512-Azvras7WpRtVw4jfEfmlrz5JBIDpXCZMab/5A1dFv3Z9Dbykp5czkZ/XXCpMCVcli7xxthF1uv/FD4nQoJdzSw==",
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-9.1.2.tgz",
+      "integrity": "sha512-GjDWEglkmBgpDZ5pWlaC4zMXUAXRmTsE2me277OGQlKKZwsBfFZWai0NHAbDVq0SE4/f3x0QKo33TxOy47LXng==",
       "requires": {
         "domino": "^2.1.2",
         "xhr2": "^0.2.0"
       }
     },
     "@angular/router": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.1.1.tgz",
-      "integrity": "sha512-OQ5Ctd+swF7ZNlgUxrkGKk2B4yBFqJm0QCxkM86kFDCKQV/4OButZ+4HPy1HxeozBIAmm2pbQA+YjsAUs0VZcQ=="
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.1.2.tgz",
+      "integrity": "sha512-csxE4HkuhVR1X932Q3kSDqBoF7Awuq5dsjv0nFk78raiHgG3CNnfMLHt8xD9XtOmR7ZT+D4yh/YmIK6W7J5hbQ=="
     },
     "@babel/code-frame": {
       "version": "7.5.5",
@@ -1965,13 +1965,15 @@
       }
     },
     "@rollup/plugin-commonjs": {
-      "version": "11.0.2",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-11.0.2.tgz",
-      "integrity": "sha512-MPYGZr0qdbV5zZj8/2AuomVpnRVXRU5XKXb3HVniwRoRCreGlf5kOE081isNWeiLIi6IYkwTX9zE0/c7V8g81g==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-11.1.0.tgz",
+      "integrity": "sha512-Ycr12N3ZPN96Fw2STurD21jMqzKwL9QuFhms3SD7KKRK7oaXUsBU9Zt0jL/rOPHiPYisI21/rXGO3jr9BnLHUA==",
       "dev": true,
       "requires": {
-        "@rollup/pluginutils": "^3.0.0",
+        "@rollup/pluginutils": "^3.0.8",
+        "commondir": "^1.0.1",
         "estree-walker": "^1.0.1",
+        "glob": "^7.1.2",
         "is-reference": "^1.1.2",
         "magic-string": "^0.25.2",
         "resolve": "^1.11.0"
@@ -1987,12 +1989,12 @@
       }
     },
     "@rollup/plugin-node-resolve": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.1.tgz",
-      "integrity": "sha512-14ddhD7TnemeHE97a4rLOhobfYvUVcaYuqTnL8Ti7Jxi9V9Jr5LY7Gko4HZ5k4h4vqQM0gBQt6tsp9xXW94WPA==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz",
+      "integrity": "sha512-RxtSL3XmdTAE2byxekYLnx+98kEUOrPHF/KRVjLH+DEIHy6kjIw7YINQzn+NXiH/NTrQLAwYs0GWB+csWygA9Q==",
       "dev": true,
       "requires": {
-        "@rollup/pluginutils": "^3.0.6",
+        "@rollup/pluginutils": "^3.0.8",
         "@types/resolve": "0.0.8",
         "builtin-modules": "^3.1.0",
         "is-module": "^1.0.0",
@@ -2000,9 +2002,9 @@
       },
       "dependencies": {
         "resolve": {
-          "version": "1.15.1",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz",
-          "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
+          "version": "1.16.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.16.0.tgz",
+          "integrity": "sha512-LarL/PIKJvc09k1jaeT4kQb/8/7P+qV4qSnN2K80AES+OHdfZELAKVOBjxsvtToT/uLOfFbvYvKfZmV8cee7nA==",
           "dev": true,
           "requires": {
             "path-parse": "^1.0.6"
@@ -2011,12 +2013,59 @@
       }
     },
     "@rollup/pluginutils": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.8.tgz",
-      "integrity": "sha512-rYGeAc4sxcZ+kPG/Tw4/fwJODC3IXHYDH4qusdN/b6aLw5LPUbzpecYbEJh4sVQGPFJxd2dBU4kc1H3oy9/bnw==",
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.9.tgz",
+      "integrity": "sha512-TLZavlfPAZYI7v33wQh4mTP6zojne14yok3DNSLcjoG/Hirxfkonn6icP5rrNWRn8nZsirJBFFpijVOJzkUHDg==",
       "dev": true,
       "requires": {
-        "estree-walker": "^1.0.1"
+        "@types/estree": "0.0.39",
+        "estree-walker": "^1.0.1",
+        "micromatch": "^4.0.2"
+      },
+      "dependencies": {
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.0.5"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
       }
     },
     "@schematics/angular": {
@@ -2070,9 +2119,9 @@
       "dev": true
     },
     "@swimlane/ngx-charts": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-13.0.2.tgz",
-      "integrity": "sha512-pKHw3DLsO2eso3SqMlHt9vumaU8gaDYZbrC8PNWteU49AFkX8kLVJIvsgjMSKwW/n3VpgHBpTMGnLkSlzHJORg==",
+      "version": "13.0.3",
+      "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-13.0.3.tgz",
+      "integrity": "sha512-WPgMZwqND/hGgxY+fJ+iN3ctL6Ps93kZ6j2jeWRgKfXdUVNnKQ4XeUBWpU+70jhq1i36PzYEg46evWdHp6vMuw==",
       "requires": {
         "d3-array": "^2.4.0",
         "d3-brush": "^1.1.5",
@@ -2107,12 +2156,6 @@
       "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-17.4.0.tgz",
       "integrity": "sha512-J3fzl1F6wvh8KXVVcIuHN12xi1ZDcPA/0Vix+ZcJYwZWVHUwfIqfvzYXXEw7ybeev6477KCTt9fKydU+ajUqcg=="
     },
-    "@types/bluebird": {
-      "version": "3.5.30",
-      "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.30.tgz",
-      "integrity": "sha512-8LhzvcjIoqoi1TghEkRMkbbmM+jhHnBokPGkJWjclMK+Ks0MxEBow3/p2/iFTZ+OIbJHQDSfpgdZEb+af3gfVw==",
-      "dev": true
-    },
     "@types/caseless": {
       "version": "0.12.2",
       "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.2.tgz",
@@ -2169,20 +2212,19 @@
       }
     },
     "@types/karma": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@types/karma/-/karma-4.4.1.tgz",
-      "integrity": "sha512-Y2jH6yMPqVMCeewC6gn5Q3hljcbtffyjnhQC8rhp9zdek2zUXh6e6+TDLNlO2lCiNmjzxANiRxQR0cRxkkIYmQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@types/karma/-/karma-5.0.0.tgz",
+      "integrity": "sha512-5quuLnxdJWkzJCEwFatOClM6O7EkeDWfXltGySb01LQnBVjtbLzIky9JLW0IKt+JfzurUjwj7b7Sb/Omsx4QYA==",
       "dev": true,
       "requires": {
-        "@types/bluebird": "*",
         "@types/node": "*",
         "log4js": "^4.0.0"
       }
     },
     "@types/marked": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/@types/marked/-/marked-0.7.3.tgz",
-      "integrity": "sha512-WXdEKuT3azHxLTThd5dwnpLt2Q9QiC8iKj09KZRtVqro3pX8hhY+GbD8FZOae6SBBEJ22yKJn3c7ejL0aucAcA=="
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/@types/marked/-/marked-0.7.4.tgz",
+      "integrity": "sha512-fdg0NO4qpuHWtZk6dASgsrBggY+8N4dWthl1bAQG9ceKUNKFjqpHaDKCAhRUI6y8vavG7hLSJ4YBwJtZyZEXqw=="
     },
     "@types/minimatch": {
       "version": "3.0.3",
@@ -9115,9 +9157,9 @@
       }
     },
     "is-installed-globally": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.1.tgz",
-      "integrity": "sha512-oiEcGoQbGc+3/iijAijrK2qFpkNoNjsHOm/5V5iaeydyrS/hnwaRCEgH5cpW0P3T1lSjV5piB7S5b5lEugNLhg==",
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz",
+      "integrity": "sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g==",
       "dev": true,
       "requires": {
         "global-dirs": "^2.0.1",
@@ -10946,9 +10988,9 @@
       "dev": true
     },
     "mem": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-6.0.1.tgz",
-      "integrity": "sha512-uIRYASflIsXqvKe+7aXbLrydaRzz4qiK6amqZDQI++eRtW3UoKtnDcGeCAOREgll7YMxO5E4VB9+3B0LFmy96g==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-6.1.0.tgz",
+      "integrity": "sha512-RlbnLQgRHk5lwqTtpEkBTQ2ll/CG/iB+J4Hy2Wh97PjgZgXgWJWrFF+XXujh3UUVLvR4OOTgZzcWMMwnehlEUg==",
       "dev": true,
       "requires": {
         "map-age-cleaner": "^0.1.3",
@@ -11400,9 +11442,9 @@
       "dev": true
     },
     "ng-packagr": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-9.1.0.tgz",
-      "integrity": "sha512-783WCTa+qQl8QQefQ3n8cDzYF3PpsQUnY87SwuXIxaJ1p8NjBq/3vCZmTiI3AXzDZFhRacbCqghtaJGU1qcFrQ==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-9.1.1.tgz",
+      "integrity": "sha512-20umbeklnsntUoTXBKuQQj4Oyw1tauVU7TZPRFC+n3bXuB29rb+91HIBtt8k7l0BuXN5G4HiXgmPW8xDGu7HWg==",
       "dev": true,
       "requires": {
         "@rollup/plugin-commonjs": "^11.0.2",
@@ -11411,7 +11453,7 @@
         "ajv": "^6.10.2",
         "autoprefixer": "^9.6.5",
         "browserslist": "^4.7.0",
-        "chalk": "^3.0.0",
+        "chalk": "^4.0.0",
         "chokidar": "^3.2.1",
         "clean-css": "^4.1.11",
         "commander": "^4.0.0",
@@ -11424,7 +11466,7 @@
         "postcss-url": "^8.0.0",
         "read-pkg-up": "^5.0.0",
         "rimraf": "^3.0.0",
-        "rollup": "2.2.0",
+        "rollup": "2.6.1",
         "rollup-plugin-sourcemaps": "^0.5.0",
         "rxjs": "^6.5.0",
         "sass": "^1.23.0",
@@ -11469,9 +11511,9 @@
           }
         },
         "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
+          "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -11587,9 +11629,9 @@
           "dev": true
         },
         "p-limit": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
-          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -11663,9 +11705,9 @@
           }
         },
         "rollup": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.2.0.tgz",
-          "integrity": "sha512-iAu/j9/WJ0i+zT0sAMuQnsEbmOKzdQ4Yxu5rbPs9aUCyqveI1Kw3H4Fi9NWfCOpb8luEySD2lDyFWL9CrLE8iw==",
+          "version": "2.6.1",
+          "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.6.1.tgz",
+          "integrity": "sha512-1RhFDRJeg027YjBO6+JxmVWkEZY0ASztHhoEUEWxOwkh4mjO58TFD6Uo7T7Y3FbmDpRTfKhM5NVxJyimCn0Elg==",
           "dev": true,
           "requires": {
             "fsevents": "~2.1.2"
@@ -12943,9 +12985,9 @@
       "dev": true
     },
     "parse5": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz",
-      "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
+      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
       "optional": true
     },
     "parseqs": {
@@ -15255,24 +15297,153 @@
       }
     },
     "rxjs-tslint": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/rxjs-tslint/-/rxjs-tslint-0.1.7.tgz",
-      "integrity": "sha512-NnOfqutNfdT7VQnQm32JLYh2gDZjc0gdWZFtrxf/czNGkLKJ1nOO6jbKAFI09W0f9lCtv6P2ozxjbQH8TSPPFQ==",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/rxjs-tslint/-/rxjs-tslint-0.1.8.tgz",
+      "integrity": "sha512-4MNcco1pugjNyjkUkvJ9ngJSMCuwmyc1g6EkEYzlTK0PrZxm8xVaBeBz5aPLE3AzldQbYkOErOVAayUlzQkjAg==",
       "dev": true,
       "requires": {
         "chalk": "^2.4.0",
-        "optimist": "^0.6.1",
         "tslint": "^5.9.1",
         "tsutils": "^2.25.0",
-        "typescript": ">=2.8.3"
+        "typescript": ">=2.8.3",
+        "yargs": "^15.3.1"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "dev": true,
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
         "builtin-modules": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
           "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
           "dev": true
         },
+        "cliui": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^6.2.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "get-caller-file": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "require-main-filename": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
         "tslint": {
           "version": "5.20.1",
           "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz",
@@ -15293,6 +15464,52 @@
             "tslib": "^1.8.0",
             "tsutils": "^2.29.0"
           }
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+          "dev": true
+        },
+        "wrap-ansi": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "yargs": {
+          "version": "15.3.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
+          "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
+          "dev": true,
+          "requires": {
+            "cliui": "^6.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^4.1.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^4.2.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^18.1.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "18.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz",
+          "integrity": "sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
         }
       }
     },
@@ -19140,9 +19357,9 @@
       "dev": true
     },
     "xterm": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/xterm/-/xterm-4.4.0.tgz",
-      "integrity": "sha512-JGIpigWM3EBWvnS3rtBuefkiToIILSK1HYMXy4BCsUpO+O4UeeV+/U1AdAXgCB6qJrnPNb7yLgBsVCQUNMteig=="
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/xterm/-/xterm-4.5.0.tgz",
+      "integrity": "sha512-4t12tsvtYnv13FBJwewddxdI/j4kSonmbQQv50j34R/rPIFbUNGtptbprmuUlTDAKvHLMDZ/Np2XcpNimga/HQ=="
     },
     "xterm-addon-fit": {
       "version": "0.3.0",
diff --git a/package.json b/package.json
index f0bb97db88..dd48317e89 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "test-backend": "./build/bk-build.sh test",
     "update-webdriver": "webdriver-manager update",
     "build": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng build --prod",
-    "build-cf": "node --max_old_space_size=1128 --optimize_for_size --gc_interval=100 node_modules/@angular/cli/bin/ng build --prod --aot=false --build-optimizer=false",
+    "build-cf": "node --max_old_space_size=2692 --gc_interval=100 node_modules/@angular/cli/bin/ng build --prod",
     "build-dev": "ng build --dev",
     "prebuild-ui": "npm run customize && npm run build && gulp package-prebuild",
     "ng": "ng",
@@ -46,26 +46,26 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "@angular/animations": "^9.1.1",
-    "@angular/cdk": "^9.2.0",
-    "@angular/common": "^9.1.1",
-    "@angular/compiler": "^9.1.1",
-    "@angular/core": "^9.1.1",
+    "@angular/animations": "^9.1.2",
+    "@angular/cdk": "^9.2.1",
+    "@angular/common": "^9.1.2",
+    "@angular/compiler": "^9.1.2",
+    "@angular/core": "^9.1.2",
     "@angular/flex-layout": "^9.0.0-beta.29",
-    "@angular/forms": "^9.1.1",
-    "@angular/material": "^9.2.0",
-    "@angular/material-moment-adapter": "^9.2.0",
-    "@angular/platform-browser": "^9.1.1",
-    "@angular/platform-browser-dynamic": "^9.1.1",
-    "@angular/platform-server": "^9.1.1",
-    "@angular/router": "^9.1.1",
+    "@angular/forms": "^9.1.2",
+    "@angular/material": "^9.2.1",
+    "@angular/material-moment-adapter": "^9.2.1",
+    "@angular/platform-browser": "^9.1.2",
+    "@angular/platform-browser-dynamic": "^9.1.2",
+    "@angular/platform-server": "^9.1.2",
+    "@angular/router": "^9.1.2",
     "@ngrx/effects": "^9.1.0",
     "@ngrx/router-store": "^9.1.0",
     "@ngrx/store": "^9.1.0",
     "@ngrx/store-devtools": "^9.1.0",
-    "@swimlane/ngx-charts": "^13.0.2",
+    "@swimlane/ngx-charts": "^13.0.3",
     "@types/moment-timezone": "^0.5.13",
-    "@types/marked": "^0.7.3",
+    "@types/marked": "^0.7.4",
     "angular2-virtual-scroll": "^0.4.16",
     "core-js": "^3.6.5",
     "immer": "^6.0.3",
@@ -86,7 +86,7 @@
     "ts-md5": "^1.2.7",
     "tslib": "^1.10.0",
     "web-animations-js": "^2.3.2",
-    "xterm": "^4.4.0",
+    "xterm": "^4.5.0",
     "xterm-addon-fit": "^0.3.0",
     "zone.js": "~0.10.2"
   },
@@ -98,11 +98,11 @@
     "@angular-devkit/build-ng-packagr": "~0.901.1",
     "@angular-devkit/schematics": "^9.1.1",
     "@angular/cli": "^9.1.1",
-    "@angular/compiler-cli": "^9.1.1",
-    "@angular/language-service": "^9.1.1",
+    "@angular/compiler-cli": "^9.1.2",
+    "@angular/language-service": "^9.1.2",
     "@types/jasmine": "^3.5.10",
     "@types/jasminewd2": "~2.0.8",
-    "@types/karma": "^4.4.1",
+    "@types/karma": "^5.0.0",
     "@types/node": "^13.11.1",
     "@types/request": "^2.48.4",
     "acorn": "^7.1.1",
@@ -129,9 +129,9 @@
     "karma-spec-reporter": "0.0.32",
     "kind-of": "^6.0.3",
     "lodash": "^4.17.13",
-    "mem": "6.0.1",
+    "mem": "6.1.0",
     "mktemp": "^1.0.0",
-    "ng-packagr": "^9.0.0",
+    "ng-packagr": "^9.1.1",
     "npm-run-all": "^4.1.5",
     "protractor": "^5.4.3",
     "ps-node": "^0.1.6",

From 2191b38b14292ad0bbecbf875b90716e8185ae14 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 17 Apr 2020 11:46:36 +0100
Subject: [PATCH 027/176] Add minimum password length

---
 .../backup-endpoints/backup-endpoints.component.html  | 11 +++++++----
 .../backup-endpoints/backup-endpoints.component.ts    |  2 +-
 .../restore-endpoints.component.html                  |  5 +++++
 .../restore-endpoints/restore-endpoints.component.ts  |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html
index 5344aaa34a..7d237225f7 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html
@@ -26,15 +26,18 @@ <h1>Backup Endpoints</h1>
       <form [formGroup]="passwordForm" class="stepper-form">
         <mat-form-field>
           <mat-label>Password</mat-label>
-          <input matInput formControlName="password" required [type]="!show ? 'password' : 'text'">
+          <input matInput formControlName="password" name="password" required [type]="!show ? 'password' : 'text'">
           <button mat-icon-button matSuffix (click)="show = !show" [attr.aria-label]="'Hide password'"
             [attr.aria-pressed]="!show">
             <mat-icon>{{!show ? 'visibility_off' : 'visibility'}}</mat-icon>
           </button>
+          <mat-error *ngIf="passwordForm.controls.password.errors && passwordForm.controls.password.errors.required">
+            Password is required</mat-error>
+          <mat-error *ngIf="passwordForm.controls.password.errors && passwordForm.controls.password.errors.minlength">
+            Password must be at least {{passwordForm.controls.password.errors.minlength.requiredLength}} characters
+          </mat-error>
         </mat-form-field>
       </form>
     </div>
   </app-step>
-</app-steppers>
-
-<!-- // TODO: RC test - no tokens in db -->
\ No newline at end of file
+</app-steppers>
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
index 882d6113f8..b0a0c1cd9c 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
@@ -120,7 +120,7 @@ export class BackupEndpointsComponent implements OnInit {
 
   setupPasswordStep() {
     this.passwordForm = new FormGroup({
-      password: new FormControl('', [Validators.required]),
+      password: new FormControl('', [Validators.required, Validators.minLength(6)]),
     });
     this.passwordValid$ = this.passwordForm.statusChanges.pipe(
       map(() => {
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html
index c99ad6600f..722d3a5e87 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html
@@ -37,6 +37,11 @@ <h1>Restore Endpoints</h1>
             [attr.aria-pressed]="!show">
             <mat-icon>{{!show ? 'visibility_off' : 'visibility'}}</mat-icon>
           </button>
+          <mat-error *ngIf="passwordForm.controls.password.errors && passwordForm.controls.password.errors.required">
+            Password is required</mat-error>
+          <mat-error *ngIf="passwordForm.controls.password.errors && passwordForm.controls.password.errors.minlength">
+            Password must be at least {{passwordForm.controls.password.errors.minlength.requiredLength}} characters
+          </mat-error>
         </mat-form-field>
       </form>
     </div>
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
index 53fca1dcc1..88430d66e8 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
@@ -40,7 +40,7 @@ export class RestoreEndpointsComponent {
 
   setupPasswordStep() {
     this.passwordForm = new FormGroup({
-      password: new FormControl('', [Validators.required]),
+      password: new FormControl('', [Validators.required, Validators.minLength(6)]),
     });
     this.passwordValid$ = this.passwordForm.statusChanges.pipe(
       map(() => {

From 19fd37a2cd7f2a6c41f2e071493245b5dbfcff4b Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 17 Apr 2020 11:47:24 +0100
Subject: [PATCH 028/176] First pass encrypt/decrypt

---
 src/jetstream/cnsi.go              |   2 +
 src/jetstream/cnsi_token_backup.go | 122 +++++++++++++++++++++--------
 2 files changed, 92 insertions(+), 32 deletions(-)

diff --git a/src/jetstream/cnsi.go b/src/jetstream/cnsi.go
index f5c6c501a3..afaaebf9cf 100644
--- a/src/jetstream/cnsi.go
+++ b/src/jetstream/cnsi.go
@@ -641,6 +641,7 @@ func (p *portalProxy) backupEndpoints(c echo.Context) error {
 
 	ctb := &cnsiTokenBackup{
 		databaseConnectionPool: p.DatabaseConnectionPool,
+		encryptionKey:          p.Config.EncryptionKeyInBytes,
 		p:                      p,
 	}
 
@@ -652,6 +653,7 @@ func (p *portalProxy) restoreEndpoints(c echo.Context) error {
 
 	ctb := &cnsiTokenBackup{
 		databaseConnectionPool: p.DatabaseConnectionPool,
+		encryptionKey:          p.Config.EncryptionKeyInBytes,
 		p:                      p,
 	}
 
diff --git a/src/jetstream/cnsi_token_backup.go b/src/jetstream/cnsi_token_backup.go
index b3d25e6543..8eca908ec0 100644
--- a/src/jetstream/cnsi_token_backup.go
+++ b/src/jetstream/cnsi_token_backup.go
@@ -1,9 +1,9 @@
 package main
 
 import (
+	"crypto/md5"
 	"database/sql"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -18,6 +18,7 @@ import (
 
 type cnsiTokenBackup struct {
 	databaseConnectionPool *sql.DB
+	encryptionKey          []byte
 	p                      *portalProxy
 }
 
@@ -58,7 +59,7 @@ type BackupContent struct {
 
 // RestoreRequest - Request from client to restore content from payload
 type RestoreRequest struct {
-	// Data - Content of backup file. This should be of type BackupContent (//TODO: RC test as BackupContent)
+	// Data - Content of backup file. This should be of type BackupContent
 	Data            string `json:"data"`
 	Password        string `json:"password"`
 	IgnoreDbVersion bool   `json:"ignoreDbVersion"`
@@ -70,12 +71,12 @@ func (ctb *cnsiTokenBackup) BackupEndpoints(c echo.Context) error {
 	// Check we can unmarshall the request
 	body, err := ioutil.ReadAll(c.Request().Body)
 	if err != nil {
-		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body")
+		return interfaces.NewHTTPShadowError(http.StatusBadRequest, "Invalid request body", "Invalid request body: %+v", err)
 	}
 
 	data := &BackupRequest{}
 	if err = json.Unmarshal(body, data); err != nil {
-		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body - could not parse JSON")
+		return interfaces.NewHTTPShadowError(http.StatusBadRequest, "Invalid request body - could not parse JSON", "Invalid request body - could not parse JSON: %+v", err)
 	}
 
 	if data.State == nil || len(data.State) == 0 {
@@ -92,7 +93,7 @@ func (ctb *cnsiTokenBackup) BackupEndpoints(c echo.Context) error {
 	// Send back the response to the client
 	jsonString, err := json.Marshal(response)
 	if err != nil {
-		return interfaces.NewHTTPError(http.StatusInternalServerError, "Failed to serialize response")
+		return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to serialize response", "Failed to serialize response: %+v", err)
 	}
 
 	log.Infof("jsonString: %+v", jsonString) // TODO: RC REMOVE
@@ -107,7 +108,7 @@ func (ctb *cnsiTokenBackup) createBackup(data *BackupRequest) (*BackupContent, e
 	log.Debug("createBackup")
 	allEndpoints, err := ctb.p.ListEndpoints()
 	if err != nil {
-		return nil, interfaces.NewHTTPError(http.StatusBadGateway, "Failed to fetch endpoints")
+		return nil, interfaces.NewHTTPShadowError(http.StatusBadGateway, "Failed to fetch endpoints", "Failed to fetch endpoints: %+v", err)
 	}
 
 	// Fetch/Format required data
@@ -157,32 +158,30 @@ func (ctb *cnsiTokenBackup) createBackup(data *BackupRequest) (*BackupContent, e
 		}
 	}
 
-	log.Infof("endpoints: %+v", endpoints) // TODO: RC REMOVE
-	log.Infof("tokens: %+v", tokens)       // TODO: RC REMOVE
-
 	payload := &BackupContentPayload{
 		Endpoints: endpoints,
 		Tokens:    tokens,
 	}
 
-	// Encrypt data (see above) // TODO: RC leave until last
-
-	bPayload, _ := json.Marshal(payload)
-	encryptedPayload, err := crypto.EncryptToken(encryptionKey, fmt.Sprintf("%+v", bPayload)) //TODO: RC error handling
+	// Encrypt the entire payload
+	encryptedPayload, err := encryptPayload(payload, data.Password, ctb.encryptionKey)
+	if err != nil {
+		return nil, interfaces.NewHTTPShadowError(http.StatusBadGateway, "Could not encrypt payload", "Could not encrypt payload: %+v", err)
+	}
 
 	versions, err := ctb.p.getVersionsData()
 	if err != nil {
-		return nil, errors.New("Could not find database version")
+		return nil, interfaces.NewHTTPShadowError(http.StatusBadGateway, "Could not find database version", "Could not find database version: %+v", err)
 	}
 
-	// log.Infof("payload: %+v", payload)
+	// log.Infof("payload: %+v", payload) // TODO: RC REMOVE
 
 	response := &BackupContent{
 		Payload:   encryptedPayload,
 		DBVersion: versions.DatabaseVersion,
 	}
 
-	// log.Infof("response: %+v", response)
+	// log.Infof("response: %+v", response) // TODO: RC REMOVE
 
 	return response, nil
 }
@@ -194,7 +193,7 @@ func (ctb *cnsiTokenBackup) getCNSITokenRecordsBackup(endpointID string) ([]inte
 		return make([]interfaces.BackupTokenRecord, 0), false
 	}
 
-	trs, err := tokenRepo.FindAllCNSITokenBackup(endpointID, ctb.p.Config.EncryptionKeyInBytes)
+	trs, err := tokenRepo.FindAllCNSITokenBackup(endpointID, ctb.encryptionKey)
 	if err != nil {
 		return make([]interfaces.BackupTokenRecord, 0), false
 	}
@@ -208,12 +207,12 @@ func (ctb *cnsiTokenBackup) RestoreEndpoints(c echo.Context) error {
 	// Check we can unmarshall the request
 	body, err := ioutil.ReadAll(c.Request().Body)
 	if err != nil {
-		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body")
+		return interfaces.NewHTTPShadowError(http.StatusBadRequest, "Invalid request body", "Invalid request body: %+v", err)
 	}
 
 	data := &RestoreRequest{}
 	if err = json.Unmarshal(body, data); err != nil {
-		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body - could not parse JSON")
+		return interfaces.NewHTTPShadowError(http.StatusBadRequest, "Invalid request body - could not parse JSON", "Invalid request body - could not parse JSON: %+v", err)
 	}
 
 	err = ctb.restoreBackup(data)
@@ -224,41 +223,40 @@ func (ctb *cnsiTokenBackup) RestoreEndpoints(c echo.Context) error {
 	// log.Warnf("BACKUP DATA: %+v", backup) // TODO: RC REMOVE
 	c.Response().WriteHeader(http.StatusOK)
 	return nil
-
 }
 
 func (ctb *cnsiTokenBackup) restoreBackup(backup *RestoreRequest) error {
 	log.Debug("restoreBackup")
 
-	// TODO: RC Q all errors are NewHTTPError
-
 	data := &BackupContent{}
 	if err := json.Unmarshal([]byte(backup.Data), data); err != nil {
-		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid backup - could not parse JSON")
+		return interfaces.NewHTTPShadowError(http.StatusBadRequest, "Invalid backup - could not parse JSON", "Invalid backup - could not parse JSON: %+v", err)
 	}
 
+	// Check that the db version of backup file matches the stratos db version
 	if backup.IgnoreDbVersion == false {
 		versions, err := ctb.p.getVersionsData()
 		if err != nil {
-			return errors.New("Could not find database version")
+			return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Could not find database version", "Could not find database version: %+v", err)
 		}
 
 		if versions.DatabaseVersion != data.DBVersion {
 			errorStr := fmt.Sprintf("Incompatible database versions. Expected %+v but got %+v", versions.DatabaseVersion, data.DBVersion)
-			return interfaces.NewHTTPShadowError(http.StatusBadRequest, errorStr, errorStr)
+			return interfaces.NewHTTPError(http.StatusBadRequest, errorStr)
 		}
 	}
 
-	unencryptedBackup, err := crypto.DecryptToken(encryptionKey, data.Payload) //TODO: RC error handling, comments
+	// Get the actual, unencrypted set of endpoints and tokens
+	payloadString, err := decryptPayload(data.Payload, backup.Password, ctb.encryptionKey)
 	if err != nil {
 		return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to decrypt payload", "Failed to decrypt payload: %+v", err)
 	}
-
 	payload := &BackupContentPayload{}
-	if err = json.Unmarshal([]byte(unencryptedBackup), payload); err != nil {
-		return interfaces.NewHTTPError(http.StatusBadRequest, "Could not parse payload")
+	if err = json.Unmarshal([]byte(*payloadString), payload); err != nil {
+		return interfaces.NewHTTPShadowError(http.StatusBadRequest, "Failed to parse payload. This could be due to an incorrect password", "Failed to decrypt payload, possible incorrect password: %+v", err)
 	}
 
+	// Insert/Update the endpoints and tokens
 	cnsiRepo, err := cnsis.NewPostgresCNSIRepository(ctb.databaseConnectionPool)
 	if err != nil {
 		return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to connect to db", "Failed to connect to db: %+v", err)
@@ -266,7 +264,7 @@ func (ctb *cnsiTokenBackup) restoreBackup(backup *RestoreRequest) error {
 
 	for _, endpoint := range payload.Endpoints {
 		e := deSerializeEndpoint(endpoint)
-		if err := cnsiRepo.Overwrite(e, ctb.p.Config.EncryptionKeyInBytes); err != nil {
+		if err := cnsiRepo.Overwrite(e, ctb.encryptionKey); err != nil {
 			return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to overwrite endpoints", "Failed to overwrite endpoint: %+v", e.Name)
 		}
 	}
@@ -277,7 +275,7 @@ func (ctb *cnsiTokenBackup) restoreBackup(backup *RestoreRequest) error {
 	}
 
 	for _, tr := range payload.Tokens {
-		if err := tokenRepo.SaveCNSIToken(tr.EndpointGUID, tr.UserGUID, tr.TokenRecord, ctb.p.Config.EncryptionKeyInBytes); err != nil {
+		if err := tokenRepo.SaveCNSIToken(tr.EndpointGUID, tr.UserGUID, tr.TokenRecord, ctb.encryptionKey); err != nil {
 			return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to overwrite token", "Failed to overwrite token: %+v", tr.TokenRecord.TokenGUID)
 		}
 	}
@@ -312,6 +310,66 @@ func deSerializeEndpoint(endpoint map[string]interface{}) interfaces.CNSIRecord
 
 	// manually add the client secret
 	a.ClientSecret = fmt.Sprintf("%v", endpoint["client_secret"])
-	log.Errorf("CLIENT SECRET: %+v", a.ClientSecret) // TODO: RC REMOVE
+	// log.Errorf("CLIENT SECRET: %+v", a.ClientSecret) // TODO: RC REMOVE
 	return a
 }
+
+func encryptPayload(payload *BackupContentPayload, password string, encryptionKey []byte) ([]byte, error) {
+	// First ensure the password is an ok length
+	secret, err := createHash(password, encryptionKey)
+	if err != nil {
+		log.Warningf("Could not create hash: %+v", err)
+		return nil, fmt.Errorf("Could not create hash")
+	}
+
+	// log.Errorf("password: %+v", password) // TODO: RC REMOVE
+	// log.Errorf("secret: %+v", secret)     // TODO: RC REMOVE
+	// log.Errorf("payload: %+v", payload)   // TODO: RC REMOVE
+	// Create the text that will be encrypted
+	payloadBytes, err := json.Marshal(payload)
+	// log.Errorf("payloadBytes: %+v", string(payloadBytes)) // TODO: RC REMOVE
+	if err != nil {
+		return nil, fmt.Errorf("Could not marshal payload: %+v", err)
+	}
+
+	// Encrypt
+	payloadEncrypted, err := crypto.EncryptToken(secret, string(payloadBytes))
+	// log.Errorf("payloadEncrypted: %+v", string(payloadEncrypted)) // TODO: RC REMOVE
+	if err != nil {
+		return nil, fmt.Errorf("Could not encrypt payload: %+v", err)
+	}
+
+	return payloadEncrypted, nil
+}
+
+func decryptPayload(payloadEncrypted []byte, password string, encryptionKey []byte) (*string, error) {
+	// First ensure the password is an ok length
+	secret, err := createHash(password, encryptionKey)
+	if err != nil {
+		log.Warningf("Could not create hash: %+v", err)
+		return nil, fmt.Errorf("Could not create hash")
+	}
+
+	// log.Errorf("password: %+v", password)                 // TODO: RC REMOVE
+	// log.Errorf("secret: %+v", secret)                     // TODO: RC REMOVE
+	// log.Errorf("payloadEncrypted: %+v", payloadEncrypted) // TODO: RC REMOVE
+	payloadUnencrypted, err := crypto.DecryptToken(secret, payloadEncrypted)
+	if err != nil {
+		return nil, fmt.Errorf("Failed to decrypt payload: %+v", err)
+	}
+	// log.Errorf("payloadUnencrypted: %+v", string(payloadUnencrypted)) // TODO: RC REMOVE
+
+	return &payloadUnencrypted, nil
+}
+
+// createHash - Ensure the token used by crypto is at an acceptable length
+func createHash(password string, salt []byte) ([]byte, error) {
+	hasher := md5.New()
+	if _, err := hasher.Write([]byte(password)); err != nil {
+		return nil, fmt.Errorf("Failed to write password to hash")
+	}
+	if _, err := hasher.Write(salt); err != nil {
+		return nil, fmt.Errorf("Failed to write salt to hash")
+	}
+	return hasher.Sum(nil), nil
+}

From 5de414d55581b539faf2e2d08a8af28d582a077e Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 17 Apr 2020 14:02:45 +0100
Subject: [PATCH 029/176] Tidy up

---
 .../backup-endpoints.component.html           |  2 +-
 .../backup-endpoints.component.ts             |  7 ++--
 .../restore-endpoints.component.ts            |  5 ++-
 src/jetstream/cnsi_token_backup.go            | 34 ++++---------------
 src/jetstream/main.go                         |  1 -
 .../repository/tokens/pgsql_tokens.go         |  1 -
 6 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html
index 7d237225f7..bfbec70bda 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.html
@@ -22,7 +22,7 @@ <h1>Backup Endpoints</h1>
   </app-step>
   <app-step title="Password" finishButtonText="Download" [onNext]="onNext" [valid]="passwordValid$ | async">
     <div class="password-step">
-      <p>Protect the backup by providing as password. You will need this password when restoring from this backup</p>
+      <p>Protect the backup by providing a password. You will need this password when restoring from this backup</p>
       <form [formGroup]="passwordForm" class="stepper-form">
         <mat-form-field>
           <mat-label>Password</mat-label>
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
index b0a0c1cd9c..6a64e5d9f1 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
@@ -3,7 +3,7 @@ import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { Store } from '@ngrx/store';
 import * as moment from 'moment';
 import { Observable, of, Subject } from 'rxjs';
-import { filter, first, map, tap } from 'rxjs/operators';
+import { filter, first, map } from 'rxjs/operators';
 
 import { GetAllEndpoints } from '../../../../../../store/src/actions/endpoint.actions';
 import { AppState } from '../../../../../../store/src/app-state';
@@ -136,7 +136,7 @@ export class BackupEndpointsComponent implements OnInit {
   onNext: StepOnNextFunction = () => {
     const confirmation = new ConfirmationDialogConfig(
       'Backup',
-      'This backup contains endpoint connection details. The contents will be encrypted, but please still ensure the safety of the file',
+      'The backup that is about to be created may contain credentials, tokens and other sensitive information. Although it is encrypted, you should take the appropriate steps to secure it. ',
       'Continue',
       true
     );
@@ -180,8 +180,7 @@ export class BackupEndpointsComponent implements OnInit {
       createBackup();
     }
 
-    // TODO: RC Remove console.log
-    return result.asObservable().pipe(tap(console.log));
+    return result.asObservable();
   }
 
 
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
index 88430d66e8..64b2e5e592 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
@@ -3,7 +3,7 @@ import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { MatCheckboxChange } from '@angular/material';
 import { Store } from '@ngrx/store';
 import { Observable, of, Subject } from 'rxjs';
-import { first, map, tap } from 'rxjs/operators';
+import { first, map } from 'rxjs/operators';
 
 import { GetAllEndpoints } from '../../../../../../store/src/actions/endpoint.actions';
 import { GeneralEntityAppState } from '../../../../../../store/src/app-state';
@@ -99,8 +99,7 @@ export class RestoreEndpointsComponent {
 
     this.confirmDialog.openWithCancel(confirmation, createBackup, userCancelledDialog);
 
-    // TODO: RC Remove console.log
-    return result.asObservable().pipe(tap(console.log));
+    return result.asObservable();
   }
 
 }
diff --git a/src/jetstream/cnsi_token_backup.go b/src/jetstream/cnsi_token_backup.go
index 8eca908ec0..3f4c4f77b9 100644
--- a/src/jetstream/cnsi_token_backup.go
+++ b/src/jetstream/cnsi_token_backup.go
@@ -68,7 +68,7 @@ type RestoreRequest struct {
 func (ctb *cnsiTokenBackup) BackupEndpoints(c echo.Context) error {
 	log.Debug("BackupEndpoints")
 
-	// Check we can unmarshall the request
+	// Create the backup request struct from the body
 	body, err := ioutil.ReadAll(c.Request().Body)
 	if err != nil {
 		return interfaces.NewHTTPShadowError(http.StatusBadRequest, "Invalid request body", "Invalid request body: %+v", err)
@@ -83,22 +83,18 @@ func (ctb *cnsiTokenBackup) BackupEndpoints(c echo.Context) error {
 		return interfaces.NewHTTPError(http.StatusBadRequest, "Invalid request body - no endpoints to backup")
 	}
 
+	// Create backup
 	response, err := ctb.createBackup(data)
 	if err != nil {
 		return err
 	}
 
-	log.Infof("response: %+v", response) // TODO: RC REMOVE
-
-	// Send back the response to the client
+	// Send the response back to the client
 	jsonString, err := json.Marshal(response)
 	if err != nil {
 		return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to serialize response", "Failed to serialize response: %+v", err)
 	}
 
-	log.Infof("jsonString: %+v", jsonString) // TODO: RC REMOVE
-
-	// Return data
 	c.Response().Header().Set("Content-Type", "application/json")
 	c.Response().Write(jsonString)
 	return nil
@@ -131,25 +127,20 @@ func (ctb *cnsiTokenBackup) createBackup(data *BackupRequest) (*BackupContent, e
 		switch connectionType := endpoint.Connect; connectionType {
 		case BACKUP_CONNECTION_ALL:
 			if tokenRecords, ok := ctb.getCNSITokenRecordsBackup(endpointID); ok {
-				log.Warn("tokens for AllConnect") // TODO: RC REMOVE
 				tokens = append(tokens, tokenRecords...)
 			} else {
 				text := fmt.Sprintf("Failed to fetch tokens for endpoint %+v", endpointID)
 				return nil, interfaces.NewHTTPError(http.StatusBadGateway, text)
 			}
 		case BACKUP_CONNECTION_CURRENT:
-			// userTokenFrom = append(userTokenFrom, endpointID)
 			if tokenRecord, ok := ctb.p.GetCNSITokenRecordWithDisconnected(endpointID, data.UserID); ok {
 				log.Warn("tokens for Connect")
-				// TODO: RC Q This will be the linked token as if it were the users token
 				var btr = interfaces.BackupTokenRecord{
-					// tokenRecord: tokenRecord,
 					TokenRecord:  tokenRecord,
 					EndpointGUID: endpointID,
 					TokenType:    "CNSI",
 					UserGUID:     data.UserID,
 				}
-
 				tokens = append(tokens, btr)
 			} else {
 				text := fmt.Sprintf("Request to back up connected user's (%+v) token for endpoint (%+v) failed.", endpointID, data.UserID)
@@ -158,6 +149,7 @@ func (ctb *cnsiTokenBackup) createBackup(data *BackupRequest) (*BackupContent, e
 		}
 	}
 
+	// Create the payload, this will be encrypted
 	payload := &BackupContentPayload{
 		Endpoints: endpoints,
 		Tokens:    tokens,
@@ -169,20 +161,17 @@ func (ctb *cnsiTokenBackup) createBackup(data *BackupRequest) (*BackupContent, e
 		return nil, interfaces.NewHTTPShadowError(http.StatusBadGateway, "Could not encrypt payload", "Could not encrypt payload: %+v", err)
 	}
 
+	// Add the db version to the response, this will allow client side up front validation
 	versions, err := ctb.p.getVersionsData()
 	if err != nil {
 		return nil, interfaces.NewHTTPShadowError(http.StatusBadGateway, "Could not find database version", "Could not find database version: %+v", err)
 	}
 
-	// log.Infof("payload: %+v", payload) // TODO: RC REMOVE
-
 	response := &BackupContent{
 		Payload:   encryptedPayload,
 		DBVersion: versions.DatabaseVersion,
 	}
 
-	// log.Infof("response: %+v", response) // TODO: RC REMOVE
-
 	return response, nil
 }
 
@@ -204,7 +193,7 @@ func (ctb *cnsiTokenBackup) getCNSITokenRecordsBackup(endpointID string) ([]inte
 func (ctb *cnsiTokenBackup) RestoreEndpoints(c echo.Context) error {
 	log.Debug("RestoreEndpoints")
 
-	// Check we can unmarshall the request
+	// Create the restore request struct from the body
 	body, err := ioutil.ReadAll(c.Request().Body)
 	if err != nil {
 		return interfaces.NewHTTPShadowError(http.StatusBadRequest, "Invalid request body", "Invalid request body: %+v", err)
@@ -220,7 +209,6 @@ func (ctb *cnsiTokenBackup) RestoreEndpoints(c echo.Context) error {
 		return err
 	}
 
-	// log.Warnf("BACKUP DATA: %+v", backup) // TODO: RC REMOVE
 	c.Response().WriteHeader(http.StatusOK)
 	return nil
 }
@@ -310,7 +298,6 @@ func deSerializeEndpoint(endpoint map[string]interface{}) interfaces.CNSIRecord
 
 	// manually add the client secret
 	a.ClientSecret = fmt.Sprintf("%v", endpoint["client_secret"])
-	// log.Errorf("CLIENT SECRET: %+v", a.ClientSecret) // TODO: RC REMOVE
 	return a
 }
 
@@ -322,19 +309,14 @@ func encryptPayload(payload *BackupContentPayload, password string, encryptionKe
 		return nil, fmt.Errorf("Could not create hash")
 	}
 
-	// log.Errorf("password: %+v", password) // TODO: RC REMOVE
-	// log.Errorf("secret: %+v", secret)     // TODO: RC REMOVE
-	// log.Errorf("payload: %+v", payload)   // TODO: RC REMOVE
 	// Create the text that will be encrypted
 	payloadBytes, err := json.Marshal(payload)
-	// log.Errorf("payloadBytes: %+v", string(payloadBytes)) // TODO: RC REMOVE
 	if err != nil {
 		return nil, fmt.Errorf("Could not marshal payload: %+v", err)
 	}
 
 	// Encrypt
 	payloadEncrypted, err := crypto.EncryptToken(secret, string(payloadBytes))
-	// log.Errorf("payloadEncrypted: %+v", string(payloadEncrypted)) // TODO: RC REMOVE
 	if err != nil {
 		return nil, fmt.Errorf("Could not encrypt payload: %+v", err)
 	}
@@ -350,14 +332,10 @@ func decryptPayload(payloadEncrypted []byte, password string, encryptionKey []by
 		return nil, fmt.Errorf("Could not create hash")
 	}
 
-	// log.Errorf("password: %+v", password)                 // TODO: RC REMOVE
-	// log.Errorf("secret: %+v", secret)                     // TODO: RC REMOVE
-	// log.Errorf("payloadEncrypted: %+v", payloadEncrypted) // TODO: RC REMOVE
 	payloadUnencrypted, err := crypto.DecryptToken(secret, payloadEncrypted)
 	if err != nil {
 		return nil, fmt.Errorf("Failed to decrypt payload: %+v", err)
 	}
-	// log.Errorf("payloadUnencrypted: %+v", string(payloadUnencrypted)) // TODO: RC REMOVE
 
 	return &payloadUnencrypted, nil
 }
diff --git a/src/jetstream/main.go b/src/jetstream/main.go
index ea8da57516..53c3045e2b 100644
--- a/src/jetstream/main.go
+++ b/src/jetstream/main.go
@@ -973,7 +973,6 @@ func (p *portalProxy) registerRoutes(e *echo.Echo, needSetupMiddleware bool) {
 	// Apply edits for the given endpoint
 	adminGroup.POST("/endpoint/:id", p.updateEndpoint)
 
-	// TODO: RC Q better as `/backup` & `/restore`?
 	adminGroup.POST("/endpoints/backup", p.backupEndpoints)
 	adminGroup.POST("/endpoints/restore", p.restoreEndpoints)
 
diff --git a/src/jetstream/repository/tokens/pgsql_tokens.go b/src/jetstream/repository/tokens/pgsql_tokens.go
index 427541747c..32c779e355 100644
--- a/src/jetstream/repository/tokens/pgsql_tokens.go
+++ b/src/jetstream/repository/tokens/pgsql_tokens.go
@@ -348,7 +348,6 @@ func (p *PgsqlTokenRepository) FindAllCNSITokenBackup(cnsiGUID string, encryptio
 		return make([]interfaces.BackupTokenRecord, 0), fmt.Errorf(msg, err)
 	}
 
-	// TODO: RC Q should this close come before returning? it doesn't in cnsi List(encryptionKey []byte) ([]*interfaces.CNSIRecord, error) {
 	defer rows.Close()
 
 	btrs := make([]interfaces.BackupTokenRecord, 0)

From 68ef3c350dca9f7dd0db989168baeadb64a223b4 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 20 Apr 2020 13:48:09 +0100
Subject: [PATCH 030/176] Fix unit tests

---
 .../backup-connection-cell.component.spec.ts  | 22 +++++++++++++++--
 .../backup-endpoints.service.ts               |  2 +-
 .../backup-endpoints.component.spec.ts        | 14 +++++++++--
 .../backup-restore-cell.component.spec.ts     | 24 +++++++++++++++++--
 ...backup-restore-endpoints.component.spec.ts | 14 +++++++++--
 .../restore-endpoints.service.ts              |  3 ++-
 .../restore-endpoints.component.spec.ts       | 14 +++++++++--
 7 files changed, 81 insertions(+), 12 deletions(-)

diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.spec.ts
index 9f1d8760e4..09028f8d35 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.spec.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.spec.ts
@@ -1,5 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { EndpointModel } from '../../../../../../store/src/types/endpoint.types';
+import { BaseTestModulesNoShared } from '../../../../../test-framework/core-test.helper';
+import { BackupEndpointsService } from '../backup-endpoints.service';
 import { BackupConnectionCellComponent } from './backup-connection-cell.component';
 
 describe('BackupConnectionCellComponent', () => {
@@ -8,14 +11,29 @@ describe('BackupConnectionCellComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ BackupConnectionCellComponent ]
+      declarations: [
+        BackupConnectionCellComponent,
+      ],
+      imports: [
+        ...BaseTestModulesNoShared
+      ],
+      providers: [
+        BackupEndpointsService
+      ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(BackupConnectionCellComponent);
     component = fixture.componentInstance;
+    component.row = {
+      guid: 'test',
+      cnsi_type: 'metrics',
+    } as EndpointModel;
+    component.service.initialize([{
+      guid: 'test'
+    } as EndpointModel]);
     fixture.detectChanges();
   });
 
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
index faffbeeef1..adff809338 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
@@ -84,7 +84,7 @@ export class BackupEndpointsService {
     }
 
     // All other settings require endpoint to be backed up
-    if (!this.state[endpoint.guid][BackupEndpointTypes.ENDPOINT]) {
+    if (!this.state[endpoint.guid] || !this.state[endpoint.guid][BackupEndpointTypes.ENDPOINT]) {
       return false;
     }
 
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.spec.ts
index 16cf213f81..3ccb5308ed 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.spec.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.spec.ts
@@ -1,5 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { TabNavService } from '../../../../../tab-nav.service';
+import { BaseTestModulesNoShared } from '../../../../../test-framework/core-test.helper';
+import { SharedModule } from '../../../../shared/shared.module';
 import { BackupEndpointsComponent } from './backup-endpoints.component';
 
 describe('BackupEndpointsComponent', () => {
@@ -8,9 +11,16 @@ describe('BackupEndpointsComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ BackupEndpointsComponent ]
+      declarations: [BackupEndpointsComponent],
+      imports: [
+        ...BaseTestModulesNoShared,
+        SharedModule
+      ],
+      providers: [
+        TabNavService
+      ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.spec.ts
index 1809ff8d89..4a8ded6022 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.spec.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.spec.ts
@@ -1,5 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { EndpointModel } from '../../../../../../store/src/types/endpoint.types';
+import { BaseTestModulesNoShared } from '../../../../../test-framework/core-test.helper';
+import { BackupEndpointsService } from '../backup-endpoints.service';
+import { BackupEndpointTypes } from '../backup-restore.types';
 import { BackupRestoreCellComponent } from './backup-restore-cell.component';
 
 describe('BackupRestoreCellComponent', () => {
@@ -8,14 +12,30 @@ describe('BackupRestoreCellComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ BackupRestoreCellComponent ]
+      declarations: [BackupRestoreCellComponent],
+      imports: [
+        ...BaseTestModulesNoShared
+      ],
+      providers: [
+        BackupEndpointsService
+      ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(BackupRestoreCellComponent);
     component = fixture.componentInstance;
+    component.config = {
+      type: BackupEndpointTypes.ENDPOINT
+    };
+    component.row = {
+      guid: 'test',
+      cnsi_type: 'metrics',
+    } as EndpointModel;
+    component.service.initialize([{
+      guid: 'test'
+    } as EndpointModel]);
     fixture.detectChanges();
   });
 
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.spec.ts
index 587eefc846..528a5ee7a9 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.spec.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.spec.ts
@@ -1,5 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { TabNavService } from '../../../../../tab-nav.service';
+import { BaseTestModulesNoShared } from '../../../../../test-framework/core-test.helper';
+import { SharedModule } from '../../../../shared/shared.module';
 import { BackupRestoreEndpointsComponent } from './backup-restore-endpoints.component';
 
 describe('BackupRestoreEndpointsComponent', () => {
@@ -8,9 +11,16 @@ describe('BackupRestoreEndpointsComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ BackupRestoreEndpointsComponent ]
+      declarations: [BackupRestoreEndpointsComponent],
+      imports: [
+        ...BaseTestModulesNoShared,
+        SharedModule
+      ],
+      providers: [
+        TabNavService
+      ],
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts
index 50d678f33d..074111bbac 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts
@@ -2,7 +2,7 @@ import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
+import { filter, map, switchMap } from 'rxjs/operators';
 
 import { GeneralEntityAppState } from '../../../../../store/src/app-state';
 import { selectSessionData } from '../../../../../store/src/reducers/auth.reducer';
@@ -53,6 +53,7 @@ export class RestoreEndpointsService {
 
   private setupStep1() {
     this.currentDbVersion$ = this.store.select(selectSessionData()).pipe(
+      filter(sd => !!sd),
       map((sd: SessionData) => sd.version.database_version)
     );
 
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.spec.ts
index b260285638..ff141f7953 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.spec.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.spec.ts
@@ -1,5 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { TabNavService } from '../../../../../tab-nav.service';
+import { BaseTestModulesNoShared } from '../../../../../test-framework/core-test.helper';
+import { SharedModule } from '../../../../shared/shared.module';
 import { RestoreEndpointsComponent } from './restore-endpoints.component';
 
 describe('RestoreEndpointsComponent', () => {
@@ -8,9 +11,16 @@ describe('RestoreEndpointsComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ RestoreEndpointsComponent ]
+      declarations: [RestoreEndpointsComponent],
+      imports: [
+        ...BaseTestModulesNoShared,
+        SharedModule
+      ],
+      providers: [
+        TabNavService
+      ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {

From 5736f8477ef0a561d9424b17a7ee8654b4584aed Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 20 Apr 2020 13:49:37 +0100
Subject: [PATCH 031/176] Re-add tests that now work

---
 .../autoscaler-metric-page.component.spec.ts         | 10 ++--------
 .../autoscaler-scale-history-page.component.spec.ts  |  9 ++-------
 .../application-instance-chart.component.spec.ts     |  3 +--
 .../tabs/metrics-tab/metrics-tab.component.spec.ts   |  3 +--
 .../cloud-foundry-cell-apps.component.spec.ts        |  7 ++-----
 .../cloud-foundry-cell-base.component.spec.ts        | 11 +++++------
 .../cloud-foundry-cell-charts.component.spec.ts      |  7 ++-----
 .../cloud-foundry-cell-summary.component.spec.ts     |  9 +++------
 .../connect-endpoint-dialog.component.spec.ts        |  9 +++++----
 .../connect-endpoint.component.spec.ts               |  5 ++---
 .../create-endpoint-cf-step-1.component.spec.ts      |  5 ++---
 .../create-endpoint.component.spec.ts                | 12 +++++++-----
 .../metrics/metrics/metrics.component.spec.ts        |  5 ++---
 .../metrics-chart/metrics-chart.component.spec.ts    |  4 ++--
 14 files changed, 38 insertions(+), 61 deletions(-)

diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts
index 0c897ce7f2..e59ab50816 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts
@@ -2,18 +2,17 @@ import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createEmptyStoreModule } from '@stratos/store/testing';
 
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../core/tab-nav.service';
 import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper';
-import { createEmptyStoreModule } from '@stratos/store/testing';
 import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module';
 import { AutoscalerMetricPageComponent } from './autoscaler-metric-page.component';
 
-// TODO: Fix after metrics has been sorted - STRAT-152
-xdescribe('AutoscalerMetricPageComponent', () => {
+describe('AutoscalerMetricPageComponent', () => {
   let component: AutoscalerMetricPageComponent;
   let fixture: ComponentFixture<AutoscalerMetricPageComponent>;
 
@@ -47,10 +46,5 @@ xdescribe('AutoscalerMetricPageComponent', () => {
     expect(component).toBeTruthy();
   });
 
-  // TODO: Fix after metrics has been sorted - STRAT-152 (cause of `Cannot read property 'getEntityMonitor' of undefined` test failure)
-  it('Blocked', () => {
-    fail('Blocked: Requires metrics to be working (specifically metrics entities)');
-  });
-
   afterAll(() => { });
 });
diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-scale-history-page/autoscaler-scale-history-page.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-scale-history-page/autoscaler-scale-history-page.component.spec.ts
index 55eead24ce..043a399200 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-scale-history-page/autoscaler-scale-history-page.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-scale-history-page/autoscaler-scale-history-page.component.spec.ts
@@ -2,18 +2,17 @@ import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createEmptyStoreModule } from '@stratos/store/testing';
 
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../core/tab-nav.service';
 import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper';
-import { createEmptyStoreModule } from '@stratos/store/testing';
 import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module';
 import { AutoscalerScaleHistoryPageComponent } from './autoscaler-scale-history-page.component';
 
-// TODO: Fix after metrics has been sorted - STRAT-152
-xdescribe('AutoscalerScaleHistoryPageComponent', () => {
+describe('AutoscalerScaleHistoryPageComponent', () => {
   let component: AutoscalerScaleHistoryPageComponent;
   let fixture: ComponentFixture<AutoscalerScaleHistoryPageComponent>;
 
@@ -47,9 +46,5 @@ xdescribe('AutoscalerScaleHistoryPageComponent', () => {
     expect(component).toBeTruthy();
   });
 
-  // TODO: Fix after metrics has been sorted - STRAT-152 (cause of `Cannot read property 'getEntityMonitor' of undefined` test failure)
-  it('Blocked', () => {
-    fail('Blocked: Requires metrics to be working (specifically metrics entities)');
-  });
 
 });
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.spec.ts
index 4680ae8b5c..ebdde598a6 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.spec.ts
@@ -7,8 +7,7 @@ import { SharedModule } from '../../../../../../core/src/shared/shared.module';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ApplicationInstanceChartComponent } from './application-instance-chart.component';
 
-// TODO: Fix after metrics has been sorted - STRAT-152
-xdescribe('ApplicationInstanceChartComponent', () => {
+describe('ApplicationInstanceChartComponent', () => {
   let component: ApplicationInstanceChartComponent;
   let fixture: ComponentFixture<ApplicationInstanceChartComponent>;
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/metrics-tab/metrics-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/metrics-tab/metrics-tab.component.spec.ts
index bb8752a65f..fdc73fff41 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/metrics-tab/metrics-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/metrics-tab/metrics-tab.component.spec.ts
@@ -17,8 +17,7 @@ import { applicationEntityType } from '../../../../../../cf-entity-types';
 import { ApplicationEnvVarsHelper } from '../build-tab/application-env-vars.service';
 import { MetricsTabComponent } from './metrics-tab.component';
 
-// TODO: Fix after metrics has been sorted - STRAT-152
-xdescribe('MetricsTabComponent', () => {
+describe('MetricsTabComponent', () => {
   let component: MetricsTabComponent;
   let fixture: ComponentFixture<MetricsTabComponent>;
   const appId = '1';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.spec.ts
index ba1472e058..af4480e9dc 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-apps/cloud-foundry-cell-apps.component.spec.ts
@@ -1,13 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import {
-  generateCfBaseTestModules,
-} from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { generateCfBaseTestModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ActiveRouteCfCell } from '../../../../cf-page.types';
 import { CloudFoundryCellAppsComponent } from './cloud-foundry-cell-apps.component';
 
-// TODO: Fix after metrics has been sorted - STRAT-152
-xdescribe('CloudFoundryCellAppsComponent', () => {
+describe('CloudFoundryCellAppsComponent', () => {
   let component: CloudFoundryCellAppsComponent;
   let fixture: ComponentFixture<CloudFoundryCellAppsComponent>;
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.spec.ts
index 93d7b9a131..205c8a732e 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.spec.ts
@@ -1,16 +1,14 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { TabNavService } from '../../../../../../../../core/tab-nav.service';
-import {
-  generateCfBaseTestModules,
-} from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { generateCfBaseTestModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { CfUserService } from '../../../../../../shared/data-services/cf-user.service';
 import { ActiveRouteCfOrgSpace } from '../../../../cf-page.types';
 import { CloudFoundryEndpointService } from '../../../../services/cloud-foundry-endpoint.service';
 import { CloudFoundryCellService } from '../cloud-foundry-cell.service';
 import { CloudFoundryCellBaseComponent } from './cloud-foundry-cell-base.component';
 
-// TODO: Fix after metrics has been sorted - STRAT-152
-xdescribe('CloudFoundryCellBaseComponent', () => {
+describe('CloudFoundryCellBaseComponent', () => {
   let component: CloudFoundryCellBaseComponent;
   let fixture: ComponentFixture<CloudFoundryCellBaseComponent>;
 
@@ -22,7 +20,8 @@ xdescribe('CloudFoundryCellBaseComponent', () => {
         CloudFoundryEndpointService,
         CloudFoundryCellService,
         ActiveRouteCfOrgSpace,
-        TabNavService
+        TabNavService,
+        CfUserService
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.spec.ts
index bf10e45c66..047523224d 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-charts/cloud-foundry-cell-charts.component.spec.ts
@@ -1,14 +1,11 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import {
-  generateCfBaseTestModules,
-} from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { generateCfBaseTestModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ActiveRouteCfCell } from '../../../../cf-page.types';
 import { CloudFoundryCellService } from '../cloud-foundry-cell.service';
 import { CloudFoundryCellChartsComponent } from './cloud-foundry-cell-charts.component';
 
-// TODO: Fix after metrics has been sorted - STRAT-152
-xdescribe('CloudFoundryCellChartsComponent', () => {
+describe('CloudFoundryCellChartsComponent', () => {
   let component: CloudFoundryCellChartsComponent;
   let fixture: ComponentFixture<CloudFoundryCellChartsComponent>;
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.spec.ts
index 8bf289dfb4..e8c160cbcf 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-summary/cloud-foundry-cell-summary.component.spec.ts
@@ -11,14 +11,12 @@ import {
   MetricsChartHelpers,
 } from '../../../../../../../../core/src/shared/components/metrics-chart/metrics.component.helpers';
 import { MetricQueryType } from '../../../../../../../../core/src/shared/services/metrics-range-selector.types';
-import {
-  generateCfBaseTestModules,
-} from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { MetricQueryConfig } from '../../../../../../../../store/src/actions/metrics.actions';
+import { generateCfBaseTestModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { FetchCFCellMetricsAction } from '../../../../../../actions/cf-metrics.actions';
 import { ActiveRouteCfCell } from '../../../../cf-page.types';
 import { CloudFoundryCellService } from '../cloud-foundry-cell.service';
 import { CloudFoundryCellSummaryComponent } from './cloud-foundry-cell-summary.component';
-import { FetchCFCellMetricsAction } from '../../../../../../actions/cf-metrics.actions';
 
 class MockCloudFoundryCellService {
   cfGuid = 'cfGuid';
@@ -60,8 +58,7 @@ class MockCloudFoundryCellService {
 
 }
 
-// TODO: Fix after metrics has been sorted - STRAT-152
-xdescribe('CloudFoundryCellSummaryComponent', () => {
+describe('CloudFoundryCellSummaryComponent', () => {
   let component: CloudFoundryCellSummaryComponent;
   let fixture: ComponentFixture<CloudFoundryCellSummaryComponent>;
 
diff --git a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.spec.ts
index 5f93a9992b..93034184a4 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.spec.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/connect-endpoint-dialog.component.spec.ts
@@ -4,10 +4,11 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createBasicStoreModule } from '@stratos/store/testing';
 
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
 import { CoreModule } from '../../../core/core.module';
+import { SidePanelService } from '../../../shared/services/side-panel.service';
 import { SharedModule } from '../../../shared/shared.module';
 import { ConnectEndpointComponent } from '../connect-endpoint/connect-endpoint.component';
 import { ConnectEndpointConfig } from '../connect.service';
@@ -25,8 +26,7 @@ class MatDialogDataMock implements ConnectEndpointConfig {
   ssoAllowed = false;
 }
 
-// TODO: Fix after metrics has been sorted - STRAT-152
-xdescribe('ConnectEndpointDialogComponent', () => {
+describe('ConnectEndpointDialogComponent', () => {
   let component: ConnectEndpointDialogComponent;
   let fixture: ComponentFixture<ConnectEndpointDialogComponent>;
 
@@ -34,7 +34,8 @@ xdescribe('ConnectEndpointDialogComponent', () => {
     const testingModule = TestBed.configureTestingModule({
       providers: [
         { provide: MatDialogRef, useClass: MatDialogRefMock },
-        { provide: MAT_DIALOG_DATA, useClass: MatDialogDataMock }
+        { provide: MAT_DIALOG_DATA, useClass: MatDialogDataMock },
+        SidePanelService
       ],
       declarations: [
         ConnectEndpointDialogComponent,
diff --git a/src/frontend/packages/core/src/features/endpoints/connect-endpoint/connect-endpoint.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/connect-endpoint/connect-endpoint.component.spec.ts
index 3097c898b3..d265f5b75b 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect-endpoint/connect-endpoint.component.spec.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect-endpoint/connect-endpoint.component.spec.ts
@@ -1,14 +1,13 @@
 import { CommonModule } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { createBasicStoreModule } from '@stratos/store/testing';
 
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
 import { CoreModule } from '../../../core/core.module';
 import { SharedModule } from '../../../shared/shared.module';
 import { ConnectEndpointComponent } from './connect-endpoint.component';
 
-// TODO: Fix after metrics has been sorted - STRAT-152
-xdescribe('ConnectEndpointComponent', () => {
+describe('ConnectEndpointComponent', () => {
   let component: ConnectEndpointComponent;
   let fixture: ComponentFixture<ConnectEndpointComponent>;
 
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 0c9396218b..0d1c1e7a2c 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,15 +1,14 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
+import { createBasicStoreModule } from '@stratos/store/testing';
 
 import { CoreTestingModule } from '../../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
 import { CoreModule } from '../../../../core/core.module';
 import { SharedModule } from '../../../../shared/shared.module';
 import { CreateEndpointCfStep1Component } from './create-endpoint-cf-step-1.component';
 
-// TODO: Fix after metrics has been sorted - STRAT-152
-xdescribe('CreateEndpointCfStep1Component', () => {
+describe('CreateEndpointCfStep1Component', () => {
   let component: CreateEndpointCfStep1Component;
   let fixture: ComponentFixture<CreateEndpointCfStep1Component>;
 
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 36294cefcf..dda3a78ace 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,21 +1,21 @@
+import { HttpClientModule } from '@angular/common/http';
 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 '@stratos/store/testing';
 
 import { TabNavService } from '../../../../tab-nav.service';
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
 import { CoreModule } from '../../../core/core.module';
+import { SidePanelService } from '../../../shared/services/side-panel.service';
 import { SharedModule } from '../../../shared/shared.module';
 import { ConnectEndpointComponent } from '../connect-endpoint/connect-endpoint.component';
 import { CreateEndpointCfStep1Component } from './create-endpoint-cf-step-1/create-endpoint-cf-step-1.component';
 import { CreateEndpointConnectComponent } from './create-endpoint-connect/create-endpoint-connect.component';
 import { CreateEndpointComponent } from './create-endpoint.component';
-import { HttpClientModule } from '@angular/common/http';
 
-// TODO: Fix after metrics has been sorted - STRAT-152
-xdescribe('CreateEndpointComponent', () => {
+describe('CreateEndpointComponent', () => {
   let component: CreateEndpointComponent;
   let fixture: ComponentFixture<CreateEndpointComponent>;
 
@@ -47,7 +47,9 @@ xdescribe('CreateEndpointComponent', () => {
             }
           }
         }
-      }, TabNavService],
+      },
+        TabNavService,
+        SidePanelService],
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.spec.ts b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.spec.ts
index 34602f97ab..f0097b1e8e 100644
--- a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.spec.ts
+++ b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.spec.ts
@@ -2,17 +2,16 @@ import { CommonModule } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createBasicStoreModule } from '@stratos/store/testing';
 
 import { TabNavService } from '../../../../tab-nav.service';
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
 import { CoreModule } from '../../../core/core.module';
 import { SharedModule } from '../../../shared/shared.module';
 import { MetricsService } from '../services/metrics-service';
 import { MetricsComponent } from './metrics.component';
 
-// TODO: Fix after metrics has been sorted - STRAT-152
-xdescribe('MetricsComponent', () => {
+describe('MetricsComponent', () => {
   let component: MetricsComponent;
   let fixture: ComponentFixture<MetricsComponent>;
 
diff --git a/src/frontend/packages/core/src/shared/components/metrics-chart/metrics-chart.component.spec.ts b/src/frontend/packages/core/src/shared/components/metrics-chart/metrics-chart.component.spec.ts
index 36029be8ae..98fa58a275 100644
--- a/src/frontend/packages/core/src/shared/components/metrics-chart/metrics-chart.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/metrics-chart/metrics-chart.component.spec.ts
@@ -1,15 +1,15 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { createBasicStoreModule } from '@stratos/store/testing';
 
+import { FetchApplicationMetricsAction } from '../../../../../cloud-foundry/src/actions/cf-metrics.actions';
 import { MetricQueryConfig } from '../../../../../store/src/actions/metrics.actions';
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
 import { CoreModule } from '../../../core/core.module';
 import { MDAppModule } from '../../../core/md.module';
 import { SharedModule } from '../../shared.module';
 import { MetricsChartComponent } from './metrics-chart.component';
 import { MetricsLineChartConfig } from './metrics-chart.types';
-import { FetchApplicationMetricsAction } from '../../../../../cloud-foundry/src/actions/cf-metrics.actions';
 
 // TODO: Fix after metrics has been sorted - STRAT-152
 xdescribe('MetricsChartComponent', () => {

From de03a0131ea651060b41359615e623b075883007 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 20 Apr 2020 15:12:58 +0100
Subject: [PATCH 032/176] Changes following review

---
 .../packages/core/sass/_all-theme.scss        |  4 +-
 .../backup-checkbox-cell.component.html}      |  0
 .../backup-checkbox-cell.component.scss}      |  0
 .../backup-checkbox-cell.component.spec.ts}   | 12 ++--
 .../backup-checkbox-cell.component.ts}        | 10 +--
 .../backup-connection-cell.component.html     |  3 +-
 .../backup-connection-cell.component.ts       | 11 +++-
 .../backup-endpoints.service.ts               | 63 +++++++++----------
 .../backup-endpoints.component.ts             | 21 +++----
 .../backup-restore-endpoints.component.html   |  3 +-
 .../backup-restore-endpoints.component.ts     |  2 -
 .../restore-endpoints.service.ts              | 25 ++++----
 .../restore-endpoints.component.html          | 24 ++++---
 .../restore-endpoints.component.scss          |  9 +++
 .../restore-endpoints.component.theme.scss    | 11 ++++
 .../restore-endpoints.component.ts            |  6 +-
 .../features/endpoints/endpoints.module.ts    |  6 +-
 .../endpoint/endpoints-list-config.service.ts |  1 -
 .../store/src/types/endpoint.types.ts         |  2 +
 src/jetstream/authcnsi.go                     |  2 +-
 src/jetstream/cnsi.go                         | 14 ++++-
 src/jetstream/cnsi_token_backup.go            | 60 ++++++++----------
 src/jetstream/repository/cnsis/cnsis.go       |  2 +-
 src/jetstream/repository/cnsis/pgsql_cnsis.go |  5 +-
 .../repository/tokens/pgsql_tokens.go         |  1 +
 src/jetstream/repository/tokens/tokens.go     |  3 +-
 26 files changed, 168 insertions(+), 132 deletions(-)
 rename src/frontend/packages/core/src/features/endpoints/backup-restore/{backup-restore-cell/backup-restore-cell.component.html => backup-checkbox-cell/backup-checkbox-cell.component.html} (100%)
 rename src/frontend/packages/core/src/features/endpoints/backup-restore/{backup-restore-cell/backup-restore-cell.component.scss => backup-checkbox-cell/backup-checkbox-cell.component.scss} (100%)
 rename src/frontend/packages/core/src/features/endpoints/backup-restore/{backup-restore-cell/backup-restore-cell.component.spec.ts => backup-checkbox-cell/backup-checkbox-cell.component.spec.ts} (74%)
 rename src/frontend/packages/core/src/features/endpoints/backup-restore/{backup-restore-cell/backup-restore-cell.component.ts => backup-checkbox-cell/backup-checkbox-cell.component.ts} (64%)
 create mode 100644 src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.theme.scss

diff --git a/src/frontend/packages/core/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss
index 3daaa41180..a6fdef57e5 100644
--- a/src/frontend/packages/core/sass/_all-theme.scss
+++ b/src/frontend/packages/core/sass/_all-theme.scss
@@ -65,7 +65,8 @@
 @import '../../cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-firehose/cloud-foundry-firehose.component.theme';
 @import '../../cloud-foundry/src/features/service-catalog/service-catalog-page/service-catalog-page.component.theme';
 @import '../../cloud-foundry/src/features/applications/application-wall/application-wall.component.theme';
-@import '../../core/src/features/error-page/error-page/error-page.component.theme.scss';
+@import '../../core/src/features/error-page/error-page/error-page.component.theme';
+@import '../../core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.theme';
 
 // Defaults
 $side-nav-light-text: #fff;
@@ -159,6 +160,7 @@ $side-nav-light-active: #484848;
   @include code-block-theme($theme, $app-theme);
   @include copy-to-clipboard-theme($theme, $app-theme);
   @include app-user-avatar-theme($theme, $app-theme);
+  @include restore-endpoints-theme($theme, $app-theme)
 }
 
 @function app-generate-nav-theme($theme, $nav-theme: null) {
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.html
similarity index 100%
rename from src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.html
rename to src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.html
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.scss b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.scss
similarity index 100%
rename from src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.scss
rename to src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.scss
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.spec.ts
similarity index 74%
rename from src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.spec.ts
rename to src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.spec.ts
index 4a8ded6022..448a1eac17 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.spec.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.spec.ts
@@ -4,15 +4,15 @@ import { EndpointModel } from '../../../../../../store/src/types/endpoint.types'
 import { BaseTestModulesNoShared } from '../../../../../test-framework/core-test.helper';
 import { BackupEndpointsService } from '../backup-endpoints.service';
 import { BackupEndpointTypes } from '../backup-restore.types';
-import { BackupRestoreCellComponent } from './backup-restore-cell.component';
+import { BackupCheckboxCellComponent } from './backup-checkbox-cell.component';
 
-describe('BackupRestoreCellComponent', () => {
-  let component: BackupRestoreCellComponent;
-  let fixture: ComponentFixture<BackupRestoreCellComponent>;
+describe('BackupCheckboxCellComponent', () => {
+  let component: BackupCheckboxCellComponent;
+  let fixture: ComponentFixture<BackupCheckboxCellComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [BackupRestoreCellComponent],
+      declarations: [BackupCheckboxCellComponent],
       imports: [
         ...BaseTestModulesNoShared
       ],
@@ -24,7 +24,7 @@ describe('BackupRestoreCellComponent', () => {
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(BackupRestoreCellComponent);
+    fixture = TestBed.createComponent(BackupCheckboxCellComponent);
     component = fixture.componentInstance;
     component.config = {
       type: BackupEndpointTypes.ENDPOINT
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.ts
similarity index 64%
rename from src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.ts
rename to src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.ts
index 0a1b80d52d..0098d10c9b 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-cell/backup-restore-cell.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-checkbox-cell/backup-checkbox-cell.component.ts
@@ -5,18 +5,18 @@ import { TableCellCustom } from '../../../../shared/components/list/list.types';
 import { BackupEndpointsService } from '../backup-endpoints.service';
 
 @Component({
-  selector: 'app-backup-restore-cell',
-  templateUrl: './backup-restore-cell.component.html',
-  styleUrls: ['./backup-restore-cell.component.scss']
+  selector: 'app-backup-checkbox-cell',
+  templateUrl: './backup-checkbox-cell.component.html',
+  styleUrls: ['./backup-checkbox-cell.component.scss']
 })
-export class BackupRestoreCellComponent extends TableCellCustom<EndpointModel> {
+export class BackupCheckboxCellComponent extends TableCellCustom<EndpointModel> {
 
   constructor(public service: BackupEndpointsService) {
     super();
   }
 
   validate() {
-    this.service.validate();
+    this.service.stateUpdated();
   }
 
   disabled(): boolean {
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.html
index c964d79408..43e7eee490 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.html
@@ -2,7 +2,8 @@
   <mat-select [(value)]="service.state[row.guid][backupType.CONNECT]"
     [disabled]="!service.state[row.guid][backupType.ENDPOINT]">
     <mat-option [value]="connectionTypes.NONE">None</mat-option>
-    <mat-option *ngIf="!!row.user" [value]="connectionTypes.CURRENT">Current User</mat-option>
+    <mat-option [value]="connectionTypes.CURRENT" [disabled]="!!userConnectionWarning"
+      [matTooltip]="userConnectionWarning">Current User</mat-option>
     <mat-option [value]="connectionTypes.ALL">All Users</mat-option>
   </mat-select>
 </mat-form-field>
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.ts
index 67c64ab19e..978f098196 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { EndpointModel } from '../../../../../../store/src/types/endpoint.types';
+import { EndpointModel, SystemSharedUserGuid } from '../../../../../../store/src/types/endpoint.types';
 import { TableCellCustom } from '../../../../shared/components/list/list.types';
 import { BackupEndpointsService } from '../backup-endpoints.service';
 import { BackupEndpointConnectionTypes, BackupEndpointTypes } from '../backup-restore.types';
@@ -17,15 +17,20 @@ export class BackupConnectionCellComponent extends TableCellCustom<EndpointModel
   backupType = BackupEndpointTypes;
   connectionTypes = BackupEndpointConnectionTypes;
   selected: BackupEndpointConnectionTypes;
+  userConnectionWarning: string;
 
   constructor(public service: BackupEndpointsService) {
     super();
   }
 
-  ngOnInit(): void {
+  ngOnInit() {
     const epType = entityCatalog.getEndpoint(this.row.cnsi_type, this.row.sub_type);
     const epEntity = epType.definition;
     this.connectable = !epEntity.unConnectable;
+    if (!this.row.user) {
+      this.userConnectionWarning = 'User not connected';
+    } else if (this.row.user.guid === SystemSharedUserGuid) {
+      this.userConnectionWarning = 'User has shared connection';
+    }
   }
-
 }
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
index adff809338..d10c9144e8 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
@@ -2,12 +2,10 @@ import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { filter, first, map, switchMap } from 'rxjs/operators';
+import { first, map } from 'rxjs/operators';
 
 import { GeneralEntityAppState } from '../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
-import { AuthState } from '../../../../../store/src/reducers/auth.reducer';
-import { SessionData } from '../../../../../store/src/types/auth.types';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
 import { BrowserStandardEncoder } from '../../../helper';
 import {
@@ -21,7 +19,6 @@ import {
 
 interface BackupRequest {
   state: BackupEndpointsConfig<BaseEndpointConfig>;
-  userId: string;
   password: string;
 }
 
@@ -51,10 +48,10 @@ export class BackupEndpointsService {
         entity
       };
     });
-    this.validate();
+    this.stateUpdated();
   }
 
-  validate() {
+  stateUpdated() {
     const endpoints = Object.values(this.state);
     endpoints.forEach(endpoint => {
       if (!endpoint[BackupEndpointTypes.ENDPOINT]) {
@@ -69,7 +66,8 @@ export class BackupEndpointsService {
     this.hasChanges.next(hasChanges);
     const allChanged = endpoints.every(endpoint => {
       const e = !this.canBackupEndpoint(endpoint.entity, BackupEndpointTypes.ENDPOINT) || endpoint[BackupEndpointTypes.ENDPOINT];
-      const c = !this.canBackupEndpoint(endpoint.entity, BackupEndpointTypes.CONNECT) || endpoint[BackupEndpointTypes.CONNECT] !== BackupEndpointConnectionTypes.NONE;
+      const c = !this.canBackupEndpoint(endpoint.entity, BackupEndpointTypes.CONNECT) ||
+        endpoint[BackupEndpointTypes.CONNECT] !== BackupEndpointConnectionTypes.NONE;
       return e && c;
     }
 
@@ -110,7 +108,7 @@ export class BackupEndpointsService {
         endpoint[BackupEndpointTypes.CONNECT] = BackupEndpointConnectionTypes.ALL;
       }
     });
-    this.validate();
+    this.stateUpdated();
   }
 
   selectNone() {
@@ -118,7 +116,7 @@ export class BackupEndpointsService {
       endpoint[BackupEndpointTypes.ENDPOINT] = false;
       endpoint[BackupEndpointTypes.CONNECT] = BackupEndpointConnectionTypes.NONE;
     });
-    this.validate();
+    this.stateUpdated();
   }
 
   hasConnectionDetails(): boolean {
@@ -135,19 +133,18 @@ export class BackupEndpointsService {
       encoder: new BrowserStandardEncoder()
     });
 
-    return this.getSessionData().pipe(
-      switchMap(ses => this.http.post(url, this.createBodyToSend(ses), {
-        params
-      })),
-      map(res => {
-        console.log('Response: ', res);
-        return new Blob([JSON.stringify(res)]);
-      }),
+    // return this.getSessionData().pipe(
+    //   switchMap(ses => this.http.post(url, this.createBodyToSend(ses), { params })),
+    //   map(res => new Blob([JSON.stringify(res)])),
+    //   first(),
+    // );
+    return this.http.post(url, this.createBodyToSend(), { params }).pipe(
+      map(res => new Blob([JSON.stringify(res)])),
       first(),
     );
   }
 
-  private createBodyToSend(sd: SessionData): BackupRequest {
+  private createBodyToSend(): BackupRequest {
     const state: BackupEndpointsConfig<BaseEndpointConfig> = Object.entries(this.state).reduce((res, [endpointId, endpoint]) => {
       if (endpoint[BackupEndpointTypes.ENDPOINT]) {
         const { entity, ...rest } = endpoint;
@@ -160,25 +157,25 @@ export class BackupEndpointsService {
     }, {});
     return {
       state,
-      userId: this.getUserIdFromSessionData(sd),
+      // userId: this.getUserIdFromSessionData(sd),
       password: this.password,
     };
   }
 
-  private getUserIdFromSessionData(sd: SessionData): string {
-    if (sd && sd.user) {
-      return sd.user.guid;
-    }
-    return null;
-  }
-
-  private getSessionData(): Observable<SessionData> {
-    return this.store.select(s => s.auth).pipe(
-      filter(auth => !!(auth && auth.sessionData)),
-      map((auth: AuthState) => auth.sessionData),
-      first()
-    );
-  }
+  // private getUserIdFromSessionData(sd: SessionData): string {
+  //   if (sd && sd.user) {
+  //     return sd.user.guid;
+  //   }
+  //   return null;
+  // }
+
+  // private getSessionData(): Observable<SessionData> {
+  //   return this.store.select(s => s.auth).pipe(
+  //     filter(auth => !!(auth && auth.sessionData)),
+  //     map((auth: AuthState) => auth.sessionData),
+  //     first()
+  //   );
+  // }
 
 
 
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
index 6a64e5d9f1..1d24656803 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { Store } from '@ngrx/store';
 import * as moment from 'moment';
@@ -17,9 +17,9 @@ import { ConfirmationDialogService } from '../../../../shared/components/confirm
 import { ITableListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source-types';
 import { ITableColumn } from '../../../../shared/components/list/list-table/table.types';
 import { StepOnNextFunction, StepOnNextResult } from '../../../../shared/components/stepper/step/step.component';
+import { BackupCheckboxCellComponent } from '../backup-checkbox-cell/backup-checkbox-cell.component';
 import { BackupConnectionCellComponent } from '../backup-connection-cell/backup-connection-cell.component';
 import { BackupEndpointsService } from '../backup-endpoints.service';
-import { BackupRestoreCellComponent } from '../backup-restore-cell/backup-restore-cell.component';
 import { BackupEndpointTypes } from '../backup-restore.types';
 
 @Component({
@@ -30,7 +30,7 @@ import { BackupEndpointTypes } from '../backup-restore.types';
     BackupEndpointsService
   ]
 })
-export class BackupEndpointsComponent implements OnInit {
+export class BackupEndpointsComponent {
 
   // Step 1
   columns: ITableColumn<EndpointModel>[] = [
@@ -51,7 +51,7 @@ export class BackupEndpointsComponent implements OnInit {
     {
       columnId: 'endpoint',
       headerCell: () => 'Backup',
-      cellComponent: BackupRestoreCellComponent,
+      cellComponent: BackupCheckboxCellComponent,
       cellConfig: {
         type: BackupEndpointTypes.ENDPOINT
       }
@@ -130,9 +130,6 @@ export class BackupEndpointsComponent implements OnInit {
     );
   }
 
-  ngOnInit() {
-  }
-
   onNext: StepOnNextFunction = () => {
     const confirmation = new ConfirmationDialogConfig(
       'Backup',
@@ -149,11 +146,6 @@ export class BackupEndpointsComponent implements OnInit {
     };
 
     const backupSuccess = data => {
-      result.next({
-        success: true,
-        redirect: true,
-      });
-
       const downloadURL = window.URL.createObjectURL(data);
       const link = document.createElement('a');
       link.href = downloadURL;
@@ -161,6 +153,11 @@ export class BackupEndpointsComponent implements OnInit {
       const dateTime = moment().format('YYYYMMDD-HHmmss');
       link.download = `stratos_backup_${dateTime}.bk`;
       link.click();
+
+      result.next({
+        success: true,
+        redirect: true,
+      });
     };
 
     const backupFailure = err => {
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.html
index d1ea1197f7..089175d985 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.html
@@ -5,8 +5,7 @@ <h1>Backup/Restore Endpoints</h1>
 <app-steppers cancel="/endpoints">
   <app-step [hideNextButton]="true">
     <div class="tiles">
-      <!-- <h3>Select Type</h3> -->
-      <p>Create a backup of Endpoints and their connection details or restore from an existing backup.</p>
+      <p>Create a backup of endpoints and their connection details or restore from an existing backup.</p>
       <app-tile-selector [options]="tileSelectorConfig" (selection)="selectedTile = $event"></app-tile-selector>
     </div>
   </app-step>
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.ts
index 90b1e4cc2d..615c1d2021 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-restore-endpoints/backup-restore-endpoints.component.ts
@@ -17,8 +17,6 @@ interface IAppTileData extends ITileData {
 })
 export class BackupRestoreEndpointsComponent {
 
-  // static BACKUP_RESTORE_PARAM = 'backup';
-
   public serviceType: string;
   public tileSelectorConfig: ITileConfig<IAppTileData>[];
 
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts
index 074111bbac..8fa35048c1 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints.service.ts
@@ -36,6 +36,7 @@ export class RestoreEndpointsService {
 
   validDb = new BehaviorSubject(false);
   validDb$: Observable<boolean>;
+  unparsableFileContent: string = null;
   currentDbVersion$: Observable<number>;
   ignoreDbVersion = new BehaviorSubject(false);
   ignoreDbVersion$ = this.ignoreDbVersion.asObservable();
@@ -61,8 +62,9 @@ export class RestoreEndpointsService {
       this.file$,
       this.currentDbVersion$
     ]).pipe(
+      filter(([file,]) => !!file && !!file.content),
       map(([file, currentDbVersion]) => {
-        return file && file.content.dbVersion === currentDbVersion;
+        return file && file.content && file.content.dbVersion === currentDbVersion;
       })
     );
 
@@ -93,20 +95,17 @@ export class RestoreEndpointsService {
     let parsedContent: BackupContent;
     try {
       parsedContent = JSON.parse(content);
-    } catch (e) {
-      this.logger.warn('Failed to parse file contents: ', e);
+      this.unparsableFileContent = null;
+    } catch (err) {
+      this.logger.warn('Failed to parse file contents: ', err);
+      parsedContent = null;
+      this.unparsableFileContent = `${err instanceof Error ? err.message : String(err)}`;
     }
 
-    if (!!parsedContent) {
-      this.file.next({
-        name: fileName,
-        content: parsedContent
-      });
-    } else {
-      this.file.next(null);
-    }
-
-    // this.updateFileContentValidation();
+    this.file.next({
+      name: fileName,
+      content: parsedContent
+    });
   }
 
   setIgnoreDbVersion(ignore: boolean) {
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html
index 722d3a5e87..4e8e0bfbaf 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html
@@ -15,13 +15,23 @@ <h1>Restore Endpoints</h1>
         </div>
       </div>
       <ng-container *ngIf="service.file$ | async as file">
-        <div *ngIf="!(service.validDb$ | async)" class="file-step__chunk">
-          <p>The database version of Stratos (<code>{{service.currentDbVersion$ | async}}</code>) and the backup
-            (<code>{{file.content.dbVersion}}</code>) are different. Restoring this file may have adverse affects.
-          </p>
-          <mat-checkbox (change)="onIgnoreDbChange($event)">
-            Ignore different database versions
-          </mat-checkbox>
+        <div *ngIf="!!service.unparsableFileContent || !(service.validDb$ | async)" class="file-step__error">
+          <div *ngIf="!service.unparsableFileContent && !(service.validDb$ | async)" class="file-step__chunk">
+            <p>
+              <mat-icon>warning</mat-icon> The database version of Stratos
+              (<code>{{service.currentDbVersion$ | async}}</code>) and the backup
+              (<code>{{file.content.dbVersion}}</code>) are different. Restoring this file may have adverse affects.
+            </p>
+            <mat-checkbox (change)="onIgnoreDbChange($event)">
+              Ignore different database versions
+            </mat-checkbox>
+          </div>
+          <div *ngIf="!!service.unparsableFileContent">
+            <p>
+              <mat-icon>warning</mat-icon> Unable to parse file contents. Reason:
+              <code>{{service.unparsableFileContent}}</code>
+            </p>
+          </div>
         </div>
       </ng-container>
     </div>
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.scss b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.scss
index 60b6ddd949..7fb53ed32c 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.scss
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.scss
@@ -20,4 +20,13 @@
     }
   }
 
+  &__error {
+    p {
+      align-items: center;
+      display: flex;
+    }
+    mat-icon {
+      margin-right: 10px;
+    }
+  }
 }
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.theme.scss b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.theme.scss
new file mode 100644
index 0000000000..335545c7ad
--- /dev/null
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.theme.scss
@@ -0,0 +1,11 @@
+@mixin restore-endpoints-theme($theme, $app-theme) {
+  $status-colors: map-get($app-theme, status);
+  $warn-color: map-get($status-colors, warning);
+  .file-step {
+    &__error {
+      mat-icon {
+        color: $warn-color;
+      }
+    }
+  }
+}
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
index 64b2e5e592..2904f6024d 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
@@ -78,7 +78,7 @@ export class RestoreEndpointsComponent {
       });
     };
 
-    const restoreSuccess = data => {
+    const restoreSuccess = () => {
       this.store.dispatch(new GetAllEndpoints());
       result.next({
         success: true,
@@ -95,9 +95,9 @@ export class RestoreEndpointsComponent {
       return of(false);
     };
 
-    const createBackup = () => this.service.restoreBackup().pipe(first()).subscribe(restoreSuccess, backupFailure);
+    const restoreBackup = () => this.service.restoreBackup().pipe(first()).subscribe(restoreSuccess, backupFailure);
 
-    this.confirmDialog.openWithCancel(confirmation, createBackup, userCancelledDialog);
+    this.confirmDialog.openWithCancel(confirmation, restoreBackup, userCancelledDialog);
 
     return result.asObservable();
   }
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 307379946a..44a05e8e2a 100644
--- a/src/frontend/packages/core/src/features/endpoints/endpoints.module.ts
+++ b/src/frontend/packages/core/src/features/endpoints/endpoints.module.ts
@@ -2,9 +2,9 @@ import { NgModule } from '@angular/core';
 
 import { CoreModule } from '../../core/core.module';
 import { SharedModule } from '../../shared/shared.module';
+import { BackupCheckboxCellComponent } from './backup-restore/backup-checkbox-cell/backup-checkbox-cell.component';
 import { BackupConnectionCellComponent } from './backup-restore/backup-connection-cell/backup-connection-cell.component';
 import { BackupEndpointsComponent } from './backup-restore/backup-endpoints/backup-endpoints.component';
-import { BackupRestoreCellComponent } from './backup-restore/backup-restore-cell/backup-restore-cell.component';
 import {
   BackupRestoreEndpointsComponent,
 } from './backup-restore/backup-restore-endpoints/backup-restore-endpoints.component';
@@ -37,7 +37,7 @@ import { EndpointsRoutingModule } from './endpoints.routing';
     BackupRestoreEndpointsComponent,
     BackupEndpointsComponent,
     RestoreEndpointsComponent,
-    BackupRestoreCellComponent,
+    BackupCheckboxCellComponent,
     BackupConnectionCellComponent,
   ],
   entryComponents: [
@@ -45,7 +45,7 @@ import { EndpointsRoutingModule } from './endpoints.routing';
     CredentialsAuthFormComponent,
     SSOAuthFormComponent,
     NoneAuthFormComponent,
-    BackupRestoreCellComponent,
+    BackupCheckboxCellComponent,
     BackupConnectionCellComponent
   ]
 })
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 44e7281b6a..8483e01383 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
@@ -106,7 +106,6 @@ export class EndpointsListConfigService implements IListConfig<EndpointModel> {
     internalEventMonitorFactory: InternalEventMonitorFactory,
     endpointListHelper: EndpointListHelper,
     favoritesConfigMapper: FavoritesConfigMapper,
-    // private router: Router
   ) {
     this.singleActions = endpointListHelper.endpointActions();
     const favoriteCell = createTableColumnFavorite(
diff --git a/src/frontend/packages/store/src/types/endpoint.types.ts b/src/frontend/packages/store/src/types/endpoint.types.ts
index 6ec7c8e09a..83bf97984a 100644
--- a/src/frontend/packages/store/src/types/endpoint.types.ts
+++ b/src/frontend/packages/store/src/types/endpoint.types.ts
@@ -60,6 +60,8 @@ export interface EndpointModel {
   metricsAvailable: boolean;
 }
 
+export const SystemSharedUserGuid = '00000000-1111-2222-3333-444444444444';
+
 // Metadata for the user connected to an endpoint
 export interface EndpointUser {
   guid: string;
diff --git a/src/jetstream/authcnsi.go b/src/jetstream/authcnsi.go
index 39cf03db4b..55809904d3 100644
--- a/src/jetstream/authcnsi.go
+++ b/src/jetstream/authcnsi.go
@@ -261,7 +261,7 @@ func (p *portalProxy) DoLoginToCNSIwithConsoleUAAtoken(c echo.Context, theCNSIre
 
 func santizeInfoForSystemSharedTokenUser(cnsiUser *interfaces.ConnectedUser, isSysystemShared bool) {
 	if isSysystemShared {
-		cnsiUser.GUID = tokens.SystemSharedUserGuid
+		cnsiUser.GUID = tokens.SystemSharedUserGuid // Used by front end also
 		cnsiUser.Scopes = make([]string, 0)
 		cnsiUser.Name = "system_shared"
 	}
diff --git a/src/jetstream/cnsi.go b/src/jetstream/cnsi.go
index afaaebf9cf..3520a06ccf 100644
--- a/src/jetstream/cnsi.go
+++ b/src/jetstream/cnsi.go
@@ -637,11 +637,17 @@ func (p *portalProxy) updateEndpoint(c echo.Context) error {
 }
 
 func (p *portalProxy) backupEndpoints(c echo.Context) error {
-	log.Debug("BackupEndpoints")
+	log.Debug("backupEndpoints")
+
+	userID, err := p.GetSessionStringValue(c, "user_id")
+	if err != nil {
+		return echo.NewHTTPError(http.StatusUnauthorized, "Could not find correct session value")
+	}
 
 	ctb := &cnsiTokenBackup{
 		databaseConnectionPool: p.DatabaseConnectionPool,
 		encryptionKey:          p.Config.EncryptionKeyInBytes,
+		userID:                 userID,
 		p:                      p,
 	}
 
@@ -651,9 +657,15 @@ func (p *portalProxy) backupEndpoints(c echo.Context) error {
 func (p *portalProxy) restoreEndpoints(c echo.Context) error {
 	log.Debug("restoreEndpoints")
 
+	userID, err := p.GetSessionStringValue(c, "user_id")
+	if err != nil {
+		return echo.NewHTTPError(http.StatusUnauthorized, "Could not find correct session value")
+	}
+
 	ctb := &cnsiTokenBackup{
 		databaseConnectionPool: p.DatabaseConnectionPool,
 		encryptionKey:          p.Config.EncryptionKeyInBytes,
+		userID:                 userID,
 		p:                      p,
 	}
 
diff --git a/src/jetstream/cnsi_token_backup.go b/src/jetstream/cnsi_token_backup.go
index 3f4c4f77b9..0666493f47 100644
--- a/src/jetstream/cnsi_token_backup.go
+++ b/src/jetstream/cnsi_token_backup.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"crypto/md5"
+	"crypto/sha256"
 	"database/sql"
 	"encoding/json"
 	"fmt"
@@ -19,6 +19,7 @@ import (
 type cnsiTokenBackup struct {
 	databaseConnectionPool *sql.DB
 	encryptionKey          []byte
+	userID                 string
 	p                      *portalProxy
 }
 
@@ -39,10 +40,8 @@ type BackupEndpointsState struct {
 
 // BackupRequest - Request from client to create a back up file
 type BackupRequest struct {
-	State     map[string]BackupEndpointsState `json:"state"`
-	UserID    string                          `json:"userId"`
-	DBVersion string                          `json:"dbVersion"`
-	Password  string                          `json:"password"`
+	State    map[string]BackupEndpointsState `json:"state"`
+	Password string                          `json:"password"`
 }
 
 // BackupContentPayload - Encrypted part of the backup
@@ -133,17 +132,16 @@ func (ctb *cnsiTokenBackup) createBackup(data *BackupRequest) (*BackupContent, e
 				return nil, interfaces.NewHTTPError(http.StatusBadGateway, text)
 			}
 		case BACKUP_CONNECTION_CURRENT:
-			if tokenRecord, ok := ctb.p.GetCNSITokenRecordWithDisconnected(endpointID, data.UserID); ok {
-				log.Warn("tokens for Connect")
+			if tokenRecord, ok := ctb.p.GetCNSITokenRecordWithDisconnected(endpointID, ctb.userID); ok {
 				var btr = interfaces.BackupTokenRecord{
 					TokenRecord:  tokenRecord,
 					EndpointGUID: endpointID,
-					TokenType:    "CNSI",
-					UserGUID:     data.UserID,
+					TokenType:    "cnsi",
+					UserGUID:     ctb.userID,
 				}
 				tokens = append(tokens, btr)
 			} else {
-				text := fmt.Sprintf("Request to back up connected user's (%+v) token for endpoint (%+v) failed.", endpointID, data.UserID)
+				text := fmt.Sprintf("Request to back up connected user's (%+v) token for endpoint (%+v) failed.", endpointID, ctb.userID)
 				return nil, interfaces.NewHTTPError(http.StatusBadGateway, text)
 			}
 		}
@@ -156,7 +154,7 @@ func (ctb *cnsiTokenBackup) createBackup(data *BackupRequest) (*BackupContent, e
 	}
 
 	// Encrypt the entire payload
-	encryptedPayload, err := encryptPayload(payload, data.Password, ctb.encryptionKey)
+	encryptedPayload, err := encryptPayload(payload, data.Password)
 	if err != nil {
 		return nil, interfaces.NewHTTPShadowError(http.StatusBadGateway, "Could not encrypt payload", "Could not encrypt payload: %+v", err)
 	}
@@ -235,7 +233,7 @@ func (ctb *cnsiTokenBackup) restoreBackup(backup *RestoreRequest) error {
 	}
 
 	// Get the actual, unencrypted set of endpoints and tokens
-	payloadString, err := decryptPayload(data.Payload, backup.Password, ctb.encryptionKey)
+	payloadString, err := decryptPayload(data.Payload, backup.Password)
 	if err != nil {
 		return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to decrypt payload", "Failed to decrypt payload: %+v", err)
 	}
@@ -252,7 +250,7 @@ func (ctb *cnsiTokenBackup) restoreBackup(backup *RestoreRequest) error {
 
 	for _, endpoint := range payload.Endpoints {
 		e := deSerializeEndpoint(endpoint)
-		if err := cnsiRepo.Overwrite(e, ctb.encryptionKey); err != nil {
+		if err := cnsiRepo.SaveOrUpdate(e, ctb.encryptionKey); err != nil {
 			return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Failed to overwrite endpoints", "Failed to overwrite endpoint: %+v", e.Name)
 		}
 	}
@@ -273,15 +271,13 @@ func (ctb *cnsiTokenBackup) restoreBackup(backup *RestoreRequest) error {
 
 // Work around the omission of the client secret when serialising the cnsi record
 func serializeEndpoint(endpoint *interfaces.CNSIRecord) map[string]interface{} {
-	// encode the original
+	// Convert struct to generic map
 	m, _ := json.Marshal(endpoint)
-
-	// decode it back to get a map
 	var a interface{}
 	json.Unmarshal(m, &a)
 	newEndpoint := a.(map[string]interface{})
 
-	// Replace the map key
+	// Apply the correct client secret
 	newEndpoint["client_secret"] = endpoint.ClientSecret
 
 	return newEndpoint
@@ -289,21 +285,19 @@ func serializeEndpoint(endpoint *interfaces.CNSIRecord) map[string]interface{} {
 
 // Work around the omission of the client secret when serialising the cnsi record
 func deSerializeEndpoint(endpoint map[string]interface{}) interfaces.CNSIRecord {
-	// encode the endpoint map
+	// Convert struct to endpoint
 	m, _ := json.Marshal(endpoint)
+	var cnsi interfaces.CNSIRecord
+	json.Unmarshal(m, &cnsi)
 
-	// decode it back to get a record with all values except client secret
-	var a interfaces.CNSIRecord
-	json.Unmarshal(m, &a)
-
-	// manually add the client secret
-	a.ClientSecret = fmt.Sprintf("%v", endpoint["client_secret"])
-	return a
+	// Apply the correct client secret
+	cnsi.ClientSecret = fmt.Sprintf("%v", endpoint["client_secret"])
+	return cnsi
 }
 
-func encryptPayload(payload *BackupContentPayload, password string, encryptionKey []byte) ([]byte, error) {
+func encryptPayload(payload *BackupContentPayload, password string) ([]byte, error) {
 	// First ensure the password is an ok length
-	secret, err := createHash(password, encryptionKey)
+	secret, err := createHash(password)
 	if err != nil {
 		log.Warningf("Could not create hash: %+v", err)
 		return nil, fmt.Errorf("Could not create hash")
@@ -324,9 +318,9 @@ func encryptPayload(payload *BackupContentPayload, password string, encryptionKe
 	return payloadEncrypted, nil
 }
 
-func decryptPayload(payloadEncrypted []byte, password string, encryptionKey []byte) (*string, error) {
+func decryptPayload(payloadEncrypted []byte, password string) (*string, error) {
 	// First ensure the password is an ok length
-	secret, err := createHash(password, encryptionKey)
+	secret, err := createHash(password)
 	if err != nil {
 		log.Warningf("Could not create hash: %+v", err)
 		return nil, fmt.Errorf("Could not create hash")
@@ -341,13 +335,11 @@ func decryptPayload(payloadEncrypted []byte, password string, encryptionKey []by
 }
 
 // createHash - Ensure the token used by crypto is at an acceptable length
-func createHash(password string, salt []byte) ([]byte, error) {
-	hasher := md5.New()
+func createHash(password string) ([]byte, error) {
+	// Create a hash long enough to ensure with use AES-256
+	hasher := sha256.New()
 	if _, err := hasher.Write([]byte(password)); err != nil {
 		return nil, fmt.Errorf("Failed to write password to hash")
 	}
-	if _, err := hasher.Write(salt); err != nil {
-		return nil, fmt.Errorf("Failed to write salt to hash")
-	}
 	return hasher.Sum(nil), nil
 }
diff --git a/src/jetstream/repository/cnsis/cnsis.go b/src/jetstream/repository/cnsis/cnsis.go
index b1e5bcc4bc..0605361d72 100644
--- a/src/jetstream/repository/cnsis/cnsis.go
+++ b/src/jetstream/repository/cnsis/cnsis.go
@@ -14,7 +14,7 @@ type Repository interface {
 	Save(guid string, cnsiRecord interfaces.CNSIRecord, encryptionKey []byte) error
 	Update(endpoint interfaces.CNSIRecord, encryptionKey []byte) error
 	UpdateMetadata(guid string, metadata string) error
-	Overwrite(endpoint interfaces.CNSIRecord, encryptionKey []byte) error
+	SaveOrUpdate(endpoint interfaces.CNSIRecord, encryptionKey []byte) error
 }
 
 type Endpoint interface {
diff --git a/src/jetstream/repository/cnsis/pgsql_cnsis.go b/src/jetstream/repository/cnsis/pgsql_cnsis.go
index 9582f3e1a4..b68bf4933f 100644
--- a/src/jetstream/repository/cnsis/pgsql_cnsis.go
+++ b/src/jetstream/repository/cnsis/pgsql_cnsis.go
@@ -61,6 +61,7 @@ func InitRepositoryProvider(databaseProvider string) {
 	deleteCNSI = datastore.ModifySQLStatement(deleteCNSI, databaseProvider)
 	updateCNSI = datastore.ModifySQLStatement(updateCNSI, databaseProvider)
 	updateCNSIMetadata = datastore.ModifySQLStatement(updateCNSIMetadata, databaseProvider)
+	countCNSI = datastore.ModifySQLStatement(countCNSI, databaseProvider)
 }
 
 // List - Returns a list of CNSI Records
@@ -352,8 +353,8 @@ func (p *PostgresCNSIRepository) UpdateMetadata(guid string, metadata string) er
 	return nil
 }
 
-// Overwrite - Creates or Updates CNSI Record
-func (p *PostgresCNSIRepository) Overwrite(endpoint interfaces.CNSIRecord, encryptionKey []byte) error {
+// SaveOrUpdate - Creates or Updates CNSI Record
+func (p *PostgresCNSIRepository) SaveOrUpdate(endpoint interfaces.CNSIRecord, encryptionKey []byte) error {
 	log.Debug("Overwrite CNSI")
 
 	// Is there an existing token?
diff --git a/src/jetstream/repository/tokens/pgsql_tokens.go b/src/jetstream/repository/tokens/pgsql_tokens.go
index 32c779e355..43a45459f9 100644
--- a/src/jetstream/repository/tokens/pgsql_tokens.go
+++ b/src/jetstream/repository/tokens/pgsql_tokens.go
@@ -86,6 +86,7 @@ func InitRepositoryProvider(databaseProvider string) {
 	updateAuthToken = datastore.ModifySQLStatement(updateAuthToken, databaseProvider)
 	findCNSIToken = datastore.ModifySQLStatement(findCNSIToken, databaseProvider)
 	findCNSITokenConnected = datastore.ModifySQLStatement(findCNSITokenConnected, databaseProvider)
+	findAllCNSIToken = datastore.ModifySQLStatement(findAllCNSIToken, databaseProvider)
 	countCNSITokens = datastore.ModifySQLStatement(countCNSITokens, databaseProvider)
 	insertCNSIToken = datastore.ModifySQLStatement(insertCNSIToken, databaseProvider)
 	updateCNSIToken = datastore.ModifySQLStatement(updateCNSIToken, databaseProvider)
diff --git a/src/jetstream/repository/tokens/tokens.go b/src/jetstream/repository/tokens/tokens.go
index f473885e15..114a77a9b7 100644
--- a/src/jetstream/repository/tokens/tokens.go
+++ b/src/jetstream/repository/tokens/tokens.go
@@ -9,7 +9,8 @@ type Token struct {
 	Record    interfaces.TokenRecord
 }
 
-const SystemSharedUserGuid = "00000000-1111-2222-3333-444444444444" // User ID for the system shared user for endpoints
+// SystemSharedUserGuid - User ID for the system shared user for endpoints. Also used by front end
+const SystemSharedUserGuid = "00000000-1111-2222-3333-444444444444"
 
 // Repository is an application of the repository pattern for storing tokens
 type Repository interface {

From efeca9fe44cad501abdf7c7b345e18b13d4f686b Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 20 Apr 2020 16:04:30 +0100
Subject: [PATCH 033/176] Move backup into it's own module

---
 .../restore-endpoints.component.html          |   2 +-
 src/jetstream/cnsi.go                         |  36 ------
 src/jetstream/load_plugins.go                 |   2 +
 src/jetstream/main.go                         |   3 -
 .../backup/backup_restore.go}                 |  35 ++----
 src/jetstream/plugins/backup/main.go          | 111 ++++++++++++++++++
 src/jetstream/version_info.go                 |   2 +-
 7 files changed, 128 insertions(+), 63 deletions(-)
 rename src/jetstream/{cnsi_token_backup.go => plugins/backup/backup_restore.go} (91%)
 create mode 100644 src/jetstream/plugins/backup/main.go

diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html
index 4e8e0bfbaf..1682c9b572 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.html
@@ -28,7 +28,7 @@ <h1>Restore Endpoints</h1>
           </div>
           <div *ngIf="!!service.unparsableFileContent">
             <p>
-              <mat-icon>warning</mat-icon> Unable to parse file contents. Reason:
+              <mat-icon>warning</mat-icon>Unable to parse file contents. Reason:&nbsp;
               <code>{{service.unparsableFileContent}}</code>
             </p>
           </div>
diff --git a/src/jetstream/cnsi.go b/src/jetstream/cnsi.go
index 3520a06ccf..daf0ea3446 100644
--- a/src/jetstream/cnsi.go
+++ b/src/jetstream/cnsi.go
@@ -635,39 +635,3 @@ func (p *portalProxy) updateEndpoint(c echo.Context) error {
 
 	return nil
 }
-
-func (p *portalProxy) backupEndpoints(c echo.Context) error {
-	log.Debug("backupEndpoints")
-
-	userID, err := p.GetSessionStringValue(c, "user_id")
-	if err != nil {
-		return echo.NewHTTPError(http.StatusUnauthorized, "Could not find correct session value")
-	}
-
-	ctb := &cnsiTokenBackup{
-		databaseConnectionPool: p.DatabaseConnectionPool,
-		encryptionKey:          p.Config.EncryptionKeyInBytes,
-		userID:                 userID,
-		p:                      p,
-	}
-
-	return ctb.BackupEndpoints(c)
-}
-
-func (p *portalProxy) restoreEndpoints(c echo.Context) error {
-	log.Debug("restoreEndpoints")
-
-	userID, err := p.GetSessionStringValue(c, "user_id")
-	if err != nil {
-		return echo.NewHTTPError(http.StatusUnauthorized, "Could not find correct session value")
-	}
-
-	ctb := &cnsiTokenBackup{
-		databaseConnectionPool: p.DatabaseConnectionPool,
-		encryptionKey:          p.Config.EncryptionKeyInBytes,
-		userID:                 userID,
-		p:                      p,
-	}
-
-	return ctb.RestoreEndpoints(c)
-}
diff --git a/src/jetstream/load_plugins.go b/src/jetstream/load_plugins.go
index 0c8b9fe639..c76b421c4f 100644
--- a/src/jetstream/load_plugins.go
+++ b/src/jetstream/load_plugins.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/autoscaler"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/backup"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cfapppush"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cfappssh"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/plugins/cloudfoundry"
@@ -34,6 +35,7 @@ func (pp *portalProxy) loadPlugins() {
 		{"userinvite", userinvite.Init},
 		{"userfavorites", userfavorites.Init},
 		{"autoscaler", autoscaler.Init},
+		{"backup", backup.Init},
 	} {
 		plugin, err := p.Init(pp)
 		pp.Plugins[p.Name] = plugin
diff --git a/src/jetstream/main.go b/src/jetstream/main.go
index 53c3045e2b..9b649da31d 100644
--- a/src/jetstream/main.go
+++ b/src/jetstream/main.go
@@ -973,9 +973,6 @@ func (p *portalProxy) registerRoutes(e *echo.Echo, needSetupMiddleware bool) {
 	// Apply edits for the given endpoint
 	adminGroup.POST("/endpoint/:id", p.updateEndpoint)
 
-	adminGroup.POST("/endpoints/backup", p.backupEndpoints)
-	adminGroup.POST("/endpoints/restore", p.restoreEndpoints)
-
 	adminGroup.POST("/unregister", p.unregisterCluster)
 	// sessionGroup.DELETE("/cnsis", p.removeCluster)
 
diff --git a/src/jetstream/cnsi_token_backup.go b/src/jetstream/plugins/backup/backup_restore.go
similarity index 91%
rename from src/jetstream/cnsi_token_backup.go
rename to src/jetstream/plugins/backup/backup_restore.go
index 0666493f47..7e6fd8df59 100644
--- a/src/jetstream/cnsi_token_backup.go
+++ b/src/jetstream/plugins/backup/backup_restore.go
@@ -1,4 +1,4 @@
-package main
+package backup
 
 import (
 	"crypto/sha256"
@@ -20,22 +20,23 @@ type cnsiTokenBackup struct {
 	databaseConnectionPool *sql.DB
 	encryptionKey          []byte
 	userID                 string
-	p                      *portalProxy
+	dbVersion              int64
+	p                      interfaces.PortalProxy
 }
 
-// BackupConnectionType - Determine what kind of connection details are stored for an endpoint
-type BackupConnectionType string
+// ConnectionType - Determine what kind of connection details are stored for an endpoint
+type ConnectionType string
 
 const (
-	BACKUP_CONNECTION_NONE    BackupConnectionType = "NONE"
-	BACKUP_CONNECTION_CURRENT                      = "CURRENT"
-	BACKUP_CONNECTION_ALL                          = "ALL"
+	BACKUP_CONNECTION_NONE    ConnectionType = "NONE"
+	BACKUP_CONNECTION_CURRENT                = "CURRENT"
+	BACKUP_CONNECTION_ALL                    = "ALL"
 )
 
 // BackupEndpointsState - For a given endpoint define what's backed up
 type BackupEndpointsState struct {
-	Endpoint bool                 `json:"endpoint"`
-	Connect  BackupConnectionType `json:"connect"`
+	Endpoint bool           `json:"endpoint"`
+	Connect  ConnectionType `json:"connect"`
 }
 
 // BackupRequest - Request from client to create a back up file
@@ -160,14 +161,9 @@ func (ctb *cnsiTokenBackup) createBackup(data *BackupRequest) (*BackupContent, e
 	}
 
 	// Add the db version to the response, this will allow client side up front validation
-	versions, err := ctb.p.getVersionsData()
-	if err != nil {
-		return nil, interfaces.NewHTTPShadowError(http.StatusBadGateway, "Could not find database version", "Could not find database version: %+v", err)
-	}
-
 	response := &BackupContent{
 		Payload:   encryptedPayload,
-		DBVersion: versions.DatabaseVersion,
+		DBVersion: ctb.dbVersion,
 	}
 
 	return response, nil
@@ -221,13 +217,8 @@ func (ctb *cnsiTokenBackup) restoreBackup(backup *RestoreRequest) error {
 
 	// Check that the db version of backup file matches the stratos db version
 	if backup.IgnoreDbVersion == false {
-		versions, err := ctb.p.getVersionsData()
-		if err != nil {
-			return interfaces.NewHTTPShadowError(http.StatusInternalServerError, "Could not find database version", "Could not find database version: %+v", err)
-		}
-
-		if versions.DatabaseVersion != data.DBVersion {
-			errorStr := fmt.Sprintf("Incompatible database versions. Expected %+v but got %+v", versions.DatabaseVersion, data.DBVersion)
+		if ctb.dbVersion != data.DBVersion {
+			errorStr := fmt.Sprintf("Incompatible database versions. Expected %+v but got %+v", ctb.dbVersion, data.DBVersion)
 			return interfaces.NewHTTPError(http.StatusBadRequest, errorStr)
 		}
 	}
diff --git a/src/jetstream/plugins/backup/main.go b/src/jetstream/plugins/backup/main.go
new file mode 100644
index 0000000000..d2ddcf5dec
--- /dev/null
+++ b/src/jetstream/plugins/backup/main.go
@@ -0,0 +1,111 @@
+package backup
+
+import (
+	"database/sql"
+	"errors"
+	"net/http"
+
+	goosedbversion "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/goose-db-version"
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+	"github.com/labstack/echo"
+	log "github.com/sirupsen/logrus"
+)
+
+// BackupRestore - Backup or restore endpoints and tokens
+type BackupRestore struct {
+	portalProxy interfaces.PortalProxy
+}
+
+// Init creates a new Autoscaler
+func Init(portalProxy interfaces.PortalProxy) (interfaces.StratosPlugin, error) {
+	return &BackupRestore{portalProxy: portalProxy}, nil
+}
+
+// GetMiddlewarePlugin gets the middleware plugin for this plugin
+func (br *BackupRestore) GetMiddlewarePlugin() (interfaces.MiddlewarePlugin, error) {
+	return nil, errors.New("Not implemented")
+}
+
+// GetEndpointPlugin gets the endpoint plugin for this plugin
+func (br *BackupRestore) GetEndpointPlugin() (interfaces.EndpointPlugin, error) {
+	return nil, errors.New("Not implemented")
+}
+
+// GetRoutePlugin gets the route plugin for this plugin
+func (br *BackupRestore) GetRoutePlugin() (interfaces.RoutePlugin, error) {
+	return br, nil
+}
+
+// AddAdminGroupRoutes adds the admin routes for this plugin to the Echo server
+func (br *BackupRestore) AddAdminGroupRoutes(echoGroup *echo.Group) {
+	echoGroup.POST("/endpoints/backup", br.backupEndpoints)
+	echoGroup.POST("/endpoints/restore", br.restoreEndpoints)
+}
+
+// AddSessionGroupRoutes adds the session routes for this plugin to the Echo server
+func (br *BackupRestore) AddSessionGroupRoutes(echoGroup *echo.Group) {
+	// no-op
+}
+
+// Init performs plugin initialization
+func (br *BackupRestore) Init() error {
+	return nil
+}
+
+func (br *BackupRestore) backupEndpoints(c echo.Context) error {
+	log.Debug("backupEndpoints")
+
+	userID, err := br.portalProxy.GetSessionStringValue(c, "user_id")
+	if err != nil {
+		return echo.NewHTTPError(http.StatusUnauthorized, "Could not find correct session value")
+	}
+
+	version, err := getDBVersion(br.portalProxy.GetDatabaseConnection())
+	if err != nil {
+		return interfaces.NewHTTPShadowError(http.StatusBadGateway, "Could not find database version", "Could not find database version: %+v", err)
+	}
+
+	ctb := &cnsiTokenBackup{
+		databaseConnectionPool: br.portalProxy.GetDatabaseConnection(),
+		encryptionKey:          br.portalProxy.GetConfig().EncryptionKeyInBytes,
+		userID:                 userID,
+		dbVersion:              version,
+		p:                      br.portalProxy,
+	}
+
+	return ctb.BackupEndpoints(c)
+}
+
+func (br *BackupRestore) restoreEndpoints(c echo.Context) error {
+	log.Debug("restoreEndpoints")
+
+	userID, err := br.portalProxy.GetSessionStringValue(c, "user_id")
+	if err != nil {
+		return echo.NewHTTPError(http.StatusUnauthorized, "Could not find correct session value")
+	}
+
+	version, err := getDBVersion(br.portalProxy.GetDatabaseConnection())
+	if err != nil {
+		return interfaces.NewHTTPShadowError(http.StatusBadGateway, "Could not find database version", "Could not find database version: %+v", err)
+	}
+
+	ctb := &cnsiTokenBackup{
+		databaseConnectionPool: br.portalProxy.GetDatabaseConnection(),
+		encryptionKey:          br.portalProxy.GetConfig().EncryptionKeyInBytes,
+		userID:                 userID,
+		dbVersion:              version,
+		p:                      br.portalProxy,
+	}
+
+	return ctb.RestoreEndpoints(c)
+}
+
+func getDBVersion(databaseConnectionPool *sql.DB) (int64, error) {
+	dbVersionRepo, _ := goosedbversion.NewPostgresGooseDBVersionRepository(databaseConnectionPool)
+	databaseVersionRec, err := dbVersionRepo.GetCurrentVersion()
+	if err != nil {
+		return 0, errors.New("Error trying to get current database version")
+	}
+
+	return databaseVersionRec.VersionID, nil
+}
diff --git a/src/jetstream/version_info.go b/src/jetstream/version_info.go
index c62257d785..08fd2bd9c8 100644
--- a/src/jetstream/version_info.go
+++ b/src/jetstream/version_info.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/goose-db-version"
+	goosedbversion "github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/goose-db-version"
 	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
 	"github.com/labstack/echo"
 	log "github.com/sirupsen/logrus"

From 41245109ea2cd85fe8b6cdf5b26982919e78dbd0 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 24 Apr 2020 14:18:58 +0100
Subject: [PATCH 034/176] Fix table passing issue

---
 .../core/sass/components/mat-table.scss       | 23 +++++++++++++++++++
 .../app-action-monitor.component.ts           |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/frontend/packages/core/sass/components/mat-table.scss b/src/frontend/packages/core/sass/components/mat-table.scss
index 085ab2d61f..0c90ba46b7 100644
--- a/src/frontend/packages/core/sass/components/mat-table.scss
+++ b/src/frontend/packages/core/sass/components/mat-table.scss
@@ -6,3 +6,26 @@ $mat-table-header-paginator-font-size: 13px;
 .mat-paginator {
   font-size: $mat-table-header-paginator-font-size;
 }
+
+// Fix right-hand margin on tables (monitor icon appears too close to edge)
+// https://github.com/cloudfoundry/stratos/issues/4234
+.stratos {
+
+  // Only put right padding between cells
+  .mat-cell {
+    padding: 10px 10px 10px 0;
+  }
+
+  // Use margin, not padding for the left side of the first cell in the row/headwer/footer
+  .mat-cell:first-of-type, mat-footer-cell:first-of-type, mat-header-cell:first-of-type {
+    margin-left: 20px;
+    padding-left: 0;
+  }
+
+  // Use margin, not padding for the right side of the first cell in the row/headwer/footer
+  .mat-cell:last-of-type, mat-footer-cell:last-of-type, mat-header-cell:last-of-type {
+    margin-right: 20px;
+    padding-right: 0;
+  }
+
+}
\ No newline at end of file
diff --git a/src/frontend/packages/core/src/shared/components/app-action-monitor/app-action-monitor.component.ts b/src/frontend/packages/core/src/shared/components/app-action-monitor/app-action-monitor.component.ts
index 3af4bbd2cd..2895bce18d 100644
--- a/src/frontend/packages/core/src/shared/components/app-action-monitor/app-action-monitor.component.ts
+++ b/src/frontend/packages/core/src/shared/components/app-action-monitor/app-action-monitor.component.ts
@@ -79,7 +79,7 @@ export class AppActionMonitorComponent<T> implements OnInit {
       columnId: 'monitorState',
       cellComponent: TableCellRequestMonitorIconComponent,
       cellConfig: this.getCellConfig || defaultGetCellConfig,
-      cellFlex: '0 0 40px'
+      cellFlex: '0 0 24px'
     };
 
     this.allColumns = [...this.columns, monitorColumn];

From d2690557001016992acb0967fdf85c6082429786 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 24 Apr 2020 14:20:08 +0100
Subject: [PATCH 035/176] Fix typo in comment

---
 src/frontend/packages/core/sass/components/mat-table.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/frontend/packages/core/sass/components/mat-table.scss b/src/frontend/packages/core/sass/components/mat-table.scss
index 0c90ba46b7..ebb8b6457e 100644
--- a/src/frontend/packages/core/sass/components/mat-table.scss
+++ b/src/frontend/packages/core/sass/components/mat-table.scss
@@ -16,16 +16,16 @@ $mat-table-header-paginator-font-size: 13px;
     padding: 10px 10px 10px 0;
   }
 
-  // Use margin, not padding for the left side of the first cell in the row/headwer/footer
+  // Use margin, not padding for the left side of the first cell in the row/header/footer
   .mat-cell:first-of-type, mat-footer-cell:first-of-type, mat-header-cell:first-of-type {
     margin-left: 20px;
     padding-left: 0;
   }
 
-  // Use margin, not padding for the right side of the first cell in the row/headwer/footer
+  // Use margin, not padding for the right side of the first cell in the row/header/footer
   .mat-cell:last-of-type, mat-footer-cell:last-of-type, mat-header-cell:last-of-type {
     margin-right: 20px;
     padding-right: 0;
   }
 
-}
\ No newline at end of file
+}

From 403e9e06f8872c13fbe4e4c79461101bcacf4568 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 28 Apr 2020 10:57:49 +0100
Subject: [PATCH 036/176] Ensure we filter out maxed results for local lists -
 When apps collection is fetched and exceeds maxed allowed certain monitor
 observables were still firing with the partial collection of apps - This led
 to app based stats (like count and memory) to be shown on the space cards &
 summary - This was caused by a correction to the pagination monitor to use
 'local' monitor observables instead of non-local - The now correct observable
 to use did not have a filter for maxed results, so emited the bad data

---
 src/frontend/packages/store/src/monitors/pagination-monitor.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/frontend/packages/store/src/monitors/pagination-monitor.ts b/src/frontend/packages/store/src/monitors/pagination-monitor.ts
index 03e06a4d68..3aded6a5a6 100644
--- a/src/frontend/packages/store/src/monitors/pagination-monitor.ts
+++ b/src/frontend/packages/store/src/monitors/pagination-monitor.ts
@@ -239,6 +239,7 @@ export class PaginationMonitor<T = any, Y extends AppState = GeneralEntityAppSta
       distinctUntilChanged(),
       // Improve efficiency
       observeOn(asapScheduler),
+      filter(pagination => this.hasPage(pagination) && !LocalPaginationHelpers.isPaginationMaxed(pagination)),
       combineLatestOperator(entityObservable$),
       withLatestFrom(allEntitiesObservable$),
       map(([[pagination], allEntities]) => {

From 7a82ca7a026d3bc7fe2b117c0c3c2399cf710267 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 30 Apr 2020 15:44:19 +0100
Subject: [PATCH 037/176] Provide typed way to access actions (and dispatch
 them), entity monitors/services and pagaintion monitors/services via the
 catalog entity - fixes #4246

---
 .../src/cf-autoscaler-testing.module.ts       |   2 +-
 .../autoscaler-tab-extension.component.ts     |   2 +-
 .../src/store/autoscaler-entity-generator.ts  |   2 +-
 .../src/store/autoscaler.effects.ts           |   2 +-
 .../src/actions/application.actions.ts        |   3 +-
 .../src/actions/cloud-foundry.actions.ts      |   6 +-
 .../actions/deploy-applications.actions.ts    |  27 +-
 .../src/actions/feature-flags.actions.ts      |   7 +-
 .../src/actions/github.actions.ts             |  13 +-
 .../src/actions/service-instances.actions.ts  |  13 +-
 .../src/actions/service.actions.ts            |   2 +-
 .../src/actions/space.actions.ts              |   1 +
 .../cloud-foundry/src/actions/stack.action.ts |   9 +-
 .../cloud-foundry/src/cf-entity-catalog.ts    | 247 +++++++++++
 .../cloud-foundry/src/cf-entity-factory.ts    |  41 +-
 .../cloud-foundry/src/cf-entity-generator.ts  | 392 ++++++++++++------
 .../src/cf-entity-relations.getters.ts        |   4 +-
 .../src/cloud-foundry-test.module.ts          |   2 +-
 .../cloud-foundry/src/cloud-foundry.module.ts |   6 +-
 .../application-env-var.action-builders.ts    |  58 ++-
 .../application-stats.action-builders.ts      |  10 +-
 .../application-summary.action-builders.ts    |   8 +-
 .../application.action-builders.ts            |  25 +-
 .../buildpack.action-builders.ts              |  13 +-
 .../cf-info.action-builders.ts                |   4 +-
 .../cf.action-builder.types.ts                |  17 -
 .../domin.action-builder.ts                   |  34 +-
 .../feature-flag.action-builder.ts            |  13 +-
 .../git-action-builder.ts                     |  38 +-
 .../organization.action-builders.ts           |   4 +-
 .../quota-definition.action-builders.ts       |  38 +-
 .../security-groups.action-builder.ts         |  18 +-
 .../service-binding.action-builders.ts        |   6 +-
 .../service-broker.entity-builders.ts         |  17 +-
 .../service-instance.action.builders.ts       |   4 +-
 ...service-plan-visibility.action-builders.ts |  12 +-
 .../service-plan.action-builders.ts           |  13 +-
 .../service.entity-builders.ts                |  24 +-
 .../space-quota.action-builders.ts            |   2 +-
 .../space.action-builders.ts                  |  26 ++
 .../stack-action-builders.ts                  |   4 +-
 .../user-provided-service.action-builders.ts  |  33 +-
 .../user.action-builders.ts                   |   5 +-
 .../entity-relation-tree.helpers.ts           |  19 -
 .../entity-relations/entity-relation-tree.ts  |   2 +-
 .../entity-relations-from-parent.spec.ts      |   2 +-
 .../entity-relations-validate.spec.ts         |   2 +-
 .../src/entity-relations/entity-relations.ts  |  13 +-
 .../processors/org-space-post-processor.ts    |   2 +-
 .../application-delete.component.ts           |  62 +--
 ...te-instances-routes-list-config.service.ts |  61 +--
 .../applications/application.service.ts       | 114 ++---
 .../application/application-base.component.ts |   7 -
 .../application-polling.service.ts            |  15 +-
 .../application-tabs-base.component.ts        |   2 +-
 .../build-tab/application-env-vars.service.ts |  29 +-
 .../tabs/build-tab/build-tab.component.ts     |  19 +-
 .../tabs/gitscm-tab/gitscm-tab.component.ts   |  55 +--
 .../create-application-step3.component.html   |   4 +-
 .../create-application-step3.component.ts     |  75 ++--
 ...ploy-application-options-step.component.ts |  44 +-
 .../deploy-application-step2.component.ts     |  47 +--
 .../deploy-application-step3.component.ts     |  23 +-
 .../deploy-application-steps.types.ts         |  22 +-
 .../routes/add-routes/add-routes.component.ts |  75 +---
 .../cloud-foundry/add-edit-space-step-base.ts |  62 +--
 .../create-organization-step.component.ts     |  31 +-
 .../create-space-step.component.ts            |  22 +-
 .../edit-organization-step.component.ts       |  26 +-
 .../edit-space-step.component.ts              |  52 +--
 .../quota-definition-base.component.ts        |  22 +-
 .../quota-definition.component.ts             |  11 +-
 .../cloud-foundry-endpoint.service.ts         |  79 +---
 .../services/cloud-foundry-org-space-quota.ts |   4 +-
 .../cloud-foundry-organization.service.ts     |  22 +-
 .../services/cloud-foundry-space.service.ts   |  17 +-
 .../space-quota-definition.component.ts       |  12 +-
 .../cloud-foundry-space-summary.component.ts  |   4 +-
 ...-foundry-organization-summary.component.ts |   2 +-
 .../invite-users-create.component.ts          |  36 +-
 .../users/manage-users/cf-roles.service.ts    |  35 +-
 .../manage-users-confirm.component.ts         |   2 +-
 .../service-base/service-base.component.ts    |  19 +-
 .../service-catalog.helpers.ts                |  11 +-
 .../service-catalog/services-helper.ts        |  99 +----
 .../service-catalog/services.service.ts       |  67 +--
 .../detach-service-instance.component.ts      |  24 +-
 .../services/services-wall.service.ts         |  49 +--
 .../add-service-instance.component.ts         |  80 +---
 .../bind-apps-step.component.ts               |   2 -
 ...instance-helper-service-factory.service.ts |   5 -
 .../create-service-instance-helper.service.ts | 140 +------
 .../add-service-instance/csi-mode.service.ts  |  18 +-
 .../specify-details-step.component.ts         |  62 +--
 ...specify-user-provided-details.component.ts |  11 +-
 .../card-cf-recent-apps.component.ts          |   9 +-
 .../compact-app-card.component.ts             |   1 -
 .../service-broker-card.component.ts          |  21 +-
 .../cf-app-instances-data-source.ts           |   8 +-
 .../cf-app-map-routes-list-config.service.ts  |  12 +-
 .../cf-app-routes-list-config-base.ts         |   8 +-
 .../app-service-binding-card.component.ts     |  30 +-
 .../app-service-binding-data-source.ts        |  27 +-
 .../cf-app-variables-data-source.ts           |  21 +-
 .../cf-app-variables-list-config.service.ts   |  25 +-
 .../list-types/app/card/card-app.component.ts |   1 -
 .../list-types/app/cf-apps-data-source.ts     |  15 +-
 .../table-cell-app-status.component.ts        |   1 -
 .../cf-buildpacks-data-source.ts              |   9 +-
 .../cf-events/cf-events-data-source.ts        |  13 +-
 .../cf-feature-flags-data-source.helpers.ts   |  21 -
 .../cf-feature-flags-data-source.ts           |   4 +-
 .../cf-feature-flags-list-config.service.ts   |   4 +-
 .../cf-routes/cf-routes-data-source-base.ts   |  11 +-
 .../cf-routes/cf-routes-data-source.ts        |  10 +-
 .../cf-routes/cf-routes-list-config-base.ts   |  10 +-
 .../cf-security-groups-data-source.ts         |   8 +-
 .../cf-select-users-list-config.service.ts    |   2 +-
 .../cf-service-card.component.ts              |   4 +-
 .../cf-services/cf-services-data-source.ts    |   9 +-
 .../cf-space-apps-data-source.service.ts      |  15 +-
 .../cf-space-routes-data-source.ts            |  13 +-
 ...cf-spaces-service-instances-data-source.ts |  10 +-
 ...aces-user-service-instances-data-source.ts |  13 +-
 ...ervice-instance-apps-attached.component.ts |   8 -
 .../cf-spaces-data-source.service.ts          |  14 +-
 .../cf-stacks/cf-stacks-data-source.ts        |   9 +-
 .../cf-org-permission-cell.component.ts       |   7 +-
 .../cf-space-permission-cell.component.ts     |   7 +-
 .../cf-users/cf-user-list-config.service.ts   |   2 +-
 .../detach-apps/detach-apps-data-source.ts    |  21 +-
 .../detach-apps-list-config.service.ts        |   2 +-
 .../service-instances-data-source.ts          |   7 +-
 .../service-plans-data-source.ts              |   7 +-
 .../service-instance-card.component.ts        |   3 -
 .../service-instances-wall-data-source.ts     |  13 +-
 .../running-instances.component.ts            |  14 +-
 .../service-plan-public.component.ts          |   6 +-
 .../cf-org-space-service.service.ts           |  14 +-
 .../shared/data-services/cf-user.service.ts   |  34 +-
 .../service-action-helper.service.ts          |  54 +--
 .../store/effects/cloud-foundry.effects.ts    |  20 +-
 .../src/store/effects/deploy-app.effects.ts   |  38 +-
 .../src/store/effects/github.effects.ts       |  19 +-
 .../src/store/effects/permissions.effect.ts   |   8 +-
 .../src/store/types/github.types.ts           |   4 +-
 .../cloud-foundry-endpoint-service.helper.ts  |   4 +-
 .../packages/core/endpoints-health-checks.ts  |   2 +-
 ...api-endpoint-type-select-page.component.ts |   2 +-
 .../api-entity-list-page.component.ts         |   7 +-
 .../api-entity-type-select-page.component.ts  |  11 +-
 src/frontend/packages/core/src/app.module.ts  |   9 +-
 .../packages/core/src/base-entity-types.ts    |  25 +-
 .../packages/core/src/core/cf-api.types.ts    |   1 +
 .../packages/core/src/core/core.module.ts     |  12 +-
 .../core/current-user-permissions.checker.ts  |  25 +-
 .../core/src/core/endpoints.service.ts        |   2 +-
 .../core/src/core/user-favorite-manager.ts    |   2 +-
 .../core/src/core/user-profile.service.ts     |  24 +-
 .../packages/core/src/core/utils.service.ts   |  50 ++-
 .../create-quota-step.component.ts            |  17 +-
 .../create-space-quota-step.component.ts      |  20 +-
 .../edit-quota-step.component.ts              |  35 +-
 .../edit-space-quota-step.component.ts        |  38 +-
 .../quota-definition-form.component.ts        |  49 +--
 .../space-quota-definition-form.component.ts  |  41 +-
 .../dashboard-base.component.ts               |  12 +-
 .../backup-connection-cell.component.ts       |   2 +-
 .../backup-endpoints.service.ts               |   2 +-
 .../backup-endpoints.component.ts             |   2 +-
 .../connect-endpoint.component.ts             |   2 +-
 .../src/features/endpoints/connect.service.ts |   2 +-
 .../create-endpoint-base-step.component.ts    |   2 +-
 .../create-endpoint-cf-step-1.component.ts    |   6 +-
 .../create-endpoint.component.ts              |   2 +-
 .../edit-endpoint-step.component.ts           |   2 +-
 .../metrics/metrics/metrics.component.ts      |   2 +-
 .../favorite-config-mapper.ts                 |  14 +-
 .../favorites-meta-card.component.ts          |   2 +-
 .../list-data-source.ts                       |   2 +-
 .../local-list.helpers.ts                     |   2 +-
 .../table-cell-service.component.ts           |  68 ++-
 .../endpoint-card/endpoint-card.component.ts  |   6 +-
 .../endpoint/endpoint-list.helpers.ts         |   4 +-
 .../endpoint/endpoints-list-config.service.ts |   2 +-
 .../table-cell-endpoint-details.component.ts  |   2 +-
 .../table-cell-endpoint-name.component.ts     |   4 +-
 .../table-cell-endpoint-status.component.ts   |   2 +-
 .../github-commits-data-source.ts             |   8 +-
 ...hub-commits-list-config-app-tab.service.ts |  39 +-
 .../shared/components/list/list.component.ts  |   7 +-
 .../max-list-message.component.ts             |   2 +-
 .../simple-list/entity-catalog-datasource.ts  |  13 +-
 .../simple-list/simple-list.component.spec.ts |  19 +-
 .../list/simple-list/simple-list.component.ts |  15 +-
 .../shared/data-services/scm/github-scm.ts    |   8 +-
 .../shared/data-services/scm/gitlab-scm.ts    |  11 +
 .../core/src/shared/data-services/scm/scm.ts  |   1 +
 .../services/cf-org-space-label.service.ts    |   2 +-
 ...-foundry-user-provided-services.service.ts | 100 ++---
 .../packages/core/src/shared/shared.module.ts |   7 +-
 .../application-service-helper.ts             |   8 -
 .../core/test-framework/core-test.modules.ts  |   2 +-
 .../entity-catalog-test-helpers.ts            |   4 +-
 .../packages/store/src/effects/app.effects.ts |   9 +-
 .../store/src/effects/endpoint.effects.ts     |  65 +--
 .../store/src/effects/metrics.effects.ts      |  12 +-
 .../store/src/effects/update-app-effects.ts   |  18 +-
 .../src/effects/user-favorites-effect.ts      |   2 +-
 .../store/src/effects/user-profile.effects.ts |   2 +-
 .../store/src/effects/users-roles.effects.ts  |  11 +-
 .../store/src/entity-catalog-test.module.ts   |  10 +-
 .../store/src/entity-catalog.actions.ts       |   3 +-
 .../store/src/entity-catalog.module.ts        |   4 +-
 .../action-dispatcher.spec.ts                 | 231 ++++++-----
 .../action-dispatcher/action-dispatcher.ts    |  79 ----
 .../action-orchestrator.ts                    |  24 +-
 .../action-builder-config.mapper.ts           |   8 +-
 .../entity-catalog-entity-store-helpers.ts    | 222 ++++++++++
 .../entity-catalog-entity.ts                  | 106 +++--
 .../entity-catalog-entity.types.ts            | 120 ++++++
 .../entity-catalog.service.ts                 |  22 +
 .../entity-catalog/entity-catalog.helper.ts   |  10 +
 ...service.spec.ts => entity-catalog.spec.ts} |  12 +-
 .../entity-catalog.store-setup.ts             |  15 -
 ...y-catalog.service.ts => entity-catalog.ts} |  47 ++-
 .../entity-catalog/entity-catalog.types.ts    |   1 -
 .../base-single-entity-request.pipeline.ts    |  10 +-
 .../entity-pagination-request-pipeline.ts     |   7 +-
 .../endpoint-errors.handler.spec.ts           |   2 +-
 .../endpoint-errors.handler.ts                |   2 +-
 .../fail-entity-request.handler.spec.ts       |   2 +-
 .../fail-entity-request.handler.ts            |   2 +-
 .../forced-action-type.helpers.ts             |   2 +-
 .../jetstream-error.handler.ts                |   2 +-
 .../make-request-entity-request.pipe.ts       |   2 +-
 .../map-multi-endpoint.pipes.ts               |   4 +-
 .../start-entity-request.handler.spec.ts      |   2 +-
 .../success-entity-request.handler.ts         |   4 +-
 .../entity-request-pipeline.ts                |   4 +-
 .../entity-request-pipeline.types.ts          |   6 +-
 .../get-params.pipe.ts                        |   3 -
 .../pagination-iterator.pipe.ts               |   2 +-
 .../pipeline-helpers.ts                       |   4 +-
 .../pipline-http-client.service.ts            |   2 +-
 .../src/entity-service-factory.service.ts     |   2 +-
 .../packages/store/src/entity-service.spec.ts |  26 +-
 .../packages/store/src/entity-service.ts      |   7 +-
 .../entity-monitor.factory.service.ts         |  18 +-
 .../monitors/pagination-monitor.factory.ts    |   2 +-
 .../store/src/monitors/pagination-monitor.ts  |  24 +-
 .../request-data-reducer.factory.ts           |   4 +-
 .../api-request-reducer/request-helpers.ts    |   7 +-
 .../api-request-reducer/succeed-request.ts    |   2 +-
 .../api-request-reducers.generator.ts         |   2 +-
 .../recently-visited.reducer.ts               |   2 +-
 ...tion-reducer-clear-pagination-of-entity.ts |   2 +-
 ...agination-reducer-clear-pagination-type.ts |   2 +-
 ...gination-reducer-create-pagination.spec.ts |   2 +-
 .../pagination-reducer-create-pagination.ts   |   2 +-
 .../pagination-reducer-max-reached.ts         |   2 +-
 .../pagination-reducer-reset-pagination.ts    |   2 +-
 .../pagination-reducer.helper.ts              |  29 +-
 .../pagination-reducer.types.ts               |  34 ++
 .../pagination-reducer/pagination.reducer.ts  |   2 +-
 .../selectors/current-user-role.selectors.ts  |   2 -
 .../selectors/favorite-groups.selectors.ts    |   4 +-
 .../store/testing/src/store-test-helper.ts    |   2 +-
 .../store/testing/src/store-test.module.ts    |   2 +-
 269 files changed, 2609 insertions(+), 3008 deletions(-)
 create mode 100644 src/frontend/packages/cloud-foundry/src/cf-entity-catalog.ts
 delete mode 100644 src/frontend/packages/cloud-foundry/src/entity-action-builders/cf.action-builder.types.ts
 delete mode 100644 src/frontend/packages/cloud-foundry/src/entity-relations/entity-relation-tree.helpers.ts
 delete mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-data-source.helpers.ts
 delete mode 100644 src/frontend/packages/store/src/entity-catalog/action-dispatcher/action-dispatcher.ts
 rename src/frontend/packages/store/src/entity-catalog/{ => entity-catalog-entity}/action-builder-config.mapper.ts (94%)
 create mode 100644 src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts
 rename src/frontend/packages/store/src/entity-catalog/{ => entity-catalog-entity}/entity-catalog-entity.ts (80%)
 create mode 100644 src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.types.ts
 create mode 100644 src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog.service.ts
 rename src/frontend/packages/store/src/entity-catalog/{entity-catalog.service.spec.ts => entity-catalog.spec.ts} (95%)
 rename src/frontend/packages/store/src/entity-catalog/{entity-catalog.service.ts => entity-catalog.ts} (86%)

diff --git a/src/frontend/packages/cf-autoscaler/src/cf-autoscaler-testing.module.ts b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler-testing.module.ts
index 96f92c9ba3..594a5608aa 100644
--- a/src/frontend/packages/cf-autoscaler/src/cf-autoscaler-testing.module.ts
+++ b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler-testing.module.ts
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 
 import { generateCFEntities } from '../../cloud-foundry/src/cf-entity-generator';
 import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../store/src/entity-catalog.module';
-import { entityCatalog, TestEntityCatalog } from '../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog, TestEntityCatalog } from '../../store/src/entity-catalog/entity-catalog';
 import { generateASEntities } from './store/autoscaler-entity-generator';
 
 @NgModule({
diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
index f3cb8c050a..215b6a3a33 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
@@ -16,7 +16,7 @@ import { ConfirmationDialogConfig } from '../../../../core/src/shared/components
 import { ConfirmationDialogService } from '../../../../core/src/shared/components/confirmation-dialog.service';
 import { RouterNav } from '../../../../store/src/actions/router.actions';
 import { AppState } from '../../../../store/src/app-state';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
 import { EntityService } from '../../../../store/src/entity-service';
 import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
index fe10d93c33..ec907724ab 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
@@ -5,7 +5,7 @@ import { IOrganization } from '../../../core/src/core/cf-api.types';
 import {
   StratosBaseCatalogEntity,
   StratosCatalogEntity,
-} from '../../../store/src/entity-catalog/entity-catalog-entity';
+} from '../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { IStratosEndpointDefinition } from '../../../store/src/entity-catalog/entity-catalog.types';
 import { APIResource } from '../../../store/src/types/api.types';
 import { IFavoriteMetadata } from '../../../store/src/types/user-favorites.types';
diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts
index dde4382a87..094fbef14d 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts
@@ -6,7 +6,7 @@ import { Observable } from 'rxjs';
 import { catchError, mergeMap, withLatestFrom } from 'rxjs/operators';
 
 import { PaginationResponse } from '../../../cloud-foundry/src/store/types/cf-api.types';
-import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
 import { environment } from '../../../core/src/environments/environment';
 import { isHttpErrorResponse } from '../../../core/src/jetstream.helpers';
 import { AppState } from '../../../store/src/app-state';
diff --git a/src/frontend/packages/cloud-foundry/src/actions/application.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/application.actions.ts
index a7574dedc8..256ff8be9e 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/application.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/application.actions.ts
@@ -8,7 +8,7 @@ import { ICFAction } from '../../../store/src/types/request.types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import { applicationEntityType, appStatsEntityType } from '../cf-entity-types';
 import { CF_ENDPOINT_TYPE } from '../cf-types';
-import { EntityInlineParentAction } from '../entity-relations/entity-relations.types';
+import { createEntityRelationPaginationKey, EntityInlineParentAction } from '../entity-relations/entity-relations.types';
 import { AppMetadataTypes } from './app-metadata.actions';
 import { CFStartAction } from './cf-action.types';
 
@@ -55,6 +55,7 @@ export class GetAllApplications extends CFStartAction implements PaginatedAction
       'GET',
       'apps'
     );
+    this.paginationKey = this.paginationKey || createEntityRelationPaginationKey('cf', endpointGuid)
   }
   actions = [GET_ALL, GET_ALL_SUCCESS, GET_ALL_FAILED];
   entity = [applicationEntitySchema];
diff --git a/src/frontend/packages/cloud-foundry/src/actions/cloud-foundry.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/cloud-foundry.actions.ts
index e99aab4249..4896e94330 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/cloud-foundry.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/cloud-foundry.actions.ts
@@ -1,11 +1,11 @@
-import { CF_ENDPOINT_TYPE } from '../cf-types';
-import { cfInfoEntityType } from '../cf-entity-types';
 import { EntityRequestAction } from '../../../store/src/types/request.types';
+import { cfInfoEntityType } from '../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../cf-types';
 
 export const GET_CF_INFO = '[CF Endpoint] Get Info';
 
 export class GetCFInfo implements EntityRequestAction {
-  constructor(public cfGuid: string) { }
+  constructor(public guid: string) { }
   type = GET_CF_INFO;
   endpointType = CF_ENDPOINT_TYPE;
   entityType = cfInfoEntityType;
diff --git a/src/frontend/packages/cloud-foundry/src/actions/deploy-applications.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/deploy-applications.actions.ts
index 41a7be9d28..c4832fe3c9 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/deploy-applications.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/deploy-applications.actions.ts
@@ -3,8 +3,8 @@ import { Action } from '@ngrx/store';
 import { GitSCM } from '../../../core/src/shared/data-services/scm/scm';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { EntityRequestAction } from '../../../store/src/types/request.types';
-import { CF_ENDPOINT_TYPE } from '../cf-types';
 import { gitBranchesEntityType, gitCommitEntityType } from '../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../cf-types';
 import { DockerAppDetails, GitAppDetails, OverrideAppDetails, SourceType } from '../store/types/deploy-application.types';
 import { GitBranch, GitCommit } from '../store/types/git.types';
 
@@ -14,6 +14,7 @@ export const PROJECT_DOESNT_EXIST = '[Deploy App] Project Doesn\'t exist';
 export const PROJECT_FETCH_FAILED = '[Deploy App] Project Fetch Failed';
 export const PROJECT_EXISTS = '[Deploy App] Project exists';
 export const FETCH_BRANCHES_FOR_PROJECT = '[Deploy App] Fetch branches';
+export const FETCH_BRANCH_FOR_PROJECT = '[Deploy App] Fetch branch';
 export const SAVE_APP_DETAILS = '[Deploy App] Save app details';
 export const SAVE_APP_OVERRIDE_DETAILS = '[Deploy App] Save app override details';
 export const FETCH_COMMIT = '[Deploy App] Fetch commit';
@@ -29,6 +30,10 @@ export const FETCH_BRANCH_START = '[GitHub] Fetch branch start';
 export const FETCH_BRANCH_SUCCESS = '[GitHub] Fetch branch succeeded';
 export const FETCH_BRANCH_FAILED = '[GitHub] Fetch branch failed';
 
+export const FETCH_BRANCHES_START = '[GitHub] Fetch branches start';
+export const FETCH_BRANCHES_SUCCESS = '[GitHub] Fetch branches succeeded';
+export const FETCH_BRANCHES_FAILED = '[GitHub] Fetch branches failed';
+
 export class SetAppSourceDetails implements Action {
   constructor(public sourceType: SourceType) { }
   type = SET_APP_SOURCE_DETAILS;
@@ -54,9 +59,9 @@ export class ProjectExists implements Action {
   type = PROJECT_EXISTS;
 }
 
-export class FetchBranchesForProject implements PaginatedAction {
-  constructor(public scm: GitSCM, public projectName: string) {
-    this.paginationKey = FetchBranchesForProject.createPaginationKey(scm, projectName);
+export class FetchBranchForProject implements EntityRequestAction {
+  constructor(public scm: GitSCM, public projectName: string, public guid: string, public branchName: string) {
+    this.guid = this.guid || `${scm.getType()}-${this.projectName}-${this.branchName}`
   }
   actions = [
     FETCH_BRANCH_START,
@@ -64,6 +69,20 @@ export class FetchBranchesForProject implements PaginatedAction {
     FETCH_BRANCH_FAILED
   ];
   public endpointType = CF_ENDPOINT_TYPE;
+  type = FETCH_BRANCH_FOR_PROJECT;
+  entityType = gitBranchesEntityType;
+}
+
+export class FetchBranchesForProject implements PaginatedAction {
+  constructor(public scm: GitSCM, public projectName: string) {
+    this.paginationKey = FetchBranchesForProject.createPaginationKey(scm, projectName);
+  }
+  actions = [
+    FETCH_BRANCHES_START,
+    FETCH_BRANCHES_SUCCESS,
+    FETCH_BRANCHES_FAILED
+  ];
+  public endpointType = CF_ENDPOINT_TYPE;
   type = FETCH_BRANCHES_FOR_PROJECT;
   entityType = gitBranchesEntityType;
   paginationKey: string;
diff --git a/src/frontend/packages/cloud-foundry/src/actions/feature-flags.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/feature-flags.actions.ts
index 9464841c32..98a6d9974b 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/feature-flags.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/feature-flags.actions.ts
@@ -1,15 +1,18 @@
 import { HttpRequest } from '@angular/common/http';
 
 import { getActions } from '../../../store/src/actions/action.helper';
+import { endpointSchemaKey } from '../../../store/src/helpers/entity-factory';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { RequestEntityLocation } from '../../../store/src/types/request.types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import { featureFlagEntityType } from '../cf-entity-types';
+import { createEntityRelationPaginationKey } from '../entity-relations/entity-relations.types';
 import { CFStartAction } from './cf-action.types';
 
 export class GetAllFeatureFlags extends CFStartAction implements PaginatedAction {
-  constructor(public endpointGuid: string, public paginationKey: string) {
+  constructor(public endpointGuid: string, public paginationKey: string = '') {
     super();
+    this.paginationKey = this.paginationKey || createEntityRelationPaginationKey(endpointSchemaKey, this.endpointGuid);
     this.options = new HttpRequest(
       'GET',
       `config/feature_flags`
@@ -21,7 +24,7 @@ export class GetAllFeatureFlags extends CFStartAction implements PaginatedAction
   entity = [cfEntityFactory(featureFlagEntityType)];
   actions = getActions('Feature Flags', 'Fetch all');
   options: HttpRequest<any>;
-  flattenPagination = false;
+  flattenPagination = true;
   entityLocation = RequestEntityLocation.ARRAY;
   initialParams = {
     page: 1,
diff --git a/src/frontend/packages/cloud-foundry/src/actions/github.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/github.actions.ts
index e2a875c49b..c02111909b 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/github.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/github.actions.ts
@@ -1,15 +1,16 @@
-import { CF_ENDPOINT_TYPE } from '../cf-types';
-import { gitRepoEntityType } from '../cf-entity-types';
-import {
-  EnvVarStratosProject,
-} from '../features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service';
 import { EntityRequestAction } from '../../../store/src/types/request.types';
+import { gitRepoEntityType } from '../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../cf-types';
+import { GitMeta } from '../entity-action-builders/git-action-builder';
 
 export const FETCH_GITHUB_REPO = '[Github] Fetch Github repo details';
 
 export class FetchGitHubRepoInfo implements EntityRequestAction {
-  constructor(public stProject: EnvVarStratosProject) { }
+  constructor(public meta: GitMeta) {
+    this.guid = this.meta.scm.getType() + '-' + this.meta.projectName;
+  }
   type = FETCH_GITHUB_REPO;
   endpointType = CF_ENDPOINT_TYPE;
   entityType = gitRepoEntityType;
+  public guid: string;
 }
diff --git a/src/frontend/packages/cloud-foundry/src/actions/service-instances.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/service-instances.actions.ts
index a0b111c079..275d550eff 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/service-instances.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/service-instances.actions.ts
@@ -16,6 +16,7 @@ import {
   spaceEntityType,
 } from '../cf-entity-types';
 import { createEntityRelationKey, EntityInlineParentAction } from '../entity-relations/entity-relations.types';
+import { QParam, QParamJoiners } from '../shared/q-param';
 import { CFStartAction } from './cf-action.types';
 
 export const DELETE_SERVICE_INSTANCE_ACTIONS = getActions('Service Instances', 'Delete Service Instance');
@@ -114,8 +115,8 @@ export class DeleteServiceInstance extends CFStartAction implements ICFAction {
 }
 export class CreateServiceInstance extends CFStartAction implements ICFAction {
   constructor(
-    public endpointGuid: string,
     public guid: string,
+    public endpointGuid: string,
     public name: string,
     public servicePlanGuid: string,
     public spaceGuid: string,
@@ -159,15 +160,15 @@ export class CreateServiceInstance extends CFStartAction implements ICFAction {
 export class UpdateServiceInstance extends CreateServiceInstance {
   static updateServiceInstance = 'Updating-Service-Instance';
   constructor(
-    public endpointGuid: string,
     public guid: string,
+    public endpointGuid: string,
     public name: string,
     public servicePlanGuid: string,
     public spaceGuid: string,
     public params: object,
     public tags: string[],
   ) {
-    super(endpointGuid, guid, name, servicePlanGuid, spaceGuid, params, tags, 'PUT', `service_instances/${guid}`);
+    super(guid, endpointGuid, name, servicePlanGuid, spaceGuid, params, tags, 'PUT', `service_instances/${guid}`);
     this.actions = getActions('Service Instances', 'Update Service Instance');
   }
   updatingKey = UpdateServiceInstance.updateServiceInstance;
@@ -188,8 +189,11 @@ export class ListServiceBindingsForInstance
     super();
     this.options = new HttpRequest(
       'GET',
-      `service_instances/${serviceInstanceGuid}/service_bindings`
+      `service_bindings`
     );
+    this.initialParams.q = [
+      new QParam('service_instance_guid', serviceInstanceGuid, QParamJoiners.in).toString(),
+    ]
   }
   actions = getActions('Service Instances', 'Get all service bindings for instance');
   entity = [cfEntityFactory(serviceBindingNoBindingsEntityType)];
@@ -200,6 +204,7 @@ export class ListServiceBindingsForInstance
     'results-per-page': 100,
     'order-direction': 'desc',
     'order-direction-field': 'creation',
+    q: []
   };
   flattenPagination = true;
 }
diff --git a/src/frontend/packages/cloud-foundry/src/actions/service.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/service.actions.ts
index fe68c1700c..dddcc56074 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/service.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/service.actions.ts
@@ -1,7 +1,7 @@
 import { HttpRequest } from '@angular/common/http';
 
 import { getActions } from '../../../store/src/actions/action.helper';
-import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import { serviceEntityType, servicePlanEntityType } from '../cf-entity-types';
diff --git a/src/frontend/packages/cloud-foundry/src/actions/space.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/space.actions.ts
index 87ee30f019..9aef2ed1d3 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/space.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/space.actions.ts
@@ -62,6 +62,7 @@ export class GetSpace extends CFStartAction implements ICFAction, EntityInlinePa
     GET_SPACE_FAILED
   ];
   entity = [cfEntityFactory(spaceEntityType)];
+  schemaKey = '';
   entityType = spaceEntityType;
   options: HttpRequest<any>;
 }
diff --git a/src/frontend/packages/cloud-foundry/src/actions/stack.action.ts b/src/frontend/packages/cloud-foundry/src/actions/stack.action.ts
index 42ef7c42b9..b4a274ee38 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/stack.action.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/stack.action.ts
@@ -1,13 +1,14 @@
-import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog.service';
+import { HttpRequest } from '@angular/common/http';
+
 import { getActions } from '../../../store/src/actions/action.helper';
+import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
 import { endpointSchemaKey } from '../../../store/src/helpers/entity-factory';
-import { createEntityRelationKey } from '../entity-relations/entity-relations.types';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
-import { CF_ENDPOINT_TYPE } from '../cf-types';
 import { stackEntityType } from '../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../cf-types';
+import { createEntityRelationKey } from '../entity-relations/entity-relations.types';
 import { CFStartAction } from './cf-action.types';
-import { HttpRequest } from '@angular/common/http';
 
 export const GET = '[Stack] Get one';
 export const GET_SUCCESS = '[Stack] Get one success';
diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-catalog.ts b/src/frontend/packages/cloud-foundry/src/cf-entity-catalog.ts
new file mode 100644
index 0000000000..ee85433d72
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-catalog.ts
@@ -0,0 +1,247 @@
+import {
+  IService,
+  IServiceBinding,
+  IServiceBroker,
+  IServiceInstance,
+  IServicePlan,
+  IServicePlanVisibility,
+  IUserProvidedServiceInstance,
+} from '../../core/src/core/cf-api-svc.types';
+import {
+  CfEvent,
+  IApp,
+  IAppSummary,
+  IBuildpack,
+  ICfV2Info,
+  IDomain,
+  IFeatureFlag,
+  IOrganization,
+  IOrgQuotaDefinition,
+  IPrivateDomain,
+  IRoute,
+  ISecurityGroup,
+  ISpace,
+  ISpaceQuotaDefinition,
+  IStack,
+} from '../../core/src/core/cf-api.types';
+import {
+  StratosBaseCatalogEntity,
+  StratosCatalogEndpointEntity,
+} from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { APIResource } from '../../store/src/types/api.types';
+import { IAppFavMetadata, IBasicCFMetaData, IOrgFavMetadata, ISpaceFavMetadata } from './cf-metadata-types';
+import { AppEnvVarActionBuilders } from './entity-action-builders/application-env-var.action-builders';
+import { AppStatsActionBuilders } from './entity-action-builders/application-stats.action-builders';
+import { AppSummaryActionBuilders } from './entity-action-builders/application-summary.action-builders';
+import { ApplicationActionBuilders } from './entity-action-builders/application.action-builders';
+import { BuildpackActionBuilders } from './entity-action-builders/buildpack.action-builders';
+import { CfEventActionBuilders } from './entity-action-builders/cf-event.action-builders';
+import { CfInfoDefinitionActionBuilders } from './entity-action-builders/cf-info.action-builders';
+import { DomainActionBuilders } from './entity-action-builders/domin.action-builder';
+import { FeatureFlagActionBuilders } from './entity-action-builders/feature-flag.action-builder';
+import {
+  GitBranchActionBuilders,
+  GitCommitActionBuilders,
+  GitCommitActionBuildersConfig,
+  GitRepoActionBuilders,
+} from './entity-action-builders/git-action-builder';
+import { OrganizationActionBuilders } from './entity-action-builders/organization.action-builders';
+import { QuotaDefinitionActionBuilder } from './entity-action-builders/quota-definition.action-builders';
+import { RoutesActionBuilders } from './entity-action-builders/routes.action-builder';
+import { SecurityGroupBuilders } from './entity-action-builders/security-groups.action-builder';
+import { ServiceBindingActionBuilders } from './entity-action-builders/service-binding.action-builders';
+import { ServiceBrokerActionBuilders } from './entity-action-builders/service-broker.entity-builders';
+import { ServiceInstanceActionBuilders } from './entity-action-builders/service-instance.action.builders';
+import { ServicePlanVisibilityActionBuilders } from './entity-action-builders/service-plan-visibility.action-builders';
+import { ServicePlanActionBuilders } from './entity-action-builders/service-plan.action-builders';
+import { ServiceActionBuilders } from './entity-action-builders/service.entity-builders';
+import { SpaceQuotaDefinitionActionBuilders } from './entity-action-builders/space-quota.action-builders';
+import { SpaceActionBuilders } from './entity-action-builders/space.action-builders';
+import { StackActionBuilders } from './entity-action-builders/stack-action-builders';
+import { UserProvidedServiceActionBuilder } from './entity-action-builders/user-provided-service.action-builders';
+import { UserActionBuilders } from './entity-action-builders/user.action-builders';
+import { AppStat } from './store/types/app-metadata.types';
+import { GitBranch, GitCommit, GitRepo } from './store/types/git.types';
+import { CfUser } from './store/types/user.types';
+
+/**
+ * A strongly typed collection of Cloud Foundry Catalog Entities.
+ * This can be used to access functionality exposed by each specific type, such as get, update, delete, etc
+ */
+export class CfEntityCatalog {
+  public cfEndpoint: StratosCatalogEndpointEntity;
+
+  public quotaDefinition: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IOrgQuotaDefinition>,
+    QuotaDefinitionActionBuilder
+  >;
+
+  public appEnvVar: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    APIResource,
+    AppEnvVarActionBuilders
+  >;
+
+  public appSummary: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    IAppSummary,
+    AppSummaryActionBuilders
+  >;
+
+  public spaceQuota: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<ISpaceQuotaDefinition>,
+    SpaceQuotaDefinitionActionBuilders
+  >;
+
+  public privateDomain: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IPrivateDomain>
+  >;
+
+  public cfInfo: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<ICfV2Info>,
+    CfInfoDefinitionActionBuilders
+  >;
+
+  public appStats: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    AppStat,
+    AppStatsActionBuilders
+  >;
+
+  public buildPack: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IBuildpack>,
+    BuildpackActionBuilders
+  >;
+
+  public serviceBroker: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IServiceBroker>,
+    ServiceBrokerActionBuilders
+  >;
+
+  public servicePlanVisibility: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IServicePlanVisibility>,
+    ServicePlanVisibilityActionBuilders
+  >;
+
+  public securityGroup: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<ISecurityGroup>,
+    SecurityGroupBuilders
+  >;
+
+  public serviceBinding: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IServiceBinding>,
+    ServiceBindingActionBuilders
+  >;
+
+  public service: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IService>,
+    ServiceActionBuilders
+  >;
+
+  public servicePlan: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IServicePlan>,
+    ServicePlanActionBuilders
+  >;
+
+  public serviceInstance: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IServiceInstance>,
+    ServiceInstanceActionBuilders
+  >;
+
+  public user: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<CfUser>,
+    UserActionBuilders
+  >;
+
+  public domain: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IDomain>,
+    DomainActionBuilders
+  >;
+
+  public gitCommit: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    GitCommit,
+    GitCommitActionBuildersConfig,
+    GitCommitActionBuilders
+  >;
+
+  public gitRepo: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    GitRepo,
+    GitRepoActionBuilders
+  >;
+
+  public gitBranch: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    GitBranch,
+    GitBranchActionBuilders
+  >;
+
+  public event: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<CfEvent>,
+    CfEventActionBuilders
+  >;
+
+  public route: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IRoute>,
+    RoutesActionBuilders
+  >;
+
+  public stack: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IStack>,
+    StackActionBuilders
+  >;
+
+  public featureFlag: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    IFeatureFlag,
+    FeatureFlagActionBuilders
+  >;
+
+  public application: StratosBaseCatalogEntity<
+    IAppFavMetadata,
+    APIResource<IApp>,
+    ApplicationActionBuilders
+  >;
+
+  public space: StratosBaseCatalogEntity<
+    ISpaceFavMetadata,
+    APIResource<ISpace>,
+    SpaceActionBuilders
+  >;
+
+  public org: StratosBaseCatalogEntity<
+    IOrgFavMetadata,
+    APIResource<IOrganization>,
+    OrganizationActionBuilders
+  >;
+
+  public metric: StratosBaseCatalogEntity<
+    IBasicCFMetaData
+  >;
+
+  public userProvidedService: StratosBaseCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IUserProvidedServiceInstance>,
+    UserProvidedServiceActionBuilder
+  >;
+}
+
+export const cfEntityCatalog: CfEntityCatalog = new CfEntityCatalog();
diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-factory.ts b/src/frontend/packages/cloud-foundry/src/cf-entity-factory.ts
index 6515d83753..98cb1f0234 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-factory.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-factory.ts
@@ -124,9 +124,10 @@ const ServiceBindingsSchema = new CFServiceBindingEntitySchema({
     app: new CFApplicationEntitySchema(),
     service_instance: new CFServiceInstanceEntitySchema({
       entity: {
-        service_bindings: [new CFEntitySchema(serviceBindingEntityType, {
-          app: new CFApplicationEntitySchema(),
-        }, { idAttribute: getAPIResourceGuid })],
+        service_bindings: [
+          new CFEntitySchema(serviceBindingEntityType, {
+            app: new CFApplicationEntitySchema(),
+          }, { idAttribute: getAPIResourceGuid })],
         service: new CFEntitySchema(serviceEntityType, {}, { idAttribute: getAPIResourceGuid }),
         service_plan: ServicePlanSchema,
       },
@@ -199,24 +200,24 @@ const CFUserSchema = new CFUserEntitySchema({
     audited_spaces: [createUserOrgSpaceSchema(spaceEntityType, {}, CfUserRoleParams.AUDITED_SPACES)],
   }
 }, {
-    idAttribute: getAPIResourceGuid,
-    processStrategy: (user: APIResource<CfUser>) => {
-      if (user.entity.username) {
-        return user;
-      }
-      const entity = {
-        ...user.entity,
-        username: user.metadata.guid
-      };
-
-      return user.metadata ? {
-        entity,
-        metadata: user.metadata
-      } : {
-          entity
-        };
+  idAttribute: getAPIResourceGuid,
+  processStrategy: (user: APIResource<CfUser>) => {
+    if (user.entity.username) {
+      return user;
     }
-  });
+    const entity = {
+      ...user.entity,
+      username: user.metadata.guid
+    };
+
+    return user.metadata ? {
+      entity,
+      metadata: user.metadata
+    } : {
+        entity
+      };
+  }
+});
 entityCache[cfUserEntityType] = CFUserSchema;
 
 const coreSpaceSchemaParams = {
diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
index 8bd4634a96..16f0adf123 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -9,9 +9,11 @@ import {
   IServiceBroker,
   IServiceInstance,
   IServicePlan,
+  IServicePlanVisibility,
   IUserProvidedServiceInstance,
 } from '../../core/src/core/cf-api-svc.types';
 import {
+  CfEvent,
   IApp,
   IAppSummary,
   IBuildpack,
@@ -34,8 +36,7 @@ import {
   StratosBaseCatalogEntity,
   StratosCatalogEndpointEntity,
   StratosCatalogEntity,
-} from '../../store/src/entity-catalog/entity-catalog-entity';
-import { entityCatalog } from '../../store/src/entity-catalog/entity-catalog.service';
+} from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import {
   IStratosEntityDefinition,
   StratosEndpointExtensionDefinition,
@@ -49,7 +50,7 @@ import { selectSessionData } from '../../store/src/reducers/auth.reducer';
 import { endpointDisconnectRemoveEntitiesReducer } from '../../store/src/reducers/endpoint-disconnect-application.reducer';
 import { APIResource } from '../../store/src/types/api.types';
 import { PaginatedAction } from '../../store/src/types/pagination.types';
-import { IFavoriteMetadata } from '../../store/src/types/user-favorites.types';
+import { cfEntityCatalog } from './cf-entity-catalog';
 import { cfEntityFactory } from './cf-entity-factory';
 import { addCfQParams, addCfRelationParams } from './cf-entity-relations.getters';
 import {
@@ -90,41 +91,72 @@ import {
 import { CfErrorResponse, getCfError } from './cf-error-helpers';
 import { IAppFavMetadata, IBasicCFMetaData, IOrgFavMetadata, ISpaceFavMetadata } from './cf-metadata-types';
 import { CF_ENDPOINT_TYPE } from './cf-types';
-import { appEnvVarActionBuilders } from './entity-action-builders/application-env-var.action-builders';
-import { appStatsActionBuilders } from './entity-action-builders/application-stats.action-builders';
-import { appSummaryActionBuilders } from './entity-action-builders/application-summary.action-builders';
-import { applicationActionBuilder } from './entity-action-builders/application.action-builders';
-import { buildpackActionBuilders } from './entity-action-builders/buildpack.action-builders';
-import { cfEventActionBuilders } from './entity-action-builders/cf-event.action-builders';
+import {
+  AppEnvVarActionBuilders,
+  appEnvVarActionBuilders,
+} from './entity-action-builders/application-env-var.action-builders';
+import { AppStatsActionBuilders, appStatsActionBuilders } from './entity-action-builders/application-stats.action-builders';
+import {
+  AppSummaryActionBuilders,
+  appSummaryActionBuilders,
+} from './entity-action-builders/application-summary.action-builders';
+import { applicationActionBuilder, ApplicationActionBuilders } from './entity-action-builders/application.action-builders';
+import { BuildpackActionBuilders, buildpackActionBuilders } from './entity-action-builders/buildpack.action-builders';
+import { CfEventActionBuilders, cfEventActionBuilders } from './entity-action-builders/cf-event.action-builders';
 import {
   CfInfoDefinitionActionBuilders,
   cfInfoDefinitionActionBuilders,
 } from './entity-action-builders/cf-info.action-builders';
-import { domainActionBuilders } from './entity-action-builders/domin.action-builder';
-import { featureFlagActionBuilders } from './entity-action-builders/feature-flag.action-builder';
+import { DomainActionBuilders, domainActionBuilders } from './entity-action-builders/domin.action-builder';
+import { FeatureFlagActionBuilders, featureFlagActionBuilders } from './entity-action-builders/feature-flag.action-builder';
 import {
   GitBranchActionBuilders,
   gitBranchActionBuilders,
   GitCommitActionBuilders,
   gitCommitActionBuilders,
   GitCommitActionBuildersConfig,
+  GitRepoActionBuilders,
   gitRepoActionBuilders,
 } from './entity-action-builders/git-action-builder';
-import { organizationActionBuilders } from './entity-action-builders/organization.action-builders';
-import { quotaDefinitionActionBuilder } from './entity-action-builders/quota-definition.action-builders';
-import { routesActionBuilders } from './entity-action-builders/routes.action-builder';
-import { securityGroupBuilders } from './entity-action-builders/security-groups.action-builder';
-import { serviceBindingActionBuilders } from './entity-action-builders/service-binding.action-builders';
-import { serviceBrokerActionBuilders } from './entity-action-builders/service-broker.entity-builders';
-import { serviceInstanceActionBuilders } from './entity-action-builders/service-instance.action.builders';
-import { servicePlanVisibilityActionBuilders } from './entity-action-builders/service-plan-visibility.action-builders';
-import { servicePlanActionBuilders } from './entity-action-builders/service-plan.action-builders';
-import { serviceActionBuilders } from './entity-action-builders/service.entity-builders';
-import { spaceQuotaDefinitionActionBuilders } from './entity-action-builders/space-quota.action-builders';
-import { spaceActionBuilders } from './entity-action-builders/space.action-builders';
-import { stackActionBuilders } from './entity-action-builders/stack-action-builders';
-import { userProvidedServiceActionBuilder } from './entity-action-builders/user-provided-service.action-builders';
-import { userActionBuilders } from './entity-action-builders/user.action-builders';
+import {
+  OrganizationActionBuilders,
+  organizationActionBuilders,
+} from './entity-action-builders/organization.action-builders';
+import {
+  QuotaDefinitionActionBuilder,
+  quotaDefinitionActionBuilder,
+} from './entity-action-builders/quota-definition.action-builders';
+import { RoutesActionBuilders, routesActionBuilders } from './entity-action-builders/routes.action-builder';
+import { SecurityGroupBuilders, securityGroupBuilders } from './entity-action-builders/security-groups.action-builder';
+import {
+  ServiceBindingActionBuilders,
+  serviceBindingActionBuilders,
+} from './entity-action-builders/service-binding.action-builders';
+import {
+  ServiceBrokerActionBuilders,
+  serviceBrokerActionBuilders,
+} from './entity-action-builders/service-broker.entity-builders';
+import {
+  ServiceInstanceActionBuilders,
+  serviceInstanceActionBuilders,
+} from './entity-action-builders/service-instance.action.builders';
+import {
+  ServicePlanVisibilityActionBuilders,
+  servicePlanVisibilityActionBuilders,
+} from './entity-action-builders/service-plan-visibility.action-builders';
+import { ServicePlanActionBuilders, servicePlanActionBuilders } from './entity-action-builders/service-plan.action-builders';
+import { ServiceActionBuilders, serviceActionBuilders } from './entity-action-builders/service.entity-builders';
+import {
+  SpaceQuotaDefinitionActionBuilders,
+  spaceQuotaDefinitionActionBuilders,
+} from './entity-action-builders/space-quota.action-builders';
+import { SpaceActionBuilders, spaceActionBuilders } from './entity-action-builders/space.action-builders';
+import { StackActionBuilders, stackActionBuilders } from './entity-action-builders/stack-action-builders';
+import {
+  UserProvidedServiceActionBuilder,
+  userProvidedServiceActionBuilder,
+} from './entity-action-builders/user-provided-service.action-builders';
+import { UserActionBuilders, userActionBuilders } from './entity-action-builders/user.action-builders';
 import { CfEndpointDetailsComponent } from './shared/components/cf-endpoint-details/cf-endpoint-details.component';
 import { updateApplicationRoutesReducer } from './store/reducers/application-route.reducer';
 import { updateOrganizationQuotaReducer } from './store/reducers/organization-quota.reducer';
@@ -139,15 +171,20 @@ import { GitBranch, GitCommit, GitRepo } from './store/types/git.types';
 import { CfUser } from './store/types/user.types';
 
 export interface CFBasePipelineRequestActionMeta {
+  /**
+   * Define a set of children that a cf entity should have, for instance organisation --> space, application --> space --> organisation
+   */
   includeRelations?: string[];
+  /**
+   * If relations, as described in `includeRelations` are missing, should they be fetched?
+   */
   populateMissing?: boolean;
+  /**
+   * Only applicable to collections
+   */
   flatten?: boolean;
 }
 
-export function registerCFEntities() {
-  generateCFEntities().forEach(entity => entityCatalog.register(entity));
-}
-
 export function generateCFEntities(): StratosBaseCatalogEntity[] {
   const endpointDefinition: StratosEndpointExtensionDefinition = {
     urlValidationRegexString: urlValidationExpression,
@@ -286,12 +323,17 @@ function generateCFQuotaDefinitionEntity(endpointDefinition: StratosEndpointExte
     schema: cfEntityFactory(quotaDefinitionEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, APIResource<IOrgQuotaDefinition>>(definition, {
+  cfEntityCatalog.quotaDefinition = new StratosCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IOrgQuotaDefinition>,
+    QuotaDefinitionActionBuilder
+  >(definition, {
     dataReducers: [
       endpointDisconnectRemoveEntitiesReducer()
     ],
     actionBuilders: quotaDefinitionActionBuilder
   });
+  return cfEntityCatalog.quotaDefinition;
 }
 
 function generateCFAppEnvVarEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -322,7 +364,12 @@ function generateCFAppEnvVarEntity(endpointDefinition: StratosEndpointExtensionD
       };
     },
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, APIResource>(definition, {
+  cfEntityCatalog.appEnvVar = new StratosCatalogEntity<
+    IBasicCFMetaData,
+    APIResource,
+    AppEnvVarActionBuilders,
+    AppEnvVarActionBuilders
+  >(definition, {
     dataReducers: [
       endpointDisconnectRemoveEntitiesReducer()
     ],
@@ -333,8 +380,9 @@ function generateCFAppEnvVarEntity(endpointDefinition: StratosEndpointExtensionD
         guid: ent.metadata.guid
       }),
       getGuid: metadata => metadata.guid,
-    }
+    },
   });
+  return cfEntityCatalog.appEnvVar;
 }
 
 function generateCFAppSummaryEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -343,7 +391,7 @@ function generateCFAppSummaryEntity(endpointDefinition: StratosEndpointExtension
     schema: cfEntityFactory(appSummaryEntityType),
     endpoint: endpointDefinition,
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, IAppSummary>(definition, {
+  cfEntityCatalog.appSummary = new StratosCatalogEntity<IBasicCFMetaData, IAppSummary, AppSummaryActionBuilders>(definition, {
     dataReducers: [
       updateAppSummaryRoutesReducer,
       endpointDisconnectRemoveEntitiesReducer()
@@ -357,6 +405,7 @@ function generateCFAppSummaryEntity(endpointDefinition: StratosEndpointExtension
       getGuid: metadata => metadata.guid,
     }
   });
+  return cfEntityCatalog.appSummary;
 }
 
 function generateCFSpaceQuotaEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -365,12 +414,16 @@ function generateCFSpaceQuotaEntity(endpointDefinition: StratosEndpointExtension
     schema: cfEntityFactory(spaceQuotaEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, APIResource<ISpaceQuotaDefinition>>(definition, {
-    dataReducers: [
-      endpointDisconnectRemoveEntitiesReducer()
-    ],
-    actionBuilders: spaceQuotaDefinitionActionBuilders
-  });
+  cfEntityCatalog.spaceQuota = new StratosCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<ISpaceQuotaDefinition>,
+    SpaceQuotaDefinitionActionBuilders>(definition, {
+      dataReducers: [
+        endpointDisconnectRemoveEntitiesReducer()
+      ],
+      actionBuilders: spaceQuotaDefinitionActionBuilders
+    });
+  return cfEntityCatalog.spaceQuota;
 }
 
 function generateCFPrivateDomainEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -379,11 +432,12 @@ function generateCFPrivateDomainEntity(endpointDefinition: StratosEndpointExtens
     schema: cfEntityFactory(privateDomainsEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, APIResource<IPrivateDomain>>(definition, {
+  cfEntityCatalog.privateDomain = new StratosCatalogEntity<IBasicCFMetaData, APIResource<IPrivateDomain>>(definition, {
     dataReducers: [
       endpointDisconnectRemoveEntitiesReducer()
     ],
   });
+  return cfEntityCatalog.privateDomain;
 }
 
 function generateCFInfoEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -394,7 +448,7 @@ function generateCFInfoEntity(endpointDefinition: StratosEndpointExtensionDefini
     labelPlural: 'Cloud Foundry Infos',
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, APIResource<ICfV2Info>, CfInfoDefinitionActionBuilders>(
+  cfEntityCatalog.cfInfo = new StratosCatalogEntity<IBasicCFMetaData, APIResource<ICfV2Info>, CfInfoDefinitionActionBuilders>(
     cfInfoDefinition,
     {
       dataReducers: [
@@ -410,6 +464,7 @@ function generateCFInfoEntity(endpointDefinition: StratosEndpointExtensionDefini
       }
     }
   );
+  return cfEntityCatalog.cfInfo;
 }
 
 function generateCFUserProvidedServiceInstanceEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -420,7 +475,11 @@ function generateCFUserProvidedServiceInstanceEntity(endpointDefinition: Stratos
     labelPlural: 'User Provided Service Instances',
     endpoint: endpointDefinition,
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, APIResource<IUserProvidedServiceInstance>>(
+  cfEntityCatalog.userProvidedService = new StratosCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IUserProvidedServiceInstance>,
+    UserProvidedServiceActionBuilder
+  >(
     definition,
     {
       actionBuilders: userProvidedServiceActionBuilder,
@@ -430,12 +489,14 @@ function generateCFUserProvidedServiceInstanceEntity(endpointDefinition: Stratos
       ],
       entityBuilder: {
         getMetadata: ent => ({
-          name: ent.entity.name
+          name: ent.entity.name,
+          guid: ent.metadata.guid,
         }),
         getGuid: metadata => metadata.guid,
-      }
+      },
     }
   );
+  return cfEntityCatalog.userProvidedService;
 }
 
 function generateCFAppStatsEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -470,18 +531,20 @@ function generateCFAppStatsEntity(endpointDefinition: StratosEndpointExtensionDe
       return data;
     },
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, AppStat>(definition, {
+  cfEntityCatalog.appStats = new StratosCatalogEntity<IBasicCFMetaData, AppStat, AppStatsActionBuilders>(definition, {
     dataReducers: [
       endpointDisconnectRemoveEntitiesReducer()
     ],
     actionBuilders: appStatsActionBuilders,
     entityBuilder: {
       getMetadata: ent => ({
-        name: ent.guid
+        name: ent.guid,
+        guid: ent.guid
       }),
       getGuid: metadata => metadata.name,
     }
   });
+  return cfEntityCatalog.appStats;
 }
 
 function generateCFBuildPackEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -490,12 +553,13 @@ function generateCFBuildPackEntity(endpointDefinition: StratosEndpointExtensionD
     schema: cfEntityFactory(buildpackEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, APIResource<IBuildpack>>(definition, {
+  cfEntityCatalog.buildPack = new StratosCatalogEntity<IBasicCFMetaData, APIResource<IBuildpack>, BuildpackActionBuilders>(definition, {
     dataReducers: [
       endpointDisconnectRemoveEntitiesReducer()
     ],
     actionBuilders: buildpackActionBuilders
   });
+  return cfEntityCatalog.buildPack;
 }
 
 function generateCFServiceBrokerEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -504,12 +568,16 @@ function generateCFServiceBrokerEntity(endpointDefinition: StratosEndpointExtens
     schema: cfEntityFactory(serviceBrokerEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, APIResource<IServiceBroker>>(definition, {
-    dataReducers: [
-      endpointDisconnectRemoveEntitiesReducer()
-    ],
-    actionBuilders: serviceBrokerActionBuilders
-  });
+  cfEntityCatalog.serviceBroker = new StratosCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IServiceBroker>,
+    ServiceBrokerActionBuilders>(definition, {
+      dataReducers: [
+        endpointDisconnectRemoveEntitiesReducer()
+      ],
+      actionBuilders: serviceBrokerActionBuilders
+    });
+  return cfEntityCatalog.serviceBroker;
 }
 
 function generateCFServicePlanVisibilityEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -518,12 +586,17 @@ function generateCFServicePlanVisibilityEntity(endpointDefinition: StratosEndpoi
     schema: cfEntityFactory(servicePlanVisibilityEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, APIResource<ISecurityGroup>>(definition, {
+  cfEntityCatalog.servicePlanVisibility = new StratosCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IServicePlanVisibility>,
+    ServicePlanVisibilityActionBuilders
+  >(definition, {
     dataReducers: [
       endpointDisconnectRemoveEntitiesReducer()
     ],
     actionBuilders: servicePlanVisibilityActionBuilders
   });
+  return cfEntityCatalog.servicePlanVisibility;
 }
 
 function generateCFSecurityGroupEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -534,12 +607,16 @@ function generateCFSecurityGroupEntity(endpointDefinition: StratosEndpointExtens
     labelPlural: 'Security Groups',
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, APIResource<ISecurityGroup>>(definition, {
-    dataReducers: [
-      endpointDisconnectRemoveEntitiesReducer()
-    ],
-    actionBuilders: securityGroupBuilders
-  });
+  cfEntityCatalog.securityGroup = new StratosCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<ISecurityGroup>,
+    SecurityGroupBuilders>(definition, {
+      dataReducers: [
+        endpointDisconnectRemoveEntitiesReducer()
+      ],
+      actionBuilders: securityGroupBuilders
+    });
+  return cfEntityCatalog.securityGroup;
 }
 
 function generateCFServiceBindingEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -553,7 +630,11 @@ function generateCFServiceBindingEntity(endpointDefinition: StratosEndpointExten
     labelPlural: 'Service Bindings',
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, APIResource<IServiceBinding>>(
+  cfEntityCatalog.serviceBinding = new StratosCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IServiceBinding>,
+    ServiceBindingActionBuilders
+  >(
     definition,
     {
       dataReducers: [
@@ -562,12 +643,14 @@ function generateCFServiceBindingEntity(endpointDefinition: StratosEndpointExten
       actionBuilders: serviceBindingActionBuilders,
       entityBuilder: {
         getMetadata: ent => ({
-          name: ent.metadata.guid
+          name: ent.metadata.guid,
+          guid: ent.metadata.guid
         }),
         getGuid: metadata => metadata.guid,
       }
     }
   );
+  return cfEntityCatalog.serviceBinding;
 }
 
 function generateCFServiceEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -578,7 +661,11 @@ function generateCFServiceEntity(endpointDefinition: StratosEndpointExtensionDef
     labelPlural: 'Services',
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, APIResource<IService>>(
+  cfEntityCatalog.service = new StratosCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IService>,
+    ServiceActionBuilders
+  >(
     definition,
     {
       dataReducers: [
@@ -587,12 +674,14 @@ function generateCFServiceEntity(endpointDefinition: StratosEndpointExtensionDef
       actionBuilders: serviceActionBuilders,
       entityBuilder: {
         getMetadata: ent => ({
-          name: ent.entity.label
+          name: ent.entity.label,
+          guid: ent.metadata.guid
         }),
         getGuid: metadata => metadata.guid,
-      }
+      },
     }
   );
+  return cfEntityCatalog.service;
 }
 
 function generateCFServicePlanEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -603,7 +692,11 @@ function generateCFServicePlanEntity(endpointDefinition: StratosEndpointExtensio
     labelPlural: 'Service Plans',
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, APIResource<IServicePlan>>(
+  cfEntityCatalog.servicePlan = new StratosCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IServicePlan>,
+    ServicePlanActionBuilders
+  >(
     definition,
     {
       dataReducers: [
@@ -612,12 +705,14 @@ function generateCFServicePlanEntity(endpointDefinition: StratosEndpointExtensio
       actionBuilders: servicePlanActionBuilders,
       entityBuilder: {
         getMetadata: ent => ({
-          name: ent.entity.name
+          name: ent.entity.name,
+          guid: ent.metadata.guid
         }),
         getGuid: metadata => metadata.guid,
       }
     }
   );
+  return cfEntityCatalog.servicePlan;
 }
 
 function generateCFServiceInstanceEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -632,7 +727,11 @@ function generateCFServiceInstanceEntity(endpointDefinition: StratosEndpointExte
     labelPlural: 'Marketplace Service Instances',
     endpoint: endpointDefinition,
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, APIResource<IServiceInstance>>(
+  cfEntityCatalog.serviceInstance = new StratosCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IServiceInstance>,
+    ServiceInstanceActionBuilders
+  >(
     definition,
     {
       dataReducers: [
@@ -642,12 +741,14 @@ function generateCFServiceInstanceEntity(endpointDefinition: StratosEndpointExte
       actionBuilders: serviceInstanceActionBuilders,
       entityBuilder: {
         getMetadata: ent => ({
-          name: ent.entity.name
+          name: ent.entity.name,
+          guid: ent.metadata.guid
         }),
         getGuid: metadata => metadata.guid,
       }
     }
   );
+  return cfEntityCatalog.serviceInstance;
 }
 
 function generateCFUserEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -658,19 +759,21 @@ function generateCFUserEntity(endpointDefinition: StratosEndpointExtensionDefini
     labelPlural: 'Users',
     endpoint: endpointDefinition,
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, APIResource<CfUser>>(
+  cfEntityCatalog.user = new StratosCatalogEntity<IBasicCFMetaData, APIResource<CfUser>, UserActionBuilders>(
     definition,
     {
       actionBuilders: userActionBuilders,
       dataReducers: [userReducer, endpointDisconnectUserReducer],
       entityBuilder: {
         getMetadata: ent => ({
-          name: ent.entity.username || ent.entity.guid || ent.metadata.guid
+          name: ent.entity.username || ent.entity.guid || ent.metadata.guid,
+          guid: ent.metadata.guid
         }),
         getGuid: metadata => metadata.guid,
       }
     }
   );
+  return cfEntityCatalog.user;
 }
 
 function generateCFDomainEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -681,7 +784,11 @@ function generateCFDomainEntity(endpointDefinition: StratosEndpointExtensionDefi
     labelPlural: 'Domains',
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, APIResource<IDomain>>(
+  cfEntityCatalog.domain = new StratosCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IDomain>,
+    DomainActionBuilders
+  >(
     definition,
     {
       dataReducers: [
@@ -690,12 +797,14 @@ function generateCFDomainEntity(endpointDefinition: StratosEndpointExtensionDefi
       actionBuilders: domainActionBuilders,
       entityBuilder: {
         getMetadata: ent => ({
-          name: ent.entity.name
+          name: ent.entity.name,
+          guid: ent.metadata.guid
         }),
         getGuid: metadata => metadata.guid,
       }
     }
   );
+  return cfEntityCatalog.domain;
 }
 
 function generateGitCommitEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -713,7 +822,7 @@ function generateGitCommitEntity(endpointDefinition: StratosEndpointExtensionDef
       };
     },
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, GitCommit, GitCommitActionBuildersConfig, GitCommitActionBuilders>(
+  cfEntityCatalog.gitCommit = new StratosCatalogEntity<IBasicCFMetaData, GitCommit, GitCommitActionBuildersConfig, GitCommitActionBuilders>(
     definition,
     {
       dataReducers: [
@@ -729,6 +838,7 @@ function generateGitCommitEntity(endpointDefinition: StratosEndpointExtensionDef
       }
     }
   );
+  return cfEntityCatalog.gitCommit;
 }
 
 function generateGitRepoEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -739,21 +849,20 @@ function generateGitRepoEntity(endpointDefinition: StratosEndpointExtensionDefin
     labelPlural: 'Git Repositories',
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, APIResource<GitRepo>>(
+  cfEntityCatalog.gitRepo = new StratosCatalogEntity<
+    IBasicCFMetaData,
+    GitRepo,
+    GitRepoActionBuilders
+  >(
     definition,
     {
       dataReducers: [
         endpointDisconnectRemoveEntitiesReducer()
       ],
       actionBuilders: gitRepoActionBuilders,
-      entityBuilder: {
-        getMetadata: ent => ({
-          name: ent.entity.full_name
-        }),
-        getGuid: metadata => metadata.guid,
-      }
     }
   );
+  return cfEntityCatalog.gitRepo;
 }
 
 function generateGitBranchEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -764,22 +873,16 @@ function generateGitBranchEntity(endpointDefinition: StratosEndpointExtensionDef
     labelPlural: 'Git Branches',
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IBasicCFMetaData, APIResource<GitBranch>, GitBranchActionBuilders>(
+  cfEntityCatalog.gitBranch = new StratosCatalogEntity<IBasicCFMetaData, GitBranch, GitBranchActionBuilders>(
     definition,
     {
       dataReducers: [
         endpointDisconnectRemoveEntitiesReducer()
       ],
       actionBuilders: gitBranchActionBuilders,
-      entityBuilder: {
-        getMetadata: ent => ({
-          guid: ent.metadata.guid,
-          name: ent.metadata.guid,
-        }),
-        getGuid: metadata => metadata.guid,
-      }
     }
   );
+  return cfEntityCatalog.gitBranch;
 }
 
 function generateEventEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -790,24 +893,28 @@ function generateEventEntity(endpointDefinition: StratosEndpointExtensionDefinit
     labelPlural: 'Events',
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IBasicCFMetaData, APIResource>(
-    definition,
-    {
-      dataReducers: [
-        endpointDisconnectRemoveEntitiesReducer()
-      ],
-      actionBuilders: cfEventActionBuilders,
-      entityBuilder: {
-        getMetadata: event => {
-          return {
-            guid: event.metadata.guid,
-            name: event.metadata.guid,
-          };
-        },
-        getGuid: metadata => metadata.guid,
+  cfEntityCatalog.event = new StratosCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<CfEvent>,
+    CfEventActionBuilders>(
+      definition,
+      {
+        dataReducers: [
+          endpointDisconnectRemoveEntitiesReducer()
+        ],
+        actionBuilders: cfEventActionBuilders,
+        entityBuilder: {
+          getMetadata: event => {
+            return {
+              guid: event.metadata.guid,
+              name: event.metadata.guid,
+            };
+          },
+          getGuid: metadata => metadata.guid,
+        }
       }
-    }
-  );
+    );
+  return cfEntityCatalog.event;
 }
 
 function generateRouteEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -818,7 +925,11 @@ function generateRouteEntity(endpointDefinition: StratosEndpointExtensionDefinit
     labelPlural: 'Application Routes',
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IBasicCFMetaData, APIResource<IRoute>>(
+  cfEntityCatalog.route = new StratosCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IRoute>,
+    RoutesActionBuilders
+  >(
     definition,
     {
       actionBuilders: routesActionBuilders,
@@ -835,6 +946,7 @@ function generateRouteEntity(endpointDefinition: StratosEndpointExtensionDefinit
       }
     }
   );
+  return cfEntityCatalog.route;
 }
 
 function generateStackEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -845,7 +957,11 @@ function generateStackEntity(endpointDefinition: StratosEndpointExtensionDefinit
     labelPlural: 'Stacks',
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IBasicCFMetaData, APIResource<IStack>>(
+  cfEntityCatalog.stack = new StratosCatalogEntity<
+    IBasicCFMetaData,
+    APIResource<IStack>,
+    StackActionBuilders
+  >(
     definition,
     {
       dataReducers: [
@@ -861,6 +977,7 @@ function generateStackEntity(endpointDefinition: StratosEndpointExtensionDefinit
       }
     }
   );
+  return cfEntityCatalog.stack;
 }
 
 function generateFeatureFlagEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -890,29 +1007,34 @@ function generateFeatureFlagEntity(endpointDefinition: StratosEndpointExtensionD
       maxedStateStartAt: () => of(null),
     }
   };
-  return new StratosCatalogEntity<IBasicCFMetaData, IFeatureFlag>(
-    featureFlagDefinition,
-    {
-      dataReducers: [
-        endpointDisconnectRemoveEntitiesReducer()
-      ],
-      actionBuilders: featureFlagActionBuilders,
-      entityBuilder: {
-        getMetadata: ff => ({
-          guid: ff.guid,
-          name: ff.name,
-        }),
-        getGuid: metadata => metadata.guid,
+  cfEntityCatalog.featureFlag = new StratosCatalogEntity<
+    IBasicCFMetaData,
+    IFeatureFlag,
+    FeatureFlagActionBuilders>(
+      featureFlagDefinition,
+      {
+        dataReducers: [
+          endpointDisconnectRemoveEntitiesReducer()
+        ],
+        actionBuilders: featureFlagActionBuilders,
+        entityBuilder: {
+          getMetadata: ff => ({
+            guid: ff.guid,
+            name: ff.name,
+          }),
+          getGuid: metadata => metadata.guid,
+        }
       }
-    }
-  );
+    );
+  return cfEntityCatalog.featureFlag;
 }
 
 function generateCfEndpointEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
-  return new StratosCatalogEndpointEntity(
+  cfEntityCatalog.cfEndpoint = new StratosCatalogEndpointEntity(
     endpointDefinition,
     metadata => `/cloud-foundry/${metadata.guid}`
   );
+  return cfEntityCatalog.cfEndpoint;
 }
 
 function generateCfApplicationEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -930,7 +1052,11 @@ function generateCfApplicationEntity(endpointDefinition: StratosEndpointExtensio
     }
   };
 
-  return new StratosCatalogEntity<IAppFavMetadata, APIResource<IApp>>(
+  cfEntityCatalog.application = new StratosCatalogEntity<
+    IAppFavMetadata,
+    APIResource<IApp>,
+    ApplicationActionBuilders
+  >(
     applicationDefinition,
     {
       dataReducers: [
@@ -953,6 +1079,7 @@ function generateCfApplicationEntity(endpointDefinition: StratosEndpointExtensio
       actionBuilders: applicationActionBuilder
     },
   );
+  return cfEntityCatalog.application;
 }
 
 function generateCfSpaceEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -966,7 +1093,7 @@ function generateCfSpaceEntity(endpointDefinition: StratosEndpointExtensionDefin
     labelPlural: 'Spaces',
     endpoint: endpointDefinition,
   };
-  return new StratosCatalogEntity<ISpaceFavMetadata, APIResource<ISpace>>(
+  cfEntityCatalog.space = new StratosCatalogEntity<ISpaceFavMetadata, APIResource<ISpace>, SpaceActionBuilders>(
     spaceDefinition,
     {
       actionBuilders: spaceActionBuilders,
@@ -991,6 +1118,7 @@ function generateCfSpaceEntity(endpointDefinition: StratosEndpointExtensionDefin
       }
     }
   );
+  return cfEntityCatalog.space;
 }
 
 function generateCfOrgEntity(endpointDefinition: StratosEndpointExtensionDefinition) {
@@ -1001,7 +1129,11 @@ function generateCfOrgEntity(endpointDefinition: StratosEndpointExtensionDefinit
     labelPlural: 'Organizations',
     endpoint: endpointDefinition,
   };
-  return new StratosCatalogEntity<IOrgFavMetadata, APIResource<IOrganization>>(
+  cfEntityCatalog.org = new StratosCatalogEntity<
+    IOrgFavMetadata,
+    APIResource<IOrganization>,
+    OrganizationActionBuilders
+  >(
     orgDefinition,
     {
       actionBuilders: organizationActionBuilders,
@@ -1027,6 +1159,7 @@ function generateCfOrgEntity(endpointDefinition: StratosEndpointExtensionDefinit
       }
     }
   );
+  return cfEntityCatalog.org;
 }
 
 function getOrgStatus(org: APIResource<IOrganization>) {
@@ -1044,7 +1177,7 @@ function generateCFMetrics(endpointDefinition: StratosEndpointExtensionDefinitio
     labelPlural: 'CF Metrics',
     endpoint: endpointDefinition,
   };
-  return new StratosCatalogEntity<IOrgFavMetadata, APIResource<IOrganization>>(
+  cfEntityCatalog.metric = new StratosCatalogEntity<IBasicCFMetaData>(
     definition,
     {
       dataReducers: [
@@ -1052,4 +1185,5 @@ function generateCFMetrics(endpointDefinition: StratosEndpointExtensionDefinitio
       ],
     }
   );
+  return cfEntityCatalog.metric;
 }
diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-relations.getters.ts b/src/frontend/packages/cloud-foundry/src/cf-entity-relations.getters.ts
index 8dd4a54f6d..b8cf91950c 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-relations.getters.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-relations.getters.ts
@@ -1,8 +1,8 @@
 import { HttpParams, HttpRequest } from '@angular/common/http';
 
 import { InternalAppState } from '../../store/src/app-state';
-import { StratosBaseCatalogEntity } from '../../store/src/entity-catalog/entity-catalog-entity';
-import { entityCatalog } from '../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../store/src/entity-catalog/entity-catalog';
+import { StratosBaseCatalogEntity } from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { EntityCatalogEntityConfig } from '../../store/src/entity-catalog/entity-catalog.types';
 import {
   getPaginationParams,
diff --git a/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts b/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts
index a9406f1e60..212a79c207 100644
--- a/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts
@@ -5,7 +5,7 @@ import { EffectsModule } from '@ngrx/effects';
 import { generateASEntities } from '../../cf-autoscaler/src/store/autoscaler-entity-generator';
 import { generateStratosEntities } from '../../core/src/base-entity-types';
 import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../store/src/entity-catalog.module';
-import { entityCatalog, TestEntityCatalog } from '../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog, TestEntityCatalog } from '../../store/src/entity-catalog/entity-catalog';
 import { getGitHubAPIURL, GITHUB_API_URL } from '../../core/src/core/github.helpers';
 import { LoggerService } from '../../core/src/core/logger.service';
 import { GitSCMService } from '../../core/src/shared/data-services/scm/scm.service';
diff --git a/src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts b/src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts
index c37a2f10a3..6584848749 100644
--- a/src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts
@@ -2,6 +2,9 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 
 import { MDAppModule } from '../../core/src/core/md.module';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { SharedModule } from '../../core/src/shared/shared.module';
 import { CfValidateEntitiesStart } from '../../store/src/actions/request.actions';
 import { EntityCatalogModule } from '../../store/src/entity-catalog.module';
@@ -83,7 +86,8 @@ function infoValidator(action: ICFAction, dispatcher) {
     CfUserService,
     CloudFoundryService,
     ServiceActionHelperService,
-    LongRunningCfOperationsService
+    LongRunningCfOperationsService,
+    CloudFoundryUserProvidedServicesService
   ]
 })
 export class CloudFoundryPackageModule { }
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/application-env-var.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/application-env-var.action-builders.ts
index 79baa612bd..a52a8cc8fc 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/application-env-var.action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/application-env-var.action-builders.ts
@@ -1,28 +1,50 @@
 import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import { GetAppEnvVarsAction } from '../actions/app-metadata.actions';
+import { AppVariablesAdd, AppVariablesDelete, AppVariablesEdit } from '../actions/app-variables.actions';
 import { ListAppEnvVar } from '../shared/components/list/list-types/app-variables/cf-app-variables-data-source';
-import { AppVariablesDelete, AppVariablesEdit, AppVariablesAdd } from '../actions/app-variables.actions';
 
-// App variables are a special case where the entities are actually embedded in an application.s
-// This means that most actions are not standard api actions.
-export const appEnvVarActionBuilders = {
-  get: (appGuid, endpointGuid) => new GetAppEnvVarsAction(appGuid, endpointGuid),
-  removeFromApplication: (appGuid, endpointGuid, allEnvVars: ListAppEnvVar[], selectedItems: ListAppEnvVar[]) => new AppVariablesDelete(
+export interface AppEnvVarActionBuilders extends OrchestratedActionBuilders {
+  getMultiple: (appGuid, endpointGuid) => GetAppEnvVarsAction;
+  removeFromApplication: (
+    appGuid,
     endpointGuid,
+    allEnvVars: ListAppEnvVar[],
+    selectedItems: ListAppEnvVar[]
+  ) => AppVariablesDelete;
+  editInApplication: (
     appGuid,
-    allEnvVars,
-    selectedItems
-  ),
-  editInApplication: (appGuid, endpointGuid, allEnvVars: ListAppEnvVar[], editedEnvVar: ListAppEnvVar) => new AppVariablesEdit(
     endpointGuid,
+    allEnvVars: ListAppEnvVar[],
+    editedEnvVar: ListAppEnvVar
+  ) => AppVariablesEdit;
+  addNewToApplication: (
     appGuid,
-    allEnvVars,
-    editedEnvVar
-  ),
-  addNewToApplication: (appGuid, endpointGuid, allEnvVars: ListAppEnvVar[], newEnvVar: ListAppEnvVar) => new AppVariablesAdd(
     endpointGuid,
+    allEnvVars: ListAppEnvVar[],
+    newEnvVar: ListAppEnvVar
+  ) => AppVariablesAdd;
+}
+
+// App variables are a special case where the entities are actually embedded in an application
+// This means that most actions are not standard api actions.
+export const appEnvVarActionBuilders: AppEnvVarActionBuilders = {
+  getMultiple: (appGuid, endpointGuid) => new GetAppEnvVarsAction(appGuid, endpointGuid),
+  removeFromApplication: (
     appGuid,
-    allEnvVars,
-    newEnvVar
-  )
-} as OrchestratedActionBuilders;
+    endpointGuid,
+    allEnvVars: ListAppEnvVar[],
+    selectedItems: ListAppEnvVar[]
+  ) => new AppVariablesDelete(endpointGuid, appGuid, allEnvVars, selectedItems),
+  editInApplication: (
+    appGuid,
+    endpointGuid,
+    allEnvVars: ListAppEnvVar[],
+    editedEnvVar: ListAppEnvVar
+  ) => new AppVariablesEdit(endpointGuid, appGuid, allEnvVars, editedEnvVar),
+  addNewToApplication: (
+    appGuid,
+    endpointGuid,
+    allEnvVars: ListAppEnvVar[],
+    newEnvVar: ListAppEnvVar
+  ) => new AppVariablesAdd(endpointGuid, appGuid, allEnvVars, newEnvVar)
+};
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/application-stats.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/application-stats.action-builders.ts
index edbfe2b26f..44d485252a 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/application-stats.action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/application-stats.action-builders.ts
@@ -1,6 +1,10 @@
 import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import { GetAppStatsAction } from '../actions/app-metadata.actions';
 
-export const appStatsActionBuilders = {
-  get: (appGuid, endpointGuid) => new GetAppStatsAction(appGuid, endpointGuid)
-} as OrchestratedActionBuilders;
+export interface AppStatsActionBuilders extends OrchestratedActionBuilders {
+  getMultiple: (appGuid, endpointGuid) => GetAppStatsAction;
+};
+
+export const appStatsActionBuilders: AppStatsActionBuilders = {
+  getMultiple: (appGuid, endpointGuid) => new GetAppStatsAction(appGuid, endpointGuid)
+};
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/application-summary.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/application-summary.action-builders.ts
index ae90916f50..b62bb28c1c 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/application-summary.action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/application-summary.action-builders.ts
@@ -1,6 +1,10 @@
 import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import { GetAppSummaryAction } from '../actions/app-metadata.actions';
 
-export const appSummaryActionBuilders = {
+export interface AppSummaryActionBuilders extends OrchestratedActionBuilders {
+  get: (appGuid, endpointGuid) => GetAppSummaryAction;
+}
+
+export const appSummaryActionBuilders: AppSummaryActionBuilders = {
   get: (appGuid, endpointGuid) => new GetAppSummaryAction(appGuid, endpointGuid)
-} as OrchestratedActionBuilders;
+};
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/application.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/application.action-builders.ts
index 7cd8457d40..f24837eca3 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/application.action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/application.action-builders.ts
@@ -1,4 +1,5 @@
 import { IApp } from '../../../core/src/core/cf-api.types';
+import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import { AppMetadataTypes } from '../actions/app-metadata.actions';
 import { AssignRouteToApplication } from '../actions/application-service-routes.actions';
 import {
@@ -12,9 +13,27 @@ import {
 } from '../actions/application.actions';
 import { GetAllAppsInSpace } from '../actions/space.actions';
 import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
-import { CFOrchestratedActionBuilders } from './cf.action-builder.types';
 
-export interface ApplicationActionBuilders extends CFOrchestratedActionBuilders {
+export interface ApplicationActionBuilders extends OrchestratedActionBuilders {
+  get: (
+    guid,
+    endpointGuid,
+    { includeRelations, populateMissing }: CFBasePipelineRequestActionMeta
+  ) => GetApplication;
+  remove: (guid: string, endpointGuid: string) => DeleteApplication;
+  create: (id: string, endpointGuid: string, application: IApp) => CreateNewApplication;
+  update: (
+    guid: string,
+    endpointGuid: string,
+    updatedApplication: UpdateApplication,
+    existingApplication?: IApp,
+    updateEntities?: AppMetadataTypes[]
+  ) => UpdateExistingApplication;
+  getMultiple: (
+    endpointGuid: string,
+    paginationKey?: string,
+    { includeRelations, populateMissing }?: CFBasePipelineRequestActionMeta
+  ) => GetAllApplications;
   restage: (guid: string, endpointGuid: string) => RestageApplication;
   assignRoute: (endpointGuid: string, routeGuid: string, applicationGuid: string) => AssignRouteToApplication;
   getAllInSpace: (
@@ -44,7 +63,7 @@ export const applicationActionBuilder: ApplicationActionBuilders = {
   ) => new UpdateExistingApplication(guid, endpointGuid, updatedApplication, existingApplication, updateEntities),
   getMultiple: (
     endpointGuid: string,
-    paginationKey: string,
+    paginationKey?: string,
     { includeRelations, populateMissing }: CFBasePipelineRequestActionMeta = {}
   ) => new GetAllApplications(paginationKey, endpointGuid, includeRelations, populateMissing),
   restage: (guid: string, endpointGuid: string) => new RestageApplication(guid, endpointGuid),
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/buildpack.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/buildpack.action-builders.ts
index d75e557608..9c205cbdf8 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/buildpack.action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/buildpack.action-builders.ts
@@ -1,11 +1,16 @@
 import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import { FetchAllBuildpacks } from '../actions/buildpack.action';
 
-export const buildpackActionBuilders = {
+export interface BuildpackActionBuilders extends OrchestratedActionBuilders {
   getMultiple: (
     endpointGuid,
     paginationKey,
-  ) => new FetchAllBuildpacks(endpointGuid, paginationKey)
-} as OrchestratedActionBuilders;
-
+  ) => FetchAllBuildpacks;
+}
 
+export const buildpackActionBuilders: BuildpackActionBuilders = {
+  getMultiple: (
+    endpointGuid,
+    paginationKey,
+  ) => new FetchAllBuildpacks(endpointGuid, paginationKey)
+};
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/cf-info.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/cf-info.action-builders.ts
index 95f6dede86..86a6efea47 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/cf-info.action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/cf-info.action-builders.ts
@@ -1,7 +1,7 @@
+import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import { GetCFInfo } from '../actions/cloud-foundry.actions';
-import { CFOrchestratedActionBuilders } from './cf.action-builder.types';
 
-export interface CfInfoDefinitionActionBuilders extends CFOrchestratedActionBuilders {
+export interface CfInfoDefinitionActionBuilders extends OrchestratedActionBuilders {
   get: (cfGuid: string) => GetCFInfo;
 }
 
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/cf.action-builder.types.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/cf.action-builder.types.ts
deleted file mode 100644
index 2f3ca87cfa..0000000000
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/cf.action-builder.types.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
-import { PaginatedAction } from '../../../store/src/types/pagination.types';
-import { EntityRequestAction } from '../../../store/src/types/request.types';
-import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
-
-export interface CFOrchestratedActionBuilders extends OrchestratedActionBuilders {
-  get?(
-    guid: string,
-    endpointGuid: string,
-    meta: CFBasePipelineRequestActionMeta
-  ): EntityRequestAction;
-  getMultiple?(
-    paginationKey: string,
-    endpointGuid: string,
-    meta: CFBasePipelineRequestActionMeta
-  ): PaginatedAction;
-}
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/domin.action-builder.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/domin.action-builder.ts
index 6866da3d44..03dc4fcc43 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/domin.action-builder.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/domin.action-builder.ts
@@ -1,8 +1,27 @@
 import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import { FetchAllDomains, FetchDomain } from '../actions/domains.actions';
+import { GetAllOrganizationDomains } from '../actions/organization.actions';
 import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
 
-export const domainActionBuilders = {
+export interface DomainActionBuilders extends OrchestratedActionBuilders {
+  get: (
+    guid,
+    endpointGuid
+  ) => FetchDomain;
+  getMultiple: (
+    endpointGuid,
+    paginationKey,
+    { flatten }: CFBasePipelineRequestActionMeta
+  ) => FetchAllDomains;
+  getOrganizationDomains: (
+    orgGuid: string,
+    endpointGuid: string,
+    paginationKey?: string,
+    meta?: CFBasePipelineRequestActionMeta
+  ) => GetAllOrganizationDomains;
+};
+
+export const domainActionBuilders: DomainActionBuilders = {
   get: (
     guid,
     endpointGuid
@@ -13,7 +32,16 @@ export const domainActionBuilders = {
     endpointGuid,
     paginationKey,
     { flatten }: CFBasePipelineRequestActionMeta = {}
-  ) => new FetchAllDomains(endpointGuid, paginationKey, flatten)
-} as OrchestratedActionBuilders;
+  ) => new FetchAllDomains(endpointGuid, paginationKey, flatten),
+  getOrganizationDomains: (
+    orgGuid: string,
+    endpointGuid: string,
+    paginationKey: string = null,
+    meta: CFBasePipelineRequestActionMeta = {
+      includeRelations: [],
+      populateMissing: true
+    }
+  ) => new GetAllOrganizationDomains(orgGuid, endpointGuid, paginationKey, meta.includeRelations, meta.populateMissing)
+};
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/feature-flag.action-builder.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/feature-flag.action-builder.ts
index d594d9c851..65e4d1030b 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/feature-flag.action-builder.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/feature-flag.action-builder.ts
@@ -1,9 +1,16 @@
 import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import { GetAllFeatureFlags } from '../actions/feature-flags.actions';
 
-export const featureFlagActionBuilders = {
+export interface FeatureFlagActionBuilders extends OrchestratedActionBuilders {
   getMultiple: (
     endpointGuid,
-    paginationKey,
+    paginationKey?,
+  ) => GetAllFeatureFlags;
+};
+
+export const featureFlagActionBuilders: FeatureFlagActionBuilders = {
+  getMultiple: (
+    endpointGuid,
+    paginationKey?,
   ) => new GetAllFeatureFlags(endpointGuid, paginationKey)
-} as OrchestratedActionBuilders;
+};
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/git-action-builder.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/git-action-builder.ts
index a99f04df18..936439cdd8 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/git-action-builder.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/git-action-builder.ts
@@ -5,28 +5,26 @@ import {
   OrchestratedActionBuilderConfig,
   OrchestratedActionBuilders,
 } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
-import { FetchBranchesForProject, FetchCommits } from '../actions/deploy-applications.actions';
+import { FetchBranchesForProject, FetchBranchForProject, FetchCommits } from '../actions/deploy-applications.actions';
 import { FetchGitHubRepoInfo } from '../actions/github.actions';
-import {
-  EnvVarStratosProject,
-} from '../features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service';
 
 export interface GitRepoActionBuilders extends OrchestratedActionBuilders {
   getRepoInfo: (
-    projectEnvVars: EnvVarStratosProject
+    meta: GitMeta
   ) => FetchGitHubRepoInfo;
 }
 
 export const gitRepoActionBuilders: GitRepoActionBuilders = {
   getRepoInfo: (
-    projectEnvVars: EnvVarStratosProject
-  ) => new FetchGitHubRepoInfo(projectEnvVars)
+    meta: GitMeta
+  ) => new FetchGitHubRepoInfo(meta)
 };
 
 export interface GitMeta {
   projectName: string;
-  scm: GitSCM;
+  scm: GitSCM; // FIXME: Remove from action, see #4245
   commitSha?: string;
+  branchName?: string;
 }
 
 export interface GitCommitActionBuildersConfig extends OrchestratedActionBuilderConfig {
@@ -54,13 +52,33 @@ export const gitCommitActionBuilders: GitCommitActionBuildersConfig = {
 };
 
 export interface GitBranchActionBuilders extends OrchestratedActionBuilders {
-  get: (projectName: string, endpointGuid: string, meta: GitMeta) => FetchBranchesForProject;
+  /**
+   * guid & endpointGuid are optional
+   */
+  get: (
+    guid: string,
+    endpointId: string,
+    meta: GitMeta
+  ) => FetchBranchForProject;
+  /**
+   * endpointGuid & paginationKey are optional
+   */
+  getMultiple: (
+    endpointGuid: string,
+    paginationKey: string,
+    meta: GitMeta
+  ) => FetchBranchesForProject;
 }
 
 export const gitBranchActionBuilders: GitBranchActionBuilders = {
   get: (
     guid: string,
-    endpointGuid: string,
+    endpointId: string,
     meta: GitMeta
+  ) => new FetchBranchForProject(meta.scm, meta.projectName, guid, meta.branchName),
+  getMultiple: (
+    endpointGuid: string = null,
+    paginationKey: string = null,
+    meta?: GitMeta
   ) => new FetchBranchesForProject(meta.scm, meta.projectName)
 };
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/organization.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/organization.action-builders.ts
index ed7b3c364f..07f8d28d7d 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/organization.action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/organization.action-builders.ts
@@ -1,4 +1,5 @@
 import { IUpdateOrganization } from '../../../core/src/core/cf-api.types';
+import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import {
   DeleteOrganization,
   GetAllOrganizations,
@@ -6,9 +7,8 @@ import {
   UpdateOrganization,
 } from '../actions/organization.actions';
 import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
-import { CFOrchestratedActionBuilders } from './cf.action-builder.types';
 
-export interface OrganizationActionBuilders extends CFOrchestratedActionBuilders {
+export interface OrganizationActionBuilders extends OrchestratedActionBuilders {
   get: (
     guid: string,
     endpointGuid: string,
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/quota-definition.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/quota-definition.action-builders.ts
index 20f6360368..d8508b1274 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/quota-definition.action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/quota-definition.action-builders.ts
@@ -1,16 +1,21 @@
-import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import {
   QuotaFormValues,
 } from '../../../core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component';
+import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import {
   CreateQuotaDefinition,
-  GetOrganizationSpaceQuotaDefinitions,
+  GetQuotaDefinition,
   GetQuotaDefinitions,
   UpdateQuotaDefinition,
 } from '../actions/quota-definitions.actions';
 import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
 
 export interface QuotaDefinitionActionBuilder extends OrchestratedActionBuilders {
+  get: (
+    guid: string,
+    endpointGuid: string,
+    { includeRelations, populateMissing }: CFBasePipelineRequestActionMeta
+  ) => GetQuotaDefinition;
   create: (
     id: string,
     endpointGuid: string,
@@ -26,16 +31,14 @@ export interface QuotaDefinitionActionBuilder extends OrchestratedActionBuilders
     endpointGuid: string,
     { includeRelations, populateMissing }?: CFBasePipelineRequestActionMeta
   ) => GetQuotaDefinitions;
-  getOrganizationSpaceQuotaDefinitions: (
-    orgGuid: string,
-    paginationKey: string,
-    endpointGuid: string,
-    includeRelations: string[],
-    populateMissing
-  ) => GetOrganizationSpaceQuotaDefinitions;
 }
 
 export const quotaDefinitionActionBuilder: QuotaDefinitionActionBuilder = {
+  get: (
+    guid: string,
+    endpointGuid: string,
+    { includeRelations, populateMissing }: CFBasePipelineRequestActionMeta
+  ) => new GetQuotaDefinition(guid, endpointGuid, includeRelations, populateMissing),
   create: (
     id: string,
     endpointGuid: string,
@@ -51,22 +54,5 @@ export const quotaDefinitionActionBuilder: QuotaDefinitionActionBuilder = {
     endpointGuid: string,
     { includeRelations, populateMissing }: CFBasePipelineRequestActionMeta = {}
   ) => new GetQuotaDefinitions(paginationKey, endpointGuid, includeRelations, populateMissing),
-  // associateSpaceQuota: (
-  //   spaceGuid: string,
-  //   endpointGuid: string,
-  //   spaceQuotaGuid: string
-  // ) => new AssociateSpaceQuota(spaceGuid, endpointGuid, spaceQuotaGuid),
-  // disassociateSpaceQuota: (
-  //   spaceGuid: string,
-  //   endpointGuid: string,
-  //   spaceQuotaGuid: string
-  // ) => new DisassociateSpaceQuota(spaceGuid, endpointGuid, spaceQuotaGuid),
-  getOrganizationSpaceQuotaDefinitions: (
-    orgGuid: string,
-    paginationKey: string,
-    endpointGuid: string,
-    includeRelations: string[] = [],
-    populateMissing = true
-  ) => new GetOrganizationSpaceQuotaDefinitions(paginationKey, orgGuid, endpointGuid, includeRelations, populateMissing)
 };
 
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/security-groups.action-builder.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/security-groups.action-builder.ts
index 26db5d869d..9b03e09ee8 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/security-groups.action-builder.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/security-groups.action-builder.ts
@@ -3,7 +3,19 @@ import { FetchDomain } from '../actions/domains.actions';
 import { GetAllSecurityGroups } from '../actions/security-groups-actions';
 import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
 
-export const securityGroupBuilders = {
+export interface SecurityGroupBuilders extends OrchestratedActionBuilders {
+  get: (
+    guid,
+    endpointGuid
+  ) => FetchDomain;
+  getMultiple: (
+    endpointGuid,
+    paginationKey,
+    { includeRelations, flatten }: CFBasePipelineRequestActionMeta
+  ) => GetAllSecurityGroups;
+}
+
+export const securityGroupBuilders: SecurityGroupBuilders = {
   get: (
     guid,
     endpointGuid
@@ -13,6 +25,4 @@ export const securityGroupBuilders = {
     paginationKey,
     { includeRelations, flatten }: CFBasePipelineRequestActionMeta = {}
   ) => new GetAllSecurityGroups(endpointGuid, paginationKey, includeRelations, flatten)
-} as OrchestratedActionBuilders;
-
-
+};
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/service-binding.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/service-binding.action-builders.ts
index c99496497d..6315ac9595 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/service-binding.action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/service-binding.action-builders.ts
@@ -1,10 +1,10 @@
+import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import { GetAppServiceBindings } from '../actions/application-service-routes.actions';
 import { CreateServiceBinding, DeleteServiceBinding, FetchAllServiceBindings } from '../actions/service-bindings.actions';
 import { ListServiceBindingsForInstance } from '../actions/service-instances.actions';
 import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
-import { CFOrchestratedActionBuilders } from './cf.action-builder.types';
 
-export interface ServiceBindingActionBuilders extends CFOrchestratedActionBuilders {
+export interface ServiceBindingActionBuilders extends OrchestratedActionBuilders {
   create: (
     id: string,
     endpointGuid: string,
@@ -54,7 +54,7 @@ export const serviceBindingActionBuilders: ServiceBindingActionBuilders = {
   getMultiple: (
     endpointGuid,
     paginationKey,
-    { includeRelations, populateMissing }: CFBasePipelineRequestActionMeta = {}
+    { includeRelations, populateMissing }: CFBasePipelineRequestActionMeta = {},
   ) => new FetchAllServiceBindings(
     endpointGuid,
     paginationKey,
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/service-broker.entity-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/service-broker.entity-builders.ts
index 1be4c4e76e..bce9105cff 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/service-broker.entity-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/service-broker.entity-builders.ts
@@ -2,7 +2,20 @@ import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/ac
 import { GetServiceBroker, GetServiceBrokers } from '../actions/service-broker.actions';
 import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
 
-export const serviceBrokerActionBuilders = {
+export interface ServiceBrokerActionBuilders extends OrchestratedActionBuilders {
+  get: (
+    guid,
+    endpointGuid,
+    { includeRelations, populateMissing }: CFBasePipelineRequestActionMeta
+  ) => GetServiceBroker;
+  getMultiple: (
+    endpointGuid,
+    paginationKey,
+    { includeRelations, populateMissing }: CFBasePipelineRequestActionMeta
+  ) => GetServiceBrokers;
+}
+
+export const serviceBrokerActionBuilders: ServiceBrokerActionBuilders = {
   get: (
     guid,
     endpointGuid,
@@ -18,4 +31,4 @@ export const serviceBrokerActionBuilders = {
     paginationKey,
     { includeRelations, populateMissing }: CFBasePipelineRequestActionMeta = {}
   ) => new GetServiceBrokers(endpointGuid, paginationKey, includeRelations, populateMissing)
-} as OrchestratedActionBuilders;
+};
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/service-instance.action.builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/service-instance.action.builders.ts
index 11e42a0533..473139f63e 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/service-instance.action.builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/service-instance.action.builders.ts
@@ -1,3 +1,4 @@
+import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import {
   CreateServiceInstance,
   DeleteServiceInstance,
@@ -8,7 +9,6 @@ import {
 import { GetServicePlanServiceInstances } from '../actions/service-plan.actions';
 import { GetServiceInstancesForSpace } from '../actions/space.actions';
 import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
-import { CFOrchestratedActionBuilders } from './cf.action-builder.types';
 
 export interface CreateUpdateActionMeta {
   name: string;
@@ -18,7 +18,7 @@ export interface CreateUpdateActionMeta {
   tags: string[];
 }
 
-export interface ServiceInstanceActionBuilders extends CFOrchestratedActionBuilders {
+export interface ServiceInstanceActionBuilders extends OrchestratedActionBuilders {
   get: (
     guid: string,
     endpointGuid: string,
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/service-plan-visibility.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/service-plan-visibility.action-builders.ts
index 1bf3f31d27..fec17c28d2 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/service-plan-visibility.action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/service-plan-visibility.action-builders.ts
@@ -2,10 +2,18 @@ import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/ac
 import { GetServicePlanVisibilities } from '../actions/service-plan-visibility.actions';
 import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
 
-export const servicePlanVisibilityActionBuilders = {
+export interface ServicePlanVisibilityActionBuilders extends OrchestratedActionBuilders {
+  getMultiple: (
+    endpointGuid,
+    paginationKey,
+    { includeRelations, populateMissing }: CFBasePipelineRequestActionMeta
+  ) => GetServicePlanVisibilities;
+};
+
+export const servicePlanVisibilityActionBuilders: ServicePlanVisibilityActionBuilders = {
   getMultiple: (
     endpointGuid,
     paginationKey,
     { includeRelations, populateMissing }: CFBasePipelineRequestActionMeta = {}
   ) => new GetServicePlanVisibilities(endpointGuid, paginationKey, includeRelations, populateMissing)
-} as OrchestratedActionBuilders;
+};
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/service-plan.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/service-plan.action-builders.ts
index fea755bb8a..e4b8391296 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/service-plan.action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/service-plan.action-builders.ts
@@ -1,7 +1,16 @@
 import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import { GetServicePlansForService } from '../actions/service.actions';
 
-export const servicePlanActionBuilders = {
+export interface ServicePlanActionBuilders extends OrchestratedActionBuilders {
+  getAllForServiceInstance: (
+    serviceGuid: string,
+    endpointGuid: string,
+    paginationKey: string,
+    includeRelations?: string[]
+  ) => GetServicePlansForService
+};
+
+export const servicePlanActionBuilders: ServicePlanActionBuilders = {
   getAllForServiceInstance: (
     serviceGuid: string,
     endpointGuid: string,
@@ -13,4 +22,4 @@ export const servicePlanActionBuilders = {
     paginationKey,
     includeRelations
   )
-} as OrchestratedActionBuilders;
+};
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/service.entity-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/service.entity-builders.ts
index 5f4ada929a..158f6c9c99 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/service.entity-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/service.entity-builders.ts
@@ -3,7 +3,27 @@ import { GetAllServices, GetService } from '../actions/service.actions';
 import { GetAllServicesForSpace } from '../actions/space.actions';
 import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
 
-export const serviceActionBuilders = {
+export interface ServiceActionBuilders extends OrchestratedActionBuilders {
+  get: (
+    guid,
+    endpointGuid,
+    { includeRelations, populateMissing }: CFBasePipelineRequestActionMeta
+  ) => GetService;
+  getMultiple: (
+    endpointGuid,
+    paginationKey,
+    { includeRelations, populateMissing }: CFBasePipelineRequestActionMeta
+  ) => GetAllServices;
+  getAllInSpace: (
+    endpointGuid: string,
+    paginationKey: string,
+    spaceGuid: string,
+    includeRelations?: string[],
+    populateMissing?: boolean,
+  ) => GetAllServicesForSpace;
+}
+
+export const serviceActionBuilders: ServiceActionBuilders = {
   get: (
     guid,
     endpointGuid,
@@ -26,4 +46,4 @@ export const serviceActionBuilders = {
     includeRelations?: string[],
     populateMissing?: boolean,
   ) => new GetAllServicesForSpace(paginationKey, endpointGuid, spaceGuid, includeRelations, populateMissing)
-} as OrchestratedActionBuilders;
+};
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/space-quota.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/space-quota.action-builders.ts
index 8566696b38..ffd1b134c7 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/space-quota.action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/space-quota.action-builders.ts
@@ -1,7 +1,7 @@
-import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import {
   QuotaFormValues,
 } from '../../../core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component';
+import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import {
   AssociateSpaceQuota,
   CreateSpaceQuotaDefinition,
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/space.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/space.action-builders.ts
index 6439af8730..e6983ad135 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/space.action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/space.action-builders.ts
@@ -2,7 +2,10 @@ import { IUpdateSpace } from '../../../core/src/core/cf-api.types';
 import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import { GetAllOrganizationSpaces } from '../actions/organization.actions';
 import { CreateSpace, DeleteSpace, GetAllSpaces, GetSpace, UpdateSpace } from '../actions/space.actions';
+import { cfEntityFactory } from '../cf-entity-factory';
 import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
+import { organizationEntityType, spaceEntityType, spaceWithOrgEntityType } from '../cf-entity-types';
+import { createEntityRelationKey } from '../entity-relations/entity-relations.types';
 
 export interface SpaceActionBuilders extends OrchestratedActionBuilders {
   get: (
@@ -10,6 +13,11 @@ export interface SpaceActionBuilders extends OrchestratedActionBuilders {
     endpointGuid: string,
     { includeRelations, populateMissing }?: CFBasePipelineRequestActionMeta
   ) => GetSpace;
+  getWithOrganization: (
+    guid: string,
+    endpointGuid: string,
+    { includeRelations, populateMissing }?: CFBasePipelineRequestActionMeta
+  ) => GetSpace;
   remove: (
     guid: string,
     endpointGuid: string,
@@ -49,6 +57,24 @@ export const spaceActionBuilders: SpaceActionBuilders = {
     includeRelations,
     populateMissing
   ),
+  getWithOrganization: (
+    guid: string,
+    endpointGuid: string,
+    {
+      includeRelations = [createEntityRelationKey(spaceEntityType, organizationEntityType)],
+      populateMissing
+    }: CFBasePipelineRequestActionMeta = {}
+  ) => {
+    const action = new GetSpace(
+      guid,
+      endpointGuid,
+      includeRelations || [],
+      populateMissing
+    )
+    action.entity = [cfEntityFactory(spaceWithOrgEntityType)];
+    action.schemaKey = spaceWithOrgEntityType
+    return action;
+  },
   remove: (
     guid,
     endpointGuid,
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/stack-action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/stack-action-builders.ts
index 4523c78611..e56dd9de38 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/stack-action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/stack-action-builders.ts
@@ -1,7 +1,7 @@
+import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import { GetAllStacks, GetStack } from '../actions/stack.action';
-import { CFOrchestratedActionBuilders } from './cf.action-builder.types';
 
-export interface StackActionBuilders extends CFOrchestratedActionBuilders {
+export interface StackActionBuilders extends OrchestratedActionBuilders {
   get: (
     guid: string,
     endpointGuid: string,
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/user-provided-service.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/user-provided-service.action-builders.ts
index 01b911c1ad..3ca122c4ff 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/user-provided-service.action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/user-provided-service.action-builders.ts
@@ -1,21 +1,32 @@
+import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
-import { DeleteApplication } from '../actions/application.actions';
 import {
+  CreateUserProvidedServiceInstance,
+  DeleteUserProvidedInstance,
   GetAllUserProvidedServices,
   GetUserProvidedService,
   IUserProvidedServiceInstanceData,
   UpdateUserProvidedServiceInstance,
 } from '../actions/user-provided-service.actions';
 import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
-import { CFOrchestratedActionBuilders } from './cf.action-builder.types';
 
-export interface UserProvidedServiceActionBuilder extends CFOrchestratedActionBuilders {
+
+export interface UserProvidedServiceActionBuilder extends OrchestratedActionBuilders {
   get: (
     guid: string,
     endpointGuid: string,
     { includeRelations, populateMissing }?: CFBasePipelineRequestActionMeta
   ) => GetUserProvidedService;
-  remove: (guid: string, endpointGuid: string) => DeleteApplication;
+  create: (
+    endpointGuid: string,
+    guid: string,
+    data: IUserProvidedServiceInstanceData,
+    proxyPaginationEntityConfig?: EntityCatalogEntityConfig) => CreateUserProvidedServiceInstance,
+  remove: (
+    guid: string,
+    endpointGuid: string,
+    proxyPaginationEntityConfig?: EntityCatalogEntityConfig
+  ) => DeleteUserProvidedInstance;
   update: (
     guid: string,
     endpointGuid: string,
@@ -42,7 +53,17 @@ export const userProvidedServiceActionBuilder: UserProvidedServiceActionBuilder
     endpointGuid,
     { includeRelations, populateMissing }: CFBasePipelineRequestActionMeta = {}
   ) => new GetUserProvidedService(guid, endpointGuid, includeRelations, populateMissing),
-  remove: (guid: string, endpointGuid: string) => new DeleteApplication(guid, endpointGuid),
+  remove: (
+    guid: string,
+    endpointGuid: string,
+    proxyPaginationEntityConfig?: EntityCatalogEntityConfig
+  ) => new DeleteUserProvidedInstance(endpointGuid, guid, proxyPaginationEntityConfig),
+  create: (
+    endpointGuid: string,
+    guid: string,
+    data: IUserProvidedServiceInstanceData,
+    proxyPaginationEntityConfig?: EntityCatalogEntityConfig) =>
+    new CreateUserProvidedServiceInstance(endpointGuid, guid, data, proxyPaginationEntityConfig),
   update: (
     guid: string,
     endpointGuid: string,
@@ -67,5 +88,3 @@ export const userProvidedServiceActionBuilder: UserProvidedServiceActionBuilder
     populateMissing?: boolean,
   ) => new GetAllUserProvidedServices(paginationKey, endpointGuid, includeRelations, populateMissing, spaceGuid)
 };
-
-
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/user.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/user.action-builders.ts
index a580331699..174a9105a0 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/user.action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/user.action-builders.ts
@@ -1,10 +1,10 @@
+import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import { GetAllOrgUsers } from '../actions/organization.actions';
 import { GetAllSpaceUsers } from '../actions/space.actions';
 import { GetAllUsersAsAdmin, GetUser } from '../actions/users.actions';
 import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
-import { CFOrchestratedActionBuilders } from './cf.action-builder.types';
 
-export interface UserActionBuilders extends CFOrchestratedActionBuilders {
+export interface UserActionBuilders extends OrchestratedActionBuilders {
   get: (
     guid: string,
     endpointGuid: string
@@ -56,5 +56,4 @@ export const userActionBuilders: UserActionBuilders = {
     isAdmin: boolean,
     includeRelations?: string[]
   ) => new GetAllSpaceUsers(guid, paginationKey, endpointGuid, isAdmin, includeRelations),
-
 };
diff --git a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relation-tree.helpers.ts b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relation-tree.helpers.ts
deleted file mode 100644
index d45bf6e8ee..0000000000
--- a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relation-tree.helpers.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-
-import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog.service';
-import { ActionState } from '../../../store/src/reducers/api-request-reducer/types';
-import { selectPaginationState } from '../../../store/src/selectors/pagination.selectors';
-import { PaginatedAction, PaginationEntityState } from '../../../store/src/types/pagination.types';
-import { ValidateResultFetchingState } from './entity-relations.types';
-
-export function createValidationPaginationWatcher(store, paramPaginationAction: PaginatedAction):
-  Observable<ValidateResultFetchingState> {
-  return store.select(selectPaginationState(entityCatalog.getEntityKey(paramPaginationAction), paramPaginationAction.paginationKey)).pipe(
-    map((paginationState: PaginationEntityState) => {
-      const pageRequest: ActionState =
-        paginationState && paginationState.pageRequests && paginationState.pageRequests[paginationState.currentPage];
-      return { fetching: pageRequest ? pageRequest.busy : true };
-    })
-  );
-}
diff --git a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relation-tree.ts b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relation-tree.ts
index a36a993c30..72077db071 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relation-tree.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relation-tree.ts
@@ -1,4 +1,4 @@
-import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
 import { EntitySchema } from '../../../store/src/helpers/entity-schema';
 
 /**
diff --git a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-from-parent.spec.ts b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-from-parent.spec.ts
index 7ddbb0378b..b17c5d4bfa 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-from-parent.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-from-parent.spec.ts
@@ -7,7 +7,7 @@ import {
   EntityCatalogTestModuleManualStore,
   TEST_CATALOGUE_ENTITIES,
 } from '../../../store/src/entity-catalog-test.module';
-import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
 import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
 import {
   createBasicStoreModule,
diff --git a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-validate.spec.ts b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-validate.spec.ts
index dee44881df..7c6d7e0b99 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-validate.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-validate.spec.ts
@@ -5,7 +5,7 @@ import {
   EntityCatalogTestModuleManualStore,
   TEST_CATALOGUE_ENTITIES,
 } from '../../../store/src/entity-catalog-test.module';
-import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
 import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
 import { environment } from '../../../core/src/environments/environment';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.ts b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.ts
index d24fc0c48f..2bbdf819b2 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.ts
@@ -8,7 +8,7 @@ import { environment } from '../../../core/src/environments/environment';
 import { SetInitialParams } from '../../../store/src/actions/pagination.actions';
 import { APIResponse } from '../../../store/src/actions/request.actions';
 import { GeneralEntityAppState } from '../../../store/src/app-state';
-import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
 import { isEntityBlocked } from '../../../store/src/entity-service';
 import { EntitySchema } from '../../../store/src/helpers/entity-schema';
 import { pick } from '../../../store/src/helpers/reducer.helper';
@@ -24,7 +24,6 @@ import {
 } from '../../../store/src/types/request.types';
 import { FetchRelationAction, FetchRelationPaginatedAction, FetchRelationSingleAction } from '../actions/relation.actions';
 import { EntityTreeRelation } from './entity-relation-tree';
-import { createValidationPaginationWatcher } from './entity-relation-tree.helpers';
 import { validationPostProcessor } from './entity-relations-post-processor';
 import { fetchEntityTree } from './entity-relations.tree';
 import {
@@ -144,6 +143,16 @@ function createActionsForExistingEntities(config: HandleRelationsConfig): Action
   );
 }
 
+function createValidationPaginationWatcher(store, paramPaginationAction: PaginatedAction):
+  Observable<ValidateResultFetchingState> {
+  return store.select(selectPaginationState(entityCatalog.getEntityKey(paramPaginationAction), paramPaginationAction.paginationKey)).pipe(
+    map((paginationState: PaginationEntityState) => {
+      const pageRequest = paginationState && paginationState.pageRequests && paginationState.pageRequests[paginationState.currentPage];
+      return { fetching: pageRequest ? pageRequest.busy : true };
+    })
+  );
+}
+
 /**
  * Create actions required to fetch missing relations
  */
diff --git a/src/frontend/packages/cloud-foundry/src/entity-relations/processors/org-space-post-processor.ts b/src/frontend/packages/cloud-foundry/src/entity-relations/processors/org-space-post-processor.ts
index ff93962667..557e5ef776 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-relations/processors/org-space-post-processor.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-relations/processors/org-space-post-processor.ts
@@ -3,7 +3,7 @@ import { map } from 'rxjs/operators';
 
 import { APIResponse } from '../../../../store/src/actions/request.actions';
 import { GeneralEntityAppState, GeneralRequestDataState, IRequestEntityTypeState } from '../../../../store/src/app-state';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
 import { deepMergeState, mergeEntity } from '../../../../store/src/helpers/reducer.helper';
 import { selectPaginationState } from '../../../../store/src/selectors/pagination.selectors';
 import { APIResource } from '../../../../store/src/types/api.types';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/application-delete.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/application-delete.component.ts
index 41846a8b01..f5210fadd0 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/application-delete.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/application-delete.component.ts
@@ -4,7 +4,6 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable, ReplaySubject } from 'rxjs';
 import { filter, first, map, pairwise, shareReplay, startWith, switchMap, tap } from 'rxjs/operators';
 
-import { DeleteUserProvidedInstance } from '../../../../../cloud-foundry/src/actions/user-provided-service.actions';
 import {
   applicationEntityType,
   routeEntityType,
@@ -19,15 +18,14 @@ import {
 import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types';
 import { RouterNav } from '../../../../../store/src/actions/router.actions';
 import { GeneralEntityAppState } from '../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../../store/src/entity-catalog/entity-catalog.types';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { EntityMonitor } from '../../../../../store/src/monitors/entity-monitor';
-import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitor } from '../../../../../store/src/monitors/pagination-monitor';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
+import { RequestInfoState } from '../../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { cfEntityCatalog } from '../../../cf-entity-catalog';
 import { CF_ENDPOINT_TYPE } from '../../../cf-types';
-import { RoutesActionBuilders } from '../../../entity-action-builders/routes.action-builder';
 import {
   CfAppRoutesListConfigService,
 } from '../../../shared/components/list/list-types/app-route/cf-app-routes-list-config.service';
@@ -172,7 +170,6 @@ export class ApplicationDeleteComponent<T> {
     private store: Store<GeneralEntityAppState>,
     private applicationService: ApplicationService,
     private paginationMonitorFactory: PaginationMonitorFactory,
-    private entityMonitorFactory: EntityMonitorFactory,
     private datePipe: DatePipe
   ) {
     this.setupAppMonitor();
@@ -204,10 +201,7 @@ export class ApplicationDeleteComponent<T> {
       startWith(true)
     );
 
-    const appEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, applicationEntityType);
-    const actionBuilder = appEntity.actionOrchestrator.getActionBuilder('get');
-    const getApplicationAction = actionBuilder(applicationService.appGuid, applicationService.cfGuid);
-    this.store.dispatch(getApplicationAction);
+    cfEntityCatalog.application.api.get(applicationService.appGuid, applicationService.cfGuid, {});
   }
 
   private setupAppMonitor() {
@@ -223,46 +217,28 @@ export class ApplicationDeleteComponent<T> {
   }
 
   public getApplicationMonitor() {
-    return this.entityMonitorFactory.create<APIResource<IApp>>(
-      this.applicationService.appGuid,
-      {
-        entityType: applicationEntityType,
-        endpointType: CF_ENDPOINT_TYPE
-      }
-    );
+    return cfEntityCatalog.application.store.getEntityMonitor(this.applicationService.appGuid);
   }
+
   /**
    * Builds the related entities actions and monitors to monitor the state of the entities.
    */
   public buildRelatedEntitiesActionMonitors() {
     const { appGuid, cfGuid } = this.applicationService;
     const instanceAction = AppServiceBindingDataSource.createGetAllServiceBindings(appGuid, cfGuid);
-
-    const routeEntity = entityCatalog.getEntity<IEntityMetadata, null, RoutesActionBuilders>(CF_ENDPOINT_TYPE, routeEntityType);
-    const actionBuilder = routeEntity.actionOrchestrator.getActionBuilder('getAllForApplication');
-    const routesAction = actionBuilder(appGuid, cfGuid);
-
-    const instancePaginationKey = instanceAction.paginationKey;
-    const routesPaginationKey = routesAction.paginationKey;
-
     const instanceMonitor = this.paginationMonitorFactory.create<APIResource<IServiceBinding>>(
-      instancePaginationKey,
+      instanceAction.paginationKey,
       instanceAction.entity[0],
       instanceAction.flattenPagination
     );
-    const routeMonitor = this.paginationMonitorFactory.create<APIResource<IRoute>>(
-      routesPaginationKey,
-      routesAction.entity[0],
-      routesAction.flattenPagination
-    );
     return {
       fetch: () => {
         this.store.dispatch(instanceAction);
-        this.store.dispatch(routesAction);
+        cfEntityCatalog.route.api.getAllForApplication(appGuid, cfGuid);
       },
       monitors: {
         instanceMonitor,
-        routeMonitor
+        routeMonitor: cfEntityCatalog.route.store.getAllForApplication.getPaginationMonitor(appGuid, cfGuid)
       }
     };
   }
@@ -320,34 +296,22 @@ export class ApplicationDeleteComponent<T> {
       return this.redirectToAppWall();
     }
     this.deleteStarted = true;
-    const applicationEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, applicationEntityType);
-    const actionBuilder = applicationEntity.actionOrchestrator.getActionBuilder('remove');
-    const deleteApplicationAction = actionBuilder(this.applicationService.appGuid, this.applicationService.cfGuid);
-    this.store.dispatch(deleteApplicationAction);
-    return this.appMonitor.entityRequest$.pipe(
+    return cfEntityCatalog.application.api.remove<RequestInfoState>(this.applicationService.appGuid, this.applicationService.cfGuid).pipe(
       filter(request => !request.deleting.busy && (request.deleting.deleted || request.deleting.error)),
       map((request) => ({ success: request.deleting.deleted })),
       tap(({ success }) => {
         if (success) {
           if (this.selectedRoutes && this.selectedRoutes.length) {
-            const routeEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, routeEntityType);
-            const delActionBuilder = routeEntity.actionOrchestrator.getActionBuilder('delete');
             this.selectedRoutes.forEach(route => {
-              const deleteRouteAction =
-                delActionBuilder(route.metadata.guid, this.applicationService.cfGuid, this.applicationService.appGuid);
-              this.store.dispatch(deleteRouteAction);
+              cfEntityCatalog.route.api.delete(route.metadata.guid, this.applicationService.cfGuid, this.applicationService.appGuid)
             });
           }
           if (this.selectedServiceInstances && this.selectedServiceInstances.length) {
             this.selectedServiceInstances.forEach(instance => {
-              const serviceInstanceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, serviceInstancesEntityType);
               if (isUserProvidedServiceInstance(instance.entity.service_instance.entity)) {
-                this.store.dispatch(new DeleteUserProvidedInstance(this.applicationService.cfGuid, instance.entity.service_instance_guid));
+                cfEntityCatalog.userProvidedService.api.remove(instance.entity.service_instance_guid, this.applicationService.cfGuid)
               } else {
-                const remSiActionBuilder = serviceInstanceEntity.actionOrchestrator.getActionBuilder('remove');
-                const deleteServiceInstanceAction =
-                  remSiActionBuilder(this.applicationService.cfGuid, instance.entity.service_instance_guid);
-                this.store.dispatch(deleteServiceInstanceAction);
+                cfEntityCatalog.serviceInstance.api.remove(instance.entity.service_instance_guid, this.applicationService.cfGuid)
               }
             });
           }
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/app-delete-instances-routes-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/app-delete-instances-routes-list-config.service.ts
index 60bb59f73e..29bf89725d 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/app-delete-instances-routes-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/app-delete-instances-routes-list-config.service.ts
@@ -2,11 +2,10 @@ import { DatePipe } from '@angular/common';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable, of as observableOf } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 
-import { FetchAllServiceBindings } from '../../../../../../cloud-foundry/src/actions/service-bindings.actions';
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
-import { serviceBindingEntityType, serviceEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
+import { serviceBindingEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
 import {
   createEntityRelationPaginationKey,
 } from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
@@ -14,18 +13,15 @@ import { IServiceBinding } from '../../../../../../core/src/core/cf-api-svc.type
 import { CurrentUserPermissionsService } from '../../../../../../core/src/core/current-user-permissions.service';
 import { RowState } from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
 import { ListViewTypes } from '../../../../../../core/src/shared/components/list/list.component.types';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
+import { endpointSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
-import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../../../store/src/types/api.types';
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
-import { ServiceBindingActionBuilders } from '../../../../entity-action-builders/service-binding.action-builders';
+import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import {
   AppServiceBindingListConfigService,
 } from '../../../../shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service';
 import { ServiceActionHelperService } from '../../../../shared/data-services/service-action-helper.service';
-import { QParam, QParamJoiners } from '../../../../shared/q-param';
+import { fetchTotalResults } from '../../../cloud-foundry/cf.helpers';
 import { ApplicationService } from '../../application.service';
 
 @Injectable()
@@ -34,21 +30,6 @@ export class AppDeleteServiceInstancesListConfigService extends AppServiceBindin
   allowSelection: boolean;
   obsCache: { [serviceGuid: string]: Observable<RowState> } = {};
 
-  static createFetchServiceBinding = (cfGuid: string, serviceInstanceGuid: string): FetchAllServiceBindings => {
-    const sgEntity = entityCatalog
-      .getEntity<IEntityMetadata, null, ServiceBindingActionBuilders>(CF_ENDPOINT_TYPE, serviceBindingEntityType);
-    const actionBuilder = sgEntity.actionOrchestrator.getActionBuilder('getMultiple');
-    const action = actionBuilder(
-      cfGuid,
-      createEntityRelationPaginationKey(serviceEntityType, serviceInstanceGuid) + '-count',
-    );
-    action.initialParams['results-per-page'] = 1;
-    action.initialParams.q = [
-      new QParam('service_instance_guid', serviceInstanceGuid, QParamJoiners.in).toString(),
-    ];
-    return action;
-  }
-
   constructor(
     store: Store<CFAppState>,
     appService: ApplicationService,
@@ -75,30 +56,24 @@ export class AppDeleteServiceInstancesListConfigService extends AppServiceBindin
         return observableOf({});
       }
       if (!this.obsCache[serviceBinding.entity.service_instance_guid]) {
-        const action = AppDeleteServiceInstancesListConfigService.createFetchServiceBinding(
+        const action = cfEntityCatalog.serviceBinding.actions.getAllForServiceInstance(
+          serviceBinding.entity.service_instance_guid,
           appService.cfGuid,
-          serviceBinding.entity.service_instance_guid
-        );
-        const catalogEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, action.entityType);
-        const pagObs = getPaginationObservables({
-          store,
+          createEntityRelationPaginationKey(endpointSchemaKey, serviceBindingEntityType),
+          {
+            includeRelations: [],
+          }
+        )
+        this.obsCache[serviceBinding.entity.service_instance_guid] = fetchTotalResults(
           action,
-          paginationMonitor: this.paginationMonitorFactory.create(
-            action.paginationKey,
-            catalogEntity.getSchema(),
-            false
-          )
-        });
-        this.obsCache[serviceBinding.entity.service_instance_guid] = pagObs.pagination$.pipe(
-          map(pag => ({
+          store,
+          this.paginationMonitorFactory
+        ).pipe(
+          map(totalResults => ({
             disabledReason: 'Service is attached to other applications',
-            disabled: pag.totalResults > 1
+            disabled: totalResults > 1
           }))
         );
-        // Ensure the request is made by sub'ing to the entities observable
-        pagObs.entities$.pipe(
-          first(),
-        ).subscribe();
       }
       return this.obsCache[serviceBinding.entity.service_instance_guid];
     };
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts
index 61bf728b50..83ac02da05 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts
@@ -9,19 +9,14 @@ import {
   UpdateApplication,
   UpdateExistingApplication,
 } from '../../../../cloud-foundry/src/actions/application.actions';
-import { GetAllOrganizationDomains } from '../../../../cloud-foundry/src/actions/organization.actions';
 import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
 import {
-  appEnvVarsEntityType,
   applicationEntityType,
-  appStatsEntityType,
-  appSummaryEntityType,
   domainEntityType,
   organizationEntityType,
   routeEntityType,
   serviceBindingEntityType,
   spaceEntityType,
-  spaceWithOrgEntityType,
   stackEntityType,
 } from '../../../../cloud-foundry/src/cf-entity-types';
 import { IApp, IAppSummary, IDomain, IOrganization, ISpace } from '../../../../core/src/core/cf-api.types';
@@ -30,24 +25,19 @@ import {
   ApplicationStateService,
 } from '../../../../core/src/shared/components/application-state/application-state.service';
 import { APP_GUID, CF_GUID } from '../../../../core/src/shared/entity.tokens';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
 import { EntityService } from '../../../../store/src/entity-service';
-import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
-import { EntityMonitorFactory } from '../../../../store/src/monitors/entity-monitor.factory.service';
-import { PaginationMonitor } from '../../../../store/src/monitors/pagination-monitor';
-import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { ActionState, rootUpdatingKey } from '../../../../store/src/reducers/api-request-reducer/types';
 import {
   getCurrentPageRequestInfo,
-  getPaginationObservables,
   PaginationObservables,
-} from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+} from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
 import { selectUpdateInfo } from '../../../../store/src/selectors/api.selectors';
 import { endpointEntitiesSelector } from '../../../../store/src/selectors/endpoint.selectors';
 import { APIResource, EntityInfo } from '../../../../store/src/types/api.types';
-import { PaginatedAction, PaginationEntityState } from '../../../../store/src/types/pagination.types';
-import { cfEntityFactory } from '../../cf-entity-factory';
-import { CF_ENDPOINT_TYPE, CFEntityConfig } from '../../cf-types';
+import { PaginationEntityState } from '../../../../store/src/types/pagination.types';
+import { cfEntityCatalog } from '../../cf-entity-catalog';
+import { CF_ENDPOINT_TYPE } from '../../cf-types';
 import { createEntityRelationKey } from '../../entity-relations/entity-relations.types';
 import { AppStat } from '../../store/types/app-metadata.types';
 import {
@@ -60,13 +50,13 @@ export function createGetApplicationAction(guid: string, endpointGuid: string) {
   return new GetApplication(
     guid,
     endpointGuid, [
-      createEntityRelationKey(applicationEntityType, routeEntityType),
-      createEntityRelationKey(applicationEntityType, spaceEntityType),
-      createEntityRelationKey(applicationEntityType, stackEntityType),
-      createEntityRelationKey(applicationEntityType, serviceBindingEntityType),
-      createEntityRelationKey(routeEntityType, domainEntityType),
-      createEntityRelationKey(spaceEntityType, organizationEntityType),
-    ]
+    createEntityRelationKey(applicationEntityType, routeEntityType),
+    createEntityRelationKey(applicationEntityType, spaceEntityType),
+    createEntityRelationKey(applicationEntityType, stackEntityType),
+    createEntityRelationKey(applicationEntityType, serviceBindingEntityType),
+    createEntityRelationKey(routeEntityType, domainEntityType),
+    createEntityRelationKey(spaceEntityType, organizationEntityType),
+  ]
   );
 }
 
@@ -87,21 +77,20 @@ export class ApplicationService {
     @Inject(CF_GUID) public cfGuid: string,
     @Inject(APP_GUID) public appGuid: string,
     private store: Store<CFAppState>,
-    private entityServiceFactory: EntityServiceFactory,
     private appStateService: ApplicationStateService,
     private appEnvVarsService: ApplicationEnvVarsHelper,
-    private paginationMonitorFactory: PaginationMonitorFactory,
   ) {
-    this.appEntityService = this.entityServiceFactory.create<APIResource<IApp>>(
+    this.appEntityService = cfEntityCatalog.application.store.getEntityService(
       appGuid,
-      createGetApplicationAction(appGuid, cfGuid)
+      cfGuid,
+      {
+        includeRelations: createGetApplicationAction(appGuid, cfGuid).includeRelations,
+        populateMissing: true
+      }
     );
-    const appSummaryEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appSummaryEntityType);
-    const actionBuilder = appSummaryEntity.actionOrchestrator.getActionBuilder('get');
-    const getAppSummaryAction = actionBuilder(appGuid, cfGuid);
-    this.appSummaryEntityService = this.entityServiceFactory.create<IAppSummary>(
+    this.appSummaryEntityService = cfEntityCatalog.appSummary.store.getEntityService(
       appGuid,
-      getAppSummaryAction
+      cfGuid
     );
 
     this.constructCoreObservables();
@@ -142,21 +131,11 @@ export class ApplicationService {
    * Fetch the current state of the app (given it's instances) as an object ready
    */
   static getApplicationState(
-    store: Store<CFAppState>,
     appStateService: ApplicationStateService,
     app: IApp,
     appGuid: string,
     cfGuid: string): Observable<ApplicationStateData> {
-    const appStatsEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appStatsEntityType);
-    const actionBuilder = appStatsEntity.actionOrchestrator.getActionBuilder('get');
-    const dummyAction = actionBuilder(appGuid, cfGuid) as PaginatedAction;
-    const paginationMonitor = new PaginationMonitor(
-      store,
-      dummyAction.paginationKey,
-      dummyAction,
-      dummyAction.flattenPagination
-    );
-    return paginationMonitor.currentPage$.pipe(
+    return cfEntityCatalog.appStats.store.getPaginationMonitor(appGuid, cfGuid).currentPage$.pipe(
       map(appInstancesPages => {
         return appStateService.get(app, appInstancesPages);
       })
@@ -172,18 +151,9 @@ export class ApplicationService {
     this.appSpace$ = moreWaiting$.pipe(
       first(),
       switchMap(app => {
-        const spaceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, spaceEntityType);
-        const actionBuilder = spaceEntity.actionOrchestrator.getActionBuilder('get');
-        const getSpaceAction = actionBuilder(
+        return cfEntityCatalog.space.store.getWithOrganization.getEntityService(
           app.space_guid,
           app.cfGuid,
-          { includeRelations: [createEntityRelationKey(spaceEntityType, organizationEntityType)], populateMissing: true }
-        );
-        getSpaceAction.entity = cfEntityFactory(spaceWithOrgEntityType);
-        getSpaceAction.schemaKey = spaceWithOrgEntityType;
-        return this.entityServiceFactory.create<APIResource<ISpace>>(
-          app.space_guid,
-          getSpaceAction
         ).waitForEntity$.pipe(
           map(entityInfo => entityInfo.entity)
         );
@@ -212,27 +182,14 @@ export class ApplicationService {
   }
 
   public getApplicationEnvVarsMonitor() {
-    const factory = new EntityMonitorFactory(this.store);
-    return factory.create<APIResource<IApp>>(
-      this.appGuid,
-      new CFEntityConfig(appEnvVarsEntityType)
-    );
+    return cfEntityCatalog.appEnvVar.store.getEntityMonitor(
+      this.appGuid
+    )
   }
 
   private constructAmalgamatedObservables() {
     // Assign/Amalgamate them to public properties (with mangling if required)
-    const appStatsEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appStatsEntityType);
-    const actionBuilder = appStatsEntity.actionOrchestrator.getActionBuilder('get');
-    const action = actionBuilder(this.appGuid, this.cfGuid) as PaginatedAction;
-    const appStats = getPaginationObservables({
-      store: this.store,
-      action,
-      paginationMonitor: this.paginationMonitorFactory.create(
-        action.paginationKey,
-        new CFEntityConfig(appStatsEntityType),
-        action.flattenPagination
-      )
-    }, true);
+    const appStats = cfEntityCatalog.appStats.store.getPaginationService(this.appGuid, this.cfGuid)
     // This will fail to fetch the app stats if the current app is not running but we're
     // willing to do this to speed up the initial fetch for a running application.
     this.appStats$ = appStats.entities$;
@@ -270,22 +227,9 @@ export class ApplicationService {
     // In an ideal world we'd get domains inline with the application, however the inline path from app to org domains exceeds max cf depth
     // of 2 (app --> space --> org --> domains).
     this.orgDomains$ = this.appOrg$.pipe(
-      switchMap(org => {
-        const domainsAction = new GetAllOrganizationDomains(org.metadata.guid, this.cfGuid);
-        const paginationMonitor = this.paginationMonitorFactory.create(
-          domainsAction.paginationKey,
-          domainsAction,
-          domainsAction.flattenPagination
-        );
-        return getPaginationObservables<APIResource<IDomain>>(
-          {
-            store: this.store,
-            action: domainsAction,
-            paginationMonitor
-          },
-          true
-        ).entities$;
-      }),
+      switchMap(org =>
+        cfEntityCatalog.domain.store.getOrganizationDomains.getPaginationService(org.metadata.guid, this.cfGuid).entities$
+      ),
       publishReplay(1),
       refCount()
     );
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.ts
index 79b42a6f9f..6d1beb833c 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.ts
@@ -8,7 +8,6 @@ import {
 } from '../../../../../core/src/shared/components/application-state/application-state.service';
 import { APP_GUID, CF_GUID, ENTITY_SERVICE } from '../../../../../core/src/shared/entity.tokens';
 import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
-import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { ApplicationService, createGetApplicationAction } from '../application.service';
 import { ApplicationEnvVarsHelper } from './application-tabs-base/tabs/build-tab/application-env-vars.service';
 
@@ -16,19 +15,15 @@ export function applicationServiceFactory(
   cfId: string,
   id: string,
   store: Store<CFAppState>,
-  entityServiceFactoryInstance: EntityServiceFactory,
   appStateService: ApplicationStateService,
   appEnvVarsService: ApplicationEnvVarsHelper,
-  paginationMonitorFactory: PaginationMonitorFactory,
 ) {
   return new ApplicationService(
     cfId,
     id,
     store,
-    entityServiceFactoryInstance,
     appStateService,
     appEnvVarsService,
-    paginationMonitorFactory
   );
 }
 
@@ -76,10 +71,8 @@ export function getGuids(type?: string) {
         CF_GUID,
         APP_GUID,
         Store,
-        EntityServiceFactory,
         ApplicationStateService,
         ApplicationEnvVarsHelper,
-        PaginationMonitorFactory
       ]
     },
     {
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-polling.service.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-polling.service.ts
index 3796e52a22..503d85ab9b 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-polling.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-polling.service.ts
@@ -3,16 +3,14 @@ import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 import { first, map, tap } from 'rxjs/operators';
 
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
-import { appStatsEntityType, appSummaryEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
 import { IApp } from '../../../../../../core/src/core/cf-api.types';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityService } from '../../../../../../store/src/entity-service';
 import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
 import { ENTITY_SERVICE } from '../../../../../../core/src/shared/entity.tokens';
 import { AppState } from '../../../../../../store/src/app-state';
+import { EntityService } from '../../../../../../store/src/entity-service';
 import { selectDashboardState } from '../../../../../../store/src/selectors/dashboard.selectors';
 import { APIResource } from '../../../../../../store/src/types/api.types';
+import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { ApplicationService } from '../../application.service';
 
 @Injectable()
@@ -69,7 +67,6 @@ export class ApplicationPollingService {
 
   public poll(withApp = false) {
     const { cfGuid, appGuid } = this.applicationService;
-    const actionDispatcher = (action) => this.store.dispatch(action);
     if (withApp) {
       const updatingApp = {
         ...this.entityService.action,
@@ -80,13 +77,9 @@ export class ApplicationPollingService {
     this.entityService.entityObs$.pipe(
       first(),
     ).subscribe(resource => {
-      const appSummaryEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appSummaryEntityType);
-      const appSummaryActionDispatcher = appSummaryEntity.actionOrchestrator.getEntityActionDispatcher(actionDispatcher);
-      appSummaryActionDispatcher.dispatchGet(appGuid, cfGuid);
+      cfEntityCatalog.appSummary.api.get(appGuid, cfGuid);
       if (resource && resource.entity && resource.entity.entity && resource.entity.entity.state === 'STARTED') {
-        const appStatsEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appStatsEntityType);
-        const appStatsActionDispatcher = appStatsEntity.actionOrchestrator.getEntityActionDispatcher(actionDispatcher);
-        appStatsActionDispatcher.dispatchGet(appGuid, cfGuid);
+        cfEntityCatalog.appStats.api.getMultiple(appGuid, cfGuid)
       }
     });
   }
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts
index c0b9a3e987..600bde7fc6 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts
@@ -30,7 +30,7 @@ import { IHeaderBreadcrumb } from '../../../../../../core/src/shared/components/
 import { GitSCMService, GitSCMType } from '../../../../../../core/src/shared/data-services/scm/scm.service';
 import { ENTITY_SERVICE } from '../../../../../../core/src/shared/entity.tokens';
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
 import { EntityService } from '../../../../../../store/src/entity-service';
 import { EntitySchema } from '../../../../../../store/src/helpers/entity-schema';
 import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service.ts
index 0eca42f1d8..f3abf44de4 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service.ts
@@ -1,18 +1,11 @@
 import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
 
-import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
-import { appEnvVarsEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types';
 import { OverrideAppDetails } from '../../../../../../../../cloud-foundry/src/store/types/deploy-application.types';
-import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import {
-  getPaginationObservables,
   PaginationObservables,
-} from '../../../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+} from '../../../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
-import { PaginatedAction } from '../../../../../../../../store/src/types/pagination.types';
-import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
+import { cfEntityCatalog } from '../../../../../../cf-entity-catalog';
 
 
 export interface EnvVarStratosProject {
@@ -35,24 +28,8 @@ export interface EnvVarStratosProjectSource {
 @Injectable()
 export class ApplicationEnvVarsHelper {
 
-  constructor(
-    private store: Store<CFAppState>,
-    private paginationMonitorFactory: PaginationMonitorFactory,
-  ) { }
-
   createEnvVarsObs(appGuid: string, cfGuid: string): PaginationObservables<APIResource> {
-    const catalogEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appEnvVarsEntityType);
-    const actionBuilder = catalogEntity.actionOrchestrator.getActionBuilder('get');
-    const action = actionBuilder(appGuid, cfGuid) as PaginatedAction;
-    return getPaginationObservables<APIResource>({
-      store: this.store,
-      action,
-      paginationMonitor: this.paginationMonitorFactory.create(
-        action.paginationKey,
-        catalogEntity.getSchema(),
-        action.flattenPagination
-      )
-    }, action.flattenPagination);
+    return cfEntityCatalog.appEnvVar.store.getPaginationService(appGuid, cfGuid);
   }
 
   FetchStratosProject(appEnvVars): EnvVarStratosProject {
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts
index dce77b69da..7c3d7744d6 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts
@@ -4,10 +4,9 @@ import { Store } from '@ngrx/store';
 import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
 import { combineLatest, delay, distinct, filter, first, map, mergeMap, startWith, tap } from 'rxjs/operators';
 
-import { AppMetadataTypes, GetAppStatsAction } from '../../../../../../../../cloud-foundry/src/actions/app-metadata.actions';
+import { AppMetadataTypes } from '../../../../../../../../cloud-foundry/src/actions/app-metadata.actions';
 import { UpdateExistingApplication } from '../../../../../../../../cloud-foundry/src/actions/application.actions';
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
-import { applicationEntityType, appStatsEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types';
 import { IAppSummary } from '../../../../../../../../core/src/core/cf-api.types';
 import { CurrentUserPermissions } from '../../../../../../../../core/src/core/current-user-permissions.config';
 import { getFullEndpointApiUrl } from '../../../../../../../../core/src/features/endpoints/endpoint-helpers';
@@ -16,11 +15,10 @@ import { ConfirmationDialogService } from '../../../../../../../../core/src/shar
 import { GitSCMService, GitSCMType } from '../../../../../../../../core/src/shared/data-services/scm/scm.service';
 import { ENTITY_SERVICE } from '../../../../../../../../core/src/shared/entity.tokens';
 import { ResetPagination } from '../../../../../../../../store/src/actions/pagination.actions';
-import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { EntityService } from '../../../../../../../../store/src/entity-service';
 import { ActionState } from '../../../../../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource, EntityInfo } from '../../../../../../../../store/src/types/api.types';
-import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
+import { cfEntityCatalog } from '../../../../../../cf-entity-catalog';
 import { ApplicationMonitorService } from '../../../../application-monitor.service';
 import { ApplicationData, ApplicationService } from '../../../../application.service';
 import { DEPLOY_TYPES_IDS } from '../../../../deploy-application/deploy-application-steps.types';
@@ -174,10 +172,7 @@ export class BuildTabComponent implements OnInit {
 
   private dispatchAppStats = () => {
     const { cfGuid, appGuid } = this.applicationService;
-    const appStatsEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appStatsEntityType);
-    const actionBuilder = appStatsEntity.actionOrchestrator.getActionBuilder('get');
-    const getAppStatsAction = actionBuilder(appGuid, cfGuid);
-    this.store.dispatch(getAppStatsAction);
+    cfEntityCatalog.appStats.api.getMultiple(appGuid, cfGuid);
   }
 
   restartApplication() {
@@ -237,18 +232,14 @@ export class BuildTabComponent implements OnInit {
     this.updateApp(appStopConfirmation, 'stopping', 'STOPPED', () => {
       // On app reaching the 'STOPPED' state clear the app's stats pagination section
       const { cfGuid, appGuid } = this.applicationService;
-      const appStatsEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appStatsEntityType);
-      const actionBuilder = appStatsEntity.actionOrchestrator.getActionBuilder('get');
-      const getAppStatsAction = actionBuilder(appGuid, cfGuid) as GetAppStatsAction;
+      const getAppStatsAction = cfEntityCatalog.appStats.actions.getMultiple(appGuid, cfGuid);
       this.store.dispatch(new ResetPagination(getAppStatsAction, getAppStatsAction.paginationKey));
     });
   }
 
   restageApplication() {
     const { cfGuid, appGuid } = this.applicationService;
-    const appEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, applicationEntityType);
-    const actionBuilder = appEntity.actionOrchestrator.getActionBuilder('restage');
-    const restageAppAction = actionBuilder(appGuid, cfGuid);
+    const restageAppAction = cfEntityCatalog.application.actions.restage(appGuid, cfGuid)
     this.confirmAndPollForState(
       appRestageConfirmation,
       () => this.store.dispatch(restageAppAction),
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.ts
index 32506fe4f9..b4a2496a9d 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.ts
@@ -5,21 +5,16 @@ import { Store } from '@ngrx/store';
 import { Observable, of as observableOf, Subscription } from 'rxjs';
 import { distinctUntilChanged, filter, map, take, tap } from 'rxjs/operators';
 
-import { GitCommit, GitRepo } from '../../../../../../../../cloud-foundry/src/store/types/git.types';
+import { GitBranch, GitCommit, GitRepo } from '../../../../../../../../cloud-foundry/src/store/types/git.types';
 import {
   GithubCommitsListConfigServiceAppTab,
 } from '../../../../../../../../core/src/shared/components/list/list-types/github-commits/github-commits-list-config-app-tab.service';
 import { ListConfig } from '../../../../../../../../core/src/shared/components/list/list.component.types';
 import { GitSCMService, GitSCMType } from '../../../../../../../../core/src/shared/data-services/scm/scm.service';
-import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { EntityService } from '../../../../../../../../store/src/entity-service';
-import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
-import { FetchGitHubRepoInfo } from '../../../../../../actions/github.actions';
 import { CFAppState } from '../../../../../../cf-app-state';
-import { gitBranchesEntityType, gitCommitEntityType, gitRepoEntityType } from '../../../../../../cf-entity-types';
-import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
+import { cfEntityCatalog } from '../../../../../../cf-entity-catalog';
 import { GitMeta } from '../../../../../../entity-action-builders/git-action-builder';
-import { GitBranch } from '../../../../../../store/types/github.types';
 import { ApplicationService } from '../../../../application.service';
 import { EnvVarStratosProject } from '../build-tab/application-env-vars.service';
 
@@ -34,11 +29,10 @@ import { EnvVarStratosProject } from '../build-tab/application-env-vars.service'
         store: Store<CFAppState>,
         datePipe: DatePipe,
         scmService: GitSCMService,
-        applicationService: ApplicationService,
-        entityServiceFactory: EntityServiceFactory) => {
-        return new GithubCommitsListConfigServiceAppTab(store, datePipe, scmService, applicationService, entityServiceFactory);
+        applicationService: ApplicationService) => {
+        return new GithubCommitsListConfigServiceAppTab(store, datePipe, scmService, applicationService);
       },
-      deps: [Store, DatePipe, GitSCMService, ApplicationService, EntityServiceFactory]
+      deps: [Store, DatePipe, GitSCMService, ApplicationService]
     }
   ]
 })
@@ -71,8 +65,6 @@ export class GitSCMTabComponent implements OnInit, OnDestroy {
 
   constructor(
     private applicationService: ApplicationService,
-    private store: Store<CFAppState>,
-    private entityServiceFactory: EntityServiceFactory,
     private snackBar: MatSnackBar,
     private scmService: GitSCMService
   ) { }
@@ -88,35 +80,20 @@ export class GitSCMTabComponent implements OnInit, OnDestroy {
         const scmType = stProject.deploySource.scm || stProject.deploySource.type;
         const scm = this.scmService.getSCM(scmType as GitSCMType);
 
-        // Ensure the SCM type is included in the key
-        const repoEntityID = `${scmType}-${projectName}`;
-        const commitEntityID = `${repoEntityID}-${commitSha}`;
-
-        const gitRepoEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, gitRepoEntityType);
-        const getRepoActionBuilder = gitRepoEntity.actionOrchestrator.getActionBuilder('getRepoInfo');
-        const getRepoAction = getRepoActionBuilder(stProject) as FetchGitHubRepoInfo;
-        this.gitSCMRepoEntityService = this.entityServiceFactory.create(
-          repoEntityID,
-          getRepoAction
-        );
+        const gitRepInfoMeta: GitMeta = { projectName: stProject.deploySource.project, scm };
+        this.gitSCMRepoEntityService = cfEntityCatalog.gitRepo.store.getRepoInfo.getEntityService(gitRepInfoMeta)
 
         const gitMeta: GitMeta = { projectName: stProject.deploySource.project, scm, commitSha };
-        this.gitCommitEntityService = this.entityServiceFactory.create(
-          {
-            endpointType: CF_ENDPOINT_TYPE,
-            entityType: gitCommitEntityType,
-            actionMetadata: gitMeta,
-            entityGuid: commitEntityID,
-          }
-        );
+        const repoEntityID = `${scmType}-${projectName}`;
+        const commitEntityID = `${repoEntityID}-${commitSha}`; // FIXME: Should come from action #4245
+        this.gitCommitEntityService = cfEntityCatalog.gitCommit.store.getEntityService(commitEntityID, null, gitMeta)
+
+        this.gitBranchEntityService = cfEntityCatalog.gitBranch.store.getEntityService(undefined, undefined, {
+          scm,
+          projectName: projectName,
+          branchName: stProject.deploySource.branch
+        });
 
-        const branchID = `${scmType}-${projectName}-${stProject.deploySource.branch}`;
-        const gitBranchesEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, gitBranchesEntityType);
-        const fetchBranchesActionBuilder = gitBranchesEntity.actionOrchestrator.getActionBuilder('get');
-        this.gitBranchEntityService = this.entityServiceFactory.create(
-          branchID,
-          fetchBranchesActionBuilder(branchID, null, { projectName, scm })
-        );
 
         this.gitSCMRepo$ = this.gitSCMRepoEntityService.waitForEntity$.pipe(
           map(p => p.entity && p.entity)
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step3/create-application-step3.component.html b/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step3/create-application-step3.component.html
index ea2010b0b2..83bce9c427 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step3/create-application-step3.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step3/create-application-step3.component.html
@@ -2,7 +2,7 @@
 <form [formGroup]="setDomainHost" class="stepper-form">
   <mat-form-field>
     <mat-select placeholder="Domain" name="domain" formControlName="domain">
-      <mat-option *ngFor="let domain of (domains$ | async)" [value]="domain.entity.guid">
+      <mat-option *ngFor="let domain of (domains$ | async)" [value]="domain.metadata.guid">
         <span>{{ domain.entity.name }}</span>
       </mat-option>
     </mat-select>
@@ -11,4 +11,4 @@
     <input required formControlName="host" matInput placeholder="Host" name="hostName">
     <mat-error *ngIf="setDomainHost.controls['host']?.errors?.maxlength">Host cannot exceed 63 characters</mat-error>
   </mat-form-field>
-</form>
+</form>
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step3/create-application-step3.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step3/create-application-step3.component.ts
index 83e6e1575b..2b478a9249 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step3/create-application-step3.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step3/create-application-step3.component.ts
@@ -5,25 +5,16 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { catchError, filter, first, map, mergeMap, switchMap, tap } from 'rxjs/operators';
 
-import { CreateNewApplication } from '../../../../../../cloud-foundry/src/actions/application.actions';
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
-import {
-  applicationEntityType,
-  domainEntityType,
-  organizationEntityType,
-  routeEntityType,
-} from '../../../../../../cloud-foundry/src/cf-entity-types';
+import { domainEntityType, organizationEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
 import { selectNewAppState } from '../../../../../../cloud-foundry/src/store/effects/create-app-effects';
-import { selectCfRequestInfo } from '../../../../../../cloud-foundry/src/store/selectors/api.selectors';
 import { CreateNewApplicationState } from '../../../../../../cloud-foundry/src/store/types/create-application.types';
 import { IDomain } from '../../../../../../core/src/core/cf-api.types';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
 import { getDefaultRequestState, RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource } from '../../../../../../store/src/types/api.types';
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
+import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { createEntityRelationKey } from '../../../../entity-relations/entity-relations.types';
 import { createGetApplicationAction } from '../../application.service';
 
@@ -40,14 +31,14 @@ export class CreateApplicationStep3Component implements OnInit {
 
   setDomainHost: FormGroup;
 
-  constructor(private store: Store<CFAppState>, private entityServiceFactory: EntityServiceFactory) {
+  constructor(private store: Store<CFAppState>) {
     this.setDomainHost = new FormGroup({
       domain: new FormControl('', [Validators.required]),
       host: new FormControl({ disabled: true }, [Validators.required, Validators.maxLength(63)]),
     });
   }
 
-  domains$: Observable<IDomain[]>;
+  domains$: Observable<APIResource<IDomain>[]>;
 
   message = null;
 
@@ -95,14 +86,15 @@ export class CreateApplicationStep3Component implements OnInit {
     const { cloudFoundry, space } = cloudFoundryDetails;
     const newAppGuid = name + space;
 
-    this.store.dispatch(new CreateNewApplication(
+    const obs$ = cfEntityCatalog.application.api.create<RequestInfoState>(
       newAppGuid,
       cloudFoundry, {
-        name,
-        space_guid: space
-      }
-    ));
-    return this.wrapObservable(this.store.select(selectCfRequestInfo(applicationEntityType, newAppGuid)), 'Could not create application');
+      name,
+      space_guid: space
+    }).pipe(
+      filter(ris => !!ris.response)
+    );
+    return this.wrapObservable(obs$, 'Could not create application');
   }
 
   createRoute(): Observable<RequestInfoState> {
@@ -115,18 +107,18 @@ export class CreateApplicationStep3Component implements OnInit {
     const newRouteGuid = hostName + selectedDomainGuid;
 
     if (shouldCreate) {
-      const routeEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, routeEntityType);
-      const actionBuilder = routeEntity.actionOrchestrator.getActionBuilder('create');
-      const createRouteAction = actionBuilder(newRouteGuid,
+      const obs$ = cfEntityCatalog.route.api.create<RequestInfoState>(
+        newRouteGuid,
         cloudFoundry,
         {
           space_guid: space,
           domain_guid: selectedDomainGuid,
           host: hostName
-        });
-      this.store.dispatch(createRouteAction);
-      return this.wrapObservable(this.store.select(selectCfRequestInfo(routeEntityType, newRouteGuid)),
-        'Application created. Could not create route');
+        }
+      ).pipe(
+        filter(ris => !!ris.response)
+      )
+      return this.wrapObservable(obs$, 'Application created. Could not create route');
     }
     return observableOf({
       ...getDefaultRequestState(),
@@ -135,12 +127,8 @@ export class CreateApplicationStep3Component implements OnInit {
   }
 
   associateRoute(appGuid: string, routeGuid: string, endpointGuid: string): Observable<RequestInfoState> {
-    const appEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, applicationEntityType);
-    const actionBuilder = appEntity.actionOrchestrator.getActionBuilder('assignRoute');
-    const assignRouteAction = actionBuilder(endpointGuid, routeGuid, appGuid);
-    this.store.dispatch(assignRouteAction);
-    return this.wrapObservable(this.store.select(selectCfRequestInfo(applicationEntityType, appGuid)),
-      'Application and route created. Could not associated route with app');
+    const obs$ = cfEntityCatalog.application.api.assignRoute<RequestInfoState>(endpointGuid, routeGuid, appGuid)
+    return this.wrapObservable(obs$, 'Application and route created. Could not associated route with app');
   }
 
   private wrapObservable(obs$: Observable<RequestInfoState>, errorString: string): Observable<RequestInfoState> {
@@ -163,23 +151,18 @@ export class CreateApplicationStep3Component implements OnInit {
         this.hostControl().setValue(state.name.split(' ').join('-').toLowerCase());
         this.hostControl().markAsDirty();
         this.newAppData = state;
-        const orgEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, organizationEntityType);
-        const getOrgActionBuilder = orgEntity.actionOrchestrator.getActionBuilder('get');
-        const getOrgAction = getOrgActionBuilder(state.cloudFoundryDetails.org, state.cloudFoundryDetails.cloudFoundry, {
-          includeRelations: [
-            createEntityRelationKey(organizationEntityType, domainEntityType)
-          ],
-          populateMissing: true
-        });
-
-        const orgEntService = this.entityServiceFactory.create<APIResource<any>>(
+
+        return cfEntityCatalog.org.store.getEntityService(
           state.cloudFoundryDetails.org,
-          getOrgAction
-        );
-        return orgEntService.waitForEntity$.pipe(
+          state.cloudFoundryDetails.cloudFoundry,
+          {
+            includeRelations: [createEntityRelationKey(organizationEntityType, domainEntityType)],
+            populateMissing: true
+          }
+        ).waitForEntity$.pipe(
           map(({ entity }) => {
             if (!this.domainControl().value && entity.entity.domains && entity.entity.domains.length) {
-              this.domainControl().setValue(entity.entity.domains[0].entity.guid);
+              this.domainControl().setValue(entity.entity.domains[0].metadata.guid);
               this.hostControl().enable();
             }
             return entity.entity.domains;
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-options-step/deploy-application-options-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-options-step/deploy-application-options-step.component.ts
index 884071a5cf..557dde3485 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-options-step/deploy-application-options-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-options-step/deploy-application-options-step.component.ts
@@ -7,9 +7,7 @@ import { combineLatest, Observable, of as observableOf, Subscription } from 'rxj
 import { filter, first, map, share, startWith, switchMap } from 'rxjs/operators';
 
 import { SaveAppOverrides } from '../../../../../../cloud-foundry/src/actions/deploy-applications.actions';
-import { GetAllOrganizationDomains } from '../../../../../../cloud-foundry/src/actions/organization.actions';
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
-import { stackEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
 import {
   selectCfDetails,
   selectDeployAppState,
@@ -18,11 +16,8 @@ import {
 import { OverrideAppDetails, SourceType } from '../../../../../../cloud-foundry/src/store/types/deploy-application.types';
 import { IDomain } from '../../../../../../core/src/core/cf-api.types';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
-import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../../../store/src/types/api.types';
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
+import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import {
   ApplicationEnvVarsHelper,
 } from '../../application/application-tabs-base/tabs/build-tab/application-env-vars.service';
@@ -53,7 +48,6 @@ export class DeployApplicationOptionsStepComponent implements OnInit, OnDestroy
   constructor(
     private fb: FormBuilder,
     private store: Store<CFAppState>,
-    private paginationMonitorFactory: PaginationMonitorFactory,
     private appEnvVarsService: ApplicationEnvVarsHelper,
     private activatedRoute: ActivatedRoute
   ) {
@@ -130,44 +124,16 @@ export class DeployApplicationOptionsStepComponent implements OnInit, OnDestroy
 
     // Create the domains list for the domains drop down
     this.domains$ = cfDetails$.pipe(
-      switchMap(cfDetails => {
-        const action = new GetAllOrganizationDomains(cfDetails.org, cfDetails.cloudFoundry);
-        return getPaginationObservables<APIResource<IDomain>>(
-          {
-            store: this.store,
-            action,
-            paginationMonitor: this.paginationMonitorFactory.create(
-              action.paginationKey,
-              action,
-              action.flattenPagination
-            )
-          },
-          action.flattenPagination
-        ).entities$;
-      }),
+      switchMap(cfDetails =>
+        cfEntityCatalog.domain.store.getOrganizationDomains.getPaginationService(cfDetails.org, cfDetails.cloudFoundry).entities$
+      ),
       // cf push overrides do not support tcp routes (no way to specify port)
       map(domains => domains.filter(domain => domain.entity.router_group_type !== 'tcp')),
       share()
     );
 
     this.stacks$ = cfDetails$.pipe(
-      switchMap(cfDetails => {
-        const stackEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, stackEntityType);
-        const getAllStacksActionBuilder = stackEntity.actionOrchestrator.getActionBuilder('getMultiple');
-        const action = getAllStacksActionBuilder(cfDetails.cloudFoundry, null);
-        return getPaginationObservables<APIResource<IDomain>>(
-          {
-            store: this.store,
-            action,
-            paginationMonitor: this.paginationMonitorFactory.create(
-              action.paginationKey,
-              action,
-              action.flattenPagination
-            )
-          },
-          action.flattenPagination
-        ).entities$;
-      }),
+      switchMap(cfDetails => cfEntityCatalog.stack.store.getPaginationService(null, cfDetails.cloudFoundry).entities$),
       share()
     );
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.ts
index 949bec2fc7..19ec4e36bc 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.ts
@@ -29,7 +29,6 @@ import {
 } from 'rxjs/operators';
 
 import {
-  FetchBranchesForProject,
   ProjectDoesntExist,
   SaveAppDetails,
   SetAppSourceDetails,
@@ -37,7 +36,6 @@ import {
   SetDeployBranch,
 } from '../../../../../../cloud-foundry/src/actions/deploy-applications.actions';
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
-import { gitBranchesEntityType, gitCommitEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
 import {
   selectDeployAppState,
   selectDeployBranchName,
@@ -50,15 +48,11 @@ import {
   DeployApplicationState,
   SourceType,
 } from '../../../../../../cloud-foundry/src/store/types/deploy-application.types';
-import { GitCommit, GitRepo } from '../../../../../../cloud-foundry/src/store/types/git.types';
-import { GitBranch } from '../../../../../../cloud-foundry/src/store/types/github.types';
+import { GitBranch, GitCommit, GitRepo } from '../../../../../../cloud-foundry/src/store/types/git.types';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { GitSCM } from '../../../../../../core/src/shared/data-services/scm/scm';
 import { GitSCMService, GitSCMType } from '../../../../../../core/src/shared/data-services/scm/scm.service';
-import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
-import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
-import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
-import { CF_ENDPOINT_TYPE, CFEntityConfig } from '../../../../cf-types';
+import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { ApplicationDeploySourceTypes, DEPLOY_TYPES_IDS } from '../deploy-application-steps.types';
 
 @Component({
@@ -131,10 +125,8 @@ export class DeployApplicationStep2Component
   }
 
   constructor(
-    private entityServiceFactory: EntityServiceFactory,
     private store: Store<CFAppState>,
     private route: ActivatedRoute,
-    private paginationMonitorFactory: PaginationMonitorFactory,
     private scmService: GitSCMService,
     private httpClient: HttpClient,
     private appDeploySourceTypes: ApplicationDeploySourceTypes
@@ -258,21 +250,12 @@ export class DeployApplicationStep2Component
         filter(state => state && !state.checking && !state.error && state.exists),
         distinctUntilChanged((x, y) => x.name === y.name),
         // Convert project name into branches pagination observable
-        switchMap(state => {
-          const fetchBranchesAction = new FetchBranchesForProject(this.scm, state.name);
-          return getPaginationObservables<GitBranch>(
-            {
-              store: this.store,
-              action: fetchBranchesAction,
-              paginationMonitor: this.paginationMonitorFactory.create(
-                fetchBranchesAction.paginationKey,
-                new CFEntityConfig(gitBranchesEntityType),
-                true
-              )
-            },
-            true
-          ).entities$;
-        }),
+        switchMap(state =>
+          cfEntityCatalog.gitBranch.store.getPaginationService(null, null, {
+            scm: this.scm,
+            projectName: state.name
+          }).entities$
+        ),
         // Find the specific branch we're interested inS
         withLatestFrom(deployBranchName$),
         filter(([, branchName]) => !!branchName),
@@ -300,17 +283,13 @@ export class DeployApplicationStep2Component
 
           if (this.isRedeploy) {
             const commitSha = commit || branch.commit.sha;
-            // This method to create entity id's should be standardised....
+            // FIXME: This method to create entity id's should be standardised.... #4245
             const repoEntityID = `${this.scm.getType()}-${projectInfo.full_name}`;
             const commitEntityID = `${repoEntityID}-${commitSha}`;
-            const commitEntityService = this.entityServiceFactory.create<GitCommit>(
-              {
-                endpointType: CF_ENDPOINT_TYPE,
-                entityType: gitCommitEntityType,
-                actionMetadata: { projectName: projectInfo.full_name, scm: this.scm, commitSha },
-                entityGuid: commitEntityID,
-              }
-            );
+            const commitEntityService = cfEntityCatalog.gitCommit.store.getEntityService(commitEntityID, null, {
+              projectName: projectInfo.full_name,
+              scm: this.scm, commitSha
+            })
 
             if (this.commitSubscription) {
               this.commitSubscription.unsubscribe();
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step3/deploy-application-step3.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step3/deploy-application-step3.component.ts
index 2b0e9b4e58..b676eda5b5 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step3/deploy-application-step3.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step3/deploy-application-step3.component.ts
@@ -10,14 +10,12 @@ import {
 } from 'rxjs';
 import { filter, first, map, startWith } from 'rxjs/operators';
 
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 import { DeleteDeployAppSection } from '../../../../../../cloud-foundry/src/actions/deploy-applications.actions';
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
-import { appEnvVarsEntityType, applicationEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
+import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { CfAppsDataSource } from '../../../../shared/components/list/list-types/app/cf-apps-data-source';
 import { CfOrgSpaceDataService } from '../../../../shared/data-services/cf-org-space-service.service';
 import { DeployApplicationDeployer } from '../deploy-application-deployer';
@@ -47,9 +45,6 @@ export class DeployApplicationStep3Component implements OnDestroy {
   private validSub: Subscription;
   private busySub: Subscription;
 
-  private appEnvVarCatalogEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appEnvVarsEntityType);
-  private appCatalogEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, applicationEntityType);
-
   public busy = false;
 
   constructor(
@@ -84,15 +79,10 @@ export class DeployApplicationStep3Component implements OnDestroy {
       this.appGuid = guid;
 
       // Update the root app wall list
-      this.appCatalogEntity.actionDispatchManager.dispatchGetMultiple(
-        null,
-        CfAppsDataSource.paginationKey,
-        CfAppsDataSource.includeRelations
-      );
-      // this.store.dispatch(createGetAllAppAction(CfAppsDataSource.paginationKey));
+      cfEntityCatalog.application.api.getMultiple(undefined, CfAppsDataSource.paginationKey);
+
       // Pre-fetch the app env vars
-      this.appEnvVarCatalogEntity.actionDispatchManager.dispatchGet(this.appGuid, this.deployer.cfGuid);
-      // this.store.dispatch(new GetAppEnvVarsAction(this.appGuid, this.deployer.cfGuid));
+      cfEntityCatalog.appEnvVar.api.getMultiple(this.appGuid, this.deployer.cfGuid);
     });
 
     this.closeable$ = observableCombineLatest(
@@ -172,11 +162,10 @@ export class DeployApplicationStep3Component implements OnDestroy {
     // Take user to applications
     const { cfGuid } = this.deployer;
     if (this.appGuid) {
-      this.appEnvVarCatalogEntity.actionDispatchManager.dispatchGet(this.appGuid, cfGuid);
-      // this.store.dispatch(new GetAppEnvVarsAction(this.appGuid, cfGuid));
+      cfEntityCatalog.appEnvVar.api.getMultiple(this.appGuid, this.deployer.cfGuid);
 
       // Ensure the application package_state is correct
-      this.appCatalogEntity.actionDispatchManager.dispatchGet(
+      cfEntityCatalog.application.api.get(
         this.appGuid,
         cfGuid,
         { includeRelations: [], populateMissing: false }
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-steps.types.ts b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-steps.types.ts
index d991638e17..a59c82a77e 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-steps.types.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-steps.types.ts
@@ -5,16 +5,11 @@ import { Observable, of } from 'rxjs';
 import { filter, first, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
 import { SourceType } from '../../../../../cloud-foundry/src/store/types/deploy-application.types';
-import { IFeatureFlag } from '../../../../../core/src/core/cf-api.types';
 import { PermissionConfig, PermissionTypes } from '../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../core/src/core/current-user-permissions.service';
 import { CFFeatureFlagTypes } from '../../../../../core/src/shared/components/cf-auth/cf-auth.types';
-import { PaginationMonitor } from '../../../../../store/src/monitors/pagination-monitor';
-import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { CFAppState } from '../../../cf-app-state';
-import {
-  createCfFeatureFlagFetchAction,
-} from '../../../shared/components/list/list-types/cf-feature-flags/cf-feature-flags-data-source.helpers';
+import { cfEntityCatalog } from '../../../cf-entity-catalog';
 
 export enum DEPLOY_TYPES_IDS {
   GITLAB = 'gitlab',
@@ -103,20 +98,7 @@ export class ApplicationDeploySourceTypes {
       // We don't want to return until we have a trusted response (there's a `startsWith(false)` in the `.can`), otherwise we return false
       // then, if different, send the actual response (this leads to flashing misleading info in ux)
       // So fetch the feature flags for the cf, which is the blocker, first before checking if we `.can`
-      const action = createCfFeatureFlagFetchAction(cfId);
-      const fetchedFeatureFlags$ = getPaginationObservables<IFeatureFlag>(
-        {
-          store: this.store,
-          action,
-          paginationMonitor: new PaginationMonitor<IFeatureFlag>(
-            this.store,
-            action.paginationKey,
-            action,
-            true
-          )
-        },
-        true
-      ).entities$.pipe(
+      const fetchedFeatureFlags$ = cfEntityCatalog.featureFlag.store.getPaginationService(cfId).entities$.pipe(
         map(entities => !!entities),
         filter(hasEntities => hasEntities),
         first(),
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.ts
index 8c5e71e8bf..add879d3ec 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.ts
@@ -5,18 +5,10 @@ import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'r
 import { filter, map, mergeMap, pairwise, switchMap, take, tap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
-import {
-  applicationEntityType,
-  domainEntityType,
-  routeEntityType,
-  spaceEntityType,
-} from '../../../../../../cloud-foundry/src/cf-entity-types';
+import { domainEntityType, spaceEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
 import { createEntityRelationKey } from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { selectCfRequestInfo } from '../../../../../../cloud-foundry/src/store/selectors/api.selectors';
 import { Route, RouteMode } from '../../../../../../cloud-foundry/src/store/types/route.types';
-import { IDomain, ISpace } from '../../../../../../core/src/core/cf-api.types';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
+import { IDomain } from '../../../../../../core/src/core/cf-api.types';
 import { pathGet } from '../../../../../../core/src/core/utils.service';
 import {
   StepOnNextFunction,
@@ -25,7 +17,7 @@ import {
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
 import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource } from '../../../../../../store/src/types/api.types';
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
+import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { ApplicationService } from '../../application.service';
 
 const hostPattern = '^([\\w\\-\\.]*)$';
@@ -62,7 +54,6 @@ export class AddRoutesComponent implements OnInit, OnDestroy {
   constructor(
     private applicationService: ApplicationService,
     private store: Store<CFAppState>,
-    private entityServiceFactory: EntityServiceFactory,
   ) {
     this.appGuid = applicationService.appGuid;
     this.cfGuid = applicationService.cfGuid;
@@ -111,19 +102,11 @@ export class AddRoutesComponent implements OnInit, OnDestroy {
       switchMap(() => this.appService.waitForAppEntity$
         .pipe(
           switchMap(app => {
-            const spaceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, spaceEntityType);
-            const actionBuilder = spaceEntity.actionOrchestrator.getActionBuilder('get');
-            const getSpaceAction = actionBuilder(
+            return cfEntityCatalog.space.store.getEntityService(
               app.entity.entity.space_guid,
               app.entity.entity.cfGuid,
               { includeRelations: [createEntityRelationKey(spaceEntityType, domainEntityType)] }
-            );
-            this.spaceGuid = app.entity.entity.space_guid;
-            const spaceService = this.entityServiceFactory.create<APIResource<ISpace>>(
-              this.spaceGuid,
-              getSpaceAction
-            );
-            return spaceService.waitForEntity$;
+            ).waitForEntity$;
           }),
           filter(({ entity }) => !!entity.entity.domains),
           tap(({ entity }) => {
@@ -221,30 +204,24 @@ export class AddRoutesComponent implements OnInit, OnDestroy {
       path = '/' + path;
     }
 
-    const routeEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, routeEntityType);
-    const actionBuilder = routeEntity.actionOrchestrator.getActionBuilder('create');
-    const createRouteAction = actionBuilder(newRouteGuid, this.cfGuid, new Route(domainGuid, this.spaceGuid, host, path, port));
-
-    this.store.dispatch(createRouteAction);
-    return this.store.select(selectCfRequestInfo(routeEntityType, newRouteGuid))
-      .pipe(
-        filter(route => !route.creating && !route.fetching),
-        mergeMap(route => {
-          if (route.error) {
-            return observableOf({ success: false, message: `Failed to create route: ${route.message}` });
-          } else {
-            return this.mapRoute(route.response.result[0]);
-          }
-        })
-      );
+    return cfEntityCatalog.route.api.create<RequestInfoState>(
+      newRouteGuid,
+      this.cfGuid,
+      new Route(domainGuid, this.spaceGuid, host, path, port)
+    ).pipe(
+      filter(route => !route.creating && !route.fetching),
+      mergeMap(route => {
+        if (route.error) {
+          return observableOf({ success: false, message: `Failed to create route: ${route.message}` });
+        } else {
+          return this.mapRoute(route.response.result[0]);
+        }
+      })
+    );
   }
 
   private mapRoute(routeGuid: string): Observable<StepOnNextResult> {
-    const appEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, applicationEntityType);
-    const actionBuilder = appEntity.actionOrchestrator.getActionBuilder('assignRoute');
-    const assignRouteAction = actionBuilder(this.cfGuid, routeGuid, this.appGuid);
-    this.store.dispatch(assignRouteAction);
-    return this.store.select(selectCfRequestInfo(applicationEntityType, this.appGuid)).pipe(
+    return cfEntityCatalog.application.api.assignRoute<RequestInfoState>(this.cfGuid, routeGuid, this.appGuid).pipe(
       pairwise(),
       filter(([oldApp, newApp]) => {
         return pathGet('updating.Assigning-Route.busy', oldApp) && !pathGet('updating.Assigning-Route.busy', newApp);
@@ -263,12 +240,7 @@ export class AddRoutesComponent implements OnInit, OnDestroy {
   private mapRouteSubmit(): Observable<StepOnNextResult> {
 
     return this.selectedRoute$.pipe(
-      tap(route => {
-        entityCatalog.getEntity(CF_ENDPOINT_TYPE, applicationEntityType)
-          .actionOrchestrator
-          .getEntityActionDispatcher((action) => this.store.dispatch(action))
-          .dispatchAction('assignRoute', this.cfGuid, route.metadata.guid, this.appGuid);
-      }),
+      tap(route => cfEntityCatalog.application.api.assignRoute(this.cfGuid, route.metadata.guid, this.appGuid)),
       switchMap(() => this.appService.app$),
       map(requestInfo => requestInfo.entityRequestInfo.updating['Assigning-Route']),
       filter(requestInfo => !requestInfo.busy),
@@ -277,10 +249,7 @@ export class AddRoutesComponent implements OnInit, OnDestroy {
         if (requestInfo.error) {
           return { success: false, message: `Failed to associate route with app: ${requestInfo.message}` };
         } else {
-          const routeEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, routeEntityType);
-          const actionBuilder = routeEntity.actionOrchestrator.getActionBuilder('getAllForApplication');
-          const getAppRoutesAction = actionBuilder(this.appGuid, this.cfGuid);
-          this.store.dispatch(getAppRoutesAction);
+          cfEntityCatalog.route.api.getAllForApplication(this.appGuid, this.cfGuid)
           return { success: true, redirect: true };
         }
       })
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-edit-space-step-base.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-edit-space-step-base.ts
index 8074e720e7..d5a55e2d1a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-edit-space-step-base.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-edit-space-step-base.ts
@@ -5,24 +5,13 @@ import { Observable, Subscription } from 'rxjs';
 import { filter, first, map, tap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
-import {
-  organizationEntityType,
-  spaceEntityType,
-  spaceQuotaEntityType,
-} from '../../../../cloud-foundry/src/cf-entity-types';
+import { organizationEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
 import { createEntityRelationPaginationKey } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { ISpaceQuotaDefinition } from '../../../../core/src/core/cf-api.types';
 import { StepOnNextResult } from '../../../../core/src/shared/components/stepper/step/step.component';
 import { getPaginationKey } from '../../../../store/src/actions/pagination.actions';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../store/src/entity-catalog/entity-catalog.types';
-import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
-import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../store/src/types/api.types';
-import { PaginatedAction } from '../../../../store/src/types/pagination.types';
-import { cfEntityFactory } from '../../cf-entity-factory';
-import { CF_ENDPOINT_TYPE, CFEntityConfig } from '../../cf-types';
-import { SpaceQuotaDefinitionActionBuilders } from '../../entity-action-builders/space-quota.action-builders';
+import { cfEntityCatalog } from '../../cf-entity-catalog';
 import { ActiveRouteCfOrgSpace } from './cf-page.types';
 
 export class AddEditSpaceStepBase {
@@ -38,26 +27,16 @@ export class AddEditSpaceStepBase {
   constructor(
     protected store: Store<CFAppState>,
     protected activatedRoute: ActivatedRoute,
-    protected paginationMonitorFactory: PaginationMonitorFactory,
-    protected activeRouteCfOrgSpace: ActiveRouteCfOrgSpace
+    protected activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
   ) {
     this.cfGuid = activeRouteCfOrgSpace.cfGuid;
     this.orgGuid = activeRouteCfOrgSpace.orgGuid;
-    const paginationKey = getPaginationKey(organizationEntityType, this.orgGuid);
-    const spaceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, spaceEntityType);
-    const getAllSpaceActionBuilder = spaceEntity.actionOrchestrator.getActionBuilder('getAllInOrganization');
-    const action = getAllSpaceActionBuilder(this.orgGuid, this.cfGuid, paginationKey) as PaginatedAction;
-    this.allSpacesInOrg$ = getPaginationObservables<APIResource, CFAppState>(
-      {
-        store: this.store,
-        action,
-        paginationMonitor: this.paginationMonitorFactory.create(
-          action.paginationKey,
-          new CFEntityConfig(spaceEntityType),
-          action.flattenPagination
-        )
-      },
-      action.flattenPagination
+    this.allSpacesInOrg$ = cfEntityCatalog.space.store.getAllInOrganization.getPaginationService(
+      this.orgGuid,
+      this.cfGuid,
+      getPaginationKey(organizationEntityType, this.orgGuid), {
+      flatten: true,
+    }
     ).entities$.pipe(
       filter(spaces => !!spaces),
       map(spaces => spaces.map(space => space.entity.name)),
@@ -66,25 +45,10 @@ export class AddEditSpaceStepBase {
     );
     this.fetchSpacesSubscription = this.allSpacesInOrg$.subscribe();
 
-    const quotaPaginationKey = createEntityRelationPaginationKey(organizationEntityType, this.orgGuid);
-
-    const quotaEntity = entityCatalog.getEntity<IEntityMetadata, any, SpaceQuotaDefinitionActionBuilders>(
-      CF_ENDPOINT_TYPE,
-      spaceQuotaEntityType
-    );
-    const actionBuilder = quotaEntity.actionOrchestrator.getActionBuilder('getAllInOrganization');
-    const getAllInOrganization = actionBuilder(this.orgGuid, this.cfGuid, quotaPaginationKey);
-    this.quotaDefinitions$ = getPaginationObservables<APIResource<ISpaceQuotaDefinition>>(
-      {
-        store: this.store,
-        action: getAllInOrganization as PaginatedAction,
-        paginationMonitor: this.paginationMonitorFactory.create(
-          quotaPaginationKey,
-          cfEntityFactory(spaceQuotaEntityType),
-          getAllInOrganization.flattenPagination
-        )
-      },
-      getAllInOrganization.flattenPagination
+    this.quotaDefinitions$ = cfEntityCatalog.spaceQuota.store.getAllInOrganization.getPaginationService(
+      this.orgGuid,
+      this.cfGuid,
+      createEntityRelationPaginationKey(organizationEntityType, this.orgGuid)
     ).entities$.pipe(
       filter(o => !!o),
       first()
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts
index 02408e0b7d..623327a2f7 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts
@@ -7,22 +7,20 @@ import { filter, map, tap } from 'rxjs/operators';
 
 import { CreateOrganization } from '../../../../../../cloud-foundry/src/actions/organization.actions';
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
-import { organizationEntityType, quotaDefinitionEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
+import { organizationEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
 import {
   createEntityRelationPaginationKey,
 } from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { selectCfRequestInfo } from '../../../../../../cloud-foundry/src/store/selectors/api.selectors';
 import { IOrganization, IOrgQuotaDefinition } from '../../../../../../core/src/core/cf-api.types';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
+import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
 import { endpointSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../../../store/src/types/api.types';
-import { cfEntityFactory } from '../../../../cf-entity-factory';
+import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
-import { QuotaDefinitionActionBuilder } from '../../../../entity-action-builders/quota-definition.action-builders';
 import { CloudFoundryEndpointService } from '../../services/cloud-foundry-endpoint.service';
 
 
@@ -48,7 +46,7 @@ export class CreateOrganizationStepComponent implements OnInit, OnDestroy {
 
   constructor(
     private store: Store<CFAppState>,
-    private activatedRoute: ActivatedRoute,
+    activatedRoute: ActivatedRoute,
     private paginationMonitorFactory: PaginationMonitorFactory,
   ) {
     this.cfGuid = activatedRoute.snapshot.params.endpointId;
@@ -78,23 +76,8 @@ export class CreateOrganizationStepComponent implements OnInit, OnDestroy {
     );
 
     const quotaPaginationKey = createEntityRelationPaginationKey(endpointSchemaKey, this.cfGuid);
-    const quotaDefinitionEntity = entityCatalog.getEntity<IEntityMetadata, any, QuotaDefinitionActionBuilder>(
-      CF_ENDPOINT_TYPE,
-      quotaDefinitionEntityType
-    );
-    const actionBuilder = quotaDefinitionEntity.actionOrchestrator.getActionBuilder('getMultiple');
-    const getQuotaDefinitionsAction = actionBuilder(quotaPaginationKey, this.cfGuid, { includeRelations: [] });
-    this.quotaDefinitions$ = getPaginationObservables<APIResource<IOrgQuotaDefinition>>(
-      {
-        store: this.store,
-        action: getQuotaDefinitionsAction,
-        paginationMonitor: this.paginationMonitorFactory.create(
-          quotaPaginationKey,
-          cfEntityFactory(quotaDefinitionEntityType),
-          action.flattenPagination
-        )
-      },
-      action.flattenPagination
+    this.quotaDefinitions$ = cfEntityCatalog.quotaDefinition.store.getPaginationService(
+      quotaPaginationKey, this.cfGuid, { includeRelations: [] }
     ).entities$.pipe(
       filter(o => !!o),
       tap(quotas => {
@@ -104,7 +87,7 @@ export class CreateOrganizationStepComponent implements OnInit, OnDestroy {
           });
         }
       })
-    );
+    )
 
     this.orgSubscription = this.orgs$.subscribe();
   }
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.ts
index 46a60f0fad..8557439921 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.ts
@@ -6,14 +6,9 @@ import { Subscription } from 'rxjs';
 import { filter } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
-import { spaceEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
-import { selectCfRequestInfo } from '../../../../../../cloud-foundry/src/store/selectors/api.selectors';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
-import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
-import { SpaceActionBuilders } from '../../../../entity-action-builders/space.action-builders';
+import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
+import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { AddEditSpaceStepBase } from '../../add-edit-space-step-base';
 import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
 
@@ -45,10 +40,9 @@ export class CreateSpaceStepComponent extends AddEditSpaceStepBase implements On
   constructor(
     store: Store<CFAppState>,
     activatedRoute: ActivatedRoute,
-    paginationMonitorFactory: PaginationMonitorFactory,
     activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
   ) {
-    super(store, activatedRoute, paginationMonitorFactory, activeRouteCfOrgSpace);
+    super(store, activatedRoute, activeRouteCfOrgSpace);
   }
 
   ngOnInit() {
@@ -79,20 +73,14 @@ export class CreateSpaceStepComponent extends AddEditSpaceStepBase implements On
 
   submit: StepOnNextFunction = () => {
     const id = `${this.orgGuid}-${this.spaceName.value}`;
-    const spaceEntity = entityCatalog.getEntity<IEntityMetadata, any, SpaceActionBuilders>(
-      CF_ENDPOINT_TYPE,
-      spaceEntityType
-    );
-    spaceEntity.actionDispatchManager.dispatchCreate(id, this.cfGuid, {
+    return cfEntityCatalog.space.api.create<RequestInfoState>(id, this.cfGuid, {
       createSpace: {
         name: this.spaceName.value,
         organization_guid: this.orgGuid,
         space_quota_definition_guid: this.quotaDefinition.value
       },
       orgGuid: this.orgGuid
-    });
-
-    return this.store.select(selectCfRequestInfo(spaceEntityType, id)).pipe(
+    }).pipe(
       filter(o => !!o && !o.fetching && !o.creating),
       this.map('Failed to create space: ')
     );
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts
index 0624440521..89823562a9 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts
@@ -6,23 +6,20 @@ import { filter, map, take, tap } from 'rxjs/operators';
 
 import { UpdateOrganization } from '../../../../../../cloud-foundry/src/actions/organization.actions';
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
-import { organizationEntityType, quotaDefinitionEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
+import { organizationEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
 import {
   createEntityRelationPaginationKey,
 } from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { IOrganization, IOrgQuotaDefinition } from '../../../../../../core/src/core/cf-api.types';
 import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
 import { endpointSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { selectRequestInfo } from '../../../../../../store/src/selectors/api.selectors';
 import { APIResource } from '../../../../../../store/src/types/api.types';
+import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../cf-entity-factory';
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
-import { QuotaDefinitionActionBuilder } from '../../../../entity-action-builders/quota-definition.action-builders';
 import { getActiveRouteCfOrgSpaceProvider } from '../../cf.helpers';
 import { CloudFoundryEndpointService } from '../../services/cloud-foundry-endpoint.service';
 import { CloudFoundryOrganizationService } from '../../services/cloud-foundry-organization.service';
@@ -115,23 +112,8 @@ export class EditOrganizationStepComponent implements OnInit, OnDestroy {
     this.fetchOrgsSub = this.allOrgsInEndpoint$.subscribe();
 
     const quotaPaginationKey = createEntityRelationPaginationKey(endpointSchemaKey, this.cfGuid);
-    const quotaDefinitionEntity = entityCatalog.getEntity<IEntityMetadata, any, QuotaDefinitionActionBuilder>(
-      CF_ENDPOINT_TYPE,
-      quotaDefinitionEntityType
-    );
-    const actionBuilder = quotaDefinitionEntity.actionOrchestrator.getActionBuilder('getMultiple');
-    const getQuotaDefinitionsAction = actionBuilder(quotaPaginationKey, this.cfGuid);
-    this.quotaDefinitions$ = getPaginationObservables<APIResource<IOrgQuotaDefinition>>(
-      {
-        store: this.store,
-        action: getQuotaDefinitionsAction,
-        paginationMonitor: this.paginationMonitorFactory.create(
-          quotaPaginationKey,
-          cfEntityFactory(quotaDefinitionEntityType),
-          action.flattenPagination
-        )
-      },
-      action.flattenPagination
+    this.quotaDefinitions$ = cfEntityCatalog.quotaDefinition.store.getPaginationService(
+      quotaPaginationKey, this.cfGuid, { includeRelations: [] }
     ).entities$.pipe(
       filter(o => !!o),
     );
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.ts
index eb91cc358f..3876bbc139 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.ts
@@ -5,20 +5,12 @@ import { Store } from '@ngrx/store';
 import { Observable, of, Subscription } from 'rxjs';
 import { filter, map, switchMap, take, tap } from 'rxjs/operators';
 
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
-import {
-  AssociateSpaceQuota,
-  DisassociateSpaceQuota,
-} from '../../../../../../cloud-foundry/src/actions/quota-definitions.actions';
+import { AssociateSpaceQuota } from '../../../../../../cloud-foundry/src/actions/quota-definitions.actions';
 import { UpdateSpace } from '../../../../../../cloud-foundry/src/actions/space.actions';
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
-import { spaceEntityType, spaceQuotaEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
-import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
-import { selectRequestInfo } from '../../../../../../store/src/selectors/api.selectors';
-import { SpaceQuotaDefinitionActionBuilders } from '../../../../entity-action-builders/space-quota.action-builders';
+import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
+import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { AddEditSpaceStepBase } from '../../add-edit-space-step-base';
 import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
 import { CloudFoundrySpaceService } from '../../services/cloud-foundry-space.service';
@@ -43,11 +35,10 @@ export class EditSpaceStepComponent extends AddEditSpaceStepBase implements OnDe
   constructor(
     store: Store<CFAppState>,
     activatedRoute: ActivatedRoute,
-    paginationMonitorFactory: PaginationMonitorFactory,
     activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
-    private cfSpaceService: CloudFoundrySpaceService
+    private cfSpaceService: CloudFoundrySpaceService,
   ) {
-    super(store, activatedRoute, paginationMonitorFactory, activeRouteCfOrgSpace);
+    super(store, activatedRoute, activeRouteCfOrgSpace);
     this.spaceGuid = activatedRoute.snapshot.params.spaceId;
     this.editSpaceForm = new FormGroup({
       spaceName: new FormControl('', this.spaceNameTakenValidator()),
@@ -111,15 +102,10 @@ export class EditSpaceStepComponent extends AddEditSpaceStepBase implements OnDe
   }
 
   updateSpace$() {
-    const spaceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, spaceEntityType);
-    const actionBuilder = spaceEntity.actionOrchestrator.getActionBuilder('update');
-    const updateSpaceAction = actionBuilder(this.spaceGuid, this.cfGuid, {
+    return cfEntityCatalog.space.api.update<RequestInfoState>(this.spaceGuid, this.cfGuid, {
       name: this.editSpaceForm.value.spaceName,
       allow_ssh: this.editSpaceForm.value.toggleSsh as boolean,
-    });
-    this.store.dispatch(updateSpaceAction);
-
-    return this.store.select(selectRequestInfo(updateSpaceAction, this.spaceGuid)).pipe(
+    }).pipe(
       filter(o => !!o && !o.updating[UpdateSpace.UpdateExistingSpace].busy),
       map((state) => state.updating[UpdateSpace.UpdateExistingSpace])
     );
@@ -127,26 +113,10 @@ export class EditSpaceStepComponent extends AddEditSpaceStepBase implements OnDe
 
   updateSpaceQuota$() {
     const spaceQuotaGuid = this.editSpaceForm.value.quotaDefinition;
-    let spaceQuotaQueryGuid;
-    let action: AssociateSpaceQuota | DisassociateSpaceQuota;
-
-    const spaceQuotaEntity = entityCatalog.getEntity<IEntityMetadata, any, SpaceQuotaDefinitionActionBuilders>(
-      CF_ENDPOINT_TYPE,
-      spaceQuotaEntityType
-    );
-    if (spaceQuotaGuid) {
-      spaceQuotaQueryGuid = spaceQuotaGuid;
-      const actionBuilder = spaceQuotaEntity.actionOrchestrator.getActionBuilder('associateWithSpace');
-      action = actionBuilder(this.spaceGuid, this.cfGuid, spaceQuotaQueryGuid) as AssociateSpaceQuota;
-    } else {
-      spaceQuotaQueryGuid = this.originalSpaceQuotaGuid;
-      const actionBuilder = spaceQuotaEntity.actionOrchestrator.getActionBuilder('disassociateFromSpace');
-      action = actionBuilder(this.spaceGuid, this.cfGuid, spaceQuotaQueryGuid) as DisassociateSpaceQuota;
-    }
-    this.store.dispatch(action);
-
-
-    return this.store.select(selectRequestInfo(action, spaceQuotaQueryGuid)).pipe(
+    const mon = spaceQuotaGuid ?
+      cfEntityCatalog.spaceQuota.api.associateWithSpace<RequestInfoState>(this.spaceGuid, this.cfGuid, spaceQuotaGuid) :
+      cfEntityCatalog.spaceQuota.api.disassociateFromSpace<RequestInfoState>(this.spaceGuid, this.cfGuid, this.originalSpaceQuotaGuid)
+    return mon.pipe(
       filter(o => {
         return !!o &&
           o.updating[AssociateSpaceQuota.UpdateExistingSpaceQuota] &&
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-base/quota-definition-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-base/quota-definition-base.component.ts
index 89fdc4cf30..4f250dc1ca 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-base/quota-definition-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-base/quota-definition-base.component.ts
@@ -9,15 +9,12 @@ import {
   ISpace,
   ISpaceQuotaDefinition,
 } from '../../../../../core/src/core/cf-api.types';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
 import { AppState } from '../../../../../store/src/app-state';
 import { endpointEntitiesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
 import { APIResource } from '../../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
-import { CF_ENDPOINT_TYPE } from '../../../cf-types';
-import { organizationEntityType, spaceEntityType } from '../../../cf-entity-types';
+import { cfEntityCatalog } from '../../../cf-entity-catalog';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 
 export class QuotaDefinitionBaseComponent {
@@ -33,7 +30,6 @@ export class QuotaDefinitionBaseComponent {
   orgSubscriber: Subscription;
 
   constructor(
-    protected entityServiceFactory: EntityServiceFactory,
     protected store: Store<AppState>,
     protected activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
     protected activatedRoute: ActivatedRoute,
@@ -49,13 +45,7 @@ export class QuotaDefinitionBaseComponent {
 
   setupOrgObservable() {
     if (this.orgGuid) {
-      const orgEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, organizationEntityType);
-      const getOrgActionBuilder = orgEntity.actionOrchestrator.getActionBuilder('get');
-      const getOrgAction = getOrgActionBuilder(this.orgGuid, this.cfGuid);
-      this.org$ = this.entityServiceFactory.create<APIResource<IOrganization>>(
-        this.orgGuid,
-        getOrgAction
-      ).waitForEntity$.pipe(
+      this.org$ = cfEntityCatalog.org.store.getEntityService(this.orgGuid, this.cfGuid).waitForEntity$.pipe(
         map(data => data.entity),
       );
     }
@@ -63,13 +53,7 @@ export class QuotaDefinitionBaseComponent {
 
   setupSpaceObservable() {
     if (this.spaceGuid) {
-      const spaceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, spaceEntityType);
-      const actionBuilder = spaceEntity.actionOrchestrator.getActionBuilder('get');
-      const getSpaceAction = actionBuilder(this.spaceGuid, this.cfGuid);
-      this.space$ = this.entityServiceFactory.create<APIResource<ISpace>>(
-        this.spaceGuid,
-        getSpaceAction
-      ).waitForEntity$.pipe(
+      this.space$ = cfEntityCatalog.space.store.getEntityService(this.spaceGuid, this.cfGuid).waitForEntity$.pipe(
         map(data => data.entity),
       );
     }
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.ts
index de3bb0449e..4906870a5c 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.ts
@@ -4,15 +4,14 @@ import { Store } from '@ngrx/store';
 import { Observable, of, Subscription } from 'rxjs';
 import { filter, first, map, switchMap } from 'rxjs/operators';
 
-import { GetQuotaDefinition } from '../../../../../cloud-foundry/src/actions/quota-definitions.actions';
 import { IOrganization, IOrgQuotaDefinition, ISpace } from '../../../../../core/src/core/cf-api.types';
 import { CurrentUserPermissions } from '../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../core/src/core/current-user-permissions.service';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
 import { AppState } from '../../../../../store/src/app-state';
 import { APIResource } from '../../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
+import { cfEntityCatalog } from '../../../cf-entity-catalog';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers';
 import { QuotaDefinitionBaseComponent } from '../quota-definition-base/quota-definition-base.component';
@@ -44,13 +43,12 @@ export class QuotaDefinitionComponent extends QuotaDefinitionBaseComponent {
   public isCf = false;
 
   constructor(
-    protected entityServiceFactory: EntityServiceFactory,
     protected store: Store<AppState>,
     activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
     activatedRoute: ActivatedRoute,
     currentUserPermissionsService: CurrentUserPermissionsService
   ) {
-    super(entityServiceFactory, store, activeRouteCfOrgSpace, activatedRoute);
+    super(store, activeRouteCfOrgSpace, activatedRoute);
     this.setupQuotaDefinitionObservable();
     const { cfGuid, orgGuid } = activeRouteCfOrgSpace;
     this.canEditQuota$ = currentUserPermissionsService.can(CurrentUserPermissions.QUOTA_EDIT, cfGuid);
@@ -62,10 +60,7 @@ export class QuotaDefinitionComponent extends QuotaDefinitionBaseComponent {
     const quotaGuid$ = this.quotaGuid ? of(this.quotaGuid) : this.org$.pipe(map(org => org.entity.quota_definition_guid));
     const entityInfo$ = quotaGuid$.pipe(
       first(),
-      switchMap(quotaGuid => this.entityServiceFactory.create<APIResource<IOrgQuotaDefinition>>(
-        quotaGuid,
-        new GetQuotaDefinition(quotaGuid, this.cfGuid),
-      ).entityObs$)
+      switchMap(quotaGuid => cfEntityCatalog.quotaDefinition.store.getEntityService(quotaGuid, this.cfGuid, {}).entityObs$)
     );
 
     this.quotaDefinition$ = entityInfo$.pipe(
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service.ts
index a5b1ba50c8..091e3f43b5 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service.ts
@@ -4,10 +4,9 @@ import { Observable } from 'rxjs';
 import { filter, first, map, publishReplay, refCount } from 'rxjs/operators';
 
 import { GetAllApplications } from '../../../../../cloud-foundry/src/actions/application.actions';
-import { DeleteOrganization, GetAllOrganizations } from '../../../../../cloud-foundry/src/actions/organization.actions';
+import { DeleteOrganization } from '../../../../../cloud-foundry/src/actions/organization.actions';
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import {
-  cfInfoEntityType,
   domainEntityType,
   organizationEntityType,
   privateDomainsEntityType,
@@ -20,27 +19,20 @@ import {
 } from '../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { CfApplicationState } from '../../../../../cloud-foundry/src/store/types/application.types';
 import { IApp, ICfV2Info, IOrganization, ISpace } from '../../../../../core/src/core/cf-api.types';
-import { EndpointsService } from '../../../../../core/src/core/endpoints.service';
 import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actions';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../../store/src/entity-catalog/entity-catalog.types';
 import { EntityService } from '../../../../../store/src/entity-service';
 import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
-import {
-  getPaginationObservables,
-  PaginationObservables,
-} from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+import { PaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
 import { EndpointModel, EndpointUser } from '../../../../../store/src/types/endpoint.types';
 import { PaginatedAction } from '../../../../../store/src/types/pagination.types';
 import { GetAllRoutes } from '../../../actions/route.actions';
 import { GetSpaceRoutes } from '../../../actions/space.actions';
+import { cfEntityCatalog } from '../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../cf-entity-factory';
-import { CF_ENDPOINT_TYPE } from '../../../cf-types';
-import { CfInfoDefinitionActionBuilders } from '../../../entity-action-builders/cf-info.action-builders';
-import { OrganizationActionBuilders } from '../../../entity-action-builders/organization.action-builders';
 import { CfUserService } from '../../../shared/data-services/cf-user.service';
 import { QParam, QParamJoiners } from '../../../shared/q-param';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
@@ -76,18 +68,11 @@ export class CloudFoundryEndpointService {
   currentUser$: Observable<EndpointUser>;
   cfGuid: string;
 
-  getAllOrgsAction: GetAllOrganizations;
-
-  private getAllAppsAction: GetAllApplications;
-
   static createGetAllOrganizations(cfGuid: string) {
     const paginationKey = cfGuid ?
       createEntityRelationPaginationKey(endpointSchemaKey, cfGuid)
       : createEntityRelationPaginationKey(endpointSchemaKey);
-    const organizationEntity = entityCatalog
-      .getEntity<IEntityMetadata, any, OrganizationActionBuilders>(CF_ENDPOINT_TYPE, organizationEntityType);
-    const actionBuilder = organizationEntity.actionOrchestrator.getActionBuilder('getMultiple');
-    const getAllOrganizationsAction = actionBuilder(cfGuid, paginationKey,
+    const getAllOrganizationsAction = cfEntityCatalog.org.actions.getMultiple(cfGuid, paginationKey,
       {
         includeRelations: [
           createEntityRelationKey(organizationEntityType, spaceEntityType),
@@ -102,9 +87,7 @@ export class CloudFoundryEndpointService {
     const paginationKey = cfGuid ?
       createEntityRelationPaginationKey(endpointSchemaKey, cfGuid)
       : createEntityRelationPaginationKey(endpointSchemaKey);
-    const organizationEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, organizationEntityType);
-    const actionBuilder = organizationEntity.actionOrchestrator.getActionBuilder('getMultiple');
-    const getAllOrganizationsAction = actionBuilder(cfGuid, paginationKey,
+    const getAllOrganizationsAction = cfEntityCatalog.org.actions.getMultiple(cfGuid, paginationKey,
       {
         includeRelations: [
           createEntityRelationKey(organizationEntityType, spaceEntityType),
@@ -159,25 +142,15 @@ export class CloudFoundryEndpointService {
     private entityServiceFactory: EntityServiceFactory,
     private cfUserService: CfUserService,
     private pmf: PaginationMonitorFactory,
-    private endpointService: EndpointsService,
-    private paginationMonitorFactory: PaginationMonitorFactory
   ) {
     this.cfGuid = activeRouteCfOrgSpace.cfGuid;
-    this.getAllOrgsAction = CloudFoundryEndpointService.createGetAllOrganizations(this.cfGuid) as GetAllOrganizations;
-    this.getAllAppsAction = new GetAllApplications(createEntityRelationPaginationKey('cf', this.cfGuid), this.cfGuid);
 
     this.cfEndpointEntityService = this.entityServiceFactory.create(
       this.cfGuid,
       new GetAllEndpoints()
     );
 
-    const cfInfoEntity = entityCatalog.getEntity<any, any, CfInfoDefinitionActionBuilders>(CF_ENDPOINT_TYPE, cfInfoEntityType);
-    const actionBuilder = cfInfoEntity.actionOrchestrator.getActionBuilder('get');
-    const action = actionBuilder(this.cfGuid);
-    this.cfInfoEntityService = this.entityServiceFactory.create<APIResource<ICfV2Info>>(
-      this.cfGuid,
-      action,
-    );
+    this.cfInfoEntityService = cfEntityCatalog.cfInfo.store.getEntityService(this.cfGuid)
     this.constructCoreObservables();
     this.constructSecondaryObservable();
   }
@@ -185,15 +158,16 @@ export class CloudFoundryEndpointService {
   private constructCoreObservables() {
     this.endpoint$ = this.cfEndpointEntityService.waitForEntity$;
 
+    const getAllOrgsAction = CloudFoundryEndpointService.createGetAllOrganizations(this.cfGuid);
     this.orgs$ = getPaginationObservables<APIResource<IOrganization>>({
       store: this.store,
-      action: this.getAllOrgsAction,
+      action: getAllOrgsAction,
       paginationMonitor: this.pmf.create(
-        this.getAllOrgsAction.paginationKey,
+        getAllOrgsAction.paginationKey,
         cfEntityFactory(organizationEntityType),
-        this.getAllOrgsAction.flattenPagination
+        getAllOrgsAction.flattenPagination
       )
-    }, this.getAllOrgsAction.flattenPagination).entities$;
+    }, getAllOrgsAction.flattenPagination).entities$;
 
     this.info$ = this.cfInfoEntityService.waitForEntity$;
 
@@ -205,16 +179,7 @@ export class CloudFoundryEndpointService {
   }
 
   constructAppObs() {
-    const appPaginationMonitor = this.pmf.create(
-      this.getAllAppsAction.paginationKey,
-      this.getAllAppsAction,
-      this.getAllAppsAction.flattenPagination
-    );
-    this.appsPagObs = getPaginationObservables<APIResource<IApp>>({
-      store: this.store,
-      action: this.getAllAppsAction,
-      paginationMonitor: appPaginationMonitor
-    }, this.getAllAppsAction.flattenPagination);
+    this.appsPagObs = cfEntityCatalog.application.store.getPaginationService(this.cfGuid);
   }
 
   private constructSecondaryObservable() {
@@ -261,21 +226,7 @@ export class CloudFoundryEndpointService {
   }
 
   public fetchDomains = () => {
-    const domainEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, domainEntityType);
-    const actionBuilder = domainEntity.actionOrchestrator.getActionBuilder('getMultiple');
-    const action = actionBuilder(this.cfGuid, null);
-    this.paginationSubscription = getPaginationObservables<APIResource>(
-      {
-        store: this.store,
-        action,
-        paginationMonitor: this.pmf.create(
-          action.paginationKey,
-          cfEntityFactory(domainEntityType),
-          action.flattenPagination
-        )
-      },
-      action.flattenPagination
-    ).entities$.pipe(first()).subscribe();
+    cfEntityCatalog.domain.api.getMultiple(this.cfGuid, null, {});
   }
 
   public deleteOrg(orgGuid: string, endpointGuid: string) {
@@ -283,7 +234,7 @@ export class CloudFoundryEndpointService {
   }
 
   fetchApps() {
-    this.store.dispatch(this.getAllAppsAction);
+    cfEntityCatalog.application.api.getMultiple(this.cfGuid);
   }
 
 }
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-org-space-quota.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-org-space-quota.ts
index 10da08098e..7a5c11fadc 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-org-space-quota.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-org-space-quota.ts
@@ -1,13 +1,13 @@
 import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { filter, first, map, switchMap } from 'rxjs/operators';
 
-import { CFEntityConfig } from '../../../cf-types';
 import { IApp, IOrganization, ISpace } from '../../../../../core/src/core/cf-api.types';
 import { truthyIncludingZero } from '../../../../../core/src/core/utils.service';
 import { determineCardStatus } from '../../../../../core/src/shared/components/cards/card-status/card-status.component';
-import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { StratosStatus } from '../../../../../core/src/shared/shared.types';
+import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { CFEntityConfig } from '../../../cf-types';
 import { CloudFoundryEndpointService } from './cloud-foundry-endpoint.service';
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization.service.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization.service.ts
index a1c41cc54b..17f4e4e19c 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization.service.ts
@@ -25,13 +25,9 @@ import { getEntityFlattenedList, getStartedAppInstanceCount } from '../../../../
 import {
   CloudFoundryUserProvidedServicesService,
 } from '../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../../store/src/entity-catalog/entity-catalog.types';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
-import { CF_ENDPOINT_TYPE } from '../../../cf-types';
-import { OrganizationActionBuilders } from '../../../entity-action-builders/organization.action-builders';
+import { cfEntityCatalog } from '../../../cf-entity-catalog';
 import { createEntityRelationKey } from '../../../entity-relations/entity-relations.types';
 import { CfUserService } from '../../../shared/data-services/cf-user.service';
 import { fetchServiceInstancesCount } from '../../service-catalog/services-helper';
@@ -89,7 +85,6 @@ export class CloudFoundryOrganizationService {
   constructor(
     public activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
     private store: Store<CFAppState>,
-    private entityServiceFactory: EntityServiceFactory,
     private cfUserService: CfUserService,
     private paginationMonitorFactory: PaginationMonitorFactory,
     private cfEndpointService: CloudFoundryEndpointService,
@@ -102,10 +97,7 @@ export class CloudFoundryOrganizationService {
   }
 
   public deleteSpace(spaceGuid: string, orgGuid: string, endpointGuid: string) {
-    const spaceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, spaceEntityType);
-    const actionBuilder = spaceEntity.actionOrchestrator.getActionBuilder('remove');
-    const deleteSpaceAction = actionBuilder(spaceGuid, endpointGuid, { orgGuid });
-    this.store.dispatch(deleteSpaceAction);
+    cfEntityCatalog.space.api.remove(spaceGuid, endpointGuid, { orgGuid })
   }
 
   public fetchApps() {
@@ -132,15 +124,7 @@ export class CloudFoundryOrganizationService {
             createEntityRelationKey(organizationEntityType, OrgUserRoleNames.AUDITOR),
           );
         }
-        const orgEntity = entityCatalog
-          .getEntity<IEntityMetadata, any, OrganizationActionBuilders>(CF_ENDPOINT_TYPE, organizationEntityType);
-        const getOrgActionBuilder = orgEntity.actionOrchestrator.getActionBuilder('get');
-        const getOrgAction = getOrgActionBuilder(this.orgGuid, this.cfGuid, { includeRelations: relations });
-        const orgEntityService = this.entityServiceFactory.create<APIResource<IOrganization>>(
-          this.orgGuid,
-          getOrgAction
-        );
-        return orgEntityService.waitForEntity$;
+        return cfEntityCatalog.org.store.getEntityService(this.orgGuid, this.cfGuid, { includeRelations: relations }).waitForEntity$;
       }),
       publishReplay(1),
       refCount()
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space.service.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space.service.ts
index 8b34067470..ad5c7101d3 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space.service.ts
@@ -15,12 +15,12 @@ import {
 import { SpaceUserRoleNames } from '../../../../../cloud-foundry/src/store/types/user.types';
 import { IApp, IOrgQuotaDefinition, IRoute, ISpace, ISpaceQuotaDefinition } from '../../../../../core/src/core/cf-api.types';
 import { getStartedAppInstanceCount } from '../../../../../core/src/core/cf.helpers';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
-import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import {
   CloudFoundryUserProvidedServicesService,
 } from '../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
+import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
+import { cfEntityCatalog } from '../../../cf-entity-catalog';
 import { createEntityRelationKey } from '../../../entity-relations/entity-relations.types';
 import { CfUserService } from '../../../shared/data-services/cf-user.service';
 import { fetchServiceInstancesCount } from '../../service-catalog/services-helper';
@@ -28,8 +28,6 @@ import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { getSpaceRolesString } from '../cf.helpers';
 import { CloudFoundryEndpointService } from './cloud-foundry-endpoint.service';
 import { CloudFoundryOrganizationService, createOrgQuotaDefinition } from './cloud-foundry-organization.service';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
-import { CF_ENDPOINT_TYPE } from '../../../cf-types';
 
 @Injectable()
 export class CloudFoundrySpaceService {
@@ -63,7 +61,6 @@ export class CloudFoundrySpaceService {
   constructor(
     public activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
     private store: Store<CFAppState>,
-    private entityServiceFactory: EntityServiceFactory,
     private cfUserService: CfUserService,
     private paginationMonitorFactory: PaginationMonitorFactory,
     private cfEndpointService: CloudFoundryEndpointService,
@@ -119,14 +116,8 @@ export class CloudFoundrySpaceService {
             createEntityRelationKey(spaceEntityType, SpaceUserRoleNames.AUDITOR),
           );
         }
-        const spaceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, spaceEntityType);
-        const actionBuilder = spaceEntity.actionOrchestrator.getActionBuilder('get');
-        const getSpaceAction = actionBuilder(this.spaceGuid, this.cfGuid, { includeRelations: relations });
-        const spaceEntityService = this.entityServiceFactory.create<APIResource<ISpace>>(
-          this.spaceGuid,
-          getSpaceAction
-        );
-        return spaceEntityService.entityObs$.pipe(filter(o => !!o && !!o.entity));
+        return cfEntityCatalog.space.store.getEntityService(this.spaceGuid, this.cfGuid, { includeRelations: relations })
+          .entityObs$.pipe(filter(o => !!o && !!o.entity));
       }),
       publishReplay(1),
       refCount()
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.ts
index da9f999835..cd34aed01f 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.ts
@@ -4,15 +4,14 @@ import { Store } from '@ngrx/store';
 import { Observable, of, Subscription } from 'rxjs';
 import { filter, first, map, switchMap } from 'rxjs/operators';
 
-import { GetSpaceQuotaDefinition } from '../../../../../cloud-foundry/src/actions/quota-definitions.actions';
 import { IOrganization, ISpace, ISpaceQuotaDefinition } from '../../../../../core/src/core/cf-api.types';
 import { CurrentUserPermissions } from '../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../core/src/core/current-user-permissions.service';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
 import { AppState } from '../../../../../store/src/app-state';
 import { APIResource } from '../../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
+import { cfEntityCatalog } from '../../../cf-entity-catalog';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers';
 import { QuotaDefinitionBaseComponent } from '../quota-definition-base/quota-definition-base.component';
@@ -42,13 +41,12 @@ export class SpaceQuotaDefinitionComponent extends QuotaDefinitionBaseComponent
   public isOrg = false;
 
   constructor(
-    protected entityServiceFactory: EntityServiceFactory,
     protected store: Store<AppState>,
     activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
     activatedRoute: ActivatedRoute,
     currentUserPermissionsService: CurrentUserPermissionsService
   ) {
-    super(entityServiceFactory, store, activeRouteCfOrgSpace, activatedRoute);
+    super(store, activeRouteCfOrgSpace, activatedRoute);
     this.setupQuotaDefinitionObservable();
     const { cfGuid, orgGuid, spaceGuid } = activeRouteCfOrgSpace;
     this.canEditQuota$ = currentUserPermissionsService.can(CurrentUserPermissions.SPACE_QUOTA_EDIT, cfGuid, orgGuid);
@@ -60,11 +58,7 @@ export class SpaceQuotaDefinitionComponent extends QuotaDefinitionBaseComponent
     const quotaGuid$ = this.quotaGuid ? of(this.quotaGuid) : this.space$.pipe(map(space => space.entity.space_quota_definition_guid));
     const entityInfo$ = quotaGuid$.pipe(
       first(),
-      switchMap(quotaGuid => this.entityServiceFactory.create<APIResource<ISpaceQuotaDefinition>>(
-        quotaGuid,
-        new GetSpaceQuotaDefinition(quotaGuid, this.cfGuid)
-      ).entityObs$
-      )
+      switchMap(quotaGuid => cfEntityCatalog.spaceQuota.store.getEntityService(quotaGuid, this.cfGuid).entityObs$)
     );
 
     this.quotaDefinition$ = entityInfo$.pipe(
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.ts
index 79b8b37122..361689d6b3 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.ts
@@ -5,16 +5,16 @@ import { combineLatest, Observable } from 'rxjs';
 import { filter, first, map, pairwise, startWith, tap } from 'rxjs/operators';
 
 import { CurrentUserPermissions } from '../../../../../../../../../core/src/core/current-user-permissions.config';
-import { entityCatalog } from '../../../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { ConfirmationDialogConfig } from '../../../../../../../../../core/src/shared/components/confirmation-dialog.config';
 import {
   ConfirmationDialogService,
 } from '../../../../../../../../../core/src/shared/components/confirmation-dialog.service';
 import { RouterNav } from '../../../../../../../../../store/src/actions/router.actions';
 import { AppState } from '../../../../../../../../../store/src/app-state';
+import { entityCatalog } from '../../../../../../../../../store/src/entity-catalog/entity-catalog';
 import { selectDeletionInfo } from '../../../../../../../../../store/src/selectors/api.selectors';
-import { CF_ENDPOINT_TYPE } from '../../../../../../../cf-types';
 import { spaceEntityType } from '../../../../../../../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../../../../../../../cf-types';
 import { CloudFoundryEndpointService } from '../../../../../services/cloud-foundry-endpoint.service';
 import { CloudFoundryOrganizationService } from '../../../../../services/cloud-foundry-organization.service';
 import { CloudFoundrySpaceService } from '../../../../../services/cloud-foundry-space.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.ts
index d9f8b8ce43..f3f7716510 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.ts
@@ -8,7 +8,7 @@ import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state'
 import { CurrentUserPermissions } from '../../../../../../../core/src/core/current-user-permissions.config';
 import { ConfirmationDialogConfig } from '../../../../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../../../core/src/shared/components/confirmation-dialog.service';
-import { entityCatalog } from '../../../../../../../store/src//entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
 import { selectDeletionInfo } from '../../../../../../../store/src/selectors/api.selectors';
 import { organizationEntityType } from '../../../../../cf-entity-types';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.ts
index 48081d40ab..83b9905fd4 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.ts
@@ -4,8 +4,6 @@ import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { IOrganization, ISpace } from '../../../../../../../core/src/core/cf-api.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityServiceFactory } from '../../../../../../../store/src/entity-service-factory.service';
 import {
   StackedInputActionResult,
 } from '../../../../../../../core/src/shared/components/stacked-input-actions/stacked-input-action/stacked-input-action.component';
@@ -16,9 +14,10 @@ import {
 import { StepOnNextFunction } from '../../../../../../../core/src/shared/components/stepper/step/step.component';
 import { ClearPaginationOfType } from '../../../../../../../store/src/actions/pagination.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { CF_ENDPOINT_TYPE, CFEntityConfig } from '../../../../../cf-types';
 import { CFAppState } from '../../../../../cf-app-state';
-import { cfUserEntityType, organizationEntityType, spaceEntityType } from '../../../../../cf-entity-types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
+import { cfUserEntityType } from '../../../../../cf-entity-types';
+import { CFEntityConfig } from '../../../../../cf-types';
 import { SpaceUserRoleNames } from '../../../../../store/types/user.types';
 import { UserRoleLabels } from '../../../../../store/types/users-roles.types';
 import { ActiveRouteCfOrgSpace } from '../../../cf-page.types';
@@ -45,7 +44,6 @@ export class InviteUsersCreateComponent implements OnInit {
   constructor(
     private store: Store<CFAppState>,
     private activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
-    private entityServiceFactory: EntityServiceFactory,
     private userInviteService: UserInviteService
   ) {
     this.valid$ = this.stepValid.asObservable();
@@ -54,12 +52,12 @@ export class InviteUsersCreateComponent implements OnInit {
         label: UserRoleLabels.space.short[SpaceUserRoleNames.AUDITOR],
         value: UserInviteSendSpaceRoles.auditor,
       }, {
-        label: UserRoleLabels.space.short[SpaceUserRoleNames.DEVELOPER],
-        value: UserInviteSendSpaceRoles.developer,
-      }, {
-        label: UserRoleLabels.space.short[SpaceUserRoleNames.MANAGER],
-        value: UserInviteSendSpaceRoles.manager,
-      });
+      label: UserRoleLabels.space.short[SpaceUserRoleNames.DEVELOPER],
+      value: UserInviteSendSpaceRoles.developer,
+    }, {
+      label: UserRoleLabels.space.short[SpaceUserRoleNames.MANAGER],
+      value: UserInviteSendSpaceRoles.manager,
+    });
   }
 
   stateOut(users: StackedInputActionsUpdate) {
@@ -69,29 +67,17 @@ export class InviteUsersCreateComponent implements OnInit {
 
   ngOnInit() {
     this.isSpace = !!this.activeRouteCfOrgSpace.spaceGuid;
-    const orgEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, organizationEntityType);
-    const getOrgActionBuilder = orgEntity.actionOrchestrator.getActionBuilder('get');
-    const getOrgAction = getOrgActionBuilder(
+    this.org$ = cfEntityCatalog.org.store.getEntityService(
       this.activeRouteCfOrgSpace.orgGuid,
       this.activeRouteCfOrgSpace.cfGuid,
       { includeRelations: [], populateMissing: false }
-    );
-    this.org$ = this.entityServiceFactory.create<APIResource<IOrganization>>(
-      this.activeRouteCfOrgSpace.orgGuid,
-      getOrgAction
     ).waitForEntity$.pipe(
       map(entity => entity.entity)
     );
-    const spaceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, spaceEntityType);
-    const actionBuilder = spaceEntity.actionOrchestrator.getActionBuilder('get');
-    const getSpaceAction = actionBuilder(
+    this.space$ = this.isSpace ? cfEntityCatalog.space.store.getEntityService(
       this.activeRouteCfOrgSpace.spaceGuid,
       this.activeRouteCfOrgSpace.cfGuid,
       { includeRelations: [], populateMissing: false }
-    );
-    this.space$ = this.isSpace ? this.entityServiceFactory.create<APIResource<ISpace>>(
-      this.activeRouteCfOrgSpace.spaceGuid,
-      getSpaceAction
     ).waitForEntity$.pipe(
       map(entity => entity.entity)
     ) : observableOf(null);
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.ts
index f078fc0ed1..b2d09c7484 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.ts
@@ -20,11 +20,7 @@ import {
 import { IOrganization, ISpace } from '../../../../../../core/src/core/cf-api.types';
 import { CurrentUserPermissionsChecker } from '../../../../../../core/src/core/current-user-permissions.checker';
 import { CurrentUserPermissionsService } from '../../../../../../core/src/core/current-user-permissions.service';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
 import { endpointSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
-import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
-import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import {
   selectUsersRolesCf,
   selectUsersRolesPicked,
@@ -33,9 +29,8 @@ import {
 import { APIResource, EntityInfo } from '../../../../../../store/src/types/api.types';
 import { UsersRolesSetChanges } from '../../../../actions/users-roles.actions';
 import { CFAppState } from '../../../../cf-app-state';
-import { cfEntityFactory } from '../../../../cf-entity-factory';
+import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { organizationEntityType, spaceEntityType } from '../../../../cf-entity-types';
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 import { CfUserService } from '../../../../shared/data-services/cf-user.service';
 import { createDefaultOrgRoles, createDefaultSpaceRoles } from '../../../../store/reducers/users-roles.reducer';
 import { CfUser, IUserPermissionInOrg, UserRoleInOrg, UserRoleInSpace } from '../../../../store/types/user.types';
@@ -94,8 +89,6 @@ export class CfRolesService {
   constructor(
     private store: Store<CFAppState>,
     private cfUserService: CfUserService,
-    private entityServiceFactory: EntityServiceFactory,
-    private paginationMonitorFactory: PaginationMonitorFactory,
     private userPerms: CurrentUserPermissionsService,
   ) {
     this.existingRoles$ = this.store.select(selectUsersRolesPicked).pipe(
@@ -233,13 +226,8 @@ export class CfRolesService {
   }
 
   fetchOrg(cfGuid: string, orgGuid: string): Observable<EntityInfo<APIResource<IOrganization>>> {
-    const orgEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, organizationEntityType);
-    const getOrgActionBuilder = orgEntity.actionOrchestrator.getActionBuilder('get');
-    const getOrgAction = getOrgActionBuilder(orgGuid, cfGuid, { includeRelations: [], populateMissing: false });
-    return this.entityServiceFactory.create<APIResource<IOrganization>>(
-      orgGuid,
-      getOrgAction
-    ).waitForEntity$;
+    return cfEntityCatalog.org.store.getEntityService(orgGuid, cfGuid, { includeRelations: [], populateMissing: false })
+      .waitForEntity$;
   }
 
   fetchOrgEntity(cfGuid: string, orgGuid: string): Observable<APIResource<IOrganization>> {
@@ -252,9 +240,7 @@ export class CfRolesService {
   fetchOrgs(cfGuid: string): Observable<APIResource<IOrganization>[]> {
     if (!this.cfOrgs[cfGuid]) {
       const paginationKey = createEntityRelationPaginationKey(endpointSchemaKey, cfGuid);
-      const organizationEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, organizationEntityType);
-      const actionBuilder = organizationEntity.actionOrchestrator.getActionBuilder('getMultiple');
-      const getAllOrganizationsAction = actionBuilder(
+      const orgs$ = cfEntityCatalog.org.store.getPaginationService(
         cfGuid,
         paginationKey,
         {
@@ -262,18 +248,7 @@ export class CfRolesService {
             createEntityRelationKey(organizationEntityType, spaceEntityType)
           ], populateMissing: true
         }
-      );
-      const orgs$ = getPaginationObservables<APIResource<IOrganization>>({
-        store: this.store,
-        action: getAllOrganizationsAction,
-        paginationMonitor: this.paginationMonitorFactory.create(
-          paginationKey,
-          cfEntityFactory(organizationEntityType),
-          getAllOrganizationsAction.flattenPagination
-        ),
-      },
-        getAllOrganizationsAction.flattenPagination
-      ).entities$;
+      ).entities$
       this.cfOrgs[cfGuid] = CfRolesService.filterEditableOrgOrSpace<IOrganization>(this.userPerms, true, orgs$).pipe(
         map(orgs => orgs.sort((a, b) => a.entity.name.localeCompare(b.entity.name))),
         publishReplay(1),
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.ts
index eeebe25d3d..c3360df331 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-confirm/manage-users-confirm.component.ts
@@ -10,7 +10,7 @@ import {
   ITableCellRequestMonitorIconConfig,
 } from '../../../../../../../core/src/shared/components/list/list-table/table-cell-request-monitor-icon/table-cell-request-monitor-icon.component';
 import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
 import {
   selectUsersRoles,
   selectUsersRolesChangedRoles,
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-base/service-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-base/service-base.component.ts
index fec927604f..20db0e5ca0 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-base/service-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-base/service-base.component.ts
@@ -1,19 +1,12 @@
 import { Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Store } from '@ngrx/store';
 
-import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
-import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { ServicesService } from '../services.service';
 
 export function servicesServiceFactory(
-  store: Store<CFAppState>,
   activatedRoute: ActivatedRoute,
-  entityServiceFactory: EntityServiceFactory,
-  paginationMonitorFactory: PaginationMonitorFactory
 ) {
-  return new ServicesService(store, entityServiceFactory, activatedRoute, paginationMonitorFactory);
+  return new ServicesService(activatedRoute);
 }
 
 
@@ -25,14 +18,8 @@ export function servicesServiceFactory(
     {
       provide: ServicesService,
       useFactory: servicesServiceFactory,
-      deps: [Store, ActivatedRoute, EntityServiceFactory, PaginationMonitorFactory]
+      deps: [ActivatedRoute]
     }
   ]
 })
-export class ServiceBaseComponent {
-
-  constructor(private servicesService: ServicesService, private store: Store<CFAppState>) {
-  }
-
-
-}
+export class ServiceBaseComponent { }
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog.helpers.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog.helpers.ts
index 2a74a1a3c5..a7cdbd8b7d 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog.helpers.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog.helpers.ts
@@ -1,24 +1,17 @@
 import { Provider } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Store } from '@ngrx/store';
 
-import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
-import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
-import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { ServicesService } from './services.service';
 
 
 export function servicesServiceFactory(
-  store: Store<CFAppState>,
   activatedRoute: ActivatedRoute,
-  entityServiceFactory: EntityServiceFactory,
-  paginationMonitorFactory: PaginationMonitorFactory
 ) {
-  return new ServicesService(store, entityServiceFactory, activatedRoute, paginationMonitorFactory);
+  return new ServicesService(activatedRoute);
 }
 
 export const servicesServiceFactoryProvider: Provider = {
   provide: ServicesService,
   useFactory: servicesServiceFactory,
-  deps: [Store, ActivatedRoute, EntityServiceFactory, PaginationMonitorFactory]
+  deps: [ActivatedRoute]
 };
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/services-helper.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/services-helper.ts
index 248875a0ee..b34883e357 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/services-helper.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/services-helper.ts
@@ -15,27 +15,17 @@ import {
 } from '../../../../core/src/core/cf-api-svc.types';
 import { getIdFromRoute, safeStringToObj } from '../../../../core/src/core/utils.service';
 import { StratosStatus } from '../../../../core/src/shared/shared.types';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../store/src/entity-catalog/entity-catalog.types';
 import { EntityService } from '../../../../store/src/entity-service';
-import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
-import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../store/src/types/api.types';
-import { PaginatedAction } from '../../../../store/src/types/pagination.types';
-import { EntityRequestAction } from '../../../../store/src/types/request.types';
 import { CFAppState } from '../../cf-app-state';
-import { cfEntityFactory } from '../../cf-entity-factory';
+import { cfEntityCatalog } from '../../cf-entity-catalog';
 import {
   organizationEntityType,
-  serviceBrokerEntityType,
-  serviceEntityType,
   serviceInstancesEntityType,
   servicePlanEntityType,
   spaceEntityType,
 } from '../../cf-entity-types';
-import { CF_ENDPOINT_TYPE } from '../../cf-types';
-import { ServiceInstanceActionBuilders } from '../../entity-action-builders/service-instance.action.builders';
 import { QParam, QParamJoiners } from '../../shared/q-param';
 import { fetchTotalResults } from '../cloud-foundry/cf.helpers';
 import { ServicePlanAccessibility } from './services.service';
@@ -83,16 +73,9 @@ export const isEditServiceInstanceMode = (activatedRoute: ActivatedRoute) => {
   return !!cfId && !!serviceInstanceId;
 };
 
-export const getServiceInstancesInCf = (cfGuid: string, store: Store<CFAppState>, paginationMonitorFactory: PaginationMonitorFactory) => {
+export const getServiceInstancesInCf = (cfGuid: string) => {
   const paginationKey = createEntityRelationPaginationKey(serviceInstancesEntityType, cfGuid);
-  const serviceIntanceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, serviceInstancesEntityType);
-  const actionBuilder = serviceIntanceEntity.actionOrchestrator.getActionBuilder('getMultiple');
-  const action = actionBuilder(cfGuid, paginationKey);
-  return getPaginationObservables<APIResource<IServiceInstance>>({
-    store,
-    action,
-    paginationMonitor: paginationMonitorFactory.create(paginationKey, action, action.flattenPagination)
-  }, action.flattenPagination).entities$;
+  return cfEntityCatalog.serviceInstance.store.getPaginationService(cfGuid, paginationKey).entities$;
 };
 
 export const fetchServiceInstancesCount = (
@@ -103,14 +86,11 @@ export const fetchServiceInstancesCount = (
   paginationMonitorFactory: PaginationMonitorFactory): Observable<number> => {
   const parentSchemaKey = spaceGuid ? spaceEntityType : orgGuid ? organizationEntityType : 'cf';
   const uniqueKey = spaceGuid || orgGuid || cfGuid;
-  const serviceInstanceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, serviceInstancesEntityType);
-  const actionBuilder = serviceInstanceEntity.actionOrchestrator.getActionBuilder('getMultiple');
-  const action = actionBuilder(
+  const action = cfEntityCatalog.serviceInstance.actions.getMultiple(
     cfGuid,
     createEntityRelationPaginationKey(parentSchemaKey, uniqueKey),
     { includeRelations: [], populateMissing: false }
-  );
-  action.initialParams.q = [];
+  )
   if (orgGuid) {
     action.initialParams.q.push(new QParam('organization_guid', orgGuid, QParamJoiners.in).toString());
   }
@@ -133,9 +113,7 @@ export const getServiceSummaryUrl = (cfGuid: string, serviceGuid: string): strin
 
 export const getServicePlans = (
   service$: Observable<APIResource<IService>>,
-  cfGuid: string,
-  store: Store<CFAppState>,
-  paginationMonitorFactory: PaginationMonitorFactory
+  cfGuid: string
 ): Observable<APIResource<IServicePlan>[]> => {
   return service$.pipe(
     filter(p => !!p),
@@ -143,22 +121,12 @@ export const getServicePlans = (
       if (service.entity.service_plans && service.entity.service_plans.length > 0) {
         return observableOf(service.entity.service_plans);
       } else {
+        // Could be a space-scoped service, make a request to fetch the plan
         const guid = service.metadata.guid;
         const paginationKey = createEntityRelationPaginationKey(servicePlanEntityType, guid);
-        const servicePlanEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, servicePlanEntityType);
-        const actionBuilder = servicePlanEntity.actionOrchestrator.getActionBuilder('getAllForServiceInstance');
-        const getServicePlansAction = actionBuilder(guid, cfGuid, paginationKey) as PaginatedAction;
-        // Could be a space-scoped service, make a request to fetch the plan
-        return getPaginationObservables<APIResource<IServicePlan>>({
-          store,
-          action: getServicePlansAction,
-          paginationMonitor: paginationMonitorFactory.create(
-            getServicePlansAction.paginationKey,
-            cfEntityFactory(servicePlanEntityType),
-            getServicePlansAction.flattenPagination
-          )
-        }, getServicePlansAction.flattenPagination)
-          .entities$.pipe(share(), first());
+        return cfEntityCatalog.servicePlan.store.getAllForServiceInstance.getPaginationService(
+          guid, cfGuid, paginationKey
+        ).entities$.pipe(share(), first());
       }
     }));
 };
@@ -226,66 +194,37 @@ export const populateServicePlanExtraTyped = (servicePlan: APIResource<IServiceP
   };
 };
 
-export const getEntityService = <T extends IService | IServiceBroker | IServiceInstance>(
-  serviceGuid: string,
-  entityRequestAction: EntityRequestAction,
-  entityServiceFactory: EntityServiceFactory
-): EntityService<APIResource<T>> => {
-  return entityServiceFactory.create<APIResource<T>>(
-    serviceGuid,
-    entityRequestAction
-  );
-};
 
 export const getServiceBroker = (
   serviceBrokerGuid: string,
   cfGuid: string,
-  entityServiceFactory: EntityServiceFactory
-): EntityService<APIResource<IServiceBroker>> => {
-  const serviceBrokerEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, serviceBrokerEntityType);
-  const actionBuilder = serviceBrokerEntity.actionOrchestrator.getActionBuilder('get');
-  const getServiceBrokerAction = actionBuilder(serviceBrokerGuid, cfGuid);
-  return getEntityService(serviceBrokerGuid, getServiceBrokerAction, entityServiceFactory);
-};
+): EntityService<APIResource<IServiceBroker>> => cfEntityCatalog.serviceBroker.store.getEntityService(serviceBrokerGuid, cfGuid, {});
 
 export const getServiceBrokerName = (
   serviceBrokerGuid: string,
   cfGuid: string,
-  entityServiceFactory: EntityServiceFactory): Observable<string> => {
-  return getServiceBroker(serviceBrokerGuid, cfGuid, entityServiceFactory).waitForEntity$.pipe(
-    filter(res => !!res),
-    map(a => a.entity.entity.name),
-    first()
-  );
-};
+): Observable<string> => getServiceBroker(serviceBrokerGuid, cfGuid).waitForEntity$.pipe(
+  filter(res => !!res),
+  map(a => a.entity.entity.name),
+  first()
+);
 
 export const getCfService = (
   serviceGuid: string,
   cfGuid: string,
-  entityServiceFactory: EntityServiceFactory
-): EntityService<APIResource<IService>> => {
-  const serviceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, serviceEntityType);
-  const actionBuilder = serviceEntity.actionOrchestrator.getActionBuilder('get');
-  const getServiceAction = actionBuilder(serviceGuid, cfGuid);
-  return getEntityService(serviceGuid, getServiceAction, entityServiceFactory);
-};
+): EntityService<APIResource<IService>> => cfEntityCatalog.service.store.getEntityService(serviceGuid, cfGuid, {});
 
 export const getCfServiceInstance = (
   serviceInstanceGuid: string,
   cfGuid: string,
-  entityServiceFactory: EntityServiceFactory,
   includeRelations: string[] = null
 ): EntityService<APIResource<IServiceInstance>> => {
-  const entity = entityCatalog
-    .getEntity<IEntityMetadata, any, ServiceInstanceActionBuilders>(CF_ENDPOINT_TYPE, serviceInstancesEntityType);
-  const actionBuilder = entity.actionOrchestrator.getActionBuilder('get');
-  const getAction = actionBuilder(
+  return cfEntityCatalog.serviceInstance.store.getEntityService(
     serviceInstanceGuid,
     cfGuid,
     {
       includeRelations,
       populateMissing: !!includeRelations
     }
-  );
-  return getEntityService<IServiceInstance>(serviceInstanceGuid, getAction, entityServiceFactory);
+  )
 };
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/services.service.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/services.service.ts
index e51f6b2275..e7db49a1d4 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/services.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/services.service.ts
@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Store } from '@ngrx/store';
 import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
 import { combineLatest, filter, first, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
@@ -12,18 +11,11 @@ import {
   IServicePlan,
   IServicePlanVisibility,
 } from '../../../../core/src/core/cf-api-svc.types';
-import { ISpace } from '../../../../core/src/core/cf-api.types';
 import { getIdFromRoute } from '../../../../core/src/core/utils.service';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
 import { EntityService } from '../../../../store/src/entity-service';
-import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
-import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
-import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../store/src/types/api.types';
-import { CFAppState } from '../../cf-app-state';
-import { cfEntityFactory } from '../../cf-entity-factory';
-import { serviceBrokerEntityType, servicePlanVisibilityEntityType, spaceEntityType } from '../../cf-entity-types';
-import { CF_ENDPOINT_TYPE } from '../../cf-types';
+import { cfEntityCatalog } from '../../cf-entity-catalog';
+import { serviceBrokerEntityType, servicePlanVisibilityEntityType } from '../../cf-entity-types';
 import { createEntityRelationPaginationKey } from '../../entity-relations/entity-relations.types';
 import { getCfService, getServiceInstancesInCf, getServiceName, getServicePlans } from './services-helper';
 
@@ -59,17 +51,17 @@ export class ServicesService {
   initialised$ = new BehaviorSubject(false);
 
   constructor(
-    private store: Store<CFAppState>,
-    private entityServiceFactory: EntityServiceFactory,
     public activatedRoute: ActivatedRoute,
-    private paginationMonitorFactory: PaginationMonitorFactory
-
   ) {
 
     this.cfGuid = getIdFromRoute(activatedRoute, 'endpointId');
     this.serviceGuid = getIdFromRoute(activatedRoute, 'serviceId');
 
-    this.serviceEntityService = getCfService(this.serviceGuid, this.cfGuid, this.entityServiceFactory);
+    if (!this.serviceGuid) {
+      return;
+    }
+
+    this.serviceEntityService = getCfService(this.serviceGuid, this.cfGuid);
     this.service$ = this.serviceEntityService.waitForEntity$.pipe(
       filter(o => !!o && !!o.entity),
       map(o => o.entity),
@@ -82,43 +74,15 @@ export class ServicesService {
 
   getServicePlanVisibilities = () => {
     const paginationKey = createEntityRelationPaginationKey(servicePlanVisibilityEntityType, this.cfGuid);
-    const servicePlanVisibilityEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, servicePlanVisibilityEntityType);
-    const actionBuilder = servicePlanVisibilityEntity.actionOrchestrator.getActionBuilder('getMultiple');
-    const getServicePlanVisibilitiesAction = actionBuilder(this.cfGuid, paginationKey);
-    return getPaginationObservables<APIResource<IServicePlanVisibility>>(
-      {
-        store: this.store,
-        action: getServicePlanVisibilitiesAction,
-        paginationMonitor: this.paginationMonitorFactory.create(
-          paginationKey,
-          cfEntityFactory(servicePlanVisibilityEntityType),
-          getServicePlanVisibilitiesAction.flattenPagination
-        )
-      },
-      getServicePlanVisibilitiesAction.flattenPagination
-    ).entities$;
+    return cfEntityCatalog.servicePlanVisibility.store.getPaginationService(this.cfGuid, paginationKey, {}).entities$
   }
   private getServiceInstances = () => {
-    return getServiceInstancesInCf(this.cfGuid, this.store, this.paginationMonitorFactory);
+    return getServiceInstancesInCf(this.cfGuid);
   }
 
   private getServiceBrokers = () => {
     const paginationKey = createEntityRelationPaginationKey(serviceBrokerEntityType, this.cfGuid);
-    const serviceBrokerEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, serviceBrokerEntityType);
-    const actionBuilder = serviceBrokerEntity.actionOrchestrator.getActionBuilder('getMultiple');
-    const getServiceBrokersAction = actionBuilder(this.cfGuid, paginationKey);
-    return getPaginationObservables<APIResource<IServiceBroker>>(
-      {
-        store: this.store,
-        action: getServiceBrokersAction,
-        paginationMonitor: this.paginationMonitorFactory.create(
-          paginationKey,
-          cfEntityFactory(serviceBrokerEntityType),
-          getServiceBrokersAction.flattenPagination
-        )
-      },
-      getServiceBrokersAction.flattenPagination
-    ).entities$;
+    return cfEntityCatalog.serviceBroker.store.getPaginationService(this.cfGuid, paginationKey, {}).entities$
   }
 
   getServiceBrokerById = (guid: string): Observable<APIResource<IServiceBroker>> => this.serviceBrokers$
@@ -191,7 +155,7 @@ export class ServicesService {
   private initBaseObservables() {
     this.servicePlanVisibilities$ = this.getServicePlanVisibilities();
     this.serviceExtraInfo$ = this.service$.pipe(map(o => JSON.parse(o.entity.extra)));
-    this.servicePlans$ = getServicePlans(this.service$, this.cfGuid, this.store, this.paginationMonitorFactory);
+    this.servicePlans$ = getServicePlans(this.service$, this.cfGuid);
     this.serviceBrokers$ = this.getServiceBrokers();
     this.serviceBroker$ = this.serviceBrokers$.pipe(
       filter(p => !!p && p.length > 0),
@@ -210,14 +174,7 @@ export class ServicesService {
             isSpaceScoped: false
           });
         } else {
-          const spaceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, spaceEntityType);
-          const actionBuilder = spaceEntity.actionOrchestrator.getActionBuilder('get');
-          const getSpaceAction = actionBuilder(spaceGuid, this.cfGuid);
-          const spaceEntityService = this.entityServiceFactory.create<APIResource<ISpace>>(
-            spaceGuid,
-            getSpaceAction
-          );
-          return spaceEntityService.waitForEntity$.pipe(
+          return cfEntityCatalog.space.store.getEntityService(spaceGuid, this.cfGuid).waitForEntity$.pipe(
             filter(o => !!o && !!o.entity),
             map(o => ({
               isSpaceScoped: true,
diff --git a/src/frontend/packages/cloud-foundry/src/features/services/detach-service-instance/detach-service-instance.component.ts b/src/frontend/packages/cloud-foundry/src/features/services/detach-service-instance/detach-service-instance.component.ts
index 8db10f06a6..d0a0413e01 100644
--- a/src/frontend/packages/cloud-foundry/src/features/services/detach-service-instance/detach-service-instance.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/services/detach-service-instance/detach-service-instance.component.ts
@@ -5,21 +5,21 @@ import { Store } from '@ngrx/store';
 import { Observable, of as observableOf, ReplaySubject } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
-import { CF_ENDPOINT_TYPE } from '../../../cf-types';
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
-import { serviceBindingEntityType, serviceInstancesEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
+import { serviceBindingEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
 import {
   ServiceActionHelperService,
 } from '../../../../../cloud-foundry/src/shared/data-services/service-action-helper.service';
-import { IServiceBinding, IServiceInstance } from '../../../../../core/src/core/cf-api-svc.types';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
+import { IServiceBinding } from '../../../../../core/src/core/cf-api-svc.types';
 import {
   AppMonitorComponentTypes,
 } from '../../../../../core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component';
 import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types';
 import { RouterNav } from '../../../../../store/src/actions/router.actions';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { cfEntityCatalog } from '../../../cf-entity-catalog';
+import { CF_ENDPOINT_TYPE } from '../../../cf-types';
 
 @Component({
   selector: 'app-detach-service-instance',
@@ -61,24 +61,14 @@ export class DetachServiceInstanceComponent {
     private store: Store<CFAppState>,
     private datePipe: DatePipe,
     private serviceActionHelperService: ServiceActionHelperService,
-    private activatedRoute: ActivatedRoute,
-    private entityServiceFactory: EntityServiceFactory
+    activatedRoute: ActivatedRoute,
   ) {
     this.cfGuid = activatedRoute.snapshot.params.endpointId;
     const serviceInstanceId = activatedRoute.snapshot.params.serviceInstanceId;
-
-    const serviceIntanceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, serviceInstancesEntityType);
-    const actionBuilder = serviceIntanceEntity.actionOrchestrator.getActionBuilder('get');
-    const getServiceInstanceAction = actionBuilder(serviceInstanceId, this.cfGuid);
-    const serviceBindingEntityService = this.entityServiceFactory.create<APIResource<IServiceInstance>>(
-      serviceInstanceId,
-      getServiceInstanceAction
-    );
-    this.title$ = serviceBindingEntityService.waitForEntity$.pipe(
+    this.title$ = cfEntityCatalog.serviceInstance.store.getEntityService(serviceInstanceId, this.cfGuid).waitForEntity$.pipe(
       filter(o => !!o && !!o.entity),
       map(o => `Unbind apps from '${o.entity.entity.name}'`),
     );
-
   }
 
   getId = (el: APIResource) => el.metadata.guid;
diff --git a/src/frontend/packages/cloud-foundry/src/features/services/services/services-wall.service.ts b/src/frontend/packages/cloud-foundry/src/features/services/services/services-wall.service.ts
index 3d76cfcc5c..32abd41efc 100644
--- a/src/frontend/packages/cloud-foundry/src/features/services/services/services-wall.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/services/services/services-wall.service.ts
@@ -1,48 +1,25 @@
 import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, map, publishReplay, refCount } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import { serviceEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
 import { IService } from '../../../../../core/src/core/cf-api-svc.types';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
-import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
-import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+import { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
 import { APIResource } from '../../../../../store/src/types/api.types';
-import { PaginatedAction } from '../../../../../store/src/types/pagination.types';
-import { cfEntityFactory } from '../../../cf-entity-factory';
-import { CF_ENDPOINT_TYPE } from '../../../cf-types';
+import { cfEntityCatalog } from '../../../cf-entity-catalog';
 import { createEntityRelationPaginationKey } from '../../../entity-relations/entity-relations.types';
 
 @Injectable()
 export class ServicesWallService {
   services$: Observable<APIResource<IService>[]>;
 
-  constructor(
-    private store: Store<CFAppState>,
-    private paginationMonitorFactory: PaginationMonitorFactory
-  ) {
+  constructor() {
     this.services$ = this.initServicesObservable();
   }
 
   initServicesObservable = () => {
-    const paginationKey = createEntityRelationPaginationKey(serviceEntityType);
-    const serviceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, serviceEntityType);
-    const actionBuilder = serviceEntity.actionOrchestrator.getActionBuilder('getMultiple');
-    const getServicesAction = actionBuilder(null, paginationKey);
-    return getPaginationObservables<APIResource<IService>>(
-      {
-        store: this.store,
-        action: getServicesAction,
-        paginationMonitor: this.paginationMonitorFactory.create(
-          paginationKey,
-          cfEntityFactory(serviceEntityType),
-          getServicesAction.flattenPagination
-        )
-      },
-      getServicesAction.flattenPagination
-    ).entities$;
+    const paginationKey = createEntityRelationPaginationKey(endpointSchemaKey);
+    return cfEntityCatalog.service.store.getPaginationService(null, paginationKey, {}).entities$
   }
 
   getServicesInCf = (cfGuid: string) => this.services$.pipe(
@@ -59,20 +36,6 @@ export class ServicesWallService {
 
   getServicesInSpace = (cfGuid: string, spaceGuid: string) => {
     const paginationKey = this.getSpaceServicePagKey(cfGuid, spaceGuid);
-    const serviceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, serviceEntityType);
-    const actionBuilder = serviceEntity.actionOrchestrator.getActionBuilder('getAllInSpace');
-    const getAllServicesForSpaceAction = actionBuilder(cfGuid, paginationKey, spaceGuid) as PaginatedAction;
-    return getPaginationObservables<APIResource<IService>>(
-      {
-        store: this.store,
-        action: getAllServicesForSpaceAction,
-        paginationMonitor: this.paginationMonitorFactory.create(
-          paginationKey,
-          cfEntityFactory(serviceEntityType),
-          getAllServicesForSpaceAction.flattenPagination
-        )
-      },
-      getAllServicesForSpaceAction.flattenPagination
-    ).entities$;
+    return cfEntityCatalog.service.store.getAllInSpace.getPaginationService(cfGuid, paginationKey, spaceGuid).entities$;
   }
 }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.ts
index dcdb7795b3..599a9393ad 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.ts
@@ -16,7 +16,6 @@ import {
   tap,
 } from 'rxjs/operators';
 
-import { GetApplication } from '../../../../../../cloud-foundry/src/actions/application.actions';
 import {
   ResetCreateServiceInstanceOrgAndSpaceState,
   ResetCreateServiceInstanceState,
@@ -27,11 +26,7 @@ import {
   SetServiceInstanceGuid,
 } from '../../../../../../cloud-foundry/src/actions/create-service-instance.actions';
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
-import {
-  applicationEntityType,
-  serviceInstancesEntityType,
-  spaceEntityType,
-} from '../../../../../../cloud-foundry/src/cf-entity-types';
+import { applicationEntityType, spaceEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
 import {
   createEntityRelationKey,
   createEntityRelationPaginationKey,
@@ -45,21 +40,10 @@ import {
 import {
   selectCreateServiceInstance,
 } from '../../../../../../cloud-foundry/src/store/selectors/create-service-instance.selectors';
-import { IServiceInstance } from '../../../../../../core/src/core/cf-api-svc.types';
 import { IApp, ISpace } from '../../../../../../core/src/core/cf-api.types';
 import { getIdFromRoute } from '../../../../../../core/src/core/utils.service';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
-import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
-import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
-import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../../../store/src/types/api.types';
-import { PaginatedAction } from '../../../../../../store/src/types/pagination.types';
-import { cfEntityFactory } from '../../../../cf-entity-factory';
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
-import { ApplicationActionBuilders } from '../../../../entity-action-builders/application.action-builders';
-import { ServiceInstanceActionBuilders } from '../../../../entity-action-builders/service-instance.action.builders';
-import { SpaceActionBuilders } from '../../../../entity-action-builders/space.action-builders';
+import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { SERVICE_INSTANCE_TYPES } from '../add-service-instance-base-step/add-service-instance.types';
 import { CreateServiceInstanceHelperServiceFactory } from '../create-service-instance-helper-service-factory.service';
 import { CreateServiceInstanceHelper } from '../create-service-instance-helper.service';
@@ -102,30 +86,13 @@ export class AddServiceInstanceComponent implements OnDestroy, AfterContentInit
     map(details => details.spaceGuid)
   );
 
-  private serviceInstanceEntity = entityCatalog.getEntity<IEntityMetadata, any, ServiceInstanceActionBuilders>(
-    CF_ENDPOINT_TYPE,
-    serviceInstancesEntityType
-  );
-
-  private spaceEntity = entityCatalog.getEntity<IEntityMetadata, any, SpaceActionBuilders>(
-    CF_ENDPOINT_TYPE,
-    spaceEntityType
-  );
-
-  private appEntity = entityCatalog.getEntity<IEntityMetadata, any, ApplicationActionBuilders>(
-    CF_ENDPOINT_TYPE,
-    applicationEntityType
-  );
-
   constructor(
     private cSIHelperServiceFactory: CreateServiceInstanceHelperServiceFactory,
     private activatedRoute: ActivatedRoute,
     private store: Store<CFAppState>,
     private cfOrgSpaceService: CfOrgSpaceDataService,
     private csiGuidsService: CsiGuidsService,
-    private entityServiceFactory: EntityServiceFactory,
     public modeService: CsiModeService,
-    private paginationMonitorFactory: PaginationMonitorFactory,
     route: ActivatedRoute
   ) {
     const cfGuid = getIdFromRoute(this.activatedRoute, 'endpointId');
@@ -165,17 +132,9 @@ export class AddServiceInstanceComponent implements OnDestroy, AfterContentInit
       switchMap(csi => {
         this.appsEmitted.next(false);
         const paginationKey = createEntityRelationPaginationKey(spaceEntityType, csi.spaceGuid);
-        const actionBuilder = this.appEntity.actionOrchestrator.getActionBuilder('getAllInSpace');
-        const getAllAppsInSpaceAction = actionBuilder(csi.spaceGuid, csi.cfGuid, paginationKey) as PaginatedAction;
-        return getPaginationObservables({
-          store: this.store,
-          action: getAllAppsInSpaceAction,
-          paginationMonitor: this.paginationMonitorFactory.create(
-            paginationKey,
-            cfEntityFactory(applicationEntityType),
-            getAllAppsInSpaceAction.flattenPagination
-          )
-        }, getAllAppsInSpaceAction.flattenPagination).entities$;
+        return cfEntityCatalog.application.store.getAllInSpace.getPaginationService(
+          csi.spaceGuid, csi.cfGuid, paginationKey
+        ).entities$;
       }),
       tap(() => this.appsEmitted.next(true)),
       publishReplay(1),
@@ -214,11 +173,12 @@ export class AddServiceInstanceComponent implements OnDestroy, AfterContentInit
     const cfId = getIdFromRoute(this.activatedRoute, 'endpointId');
     this.appId = appId;
     this.bindAppStepperText = 'Binding Params (Optional)';
-    const entityService = this.entityServiceFactory.create<APIResource<IApp>>(
+    return cfEntityCatalog.application.store.getEntityService(
       appId,
-      new GetApplication(appId, cfId, [createEntityRelationKey(applicationEntityType, spaceEntityType)])
-    );
-    return entityService.waitForEntity$.pipe(
+      cfId, {
+      includeRelations: [createEntityRelationKey(applicationEntityType, spaceEntityType)]
+    }
+    ).waitForEntity$.pipe(
       filter(p => !!p),
       tap(app => {
         const spaceEntity = app.entity.entity.space as APIResource<ISpace>;
@@ -238,8 +198,7 @@ export class AddServiceInstanceComponent implements OnDestroy, AfterContentInit
       this.serviceInstanceId = serviceInstanceId;
       this.title$ = observableOf('Edit User Provided Service Instance');
     } else {
-      const entityService = this.getServiceInstanceEntityService(serviceInstanceId, endpointId);
-      return entityService.waitForEntity$.pipe(
+      return cfEntityCatalog.serviceInstance.store.getEntityService(serviceInstanceId, endpointId).waitForEntity$.pipe(
         filter(p => !!p),
         tap(serviceInstance => {
           const serviceInstanceEntity = serviceInstance.entity.entity;
@@ -257,8 +216,7 @@ export class AddServiceInstanceComponent implements OnDestroy, AfterContentInit
             ''
           ));
           this.store.dispatch(new SetCreateServiceInstanceServicePlan(serviceInstanceEntity.service_plan_guid));
-          const spaceEntityService = this.getSpaceEntityService(serviceInstanceEntity.space_guid, endpointId);
-          spaceEntityService.waitForEntity$.pipe(
+          cfEntityCatalog.space.store.getEntityService(serviceInstanceEntity.space_guid, endpointId).waitForEntity$.pipe(
             filter(p => !!p),
             tap(spaceEntity => {
               this.store.dispatch(new SetCreateServiceInstanceCFDetails(
@@ -276,20 +234,6 @@ export class AddServiceInstanceComponent implements OnDestroy, AfterContentInit
     }
   }
 
-  private getServiceInstanceEntityService(serviceInstanceId: string, cfId: string) {
-    return this.entityServiceFactory.create<APIResource<IServiceInstance>>(
-      serviceInstanceId,
-      this.serviceInstanceEntity.actionOrchestrator.getActionBuilder('get')(serviceInstanceId, cfId)
-    );
-  }
-
-  private getSpaceEntityService(spaceGuid: string, cfGuid: string) {
-    return this.entityServiceFactory.create<APIResource<ISpace>>(
-      spaceGuid,
-      this.spaceEntity.actionOrchestrator.getActionBuilder('get')(spaceGuid, cfGuid)
-    );
-  }
-
   ngOnDestroy(): void {
     this.store.dispatch(new ResetCreateServiceInstanceState());
   }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/bind-apps-step/bind-apps-step.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/bind-apps-step/bind-apps-step.component.ts
index 2bba06cd52..22bacf5d6e 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/bind-apps-step/bind-apps-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/bind-apps-step/bind-apps-step.component.ts
@@ -9,7 +9,6 @@ import { IServicePlan } from '../../../../../../core/src/core/cf-api-svc.types';
 import { IApp } from '../../../../../../core/src/core/cf-api.types';
 import { pathGet, safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
 import { StepOnNextResult } from '../../../../../../core/src/shared/components/stepper/step/step.component';
-import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource } from '../../../../../../store/src/types/api.types';
 import { SchemaFormConfig } from '../../schema-form/schema-form.component';
 
@@ -37,7 +36,6 @@ export class BindAppsStepComponent implements OnDestroy, AfterContentInit {
 
   constructor(
     private store: Store<CFAppState>,
-    private paginationMonitorFactory: PaginationMonitorFactory
   ) {
     this.stepperForm = new FormGroup({
       apps: new FormControl(''),
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/create-service-instance-helper-service-factory.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/create-service-instance-helper-service-factory.service.ts
index db99edb66a..46bfdf8a89 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/create-service-instance-helper-service-factory.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/create-service-instance-helper-service-factory.service.ts
@@ -1,9 +1,7 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { CreateServiceInstanceHelper } from './create-service-instance-helper.service';
 
@@ -15,8 +13,6 @@ export class CreateServiceInstanceHelperServiceFactory {
   } = {};
   constructor(
     private store: Store<CFAppState>,
-    private entityServiceFactory: EntityServiceFactory,
-    private activatedRoute: ActivatedRoute,
     private paginationMonitorFactory: PaginationMonitorFactory
   ) { }
 
@@ -30,7 +26,6 @@ export class CreateServiceInstanceHelperServiceFactory {
         this.store,
         serviceGuid,
         cfGuid,
-        this.entityServiceFactory,
         this.paginationMonitorFactory
       );
       this.serviceInstanceCache[key] = instance;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/create-service-instance-helper.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/create-service-instance-helper.service.ts
index 45bd998cc6..23ec1f9838 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/create-service-instance-helper.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/create-service-instance-helper.service.ts
@@ -17,13 +17,11 @@ import {
   IServicePlanVisibility,
 } from '../../../../../core/src/core/cf-api-svc.types';
 import { CF_GUID } from '../../../../../core/src/shared/entity.tokens';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { cfEntityCatalog } from '../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../cf-entity-factory';
-import { CF_ENDPOINT_TYPE } from '../../../cf-types';
 import {
   getCfService,
   getServiceBroker,
@@ -43,7 +41,6 @@ export class CreateServiceInstanceHelper {
     private store: Store<CFAppState>,
     public serviceGuid: string,
     @Inject(CF_GUID) public cfGuid: string,
-    private entityServiceFactory: EntityServiceFactory,
     private paginationMonitorFactory: PaginationMonitorFactory
   ) {
     this.initBaseObservables();
@@ -51,9 +48,7 @@ export class CreateServiceInstanceHelper {
 
   initBaseObservables = () => {
 
-    const serviceEntityService = getCfService(this.serviceGuid, this.cfGuid, this.entityServiceFactory);
-
-    this.service$ = serviceEntityService.waitForEntity$.pipe(
+    this.service$ = getCfService(this.serviceGuid, this.cfGuid).waitForEntity$.pipe(
       filter(o => !!o && !!o.entity && !!o.entity.entity && !!o.entity.entity.service_plans),
       // filter(o => !!o && !!o.entity),
       map(o => o.entity),
@@ -62,41 +57,21 @@ export class CreateServiceInstanceHelper {
     );
 
     this.serviceBroker$ = this.service$.pipe(
-      map(service => getServiceBroker(service.entity.service_broker_guid, this.cfGuid, this.entityServiceFactory)),
+      map(service => getServiceBroker(service.entity.service_broker_guid, this.cfGuid)),
       switchMap(serviceService => serviceService.waitForEntity$),
       map(entity => entity.entity)
     );
 
     const paginationKey = createEntityRelationPaginationKey(servicePlanVisibilityEntityType, this.cfGuid);
-    const servicePlanVisibilityEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, servicePlanVisibilityEntityType);
-    const actionBuilder = servicePlanVisibilityEntity.actionOrchestrator.getActionBuilder('getMultiple');
-    const getServicePlanVisibilitiesAction = actionBuilder(this.cfGuid, paginationKey);
-    this.servicePlanVisibilities$ = getPaginationObservables<APIResource<IServicePlanVisibility>>(
-      {
-        store: this.store,
-        action: getServicePlanVisibilitiesAction,
-        paginationMonitor: this.paginationMonitorFactory.create(
-          paginationKey,
-          cfEntityFactory(servicePlanVisibilityEntityType),
-          getServicePlanVisibilitiesAction.flattenPagination
-        )
-      },
-      getServicePlanVisibilitiesAction.flattenPagination
-    ).entities$;
-
+    this.servicePlanVisibilities$ = cfEntityCatalog.servicePlanVisibility.store.getPaginationService(this.cfGuid, paginationKey, {}).entities$
   }
 
   getServicePlanVisibilities = (): Observable<APIResource<IServicePlanVisibility>[]> =>
     this.servicePlanVisibilities$.pipe(filter(p => !!p))
 
-  // getServicePlanVisibilitiesForOrg = (orgGuid: string): Observable<APIResource<IServicePlanVisibility>[]> =>
-  //   this.servicePlanVisibilities$.pipe(
-  //     filter(p => !!p),
-  //     map(entities => entities.filter(entity => entity.entity.organization_guid === orgGuid))
-  //   )
 
   getServicePlans(): Observable<APIResource<IServicePlan>[]> {
-    return getServicePlans(this.service$, this.cfGuid, this.store, this.paginationMonitorFactory);
+    return getServicePlans(this.service$, this.cfGuid);
   }
 
   getServiceName = () => {
@@ -107,98 +82,19 @@ export class CreateServiceInstanceHelper {
       );
   }
 
-  // getSelectedServicePlan = (): Observable<APIResource<IServicePlan>> => {
-  //   return observableCombineLatest(this.store.select(selectCreateServiceInstanceServicePlan), this.getServicePlans())
-  //     .pipe(
-  //       filter(([p, q]) => !!p && !!q),
-  //       map(([servicePlanGuid, servicePlans]) => servicePlans.filter(o => o.metadata.guid === servicePlanGuid)),
-  //       map(p => p[0]), filter(p => !!p)
-  //     );
-  // }
-
-  // getSelectedServicePlanAccessibility = (): Observable<ServicePlanAccessibility> => {
-  //   return this.getSelectedServicePlan().pipe(
-  //     switchMap(plan => getServicePlanAccessibility(plan, this.getServicePlanVisibilities()))
-  //   );
-  // }
-
-  // getOrgsForSelectedServicePlan = (): Observable<APIResource<IOrganization>[]> => {
-  //   return this.getSelectedServicePlan()
-  //     .pipe(
-  //       switchMap(servicePlan => getServicePlanAccessibility(servicePlan, this.getServicePlanVisibilities())),
-  //       switchMap(servicePlanAccessibility => {
-  //         if (servicePlanAccessibility.isPublic) {
-  //           const getAllOrgsAction = CloudFoundryEndpointService.createGetAllOrganizationsLimitedSchema(this.cfGuid);
-  //           return getPaginationObservables<APIResource<IOrganization>>({
-  //             store: this.store,
-  //             action: getAllOrgsAction,
-  //             paginationMonitor: this.paginationMonitorFactory.create(
-  //               getAllOrgsAction.paginationKey,
-  //               cfEntityFactory(organizationEntityType)
-  //             )
-  //           }, true)
-  //             .entities$.pipe(share(), first());
-  //         } else if (servicePlanAccessibility.spaceScoped) {
-  //           // Service plan is not public, but is space-scoped
-  //           const action = new GetSpace(servicePlanAccessibility.spaceGuid, this.cfGuid,
-  //             [
-  //               createEntityRelationKey(spaceEntityType, organizationEntityType),
-  //             ]
-  //           );
-  //           action.entity = [cfEntityFactory(spaceWithOrgEntityType)];
-  //           return this.entityServiceFactory.create<APIResource<ISpace>>(
-  //             spaceEntityType,
-  //             cfEntityFactory(spaceWithOrgEntityType),
-  //             servicePlanAccessibility.spaceGuid,
-  //             action,
-  //             true
-  //           ).waitForEntity$
-  //             .pipe(
-  //               // Block until the org is either fetched or associated with existing entity
-  //               filter(p => !!pathGet('entity.entity.organization.entity', p)),
-  //               map((p) => {
-  //                 const orgEntity = { ...p.entity.entity.organization.entity, spaces: [p.entity] };
-  //                 return [{ ...p.entity.entity.organization, entity: orgEntity }];
-  //               }),
-  //             );
-  //         } else if (servicePlanAccessibility.hasVisibilities) {
-  //           // Service plan is not public, fetch visibilities
-  //           return this.getServicePlanVisibilitiesForPlan(servicePlanAccessibility.guid)
-  //             .pipe(
-  //               map(s => s.map(o => o.entity.organization)),
-  //             );
-  //         }
-  //       }
-  //       ),
-  //       share(), first()
-  //     );
-  // }
-
-  // getServicePlanVisibilitiesForPlan = (servicePlanGuid: string): Observable<APIResource<IServicePlanVisibility>[]> => {
-  //   return this.getServicePlanVisibilities().pipe(
-  //     filter(p => !!p),
-  //     map(vis => vis.filter(s => s.entity.service_plan_guid === servicePlanGuid)),
-  //     first()
-  //   );
-  // }
-
   getServiceInstancesForService = (servicePlanGuid: string = null, spaceGuid: string = null, cfGuid: string = null) => {
     let action;
     let paginationKey;
-    const serviceInstanceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, serviceInstancesEntityType);
     if (spaceGuid) {
       paginationKey = createEntityRelationPaginationKey(serviceInstancesEntityType, `${spaceGuid}-${servicePlanGuid}`);
       const q = [new QParam('service_plan_guid', servicePlanGuid, QParamJoiners.colon).toString()];
-      const actionBuilder = serviceInstanceEntity.actionOrchestrator.getActionBuilder('getAllInSpace');
-      action = actionBuilder(spaceGuid, cfGuid, paginationKey, q);
+      action = cfEntityCatalog.serviceInstance.actions.getAllInSpace(spaceGuid, cfGuid, paginationKey, q)
     } else if (servicePlanGuid) {
       paginationKey = createEntityRelationPaginationKey(serviceInstancesEntityType, servicePlanGuid);
-      const actionBuilder = serviceInstanceEntity.actionOrchestrator.getActionBuilder('getAllInServicePlan');
-      action = actionBuilder(servicePlanGuid, cfGuid, paginationKey);
+      action = cfEntityCatalog.serviceInstance.actions.getAllInServicePlan(servicePlanGuid, cfGuid, paginationKey);
     } else {
       paginationKey = createEntityRelationPaginationKey(serviceInstancesEntityType, cfGuid);
-      const actionBuilder = serviceInstanceEntity.actionOrchestrator.getActionBuilder('getMultiple');
-      action = actionBuilder(cfGuid, paginationKey);
+      action = cfEntityCatalog.serviceInstance.actions.getMultiple(cfGuid, paginationKey);
     }
     return getPaginationObservables<APIResource<IServiceInstance>>({
       store: this.store,
@@ -214,24 +110,4 @@ export class CreateServiceInstanceHelper {
         refCount()
       );
   }
-
-  // getServicesForSpace = (spaceGuid: string, cfGuid: string) => {
-  //   const paginationKey = createEntityRelationPaginationKey(serviceEntityType, spaceGuid);
-  //   return getPaginationObservables<APIResource<IService>>(
-  //     {
-  //       store: this.store,
-  //       action: new GetAllServicesForSpace(paginationKey, cfGuid, spaceGuid),
-  //       paginationMonitor: this.paginationMonitorFactory.create(
-  //         paginationKey,
-  //         entityFactory(serviceEntityType)
-  //       )
-  //     },
-  //     true
-  //   ).entities$.pipe(
-  //     filter(p => !!p),
-  //     publishReplay(1),
-  //     refCount()
-  //   );
-  // }
-
 }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/csi-mode.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/csi-mode.service.ts
index f507f62e34..3b7f414439 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/csi-mode.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/csi-mode.service.ts
@@ -1,15 +1,11 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Store } from '@ngrx/store';
 import { filter, map } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
-import { serviceBindingEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
 import { SpaceScopedService } from '../../../../../cloud-foundry/src/features/service-catalog/services.service';
-import { selectCfRequestInfo } from '../../../../../cloud-foundry/src/store/selectors/api.selectors';
 import { getIdFromRoute } from '../../../../../core/src/core/utils.service';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
-import { CF_ENDPOINT_TYPE } from '../../../cf-types';
+import { RequestInfoState } from '../../../../../store/src/reducers/api-request-reducer/types';
+import { cfEntityCatalog } from '../../../cf-entity-catalog';
 
 export enum CreateServiceInstanceMode {
   MARKETPLACE_MODE = 'marketPlaceMode',
@@ -54,7 +50,6 @@ export class CsiModeService {
 
   constructor(
     private activatedRoute: ActivatedRoute,
-    private store: Store<CFAppState>
   ) {
     const serviceId = getIdFromRoute(activatedRoute, 'serviceId');
     const serviceInstanceId = getIdFromRoute(activatedRoute, 'serviceInstanceId');
@@ -136,16 +131,11 @@ export class CsiModeService {
   public createApplicationServiceBinding(serviceInstanceGuid: string, cfGuid: string, appGuid: string, params: object) {
 
     const guid = `${cfGuid}-${appGuid}-${serviceInstanceGuid}`;
-    const servceBindingEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, serviceBindingEntityType);
-    const actionBuilder = servceBindingEntity.actionOrchestrator.getActionBuilder('create');
-    const createServiceBindingAction = actionBuilder(
+    return cfEntityCatalog.serviceBinding.api.create<RequestInfoState>(
       guid,
       cfGuid,
       { applicationGuid: appGuid, serviceInstanceGuid, params }
-    );
-    this.store.dispatch(createServiceBindingAction);
-
-    return this.store.select(selectCfRequestInfo(serviceBindingEntityType, guid)).pipe(
+    ).pipe(
       filter(s => {
         return s && !s.creating;
       }),
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.ts
index 61ef2e0af5..c31b6f6142 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.ts
@@ -3,7 +3,13 @@ import { AfterContentInit, Component, Input, OnDestroy } from '@angular/core';
 import { AbstractControl, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms';
 import { MatChipInputEvent } from '@angular/material/chips';
 import { Store } from '@ngrx/store';
-import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
 import {
   combineLatest,
   distinctUntilChanged,
@@ -27,13 +33,12 @@ import { IServiceInstance, IServicePlan } from '../../../../../../core/src/core/
 import { pathGet, safeStringToObj } from '../../../../../../core/src/core/utils.service';
 import { StepOnNextResult } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { getDefaultRequestState, RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource, NormalizedResponse } from '../../../../../../store/src/types/api.types';
 import { UpdateServiceInstance } from '../../../../actions/service-instances.actions';
 import { CFAppState } from '../../../../cf-app-state';
-import { appEnvVarsEntityType, serviceBindingEntityType, serviceInstancesEntityType } from '../../../../cf-entity-types';
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
+import { cfEntityCatalog } from '../../../../cf-entity-catalog';
+import { serviceInstancesEntityType } from '../../../../cf-entity-types';
 import { selectCfRequestInfo, selectCfUpdateInfo } from '../../../../store/selectors/api.selectors';
 import {
   selectCreateServiceInstance,
@@ -312,13 +317,7 @@ export class SpecifyDetailsStepComponent implements OnDestroy, AfterContentInit
             return req;
           } else {
             // Refetch env vars for app, since they have been changed by CF
-            const appEnvVarsEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appEnvVarsEntityType);
-            const actionBuilder = appEnvVarsEntity.actionOrchestrator.getActionBuilder('get');
-            const getAppEnvVarsAction = actionBuilder(state.bindAppGuid, state.cfGuid);
-            this.store.dispatch(
-              getAppEnvVarsAction
-            );
-
+            cfEntityCatalog.appEnvVar.api.getMultiple(state.bindAppGuid, state.cfGuid);
             return this.routeToServices(state.cfGuid, state.bindAppGuid);
           }
         })
@@ -416,35 +415,26 @@ export class SpecifyDetailsStepComponent implements OnDestroy, AfterContentInit
     tagsStr: string[],
     isEditMode: boolean
   ) {
-    const serviceInstanceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, serviceInstancesEntityType);
     if (isEditMode) {
-      const updateActionBuilder = serviceInstanceEntity.actionOrchestrator.getActionBuilder('update');
-      const updateServiceInstanceAction = updateActionBuilder(
-        cfGuid,
+      return cfEntityCatalog.serviceInstance.actions.update(
         newServiceInstanceGuid,
+        cfGuid,
         { name, servicePlanGuid, spaceGuid, params, tags: tagsStr }
-      );
-      return updateServiceInstanceAction;
+      )
     }
-    const createActionBuilder = serviceInstanceEntity.actionOrchestrator.getActionBuilder('create');
-    const createServiceInstanceAction = createActionBuilder(
-      cfGuid,
+    return cfEntityCatalog.serviceInstance.actions.create(
       newServiceInstanceGuid,
+      cfGuid,
       { name, servicePlanGuid, spaceGuid, params, tags: tagsStr }
-    );
-    return createServiceInstanceAction;
+    )
   }
 
   private getIdFromResponseGetter(cfGuid: string, newId: string, isEditMode: boolean) {
     return (response: NormalizedResponse) => {
       if (!isEditMode) {
-        // We need to re-fetch the Service Instance
-        // incase of creation because the entity returned is incomplete
+        // We need to re-fetch the Service Instance in case of creation because the entity returned is incomplete
         const guid = response.result[0];
-        const serviceIntanceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, serviceInstancesEntityType);
-        const actionBuilder = serviceIntanceEntity.actionOrchestrator.getActionBuilder('get');
-        const getServiceInstanceAction = actionBuilder(guid, cfGuid);
-        this.store.dispatch(getServiceInstanceAction);
+        cfEntityCatalog.serviceInstance.api.get(guid, cfGuid);
         return guid;
       }
       return newId;
@@ -492,22 +482,6 @@ export class SpecifyDetailsStepComponent implements OnDestroy, AfterContentInit
     );
   }
 
-
-  createBinding = (serviceInstanceGuid: string, cfGuid: string, appGuid: string, params: object) => {
-
-    const guid = `${cfGuid}-${appGuid}-${serviceInstanceGuid}`;
-    const servceBindingEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, serviceBindingEntityType);
-    const actionBuilder = servceBindingEntity.actionOrchestrator.getActionBuilder('create');
-    const createServiceBindingAction = actionBuilder(
-      cfGuid,
-      guid,
-      { applicationGuid: appGuid, serviceInstanceGuid, params }
-    );
-    this.store.dispatch(createServiceBindingAction);
-
-    return this.store.select(selectCfRequestInfo(serviceBindingEntityType, guid));
-  }
-
   addTag(event: MatChipInputEvent): void {
     const input = event.input;
     const value = event.value;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts
index 433f914488..b40f8dda75 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts
@@ -14,7 +14,6 @@ import {
 } from '../../../../../../cloud-foundry/src/actions/user-provided-service.actions';
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
 import {
-  appEnvVarsEntityType,
   serviceBindingEntityType,
   userProvidedServiceInstanceEntityType,
 } from '../../../../../../cloud-foundry/src/cf-entity-types';
@@ -33,9 +32,8 @@ import { isValidJsonValidator } from '../../../../../../core/src/shared/form-val
 import {
   CloudFoundryUserProvidedServicesService,
 } from '../../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { APIResource } from '../../../../../../store/src/types/api.types';
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
+import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { CreateServiceFormMode, CsiModeService } from './../csi-mode.service';
 
 const { proxyAPIVersion, cfAPIVersion } = environment;
@@ -292,12 +290,7 @@ export class SpecifyUserProvidedDetailsComponent implements OnDestroy {
             return { success: false, message: `Failed to create service instance binding: ${req.message}` };
           } else {
             // Refetch env vars for app, since they have been changed by CF
-            const appEnvVarsEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appEnvVarsEntityType);
-            const actionBuilder = appEnvVarsEntity.actionOrchestrator.getActionBuilder('get');
-            const getAppEnvVarsAction = actionBuilder(data.bindAppGuid, data.cfGuid);
-            this.store.dispatch(
-              getAppEnvVarsAction
-            );
+            cfEntityCatalog.appEnvVar.api.getMultiple(data.bindAppGuid, data.cfGuid)
             return { success: true, redirect: true };
           }
         })
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.ts
index 147e03657b..34f2d6488c 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.ts
@@ -9,10 +9,8 @@ import {
   CloudFoundryEndpointService,
 } from '../../../../../../cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service';
 import { IApp } from '../../../../../../core/src/core/cf-api.types';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { APIResource } from '../../../../../../store/src/types/api.types';
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
-import { appStatsEntityType } from '../../../../cf-entity-types';
+import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 
 const RECENT_ITEMS_COUNT = 10;
 
@@ -45,10 +43,7 @@ export class CardCfRecentAppsComponent implements OnInit {
   private fetchAppStats(recentApps: APIResource<IApp>[]) {
     recentApps.forEach(app => {
       if (app.entity.state === 'STARTED') {
-        const appStatsEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appStatsEntityType);
-        const actionBuilder = appStatsEntity.actionOrchestrator.getActionBuilder('get');
-        const getAppStatsAction = actionBuilder(app.metadata.guid, this.cfEndpointService.cfGuid);
-        this.store.dispatch(getAppStatsAction);
+        cfEntityCatalog.appStats.api.getMultiple(app.metadata.guid, this.cfEndpointService.cfGuid);
       }
     });
   }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.ts
index 6006ee7bc3..a674581596 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.ts
@@ -41,7 +41,6 @@ export class CompactAppCardComponent implements OnInit {
     this.bcType = this.setBreadcrumbType(this.activeRouteCfOrgSpace);
     const initState = this.appStateService.get(this.app.entity, null);
     this.applicationState$ = ApplicationService.getApplicationState(
-      this.store,
       this.appStateService,
       this.app.entity,
       this.app.metadata.guid,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/service-broker-card/service-broker-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/service-broker-card/service-broker-card.component.ts
index 079ba90a05..1783dd1c18 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/service-broker-card/service-broker-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/service-broker-card/service-broker-card.component.ts
@@ -1,18 +1,12 @@
 import { Component, OnDestroy } from '@angular/core';
-import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 import { filter, map, switchMap, take, tap } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
 import { ServicesService } from '../../../../../../cloud-foundry/src/features/service-catalog/services.service';
 import { IServiceBroker } from '../../../../../../core/src/core/cf-api-svc.types';
-import { ISpace } from '../../../../../../core/src/core/cf-api.types';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
 import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
 import { APIResource } from '../../../../../../store/src/types/api.types';
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
-import { spaceEntityType } from '../../../../cf-entity-types';
+import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 
 @Component({
   selector: 'app-service-broker-card',
@@ -27,9 +21,7 @@ export class ServiceBrokerCardComponent implements OnDestroy {
   subs: Subscription[] = [];
 
   constructor(
-    private servicesService: ServicesService,
-    private store: Store<CFAppState>,
-    private entityServiceFactory: EntityServiceFactory
+    private servicesService: ServicesService
   ) {
     this.serviceBroker$ = this.servicesService.serviceBroker$;
     this.subs.push(this.serviceBroker$.pipe(
@@ -39,14 +31,7 @@ export class ServiceBrokerCardComponent implements OnDestroy {
       filter(o => !!o),
       // Broker is space scoped
       switchMap(spaceGuid => {
-        const spaceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, spaceEntityType);
-        const actionBuilder = spaceEntity.actionOrchestrator.getActionBuilder('get');
-        const getSpaceAction = actionBuilder(spaceGuid, this.servicesService.cfGuid);
-        const spaceService = this.entityServiceFactory.create<APIResource<ISpace>>(
-          spaceGuid,
-          getSpaceAction
-        );
-        return spaceService.waitForEntity$;
+        return cfEntityCatalog.space.store.getEntityService(spaceGuid, this.servicesService.cfGuid).waitForEntity$
       }),
       tap(space => {
         this.spaceLink = ['/cloud-foundry',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-data-source.ts
index f7832d76a6..3976e36dc2 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-data-source.ts
@@ -2,14 +2,12 @@ import { Store } from '@ngrx/store';
 import { map } from 'rxjs/operators';
 
 import { AppStat } from '../../../../../../../cloud-foundry/src/store/types/app-metadata.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CFAppState } from '../../../../../cf-app-state';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { applicationEntityType, appStatsEntityType } from '../../../../../cf-entity-types';
 import { createEntityRelationPaginationKey } from '../../../../../entity-relations/entity-relations.types';
@@ -24,9 +22,7 @@ export class CfAppInstancesDataSource extends ListDataSource<ListAppInstance, Ap
     listConfig: IListConfig<ListAppInstance>
   ) {
     const paginationKey = createEntityRelationPaginationKey(applicationEntityType, appGuid);
-    const appStatsEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appStatsEntityType);
-    const actionBuilder = appStatsEntity.actionOrchestrator.getActionBuilder('get');
-    const action = actionBuilder(appGuid, cfGuid) as PaginatedAction;
+    const action = cfEntityCatalog.appStats.actions.getMultiple(appGuid, cfGuid)
 
     super(
       {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-map-routes-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-map-routes-list-config.service.ts
index c133b21cca..a07393539f 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-map-routes-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-map-routes-list-config.service.ts
@@ -3,21 +3,19 @@ import { Injectable } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
-import { GetSpaceRoutes } from '../../../../../../../cloud-foundry/src/actions/space.actions';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { routeEntityType, spaceEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
+import { spaceEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
 import {
   createEntityRelationPaginationKey,
 } from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { ConfirmationDialogService } from '../../../../../../../core/src/shared/components/confirmation-dialog.service';
 import {
   TableCellRadioComponent,
 } from '../../../../../../../core/src/shared/components/list/list-table/table-cell-radio/table-cell-radio.component';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { ApplicationService } from '../../../../../features/applications/application.service';
 import { CfAppRoutesListConfigServiceBase } from './cf-app-routes-list-config-base';
 
@@ -33,13 +31,11 @@ export class CfAppMapRoutesListConfigService extends CfAppRoutesListConfigServic
     currentUserPermissionsService: CurrentUserPermissionsService,
   ) {
     const spaceGuid = activatedRoute.snapshot.queryParamMap.get('spaceGuid');
-    const routeEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, routeEntityType);
-    const actionBuilder = routeEntity.actionOrchestrator.getActionBuilder('getAllInSpace');
-    const action = actionBuilder(
+    const action = cfEntityCatalog.route.actions.getAllInSpace(
       spaceGuid,
       appService.cfGuid,
       createEntityRelationPaginationKey(spaceEntityType, spaceGuid)
-    ) as GetSpaceRoutes;
+    )
     // If parentEntitySchema is set the entity validation process will look for the space routes in the parent space entity
     // In this case, we do have them however they're missing the route-->app relationship.. which means we fetch them at a rate of one per
     // route. For spaces with hundreds of routes this isn't acceptable, so remove the link to the parent and fetch the list afresh.
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-list-config-base.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-list-config-base.ts
index 7c4e0decb6..2f970c7cfa 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-list-config-base.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-list-config-base.ts
@@ -3,17 +3,15 @@ import { Store } from '@ngrx/store';
 import { of as observableOf } from 'rxjs';
 import { publishReplay, refCount, switchMap } from 'rxjs/operators';
 
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { GetAppRoutes } from '../../../../../../../cloud-foundry/src/actions/application-service-routes.actions';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { routeEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
 import { CurrentUserPermissions } from '../../../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { ConfirmationDialogService } from '../../../../../../../core/src/shared/components/confirmation-dialog.service';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { ApplicationService } from '../../../../../features/applications/application.service';
 import { CfRoutesListConfigBase } from '../cf-routes/cf-routes-list-config-base';
 import { CfAppRoutesDataSource } from './cf-app-routes-data-source';
@@ -64,9 +62,7 @@ export abstract class CfAppRoutesListConfigServiceBase extends CfRoutesListConfi
     this.getDataSource = () => {
       // Lazy init so that any changes to the columns & data functions (like sort) are correctly applied
       if (!this.dataSource) {
-        const routeEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, routeEntityType);
-        const actionBuilder = routeEntity.actionOrchestrator.getActionBuilder('getAllForApplication');
-        const getAppRoutesAction = actionBuilder(appService.appGuid, appService.cfGuid) as PaginatedAction;
+        const getAppRoutesAction = cfEntityCatalog.route.actions.getAllForApplication(appService.appGuid, appService.cfGuid)
         this.dataSource = new CfAppRoutesDataSource(
           store,
           appService,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts
index 671f85f971..4ccaeafd9b 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts
@@ -19,16 +19,10 @@ import {
 } from '../../../../../../../../core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component';
 import { CardCell, IListRowCell } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { ComponentEntityMonitorConfig } from '../../../../../../../../core/src/shared/shared.types';
-import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { APIResource, EntityInfo } from '../../../../../../../../store/src/types/api.types';
+import { cfEntityCatalog } from '../../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
-import {
-  serviceBindingEntityType,
-  serviceInstancesEntityType,
-  userProvidedServiceInstanceEntityType,
-} from '../../../../../../cf-entity-types';
-import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
+import { serviceBindingEntityType } from '../../../../../../cf-entity-types';
 import { ApplicationService } from '../../../../../../features/applications/application.service';
 import { isUserProvidedServiceInstance } from '../../../../../../features/cloud-foundry/cf.helpers';
 import {
@@ -73,7 +67,6 @@ export class AppServiceBindingCardComponent extends CardCell<APIResource<IServic
   constructor(
     private dialog: MatDialog,
     private datePipe: DatePipe,
-    private entityServiceFactory: EntityServiceFactory,
     private appService: ApplicationService,
     private serviceActionHelperService: ServiceActionHelperService,
     private currentUserPermissionsService: CurrentUserPermissionsService,
@@ -126,16 +119,12 @@ export class AppServiceBindingCardComponent extends CardCell<APIResource<IServic
   }
 
   private setupAsServiceInstance() {
-    const serviceInstanceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, serviceInstancesEntityType);
-    const actionBuilder = serviceInstanceEntity.actionOrchestrator.getActionBuilder('get');
-    const getServiceInstanceAction = actionBuilder(this.row.entity.service_instance_guid, this.appService.cfGuid);
-    const serviceInstance$ = this.entityServiceFactory.create<APIResource<IServiceInstance>>(
-      this.row.entity.service_instance_guid,
-      getServiceInstanceAction
+    const serviceInstance$ = cfEntityCatalog.serviceInstance.store.getEntityService(
+      this.row.entity.service_instance_guid, this.appService.cfGuid
     ).waitForEntity$;
     this.serviceInstance$ = serviceInstance$;
     this.service$ = serviceInstance$.pipe(
-      switchMap(o => getCfService(o.entity.entity.service_guid, this.appService.cfGuid, this.entityServiceFactory).waitForEntity$),
+      switchMap(o => getCfService(o.entity.entity.service_guid, this.appService.cfGuid).waitForEntity$),
       filter(service => !!service)
     );
     this.listData = [{
@@ -163,7 +152,6 @@ export class AppServiceBindingCardComponent extends CardCell<APIResource<IServic
               return getServiceBrokerName(
                 service.entity.entity.service_broker_guid,
                 serviceInstance.cfGuid,
-                this.entityServiceFactory
               );
             })
           );
@@ -188,12 +176,8 @@ export class AppServiceBindingCardComponent extends CardCell<APIResource<IServic
   }
 
   private setupAsUserProvidedServiceInstance() {
-    const serviceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, userProvidedServiceInstanceEntityType);
-    const actionBuilder = serviceEntity.actionOrchestrator.getActionBuilder('get');
-    const getUserProvidedServiceAction = actionBuilder(this.row.entity.service_instance_guid, this.appService.cfGuid);
-    const userProvidedServiceInstance$ = this.entityServiceFactory.create<APIResource<IUserProvidedServiceInstance>>(
-      this.row.entity.service_instance_guid,
-      getUserProvidedServiceAction
+    const userProvidedServiceInstance$ = cfEntityCatalog.userProvidedService.store.getEntityService(
+      this.row.entity.service_instance_guid, this.appService.cfGuid
     ).waitForEntity$;
     this.serviceInstance$ = userProvidedServiceInstance$;
     this.service$ = of(null);
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-data-source.ts
index 6b324918a8..c8fc20d7ac 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-data-source.ts
@@ -19,30 +19,23 @@ import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../../../../store/src/entity-catalog/entity-catalog.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
-import { ServiceBindingActionBuilders } from '../../../../../entity-action-builders/service-binding.action-builders';
 
 export class AppServiceBindingDataSource extends ListDataSource<APIResource<IServiceBinding>> {
   static createGetAllServiceBindings(appGuid: string, cfGuid: string) {
     const paginationKey = createEntityRelationPaginationKey(serviceBindingEntityType, appGuid);
-    const serviceBindingEntity = entityCatalog
-      .getEntity<IEntityMetadata, null, ServiceBindingActionBuilders>(CF_ENDPOINT_TYPE, serviceBindingEntityType);
-    const actionBuilder = serviceBindingEntity.actionOrchestrator.getActionBuilder('getAllForApplication');
-    const getAppServiceBindingsAction = actionBuilder(
+    return cfEntityCatalog.serviceBinding.actions.getAllForApplication(
       appGuid, cfGuid, paginationKey, {
-        includeRelations: [
-          createEntityRelationKey(serviceBindingEntityType, applicationEntityType),
-          createEntityRelationKey(serviceBindingEntityType, serviceInstancesEntityType),
-          createEntityRelationKey(serviceInstancesEntityType, servicePlanEntityType),
-          createEntityRelationKey(servicePlanEntityType, serviceEntityType),
-        ],
-        populateMissing: true
-      });
-    return getAppServiceBindingsAction;
+      includeRelations: [
+        createEntityRelationKey(serviceBindingEntityType, applicationEntityType),
+        createEntityRelationKey(serviceBindingEntityType, serviceInstancesEntityType),
+        createEntityRelationKey(serviceInstancesEntityType, servicePlanEntityType),
+        createEntityRelationKey(servicePlanEntityType, serviceEntityType),
+      ],
+      populateMissing: true
+    });
   }
 
   constructor(store: Store<CFAppState>, appService: ApplicationService, listConfig?: IListConfig<APIResource<IServiceBinding>>) {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/cf-app-variables-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/cf-app-variables-data-source.ts
index 43ff0a9f2d..c16c3fc0b4 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/cf-app-variables-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/cf-app-variables-data-source.ts
@@ -4,15 +4,13 @@ import { map } from 'rxjs/operators';
 import {
   createEntityRelationPaginationKey,
 } from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CFAppState } from '../../../../../cf-app-state';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { appEnvVarsEntityType, applicationEntityType } from '../../../../../cf-entity-types';
 import { ApplicationService } from '../../../../../features/applications/application.service';
@@ -31,11 +29,10 @@ export class CfAppVariablesDataSource extends ListDataSource<ListAppEnvVar, APIR
   constructor(
     store: Store<CFAppState>,
     appService: ApplicationService,
-    listConfig: IListConfig<ListAppEnvVar>
+    listConfig: IListConfig<ListAppEnvVar>,
   ) {
-    const appEnvVarsEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appEnvVarsEntityType);
-    const actionBuilder = appEnvVarsEntity.actionOrchestrator.getActionBuilder('get');
-    const getAppEnvVarsAction = actionBuilder(appService.appGuid, appService.cfGuid) as PaginatedAction;
+    const getAppEnvVarsAction = cfEntityCatalog.appEnvVar.actions.getMultiple(appService.appGuid, appService.cfGuid);
+
     super({
       store,
       action: getAppEnvVarsAction,
@@ -61,11 +58,8 @@ export class CfAppVariablesDataSource extends ListDataSource<ListAppEnvVar, APIR
   }
 
   saveAdd() {
-    const appEnvVarsEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appEnvVarsEntityType);
-    const actionBuilder = appEnvVarsEntity.actionOrchestrator.getActionBuilder('addNewToApplication');
-    const appVariablesAddAction = actionBuilder(this.appGuid, this.cfGuid, this.transformedEntities, this.addItem);
+    cfEntityCatalog.appEnvVar.api.addNewToApplication(this.appGuid, this.cfGuid, this.transformedEntities, this.addItem);
 
-    this.store.dispatch(appVariablesAddAction);
     super.saveAdd();
   }
 
@@ -74,11 +68,8 @@ export class CfAppVariablesDataSource extends ListDataSource<ListAppEnvVar, APIR
   }
 
   saveEdit() {
-    const appEnvVarsEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appEnvVarsEntityType);
-    const actionBuilder = appEnvVarsEntity.actionOrchestrator.getActionBuilder('editInApplication');
-    const appVariablesEditAction = actionBuilder(this.appGuid, this.cfGuid, this.transformedEntities, this.editRow);
+    cfEntityCatalog.appEnvVar.api.editInApplication(this.appGuid, this.cfGuid, this.transformedEntities, this.editRow);
 
-    this.store.dispatch(appVariablesEditAction);
     super.saveEdit();
   }
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.ts
index 03a78f107f..72fb9f190a 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.ts
@@ -15,10 +15,11 @@ import {
   IMultiListAction,
   ListViewTypes,
 } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
 import { UpdateExistingApplication } from '../../../../../actions/application.actions';
 import { CFAppState } from '../../../../../cf-app-state';
-import { appEnvVarsEntityType, applicationEntityType } from '../../../../../cf-entity-types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
+import { applicationEntityType } from '../../../../../cf-entity-types';
 import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { ApplicationService } from '../../../../../features/applications/application.service';
 import { CfAppVariablesDataSource, ListAppEnvVar } from './cf-app-variables-data-source';
@@ -89,21 +90,17 @@ export class CfAppVariablesListConfigService implements IListConfig<ListAppEnvVa
   private dispatchDeleteAction(newValues: ListAppEnvVar[]) {
     const confirmation = this.getConfirmationModal(newValues);
 
-    const appEnvVarsEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appEnvVarsEntityType);
-    const actionBuilder = appEnvVarsEntity.actionOrchestrator.getActionBuilder('removeFromApplication');
-    const action = actionBuilder(
-      this.envVarsDataSource.appGuid,
-      this.envVarsDataSource.cfGuid,
-      this.envVarsDataSource.transformedEntities,
-      newValues
-    );
-
     const entityReq$ = this.getEntityMonitor();
     const trigger$ = new Subject();
     this.confirmDialog.open(
       confirmation,
       () => {
-        this.store.dispatch(action);
+        cfEntityCatalog.appEnvVar.api.removeFromApplication(
+          this.envVarsDataSource.appGuid,
+          this.envVarsDataSource.cfGuid,
+          this.envVarsDataSource.transformedEntities,
+          newValues
+        );
         trigger$.next();
       }
     );
@@ -119,8 +116,8 @@ export class CfAppVariablesListConfigService implements IListConfig<ListAppEnvVa
       endpointType: CF_ENDPOINT_TYPE
     });
     return catalogEntity
+      .store
       .getEntityMonitor(
-        this.store,
         this.envVarsDataSource.appGuid
       )
       .entityRequest$.pipe(
@@ -151,7 +148,7 @@ export class CfAppVariablesListConfigService implements IListConfig<ListAppEnvVa
   constructor(
     private store: Store<CFAppState>,
     private appService: ApplicationService,
-    private confirmDialog: ConfirmationDialogService
+    private confirmDialog: ConfirmationDialogService,
   ) {
     this.envVarsDataSource = new CfAppVariablesDataSource(this.store, this.appService, this);
   }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts
index 692f9f8c9b..cc9f26c9d0 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts
@@ -62,7 +62,6 @@ export class CardAppComponent extends CardCell<APIResource<IApp>> implements OnI
 
     const initState = this.appStateService.get(this.row.entity, null);
     this.applicationState$ = ApplicationService.getApplicationState(
-      this.store,
       this.appStateService,
       this.row.entity,
       this.row.metadata.guid,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-apps-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-apps-data-source.ts
index f20011ad2b..284ae8a40f 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-apps-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-apps-data-source.ts
@@ -7,7 +7,6 @@ import { GetAllApplications } from '../../../../../../../cloud-foundry/src/actio
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
   applicationEntityType,
-  appStatsEntityType,
   organizationEntityType,
   routeEntityType,
   spaceEntityType,
@@ -23,12 +22,11 @@ import {
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { CreatePagination } from '../../../../../../../store/src/actions/pagination.actions';
 import { AppState } from '../../../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { MultiActionListEntity } from '../../../../../../../store/src/monitors/pagination-monitor';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginationParam } from '../../../../../../../store/src/types/pagination.types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { cfOrgSpaceFilter, getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 import { CFListDataSource } from '../../../../cf-list-data-source';
 import { createCfOrSpaceMultipleFilterFn } from '../../../../data-services/cf-org-space-service.service';
@@ -44,18 +42,16 @@ export class CfAppsDataSource extends CFListDataSource<APIResource> {
   private subs: Subscription[];
   public action: GetAllApplications;
 
-
   constructor(
     store: Store<AppState>,
     listConfig?: IListConfig<APIResource>,
     transformEntities?: any[],
     paginationKey = CfAppsDataSource.paginationKey,
     seedPaginationKey = CfAppsDataSource.paginationKey,
-    startingCfGuid?: string
+    startingCfGuidFilter?: string
   ) {
     const syncNeeded = paginationKey !== seedPaginationKey;
-    const action = new GetAllApplications(paginationKey, null, CfAppsDataSource.includeRelations);
-    action.endpointGuid = startingCfGuid;
+    const action = cfEntityCatalog.application.actions.getMultiple(undefined, CfAppsDataSource.paginationKey);
 
     const dispatchSequencer = new DispatchSequencer(store);
 
@@ -107,12 +103,9 @@ export class CfAppsDataSource extends CFListDataSource<APIResource> {
           const appGuid = app.metadata.guid;
           const cfGuid = app.entity.cfGuid;
           if (appState === 'STARTED') {
-            const appStatsEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appStatsEntityType);
-            const actionBuilder = appStatsEntity.actionOrchestrator.getActionBuilder('get');
-            const getAction = actionBuilder(appGuid, cfGuid);
             actions.push({
               id: appGuid,
-              action: getAction
+              action: cfEntityCatalog.appStats.actions.getMultiple(appGuid, cfGuid)
             });
           }
         });
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-status/table-cell-app-status.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-status/table-cell-app-status.component.ts
index 4024d1e75a..2342e06ff0 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-status/table-cell-app-status.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-status/table-cell-app-status.component.ts
@@ -45,7 +45,6 @@ export class TableCellAppStatusComponent<T> extends TableCellCustom<T> implement
   ngOnInit() {
     const applicationState = this.appStateService.get(this.row.entity, null);
     this.fetchAppState$ = ApplicationService.getApplicationState(
-      this.store,
       this.appStateService,
       this.row.entity,
       this.row.metadata.guid,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-data-source.ts
index 240c641023..e1b766844a 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-data-source.ts
@@ -1,6 +1,5 @@
 import { Store } from '@ngrx/store';
 
-import { FetchAllBuildpacks } from '../../../../../../../cloud-foundry/src/actions/buildpack.action';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { buildpackEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
 import {
@@ -12,18 +11,14 @@ import {
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
-import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
 
 export class CfBuildpacksDataSource extends ListDataSource<APIResource> {
   constructor(store: Store<CFAppState>, cfGuid: string, listConfig?: IListConfig<APIResource>) {
     const paginationKey = createEntityRelationPaginationKey(endpointSchemaKey, cfGuid);
-    const buildpackEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, buildpackEntityType);
-    const actionBuilder = buildpackEntity.actionOrchestrator.getActionBuilder('getMultiple');
-    const action = actionBuilder(cfGuid, paginationKey) as PaginatedAction;
+    const action = cfEntityCatalog.buildPack.actions.getMultiple(cfGuid, paginationKey)
     super({
       store,
       action,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/cf-events-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/cf-events-data-source.ts
index 42368617ee..d04883addc 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/cf-events-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/cf-events-data-source.ts
@@ -4,14 +4,11 @@ import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../../../../store/src/entity-catalog/entity-catalog.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CFAppState } from '../../../../../cf-app-state';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { cfEventEntityType } from '../../../../../cf-entity-types';
-import { CfEventActionBuilders } from '../../../../../entity-action-builders/cf-event.action-builders';
 import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 import { QParam, QParamJoiners } from '../../../../q-param';
 
@@ -25,18 +22,14 @@ export class CfEventsDataSource extends ListDataSource<APIResource> {
     spaceGuid?: string,
     actee?: string,
   ) {
-    const appEventEntity = entityCatalog.getEntity<IEntityMetadata, any, CfEventActionBuilders>(
-      CF_ENDPOINT_TYPE,
-      cfEventEntityType
-    );
-    const actionBuilder = appEventEntity.actionOrchestrator.getActionBuilder('getMultiple');
     const paginationKey = CfEventsDataSource.createPaginationKey(
       cfGuid,
       orgGuid,
       spaceGuid,
       actee
     );
-    const action = actionBuilder(cfGuid, paginationKey);
+
+    const action = cfEntityCatalog.event.actions.getMultiple(cfGuid, paginationKey)
 
     action.initialParams.q = CfEventsDataSource.createInitialQParams(
       orgGuid,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-data-source.helpers.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-data-source.helpers.ts
deleted file mode 100644
index be5fd42b22..0000000000
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-data-source.helpers.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import {
-  createEntityRelationPaginationKey,
-} from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
-import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
-import { featureFlagEntityType } from '../../../../../cf-entity-types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
-
-export function createCfFeatureFlagFetchAction(cfGuid: string) {
-  const paginationKey = createCFFeatureFlagPaginationKey(cfGuid);
-  const featureFlagEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, featureFlagEntityType);
-  const actionBuilder = featureFlagEntity.actionOrchestrator.getActionBuilder('getMultiple');
-  const action = actionBuilder(cfGuid, paginationKey) as PaginatedAction;
-  action.flattenPagination = true;
-  return action;
-}
-
-export function createCFFeatureFlagPaginationKey(cfGuid: string) {
-  return createEntityRelationPaginationKey(endpointSchemaKey, cfGuid);
-}
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-data-source.ts
index 3981cf1173..105119741b 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-data-source.ts
@@ -8,8 +8,8 @@ import {
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { PaginationEntityState } from '../../../../../../../store/src/types/pagination.types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
-import { createCfFeatureFlagFetchAction } from './cf-feature-flags-data-source.helpers';
 
 export const FeatureFlagDescriptions = {
   user_org_creation: 'Any user can create an organization',
@@ -35,7 +35,7 @@ export class CfFeatureFlagsDataSource extends ListDataSource<IFeatureFlag> {
   static descriptionColumnId = 'description';
 
   constructor(store: Store<CFAppState>, cfGuid: string, listConfig?: IListConfig<IFeatureFlag>) {
-    const action = createCfFeatureFlagFetchAction(cfGuid);
+    const action = cfEntityCatalog.featureFlag.actions.getMultiple(cfGuid);
     super({
       store,
       action,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-list-config.service.ts
index e308c75400..6b5a9d03e3 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-list-config.service.ts
@@ -9,8 +9,10 @@ import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import { CfFeatureFlagsDataSource } from './cf-feature-flags-data-source';
+import {
+  TableCellFeatureFlagDescriptionComponent,
+} from './table-cell-feature-flag-description/table-cell-feature-flag-description.component';
 import { TableCellFeatureFlagStateComponent } from './table-cell-feature-flag-state/table-cell-feature-flag-state.component';
-import { TableCellFeatureFlagDescriptionComponent } from './table-cell-feature-flag-description/table-cell-feature-flag-description.component';
 
 @Injectable()
 export class CfFeatureFlagsListConfigService extends BaseCfListConfig<IFeatureFlag> {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source-base.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source-base.ts
index f862c9380d..2e944f8323 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source-base.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source-base.ts
@@ -14,7 +14,8 @@ import {
   TableRowStateManager,
 } from '../../../../../../../core/src/shared/components/list/list-table/table-row/table-row-state-manager';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { AppState } from '../../../../../../../store/src/app-state';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
 import { PaginationMonitor } from '../../../../../../../store/src/monitors/pagination-monitor';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginatedAction, PaginationParam } from '../../../../../../../store/src/types/pagination.types';
@@ -117,7 +118,7 @@ export abstract class CfRoutesDataSourceBase extends CFListDataSource<APIResourc
    * Create a row state manager that will set the route row state to busy/blocked/deleting etc
    */
   private static createRowState(
-    store,
+    store: Store<AppState>,
     paginationKey,
     genericRouteState: boolean,
     isLocal: boolean): { rowsState: Observable<RowsState>, sub: Subscription } {
@@ -135,7 +136,7 @@ export abstract class CfRoutesDataSourceBase extends CFListDataSource<APIResourc
     }
   }
 
-  private static getRowStateManager(store: Store<CFAppState>, paginationKey: string, isLocal: boolean): {
+  private static getRowStateManager(store: Store<AppState>, paginationKey: string, isLocal: boolean): {
     rowStateManager: TableRowStateManager,
     sub: Subscription
   } {
@@ -151,7 +152,6 @@ export abstract class CfRoutesDataSourceBase extends CFListDataSource<APIResourc
     );
 
     const sub = this.setUpManager(
-      store,
       paginationMonitor,
       rowStateManager
     );
@@ -163,7 +163,6 @@ export abstract class CfRoutesDataSourceBase extends CFListDataSource<APIResourc
 
   // This pattern might be worth pulling out into a more general helper if we use it again.
   private static setUpManager(
-    store: Store<CFAppState>,
     paginationMonitor: PaginationMonitor<APIResource>,
     rowStateManager: TableRowStateManager
   ) {
@@ -174,7 +173,7 @@ export abstract class CfRoutesDataSourceBase extends CFListDataSource<APIResourc
             entityType: routeEntityType,
             endpointType: CF_ENDPOINT_TYPE
           });
-          const entityMonitor = catalogEntity.getEntityMonitor(store, route.metadata.guid);
+          const entityMonitor = catalogEntity.store.getEntityMonitor(route.metadata.guid);
           const request$ = entityMonitor.entityRequest$.pipe(
             tap(request => {
               const unmapping = request.updating.unmapping || { busy: false };
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source.ts
index 27a4ce752b..ab825a63ba 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source.ts
@@ -2,14 +2,12 @@ import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { IRoute } from '../../../../../../../core/src/core/cf-api.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import {
   IListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
-import { routeEntityType } from '../../../../../cf-entity-types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { CfRoutesDataSourceBase } from '../cf-routes/cf-routes-data-source-base';
 
 
@@ -20,11 +18,7 @@ export class CfRoutesDataSource extends CfRoutesDataSourceBase implements IListD
     listConfig: IListConfig<APIResource>,
     cfGuid: string
   ) {
-    const routeEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, routeEntityType);
-    const actionBuilder = routeEntity.actionOrchestrator.getActionBuilder('getMultiple');
-    const createRouteAction = actionBuilder(cfGuid, null);
-    super(store, listConfig, cfGuid, createRouteAction, true);
+    super(store, listConfig, cfGuid, cfEntityCatalog.route.actions.getMultiple(cfGuid, null, {}), true);
   }
-
 }
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-list-config-base.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-list-config-base.ts
index ba099a47b8..b1a7ae262b 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-list-config-base.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-list-config-base.ts
@@ -4,7 +4,6 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { routeEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
 import { ConfirmationDialogConfig } from '../../../../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../../../core/src/shared/components/confirmation-dialog.service';
 import { ITableColumn, ITableText } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
@@ -16,9 +15,8 @@ import {
   IMultiListAction,
   ListViewTypes,
 } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import {
   TableCellRouteAppsAttachedComponent,
 } from '../cf-routes/table-cell-route-apps-attached/table-cell-route-apps-attached.component';
@@ -88,8 +86,6 @@ export abstract class CfRoutesListConfigBase implements IListConfig<APIResource>
   };
   enableTextFilter = true;
 
-  private routeCatalogEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, routeEntityType);
-
   private multiListActionDelete: IMultiListAction<APIResource> = {
     action: (items: APIResource[]) => {
       if (items.length === 1) {
@@ -136,7 +132,7 @@ export abstract class CfRoutesListConfigBase implements IListConfig<APIResource>
   private dispatchDeleteAction(route: APIResource<ListCfRoute>) {
     const appGuids = (route.entity.apps || []).map(app => app.metadata.guid);
     const singleApp = appGuids.length === 1;
-    this.routeCatalogEntity.actionDispatchManager.dispatchDelete(
+    cfEntityCatalog.route.api.delete(
       route.metadata.guid,
       this.cfGuid,
       // FIXME: The appGuid/appGuids params need merging
@@ -147,7 +143,7 @@ export abstract class CfRoutesListConfigBase implements IListConfig<APIResource>
 
   private dispatchUnmapAction(routeGuid: string, appGuids: string[]) {
     appGuids.forEach(appGuid => {
-      this.routeCatalogEntity.actionDispatchManager.dispatchAction('unmap',
+      cfEntityCatalog.route.api.unmap(
         routeGuid,
         appGuid,
         this.cfGuid,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-data-source.ts
index 670afdb18c..b728e72aee 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-data-source.ts
@@ -1,6 +1,5 @@
 import { Store } from '@ngrx/store';
 
-import { GetAllSecurityGroups } from '../../../../../../../cloud-foundry/src/actions/security-groups-actions';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { securityGroupEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
 import {
@@ -12,17 +11,14 @@ import {
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 
 export class CfSecurityGroupsDataSource extends ListDataSource<APIResource> {
   constructor(store: Store<CFAppState>, cfGuid: string, listConfig?: IListConfig<APIResource>) {
     const paginationKey = createEntityRelationPaginationKey(endpointSchemaKey, cfGuid);
-    const sgEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, securityGroupEntityType);
-    const actionBuilder = sgEntity.actionOrchestrator.getActionBuilder('getMultiple');
-    const action = actionBuilder(cfGuid, paginationKey);
+    const action = cfEntityCatalog.securityGroup.actions.getMultiple(cfGuid, paginationKey, {})
     super({
       store,
       action,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-select-users/cf-select-users-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-select-users/cf-select-users-list-config.service.ts
index 46a8c9d81c..a60d8d0c6c 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-select-users/cf-select-users-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-select-users/cf-select-users-list-config.service.ts
@@ -59,7 +59,7 @@ export class CfSelectUsersListConfigService implements IListConfig<APIResource<C
   constructor(
     private store: Store<CFAppState>,
     private cfGuid: string,
-    private cfUserService: CfUserService,
+    cfUserService: CfUserService,
     private activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
     private paginationMonitorFactory: PaginationMonitorFactory,
     private entityMonitorFactory: EntityMonitorFactory
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.ts
index eb28c1b577..433d2c8ba8 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.ts
@@ -4,11 +4,11 @@ import { Observable } from 'rxjs';
 
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
 import { IService, IServiceExtra } from '../../../../../../../../core/src/core/cf-api-svc.types';
-import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
 import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { CfOrgSpaceLabelService } from '../../../../../../../../core/src/shared/services/cf-org-space-label.service';
 import { RouterNav } from '../../../../../../../../store/src/actions/router.actions';
+import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { getServiceBrokerName, getServiceName } from '../../../../../../features/service-catalog/services-helper';
 
@@ -50,7 +50,6 @@ export class CfServiceCardComponent extends CardCell<APIResource<IService>> {
         this.serviceBrokerName$ = getServiceBrokerName(
           this.serviceEntity.entity.service_broker_guid,
           this.serviceEntity.entity.cfGuid,
-          this.entityServiceFactory
         );
       }
     }
@@ -58,7 +57,6 @@ export class CfServiceCardComponent extends CardCell<APIResource<IService>> {
 
   constructor(
     private store: Store<CFAppState>,
-    private entityServiceFactory: EntityServiceFactory
   ) {
     super();
   }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-data-source.ts
index 651f3bd158..982e384e25 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-data-source.ts
@@ -1,27 +1,26 @@
 import { Store } from '@ngrx/store';
 
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { serviceEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
 import {
   createEntityRelationPaginationKey,
 } from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
 import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginationEntityState } from '../../../../../../../store/src/types/pagination.types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
+import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 
 export class CfServicesDataSource extends ListDataSource<APIResource> {
   constructor(store: Store<CFAppState>, endpointGuid: string, listConfig?: IListConfig<APIResource>) {
     const paginationKey = createEntityRelationPaginationKey(endpointSchemaKey);
-    const serviceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, serviceEntityType);
-    const actionBuilder = serviceEntity.actionOrchestrator.getActionBuilder('getMultiple');
-    const getServicesAction = actionBuilder(endpointGuid, paginationKey);
+    const getServicesAction = cfEntityCatalog.service.actions.getMultiple(endpointGuid, paginationKey, {})
     super({
       store,
       action: getServicesAction,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-data-source.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-data-source.service.ts
index f7721a1783..9fc55fb4b5 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-data-source.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-data-source.service.ts
@@ -5,14 +5,12 @@ import { applicationEntityType, spaceEntityType } from '../../../../../../../clo
 import {
   createEntityRelationPaginationKey,
 } from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service';
@@ -20,9 +18,14 @@ import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/
 export class CfSpaceAppsDataSource extends ListDataSource<APIResource> {
   constructor(store: Store<CFAppState>, cfSpaceService: CloudFoundrySpaceService, listConfig?: IListConfig<APIResource>) {
     const paginationKey = createEntityRelationPaginationKey(spaceEntityType, cfSpaceService.spaceGuid) + '-tab';
-    const appEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, applicationEntityType);
-    const actionBuilder = appEntity.actionOrchestrator.getActionBuilder('getAllInSpace');
-    const action = actionBuilder(cfSpaceService.spaceGuid, cfSpaceService.cfGuid, paginationKey, [], false, false) as PaginatedAction;
+    const action = cfEntityCatalog.application.actions.getAllInSpace(
+      cfSpaceService.spaceGuid,
+      cfSpaceService.cfGuid,
+      paginationKey,
+      [],
+      false,
+      false
+    )
     super({
       store,
       action,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-data-source.ts
index e29bca0710..ecdcaa8cd5 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-data-source.ts
@@ -1,6 +1,5 @@
 import { Store } from '@ngrx/store';
 
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
   applicationEntityType,
@@ -13,13 +12,12 @@ import {
   createEntityRelationPaginationKey,
 } from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { IRoute } from '../../../../../../../core/src/core/cf-api.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import {
   IListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { CfRoutesDataSourceBase } from '../cf-routes/cf-routes-data-source-base';
 
 
@@ -32,13 +30,12 @@ export class CfSpaceRoutesDataSource extends CfRoutesDataSourceBase implements I
     cfGuid: string
   ) {
     const paginationKey = createEntityRelationPaginationKey(spaceEntityType, spaceGuid);
-    const routeEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, routeEntityType);
-    const actionBuilder = routeEntity.actionOrchestrator.getActionBuilder('getAllInSpace');
-    const action = actionBuilder(spaceGuid, cfGuid, paginationKey, [
+    const action = cfEntityCatalog.route.actions.getAllInSpace(
+      spaceGuid, cfGuid, paginationKey, [
       createEntityRelationKey(routeEntityType, applicationEntityType),
       createEntityRelationKey(routeEntityType, domainEntityType),
-    ], true, false) as PaginatedAction;
-
+    ], true, false
+    )
     action.initialParams['order-direction-field'] = 'creation';
     super(store, listConfig, cfGuid, action, false);
   }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-data-source.ts
index 0635f65e7a..f0d9413db2 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-data-source.ts
@@ -18,21 +18,15 @@ import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../../../../store/src/entity-catalog/entity-catalog.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
-import { ServiceInstanceActionBuilders } from '../../../../../entity-action-builders/service-instance.action.builders';
 import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 
 export class CfSpacesServiceInstancesDataSource extends ListDataSource<APIResource> {
   constructor(cfGuid: string, spaceGuid: string, store: Store<CFAppState>, listConfig?: IListConfig<APIResource>) {
     const paginationKey = createEntityRelationPaginationKey(spaceEntityType, spaceGuid);
-    const serviceInstanceEntity =
-      entityCatalog.getEntity<IEntityMetadata, null, ServiceInstanceActionBuilders>(CF_ENDPOINT_TYPE, serviceInstancesEntityType);
-    const actionBuilder = serviceInstanceEntity.actionOrchestrator.getActionBuilder('getAllInSpace');
-    const action = actionBuilder(spaceGuid, cfGuid, paginationKey, null, {
+    const action = cfEntityCatalog.serviceInstance.actions.getAllInSpace(spaceGuid, cfGuid, paginationKey, null, {
       includeRelations: [
         createEntityRelationKey(serviceInstancesEntityType, serviceBindingEntityType),
         createEntityRelationKey(serviceInstancesEntityType, servicePlanEntityType),
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-user-service-instances-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-user-service-instances-data-source.ts
index b444fefc85..e3d9e31448 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-user-service-instances-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-user-service-instances-data-source.ts
@@ -1,6 +1,5 @@
 import { Store } from '@ngrx/store';
 
-import { GetAllUserProvidedServices } from '../../../../../../../cloud-foundry/src/actions/user-provided-service.actions';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
   applicationEntityType,
@@ -22,21 +21,15 @@ import {
   IListConfig,
 } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
-import { UserProvidedServiceActionBuilder } from '../../../../../entity-action-builders/user-provided-service.action-builders';
 
 export class CfSpacesUserServiceInstancesDataSource extends ListDataSource<APIResource> {
   constructor(cfGuid: string, spaceGuid: string, store: Store<CFAppState>, listConfig?: IListConfig<APIResource>) {
     const paginationKey = createEntityRelationPaginationKey(spaceEntityType, spaceGuid);
-    const userProvidedServiceEntity = entityCatalog.getEntity<any, any, UserProvidedServiceActionBuilder>(
-      CF_ENDPOINT_TYPE,
-      userProvidedServiceInstanceEntityType
-    );
-    const actionBuilder = userProvidedServiceEntity.actionOrchestrator.getActionBuilder('getAllInSpace');
-    const action = actionBuilder(cfGuid, spaceGuid, paginationKey,
+    const action = cfEntityCatalog.userProvidedService.actions.getAllInSpace(
+      cfGuid, spaceGuid, paginationKey,
       [
         createEntityRelationKey(userProvidedServiceInstanceEntityType, spaceWithOrgEntityType),
         createEntityRelationKey(spaceEntityType, organizationEntityType),
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-instance-apps-attached/table-cell-service-instance-apps-attached.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-instance-apps-attached/table-cell-service-instance-apps-attached.component.ts
index 5270763504..7c55300b2b 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-instance-apps-attached/table-cell-service-instance-apps-attached.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-instance-apps-attached/table-cell-service-instance-apps-attached.component.ts
@@ -5,7 +5,6 @@ import { filter, first, map, switchMap } from 'rxjs/operators';
 import { IServiceInstance } from '../../../../../../../../core/src/core/cf-api-svc.types';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
-import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import {
   applicationEntityType,
@@ -26,12 +25,6 @@ export class TableCellServiceInstanceAppsAttachedComponent extends TableCellCust
   config$ = new BehaviorSubject(null);
   row$ = new BehaviorSubject<APIResource<IServiceInstance>>(null);
 
-  constructor(
-    private entityServiceFactory: EntityServiceFactory,
-  ) {
-    super();
-  }
-
   @Input('config')
   set config(config: any) {
     this.config$.next(config);
@@ -57,7 +50,6 @@ export class TableCellServiceInstanceAppsAttachedComponent extends TableCellCust
           getCfServiceInstance(
             row.metadata.guid,
             row.entity.cfGuid,
-            this.entityServiceFactory,
             [
               createEntityRelationKey(serviceInstancesEntityType, serviceBindingEntityType),
               createEntityRelationKey(serviceBindingEntityType, applicationEntityType)
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-spaces-data-source.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-spaces-data-source.service.ts
index 21e1121ab9..002d1d784a 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-spaces-data-source.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-spaces-data-source.service.ts
@@ -15,20 +15,18 @@ import {
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
-import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
 
 export class CfSpacesDataSourceService extends ListDataSource<APIResource> {
   constructor(cfGuid: string, orgGuid: string, store: Store<CFAppState>, listConfig?: IListConfig<APIResource>) {
     const paginationKey = createEntityRelationPaginationKey(organizationEntityType, orgGuid);
-    const spaceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, spaceEntityType);
-    const getAllSpaceActionBuilder = spaceEntity.actionOrchestrator.getActionBuilder('getAllInOrganization');
-    const action = getAllSpaceActionBuilder(orgGuid, cfGuid, paginationKey, [
-      createEntityRelationKey(spaceEntityType, spaceQuotaEntityType),
-    ]) as PaginatedAction;
+    const action = cfEntityCatalog.space.actions.getAllInOrganization(orgGuid, cfGuid, paginationKey, {
+      includeRelations: [
+        createEntityRelationKey(spaceEntityType, spaceQuotaEntityType),
+      ]
+    });
     super({
       store,
       action,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-data-source.ts
index 1a0c89eab6..b1a250c1e1 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-data-source.ts
@@ -1,24 +1,19 @@
 import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../../../../store/src/entity-catalog/entity-catalog.types';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { stackEntityType } from '../../../../../cf-entity-types';
-import { StackActionBuilders } from '../../../../../entity-action-builders/stack-action-builders';
 import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 
 export class CfStacksDataSource extends ListDataSource<APIResource> {
   constructor(store: Store<CFAppState>, cfGuid: string, listConfig?: IListConfig<APIResource>) {
-    const stackEntity = entityCatalog.getEntity<IEntityMetadata, any, StackActionBuilders>(CF_ENDPOINT_TYPE, stackEntityType);
-    const getAllStacksActionBuilder = stackEntity.actionOrchestrator.getActionBuilder('getMultiple');
-    const action = getAllStacksActionBuilder(null, cfGuid);
+    const action = cfEntityCatalog.stack.actions.getMultiple(null, cfGuid);
     super({
       store,
       action,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-org-permission-cell/cf-org-permission-cell.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-org-permission-cell/cf-org-permission-cell.component.ts
index 39545b54a2..78d28cda50 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-org-permission-cell/cf-org-permission-cell.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-org-permission-cell/cf-org-permission-cell.component.ts
@@ -17,7 +17,7 @@ import { CurrentUserPermissionsService } from '../../../../../../../../core/src/
 import { arrayHelper } from '../../../../../../../../core/src/core/helper-classes/array.helper';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
-import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
 import { getOrgRoles } from '../../../../../../features/cloud-foundry/cf.helpers';
@@ -36,7 +36,7 @@ export class CfOrgPermissionCellComponent extends CfPermissionCell<OrgUserRoleNa
     public store: Store<CFAppState>,
     cfUserService: CfUserService,
     private userPerms: CurrentUserPermissionsService,
-    confirmDialog: ConfirmationDialogService
+    confirmDialog: ConfirmationDialogService,
   ) {
     super(store, confirmDialog, cfUserService);
     this.chipsConfig$ = combineLatest(
@@ -74,8 +74,7 @@ export class CfOrgPermissionCellComponent extends CfPermissionCell<OrgUserRoleNa
         guid: orgPerms.orgGuid,
         username: row.entity.username,
         userGuid: row.metadata.guid,
-        busy: catalogEntity.getEntityMonitor(
-          this.store,
+        busy: catalogEntity.store.getEntityMonitor(
           orgPerms.orgGuid
         )
           .getUpdatingSection(updatingKey).pipe(
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component.ts
index 8da4cdbc59..18d770398b 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component.ts
@@ -17,7 +17,7 @@ import { CurrentUserPermissions } from '../../../../../../../../core/src/core/cu
 import { CurrentUserPermissionsService } from '../../../../../../../../core/src/core/current-user-permissions.service';
 import { arrayHelper } from '../../../../../../../../core/src/core/helper-classes/array.helper';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
-import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
 import { getSpaceRoles } from '../../../../../../features/cloud-foundry/cf.helpers';
@@ -38,7 +38,7 @@ export class CfSpacePermissionCellComponent extends CfPermissionCell<SpaceUserRo
     public store: Store<CFAppState>,
     cfUserService: CfUserService,
     private userPerms: CurrentUserPermissionsService,
-    confirmDialog: ConfirmationDialogService
+    confirmDialog: ConfirmationDialogService,
   ) {
     super(store, confirmDialog, cfUserService);
 
@@ -130,8 +130,7 @@ export class CfSpacePermissionCellComponent extends CfPermissionCell<SpaceUserRo
         guid: spacePerms.spaceGuid,
         username: row.entity.username,
         userGuid: row.metadata.guid,
-        busy: catalogEntity.getEntityMonitor(
-          this.store,
+        busy: catalogEntity.store.getEntityMonitor(
           spacePerms.spaceGuid
         )
           .getUpdatingSection(updatingKey).pipe(
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.ts
index 4eab25e436..477cbe322e 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.ts
@@ -19,7 +19,7 @@ import {
   ListViewTypes,
 } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { SetClientFilter } from '../../../../../../../store/src/actions/pagination.actions';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
 import { selectPaginationState } from '../../../../../../../store/src/selectors/pagination.selectors';
 import { APIResource, EntityInfo } from '../../../../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-data-source.ts
index 6006fc1d0a..de42b7a578 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-data-source.ts
@@ -1,27 +1,34 @@
 import { Store } from '@ngrx/store';
 
 import {
+  createEntityRelationKey,
   createEntityRelationPaginationKey,
 } from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CFAppState } from '../../../../../cf-app-state';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
-import { serviceBindingEntityType, serviceBindingNoBindingsEntityType } from '../../../../../cf-entity-types';
+import {
+  applicationEntityType,
+  serviceBindingEntityType,
+  serviceBindingNoBindingsEntityType,
+} from '../../../../../cf-entity-types';
 import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 
 export class DetachAppsDataSource extends ListDataSource<APIResource> {
   constructor(cfGuid: string, serviceInstanceGuid: string, store: Store<CFAppState>, listConfig?: IListConfig<APIResource>) {
     const paginationKey = createEntityRelationPaginationKey(serviceBindingEntityType, serviceInstanceGuid);
-    const serviceBindingEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, serviceBindingEntityType);
-    const actionBuilder = serviceBindingEntity.actionOrchestrator.getActionBuilder('getAllForServiceInstance');
-    const getAppServiceBindingsAction = actionBuilder(serviceInstanceGuid, cfGuid, paginationKey) as PaginatedAction;
+    const getAppServiceBindingsAction = cfEntityCatalog.serviceBinding.actions.getAllForServiceInstance(
+      serviceInstanceGuid, cfGuid, paginationKey, {
+      includeRelations: [
+        createEntityRelationKey(serviceBindingEntityType, applicationEntityType)
+      ]
+    }
+    );
     super({
       store,
       action: getAppServiceBindingsAction,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts
index a3cc6ae5f2..7453abfe53 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts
@@ -26,7 +26,7 @@ export class DetachAppsListConfigService implements IListConfig<APIResource> {
     columnId: 'appName',
     headerCell: () => 'App Name',
     cellDefinition: {
-      getValue: (row: APIResource) => `${row.entity.app.entity.name}`
+      valuePath: 'entity.app.entity.name'
     },
     sort: {
       type: 'sort',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-data-source.ts
index 09bb9e0867..d03fc43149 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-data-source.ts
@@ -12,19 +12,16 @@ import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginationEntityState } from '../../../../../../../store/src/types/pagination.types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 
 export class ServiceInstancesDataSource extends ListDataSource<APIResource> {
   constructor(cfGuid: string, serviceGuid: string, store: Store<CFAppState>, listConfig?: IListConfig<APIResource>) {
     const paginationKey = createEntityRelationPaginationKey(serviceInstancesEntityType, cfGuid);
-    const serviceInstanceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, serviceInstancesEntityType);
-    const actionBuilder = serviceInstanceEntity.actionOrchestrator.getActionBuilder('getMultiple');
-    const action = actionBuilder(cfGuid, paginationKey);
+    const action = cfEntityCatalog.serviceInstance.actions.getMultiple(cfGuid, paginationKey);
 
     super({
       store,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/service-plans-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/service-plans-data-source.ts
index 2020eb9613..ab3aed7715 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/service-plans-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/service-plans-data-source.ts
@@ -15,14 +15,13 @@ import {
   populateServicePlanExtraTyped,
 } from '../../../../../../../cloud-foundry/src/features/service-catalog/services-helper';
 import { IServicePlan } from '../../../../../../../core/src/core/cf-api-svc.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 
 export class ServicePlansDataSource extends ListDataSource<APIResource<IServicePlan>> {
@@ -34,9 +33,7 @@ export class ServicePlansDataSource extends ListDataSource<APIResource<IServiceP
   ) {
 
     const paginationKey = createEntityRelationPaginationKey(serviceInstancesEntityType, serviceGuid);
-    const servicePlanEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, servicePlanEntityType);
-    const actionBuilder = servicePlanEntity.actionOrchestrator.getActionBuilder('getAllForServiceInstance');
-    const action = actionBuilder(serviceGuid, cfGuid, paginationKey, [
+    const action = cfEntityCatalog.servicePlan.actions.getAllForServiceInstance(serviceGuid, cfGuid, paginationKey, [
       createEntityRelationKey(servicePlanEntityType, serviceEntityType),
     ]) as PaginatedAction;
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts
index 9364faf37a..1ade4946cc 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts
@@ -14,7 +14,6 @@ import {
 import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { CfOrgSpaceLabelService } from '../../../../../../../../core/src/shared/services/cf-org-space-label.service';
 import { ComponentEntityMonitorConfig } from '../../../../../../../../core/src/shared/shared.types';
-import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import {
@@ -86,7 +85,6 @@ export class ServiceInstanceCardComponent extends CardCell<APIResource<IServiceI
         this.serviceBrokerName$ = getServiceBrokerName(
           this.serviceInstanceEntity.entity.service_plan.entity.service.entity.service_broker_guid,
           this.serviceInstanceEntity.entity.cfGuid,
-          this.entityServiceFactory
         );
       }
     }
@@ -96,7 +94,6 @@ export class ServiceInstanceCardComponent extends CardCell<APIResource<IServiceI
     private store: Store<CFAppState>,
     private serviceActionHelperService: ServiceActionHelperService,
     private currentUserPermissionsService: CurrentUserPermissionsService,
-    private entityServiceFactory: EntityServiceFactory
   ) {
     super();
   }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-data-source.ts
index 57ffd72bc7..eb98c422bf 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-data-source.ts
@@ -1,6 +1,5 @@
 import { Store } from '@ngrx/store';
 
-import { GetAllUserProvidedServices } from '../../../../../../../cloud-foundry/src/actions/user-provided-service.actions';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { serviceInstancesEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
 import {
@@ -14,12 +13,9 @@ import {
   ListPaginationMultiFilterChange,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../../../../store/src/entity-catalog/entity-catalog.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginatedAction, PaginationParam } from '../../../../../../../store/src/types/pagination.types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
-import { ServiceInstanceActionBuilders } from '../../../../../entity-action-builders/service-instance.action.builders';
+import { cfEntityCatalog } from '../../../../../cf-entity-catalog';
 import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 import { CFListDataSource } from '../../../../cf-list-data-source';
 import { createCfOrSpaceMultipleFilterFn } from '../../../../data-services/cf-org-space-service.service';
@@ -27,11 +23,8 @@ import { createCfOrSpaceMultipleFilterFn } from '../../../../data-services/cf-or
 export class ServiceInstancesWallDataSource extends CFListDataSource<APIResource> {
   constructor(store: Store<CFAppState>, transformEntities: any[], listConfig?: IListConfig<APIResource>) {
     const paginationKey = createEntityRelationPaginationKey(serviceInstancesEntityType);
-    const serviceInstanceEntity = entityCatalog
-      .getEntity<IEntityMetadata, any, ServiceInstanceActionBuilders>(CF_ENDPOINT_TYPE, serviceInstancesEntityType);
-    const actionBuilder = serviceInstanceEntity.actionOrchestrator.getActionBuilder('getMultiple');
-    const marketplaceAction = actionBuilder(null, paginationKey);
-    const userProvidedAction = new GetAllUserProvidedServices();
+    const marketplaceAction = cfEntityCatalog.serviceInstance.actions.getMultiple(null, paginationKey);
+    const userProvidedAction = cfEntityCatalog.userProvidedService.actions.getMultiple();
     const actionSchemaConfigs = [
       new ActionSchemaConfig(
         marketplaceAction
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/running-instances/running-instances.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/running-instances/running-instances.component.ts
index 1d663a7458..29614fb734 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/running-instances/running-instances.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/running-instances/running-instances.component.ts
@@ -2,9 +2,7 @@ import { Component, Input, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { GetAppStatsAction } from '../../../../../cloud-foundry/src/actions/app-metadata.actions';
-import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
-import { AppStat } from '../../../store/types/app-metadata.types';
+import { cfEntityCatalog } from '../../../cf-entity-catalog';
 
 @Component({
   selector: 'app-running-instances',
@@ -19,16 +17,8 @@ export class RunningInstancesComponent implements OnInit {
   // Observable on the running instances count for the application
   public runningInstances$: Observable<number>;
 
-  constructor(private paginationMonitorFactory: PaginationMonitorFactory) { }
-
   ngOnInit() {
-    const dummyAction = new GetAppStatsAction(this.appGuid, this.cfGuid);
-    const paginationMonitor = this.paginationMonitorFactory.create<AppStat>(
-      dummyAction.paginationKey,
-      dummyAction,
-      dummyAction.flattenPagination
-    );
-    this.runningInstances$ = paginationMonitor.currentPage$.pipe(
+    this.runningInstances$ = cfEntityCatalog.appStats.store.getPaginationMonitor(this.appGuid, this.cfGuid).currentPage$.pipe(
       map(appInstancesPages => {
         const allInstances = [].concat.apply([], Object.values(appInstancesPages || [])).filter(instance => !!instance);
         return allInstances.filter(stat => stat.state === 'RUNNING').length;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.ts
index d50491f5fb..a278c89b7d 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.ts
@@ -9,7 +9,6 @@ import {
 } from '../../../../../cloud-foundry/src/features/service-catalog/services-helper';
 import { ServicesService } from '../../../../../cloud-foundry/src/features/service-catalog/services.service';
 import { IServiceBroker, IServicePlan } from '../../../../../core/src/core/cf-api-svc.types';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { StratosStatus } from '../../../../../core/src/shared/shared.types';
 import { APIResource } from '../../../../../store/src/types/api.types';
 
@@ -51,13 +50,12 @@ export class ServicePlanPublicComponent {
 
   constructor(
     private servicesService: ServicesService,
-    private entityServiceFactory: EntityServiceFactory
   ) {
   }
 
   private getServiceBroker(serviceGuid: string, cfGuid: string): Observable<APIResource<IServiceBroker>> {
-    return getCfService(serviceGuid, cfGuid, this.entityServiceFactory).waitForEntity$.pipe(
-      map(service => getServiceBroker(service.entity.entity.service_broker_guid, cfGuid, this.entityServiceFactory)),
+    return getCfService(serviceGuid, cfGuid).waitForEntity$.pipe(
+      map(service => getServiceBroker(service.entity.entity.service_broker_guid, cfGuid)),
       switchMap(serviceService => serviceService.waitForEntity$),
       map(entity => entity.entity)
     );
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-org-space-service.service.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-org-space-service.service.ts
index b24ccb35a1..8d38830e06 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-org-space-service.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-org-space-service.service.ts
@@ -26,18 +26,15 @@ import {
   valueOrCommonFalsy,
 } from '../../../../core/src/shared/components/list/data-sources-controllers/list-pagination-controller';
 import { ResetPagination, SetParams } from '../../../../store/src/actions/pagination.actions';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
-import {
-  getCurrentPageRequestInfo,
-  getPaginationObservables,
-} from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+import { getCurrentPageRequestInfo } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
 import { selectPaginationState } from '../../../../store/src/selectors/pagination.selectors';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 import { PaginatedAction, PaginationParam } from '../../../../store/src/types/pagination.types';
+import { cfEntityCatalog } from '../../cf-entity-catalog';
 import { cfEntityFactory } from '../../cf-entity-factory';
-import { CF_ENDPOINT_TYPE } from '../../cf-types';
 import { QParam, QParamJoiners } from '../q-param';
 
 export function spreadPaginationParams(params: PaginationParam): PaginationParam {
@@ -304,15 +301,12 @@ export class CfOrgSpaceDataService implements OnDestroy {
   }
 
   private createPaginationAction() {
-    const organizationEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, organizationEntityType);
-    const actionBuilder = organizationEntity.actionOrchestrator.getActionBuilder('getMultiple');
-    const getAllOrganizationsAction = actionBuilder(null, CfOrgSpaceDataService.CfOrgSpaceServicePaginationKey, {
+    return cfEntityCatalog.org.actions.getMultiple(null, CfOrgSpaceDataService.CfOrgSpaceServicePaginationKey, {
       includeRelations: [
         createEntityRelationKey(organizationEntityType, spaceEntityType),
       ],
       populateMissing: true
     });
-    return getAllOrganizationsAction;
   }
 
   public getEndpointOrgs(endpointGuid: string) {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-user.service.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-user.service.ts
index 706d2dfa56..2eb596e4cc 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-user.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-user.service.ts
@@ -20,23 +20,20 @@ import { IOrganization, ISpace } from '../../../../core/src/core/cf-api.types';
 import {
   LocalPaginationHelpers,
 } from '../../../../core/src/shared/components/list/data-sources-controllers/local-list.helpers';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../store/src/entity-catalog/entity-catalog.types';
-import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
+import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import {
   getDefaultPaginationEntityState,
 } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer-reset-pagination';
+import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import {
   getCurrentPageRequestInfo,
-  getPaginationObservables,
   PaginationObservables,
-} from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+} from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../store/src/types/pagination.types';
+import { cfEntityCatalog } from '../../cf-entity-catalog';
 import { cfEntityFactory } from '../../cf-entity-factory';
-import { CF_ENDPOINT_TYPE } from '../../cf-types';
-import { UserActionBuilders } from '../../entity-action-builders/user.action-builders';
 import { ActiveRouteCfOrgSpace } from '../../features/cloud-foundry/cf-page.types';
 import {
   fetchTotalResults,
@@ -56,15 +53,12 @@ import { selectCfPaginationState } from '../../store/selectors/pagination.select
 export class CfUserService {
   private allUsers$: Observable<PaginationObservables<APIResource<CfUser>>>;
 
-  private userCatalogEntity = entityCatalog.getEntity<IEntityMetadata, any, UserActionBuilders>(CF_ENDPOINT_TYPE, cfUserEntityType);
-
   users: { [guid: string]: Observable<APIResource<CfUser>> } = {};
 
   constructor(
     private store: Store<CFAppState>,
     public paginationMonitorFactory: PaginationMonitorFactory,
     public activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
-    private entityServiceFactory: EntityServiceFactory,
   ) { }
 
   getUsers = (endpointGuid: string, filterEmpty = true): Observable<APIResource<CfUser>[]> =>
@@ -114,15 +108,11 @@ export class CfUserService {
           return observableOf(users.filter(o => o.metadata.guid === userGuid)[0]);
         }
         if (!this.users[userGuid]) {
-          const actionBuilder = this.userCatalogEntity.actionOrchestrator.getActionBuilder('get');
-          const getUserAction = actionBuilder(userGuid, endpointGuid);
-          this.users[userGuid] = this.entityServiceFactory.create<APIResource<CfUser>>(
-            userGuid,
-            getUserAction
-          ).waitForEntity$.pipe(
-            filter(entity => !!entity),
-            map(entity => entity.entity)
-          );
+          this.users[userGuid] = cfEntityCatalog.user.store.getEntityService(userGuid, endpointGuid)
+            .waitForEntity$.pipe(
+              filter(entity => !!entity),
+              map(entity => entity.entity)
+            );
         }
         return this.users[userGuid];
       }),
@@ -458,11 +448,11 @@ export class CfUserService {
   }
 
   private createCfGetAllUsersAction = (cfGuid: string): PaginatedAction => {
-    return this.userCatalogEntity.actionOrchestrator.getActionBuilder('getMultiple')(cfGuid, null);
+    return cfEntityCatalog.user.actions.getMultiple(cfGuid, null);
   }
 
   private createOrgGetUsersAction = (isAdmin: boolean, cfGuid: string, orgGuid: string): PaginatedAction => {
-    return this.userCatalogEntity.actionOrchestrator.getActionBuilder('getAllInOrganization')(
+    return cfEntityCatalog.user.actions.getAllInOrganization(
       orgGuid,
       cfGuid,
       createEntityRelationPaginationKey(organizationEntityType, orgGuid),
@@ -471,7 +461,7 @@ export class CfUserService {
   }
 
   private createSpaceGetUsersAction = (isAdmin: boolean, cfGuid: string, spaceGuid: string, ): PaginatedAction => {
-    return this.userCatalogEntity.actionOrchestrator.getActionBuilder('getAllInSpace')(
+    return cfEntityCatalog.user.actions.getAllInSpace(
       spaceGuid,
       cfGuid,
       createEntityRelationPaginationKey(spaceEntityType, spaceGuid),
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/service-action-helper.service.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/service-action-helper.service.ts
index 349c1928cb..6fb379d819 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/service-action-helper.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/service-action-helper.service.ts
@@ -3,29 +3,19 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, first, map, pairwise } from 'rxjs/operators';
 
-import { CF_ENDPOINT_TYPE } from '../../cf-types';
-import {
-  DeleteUserProvidedInstance,
-  UpdateUserProvidedServiceInstance,
-} from '../../../../cloud-foundry/src/actions/user-provided-service.actions';
+import { UpdateUserProvidedServiceInstance } from '../../../../cloud-foundry/src/actions/user-provided-service.actions';
 import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
-import {
-  serviceBindingEntityType,
-  serviceInstancesEntityType,
-  userProvidedServiceInstanceEntityType,
-} from '../../../../cloud-foundry/src/cf-entity-types';
+import { serviceInstancesEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
 import { IServiceBinding, IServiceInstance, IUserProvidedServiceInstance } from '../../../../core/src/core/cf-api-svc.types';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata, EntityCatalogEntityConfig } from '../../../../store/src/entity-catalog/entity-catalog.types';
-import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
 import { ConfirmationDialogConfig } from '../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../core/src/shared/components/confirmation-dialog.service';
 import { RouterNav, RouterQueryParams } from '../../../../store/src/actions/router.actions';
+import { EntityCatalogEntityConfig } from '../../../../store/src/entity-catalog/entity-catalog.types';
 import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource, EntityInfo } from '../../../../store/src/types/api.types';
 import { UpdateServiceInstance } from '../../actions/service-instances.actions';
-import { ServiceBindingActionBuilders } from '../../entity-action-builders/service-binding.action-builders';
-import { ServiceInstanceActionBuilders } from '../../entity-action-builders/service-instance.action.builders';
+import { cfEntityCatalog } from '../../cf-entity-catalog';
+import { CF_ENDPOINT_TYPE } from '../../cf-types';
 import {
   SERVICE_INSTANCE_TYPES,
 } from '../components/add-service-instance/add-service-instance-base-step/add-service-instance.types';
@@ -34,20 +24,9 @@ import {
 @Injectable()
 export class ServiceActionHelperService {
 
-  private sgEntity = entityCatalog.getEntity<IEntityMetadata, any, ServiceBindingActionBuilders>(
-    CF_ENDPOINT_TYPE,
-    serviceBindingEntityType
-  );
-
-  private serviceInstanceEntity = entityCatalog.getEntity<IEntityMetadata, any, ServiceInstanceActionBuilders>(
-    CF_ENDPOINT_TYPE,
-    serviceInstancesEntityType
-  );
-
   constructor(
     private confirmDialog: ConfirmationDialogService,
     private store: Store<CFAppState>,
-    private entityServiceFactory: EntityServiceFactory
   ) { }
 
   detachServiceBinding = (
@@ -65,8 +44,7 @@ export class ServiceActionHelperService {
       return;
     }
 
-    const actionBuilder = this.sgEntity.actionOrchestrator.getActionBuilder('remove');
-    const action = actionBuilder(serviceBindings[0].metadata.guid, endpointGuid, { serviceInstanceGuid });
+    const action = cfEntityCatalog.serviceBinding.actions.remove(serviceBindings[0].metadata.guid, endpointGuid, { serviceInstanceGuid });
     if (!noConfirm) {
       const confirmation = new ConfirmationDialogConfig(
         'Detach Service Instance',
@@ -94,8 +72,8 @@ export class ServiceActionHelperService {
     };
 
     const action = userProvided ?
-      new DeleteUserProvidedInstance(endpointGuid, serviceInstanceGuid, serviceInstancesEntityConfig) :
-      this.serviceInstanceEntity.actionOrchestrator.getActionBuilder('remove')(serviceInstanceGuid, endpointGuid);
+      cfEntityCatalog.userProvidedService.actions.remove(serviceInstanceGuid, endpointGuid, serviceInstancesEntityConfig) :
+      cfEntityCatalog.serviceInstance.actions.remove(serviceInstanceGuid, endpointGuid);
 
     const confirmation = new ConfirmationDialogConfig(
       'Delete Service Instance',
@@ -147,22 +125,10 @@ export class ServiceActionHelperService {
 
   private createUserProvidedServiceInstanceObs(guid: string, endpointGuid: string):
     Observable<EntityInfo<APIResource<IUserProvidedServiceInstance>>> {
-    const serviceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, userProvidedServiceInstanceEntityType);
-    const actionBuilder = serviceEntity.actionOrchestrator.getActionBuilder('get');
-    const getUserProvidedServiceAction = actionBuilder(guid, endpointGuid);
-    return this.entityServiceFactory.create<APIResource<IUserProvidedServiceInstance>>(
-      guid,
-      getUserProvidedServiceAction
-    ).entityObs$;
+    return cfEntityCatalog.userProvidedService.store.getEntityService(guid, endpointGuid, {}).entityObs$;
   }
 
   private createServiceInstanceObs(guid: string, endpointGuid: string): Observable<EntityInfo<APIResource<IServiceInstance>>> {
-    const serviceInstanceEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, serviceInstancesEntityType);
-    const actionBuilder = serviceInstanceEntity.actionOrchestrator.getActionBuilder('get');
-    const getServiceInstanceAction = actionBuilder(guid, endpointGuid);
-    return this.entityServiceFactory.create<APIResource<IServiceInstance>>(
-      guid,
-      getServiceInstanceAction
-    ).entityObs$;
+    return cfEntityCatalog.serviceInstance.store.getEntityService(guid, endpointGuid).entityObs$;
   }
 }
diff --git a/src/frontend/packages/cloud-foundry/src/store/effects/cloud-foundry.effects.ts b/src/frontend/packages/cloud-foundry/src/store/effects/cloud-foundry.effects.ts
index 955712ef86..7f86644ba1 100644
--- a/src/frontend/packages/cloud-foundry/src/store/effects/cloud-foundry.effects.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/effects/cloud-foundry.effects.ts
@@ -1,15 +1,19 @@
+import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { catchError, flatMap, mergeMap } from 'rxjs/operators';
 
-import { GET_CF_INFO, GetCFInfo } from '../../actions/cloud-foundry.actions';
-import { CFAppState } from '../../cf-app-state';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
 import { environment } from '../../../../core/src/environments/environment.prod';
+import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
 import { NormalizedResponse } from '../../../../store/src/types/api.types';
-import { StartRequestAction, WrapperRequestActionFailed, WrapperRequestActionSuccess } from '../../../../store/src/types/request.types';
-import { HttpClient } from '@angular/common/http';
+import {
+  StartRequestAction,
+  WrapperRequestActionFailed,
+  WrapperRequestActionSuccess,
+} from '../../../../store/src/types/request.types';
+import { GET_CF_INFO, GetCFInfo } from '../../actions/cloud-foundry.actions';
+import { CFAppState } from '../../cf-app-state';
 
 @Injectable()
 export class CloudFoundryEffects {
@@ -29,7 +33,7 @@ export class CloudFoundryEffects {
       const cfInfoKey = catalogEntity.entityKey;
       this.store.dispatch(new StartRequestAction(action, actionType));
       const requestArgs = {
-        headers: { 'x-cap-cnsi-list': action.cfGuid }
+        headers: { 'x-cap-cnsi-list': action.guid }
       };
       const url = `/pp/${this.proxyAPIVersion}/proxy/v2/info`;
       return this.http
@@ -40,7 +44,7 @@ export class CloudFoundryEffects {
               entities: { [cfInfoKey]: {} },
               result: []
             } as NormalizedResponse;
-            const id = action.cfGuid;
+            const id = action.guid;
 
             mappedData.entities[cfInfoKey][id] = {
               entity: info[id],
@@ -53,7 +57,7 @@ export class CloudFoundryEffects {
           }),
           catchError(error => [
             new WrapperRequestActionFailed(error.message, action, actionType, {
-              endpointIds: [action.cfGuid],
+              endpointIds: [action.guid],
               url: error.url || url,
               eventCode: error.status ? error.status + '' : '500',
               message: 'Cloud Foundry Info request error',
diff --git a/src/frontend/packages/cloud-foundry/src/store/effects/deploy-app.effects.ts b/src/frontend/packages/cloud-foundry/src/store/effects/deploy-app.effects.ts
index 569136aa7b..11a4310bf8 100644
--- a/src/frontend/packages/cloud-foundry/src/store/effects/deploy-app.effects.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/effects/deploy-app.effects.ts
@@ -6,7 +6,7 @@ import { of as observableOf } from 'rxjs';
 import { catchError, filter, map, mergeMap, switchMap, withLatestFrom } from 'rxjs/operators';
 
 import { LoggerService } from '../../../../core/src/core/logger.service';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
 import { NormalizedResponse } from '../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../store/src/types/pagination.types';
 import {
@@ -18,10 +18,12 @@ import {
 import {
   CHECK_PROJECT_EXISTS,
   CheckProjectExists,
+  FETCH_BRANCH_FOR_PROJECT,
   FETCH_BRANCHES_FOR_PROJECT,
   FETCH_COMMIT,
   FETCH_COMMITS,
   FetchBranchesForProject,
+  FetchBranchForProject,
   FetchCommit,
   FetchCommits,
   ProjectDoesntExist,
@@ -122,6 +124,38 @@ export class DeployAppEffects {
         ]));
     }));
 
+  @Effect()
+  fetchBranch$ = this.actions$.pipe(
+    ofType<FetchBranchForProject>(FETCH_BRANCH_FOR_PROJECT),
+    mergeMap(action => {
+      const actionType = 'fetch';
+      const apiAction = {
+        entityType: gitBranchesEntityType,
+        endpointType: CF_ENDPOINT_TYPE,
+        type: action.type,
+        guid: action.guid
+      };
+      this.store.dispatch(new StartRequestAction(apiAction, actionType));
+      return action.scm.getBranch(this.httpClient, action.projectName, action.branchName).pipe(
+        mergeMap(branch => {
+          const entityKey = entityCatalog.getEntity(apiAction).entityKey;
+          const mappedData: NormalizedResponse = {
+            entities: { [entityKey]: {} },
+            result: []
+          };
+          branch.projectId = action.projectName;
+          branch.entityId = action.guid;
+          mappedData.entities[entityKey][action.guid] = branch;
+          mappedData.result.push(action.guid);
+          return [
+            new WrapperRequestActionSuccess(mappedData, apiAction, actionType)
+          ];
+        }),
+        catchError(err => [
+          new WrapperRequestActionFailed(createFailedGithubRequestMessage(err, this.logger), apiAction, actionType)
+        ]));
+    }));
+
   @Effect()
   fetchCommit$ = this.actions$.pipe(
     ofType<FetchCommit>(FETCH_COMMIT),
@@ -182,7 +216,7 @@ export class DeployAppEffects {
     }));
 
   addCommit(entityKey: string, mappedData: NormalizedResponse, scmType: string, projectName: string, commit: GitCommit) {
-    const id = scmType + '-' + projectName + '-' + commit.sha;
+    const id = scmType + '-' + projectName + '-' + commit.sha; // FIXME: get from action, see #4245
     mappedData.entities[entityKey][id] = commit;
     // mappedData.entities[entityKey][id] = {
     //   entity: commit,
diff --git a/src/frontend/packages/cloud-foundry/src/store/effects/github.effects.ts b/src/frontend/packages/cloud-foundry/src/store/effects/github.effects.ts
index e2bd9fc694..24ac509d51 100644
--- a/src/frontend/packages/cloud-foundry/src/store/effects/github.effects.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/effects/github.effects.ts
@@ -5,17 +5,17 @@ import { Store } from '@ngrx/store';
 import { catchError, mergeMap } from 'rxjs/operators';
 
 import { LoggerService } from '../../../../core/src/core/logger.service';
-import { GitSCMService, GitSCMType } from '../../../../core/src/shared/data-services/scm/scm.service';
+import { GitSCMService } from '../../../../core/src/shared/data-services/scm/scm.service';
 import { NormalizedResponse } from '../../../../store/src/types/api.types';
 import {
   StartRequestAction,
   WrapperRequestActionFailed,
   WrapperRequestActionSuccess,
 } from '../../../../store/src/types/request.types';
-import { CF_ENDPOINT_TYPE } from '../../cf-types';
 import { FETCH_GITHUB_REPO, FetchGitHubRepoInfo } from '../../actions/github.actions';
 import { CFAppState } from '../../cf-app-state';
 import { gitRepoEntityType } from '../../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../../cf-types';
 import { createFailedGithubRequestMessage } from './deploy-app.effects';
 
 // TODO: Remove this in favour of action builder config.
@@ -41,24 +41,17 @@ export class GithubEffects {
         entityType: gitRepoEntityType,
         endpointType: CF_ENDPOINT_TYPE,
         type: action.type,
-        guid: action.stProject.deploySource.project
+        guid: action.guid
       };
       this.store.dispatch(new StartRequestAction(apiAction, actionType));
-      const scmType = action.stProject.deploySource.scm || action.stProject.deploySource.type;
-      const scm = this.scmService.getSCM(scmType as GitSCMType);
-      return scm.getRepository(this.httpClient, action.stProject.deploySource.project).pipe(
+      return action.meta.scm.getRepository(this.httpClient, action.meta.projectName).pipe(
         mergeMap(repoDetails => {
           const mappedData = {
             entities: { cfGitRepo: {} },
             result: []
           } as NormalizedResponse;
-          const id = scmType + '-' + repoDetails.full_name;
-          mappedData.entities.cfGitRepo[id] = repoDetails;
-          // mappedData.entities.cfGitRepo[id] = {
-          //   entity: repoDetails,
-          //   metadata: {}
-          // };
-          mappedData.result.push(id);
+          mappedData.entities.cfGitRepo[action.guid] = repoDetails;
+          mappedData.result.push(action.guid);
           return [
             new WrapperRequestActionSuccess(mappedData, apiAction, actionType)
           ];
diff --git a/src/frontend/packages/cloud-foundry/src/store/effects/permissions.effect.ts b/src/frontend/packages/cloud-foundry/src/store/effects/permissions.effect.ts
index 0a49a853e8..8c713def7c 100644
--- a/src/frontend/packages/cloud-foundry/src/store/effects/permissions.effect.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/effects/permissions.effect.ts
@@ -19,7 +19,7 @@ import {
 
 import { LoggerService } from '../../../../core/src/core/logger.service';
 import { CONNECT_ENDPOINTS_SUCCESS, EndpointActionComplete } from '../../../../store/src/actions/endpoint.actions';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
 import {
   BaseHttpClientFetcher,
   flattenPagination,
@@ -44,9 +44,7 @@ import {
   UserRelationTypes,
 } from '../../actions/permissions.actions';
 import { CFAppState } from '../../cf-app-state';
-import {
-  createCfFeatureFlagFetchAction,
-} from '../../shared/components/list/list-types/cf-feature-flags/cf-feature-flags-data-source.helpers';
+import { cfEntityCatalog } from '../../cf-entity-catalog';
 import { CFResponse } from '../types/cf-api.types';
 
 class PermissionFlattener extends BaseHttpClientFetcher<CFResponse> implements PaginationFlattener<CFResponse, CFResponse> {
@@ -213,7 +211,7 @@ export class PermissionsEffects {
         this.store.dispatch(new GetUserCfRelations(endpoint.guid, GET_CURRENT_USER_CF_RELATIONS));
 
         // Dispatch feature flags fetch actions
-        const ffAction = createCfFeatureFlagFetchAction(endpoint.guid);
+        const ffAction = cfEntityCatalog.featureFlag.actions.getMultiple(endpoint.guid)
         requests[endpoint.guid] = [createPaginationCompleteWatcher(this.store, ffAction)];
         this.store.dispatch(ffAction);
 
diff --git a/src/frontend/packages/cloud-foundry/src/store/types/github.types.ts b/src/frontend/packages/cloud-foundry/src/store/types/github.types.ts
index 9d61db0197..73f6b888ad 100644
--- a/src/frontend/packages/cloud-foundry/src/store/types/github.types.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/types/github.types.ts
@@ -1,5 +1,3 @@
-import { schema } from 'normalizr';
-
 export interface GithubRepo {
   pushed_at: string;
   created_at: string;
@@ -18,7 +16,7 @@ export interface GithubUser {
   type: string;
 }
 
-export interface GitBranch {
+export interface GitHubBranch {
   name: string;
   commit?: GithubCommit;
 }
diff --git a/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts
index 7a72e4072a..e9d28e530e 100644
--- a/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts
+++ b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts
@@ -92,16 +92,14 @@ export function generateTestCfUserServiceProvider(guid = testSCFEndpointGuid) {
     useFactory: (
       store: Store<CFAppState>,
       paginationMonitorFactory: PaginationMonitorFactory,
-      entityServiceFactory: EntityServiceFactory
     ) => {
       return new CfUserService(
         store,
         paginationMonitorFactory,
         { cfGuid: guid, orgGuid: guid, spaceGuid: guid },
-        entityServiceFactory,
       );
     },
-    deps: [Store, PaginationMonitorFactory, EntityServiceFactory, HttpClient]
+    deps: [Store, PaginationMonitorFactory, HttpClient]
   };
 }
 
diff --git a/src/frontend/packages/core/endpoints-health-checks.ts b/src/frontend/packages/core/endpoints-health-checks.ts
index 1351edc0b0..2c7624fd76 100644
--- a/src/frontend/packages/core/endpoints-health-checks.ts
+++ b/src/frontend/packages/core/endpoints-health-checks.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 
+import { entityCatalog } from '../store/src/entity-catalog/entity-catalog';
 import { EndpointModel } from '../store/src/types/endpoint.types';
-import { entityCatalog } from '../store/src/entity-catalog/entity-catalog.service';
 
 
 export class EndpointHealthCheck {
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.ts b/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.ts
index 62571bf9a2..c897ea9c69 100644
--- a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.ts
+++ b/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-type-select-page/api-endpoint-type-select-page.component.ts
@@ -6,7 +6,7 @@ import { map } from 'rxjs/operators';
 
 import { GeneralAppState } from '../../../../../store/src/app-state';
 import { endpointEntitiesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { ApiEntityType } from '../../api-drive-views.types';
 
 @Component({
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.ts b/src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.ts
index 70c9cba22e..eff169381f 100644
--- a/src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.ts
+++ b/src/frontend/packages/core/src/api-driven-views/features/api-entity-list-page/api-entity-list-page.component.ts
@@ -1,7 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { StratosBaseCatalogEntity } from '../../../../../store/src/entity-catalog/entity-catalog-entity';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
+
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
+import {
+  StratosBaseCatalogEntity,
+} from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 
 @Component({
   selector: 'app-api-entity-list-page',
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-entity-type-select-page/api-entity-type-select-page.component.ts b/src/frontend/packages/core/src/api-driven-views/features/api-entity-type-select-page/api-entity-type-select-page.component.ts
index f99ceb1cc7..69ce1bc3f9 100644
--- a/src/frontend/packages/core/src/api-driven-views/features/api-entity-type-select-page/api-entity-type-select-page.component.ts
+++ b/src/frontend/packages/core/src/api-driven-views/features/api-entity-type-select-page/api-entity-type-select-page.component.ts
@@ -1,14 +1,13 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
-import { ApiEntityType } from '../../api-drive-views.types';
-import { TabNavService } from '../../../../tab-nav.service';
 import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
 import { GeneralAppState } from '../../../../../store/src/app-state';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { connectedEndpointsOfTypesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
-import { map } from 'rxjs/operators';
-import { Observable } from 'rxjs';
-import { TabNavItem } from '../../../../tab-nav.types';
+import { TabNavService } from '../../../../tab-nav.service';
 import { IPageSideNavTab } from '../../../features/dashboard/page-side-nav/page-side-nav.component';
 
 @Component({
diff --git a/src/frontend/packages/core/src/app.module.ts b/src/frontend/packages/core/src/app.module.ts
index bfeef7669a..7787fddcfe 100644
--- a/src/frontend/packages/core/src/app.module.ts
+++ b/src/frontend/packages/core/src/app.module.ts
@@ -14,8 +14,9 @@ import {
 } from '../../store/src/actions/user-favourites-actions/update-user-favorite-metadata-action';
 import { GeneralEntityAppState, GeneralRequestDataState } from '../../store/src/app-state';
 import { EntityCatalogModule } from '../../store/src/entity-catalog.module';
-import { EntityActionDispatcher } from '../../store/src/entity-catalog/action-dispatcher/action-dispatcher';
-import { entityCatalog } from '../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../store/src/entity-catalog/entity-catalog';
+import { EntityCatalogHelper } from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service';
+import { EntityCatalogHelpers } from '../../store/src/entity-catalog/entity-catalog.helper';
 import { endpointSchemaKey } from '../../store/src/helpers/entity-factory';
 import { getAPIRequestDataState, selectEntity } from '../../store/src/selectors/api.selectors';
 import { internalEventStateSelector } from '../../store/src/selectors/internal-events.selectors';
@@ -125,8 +126,10 @@ export class AppModule {
     eventService: GlobalEventService,
     private userFavoriteManager: UserFavoriteManager,
     private favoritesConfigMapper: FavoritesConfigMapper,
+    ech: EntityCatalogHelper
   ) {
-    EntityActionDispatcher.initialize(this.store);
+    EntityCatalogHelpers.SetEntityCatalogEntityHelper(ech);
+
     eventService.addEventConfig<boolean>({
       eventTriggered: (state: GeneralEntityAppState) => new GlobalEventData(!state.dashboard.timeoutSession),
       message: 'Timeout session is disabled - this is considered a security risk.',
diff --git a/src/frontend/packages/core/src/base-entity-types.ts b/src/frontend/packages/core/src/base-entity-types.ts
index 33ba893917..9c878d627c 100644
--- a/src/frontend/packages/core/src/base-entity-types.ts
+++ b/src/frontend/packages/core/src/base-entity-types.ts
@@ -1,8 +1,12 @@
-import { systemEndpointsReducer } from '../../store/src/reducers/system-endpoints.reducer';
+import {
+  StratosCatalogEndpointEntity,
+  StratosCatalogEntity,
+} from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import {
   addOrUpdateUserFavoriteMetadataReducer,
   deleteUserFavoriteMetadataReducer,
 } from '../../store/src/reducers/favorite.reducer';
+import { systemEndpointsReducer } from '../../store/src/reducers/system-endpoints.reducer';
 import {
   endpointEntitySchema,
   STRATOS_ENDPOINT_TYPE,
@@ -10,7 +14,6 @@ import {
   userFavoritesEntitySchema,
   userProfileEntitySchema,
 } from './base-entity-schemas';
-import { StratosCatalogEndpointEntity, StratosCatalogEntity } from '../../store/src/entity-catalog/entity-catalog-entity';
 import { BaseEndpointAuth } from './features/endpoints/endpoint-auth';
 
 //
@@ -38,10 +41,10 @@ class DefaultEndpointCatalogEntity extends StratosCatalogEntity {
       type: endpointEntitySchema.entityType,
       endpoint: stratosType,
     }, {
-        dataReducers: [
-          systemEndpointsReducer
-        ]
-      });
+      dataReducers: [
+        systemEndpointsReducer
+      ]
+    });
   }
 }
 
@@ -52,11 +55,11 @@ class UserFavoriteCatalogEntity extends StratosCatalogEntity {
       type: userFavoritesEntitySchema.entityType,
       endpoint: stratosType,
     }, {
-        dataReducers: [
-          addOrUpdateUserFavoriteMetadataReducer,
-          deleteUserFavoriteMetadataReducer,
-        ]
-      });
+      dataReducers: [
+        addOrUpdateUserFavoriteMetadataReducer,
+        deleteUserFavoriteMetadataReducer,
+      ]
+    });
   }
 }
 
diff --git a/src/frontend/packages/core/src/core/cf-api.types.ts b/src/frontend/packages/core/src/core/cf-api.types.ts
index 9442951898..ac83e78b88 100644
--- a/src/frontend/packages/core/src/core/cf-api.types.ts
+++ b/src/frontend/packages/core/src/core/cf-api.types.ts
@@ -182,6 +182,7 @@ export interface IOrganization<T = unknown> {
   default_isolation_segment_guid?: any;
   quota_definition_url?: string;
   spaces_url?: string;
+  domains: APIResource<IDomain>[];
   domains_url?: string;
   private_domains_url?: string;
   users?: APIResource<CfUser>[];
diff --git a/src/frontend/packages/core/src/core/core.module.ts b/src/frontend/packages/core/src/core/core.module.ts
index 0c5547ad70..39b6412c5f 100644
--- a/src/frontend/packages/core/src/core/core.module.ts
+++ b/src/frontend/packages/core/src/core/core.module.ts
@@ -1,22 +1,25 @@
 import { PortalModule } from '@angular/cdk/portal';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { RouterModule } from '@angular/router';
 import { Title } from '@angular/platform-browser';
+import { RouterModule } from '@angular/router';
 import { MomentModule } from 'ngx-moment';
 
+import { EntityCatalogHelper } from '../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service';
+import { EntityServiceFactory } from '../../../store/src/entity-service-factory.service';
 import { NoContentMessageComponent } from '../shared/components/no-content-message/no-content-message.component';
 import { RecentEntitiesComponent } from '../shared/components/recent-entities/recent-entities.component';
+import { UserAvatarComponent } from './../shared/components/user-avatar/user-avatar.component';
 import { AuthGuardService } from './auth-guard.service';
 import { ButtonBlurOnClickDirective } from './button-blur-on-click.directive';
 import { BytesToHumanSize, MegaBytesToHumanSize } from './byte-formatters.pipe';
 import { ClickStopPropagationDirective } from './click-stop-propagation.directive';
+import { APP_TITLE, appTitleFactory } from './core.types';
 import { CurrentUserPermissionsService } from './current-user-permissions.service';
 import { DisableRouterLinkDirective } from './disable-router-link.directive';
 import { DotContentComponent } from './dot-content/dot-content.component';
 import { EndpointsService } from './endpoints.service';
 import { EntityFavoriteStarComponent } from './entity-favorite-star/entity-favorite-star.component';
-import { EntityServiceFactory } from '../../../store/src/entity-service-factory.service';
 import { EventWatcherService } from './event-watcher/event-watcher.service';
 import { InfinityPipe } from './infinity.pipe';
 import { LogOutDialogComponent } from './log-out-dialog/log-out-dialog.component';
@@ -28,12 +31,10 @@ import { PageNotFoundComponentComponent } from './page-not-found-component/page-
 import { SafeImgPipe } from './safe-img.pipe';
 import { StatefulIconComponent } from './stateful-icon/stateful-icon.component';
 import { TruncatePipe } from './truncate.pipe';
+import { UserProfileService } from './user-profile.service';
 import { UserService } from './user.service';
 import { UtilsService } from './utils.service';
 import { WindowRef } from './window-ref/window-ref.service';
-import { APP_TITLE, appTitleFactory } from './core.types';
-import { UserProfileService } from './user-profile.service';
-import { UserAvatarComponent } from './../shared/components/user-avatar/user-avatar.component';
 
 @NgModule({
   imports: [
@@ -77,6 +78,7 @@ import { UserAvatarComponent } from './../shared/components/user-avatar/user-ava
     EndpointsService,
     UserService,
     EntityServiceFactory,
+    EntityCatalogHelper,
     UserProfileService,
     CurrentUserPermissionsService,
     {
diff --git a/src/frontend/packages/core/src/core/current-user-permissions.checker.ts b/src/frontend/packages/core/src/core/current-user-permissions.checker.ts
index f0050f0832..234279fec8 100644
--- a/src/frontend/packages/core/src/core/current-user-permissions.checker.ts
+++ b/src/frontend/packages/core/src/core/current-user-permissions.checker.ts
@@ -2,9 +2,7 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators';
 
-import {
-  createCfFeatureFlagFetchAction,
-} from '../../../cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-data-source.helpers';
+import { cfEntityCatalog } from '../../../cloud-foundry/src/cf-entity-catalog';
 import {
   getCurrentUserCFEndpointHasScope,
   getCurrentUserCFEndpointRolesState,
@@ -16,8 +14,6 @@ import {
   ISpacesRoleState,
 } from '../../../cloud-foundry/src/store/types/cf-current-user-roles.types';
 import { GeneralEntityAppState } from '../../../store/src/app-state';
-import { PaginationMonitor } from '../../../store/src/monitors/pagination-monitor';
-import { getPaginationObservables } from '../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import {
   getCurrentUserStratosHasScope,
   getCurrentUserStratosRole,
@@ -194,24 +190,11 @@ export class CurrentUserPermissionsChecker {
     const endpointGuids$ = this.getEndpointGuidObservable(endpointGuid);
     return endpointGuids$.pipe(
       switchMap(guids => {
-        const createFFObs = guid => {
+        const createFFObs = guid =>
           // For admins we don't have the ff list which is usually fetched right at the start,
           // so this can't be a pagination monitor on its own (which doesn't fetch if list is missing)
-          const action = createCfFeatureFlagFetchAction(guid);
-          return getPaginationObservables<IFeatureFlag>(
-            {
-              store: this.store,
-              action,
-              paginationMonitor: new PaginationMonitor<IFeatureFlag>(
-                this.store,
-                action.paginationKey,
-                action,
-                true
-              )
-            },
-            true
-          ).entities$;
-        };
+          cfEntityCatalog.featureFlag.store.getPaginationService(guid).entities$
+          ;
 
         return combineLatest(guids.map(createFFObs));
       }),
diff --git a/src/frontend/packages/core/src/core/endpoints.service.ts b/src/frontend/packages/core/src/core/endpoints.service.ts
index 51749fccf5..842330f087 100644
--- a/src/frontend/packages/core/src/core/endpoints.service.ts
+++ b/src/frontend/packages/core/src/core/endpoints.service.ts
@@ -6,7 +6,7 @@ import { first, map, skipWhile, withLatestFrom } from 'rxjs/operators';
 
 import { RouterNav } from '../../../store/src/actions/router.actions';
 import { EndpointOnlyAppState, IRequestEntityTypeState } from '../../../store/src/app-state';
-import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
 import { AuthState } from '../../../store/src/reducers/auth.reducer';
 import { endpointEntitiesSelector, endpointStatusSelector } from '../../../store/src/selectors/endpoint.selectors';
 import { EndpointModel, EndpointState } from '../../../store/src/types/endpoint.types';
diff --git a/src/frontend/packages/core/src/core/user-favorite-manager.ts b/src/frontend/packages/core/src/core/user-favorite-manager.ts
index 44a07d676a..45e4fded8a 100644
--- a/src/frontend/packages/core/src/core/user-favorite-manager.ts
+++ b/src/frontend/packages/core/src/core/user-favorite-manager.ts
@@ -5,6 +5,7 @@ import { filter, map, switchMap, tap } from 'rxjs/operators';
 
 import { ToggleUserFavoriteAction } from '../../../store/src/actions/user-favourites-actions/toggle-user-favorite-action';
 import { GeneralEntityAppState, IRequestEntityTypeState } from '../../../store/src/app-state';
+import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
 import { endpointEntitiesSelector } from '../../../store/src/selectors/endpoint.selectors';
 import {
   errorFetchingFavoritesSelector,
@@ -19,7 +20,6 @@ import {
   FavoritesConfigMapper,
   TFavoriteMapperFunction,
 } from '../shared/components/favorites-meta-card/favorite-config-mapper';
-import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog.service';
 import { LoggerService } from './logger.service';
 
 export interface IFavoriteEntity {
diff --git a/src/frontend/packages/core/src/core/user-profile.service.ts b/src/frontend/packages/core/src/core/user-profile.service.ts
index 95fd5c5a4b..cab800a9cc 100644
--- a/src/frontend/packages/core/src/core/user-profile.service.ts
+++ b/src/frontend/packages/core/src/core/user-profile.service.ts
@@ -10,21 +10,13 @@ import {
 } from '../../../store/src/actions/user-profile.actions';
 import { AppState } from '../../../store/src/app-state';
 import { UserProfileEffect, userProfilePasswordUpdatingKey } from '../../../store/src/effects/user-profile.effects';
-import {
-  ActionState,
-  getDefaultActionState,
-  rootUpdatingKey,
-} from '../../../store/src/reducers/api-request-reducer/types';
+import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
+import { EntityMonitor } from '../../../store/src/monitors/entity-monitor';
+import { ActionState, getDefaultActionState, rootUpdatingKey } from '../../../store/src/reducers/api-request-reducer/types';
 import { AuthState } from '../../../store/src/reducers/auth.reducer';
 import { selectRequestInfo, selectUpdateInfo } from '../../../store/src/selectors/api.selectors';
-import {
-  UserProfileInfo,
-  UserProfileInfoEmail,
-  UserProfileInfoUpdates,
-} from '../../../store/src/types/user-profile.types';
+import { UserProfileInfo, UserProfileInfoEmail, UserProfileInfoUpdates } from '../../../store/src/types/user-profile.types';
 import { userProfileEntitySchema } from '../base-entity-schemas';
-import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityMonitor } from '../../../store/src/monitors/entity-monitor';
 
 
 @Injectable()
@@ -40,14 +32,16 @@ export class UserProfileService {
 
   private stratosUserConfig = entityCatalog.getEntity(userProfileEntitySchema.endpointType, userProfileEntitySchema.entityType);
 
-  constructor(private store: Store<AppState>) {
+  constructor(
+    private store: Store<AppState>,
+  ) {
     if (!this.stratosUserConfig) {
       console.error('Can not get user profile entity');
       this.userProfile$ = of({} as UserProfileInfo);
       return;
     }
 
-    this.entityMonitor = this.stratosUserConfig.getEntityMonitor(this.store, UserProfileEffect.guid);
+    this.entityMonitor = this.stratosUserConfig.store.getEntityMonitor(UserProfileEffect.guid);
 
     this.userProfile$ = this.entityMonitor.entity$.pipe(
       filter(data => data && !!data.id)
@@ -99,7 +93,7 @@ export class UserProfileService {
   updateProfile(profile: UserProfileInfo, profileChanges: UserProfileInfoUpdates): Observable<[ActionState, ActionState]> {
     const didChangeProfile = (profileChanges.givenName !== undefined ||
       profileChanges.familyName !== undefined ||
-      profileChanges.emailAddress !== undefined );
+      profileChanges.emailAddress !== undefined);
     const didChangePassword = !!(profileChanges.newPassword && profileChanges.currentPassword);
     const profileObs$ = didChangeProfile ? this.updateProfileInfo(profile, profileChanges) : observableOf(getDefaultActionState());
     const passwordObs$ = didChangePassword ? this.updatePassword(profile, profileChanges) : observableOf(getDefaultActionState());
diff --git a/src/frontend/packages/core/src/core/utils.service.ts b/src/frontend/packages/core/src/core/utils.service.ts
index 422447cb4a..415a8f89c6 100644
--- a/src/frontend/packages/core/src/core/utils.service.ts
+++ b/src/frontend/packages/core/src/core/utils.service.ts
@@ -11,7 +11,55 @@ export function getIdFromRoute(activatedRoute: ActivatedRoute, id: string) {
   return null;
 }
 
-export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
+export type OptionalKeys<T extends object> = Exclude<{
+  [K in keyof T]: T extends Record<K, T[K]>
+  ? K
+  : never
+}[keyof T], undefined>
+
+
+export type NonOptionalKeys<T extends object> = Exclude<{
+  [K in keyof T]: T extends Record<K, T[K]>
+  ? K
+  : never
+}[keyof T], undefined>
+
+export type NeverKeys<T extends object> = Exclude<{
+  [K in keyof T]: T[K] extends never
+  ? K
+  : never
+}[keyof T], undefined>
+
+
+/**
+ * Remove keys such as typed indexes  (i.e. [key: string])
+ * For magic see
+ *  - https://github.com/Microsoft/TypeScript/issues/25987#issuecomment-441224690
+ *  - https://github.com/Microsoft/TypeScript/issues/12215#issuecomment-414808995
+ */
+export type KnownKeys<T> = {
+  [K in keyof T]: string extends K ? never : number extends K ? never : K
+} extends { [_ in keyof T]: infer U } ? ({} extends U ? never : U) : never;
+
+/**
+ * Pick all properties who's function has the specified return type U
+ */
+export type FilteredByReturnType<T extends { [key: string]: (...args: any[]) => any }, U> = {
+  [P in keyof T]: ReturnType<T[P]> extends U ? T[P] : never
+};
+
+/**
+ * Pick all properties who's function do not have the specified return type U
+ */
+export type FilteredByNotReturnType<T extends { [key: string]: (...args: any[]) => any }, U> = {
+  [P in keyof T]: ReturnType<T[P]> extends U ? never : T[P]
+};
+
+// Note - Adding }[keyof T] to [P in keyof T] types should filter out properties of type `never`, however this fails with generics!
+export type FilteredByValueType<T extends { [key: string]: (...args: any[]) => any }, U> = {
+  [P in keyof T]: T[P] extends U ? never : T[P]
+};
+
 
 export const urlValidationExpression =
   '^' +
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.ts b/src/frontend/packages/core/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.ts
index 64d39dd41e..3dd8541e5b 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.ts
+++ b/src/frontend/packages/core/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.ts
@@ -1,20 +1,13 @@
 import { Component, ViewChild } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
-import { Store } from '@ngrx/store';
 import { Subscription } from 'rxjs';
 import { filter, map, pairwise } from 'rxjs/operators';
 
-import { CF_ENDPOINT_TYPE } from '../../../../../../cloud-foundry/src/cf-types';
-import {
-  QuotaDefinitionActionBuilder,
-} from '../../../../../../cloud-foundry/src/entity-action-builders/quota-definition.action-builders';
-import { AppState } from '../../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
+import { cfEntityCatalog } from '../../../../../../cloud-foundry/src/cf-entity-catalog';
+import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component';
 import { QuotaDefinitionFormComponent } from '../../quota-definition-form/quota-definition-form.component';
-import { quotaDefinitionEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
 
 
 @Component({
@@ -32,7 +25,6 @@ export class CreateQuotaStepComponent {
   form: QuotaDefinitionFormComponent;
 
   constructor(
-    private store: Store<AppState>,
     private activatedRoute: ActivatedRoute,
   ) {
     this.cfGuid = this.activatedRoute.snapshot.params.endpointId;
@@ -42,10 +34,7 @@ export class CreateQuotaStepComponent {
 
   submit: StepOnNextFunction = () => {
     const formValues = this.form.formGroup.value;
-    const entityConfig =
-      entityCatalog.getEntity<IEntityMetadata, any, QuotaDefinitionActionBuilder>(CF_ENDPOINT_TYPE, quotaDefinitionEntityType);
-    entityConfig.actionDispatchManager.dispatchCreate(formValues.name, this.cfGuid, formValues);
-    return entityConfig.getEntityMonitor(this.store, formValues.name).entityRequest$.pipe(
+    return cfEntityCatalog.quotaDefinition.api.create<RequestInfoState>(formValues.name, this.cfGuid, formValues).pipe(
       pairwise(),
       filter(([oldV, newV]) => oldV.creating && !newV.creating),
       map(([, newV]) => newV),
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts b/src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts
index b1371907dc..a63b5b2489 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts
+++ b/src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts
@@ -1,21 +1,14 @@
 import { Component, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 import { filter, map, pairwise } from 'rxjs/operators';
 
-import { CF_ENDPOINT_TYPE } from '../../../../../../cloud-foundry/src/cf-types';
-import {
-  SpaceQuotaDefinitionActionBuilders,
-} from '../../../../../../cloud-foundry/src/entity-action-builders/space-quota.action-builders';
-import { AppState } from '../../../../../../store/src/app-state';
+import { cfEntityCatalog } from '../../../../../../cloud-foundry/src/cf-entity-catalog';
+import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource } from '../../../../../../store/src/types/api.types';
 import { IQuotaDefinition } from '../../../../core/cf-api.types';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
 import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component';
 import { SpaceQuotaDefinitionFormComponent } from '../../space-quota-definition-form/space-quota-definition-form.component';
-import { spaceQuotaEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
 
 
 @Component({
@@ -34,7 +27,6 @@ export class CreateSpaceQuotaStepComponent {
   form: SpaceQuotaDefinitionFormComponent;
 
   constructor(
-    private store: Store<AppState>,
     private activatedRoute: ActivatedRoute,
   ) {
     this.cfGuid = this.activatedRoute.snapshot.params.endpointId;
@@ -46,14 +38,10 @@ export class CreateSpaceQuotaStepComponent {
   submit: StepOnNextFunction = () => {
     const formValues = this.form.formGroup.value;
 
-    const entityConfig =
-      entityCatalog.getEntity<IEntityMetadata, any, SpaceQuotaDefinitionActionBuilders>(CF_ENDPOINT_TYPE, spaceQuotaEntityType);
-    entityConfig.actionDispatchManager.dispatchCreate(formValues.name, this.cfGuid, {
+    return cfEntityCatalog.spaceQuota.api.create<RequestInfoState>(formValues.name, this.cfGuid, {
       orgGuid: this.orgGuid,
       createQuota: formValues
-    });
-
-    return entityConfig.getEntityMonitor(this.store, formValues.name).entityRequest$.pipe(
+    }).pipe(
       pairwise(),
       filter(([oldV, newV]) => oldV.creating && !newV.creating),
       map(([, newV]) => newV),
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts b/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts
index 5bb4a1ef34..b15cbe0a71 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts
+++ b/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts
@@ -4,26 +4,15 @@ import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 import { filter, first, map, pairwise, tap } from 'rxjs/operators';
 
-import { CF_ENDPOINT_TYPE } from '../../../../../../cloud-foundry/src/cf-types';
-import {
-  GetQuotaDefinition,
-  UpdateQuotaDefinition,
-} from '../../../../../../cloud-foundry/src/actions/quota-definitions.actions';
-import {
-  QuotaDefinitionActionBuilder,
-} from '../../../../../../cloud-foundry/src/entity-action-builders/quota-definition.action-builders';
+import { cfEntityCatalog } from '../../../../../../cloud-foundry/src/cf-entity-catalog';
 import { ActiveRouteCfOrgSpace } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import { AppState } from '../../../../../../store/src/app-state';
 import { APIResource } from '../../../../../../store/src/types/api.types';
-import { IQuotaDefinition } from '../../../../core/cf-api.types';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
-import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
+import { IOrgQuotaDefinition } from '../../../../core/cf-api.types';
 import { safeUnsubscribe } from '../../../../core/utils.service';
 import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component';
 import { QuotaDefinitionFormComponent } from '../../quota-definition-form/quota-definition-form.component';
-import { quotaDefinitionEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
 
 
 @Component({
@@ -38,9 +27,9 @@ export class EditQuotaStepComponent implements OnDestroy {
 
   cfGuid: string;
   quotaGuid: string;
-  quotaDefinition$: Observable<APIResource<IQuotaDefinition>>;
+  quotaDefinition$: Observable<APIResource<IOrgQuotaDefinition>>;
   quotaSubscription: Subscription;
-  quota: IQuotaDefinition;
+  quota: IOrgQuotaDefinition;
 
   @ViewChild('form', { static: false })
   form: QuotaDefinitionFormComponent;
@@ -48,7 +37,6 @@ export class EditQuotaStepComponent implements OnDestroy {
   constructor(
     private store: Store<AppState>,
     private activatedRoute: ActivatedRoute,
-    private entityServiceFactory: EntityServiceFactory,
     activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
   ) {
     this.cfGuid = activeRouteCfOrgSpace.cfGuid;
@@ -58,10 +46,7 @@ export class EditQuotaStepComponent implements OnDestroy {
   }
 
   fetchQuotaDefinition() {
-    this.quotaDefinition$ = this.entityServiceFactory.create<APIResource<IQuotaDefinition>>(
-      this.quotaGuid,
-      new GetQuotaDefinition(this.quotaGuid, this.cfGuid),
-    ).waitForEntity$.pipe(
+    this.quotaDefinition$ = cfEntityCatalog.quotaDefinition.store.getEntityService(this.quotaGuid, this.cfGuid, {}).waitForEntity$.pipe(
       first(),
       map(data => data.entity),
       tap((resource) => this.quota = resource.entity)
@@ -74,12 +59,10 @@ export class EditQuotaStepComponent implements OnDestroy {
 
   submit: StepOnNextFunction = () => {
     const formValues = this.form.formGroup.value;
-    const entityConfig =
-      entityCatalog.getEntity<IEntityMetadata, any, QuotaDefinitionActionBuilder>(CF_ENDPOINT_TYPE, quotaDefinitionEntityType);
-    entityConfig.actionDispatchManager.dispatchUpdate(this.quotaGuid, this.cfGuid, formValues);
-    return entityConfig
-      .getEntityMonitor(this.store, this.quotaGuid)
-      .getUpdatingSection(UpdateQuotaDefinition.UpdateExistingQuota).pipe(
+    const action = cfEntityCatalog.quotaDefinition.actions.update(this.quotaGuid, this.cfGuid, formValues);
+    this.store.dispatch(action);
+    return cfEntityCatalog.quotaDefinition.store.getEntityMonitor(this.quotaGuid)
+      .getUpdatingSection(action.updatingKey).pipe(
         pairwise(),
         filter(([oldV, newV]) => oldV.busy && !newV.busy),
         map(([, newV]) => newV),
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts b/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
index cd832da790..c1d149dcc5 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
+++ b/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
@@ -4,24 +4,13 @@ import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 import { filter, map, pairwise, tap } from 'rxjs/operators';
 
-import { CF_ENDPOINT_TYPE } from '../../../../../../cloud-foundry/src/cf-types';
-import {
-  GetSpaceQuotaDefinition,
-  UpdateSpaceQuotaDefinition,
-} from '../../../../../../cloud-foundry/src/actions/quota-definitions.actions';
-import {
-  SpaceQuotaDefinitionActionBuilders,
-} from '../../../../../../cloud-foundry/src/entity-action-builders/space-quota.action-builders';
+import { cfEntityCatalog } from '../../../../../../cloud-foundry/src/cf-entity-catalog';
 import { AppState } from '../../../../../../store/src/app-state';
 import { APIResource } from '../../../../../../store/src/types/api.types';
-import { IQuotaDefinition } from '../../../../core/cf-api.types';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
-import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
+import { ISpaceQuotaDefinition } from '../../../../core/cf-api.types';
 import { safeUnsubscribe } from '../../../../core/utils.service';
 import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component';
 import { SpaceQuotaDefinitionFormComponent } from '../../space-quota-definition-form/space-quota-definition-form.component';
-import { spaceQuotaEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
 
 
 @Component({
@@ -35,8 +24,8 @@ export class EditSpaceQuotaStepComponent implements OnDestroy {
   cfGuid: string;
   spaceQuotaGuid: string;
   allQuotas: string[];
-  spaceQuotaDefinition$: Observable<APIResource<IQuotaDefinition>>;
-  quota: IQuotaDefinition;
+  spaceQuotaDefinition$: Observable<APIResource<ISpaceQuotaDefinition>>;
+  quota: ISpaceQuotaDefinition;
 
   @ViewChild('form', { static: false })
   form: SpaceQuotaDefinitionFormComponent;
@@ -44,7 +33,6 @@ export class EditSpaceQuotaStepComponent implements OnDestroy {
   constructor(
     private store: Store<AppState>,
     private activatedRoute: ActivatedRoute,
-    private entityServiceFactory: EntityServiceFactory,
   ) {
     this.cfGuid = this.activatedRoute.snapshot.params.endpointId;
     this.spaceQuotaGuid = this.activatedRoute.snapshot.params.quotaId;
@@ -53,10 +41,7 @@ export class EditSpaceQuotaStepComponent implements OnDestroy {
   }
 
   fetchQuotaDefinition() {
-    this.spaceQuotaDefinition$ = this.entityServiceFactory.create<APIResource<IQuotaDefinition>>(
-      this.spaceQuotaGuid,
-      new GetSpaceQuotaDefinition(this.spaceQuotaGuid, this.cfGuid),
-    ).waitForEntity$.pipe(
+    this.spaceQuotaDefinition$ = cfEntityCatalog.spaceQuota.store.getEntityService(this.spaceQuotaGuid, this.cfGuid).waitForEntity$.pipe(
       map(data => data.entity),
       tap((resource) => this.quota = resource.entity)
     );
@@ -68,16 +53,11 @@ export class EditSpaceQuotaStepComponent implements OnDestroy {
 
   submit: StepOnNextFunction = () => {
     const formValues = this.form.formGroup.value;
-    const action = new UpdateSpaceQuotaDefinition(this.spaceQuotaGuid, this.cfGuid, formValues);
-    this.store.dispatch(action);
-
-    const entityConfig =
-      entityCatalog.getEntity<IEntityMetadata, any, SpaceQuotaDefinitionActionBuilders>(CF_ENDPOINT_TYPE, spaceQuotaEntityType);
-    entityConfig.actionDispatchManager.dispatchUpdate(this.spaceQuotaGuid, this.cfGuid, formValues);
 
-    return entityConfig
-      .getEntityMonitor(this.store, this.spaceQuotaGuid)
-      .getUpdatingSection(UpdateSpaceQuotaDefinition.UpdateExistingSpaceQuota)
+    const action = cfEntityCatalog.spaceQuota.actions.update(this.spaceQuotaGuid, this.cfGuid, formValues);
+    this.store.dispatch(action);
+    return cfEntityCatalog.quotaDefinition.store.getEntityMonitor(this.spaceQuotaGuid)
+      .getUpdatingSection(action.updatingKey)
       .pipe(
         pairwise(),
         filter(([oldV, newV]) => oldV.busy && !newV.busy),
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts b/src/frontend/packages/core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts
index 0f73bbfb4b..ed39df04bd 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts
+++ b/src/frontend/packages/core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts
@@ -1,24 +1,12 @@
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { AbstractControl, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
-import { Store } from '@ngrx/store';
-import { Observable, Subscription } from 'rxjs';
+import { Subscription } from 'rxjs';
 import { filter, map, tap } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
-import { cfEntityFactory } from '../../../../../cloud-foundry/src/cf-entity-factory';
-import { quotaDefinitionEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cloud-foundry/src/cf-types';
-import {
-  QuotaDefinitionActionBuilder,
-} from '../../../../../cloud-foundry/src/entity-action-builders/quota-definition.action-builders';
+import { cfEntityCatalog } from '../../../../../cloud-foundry/src/cf-entity-catalog';
 import { createEntityRelationPaginationKey } from '../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../../store/src/entity-catalog/entity-catalog.types';
 import { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
-import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
-import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
-import { APIResource } from '../../../../../store/src/types/api.types';
 import { IQuotaDefinition } from '../../../core/cf-api.types';
 import { safeUnsubscribe } from '../../../core/utils.service';
 
@@ -45,15 +33,12 @@ export class QuotaDefinitionFormComponent implements OnInit, OnDestroy {
   quotasSubscription: Subscription;
   cfGuid: string;
   allQuotas: string[];
-  quotaDefinitions$: Observable<APIResource<IQuotaDefinition>[]>;
   formGroup: FormGroup;
 
   @Input() quota: IQuotaDefinition;
 
   constructor(
-    private store: Store<CFAppState>,
     private activatedRoute: ActivatedRoute,
-    private paginationMonitorFactory: PaginationMonitorFactory,
   ) {
     this.cfGuid = this.activatedRoute.snapshot.params.endpointId;
   }
@@ -83,28 +68,14 @@ export class QuotaDefinitionFormComponent implements OnInit, OnDestroy {
 
   fetchQuotasDefinitions() {
     const quotaPaginationKey = createEntityRelationPaginationKey(endpointSchemaKey, this.cfGuid);
-    const quotaDefinitionEntity =
-      entityCatalog.getEntity<IEntityMetadata, any, QuotaDefinitionActionBuilder>(CF_ENDPOINT_TYPE, quotaDefinitionEntityType);
-    const actionBuilder = quotaDefinitionEntity.actionOrchestrator.getActionBuilder('getMultiple');
-    const getQuotaDefinitionsAction = actionBuilder(quotaPaginationKey, this.cfGuid, {});
-    this.quotaDefinitions$ = getPaginationObservables<APIResource>(
-      {
-        store: this.store,
-        action: getQuotaDefinitionsAction,
-        paginationMonitor: this.paginationMonitorFactory.create(
-          quotaPaginationKey,
-          cfEntityFactory(quotaDefinitionEntityType),
-          getQuotaDefinitionsAction.flattenPagination
-        )
-      },
-      getQuotaDefinitionsAction.flattenPagination
-    ).entities$.pipe(
-      filter(o => !!o),
-      map(o => o.map(org => org.entity.name)),
-      tap((o) => this.allQuotas = o)
-    );
-
-    this.quotasSubscription = this.quotaDefinitions$.subscribe();
+    const quotaDefinitions$ = cfEntityCatalog.quotaDefinition.store.getPaginationService(quotaPaginationKey, this.cfGuid, {})
+      .entities$.pipe(
+        filter(o => !!o),
+        map(o => o.map(org => org.entity.name)),
+        tap((o: string[]) => this.allQuotas = o)
+      );
+
+    this.quotasSubscription = quotaDefinitions$.subscribe();
   }
 
   nameTakenValidator = (): ValidatorFn => {
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts b/src/frontend/packages/core/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts
index a5055fbf0a..154be20360 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts
+++ b/src/frontend/packages/core/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts
@@ -1,19 +1,12 @@
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { AbstractControl, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
-import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 import { filter, map, tap } from 'rxjs/operators';
 
-import { GetOrganizationSpaceQuotaDefinitions } from '../../../../../cloud-foundry/src/actions/quota-definitions.actions';
-import { cfEntityFactory } from '../../../../../cloud-foundry/src/cf-entity-factory';
-import { spaceQuotaEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
+import { cfEntityCatalog } from '../../../../../cloud-foundry/src/cf-entity-catalog';
 import { createEntityRelationPaginationKey } from '../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { AppState } from '../../../../../store/src/app-state';
 import { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
-import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
-import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
-import { APIResource } from '../../../../../store/src/types/api.types';
 import { IQuotaDefinition } from '../../../core/cf-api.types';
 import { safeUnsubscribe } from '../../../core/utils.service';
 
@@ -28,15 +21,13 @@ export class SpaceQuotaDefinitionFormComponent implements OnInit, OnDestroy {
   cfGuid: string;
   orgGuid: string;
   allQuotas: string[];
-  spaceQuotaDefinitions$: Observable<APIResource<IQuotaDefinition>[]>;
+  spaceQuotaDefinitions$: Observable<string[]>;
   formGroup: FormGroup;
 
   @Input() quota: IQuotaDefinition;
 
   constructor(
-    private store: Store<AppState>,
     private activatedRoute: ActivatedRoute,
-    private paginationMonitorFactory: PaginationMonitorFactory,
   ) {
     this.cfGuid = this.activatedRoute.snapshot.params.endpointId;
     this.orgGuid = this.activatedRoute.snapshot.params.orgId;
@@ -65,24 +56,16 @@ export class SpaceQuotaDefinitionFormComponent implements OnInit, OnDestroy {
   }
 
   fetchQuotasDefinitions() {
-    const spaceQuotaPaginationKey = createEntityRelationPaginationKey(endpointSchemaKey, this.cfGuid);
-    const action = new GetOrganizationSpaceQuotaDefinitions(spaceQuotaPaginationKey, this.orgGuid, this.cfGuid);
-    this.spaceQuotaDefinitions$ = getPaginationObservables<APIResource>(
-      {
-        store: this.store,
-        action,
-        paginationMonitor: this.paginationMonitorFactory.create(
-          spaceQuotaPaginationKey,
-          cfEntityFactory(spaceQuotaEntityType),
-          action.flattenPagination
-        )
-      },
-      action.flattenPagination
-    ).entities$.pipe(
-      filter(o => !!o),
-      map(o => o.map(org => org.entity.name)),
-      tap((o) => this.allQuotas = o)
-    );
+    this.spaceQuotaDefinitions$ = cfEntityCatalog.spaceQuota.store.getAllInOrganization.getPaginationService(
+      this.orgGuid,
+      this.cfGuid,
+      createEntityRelationPaginationKey(endpointSchemaKey, this.cfGuid)
+    ).entities$
+      .pipe(
+        filter(o => !!o),
+        map(o => o.map(org => org.entity.name)),
+        tap((o) => this.allQuotas = o)
+      );
 
     this.quotasSubscription = this.spaceQuotaDefinitions$.subscribe();
   }
diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts
index 91e4819fba..22bf3bd7c6 100644
--- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts
+++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts
@@ -4,17 +4,12 @@ import { AfterViewInit, Component, NgZone, OnDestroy, OnInit, ViewChild, ViewCon
 import { MatDrawer } from '@angular/material';
 import { ActivatedRoute, ActivatedRouteSnapshot, NavigationEnd, Route, Router } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from 'frontend/packages/store/src/entity-catalog/entity-catalog.types';
 import { combineLatest, Observable, of, Subscription } from 'rxjs';
 import { distinctUntilChanged, filter, map, startWith, withLatestFrom } from 'rxjs/operators';
 
 import { GetCurrentUsersRelations } from '../../../../../cloud-foundry/src/actions/permissions.actions';
-import { cfInfoEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
+import { cfEntityCatalog } from '../../../../../cloud-foundry/src/cf-entity-catalog';
 import { CF_ENDPOINT_TYPE } from '../../../../../cloud-foundry/src/cf-types';
-import {
-  CfInfoDefinitionActionBuilders,
-} from '../../../../../cloud-foundry/src/entity-action-builders/cf-info.action-builders';
 import { CloseSideNav, DisableMobileNav, EnableMobileNav } from '../../../../../store/src/actions/dashboard-actions';
 import { GetUserFavoritesAction } from '../../../../../store/src/actions/user-favourites-actions/get-user-favorites-action';
 import { DashboardOnlyAppState } from '../../../../../store/src/app-state';
@@ -144,10 +139,7 @@ export class DashboardBaseComponent implements OnInit, OnDestroy, AfterViewInit
     );
     // TODO: Move cf code out to cf module #3849
     this.endpointsService.registerHealthCheck(
-      new EndpointHealthCheck(CF_ENDPOINT_TYPE, (endpoint) => {
-        entityCatalog.getEntity<IEntityMetadata, any, CfInfoDefinitionActionBuilders>(CF_ENDPOINT_TYPE, cfInfoEntityType)
-          .actionDispatchManager.dispatchGet(endpoint.guid);
-      })
+      new EndpointHealthCheck(CF_ENDPOINT_TYPE, (endpoint) => cfEntityCatalog.cfInfo.api.get(endpoint.guid))
     );
     this.dispatchRelations();
     this.store.dispatch(new GetUserFavoritesAction());
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.ts
index 978f098196..13bddabaaa 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-connection-cell/backup-connection-cell.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
 import { EndpointModel, SystemSharedUserGuid } from '../../../../../../store/src/types/endpoint.types';
 import { TableCellCustom } from '../../../../shared/components/list/list.types';
 import { BackupEndpointsService } from '../backup-endpoints.service';
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
index d10c9144e8..5251a66479 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints.service.ts
@@ -5,7 +5,7 @@ import { BehaviorSubject, Observable } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 
 import { GeneralEntityAppState } from '../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
 import { BrowserStandardEncoder } from '../../../helper';
 import {
diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
index 1d24656803..3ad6856b48 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts
@@ -7,7 +7,7 @@ import { filter, first, map } from 'rxjs/operators';
 
 import { GetAllEndpoints } from '../../../../../../store/src/actions/endpoint.actions';
 import { AppState } from '../../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { EndpointModel } from '../../../../../../store/src/types/endpoint.types';
diff --git a/src/frontend/packages/core/src/features/endpoints/connect-endpoint/connect-endpoint.component.ts b/src/frontend/packages/core/src/features/endpoints/connect-endpoint/connect-endpoint.component.ts
index 185456b739..fc355c4928 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect-endpoint/connect-endpoint.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect-endpoint/connect-endpoint.component.ts
@@ -15,7 +15,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { EndpointAuthTypeConfig, IAuthForm, IEndpointAuthComponent } from '../../../core/extension/extension-types';
 import { safeUnsubscribe } from '../../../core/utils.service';
 import { ConnectEndpointConfig, ConnectEndpointData, ConnectEndpointService } from '../connect.service';
diff --git a/src/frontend/packages/core/src/features/endpoints/connect.service.ts b/src/frontend/packages/core/src/features/endpoints/connect.service.ts
index 102df34440..015ff5b14d 100644
--- a/src/frontend/packages/core/src/features/endpoints/connect.service.ts
+++ b/src/frontend/packages/core/src/features/endpoints/connect.service.ts
@@ -17,7 +17,7 @@ import { GetSystemInfo } from '../../../../store/src/actions/system.actions';
 import { EndpointOnlyAppState } from '../../../../store/src/app-state';
 import { EndpointsEffect } from '../../../../store/src/effects/endpoint.effects';
 import { SystemEffects } from '../../../../store/src/effects/system.effects';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
 import { endpointSchemaKey } from '../../../../store/src/helpers/entity-factory';
 import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
 import { selectEntity, selectRequestInfo, selectUpdateInfo } from '../../../../store/src/selectors/api.selectors';
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 38ed86cbca..85fedb80c1 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
@@ -5,7 +5,7 @@ import { first, map } from 'rxjs/operators';
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
 import { GeneralEntityAppState } from '../../../../../../store/src/app-state';
 import { selectSessionData } from '../../../../../../store/src/reducers/auth.reducer';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
 import { BASE_REDIRECT_QUERY } from '../../../../shared/components/stepper/stepper.types';
 import { TileConfigManager } from '../../../../shared/components/tile/tile-selector.helpers';
 import { ITileConfig, ITileData } from '../../../../shared/components/tile/tile-selector.types';
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 1a576df5dd..c2ca34a7c9 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
@@ -10,8 +10,10 @@ import { GetAllEndpoints, RegisterEndpoint } from '../../../../../../store/src/a
 import { ShowSnackBar } from '../../../../../../store/src/actions/snackBar.actions';
 import { GeneralEntityAppState } from '../../../../../../store/src/app-state';
 import { EndpointsEffect } from '../../../../../../store/src/effects/endpoint.effects';
-import { StratosCatalogEndpointEntity } from '../../../../../../store/src/entity-catalog/entity-catalog-entity';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
+import {
+  StratosCatalogEndpointEntity,
+} from '../../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { endpointSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
 import { getAPIRequestDataState, selectUpdateInfo } from '../../../../../../store/src/selectors/api.selectors';
 import { selectPaginationState } from '../../../../../../store/src/selectors/pagination.selectors';
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 9a2d225ea3..1bd0f9c07c 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,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { getIdFromRoute } from '../../../core/utils.service';
 
 
diff --git a/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts b/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts
index ce966903ba..5f4447afec 100644
--- a/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts
@@ -7,7 +7,7 @@ import { filter, map, first, pairwise, startWith } from 'rxjs/operators';
 import { EndpointModel } from './../../../../../../store/src/types/endpoint.types';
 import { UpdateEndpoint } from './../../../../../../store/src/actions/endpoint.actions';
 import { IStratosEndpointDefinition, EntityCatalogSchemas } from './../../../../../../store/src/entity-catalog/entity-catalog.types';
-import { entityCatalog } from './../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
 import { endpointEntitiesSelector } from './../../../../../../store/src/selectors/endpoint.selectors';
 import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component';
 import { selectUpdateInfo } from '../../../../../../store/src/selectors/api.selectors';
diff --git a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.ts b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.ts
index 348b5ebf48..15bc240559 100644
--- a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.ts
+++ b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.ts
@@ -6,7 +6,7 @@ import { filter, first, map } from 'rxjs/operators';
 
 import { MetricsAPIAction, MetricsAPITargets } from '../../../../../store/src/actions/metrics-api.actions';
 import { AppState } from '../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { getIdFromRoute } from '../../../core/utils.service';
 import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types';
 import { EndpointIcon } from '../../endpoints/endpoint-helpers';
diff --git a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorite-config-mapper.ts b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorite-config-mapper.ts
index 0e39935fd9..94e4d2bbd6 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorite-config-mapper.ts
+++ b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorite-config-mapper.ts
@@ -1,19 +1,21 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
+import {
+  StratosBaseCatalogEntity,
+} from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { EntityCatalogHelpers } from '../../../../../store/src/entity-catalog/entity-catalog.helper';
+import { IEntityMetadata, IStratosEntityDefinition } from '../../../../../store/src/entity-catalog/entity-catalog.types';
+import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
+import { EntityRequestAction } from '../../../../../store/src/types/request.types';
 import {
   IFavoriteMetadata,
   IFavoriteTypeInfo,
   UserFavorite,
   UserFavoriteEndpoint,
 } from '../../../../../store/src/types/user-favorites.types';
-import { StratosBaseCatalogEntity } from '../../../../../store/src/entity-catalog/entity-catalog-entity';
-import { EntityCatalogHelpers } from '../../../../../store/src/entity-catalog/entity-catalog.helper';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata, IStratosEntityDefinition } from '../../../../../store/src/entity-catalog/entity-catalog.types';
 import { MetaCardMenuItem } from '../list/list-cards/meta-card/meta-card-base/meta-card.component';
-import { EntityRequestAction } from '../../../../../store/src/types/request.types';
-import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
 
 
 export interface IFavoriteTypes {
diff --git a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.ts b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.ts
index 7476f5156f..f75c0a63dc 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.ts
+++ b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.ts
@@ -7,6 +7,7 @@ import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import {
   RemoveUserFavoriteAction,
 } from '../../../../../store/src/actions/user-favourites-actions/remove-user-favorite-action';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { endpointEntitiesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../store/src/types/user-favorites.types';
 import { userFavoritesEntitySchema } from '../../../base-entity-schemas';
@@ -16,7 +17,6 @@ import { ComponentEntityMonitorConfig, StratosStatus } from '../../shared.types'
 import { ConfirmationDialogConfig } from '../confirmation-dialog.config';
 import { ConfirmationDialogService } from '../confirmation-dialog.service';
 import { MetaCardMenuItem } from '../list/list-cards/meta-card/meta-card-base/meta-card.component';
-import { entityCatalog } from './../../../../../store/src/entity-catalog/entity-catalog.service';
 import { IFavoritesMetaCardConfig } from './favorite-config-mapper';
 
 
diff --git a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts
index 762a4df7c4..b1fdfc75c7 100644
--- a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts
+++ b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/list-data-source.ts
@@ -29,7 +29,7 @@ import { ListFilter, ListSort } from '../../../../../../store/src/actions/list.a
 import { MetricsAction } from '../../../../../../store/src/actions/metrics.actions';
 import { IgnorePaginationMaxedState, SetResultCount } from '../../../../../../store/src/actions/pagination.actions';
 import { AppState } from '../../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
 import { EntitySchema } from '../../../../../../store/src/helpers/entity-schema';
 import { PaginationMonitor } from '../../../../../../store/src/monitors/pagination-monitor';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
diff --git a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list.helpers.ts b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list.helpers.ts
index 663ef63e5e..c84c1c7402 100644
--- a/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list.helpers.ts
+++ b/src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-list.helpers.ts
@@ -1,4 +1,4 @@
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
 import { PaginationEntityState } from '../../../../../../store/src/types/pagination.types';
 
 export class LocalPaginationHelpers {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.ts
index 9f35194807..02ae1b0203 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.ts
@@ -1,20 +1,17 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Observable, of } from 'rxjs';
 import { filter, first, map, switchMap } from 'rxjs/operators';
 
-import {
-  serviceBrokerEntityType,
-  userProvidedServiceInstanceEntityType,
-} from '../../../../../../../../cloud-foundry/src/cf-entity-types';
+import { cfEntityCatalog } from '../../../../../../../../cloud-foundry/src/cf-entity-catalog';
+import { userProvidedServiceInstanceEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types';
 import { CF_ENDPOINT_TYPE } from '../../../../../../../../cloud-foundry/src/cf-types';
 import {
   getCfService,
   getServiceName,
 } from '../../../../../../../../cloud-foundry/src/features/service-catalog/services-helper';
-import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
+import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
-import { IServiceBroker, IServiceInstance } from '../../../../../../core/cf-api-svc.types';
+import { IServiceInstance } from '../../../../../../core/cf-api-svc.types';
 import { TableCellCustom } from '../../../list.types';
 
 // TODO: Move CF code to CF Module #3769
@@ -35,45 +32,38 @@ export class TableCellServiceComponent extends TableCellCustom<APIResource<IServ
   @Input() row: APIResource<IServiceInstance>;
   @Input() entityKey: string;
 
-  constructor(private entityServiceFactory: EntityServiceFactory) {
-    super();
-  }
 
   ngOnInit() {
     this.isUserProvidedServiceInstance =
       this.entityKey === entityCatalog.getEntityKey(CF_ENDPOINT_TYPE, userProvidedServiceInstanceEntityType);
 
-    const service$ = getCfService(this.row.entity.service_guid, this.row.entity.cfGuid, this.entityServiceFactory).waitForEntity$.pipe(
-      filter(s => !!s),
-    );
-
-    this.serviceName$ = service$.pipe(
-      map(s => this.isUserProvidedServiceInstance ? 'User Provided' : getServiceName(s.entity))
-    );
+    if (!this.isUserProvidedServiceInstance) {
+      const service$ = getCfService(this.row.entity.service_guid, this.row.entity.cfGuid).waitForEntity$.pipe(
+        filter(s => !!s),
+      );
 
-    this.serviceUrl$ = service$.pipe(
-      map(service => `/marketplace/${service.entity.entity.cfGuid}/${service.entity.metadata.guid}/summary`)
-    );
+      this.serviceName$ = service$.pipe(
+        map(s => getServiceName(s.entity))
+      );
 
-    this.serviceBrokerName$ = service$.pipe(
-      first(),
-      switchMap(service => {
-        const brokerGuid = service.entity.entity.service_broker_guid;
-        const serviceBrokerEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, serviceBrokerEntityType);
-        const actionBuilder = serviceBrokerEntity.actionOrchestrator.getActionBuilder('get');
-        const getServiceBrokersAction = actionBuilder(brokerGuid, service.entity.entity.cfGuid);
-        return this.entityServiceFactory.create<APIResource<IServiceBroker>>(
-          brokerGuid,
-          getServiceBrokersAction
-        ).waitForEntity$.pipe(
-          map(a => a.entity),
-          filter(res => !!res),
-          map(a => a.entity.name),
-          first()
-        );
-      })
-    );
+      this.serviceUrl$ = this.isUserProvidedServiceInstance ? of(null) : service$.pipe(
+        map(service => `/marketplace/${service.entity.entity.cfGuid}/${service.entity.metadata.guid}/summary`)
+      );
 
+      this.serviceBrokerName$ = service$.pipe(
+        first(),
+        switchMap(service => {
+          const brokerGuid = service.entity.entity.service_broker_guid;
+          return cfEntityCatalog.serviceBroker.store.getEntityService(brokerGuid, service.entity.entity.cfGuid, {})
+            .waitForEntity$.pipe(
+              map(a => a.entity),
+              filter(res => !!res),
+              map(a => a.entity.name),
+              first()
+            );
+        })
+      );
+    }
   }
 
 }
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 e8a189b97a..42cdbed9bf 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
@@ -15,8 +15,10 @@ import { AppState } from 'frontend/packages/store/src/app-state';
 import { Observable, of, ReplaySubject, Subscription } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 
-import { StratosCatalogEndpointEntity } from '../../../../../../../../store/src/entity-catalog/entity-catalog-entity';
-import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog';
+import {
+  StratosCatalogEndpointEntity,
+} from '../../../../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { EndpointModel } from '../../../../../../../../store/src/types/endpoint.types';
 import { UserFavoriteEndpoint } from '../../../../../../../../store/src/types/user-favorites.types';
 import { safeUnsubscribe } from '../../../../../../core/utils.service';
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers.ts
index a90bb816ad..25ba15e604 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers.ts
@@ -9,13 +9,13 @@ import { DisconnectEndpoint, UnregisterEndpoint } from '../../../../../../../sto
 import { ShowSnackBar } from '../../../../../../../store/src/actions/snackBar.actions';
 import { GetSystemInfo } from '../../../../../../../store/src/actions/system.actions';
 import { EndpointsEffect } from '../../../../../../../store/src/effects/endpoint.effects';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
 import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
 import { selectDeletionInfo, selectUpdateInfo } from '../../../../../../../store/src/selectors/api.selectors';
 import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
 import { STRATOS_ENDPOINT_TYPE } from '../../../../../base-entity-schemas';
 import { CurrentUserPermissions } from '../../../../../core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../core/current-user-permissions.service';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { LoggerService } from '../../../../../core/logger.service';
 import {
   ConnectEndpointDialogComponent,
@@ -98,7 +98,7 @@ export class EndpointListHelper {
         description: '',
         createVisible: (row$: Observable<EndpointModel>) => row$.pipe(map(row => {
           const endpoint = entityCatalog.getEndpoint(row.cnsi_type, row.sub_type);
-          const ep = endpoint ? endpoint.definition : {unConnectable: false};
+          const ep = endpoint ? endpoint.definition : { unConnectable: false };
           return !ep.unConnectable && row.connectionStatus === 'disconnected';
         }))
       },
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 8483e01383..e7516adeed 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
@@ -4,7 +4,7 @@ import { filter } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
 import { EntityMonitorFactory } from '../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { InternalEventMonitorFactory } from '../../../../../../../store/src/monitors/internal-event-monitor.factory';
 import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory';
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-details/table-cell-endpoint-details.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-details/table-cell-endpoint-details.component.ts
index e402966099..33ce1723a0 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-details/table-cell-endpoint-details.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-details/table-cell-endpoint-details.component.ts
@@ -9,8 +9,8 @@ import {
   ViewContainerRef,
 } from '@angular/core';
 
+import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog';
 import { EndpointModel } from '../../../../../../../../store/src/types/endpoint.types';
-import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { TableCellCustom } from '../../../list.types';
 import { EndpointListDetailsComponent, EndpointListHelper } from '../endpoint-list.helpers';
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.ts
index fb694f04f3..62928cef55 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.ts
@@ -3,11 +3,11 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/internal/operators/map';
 
 import { GetAllEndpoints } from '../../../../../../../../store/src/actions/endpoint.actions';
+import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog';
+import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { EndpointModel } from '../../../../../../../../store/src/types/endpoint.types';
 import { EndpointsService } from '../../../../../../core/endpoints.service';
-import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { TableCellCustom } from '../../../list.types';
-import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog.service';
 
 export interface RowWithEndpointId {
   endpointId: string;
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.ts
index 148bb9a7de..7d1d870f70 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component.ts
@@ -1,8 +1,8 @@
 import { Component, Input, OnInit } from '@angular/core';
 
+import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog';
 import { EndpointModel } from '../../../../../../../../store/src/types/endpoint.types';
 import { TableCellCustom } from '../../../list.types';
-import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog.service';
 
 @Component({
   selector: 'app-table-cell-endpoint-status',
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-data-source.ts b/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-data-source.ts
index c93962a412..a376791728 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-data-source.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-data-source.ts
@@ -2,12 +2,11 @@ import { Store } from '@ngrx/store';
 import { of as observableOf } from 'rxjs';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
+import { cfEntityCatalog } from '../../../../../../../cloud-foundry/src/cf-entity-catalog';
 import { CFEntitySchema } from '../../../../../../../cloud-foundry/src/cf-entity-schema-types';
 import { gitCommitEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
-import { CF_ENDPOINT_TYPE } from '../../../../../../../cloud-foundry/src/cf-types';
 import { GitMeta } from '../../../../../../../cloud-foundry/src/entity-action-builders/git-action-builder';
 import { GitCommit } from '../../../../../../../cloud-foundry/src/store/types/git.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { GitSCM } from '../../../../data-services/scm/scm';
 import { ListDataSource } from '../../data-sources-controllers/list-data-source';
 import { IListConfig } from '../../list.component.types';
@@ -30,15 +29,12 @@ export class GithubCommitsDataSource extends ListDataSource<GitCommit> {
     sha: string,
     commitSha?: string,
   ) {
-    const gitCommitEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, gitCommitEntityType);
-    const fetchCommitActionBuilder = gitCommitEntity.actionOrchestrator.getActionBuilder('getMultiple');
     const gitMeta: GitMeta = {
       scm,
       projectName,
       commitSha: sha
     };
-    const fetchCommitAction = fetchCommitActionBuilder(sha, null, gitMeta);
-    const action = fetchCommitAction;
+    const action = cfEntityCatalog.gitCommit.actions.getMultiple(sha, null, gitMeta);
     const paginationKey = action.paginationKey;
     const rowsState = observableOf(commitSha ? {
       [commitSha]: {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-app-tab.service.ts b/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-app-tab.service.ts
index 9d8fbab53c..28816401e5 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-app-tab.service.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-app-tab.service.ts
@@ -13,14 +13,12 @@ import {
   StoreCFSettings,
 } from '../../../../../../../cloud-foundry/src/actions/deploy-applications.actions';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { gitBranchesEntityType, gitCommitEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
-import { CF_ENDPOINT_TYPE } from '../../../../../../../cloud-foundry/src/cf-types';
+import { cfEntityCatalog } from '../../../../../../../cloud-foundry/src/cf-entity-catalog';
+import { gitCommitEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
 import { ApplicationService } from '../../../../../../../cloud-foundry/src/features/applications/application.service';
 import { selectCfEntity } from '../../../../../../../cloud-foundry/src/store/selectors/api.selectors';
-import { GitBranch, GitCommit } from '../../../../../../../cloud-foundry/src/store/types/git.types';
+import { GitCommit } from '../../../../../../../cloud-foundry/src/store/types/git.types';
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityServiceFactory } from '../../../../../../../store/src/entity-service-factory.service';
 import { GitSCM } from '../../../../data-services/scm/scm';
 import { GitSCMService, GitSCMType } from '../../../../data-services/scm/scm.service';
 import { IListAction } from '../../list.component.types';
@@ -103,7 +101,6 @@ export class GithubCommitsListConfigServiceAppTab extends GithubCommitsListConfi
     datePipe: DatePipe,
     private scmService: GitSCMService,
     private applicationService: ApplicationService,
-    private entityServiceFactory: EntityServiceFactory
   ) {
     super(store, datePipe);
     this.setGuids();
@@ -131,25 +128,19 @@ export class GithubCommitsListConfigServiceAppTab extends GithubCommitsListConfi
       const scmType = stratosProject.deploySource.scm || stratosProject.deploySource.type;
       this.scm = this.scmService.getSCM(scmType as GitSCMType);
 
-      const branchKey = `${scmType}-${this.projectName}-${stratosProject.deploySource.branch}`;
-      const gitBranchesEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, gitBranchesEntityType);
-      const fetchBranchesActionBuilder = gitBranchesEntity.actionOrchestrator.getActionBuilder('get');
-      const fetchBranchesAction = fetchBranchesActionBuilder(this.projectName, this.cfGuid, {
+      cfEntityCatalog.gitBranch.store.getEntityService(undefined, undefined, {
         scm: this.scm,
-        projectName: this.projectName
-      });
-      const gitBranchEntityService = this.entityServiceFactory.create<GitBranch>(
-        branchKey,
-        fetchBranchesAction
-      );
-      gitBranchEntityService.waitForEntity$.pipe(
-        first(),
-      ).subscribe(branch => {
-        this.branchName = branch.entity.name;
-        this.dataSource = new GithubCommitsDataSource(
-          this.store, this, this.scm, this.projectName, this.branchName, this.deployedCommitSha);
-        this.initialised.next(true);
-      });
+        projectName: this.projectName,
+        branchName: stratosProject.deploySource.branch
+      })
+        .waitForEntity$.pipe(
+          first(),
+        ).subscribe(branch => {
+          this.branchName = branch.entity.name;
+          this.dataSource = new GithubCommitsDataSource(
+            this.store, this, this.scm, this.projectName, this.branchName, this.deployedCommitSha);
+          this.initialised.next(true);
+        });
 
       this.setDeployedCommitDetails();
     });
diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.ts b/src/frontend/packages/core/src/shared/components/list/list.component.ts
index 557bf779ab..5c14153089 100644
--- a/src/frontend/packages/core/src/shared/components/list/list.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list.component.ts
@@ -51,7 +51,7 @@ import {
 } from '../../../../../store/src/actions/list.actions';
 import { SetClientFilterKey, SetPage } from '../../../../../store/src/actions/pagination.actions';
 import { GeneralAppState } from '../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { EntityCatalogEntityConfig } from '../../../../../store/src/entity-catalog/entity-catalog.types';
 import { ActionState } from '../../../../../store/src/reducers/api-request-reducer/types';
 import { getListStateObservables } from '../../../../../store/src/reducers/list.reducer';
@@ -230,7 +230,7 @@ export class ListComponent<T> implements OnInit, OnChanges, OnDestroy, AfterView
     private store: Store<GeneralAppState>,
     private cd: ChangeDetectorRef,
     @Optional() public config: ListConfig<T>,
-    private ngZone: NgZone
+    private ngZone: NgZone,
   ) { }
 
   ngOnInit() {
@@ -690,8 +690,7 @@ export class ListComponent<T> implements OnInit, OnChanges, OnDestroy, AfterView
         return observableOf(getDefaultRowState());
       }
       const catalogEntity = entityCatalog.getEntity(entityConfig);
-      const entityMonitor = catalogEntity.getEntityMonitor(
-        this.store,
+      const entityMonitor = catalogEntity.store.getEntityMonitor(
         dataSource.getRowUniqueId(row),
         {
           schemaKey: entityConfig.schemaKey
diff --git a/src/frontend/packages/core/src/shared/components/list/max-list-message/max-list-message.component.ts b/src/frontend/packages/core/src/shared/components/list/max-list-message/max-list-message.component.ts
index 1e82d3bd24..36294cb32f 100644
--- a/src/frontend/packages/core/src/shared/components/list/max-list-message/max-list-message.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/max-list-message/max-list-message.component.ts
@@ -4,7 +4,7 @@ import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
 import { AppState } from '../../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
 import { EntityCatalogEntityConfig } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
 import {
   PaginationPageIteratorConfig,
diff --git a/src/frontend/packages/core/src/shared/components/list/simple-list/entity-catalog-datasource.ts b/src/frontend/packages/core/src/shared/components/list/simple-list/entity-catalog-datasource.ts
index ad051defa2..0b75bc20e1 100644
--- a/src/frontend/packages/core/src/shared/components/list/simple-list/entity-catalog-datasource.ts
+++ b/src/frontend/packages/core/src/shared/components/list/simple-list/entity-catalog-datasource.ts
@@ -1,10 +1,13 @@
-import { ListDataSource } from '../data-sources-controllers/list-data-source';
 import { Store } from '@ngrx/store';
-import { StratosBaseCatalogEntity } from '../../../../../../store/src/entity-catalog/entity-catalog-entity';
-import { ListConfig, ListViewTypes } from '../list.component.types';
-import { createTableColumnFavorite } from '../list-table/table-cell-favorite/table-cell-favorite.component';
+
+import {
+  StratosBaseCatalogEntity,
+} from '../../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { EntityPipelineEntity } from '../../../../../../store/src/entity-request-pipeline/pipeline.types';
 import { UserFavorite } from '../../../../../../store/src/types/user-favorites.types';
-import { EntityPipelineEntity, } from '../../../../../../store/src/entity-request-pipeline/pipeline.types';
+import { ListDataSource } from '../data-sources-controllers/list-data-source';
+import { createTableColumnFavorite } from '../list-table/table-cell-favorite/table-cell-favorite.component';
+import { ListConfig, ListViewTypes } from '../list.component.types';
 
 export interface GetMultipleActionConfig {
   endpointGuid?: string;
diff --git a/src/frontend/packages/core/src/shared/components/list/simple-list/simple-list.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/simple-list/simple-list.component.spec.ts
index 94b7067d6c..a3edaef193 100644
--- a/src/frontend/packages/core/src/shared/components/list/simple-list/simple-list.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/simple-list/simple-list.component.spec.ts
@@ -1,15 +1,18 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
 
-import { SimpleListComponent } from './simple-list.component';
-import { SharedModule } from '../../../shared.module';
-import { CoreModule } from '../../../../core/core.module';
-import { AppReducersModule } from '../../../../../../store/src/reducers.module';
-import { StratosCatalogEntity, StratosCatalogEndpointEntity } from '../../../../../../store/src/entity-catalog/entity-catalog-entity';
+import { EntityCatalogTestModule, TEST_CATALOGUE_ENTITIES } from '../../../../../../store/src/entity-catalog-test.module';
+import {
+  StratosCatalogEndpointEntity,
+  StratosCatalogEntity,
+} from '../../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { StratosEndpointExtensionDefinition } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
 import { EntitySchema } from '../../../../../../store/src/helpers/entity-schema';
-import { EntityCatalogTestModule, TEST_CATALOGUE_ENTITIES } from '../../../../../../store/src/entity-catalog-test.module';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { RouterTestingModule } from '@angular/router/testing';
+import { AppReducersModule } from '../../../../../../store/src/reducers.module';
+import { CoreModule } from '../../../../core/core.module';
+import { SharedModule } from '../../../shared.module';
+import { SimpleListComponent } from './simple-list.component';
 
 describe('SimpleListComponent', () => {
   let component: SimpleListComponent;
diff --git a/src/frontend/packages/core/src/shared/components/list/simple-list/simple-list.component.ts b/src/frontend/packages/core/src/shared/components/list/simple-list/simple-list.component.ts
index 64568a8aea..b5377d1ee4 100644
--- a/src/frontend/packages/core/src/shared/components/list/simple-list/simple-list.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/simple-list/simple-list.component.ts
@@ -1,11 +1,14 @@
-import { Component, OnInit, Input, ChangeDetectorRef, NgZone, ComponentFactoryResolver, ViewChild, Injector } from '@angular/core';
-import { StratosCatalogEntity } from '../../../../../../store/src/entity-catalog/entity-catalog-entity';
+import { Component, ComponentFactoryResolver, Injector, Input, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Store } from '@ngrx/store';
+
+import {
+  StratosCatalogEntity,
+} from '../../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { ListComponent } from '../list.component';
-import { ListConfig, ListViewTypes } from '../list.component.types';
-import { ListHostDirective } from './list-host.directive';
+import { ListConfig } from '../list.component.types';
 import { CatalogEntityDrivenListDataSource } from './entity-catalog-datasource';
-import { Store } from '@ngrx/store';
-import { ActivatedRoute } from '@angular/router';
+import { ListHostDirective } from './list-host.directive';
 
 @Component({
   selector: 'app-simple-list',
diff --git a/src/frontend/packages/core/src/shared/data-services/scm/github-scm.ts b/src/frontend/packages/core/src/shared/data-services/scm/github-scm.ts
index 5de5a777ca..f58b374197 100644
--- a/src/frontend/packages/core/src/shared/data-services/scm/github-scm.ts
+++ b/src/frontend/packages/core/src/shared/data-services/scm/github-scm.ts
@@ -32,6 +32,10 @@ export class GitHubSCM implements GitSCM {
     return httpClient.get(`${this.gitHubURL}/repos/${projectName}`) as Observable<GitRepo>;
   }
 
+  getBranch(httpClient: HttpClient, projectName: string, branchName: string): Observable<GitBranch> {
+    return httpClient.get(`${this.gitHubURL}/repos/${projectName}/branches/${branchName}`) as Observable<GitBranch>;
+  }
+
   getBranches(httpClient: HttpClient, projectName: string): Observable<GitBranch[]> {
     return httpClient.get(`${this.gitHubURL}/repos/${projectName}/branches`) as Observable<GitBranch[]>;
   }
@@ -44,8 +48,8 @@ export class GitHubSCM implements GitSCM {
     return `${this.gitHubURL}/repos/${projectName}/commits/${commitSha}`;
   }
 
-  getCommits(httpClient: HttpClient, projectName: string, commitSha: string): Observable<GitCommit[]> {
-    return httpClient.get(`${this.gitHubURL}/repos/${projectName}/commits?sha=${commitSha}`) as Observable<GitCommit[]>;
+  getCommits(httpClient: HttpClient, projectName: string, ref: string): Observable<GitCommit[]> {
+    return httpClient.get(`${this.gitHubURL}/repos/${projectName}/commits?sha=${ref}`) as Observable<GitCommit[]>;
   }
 
   getCloneURL(projectName: string): string {
diff --git a/src/frontend/packages/core/src/shared/data-services/scm/gitlab-scm.ts b/src/frontend/packages/core/src/shared/data-services/scm/gitlab-scm.ts
index 2b6daa1931..90c079e14b 100644
--- a/src/frontend/packages/core/src/shared/data-services/scm/gitlab-scm.ts
+++ b/src/frontend/packages/core/src/shared/data-services/scm/gitlab-scm.ts
@@ -46,6 +46,17 @@ export class GitLabSCM implements GitSCM {
     );
   }
 
+  getBranch(httpClient: HttpClient, projectName: string, branchName: string): Observable<GitBranch> {
+    const prjNameEncoded = encodeURIComponent(projectName);
+    return httpClient.get(`${gitLabAPIUrl}/projects/${prjNameEncoded}/repository/branches/${branchName}`).pipe(
+      map((data: any) => {
+        const nb = { ...data };
+        nb.commit.sha = nb.commit.id;
+        return nb;
+      })
+    );
+  }
+
   getBranches(httpClient: HttpClient, projectName: string): Observable<GitBranch[]> {
     const prjNameEncoded = encodeURIComponent(projectName);
     return httpClient.get(`${gitLabAPIUrl}/projects/${prjNameEncoded}/repository/branches`).pipe(
diff --git a/src/frontend/packages/core/src/shared/data-services/scm/scm.ts b/src/frontend/packages/core/src/shared/data-services/scm/scm.ts
index eb25e03cb9..d20a2c9538 100644
--- a/src/frontend/packages/core/src/shared/data-services/scm/scm.ts
+++ b/src/frontend/packages/core/src/shared/data-services/scm/scm.ts
@@ -15,6 +15,7 @@ export interface GitSCM {
   getLabel(): string;
   getIcon(): SCMIcon;
   getRepository(httpClient: HttpClient, projectName: string): Observable<GitRepo>;
+  getBranch(httpClient: HttpClient, projectName: string, branchId: string): Observable<GitBranch>;
   getBranches(httpClient: HttpClient, projectName: string): Observable<GitBranch[]>;
   getCommit(httpClient: HttpClient, projectName: string, commitSha: string): Observable<GitCommit>;
   getCommits(httpClient: HttpClient, projectName: string, commitSha: string): Observable<GitCommit[]>;
diff --git a/src/frontend/packages/core/src/shared/services/cf-org-space-label.service.ts b/src/frontend/packages/core/src/shared/services/cf-org-space-label.service.ts
index 933441c5d6..e9690804fa 100644
--- a/src/frontend/packages/core/src/shared/services/cf-org-space-label.service.ts
+++ b/src/frontend/packages/core/src/shared/services/cf-org-space-label.service.ts
@@ -12,7 +12,7 @@ import { APIResource } from '../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 import { STRATOS_ENDPOINT_TYPE } from '../../base-entity-schemas';
 import { IOrganization, ISpace } from '../../core/cf-api.types';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
 
 export class CfOrgSpaceLabelService {
 
diff --git a/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts b/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts
index 6fa1765b3b..7fcb69adba 100644
--- a/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts
+++ b/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts
@@ -4,59 +4,26 @@ import { combineLatest, Observable } from 'rxjs';
 import { filter, first, map, pairwise, tap } from 'rxjs/operators';
 
 import {
-  CreateUserProvidedServiceInstance,
   getUserProvidedServiceInstanceRelations,
   IUserProvidedServiceInstanceData,
-  UpdateUserProvidedServiceInstance,
 } from '../../../../cloud-foundry/src/actions/user-provided-service.actions';
 import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
-import {
-  organizationEntityType,
-  serviceInstancesEntityType,
-  spaceEntityType,
-  userProvidedServiceInstanceEntityType,
-} from '../../../../cloud-foundry/src/cf-entity-types';
-import { CF_ENDPOINT_TYPE } from '../../../../cloud-foundry/src/cf-types';
-import {
-  UserProvidedServiceActionBuilder,
-} from '../../../../cloud-foundry/src/entity-action-builders/user-provided-service.action-builders';
+import { cfEntityCatalog } from '../../../../cloud-foundry/src/cf-entity-catalog';
+import { organizationEntityType, spaceEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
 import { createEntityRelationPaginationKey } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { fetchTotalResults } from '../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import { QParam, QParamJoiners } from '../../../../cloud-foundry/src/shared/q-param';
-import { selectCfRequestInfo } from '../../../../cloud-foundry/src/store/selectors/api.selectors';
 import { ClearPaginationOfType } from '../../../../store/src/actions/pagination.actions';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityCatalogEntityConfig, IEntityMetadata } from '../../../../store/src/entity-catalog/entity-catalog.types';
-import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { RequestInfoState } from '../../../../store/src/reducers/api-request-reducer/types';
-import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../store/src/types/api.types';
-import { PaginatedAction } from '../../../../store/src/types/pagination.types';
 import { IUserProvidedServiceInstance } from '../../core/cf-api-svc.types';
 
-
 @Injectable()
 export class CloudFoundryUserProvidedServicesService {
 
-  private serviceInstancesEntityConfig: EntityCatalogEntityConfig = {
-    endpointType: CF_ENDPOINT_TYPE,
-    entityType: serviceInstancesEntityType
-  };
-
-  private userProvidedServiceInstancesEntityConfig: EntityCatalogEntityConfig = {
-    endpointType: CF_ENDPOINT_TYPE,
-    entityType: userProvidedServiceInstanceEntityType
-  };
-
-  private userProvidedServiceEntity = entityCatalog.getEntity<IEntityMetadata, any, UserProvidedServiceActionBuilder>(
-    CF_ENDPOINT_TYPE,
-    userProvidedServiceInstanceEntityType
-  );
-
   constructor(
     private store: Store<CFAppState>,
-    private entityServiceFactory: EntityServiceFactory,
     private paginationMonitorFactory: PaginationMonitorFactory,
   ) {
 
@@ -64,17 +31,10 @@ export class CloudFoundryUserProvidedServicesService {
 
   public getUserProvidedServices(cfGuid: string, spaceGuid?: string, relations = getUserProvidedServiceInstanceRelations)
     : Observable<APIResource<IUserProvidedServiceInstance>[]> {
-    const actionBuilder = this.userProvidedServiceEntity.actionOrchestrator.getActionBuilder('getAllInSpace');
-    const action = actionBuilder(cfGuid, spaceGuid, null, relations, true);
-    const pagObs = getPaginationObservables({
-      store: this.store,
-      action,
-      paginationMonitor: this.paginationMonitorFactory.create(
-        action.paginationKey,
-        action,
-        action.flattenPagination
-      )
-    }, action.flattenPagination);
+
+    const pagObs = cfEntityCatalog.userProvidedService.store.getAllInSpace.getPaginationService(
+      cfGuid, spaceGuid, null, relations, true
+    );
     return combineLatest([
       pagObs.entities$, // Ensure entities is subbed to the fetch kicks off
       pagObs.fetchingEntities$
@@ -88,12 +48,12 @@ export class CloudFoundryUserProvidedServicesService {
     : Observable<number> {
     const parentSchemaKey = spaceGuid ? spaceEntityType : orgGuid ? organizationEntityType : 'cf';
     const uniqueKey = spaceGuid || orgGuid || cfGuid;
-    const actionBuilder = this.userProvidedServiceEntity.actionOrchestrator.getActionBuilder('getMultiple');
-    const action = actionBuilder(
+
+    const action = cfEntityCatalog.userProvidedService.actions.getMultiple(
       createEntityRelationPaginationKey(parentSchemaKey, uniqueKey),
       cfGuid,
       { includeRelations: [], populateMissing: false }
-    ) as PaginatedAction;
+    );
     action.initialParams.q = [];
     if (orgGuid) {
       action.initialParams.q.push(new QParam('organization_guid', orgGuid, QParamJoiners.in).toString());
@@ -105,13 +65,7 @@ export class CloudFoundryUserProvidedServicesService {
   }
 
   public getUserProvidedService(cfGuid: string, upsGuid: string): Observable<APIResource<IUserProvidedServiceInstance>> {
-    const actionBuilder = this.userProvidedServiceEntity.actionOrchestrator.getActionBuilder('get');
-    const getUserProvidedServiceAction = actionBuilder(upsGuid, cfGuid);
-    const service = this.entityServiceFactory.create<APIResource<IUserProvidedServiceInstance>>(
-      upsGuid,
-      getUserProvidedServiceAction
-    );
-    return service.waitForEntity$.pipe(
+    return cfEntityCatalog.userProvidedService.store.getEntityService(upsGuid, cfGuid, {}).waitForEntity$.pipe(
       map(e => e.entity)
     );
   }
@@ -121,10 +75,12 @@ export class CloudFoundryUserProvidedServicesService {
     guid: string,
     data: IUserProvidedServiceInstanceData
   ): Observable<RequestInfoState> {
-    const action = new CreateUserProvidedServiceInstance(cfGuid, guid, data, this.userProvidedServiceInstancesEntityConfig);
-    const create$ = this.store.select(selectCfRequestInfo(userProvidedServiceInstanceEntityType, guid));
-    this.store.dispatch(action);
-    return create$.pipe(
+    return cfEntityCatalog.userProvidedService.api.create<RequestInfoState>(
+      cfGuid,
+      guid,
+      data,
+      // this.userProvidedServiceInstancesEntityConfig
+    ).pipe(
       pairwise(),
       filter(([oldV, newV]) => oldV.creating && !newV.creating),
       map(([, newV]) => newV),
@@ -133,7 +89,7 @@ export class CloudFoundryUserProvidedServicesService {
         if (!v.error) {
           // Problem - Lists with multiple actions aren't updated following the creation of an entity based on secondary action
           // Here the service instance list (1st action SI, 2nd action UPSI) isn't updated so manually do so
-          this.store.dispatch(new ClearPaginationOfType(this.serviceInstancesEntityConfig));
+          this.store.dispatch(new ClearPaginationOfType(cfEntityCatalog.service));
         }
       })
     );
@@ -144,23 +100,25 @@ export class CloudFoundryUserProvidedServicesService {
     guid: string,
     data: Partial<IUserProvidedServiceInstanceData>,
   ): Observable<RequestInfoState> {
-    this.userProvidedServiceEntity.actionDispatchManager.dispatchUpdate(
+    // TODO: RC Q
+    const updatingKey = cfEntityCatalog.userProvidedService.actions.update(guid, cfGuid, data).updatingKey;
+    // const updatingKey = UpdateUserProvidedServiceInstance.updateServiceInstance;
+    return cfEntityCatalog.userProvidedService.api.update<RequestInfoState>(
       guid,
       cfGuid,
       data,
-      this.userProvidedServiceInstancesEntityConfig
-    );
-    return this.userProvidedServiceEntity.getEntityMonitor(
-      this.store,
-      guid
-    ).entityRequest$.pipe(
-      filter(v => !!v.updating[UpdateUserProvidedServiceInstance.updateServiceInstance]),
+      // this.userProvidedServiceInstancesEntityConfig
+    ).pipe(
+      filter(v => !!v.updating[updatingKey]),
       pairwise(),
       filter(([oldV, newV]) =>
-        oldV.updating[UpdateUserProvidedServiceInstance.updateServiceInstance].busy &&
-        !newV.updating[UpdateUserProvidedServiceInstance.updateServiceInstance].busy),
+        oldV.updating[updatingKey].busy &&
+        !newV.updating[updatingKey].busy),
       map(([, newV]) => newV)
     );
   }
 
 }
+
+
+
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index c380a0c102..b890491046 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -125,7 +125,6 @@ import { PercentagePipe } from './pipes/percentage.pipe';
 import { UptimePipe } from './pipes/uptime.pipe';
 import { UsageBytesPipe } from './pipes/usage-bytes.pipe';
 import { ValuesPipe } from './pipes/values.pipe';
-import { CloudFoundryUserProvidedServicesService } from './services/cloud-foundry-user-provided-services.service';
 import { LongRunningOperationsService } from './services/long-running-op.service';
 import { MetricsRangeSelectorService } from './services/metrics-range-selector.service';
 import { UserPermissionDirective } from './user-permission.directive';
@@ -347,17 +346,13 @@ import { UserPermissionDirective } from './user-permission.directive';
     ApplicationStateService,
     EndpointListHelper,
     EndpointsListConfigService,
-    // CfUserService,
     ConfirmationDialogService,
     EntityMonitorFactory,
     PaginationMonitorFactory,
-    // CloudFoundryService,
     InternalEventMonitorFactory,
-    // ServiceActionHelperService,
     MetricsRangeSelectorService,
     GitSCMService,
-    LongRunningOperationsService,
-    CloudFoundryUserProvidedServicesService
+    LongRunningOperationsService
   ]
 })
 export class SharedModule { }
diff --git a/src/frontend/packages/core/test-framework/application-service-helper.ts b/src/frontend/packages/core/test-framework/application-service-helper.ts
index e4fcb83dab..a9caaa3ae8 100644
--- a/src/frontend/packages/core/test-framework/application-service-helper.ts
+++ b/src/frontend/packages/core/test-framework/application-service-helper.ts
@@ -11,12 +11,10 @@ import { AppStat } from '../../cloud-foundry/src/store/types/app-metadata.types'
 import { RequestInfoState } from '../../store/src/reducers/api-request-reducer/types';
 import { APIResource, EntityInfo } from '../../store/src/types/api.types';
 import { IApp, IAppSummary, IDomain, ISpace } from '../src/core/cf-api.types';
-import { EntityServiceFactory } from '../../store/src/entity-service-factory.service';
 import {
   ApplicationStateData,
   ApplicationStateService,
 } from '../src/shared/components/application-state/application-state.service';
-import { PaginationMonitorFactory } from '../../store/src/monitors/pagination-monitor.factory';
 
 function createEntity<T>(entity: T): APIResource<T> {
   return {
@@ -91,28 +89,22 @@ export function generateTestApplicationServiceProvider(appGuid: string, cfGuid:
     provide: ApplicationService,
     useFactory: (
       store: Store<CFAppState>,
-      entityServiceFactory: EntityServiceFactory,
       applicationStateService: ApplicationStateService,
       applicationEnvVarsService: ApplicationEnvVarsHelper,
-      paginationMonitorFactory: PaginationMonitorFactory,
     ) => {
       const appService = new ApplicationService(
         cfGuid,
         appGuid,
         store,
-        entityServiceFactory,
         applicationStateService,
         applicationEnvVarsService,
-        paginationMonitorFactory
       );
       return appService;
     },
     deps: [
       Store,
-      EntityServiceFactory,
       ApplicationStateService,
       ApplicationEnvVarsHelper,
-      PaginationMonitorFactory
     ]
   };
 }
diff --git a/src/frontend/packages/core/test-framework/core-test.modules.ts b/src/frontend/packages/core/test-framework/core-test.modules.ts
index dd28d46d6b..f2e0bc6e7a 100644
--- a/src/frontend/packages/core/test-framework/core-test.modules.ts
+++ b/src/frontend/packages/core/test-framework/core-test.modules.ts
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 
 import { generateStratosEntities } from '../../core/src/base-entity-types';
 import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../store/src/entity-catalog.module';
-import { entityCatalog, TestEntityCatalog } from '../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog, TestEntityCatalog } from '../../store/src/entity-catalog/entity-catalog';
 
 @NgModule({
   imports: [
diff --git a/src/frontend/packages/core/test-framework/entity-catalog-test-helpers.ts b/src/frontend/packages/core/test-framework/entity-catalog-test-helpers.ts
index b59fcf4258..010004b460 100644
--- a/src/frontend/packages/core/test-framework/entity-catalog-test-helpers.ts
+++ b/src/frontend/packages/core/test-framework/entity-catalog-test-helpers.ts
@@ -1,5 +1,5 @@
-import { StratosBaseCatalogEntity } from '../..store/src/entity-catalog/entity-catalog-entity';
-import { entityCatalog } from '../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../store/src/entity-catalog/entity-catalog';
+import { StratosBaseCatalogEntity } from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { EntityCatalogEntityConfig } from '../../store/src/entity-catalog/entity-catalog.types';
 
 export interface EntityCatalogHelperConfig {
diff --git a/src/frontend/packages/store/src/effects/app.effects.ts b/src/frontend/packages/store/src/effects/app.effects.ts
index e1f43f644b..d4ddf1346d 100644
--- a/src/frontend/packages/store/src/effects/app.effects.ts
+++ b/src/frontend/packages/store/src/effects/app.effects.ts
@@ -3,14 +3,12 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { first, map } from 'rxjs/operators';
 
-import { CF_ENDPOINT_TYPE } from '../../../cloud-foundry/src/cf-types';
 import { ASSIGN_ROUTE_SUCCESS } from '../../../cloud-foundry/src/actions/application-service-routes.actions';
 import { UPDATE_SUCCESS, UpdateExistingApplication } from '../../../cloud-foundry/src/actions/application.actions';
-import { appSummaryEntityType } from '../../../cloud-foundry/src/cf-entity-types';
+import { cfEntityCatalog } from '../../../cloud-foundry/src/cf-entity-catalog';
 import {
   createAppInstancesMetricAction,
 } from '../../../cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service';
-import { entityCatalog } from '../entity-catalog/entity-catalog.service';
 import { endpointHasMetrics } from '../../../core/src/features/endpoints/endpoint-helpers';
 import { EndpointOnlyAppState } from '../app-state';
 import { APISuccessOrFailedAction } from '../types/request.types';
@@ -27,10 +25,7 @@ export class AppEffects {
   @Effect({ dispatch: false }) updateSummary$ = this.actions$.pipe(
     ofType<APISuccessOrFailedAction>(ASSIGN_ROUTE_SUCCESS),
     map(action => {
-      const appSummaryEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appSummaryEntityType);
-      const actionBuilder = appSummaryEntity.actionOrchestrator.getActionBuilder('get');
-      const getAppSummaryAction = actionBuilder(action.apiAction.guid, action.apiAction.endpointGuid);
-      this.store.dispatch(getAppSummaryAction);
+      cfEntityCatalog.appSummary.api.get(action.apiAction.guid, action.apiAction.endpointGuid)
     }),
   );
 
diff --git a/src/frontend/packages/store/src/effects/endpoint.effects.ts b/src/frontend/packages/store/src/effects/endpoint.effects.ts
index 32f5cf3e7e..3ebaf0694a 100644
--- a/src/frontend/packages/store/src/effects/endpoint.effects.ts
+++ b/src/frontend/packages/store/src/effects/endpoint.effects.ts
@@ -1,4 +1,3 @@
-import { UpdateEndpoint, UPDATE_ENDPOINT, UPDATE_ENDPOINT_SUCCESS, UPDATE_ENDPOINT_FAILED } from './../actions/endpoint.actions';
 import { HttpClient, HttpErrorResponse, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
@@ -35,7 +34,7 @@ import { ClearPaginationOfEntity } from '../actions/pagination.actions';
 import { GET_SYSTEM_INFO_SUCCESS, GetSystemInfo, GetSystemSuccess } from '../actions/system.actions';
 import { GetUserFavoritesAction } from '../actions/user-favourites-actions/get-user-favorites-action';
 import { DispatchOnlyAppState } from '../app-state';
-import { entityCatalog } from '../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../entity-catalog/entity-catalog';
 import { endpointSchemaKey } from '../helpers/entity-factory';
 import { ApiRequestTypes } from '../reducers/api-request-reducer/request-helpers';
 import { NormalizedResponse } from '../types/api.types';
@@ -46,6 +45,12 @@ import {
   WrapperRequestActionFailed,
   WrapperRequestActionSuccess,
 } from '../types/request.types';
+import {
+  UPDATE_ENDPOINT,
+  UPDATE_ENDPOINT_FAILED,
+  UPDATE_ENDPOINT_SUCCESS,
+  UpdateEndpoint,
+} from './../actions/endpoint.actions';
 import { PaginatedAction } from './../types/pagination.types';
 
 
@@ -236,36 +241,36 @@ export class EndpointsEffect {
       );
     }));
 
-    @Effect() updateEndpoint$ = this.actions$.pipe(
-      ofType<UpdateEndpoint>(UPDATE_ENDPOINT),
-      mergeMap(action => {
-        const apiAction = this.getEndpointUpdateAction(action.id, action.type, EndpointsEffect.updatingKey);
-        const paramsObj = {
-          name: action.name,
-          skipSSL: action.skipSSL,
-          setClientInfo: action.setClientInfo,
-          clientID: action.clientID,
-          clientSecret: action.clientSecret,
-          allowSSO: action.allowSSO,
-        };
+  @Effect() updateEndpoint$ = this.actions$.pipe(
+    ofType<UpdateEndpoint>(UPDATE_ENDPOINT),
+    mergeMap(action => {
+      const apiAction = this.getEndpointUpdateAction(action.id, action.type, EndpointsEffect.updatingKey);
+      const paramsObj = {
+        name: action.name,
+        skipSSL: action.skipSSL,
+        setClientInfo: action.setClientInfo,
+        clientID: action.clientID,
+        clientSecret: action.clientSecret,
+        allowSSO: action.allowSSO,
+      };
 
-        // Encode auth values in the body, not the query string
-        const body: any = new FormData();
-        Object.keys(paramsObj).forEach(key => {
-          body.set(key, paramsObj[key]);
-        });
+      // Encode auth values in the body, not the query string
+      const body: any = new FormData();
+      Object.keys(paramsObj).forEach(key => {
+        body.set(key, paramsObj[key]);
+      });
 
-        return this.doEndpointAction(
-          apiAction,
-          '/pp/v1/endpoint/' + action.id,
-          new HttpParams({}),
-          'update',
-          [UPDATE_ENDPOINT_SUCCESS, UPDATE_ENDPOINT_FAILED],
-          action.endpointType,
-          body,
-          this.processUpdateError
-        );
-      }));
+      return this.doEndpointAction(
+        apiAction,
+        '/pp/v1/endpoint/' + action.id,
+        new HttpParams({}),
+        'update',
+        [UPDATE_ENDPOINT_SUCCESS, UPDATE_ENDPOINT_FAILED],
+        action.endpointType,
+        body,
+        this.processUpdateError
+      );
+    }));
 
   private processUpdateError(e: HttpErrorResponse): string {
     const err = e.error ? e.error.error : {};
diff --git a/src/frontend/packages/store/src/effects/metrics.effects.ts b/src/frontend/packages/store/src/effects/metrics.effects.ts
index f4bc789531..b075191891 100644
--- a/src/frontend/packages/store/src/effects/metrics.effects.ts
+++ b/src/frontend/packages/store/src/effects/metrics.effects.ts
@@ -4,7 +4,6 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { catchError, map, mergeMap } from 'rxjs/operators';
 
-import { entityCatalog } from '../entity-catalog/entity-catalog.service';
 import {
   METRIC_API_FAILED,
   METRIC_API_START,
@@ -13,6 +12,7 @@ import {
 } from '../actions/metrics-api.actions';
 import { getFullMetricQueryQuery, METRICS_START, MetricsAction } from '../actions/metrics.actions';
 import { DispatchOnlyAppState } from '../app-state';
+import { entityCatalog } from '../entity-catalog/entity-catalog';
 import { IMetricsResponse } from '../types/base-metric.types';
 import { StartRequestAction, WrapperRequestActionFailed, WrapperRequestActionSuccess } from './../types/request.types';
 
@@ -60,11 +60,11 @@ export class MetricsEffect {
             errObservable.message,
             action,
             'fetch', {
-              endpointIds: [action.endpointGuid],
-              url: errObservable.url || fullUrl,
-              eventCode: errObservable.status ? errObservable.status + '' : '500',
-              message: 'Metric request error',
-            }
+            endpointIds: [action.endpointGuid],
+            url: errObservable.url || fullUrl,
+            eventCode: errObservable.status ? errObservable.status + '' : '500',
+            message: 'Metric request error',
+          }
           )
         ];
       }));
diff --git a/src/frontend/packages/store/src/effects/update-app-effects.ts b/src/frontend/packages/store/src/effects/update-app-effects.ts
index a0558f9851..c4cab46c0f 100644
--- a/src/frontend/packages/store/src/effects/update-app-effects.ts
+++ b/src/frontend/packages/store/src/effects/update-app-effects.ts
@@ -2,11 +2,9 @@ import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { mergeMap } from 'rxjs/operators';
 
-import { CF_ENDPOINT_TYPE } from '../../../cloud-foundry/src/cf-types';
 import { AppMetadataTypes } from '../../../cloud-foundry/src/actions/app-metadata.actions';
 import { UPDATE_SUCCESS, UpdateExistingApplication } from '../../../cloud-foundry/src/actions/application.actions';
-import { appEnvVarsEntityType, appStatsEntityType, appSummaryEntityType } from '../../../cloud-foundry/src/cf-entity-types';
-import { entityCatalog } from '../entity-catalog/entity-catalog.service';
+import { cfEntityCatalog } from '../../../cloud-foundry/src/cf-entity-catalog';
 import { WrapperRequestActionSuccess } from '../types/request.types';
 
 
@@ -29,15 +27,10 @@ export class UpdateAppEffects {
         switch (updateEntity) {
           case AppMetadataTypes.ENV_VARS:
             // This is done so the app metadata env vars environment_json matches that of the app
-            const appEnvVarsEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appEnvVarsEntityType);
-            const actionBuilder = appEnvVarsEntity.actionOrchestrator.getActionBuilder('get');
-            const getAppEnvVarsAction = actionBuilder(action.apiAction.guid, action.apiAction.endpointGuid as string);
-            actions.push(getAppEnvVarsAction);
+            actions.push(cfEntityCatalog.appEnvVar.actions.getMultiple(action.apiAction.guid, action.apiAction.endpointGuid));
             break;
           case AppMetadataTypes.STATS:
-            const appStatsEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appStatsEntityType);
-            const appStatsActionBuilder = appStatsEntity.actionOrchestrator.getActionBuilder('get');
-            const statsAction = appStatsActionBuilder(action.apiAction.guid, action.apiAction.endpointGuid as string);
+            const statsAction = cfEntityCatalog.appStats.actions.getMultiple(action.apiAction.guid, action.apiAction.endpointGuid as string)
             // Application has changed and the associated app stats need to also be updated.
             // Apps that are started can just make the stats call to update cached stats, however this call will fail for stopped apps.
             // For those cases create a fake stats request response that should result in the same thing
@@ -48,10 +41,7 @@ export class UpdateAppEffects {
             }
             break;
           case AppMetadataTypes.SUMMARY:
-            const appSummaryEntity = entityCatalog.getEntity(CF_ENDPOINT_TYPE, appSummaryEntityType);
-            const appSummaryActionBuilder = appSummaryEntity.actionOrchestrator.getActionBuilder('get');
-            const getAppSummaryAction = appSummaryActionBuilder(action.apiAction.guid, action.apiAction.endpointGuid as string);
-            actions.push(getAppSummaryAction);
+            actions.push(cfEntityCatalog.appSummary.actions.get(action.apiAction.guid, action.apiAction.endpointGuid));
             break;
         }
       });
diff --git a/src/frontend/packages/store/src/effects/user-favorites-effect.ts b/src/frontend/packages/store/src/effects/user-favorites-effect.ts
index 9c9e677bee..deebce83a7 100644
--- a/src/frontend/packages/store/src/effects/user-favorites-effect.ts
+++ b/src/frontend/packages/store/src/effects/user-favorites-effect.ts
@@ -5,7 +5,7 @@ import { Store } from '@ngrx/store';
 import { catchError, first, map, mergeMap, switchMap } from 'rxjs/operators';
 
 import { userFavoritesEntitySchema } from '../../../core/src/base-entity-schemas';
-import { entityCatalog } from '../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../entity-catalog/entity-catalog';
 import { UserFavoriteManager } from '../../../core/src/core/user-favorite-manager';
 import { environment } from '../../../core/src/environments/environment.prod';
 import { ClearPaginationOfEntity } from '../actions/pagination.actions';
diff --git a/src/frontend/packages/store/src/effects/user-profile.effects.ts b/src/frontend/packages/store/src/effects/user-profile.effects.ts
index c58d969600..175ac3a4ef 100644
--- a/src/frontend/packages/store/src/effects/user-profile.effects.ts
+++ b/src/frontend/packages/store/src/effects/user-profile.effects.ts
@@ -5,7 +5,6 @@ import { Store } from '@ngrx/store';
 import { catchError, mergeMap, switchMap } from 'rxjs/operators';
 
 import { userProfileEntitySchema } from '../../../core/src/base-entity-schemas';
-import { entityCatalog } from '../entity-catalog/entity-catalog.service';
 import { environment } from '../../../core/src/environments/environment';
 import {
   FetchUserProfileAction,
@@ -15,6 +14,7 @@ import {
   UpdateUserPasswordAction,
   UpdateUserProfileAction,
 } from '../actions/user-profile.actions';
+import { entityCatalog } from '../entity-catalog/entity-catalog';
 import { rootUpdatingKey } from '../reducers/api-request-reducer/types';
 import { UserProfileInfo } from '../types/user-profile.types';
 import { DispatchOnlyAppState } from './../app-state';
diff --git a/src/frontend/packages/store/src/effects/users-roles.effects.ts b/src/frontend/packages/store/src/effects/users-roles.effects.ts
index 4785818511..640bebb891 100644
--- a/src/frontend/packages/store/src/effects/users-roles.effects.ts
+++ b/src/frontend/packages/store/src/effects/users-roles.effects.ts
@@ -20,7 +20,7 @@ import { CfUserService } from '../../../cloud-foundry/src/shared/data-services/c
 import { OrgUserRoleNames } from '../../../cloud-foundry/src/store/types/user.types';
 import { CfRoleChange, UsersRolesState } from '../../../cloud-foundry/src/store/types/users-roles.types';
 import { ResetPagination } from '../actions/pagination.actions';
-import { entityCatalog } from '../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../entity-catalog/entity-catalog';
 import { ActionState } from '../reducers/api-request-reducer/types';
 import { selectSessionData } from '../reducers/auth.reducer';
 import { selectUsersRoles } from '../selectors/users-roles.selector';
@@ -35,7 +35,7 @@ export class UsersRolesEffects {
   constructor(
     private actions$: Actions,
     private store: Store<CFAppState>,
-    private cfUserService: CfUserService
+    private cfUserService: CfUserService,
   ) { }
 
   @Effect() clearEntityUpdates$ = this.actions$.pipe(
@@ -230,10 +230,9 @@ export class UsersRolesEffects {
 
   private createActionObs(action: ChangeUserRole): Observable<any> {
     return entityCatalog.getEntity(action)
-      .getEntityMonitor(
-        this.store,
-        action.guid
-      ).getUpdatingSection(action.updatingKey).pipe(
+      .store
+      .getEntityMonitor(action.guid)
+      .getUpdatingSection(action.updatingKey).pipe(
         pairwise(),
         filter(([oldUpdate, newUpdate]) => !!oldUpdate.busy && !newUpdate.busy),
         map(([, newUpdate]) => newUpdate),
diff --git a/src/frontend/packages/store/src/entity-catalog-test.module.ts b/src/frontend/packages/store/src/entity-catalog-test.module.ts
index db4da3027c..83df6de2b1 100644
--- a/src/frontend/packages/store/src/entity-catalog-test.module.ts
+++ b/src/frontend/packages/store/src/entity-catalog-test.module.ts
@@ -1,13 +1,11 @@
 import { Inject, NgModule } from '@angular/core';
 import { ReducerManager, Store } from '@ngrx/store';
 
-import {
-  requestDataReducerFactory,
-} from './reducers/api-request-data-reducer/request-data-reducer.factory';
-import { chainApiReducers, requestActions } from './reducers/api-request-reducers.generator.helpers';
 import { InitCatalogEntitiesAction } from './entity-catalog.actions';
-import { StratosBaseCatalogEntity } from './entity-catalog/entity-catalog-entity';
-import { entityCatalog, TestEntityCatalog } from './entity-catalog/entity-catalog.service';
+import { entityCatalog, TestEntityCatalog } from './entity-catalog/entity-catalog';
+import { StratosBaseCatalogEntity } from './entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { requestDataReducerFactory } from './reducers/api-request-data-reducer/request-data-reducer.factory';
+import { chainApiReducers, requestActions } from './reducers/api-request-reducers.generator.helpers';
 
 export const TEST_CATALOGUE_ENTITIES = '__TEST_CATALOGUE_ENTITIES__';
 
diff --git a/src/frontend/packages/store/src/entity-catalog.actions.ts b/src/frontend/packages/store/src/entity-catalog.actions.ts
index 408b40a8f9..fdc7936cf0 100644
--- a/src/frontend/packages/store/src/entity-catalog.actions.ts
+++ b/src/frontend/packages/store/src/entity-catalog.actions.ts
@@ -1,6 +1,7 @@
-import { StratosBaseCatalogEntity } from './entity-catalog/entity-catalog-entity';
 import { Action } from '@ngrx/store';
 
+import { StratosBaseCatalogEntity } from './entity-catalog/entity-catalog-entity/entity-catalog-entity';
+
 export class InitCatalogEntitiesAction implements Action {
   static ACTION_TYPE = '@stratos/add-catalog-entities';
   public type = InitCatalogEntitiesAction.ACTION_TYPE;
diff --git a/src/frontend/packages/store/src/entity-catalog.module.ts b/src/frontend/packages/store/src/entity-catalog.module.ts
index ce1830c9af..25982e2653 100644
--- a/src/frontend/packages/store/src/entity-catalog.module.ts
+++ b/src/frontend/packages/store/src/entity-catalog.module.ts
@@ -2,8 +2,8 @@ import { Inject, ModuleWithProviders, NgModule } from '@angular/core';
 import { ReducerManager, Store } from '@ngrx/store';
 
 import { InitCatalogEntitiesAction } from './entity-catalog.actions';
-import { StratosBaseCatalogEntity } from './entity-catalog/entity-catalog-entity';
-import { entityCatalog } from './entity-catalog/entity-catalog.service';
+import { entityCatalog } from './entity-catalog/entity-catalog';
+import { StratosBaseCatalogEntity } from './entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { requestDataReducerFactory } from './reducers/api-request-data-reducer/request-data-reducer.factory';
 import { chainApiReducers, requestActions } from './reducers/api-request-reducers.generator.helpers';
 
diff --git a/src/frontend/packages/store/src/entity-catalog/action-dispatcher/action-dispatcher.spec.ts b/src/frontend/packages/store/src/entity-catalog/action-dispatcher/action-dispatcher.spec.ts
index ed0cb38c8c..38572f044d 100644
--- a/src/frontend/packages/store/src/entity-catalog/action-dispatcher/action-dispatcher.spec.ts
+++ b/src/frontend/packages/store/src/entity-catalog/action-dispatcher/action-dispatcher.spec.ts
@@ -1,124 +1,125 @@
-import { Action } from '@ngrx/store';
+// import { Action } from '@ngrx/store';
 
-import { EntityRequestAction } from '../../types/request.types';
-import { ActionOrchestrator, OrchestratedActionBuilders } from '../action-orchestrator/action-orchestrator';
-import { getPaginationAction, getRequestAction } from '../action-orchestrator/action-orchestrator.spec.helpers';
-import { EntityActionDispatcherManager } from './action-dispatcher';
+// import { EntityRequestAction } from '../../types/request.types';
+// import { ActionOrchestrator, OrchestratedActionBuilders } from '../action-orchestrator/action-orchestrator';
+// import { getPaginationAction, getRequestAction } from '../action-orchestrator/action-orchestrator.spec.helpers';
+// import { EntityActionDispatcherManager } from './action-dispatcher';
 
-function actionDispatcher(action: Action) {
-  // noop
-}
+// function actionDispatcher(action: Action) {
+//   // noop
+// }
 
-describe('ActionDispatcher', () => {
-  it('should not dispatch unknown action', () => {
-    const actionOrchestrator = new ActionOrchestrator('Empty');
-    const entityActionDispatcher = new EntityActionDispatcherManager(actionDispatcher, actionOrchestrator);
-    expect(entityActionDispatcher.getActionDispatcher('get').dispatch('1', '2')).toBe(false);
-  });
-  it('should dispatch custom action', () => {
-    interface CustomOrchestratedActionBuilders extends OrchestratedActionBuilders {
-      custom: (guid: string) => EntityRequestAction;
-    }
-    const actionBuilders = {
-      custom: guid => getRequestAction(),
-      customAarb: guid => getRequestAction(),
-      get: guid => getRequestAction()
-    } as CustomOrchestratedActionBuilders;
-    const data = 'adsd';
-    const data2 = 'adsd2';
-    const spy = spyOn(actionBuilders, 'custom');
-    const actionOrchestrator = new ActionOrchestrator('Custom', actionBuilders);
-    const entityActionDispatcher = new EntityActionDispatcherManager(actionDispatcher, actionOrchestrator);
-    // By getting action dispatcher
-    const dipatcher = entityActionDispatcher.getActionDispatcher('custom');
-    const dipatcher2 = entityActionDispatcher.getActionDispatcher('customAarb');
-    expect(entityActionDispatcher.getActionDispatcher('custom').dispatch(data)).toBe(true);
-    expect(spy).toHaveBeenCalledWith(data);
-    expect(entityActionDispatcher.getActionDispatcher('customAarb').dispatch(data)).toBe(true);
-    // By dispatching action directly
-    expect(entityActionDispatcher.dispatchAction('custom', data2)).toBe(true);
-    expect(spy).toHaveBeenCalledWith(data2);
-  });
+// TODO: RC Update tests
+// describe('ActionDispatcher', () => {
+//   it('should not dispatch unknown action', () => {
+//     const actionOrchestrator = new ActionOrchestrator('Empty');
+//     const entityActionDispatcher = new EntityActionDispatcherManager(actionDispatcher, actionOrchestrator);
+//     expect(entityActionDispatcher.getActionDispatcher('get').dispatch('1', '2')).toBe(false);
+//   });
+//   it('should dispatch custom action', () => {
+//     interface CustomOrchestratedActionBuilders extends OrchestratedActionBuilders {
+//       custom: (guid: string) => EntityRequestAction;
+//     }
+//     const actionBuilders = {
+//       custom: guid => getRequestAction(),
+//       customAarb: guid => getRequestAction(),
+//       get: guid => getRequestAction()
+//     } as CustomOrchestratedActionBuilders;
+//     const data = 'adsd';
+//     const data2 = 'adsd2';
+//     const spy = spyOn(actionBuilders, 'custom');
+//     const actionOrchestrator = new ActionOrchestrator('Custom', actionBuilders);
+//     const entityActionDispatcher = new EntityActionDispatcherManager(actionDispatcher, actionOrchestrator);
+//     // By getting action dispatcher
+//     const dipatcher = entityActionDispatcher.getActionDispatcher('custom');
+//     const dipatcher2 = entityActionDispatcher.getActionDispatcher('customAarb');
+//     expect(entityActionDispatcher.getActionDispatcher('custom').dispatch(data)).toBe(true);
+//     expect(spy).toHaveBeenCalledWith(data);
+//     expect(entityActionDispatcher.getActionDispatcher('customAarb').dispatch(data)).toBe(true);
+//     // By dispatching action directly
+//     expect(entityActionDispatcher.dispatchAction('custom', data2)).toBe(true);
+//     expect(spy).toHaveBeenCalledWith(data2);
+//   });
 
-  it('should dispatch get action', () => {
-    function getActionBuilder() {
-      return getRequestAction();
-    }
-    const guid = 'guid';
-    const endpointGuid = 'guid';
-    const actionBuilders = {
-      get: getActionBuilder
-    } as OrchestratedActionBuilders;
-    const spy = spyOn(actionBuilders, 'get');
-    const actionOrchestrator = new ActionOrchestrator('get', actionBuilders);
-    const entityActionDispatcher = new EntityActionDispatcherManager(actionDispatcher, actionOrchestrator);
-    expect(entityActionDispatcher.dispatchGet(guid, endpointGuid)).toBe(true);
-    expect(spy).toHaveBeenCalledWith(guid, endpointGuid);
-  });
+//   it('should dispatch get action', () => {
+//     function getActionBuilder() {
+//       return getRequestAction();
+//     }
+//     const guid = 'guid';
+//     const endpointGuid = 'guid';
+//     const actionBuilders = {
+//       get: getActionBuilder
+//     } as OrchestratedActionBuilders;
+//     const spy = spyOn(actionBuilders, 'get');
+//     const actionOrchestrator = new ActionOrchestrator('get', actionBuilders);
+//     const entityActionDispatcher = new EntityActionDispatcherManager(actionDispatcher, actionOrchestrator);
+//     expect(entityActionDispatcher.dispatchGet(guid, endpointGuid)).toBe(true);
+//     expect(spy).toHaveBeenCalledWith(guid, endpointGuid);
+//   });
 
-  it('should dispatch delete action', () => {
-    function getActionBuilder() {
-      return getRequestAction();
-    }
-    const guid = 'guid';
-    const endpointGuid = 'guid';
-    const actionBuilders = {
-      delete: getActionBuilder
-    } as OrchestratedActionBuilders;
-    const spy = spyOn(actionBuilders, 'delete');
-    const actionOrchestrator = new ActionOrchestrator('delete', actionBuilders);
-    const entityActionDispatcher = new EntityActionDispatcherManager(actionDispatcher, actionOrchestrator);
-    expect(entityActionDispatcher.dispatchDelete(guid, endpointGuid)).toBe(true);
-    expect(spy).toHaveBeenCalledWith(guid, endpointGuid);
-  });
+//   it('should dispatch delete action', () => {
+//     function getActionBuilder() {
+//       return getRequestAction();
+//     }
+//     const guid = 'guid';
+//     const endpointGuid = 'guid';
+//     const actionBuilders = {
+//       delete: getActionBuilder
+//     } as OrchestratedActionBuilders;
+//     const spy = spyOn(actionBuilders, 'delete');
+//     const actionOrchestrator = new ActionOrchestrator('delete', actionBuilders);
+//     const entityActionDispatcher = new EntityActionDispatcherManager(actionDispatcher, actionOrchestrator);
+//     expect(entityActionDispatcher.dispatchDelete(guid, endpointGuid)).toBe(true);
+//     expect(spy).toHaveBeenCalledWith(guid, endpointGuid);
+//   });
 
-  it('should dispatch update action', () => {
-    function getActionBuilder() {
-      return getRequestAction();
-    }
-    const guid = 'guid';
-    const endpointGuid = 'guid';
-    const arbData = { arb: true };
-    const actionBuilders = {
-      update: getActionBuilder
-    } as OrchestratedActionBuilders;
-    const spy = spyOn(actionBuilders, 'update');
-    const actionOrchestrator = new ActionOrchestrator('update', actionBuilders);
-    const entityActionDispatcher = new EntityActionDispatcherManager(actionDispatcher, actionOrchestrator);
-    expect(entityActionDispatcher.dispatchUpdate(guid, endpointGuid, arbData)).toBe(true);
-    expect(spy).toHaveBeenCalledWith(guid, endpointGuid, arbData);
-  });
+//   it('should dispatch update action', () => {
+//     function getActionBuilder() {
+//       return getRequestAction();
+//     }
+//     const guid = 'guid';
+//     const endpointGuid = 'guid';
+//     const arbData = { arb: true };
+//     const actionBuilders = {
+//       update: getActionBuilder
+//     } as OrchestratedActionBuilders;
+//     const spy = spyOn(actionBuilders, 'update');
+//     const actionOrchestrator = new ActionOrchestrator('update', actionBuilders);
+//     const entityActionDispatcher = new EntityActionDispatcherManager(actionDispatcher, actionOrchestrator);
+//     expect(entityActionDispatcher.dispatchUpdate(guid, endpointGuid, arbData)).toBe(true);
+//     expect(spy).toHaveBeenCalledWith(guid, endpointGuid, arbData);
+//   });
 
-  it('should dispatch create action', () => {
-    function getActionBuilder() {
-      return getRequestAction();
-    }
-    const endpointGuid = 'guid';
-    const aString = 'stringy';
-    const actionBuilders = {
-      create: getActionBuilder
-    } as OrchestratedActionBuilders;
-    const spy = spyOn(actionBuilders, 'create');
-    const actionOrchestrator = new ActionOrchestrator('create', actionBuilders);
-    const entityActionDispatcher = new EntityActionDispatcherManager(actionDispatcher, actionOrchestrator);
-    expect(entityActionDispatcher.dispatchCreate(endpointGuid, aString)).toBe(true);
-    expect(spy).toHaveBeenCalledWith(endpointGuid, aString);
-  });
+//   it('should dispatch create action', () => {
+//     function getActionBuilder() {
+//       return getRequestAction();
+//     }
+//     const endpointGuid = 'guid';
+//     const aString = 'stringy';
+//     const actionBuilders = {
+//       create: getActionBuilder
+//     } as OrchestratedActionBuilders;
+//     const spy = spyOn(actionBuilders, 'create');
+//     const actionOrchestrator = new ActionOrchestrator('create', actionBuilders);
+//     const entityActionDispatcher = new EntityActionDispatcherManager(actionDispatcher, actionOrchestrator);
+//     expect(entityActionDispatcher.dispatchCreate(endpointGuid, aString)).toBe(true);
+//     expect(spy).toHaveBeenCalledWith(endpointGuid, aString);
+//   });
 
-  it('should dispatch getMultiple action', () => {
-    function getActionBuilder() {
-      return getPaginationAction();
-    }
+//   it('should dispatch getMultiple action', () => {
+//     function getActionBuilder() {
+//       return getPaginationAction();
+//     }
 
-    const actionBuilders = {
-      getMultiple: getActionBuilder
-    } as OrchestratedActionBuilders;
-    const endpointGuid = 'guid';
-    const paginationKey = 'pagKey';
-    const spy = spyOn(actionBuilders, 'getMultiple');
-    const actionOrchestrator = new ActionOrchestrator('getMultiple', actionBuilders);
-    const entityActionDispatcher = new EntityActionDispatcherManager(actionDispatcher, actionOrchestrator);
-    expect(entityActionDispatcher.dispatchGetMultiple(endpointGuid, paginationKey)).toBe(true);
-    expect(spy).toHaveBeenCalledWith(endpointGuid, paginationKey);
-  });
-});
+//     const actionBuilders = {
+//       getMultiple: getActionBuilder
+//     } as OrchestratedActionBuilders;
+//     const endpointGuid = 'guid';
+//     const paginationKey = 'pagKey';
+//     const spy = spyOn(actionBuilders, 'getMultiple');
+//     const actionOrchestrator = new ActionOrchestrator('getMultiple', actionBuilders);
+//     const entityActionDispatcher = new EntityActionDispatcherManager(actionDispatcher, actionOrchestrator);
+//     expect(entityActionDispatcher.dispatchGetMultiple(endpointGuid, paginationKey)).toBe(true);
+//     expect(spy).toHaveBeenCalledWith(endpointGuid, paginationKey);
+//   });
+// });
diff --git a/src/frontend/packages/store/src/entity-catalog/action-dispatcher/action-dispatcher.ts b/src/frontend/packages/store/src/entity-catalog/action-dispatcher/action-dispatcher.ts
deleted file mode 100644
index a4c6b9fba4..0000000000
--- a/src/frontend/packages/store/src/entity-catalog/action-dispatcher/action-dispatcher.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { Action, Store } from '@ngrx/store';
-
-import { AppState } from '../../app-state';
-import {
-  ActionOrchestrator,
-  OrchestratedActionBuilder,
-  OrchestratedActionBuilders,
-} from '../action-orchestrator/action-orchestrator';
-
-type ActionDispatcher = (action: Action) => void;
-export class EntityActionDispatcher<
-  T extends OrchestratedActionBuilder<any[], Action> =
-  OrchestratedActionBuilder<any[], Action>,
-  > {
-
-  private static STORE: Store<AppState>;
-  static initialize(store: Store<AppState>) {
-    EntityActionDispatcher.STORE = store;
-  }
-
-  constructor(
-    private actionDispatcher?: ActionDispatcher,
-    private actionBuilder?: T | ((...args: Parameters<T>) => ReturnType<T>)
-  ) { }
-  public dispatch(...args: Parameters<T>) {
-    if (this.actionBuilder) {
-      const action = this.actionBuilder(...args);
-      if (this.actionDispatcher) {
-        this.actionDispatcher(action);
-      } else if (EntityActionDispatcher.STORE && EntityActionDispatcher.STORE.dispatch) {
-        EntityActionDispatcher.STORE.dispatch(action);
-      } else {
-        console.error('Failed to find dispatcher: ', this.actionBuilder);
-        return false;
-      }
-      return true;
-    }
-    return false;
-  }
-}
-export class EntityActionDispatcherManager<T extends OrchestratedActionBuilders = OrchestratedActionBuilders> {
-  constructor(private actionDispatcher: (action: Action) => void, private actionOrchestrator: ActionOrchestrator<T>) { }
-
-  public getActionDispatcher<Y extends keyof T>(actionType: Y) {
-    const actionBuilder = this.getActionBuilder(actionType);
-    return new EntityActionDispatcher<T[Y]>(
-      this.actionDispatcher,
-      actionBuilder
-    );
-  }
-
-  public getActionBuilder<Y extends keyof T>(actionType: Y) {
-    return this.actionOrchestrator.getActionBuilder(actionType);
-  }
-
-  public dispatchGet(...args: Parameters<T['get']>) {
-    return this.getActionDispatcher('get').dispatch(...args);
-  }
-
-  public dispatchDelete(...args: Parameters<T['delete']>) {
-    return this.getActionDispatcher('delete').dispatch(...args);
-  }
-
-  public dispatchUpdate(...args: Parameters<T['update']>) {
-    return this.getActionDispatcher('update').dispatch(...args);
-  }
-
-  public dispatchCreate(...args: Parameters<T['create']>) {
-    return this.getActionDispatcher('create').dispatch(...args);
-  }
-
-  public dispatchGetMultiple(...args: Parameters<T['getMultiple']>) {
-    return this.getActionDispatcher('getMultiple').dispatch(...args);
-  }
-
-  public dispatchAction<K extends keyof T>(actionType: K, ...args: Parameters<T[K]>) {
-    return this.getActionDispatcher(actionType).dispatch(...args);
-  }
-}
diff --git a/src/frontend/packages/store/src/entity-catalog/action-orchestrator/action-orchestrator.ts b/src/frontend/packages/store/src/entity-catalog/action-orchestrator/action-orchestrator.ts
index 7bdb21e3b8..f6eb1bf5d3 100644
--- a/src/frontend/packages/store/src/entity-catalog/action-orchestrator/action-orchestrator.ts
+++ b/src/frontend/packages/store/src/entity-catalog/action-orchestrator/action-orchestrator.ts
@@ -4,8 +4,6 @@ import { Action } from '@ngrx/store';
 import { EntitySchema } from '../../helpers/entity-schema';
 import { PaginatedAction } from '../../types/pagination.types';
 import { EntityRequestAction, StartAction } from '../../types/request.types';
-import { Omit } from '../../../../core/src/core/utils.service';
-import { EntityActionDispatcherManager } from '../action-dispatcher/action-dispatcher';
 
 export interface ActionBuilderAction extends EntityRequestAction {
   actionBuilderActionType: string;
@@ -23,7 +21,7 @@ export type KnownEntityActionBuilder<
   > = (guid: string, endpointGuid: string, extraArgs?: T) => EntityRequestAction;
 // createTrackingId should be unique to the thing that's being created.
 // It is used to track the status of the entity creation.
-type CreateActionBuilder<
+export type CreateActionBuilder<
   T extends Record<any, any> = Record<any, any>
   > = (createTrackingId: string, endpointGuid: string, extraArgs?: T) => EntityRequestAction;
 // paginationKey could be optional, we could give it a default value.
@@ -156,14 +154,22 @@ export class BasePaginationRequestAction extends BasePipelineRequestAction imple
   }
 }
 
-
-// A list of functions that can be used get interface with the entity
-export interface OrchestratedActionBuilders {
+/**
+ * Collection of common types of actions that should be associated with an entity.
+ * Generic code will make use of get and getMultiple
+ */
+export interface OrchestratedActionCoreBuilders {
   get?: KnownEntityActionBuilder;
   remove?: KnownEntityActionBuilder;
   update?: KnownEntityActionBuilder;
   create?: CreateActionBuilder;
   getMultiple?: GetMultipleActionBuilder;
+}
+
+/**
+ * Generic interface for functions that create actions for an entity
+ */
+export interface OrchestratedActionBuilders extends OrchestratedActionCoreBuilders {
   [actionType: string]: OrchestratedActionBuilder;
 }
 
@@ -178,14 +184,8 @@ export interface OrchestratedActionBuilderConfig {
   PaginationRequestActionConfig<GetMultipleActionBuilder>;
 }
 
-export class OrchestratedActionBuildersClass implements OrchestratedActionBuilders {
-  [actionType: string]: OrchestratedActionBuilder<any[], EntityRequestAction>;
-}
 export class ActionOrchestrator<T extends OrchestratedActionBuilders = OrchestratedActionBuilders> {
 
-  public getEntityActionDispatcher(actionDispatcher?: (action: Action) => void) {
-    return new EntityActionDispatcherManager<T>(actionDispatcher, this);
-  }
   public getActionBuilder<Y extends keyof T>(actionType: Y) {
     const actionBuilderForType = this.actionBuilders[actionType];
     if (!actionBuilderForType) {
diff --git a/src/frontend/packages/store/src/entity-catalog/action-builder-config.mapper.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/action-builder-config.mapper.ts
similarity index 94%
rename from src/frontend/packages/store/src/entity-catalog/action-builder-config.mapper.ts
rename to src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/action-builder-config.mapper.ts
index 0648298774..cb22364ae8 100644
--- a/src/frontend/packages/store/src/entity-catalog/action-builder-config.mapper.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/action-builder-config.mapper.ts
@@ -1,4 +1,4 @@
-import { EntitySchema } from '../helpers/entity-schema';
+import { EntitySchema } from '../../helpers/entity-schema';
 import {
   BaseEntityRequestAction,
   BaseEntityRequestConfig,
@@ -10,7 +10,7 @@ import {
   OrchestratedActionBuilderConfig,
   OrchestratedActionBuilders,
   PaginationRequestActionConfig,
-} from './action-orchestrator/action-orchestrator';
+} from '../action-orchestrator/action-orchestrator';
 
 export class ActionBuilderConfigMapper {
 
@@ -49,7 +49,9 @@ export class ActionBuilderConfigMapper {
     schemaGetter: (schemaKey: string) => EntitySchema
   ): OrchestratedActionBuilder {
     if (configOrBuilder instanceof EntityRequestActionConfig) {
-      return (...args: Parameters<KnownEntityActionBuilder>) => {
+      return (
+        ...args: Parameters<KnownEntityActionBuilder>
+      ) => {
         const [guid, endpointGuid, ...meta] = args;
         return new BaseEntityRequestAction(
           schemaGetter(configOrBuilder.schemaKey),
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts
new file mode 100644
index 0000000000..6e79f49192
--- /dev/null
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts
@@ -0,0 +1,222 @@
+import { Observable } from 'rxjs';
+
+import { EntityService } from '../../entity-service';
+import { EntitySchema } from '../../helpers/entity-schema';
+import { EntityMonitor } from '../../monitors/entity-monitor';
+import { PaginationMonitor } from '../../monitors/pagination-monitor';
+import { ListActionState, RequestInfoState } from '../../reducers/api-request-reducer/types';
+import { PaginationObservables } from '../../reducers/pagination-reducer/pagination-reducer.types';
+import { isPaginatedAction, PaginatedAction } from '../../types/pagination.types';
+import { EntityRequestAction, RequestAction } from '../../types/request.types';
+import {
+  ActionOrchestrator,
+  OrchestratedActionBuilder,
+  OrchestratedActionBuilders,
+} from '../action-orchestrator/action-orchestrator';
+import { EntityCatalogHelpers } from '../entity-catalog.helper';
+import { KnownActionBuilders } from './entity-catalog-entity';
+import {
+  CoreEntityCatalogEntityStore,
+  CustomEntityCatalogEntityStore,
+  EntityCatalogEntityStore,
+} from './entity-catalog-entity.types';
+
+type ActionDispatcher<K extends keyof ABC, ABC extends OrchestratedActionBuilders> = <T extends RequestInfoState | ListActionState>(
+  ...args: Parameters<ABC[K]>
+) => Observable<T>;
+
+export type ActionDispatchers<ABC extends OrchestratedActionBuilders> = {
+  [K in keyof ABC]: ActionDispatcher<K, ABC>
+};
+
+export class EntityCatalogEntityStoreHelpers {
+
+  private static createEntityService<Y>(
+    actionBuilderKey: string,
+    action: any,
+  ): EntityService<Y> {
+    const helper = EntityCatalogHelpers.GetEntityCatalogEntityHelper();
+    if (isPaginatedAction(action)) {
+      throw new Error(`\`${actionBuilderKey}\` action is of type pagination`);
+    }
+    if (!action.guid) {
+      throw new Error(`\`${actionBuilderKey}\` action has no guid`);
+    }
+    return helper.esf.create<Y>(
+      action.guid,
+      action
+    )
+  }
+
+  private static createPaginationMonitor<Y>(
+    actionBuilderKey: string,
+    action: any,
+  ): PaginationMonitor<Y> {
+    const helper = EntityCatalogHelpers.GetEntityCatalogEntityHelper();
+    if (!isPaginatedAction(action)) {
+      throw new Error(`\`${actionBuilderKey}\` action is not of type pagination`);
+    }
+    const pAction = action as PaginatedAction;
+    return helper.pmf.create<Y>(pAction.paginationKey, pAction, pAction.flattenPagination);
+  }
+
+  private static createPaginationService<Y>(
+    actionBuilderKey: string,
+    action: any,
+  ): PaginationObservables<Y> {
+    const helper = EntityCatalogHelpers.GetEntityCatalogEntityHelper();
+    if (!isPaginatedAction(action)) {
+      throw new Error(`\`${actionBuilderKey}\` action is not of type pagination`);
+    }
+    const pAction = action as PaginatedAction;
+    return helper.getPaginationObservables<Y>({
+      store: helper.store,
+      action: pAction,
+      paginationMonitor: helper.pmf.create<Y>(
+        pAction.paginationKey,
+        pAction,
+        pAction.flattenPagination
+      )
+    }, pAction.flattenPagination);
+  }
+
+  static getActionDispatchers<Y, ABC extends OrchestratedActionBuilders>(
+    es: EntityCatalogEntityStore<Y, ABC>,
+    builders: ABC,
+  ): ActionDispatchers<ABC> {
+    if (!builders) {
+      return {} as ActionDispatchers<ABC>;
+    }
+    return Object.keys(builders).reduce((actionDispatchers, key) => ({
+      ...actionDispatchers,
+      [key]: EntityCatalogEntityStoreHelpers.getActionDispatcher(
+        es,
+        builders[key],
+        key
+      )
+    }), {} as ActionDispatchers<ABC>);
+  }
+
+  private static getActionDispatcher<Y, ABC extends OrchestratedActionBuilders, K extends keyof ABC>(
+    es: CoreEntityCatalogEntityStore<Y, ABC>,
+    builder: OrchestratedActionBuilder,
+    actionKey: string,
+  ): ActionDispatcher<K, ABC> {
+    return <T extends RequestInfoState | ListActionState>(
+      ...args: Parameters<ABC[K]>): Observable<T> => {
+      const helper = EntityCatalogHelpers.GetEntityCatalogEntityHelper();
+
+      const action = builder(...args);
+      helper.store.dispatch(action);
+      if (isPaginatedAction(action)) {
+        return es[actionKey].getPaginationMonitor(
+          ...args
+        ).currentPageState$;
+      }
+      const rAction = action as RequestAction;
+      const schema = rAction.entity ? rAction.entity[0] || rAction.entity : null;
+      const schemaKey = schema ? schema.schemaKey : null;
+
+      if (!rAction.guid) {
+        throw new Error(`\`${actionKey}\` action has no guid`);
+      }
+
+      return es.getEntityMonitor(
+        rAction.guid,
+        {
+          schemaKey,
+          startWithNull: false
+        }
+      ).entityRequest$ as unknown as Observable<T>;
+    };
+  }
+
+  static createCoreStore<Y, ABC extends OrchestratedActionBuilders>(
+    actionOrchestrator: ActionOrchestrator<ABC>,
+    entityKey: string,
+    getSchema: (schema: string) => EntitySchema
+  ): CoreEntityCatalogEntityStore<Y, ABC> {
+    return {
+      getEntityMonitor: (
+        entityId: string,
+        params = {
+          schemaKey: '',
+          startWithNull: false
+        }
+      ): EntityMonitor<Y> =>
+        new EntityMonitor<Y>(EntityCatalogHelpers.GetEntityCatalogEntityHelper().store, entityId, entityKey, getSchema(params.schemaKey), params.startWithNull)
+      ,
+      getEntityService: (
+        ...args: Parameters<ABC['get']>
+      ): EntityService<Y> => {
+        const actionBuilder = actionOrchestrator.getActionBuilder('get');
+        if (!actionBuilder) {
+          throw new Error(`\`get\` action builder not implemented for ${entityKey}`);
+        }
+        return EntityCatalogEntityStoreHelpers.createEntityService('get', actionBuilder(...args))
+      },
+      getPaginationMonitor: (
+        ...args: Parameters<ABC['getMultiple']>
+      ) => {
+        const actionBuilder = actionOrchestrator.getActionBuilder('getMultiple');
+        if (!actionBuilder) {
+          throw new Error(`\`get\` action builder not implemented for ${entityKey}`);
+        }
+        return EntityCatalogEntityStoreHelpers.createPaginationMonitor('getMultiple', actionBuilder(...args));
+      },
+      getPaginationService: (
+        ...args: Parameters<ABC['getMultiple']>
+      ) => {
+        const actionBuilder = actionOrchestrator.getActionBuilder('getMultiple');
+        if (!actionBuilder) {
+          throw new Error(`\`get\` action builder not implemented for ${entityKey}`);
+        }
+        return EntityCatalogEntityStoreHelpers.createPaginationService('getMultiple', actionBuilder(...args));
+      },
+    };
+  }
+
+  static getPaginationStore<Y, ABC extends OrchestratedActionBuilders = OrchestratedActionBuilders>(
+    builders: KnownActionBuilders<ABC>,
+    entityKey: string,
+    getSchema: (schema: string) => EntitySchema
+  ): CustomEntityCatalogEntityStore<Y, ABC> {
+    if (!builders) {
+      return {} as CustomEntityCatalogEntityStore<Y, ABC>;
+    }
+    return Object.keys(builders).reduce((entityInstances, key) => {
+      // This isn't smart like the PaginationBuilders type. Here key will be all properties from an action builder (get, getMultiple, etc)
+      // which will be available from the dev console. Attempting to use in code pre-transpile will result in error
+      return {
+        ...entityInstances,
+        [key]: {
+          getEntityMonitor: (
+            startWithNull: boolean,
+            ...args: any
+          ): EntityMonitor<Y> => {
+            const action: EntityRequestAction = builders[key](...args);
+            if (isPaginatedAction(action)) {
+              throw new Error(`\`${key}\` action is of type pagination`);
+            }
+            return new EntityMonitor<Y>(
+              EntityCatalogHelpers.GetEntityCatalogEntityHelper().store,
+              action.guid,
+              entityKey,
+              getSchema(action.schemaKey),
+              startWithNull
+            )
+          },
+          getEntityService: (
+            ...args: any
+          ): EntityService<Y> => EntityCatalogEntityStoreHelpers.createEntityService(key, builders[key](...args)),
+          getPaginationMonitor: (
+            ...args: any
+          ): PaginationMonitor<Y> => EntityCatalogEntityStoreHelpers.createPaginationMonitor(key, builders[key](...args)),
+          getPaginationService: (
+            ...args: any
+          ): PaginationObservables<Y> => EntityCatalogEntityStoreHelpers.createPaginationService(key, builders[key](...args))
+        }
+      };
+    }, {} as CustomEntityCatalogEntityStore<Y, ABC>);
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts
similarity index 80%
rename from src/frontend/packages/store/src/entity-catalog/entity-catalog-entity.ts
rename to src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts
index 12d4cb43b9..adfc5469c2 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts
@@ -1,26 +1,24 @@
-import { ActionReducer, Store } from '@ngrx/store';
+import { ActionReducer } from '@ngrx/store';
 
-import { endpointEntitySchema, STRATOS_ENDPOINT_TYPE } from '../../../core/src/base-entity-schemas';
-import { getFullEndpointApiUrl } from '../../../core/src/features/endpoints/endpoint-helpers';
-import { AppState, IRequestEntityTypeState } from '../app-state';
+import { endpointEntitySchema, STRATOS_ENDPOINT_TYPE } from '../../../../core/src/base-entity-schemas';
+import { KnownKeys, NonOptionalKeys } from '../../../../core/src/core/utils.service';
+import { getFullEndpointApiUrl } from '../../../../core/src/features/endpoints/endpoint-helpers';
+import { IRequestEntityTypeState } from '../../app-state';
 import {
   PaginationPageIteratorConfig,
-} from '../entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe';
-import { EntityPipelineEntity, stratosEndpointGuidKey } from '../entity-request-pipeline/pipeline.types';
-import { EntitySchema } from '../helpers/entity-schema';
-import { EntityMonitor } from '../monitors/entity-monitor';
-import { EndpointModel } from '../types/endpoint.types';
-import { APISuccessOrFailedAction, EntityRequestAction } from '../types/request.types';
-import { IEndpointFavMetadata } from '../types/user-favorites.types';
-import { ActionBuilderConfigMapper } from './action-builder-config.mapper';
-import { EntityActionDispatcherManager } from './action-dispatcher/action-dispatcher';
+} from '../../entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe';
+import { EntityPipelineEntity, stratosEndpointGuidKey } from '../../entity-request-pipeline/pipeline.types';
+import { EntitySchema } from '../../helpers/entity-schema';
+import { EndpointModel } from '../../types/endpoint.types';
+import { APISuccessOrFailedAction, EntityRequestAction } from '../../types/request.types';
+import { IEndpointFavMetadata } from '../../types/user-favorites.types';
 import {
   ActionBuilderAction,
   ActionOrchestrator,
   OrchestratedActionBuilderConfig,
   OrchestratedActionBuilders,
-} from './action-orchestrator/action-orchestrator';
-import { EntityCatalogHelpers } from './entity-catalog.helper';
+} from '../action-orchestrator/action-orchestrator';
+import { EntityCatalogHelpers } from '../entity-catalog.helper';
 import {
   EntityCatalogSchemas,
   IEntityMetadata,
@@ -29,12 +27,17 @@ import {
   IStratosEntityBuilder,
   IStratosEntityDefinition,
   StratosEndpointExtensionDefinition,
-} from './entity-catalog.types';
+} from '../entity-catalog.types';
+import { ActionBuilderConfigMapper } from './action-builder-config.mapper';
+import { ActionDispatchers, EntityCatalogEntityStoreHelpers } from './entity-catalog-entity-store-helpers';
+import { EntityCatalogEntityStore } from './entity-catalog-entity.types';
+
+export type KnownActionBuilders<ABC extends OrchestratedActionBuilders> = Pick<ABC, NonOptionalKeys<Pick<ABC, KnownKeys<ABC>>>>
 
 export interface EntityCatalogBuilders<
   T extends IEntityMetadata = IEntityMetadata,
   Y = any,
-  AB extends OrchestratedActionBuilderConfig = OrchestratedActionBuilders
+  AB extends OrchestratedActionBuilderConfig = OrchestratedActionBuilders,
   > {
   entityBuilder?: IStratosEntityBuilder<T, Y>;
   // Allows extensions to modify entities data in the store via none API Effect or unrelated actions.
@@ -49,15 +52,9 @@ export class StratosBaseCatalogEntity<
   Y = any,
   AB extends OrchestratedActionBuilderConfig = OrchestratedActionBuilderConfig,
   // This typing may cause an issue down the line.
-  ABC extends OrchestratedActionBuilders = AB extends OrchestratedActionBuilders ? AB : OrchestratedActionBuilders
+  ABC extends OrchestratedActionBuilders = AB extends OrchestratedActionBuilders ? AB : OrchestratedActionBuilders,
   > {
-  public readonly entityKey: string;
-  public readonly type: string;
-  public readonly definition: DefinitionTypes;
-  public readonly isEndpoint: boolean;
-  public readonly actionDispatchManager: EntityActionDispatcherManager<ABC>;
-  public readonly actionOrchestrator: ActionOrchestrator<ABC>;
-  public readonly endpointType: string;
+
   constructor(
     definition: IStratosEntityDefinition | IStratosEndpointDefinition | IStratosBaseEntityDefinition,
     public readonly builders: EntityCatalogBuilders<T, Y, AB> = {}
@@ -77,10 +74,51 @@ export class StratosBaseCatalogEntity<
       this.type,
       (schemaKey: string) => this.getSchema(schemaKey)
     );
+
+    this.actions = actionBuilders as KnownActionBuilders<ABC>;
+
     this.actionOrchestrator = new ActionOrchestrator<ABC>(this.entityKey, actionBuilders as ABC);
-    this.actionDispatchManager = this.actionOrchestrator.getEntityActionDispatcher();
+
+    this.store = {
+      ...EntityCatalogEntityStoreHelpers.createCoreStore<Y, ABC>(
+        this.actionOrchestrator,
+        this.entityKey,
+        Object.bind(this.getSchema, this)
+      ),
+      ...EntityCatalogEntityStoreHelpers.getPaginationStore<Y>(
+        this.actions,
+        this.entityKey,
+        Object.bind(this.getSchema, this)
+      )
+    } as EntityCatalogEntityStore<Y, ABC>; // TODO: RC investigate more
+    this.api = EntityCatalogEntityStoreHelpers.getActionDispatchers(
+      this.store,
+      actionBuilders as ABC
+    );
   }
 
+
+  /**
+   * Create actions specific to the entity type
+   */
+  public readonly actions: KnownActionBuilders<ABC>;
+  /**
+   * Create and dispatch actions specific to the entity type. Response will provide an observable reporting entity or pagination state
+   */
+  public readonly api: ActionDispatchers<KnownActionBuilders<ABC>>;
+  /**
+   * Monitor an entity or collection of entities. Services will fetch the entity/entities if missing, monitors will not
+   */
+  public readonly store: EntityCatalogEntityStore<Y, ABC>;
+
+
+  public readonly entityKey: string;
+  public readonly type: string;
+  public readonly definition: DefinitionTypes;
+  public readonly isEndpoint: boolean;
+  public readonly actionOrchestrator: ActionOrchestrator<ABC>;
+  public readonly endpointType: string;
+
   private populateEntitySchemaKey(entitySchemas: EntityCatalogSchemas): EntityCatalogSchemas {
     return Object.keys(entitySchemas).reduce((newSchema, schemaKey) => {
       if (schemaKey !== 'default') {
@@ -145,17 +183,6 @@ export class StratosBaseCatalogEntity<
     return entity[stratosEndpointGuidKey];
   }
 
-  public getEntityMonitor<Q extends AppState, B = any>(
-    store: Store<Q>,
-    entityId: string,
-    {
-      schemaKey = '',
-      startWithNull = false
-    } = {}
-  ) {
-    return new EntityMonitor<B>(store, entityId, this.entityKey, this.getSchema(schemaKey), startWithNull);
-  }
-
   public getTypeAndSubtype() {
     const type = this.definition.parentType || this.definition.type;
     const subType = this.definition.parentType ? this.definition.type : null;
@@ -229,8 +256,8 @@ export class StratosCatalogEntity<
   T extends IEntityMetadata = IEntityMetadata,
   Y = any,
   AB extends OrchestratedActionBuilderConfig = OrchestratedActionBuilders,
-  ABC extends OrchestratedActionBuilders = AB extends OrchestratedActionBuilders ? AB : OrchestratedActionBuilders
-  > extends StratosBaseCatalogEntity<T, Y, AB> {
+  ABC extends OrchestratedActionBuilders = AB extends OrchestratedActionBuilders ? AB : OrchestratedActionBuilders,
+  > extends StratosBaseCatalogEntity<T, Y, AB, ABC> {
   public definition: IStratosEntityDefinition<EntityCatalogSchemas, Y, ABC>;
   constructor(
     entity: IStratosEntityDefinition,
@@ -284,3 +311,4 @@ export class StratosCatalogEndpointEntity extends StratosBaseCatalogEntity<IEndp
     });
   }
 }
+
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.types.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.types.ts
new file mode 100644
index 0000000000..7136e1d3ad
--- /dev/null
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.types.ts
@@ -0,0 +1,120 @@
+import {
+  FilteredByNotReturnType,
+  FilteredByReturnType,
+  KnownKeys,
+  NeverKeys,
+} from '../../../../core/src/core/utils.service';
+import { EntityService } from '../../entity-service';
+import { EntityMonitor } from '../../monitors/entity-monitor';
+import { PaginationMonitor } from '../../monitors/pagination-monitor';
+import { PaginationObservables } from '../../reducers/pagination-reducer/pagination-reducer.types';
+import { PaginatedAction } from '../../types/pagination.types';
+import { OrchestratedActionBuilders, OrchestratedActionCoreBuilders } from '../action-orchestrator/action-orchestrator';
+
+// TODO: RC tidy up `extends OrchestratedActionBuilders`, could be more specific
+/**
+ * Core entity and entities access (entity/entities monitors and services)
+ */
+export interface CoreEntityCatalogEntityStore<Y, ABC extends OrchestratedActionBuilders> {
+  /**
+   * Return a collection of observables for the given entity id. If the entity is missing is will NOT be fetched
+   */
+  getEntityMonitor: (
+    entityId: string,
+    params?: {
+      schemaKey?: string,
+      startWithNull?: boolean
+    }
+  ) => EntityMonitor<Y>;
+  /**
+   * Return a collection of observables for the given entity id. Subscribing to core observables (like entityObs$) will fetch the entity if missing
+   */
+  getEntityService: (
+    ...args: Parameters<ABC['get']>
+  ) => EntityService<Y>;
+  /**
+   * Return a collection of observables for the given collection of entities. If the collection is missing it will NOT be fetched
+   */
+  getPaginationMonitor: (
+    ...args: Parameters<ABC['getMultiple']>
+  ) => PaginationMonitor<Y>;
+  /**
+   * Return a collection of observables for the given collection of entities. Subscribing to core (like entities$) will fetch the entity if missing
+   */
+  getPaginationService: (
+    ...args: Parameters<ABC['getMultiple']>
+  ) => PaginationObservables<Y>;
+}
+
+/**
+ * Filter out all common builders in OrchestratedActionCoreBuilders from ABC
+ */
+type CustomBuilders<ABC> = Omit<Pick<ABC, KnownKeys<ABC>>, keyof OrchestratedActionCoreBuilders>;
+
+/**
+ * Mark builders that don't return a pagination action as `never`
+ */
+type PaginatedActionBuildersWithNevers<ABC extends OrchestratedActionBuilders> = FilteredByReturnType<CustomBuilders<ABC>, PaginatedAction>;
+/**
+ * Filter out builders that don't return pagination actions from ABC
+ */
+type PaginatedActionBuilders<ABC extends OrchestratedActionBuilders> = Omit<PaginatedActionBuildersWithNevers<ABC>, NeverKeys<PaginatedActionBuildersWithNevers<ABC>>>
+
+/**
+ * Mark builders that return a pagination action as `never`
+ */
+type NonPaginatedActionBuildersWithNevers<ABC extends OrchestratedActionBuilders> = FilteredByNotReturnType<CustomBuilders<ABC>, PaginatedAction>;
+/**
+ * Filter out builders that return pagination actions from ABC
+ */
+type NonPaginatedActionBuilders<ABC extends OrchestratedActionBuilders> = Omit<NonPaginatedActionBuildersWithNevers<ABC>, NeverKeys<NonPaginatedActionBuildersWithNevers<ABC>>>
+
+
+
+
+/**
+ * Provided a typed way to create pagination monitor/service per action (this ultimately only provides ones for paginated actions)
+ */
+type EntityCatalogEntityStoreCollections<Y, ABC extends OrchestratedActionBuilders> = {
+  [K in keyof ABC]: {
+    getPaginationMonitor: (
+      ...args: Parameters<ABC[K]>
+    ) => PaginationMonitor<Y>;
+    getPaginationService: (
+      ...args: Parameters<ABC[K]>
+    ) => PaginationObservables<Y>;
+  }
+};
+
+/**
+ * Provided a typed way to create entity monitor/service per action (this ultimately only provides ones for non-paginated actions)
+ */
+type EntityCatalogEntityStoreSingles<Y, ABC extends OrchestratedActionBuilders> = {
+  [K in keyof ABC]: {
+    getEntityMonitor: (
+      startWithNull: boolean,
+      ...args: Parameters<ABC[K]>
+    ) => EntityMonitor<Y>;
+    getEntityService: (
+      ...args: Parameters<ABC[K]>
+    ) => EntityService<Y>
+  }
+};
+
+export type CustomEntityCatalogEntityStore<Y, ABC extends OrchestratedActionBuilders> =
+  EntityCatalogEntityStoreCollections<Y, PaginatedActionBuilders<ABC>> &
+  EntityCatalogEntityStoreSingles<Y, NonPaginatedActionBuilders<ABC>>
+
+
+/**
+ * Combine all types of store
+ * - CoreEntityCatalogEntityStore (entity and entities store access) 
+ * - EntityCatalogEntityStoreCollections (per entity custom entities lists)
+ * - EntityCatalogEntityStoreSingles (per entity custom entity's)
+ */
+export type EntityCatalogEntityStore<Y, ABC extends OrchestratedActionBuilders> =
+  CoreEntityCatalogEntityStore<Y, ABC> &
+  CustomEntityCatalogEntityStore<Y, ABC>
+
+
+
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog.service.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog.service.ts
new file mode 100644
index 0000000000..ededbee860
--- /dev/null
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog.service.ts
@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+
+import { AppState } from '../../app-state';
+import { EntityServiceFactory } from '../../entity-service-factory.service';
+import { PaginationMonitorFactory } from '../../monitors/pagination-monitor.factory';
+import { getPaginationObservables } from '../../reducers/pagination-reducer/pagination-reducer.helper';
+
+@Injectable()
+export class EntityCatalogHelper {
+
+  // Remove cyclic dependency by accessing this here instead of in entity catalog entity
+  public getPaginationObservables = getPaginationObservables;
+
+  constructor(
+    public esf: EntityServiceFactory,
+    public pmf: PaginationMonitorFactory,
+    public store: Store<AppState>,
+  ) {
+
+  }
+}
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog.helper.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog.helper.ts
index cd1663bf8a..c65c640779 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog.helper.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog.helper.ts
@@ -1,3 +1,5 @@
+import { EntityCatalogHelper as EntityCatalogEntityHelper } from './entity-catalog-entity/entity-catalog.service';
+
 export abstract class EntityCatalogHelpers {
   static readonly endpointType = 'endpoint';
   static buildEntityKey(entityType: string, endpointType: string): string {
@@ -10,4 +12,12 @@ export abstract class EntityCatalogHelpers {
     // Camelcased to make it work better with the store.
     return `${endpointType}${entityType.charAt(0).toUpperCase() + entityType.slice(1)}`;
   }
+
+  private static Instance: EntityCatalogEntityHelper;
+  static SetEntityCatalogEntityHelper(ecf: EntityCatalogEntityHelper) {
+    this.Instance = ecf;
+  }
+  static GetEntityCatalogEntityHelper(): EntityCatalogEntityHelper {
+    return this.Instance;
+  }
 }
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog.service.spec.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog.spec.ts
similarity index 95%
rename from src/frontend/packages/store/src/entity-catalog/entity-catalog.service.spec.ts
rename to src/frontend/packages/store/src/entity-catalog/entity-catalog.spec.ts
index 352c91f1e0..7f7a44f245 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog.service.spec.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog.spec.ts
@@ -1,10 +1,12 @@
-import { EntitySchema } from '../helpers/entity-schema';
 import { endpointEntitySchema } from '../../../core/src/base-entity-schemas';
 import { BaseEndpointAuth } from '../../../core/src/features/endpoints/endpoint-auth';
-import { EndpointListDetailsComponent } from '../../../core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers';
-import { StratosCatalogEndpointEntity, StratosCatalogEntity } from './entity-catalog-entity';
-import { TestEntityCatalog } from './entity-catalog.service';
-import { IStratosEndpointDefinition, EntityCatalogSchemas } from './entity-catalog.types';
+import {
+  EndpointListDetailsComponent,
+} from '../../../core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers';
+import { EntitySchema } from '../helpers/entity-schema';
+import { TestEntityCatalog } from './entity-catalog';
+import { StratosCatalogEndpointEntity, StratosCatalogEntity } from './entity-catalog-entity/entity-catalog-entity';
+import { EntityCatalogSchemas, IStratosEndpointDefinition } from './entity-catalog.types';
 
 describe('EntityCatalogService', () => {
   let entityCatalog: TestEntityCatalog;
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog.store-setup.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog.store-setup.ts
index fb9eb2b43d..4082342470 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog.store-setup.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog.store-setup.ts
@@ -1,19 +1,4 @@
 import { IRequestTypeState } from '../app-state';
-import { entityCatalog } from './entity-catalog.service';
-
-// FIXME: These should be removed/come from the entity catalog - STRAT-151
-const baseEntities = [
-  'user',
-  'system'
-];
-
-export function getAllEntityStoreKeys() {
-  const entities = entityCatalog.getAllEntitiesTypes();
-  return [
-    ...entities.map(entity => entity.entityKey),
-    ...baseEntities
-  ];
-}
 
 export function getDefaultStateFromEntityCatalog<T = any>(entityKeys: string[], defaultState: T, initialState: IRequestTypeState) {
   return entityKeys.reduce((currentState, entityKey) => {
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog.service.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts
similarity index 86%
rename from src/frontend/packages/store/src/entity-catalog/entity-catalog.service.ts
rename to src/frontend/packages/store/src/entity-catalog/entity-catalog.ts
index 68faff02eb..d10b67359f 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog.service.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog.ts
@@ -1,12 +1,12 @@
+import { STRATOS_ENDPOINT_TYPE } from '../../../core/src/base-entity-schemas';
 import { IRequestEntityTypeState } from '../app-state';
 import { ExtraApiReducers } from '../reducers/api-request-reducers.generator.helpers';
-import { STRATOS_ENDPOINT_TYPE } from '../../../core/src/base-entity-schemas';
 import { OrchestratedActionBuilders } from './action-orchestrator/action-orchestrator';
 import {
   StratosBaseCatalogEntity,
   StratosCatalogEndpointEntity,
   StratosCatalogEntity,
-} from './entity-catalog-entity';
+} from './entity-catalog-entity/entity-catalog-entity';
 import { EntityCatalogHelpers } from './entity-catalog.helper';
 import { EntityCatalogEntityConfig, IEntityMetadata, IStratosBaseEntityDefinition } from './entity-catalog.types';
 
@@ -103,25 +103,36 @@ class EntityCatalog {
     return this.entities.get(entityKey) || this.endpoints.get(entityKey);
   }
 
-  /* tslint:disable:max-line-length */
-  public getEntity<T extends IEntityMetadata = IEntityMetadata, Y = any, AB extends OrchestratedActionBuilders = OrchestratedActionBuilders>(
+  public getEntity<
+    T extends IEntityMetadata = IEntityMetadata,
+    Y = any,
+    AB extends OrchestratedActionBuilders = OrchestratedActionBuilders
+  >(
     entityConfig: EntityCatalogEntityConfig
-  ): StratosBaseCatalogEntity<T, Y, AB>;
-  public getEntity<T extends IEntityMetadata = IEntityMetadata, Y = any, AB extends OrchestratedActionBuilders = OrchestratedActionBuilders>(
-    endpointType: string,
-    entityType: string,
-    subType?: string
-  ): StratosBaseCatalogEntity<T, Y, AB>;
-  public getEntity<T extends IEntityMetadata = IEntityMetadata, Y = any, AB extends OrchestratedActionBuilders = OrchestratedActionBuilders>(
-    endpointTypeOrConfig: string | EntityCatalogEntityConfig,
-    entityType?: string,
-    subType?: string
-  ): StratosBaseCatalogEntity<T, Y, AB> {
+  ): StratosBaseCatalogEntity<T, Y, AB, AB>;
+  public getEntity<
+    T extends IEntityMetadata = IEntityMetadata,
+    Y = any,
+    AB extends OrchestratedActionBuilders = OrchestratedActionBuilders,
+    >(
+      endpointType: string,
+      entityType: string,
+      subType?: string
+    ): StratosBaseCatalogEntity<T, Y, AB, AB>;
+  public getEntity<
+    T extends IEntityMetadata = IEntityMetadata,
+    Y = any,
+    AB extends OrchestratedActionBuilders = OrchestratedActionBuilders,
+    >(
+      endpointTypeOrConfig: string | EntityCatalogEntityConfig,
+      entityType?: string,
+      subType?: string
+    ): StratosBaseCatalogEntity<T, Y, AB, AB> {
     /* tslint:enable:max-line-length */
     const config = this.getConfig(endpointTypeOrConfig, entityType, subType);
     const entityOfType = this.getEntityOfType(config.entityType, config.endpointType);
     if (entityOfType && subType) {
-      return this.getEntitySubType(entityOfType, subType) as StratosBaseCatalogEntity<T, Y, AB>;
+      return this.getEntitySubType(entityOfType, subType) as StratosBaseCatalogEntity<T, Y, AB, AB>;
     }
     if (!entityOfType) {
       console.warn(
@@ -129,7 +140,7 @@ class EntityCatalog {
         new Error().stack
       );
     }
-    return entityOfType as StratosBaseCatalogEntity<T, Y, AB>;
+    return entityOfType as StratosBaseCatalogEntity<T, Y, AB, AB>;
   }
 
   public getEntityKey(endpointType: string, entityType: string): string;
@@ -203,4 +214,4 @@ export class TestEntityCatalog extends EntityCatalog {
 // https://github.com/cloudfoundry-incubator/stratos/issues/3753 - Reverting the entity catalog to an Angular service
 // makes testing much easier and remove the need for this.
 /* tslint:disable-next-line:no-string-literal  */
-export const entityCatalog = !!window['__karma__'] ? new TestEntityCatalog() : new EntityCatalog();
+export const entityCatalog: EntityCatalog = !!window['__karma__'] ? new TestEntityCatalog() : new EntityCatalog();
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts
index 80e9d7a61a..09277100b9 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts
@@ -2,7 +2,6 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 
 import { EndpointAuthTypeConfig } from '../../../core/src/core/extension/extension-types';
-import { Omit } from '../../../core/src/core/utils.service';
 import { StratosStatus } from '../../../core/src/shared/shared.types';
 import { GeneralEntityAppState } from '../app-state';
 import {
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/base-single-entity-request.pipeline.ts b/src/frontend/packages/store/src/entity-request-pipeline/base-single-entity-request.pipeline.ts
index 6672986f46..f8ac38b4ca 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/base-single-entity-request.pipeline.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/base-single-entity-request.pipeline.ts
@@ -2,20 +2,20 @@ import { Action, Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { StratosBaseCatalogEntity } from '../entity-catalog/entity-catalog-entity';
-import { entityCatalog } from '../entity-catalog/entity-catalog.service';
-import { IStratosEntityDefinition } from '../entity-catalog/entity-catalog.types';
 import { AppState, InternalAppState } from '../app-state';
+import { entityCatalog } from '../entity-catalog/entity-catalog';
+import { StratosBaseCatalogEntity } from '../entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { IStratosEntityDefinition } from '../entity-catalog/entity-catalog.types';
 import { EntityRequestAction } from '../types/request.types';
 import { buildRequestEntityPipe } from './entity-request-base-handlers/build-entity-request.pipe';
 import {
   handleJetstreamResponsePipeFactory,
-  handleNonJetstreamResponsePipeFactory
+  handleNonJetstreamResponsePipeFactory,
 } from './entity-request-base-handlers/handle-multi-endpoints.pipe';
 import { makeRequestEntityPipe } from './entity-request-base-handlers/make-request-entity-request.pipe';
 import { mapMultiEndpointResponses } from './entity-request-base-handlers/map-multi-endpoint.pipes';
 import { BasePipelineConfig, EntityRequestPipeline, PipelineResult } from './entity-request-pipeline.types';
-import { singleRequestToPaged, isJetstreamRequest } from './pipeline-helpers';
+import { isJetstreamRequest, singleRequestToPaged } from './pipeline-helpers';
 import { PipelineHttpClient } from './pipline-http-client.service';
 
 export interface SingleRequestPipelineConfig<T extends AppState = InternalAppState> extends BasePipelineConfig<T> {
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-pagination-request-pipeline.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-pagination-request-pipeline.ts
index a2bbe9bb6b..163ec04dc5 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-pagination-request-pipeline.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-pagination-request-pipeline.ts
@@ -4,8 +4,11 @@ import { isObservable, Observable, of } from 'rxjs';
 import { first, map, switchMap } from 'rxjs/operators';
 
 import { AppState, InternalAppState } from '../app-state';
-import { StratosBaseCatalogEntity, StratosCatalogEntity } from '../entity-catalog/entity-catalog-entity';
-import { entityCatalog } from '../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../entity-catalog/entity-catalog';
+import {
+  StratosBaseCatalogEntity,
+  StratosCatalogEntity,
+} from '../entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { IStratosEntityDefinition } from '../entity-catalog/entity-catalog.types';
 import { PaginationFlattenerConfig } from '../helpers/paginated-request-helpers';
 import { selectPaginationState } from '../selectors/pagination.selectors';
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/endpoint-errors.handler.spec.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/endpoint-errors.handler.spec.ts
index 2e39ebde17..d03761d51c 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/endpoint-errors.handler.spec.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/endpoint-errors.handler.spec.ts
@@ -1,7 +1,7 @@
 import { Action } from '@ngrx/store';
 
 import { SendEventAction } from '../../actions/internal-events.actions';
-import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity';
+import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { EntitySchema } from '../../helpers/entity-schema';
 import { InternalEventSeverity } from '../../types/internal-events.types';
 import { APISuccessOrFailedAction, EntityRequestAction } from '../../types/request.types';
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/endpoint-errors.handler.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/endpoint-errors.handler.ts
index 6ff1efc269..8b6fc07532 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/endpoint-errors.handler.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/endpoint-errors.handler.ts
@@ -1,5 +1,5 @@
 import { SendEventAction } from '../../actions/internal-events.actions';
-import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity';
+import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { endpointSchemaKey } from '../../helpers/entity-factory';
 import { ApiRequestTypes } from '../../reducers/api-request-reducer/request-helpers';
 import { InternalEventSeverity, InternalEventStateMetadata } from '../../types/internal-events.types';
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/fail-entity-request.handler.spec.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/fail-entity-request.handler.spec.ts
index d930e58ec7..26f25612a6 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/fail-entity-request.handler.spec.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/fail-entity-request.handler.spec.ts
@@ -1,4 +1,4 @@
-import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity';
+import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { EntitySchema } from '../../helpers/entity-schema';
 import { EntityRequestAction } from '../../types/request.types';
 import { failedEntityHandler } from './fail-entity-request.handler';
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/fail-entity-request.handler.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/fail-entity-request.handler.ts
index 9d0803744b..ebe6478295 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/fail-entity-request.handler.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/fail-entity-request.handler.ts
@@ -1,5 +1,5 @@
-import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity';
 import { RecursiveDeleteFailed } from '../../effects/recursive-entity-delete.effect';
+import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { ApiRequestTypes } from '../../reducers/api-request-reducer/request-helpers';
 import { EntityRequestAction, WrapperRequestActionFailed } from '../../types/request.types';
 import { ActionDispatcher, PipelineResult } from '../entity-request-pipeline.types';
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/forced-action-type.helpers.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/forced-action-type.helpers.ts
index 01c607cd4b..9eaeb471ca 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/forced-action-type.helpers.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/forced-action-type.helpers.ts
@@ -1,4 +1,4 @@
-import { entityCatalog } from '../../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { PaginatedAction } from '../../types/pagination.types';
 import { EntityRequestAction } from '../../types/request.types';
 
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/jetstream-error.handler.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/jetstream-error.handler.ts
index 950dd6c51b..d68ddd27ab 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/jetstream-error.handler.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/jetstream-error.handler.ts
@@ -1,6 +1,6 @@
-import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity';
 import { SendEventAction } from '../../actions/internal-events.actions';
 import { RecursiveDeleteFailed } from '../../effects/recursive-entity-delete.effect';
+import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { endpointSchemaKey } from '../../helpers/entity-factory';
 import { ApiRequestTypes, getFailApiRequestActions } from '../../reducers/api-request-reducer/request-helpers';
 import { GLOBAL_EVENT, InternalEventSeverity, InternalEventStateMetadata } from '../../types/internal-events.types';
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/make-request-entity-request.pipe.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/make-request-entity-request.pipe.ts
index 9748006ba2..b6bd9dfeac 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/make-request-entity-request.pipe.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/make-request-entity-request.pipe.ts
@@ -1,7 +1,7 @@
 import { HttpRequest } from '@angular/common/http';
 import { switchMap } from 'rxjs/operators';
 
-import { StratosCatalogEndpointEntity } from '../../entity-catalog/entity-catalog-entity';
+import { StratosCatalogEndpointEntity } from '../../entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { MakeEntityRequestPipe } from '../entity-request-pipeline.types';
 
 export const makeRequestEntityPipe: MakeEntityRequestPipe = (
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/map-multi-endpoint.pipes.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/map-multi-endpoint.pipes.ts
index b078c3d189..953c96884d 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/map-multi-endpoint.pipes.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/map-multi-endpoint.pipes.ts
@@ -1,8 +1,8 @@
 import { Action } from '@ngrx/store';
 import { normalize } from 'normalizr';
 
-import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity';
-import { entityCatalog } from '../../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../entity-catalog/entity-catalog';
+import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { IStratosEntityDefinition } from '../../entity-catalog/entity-catalog.types';
 import { ApiRequestTypes } from '../../reducers/api-request-reducer/request-helpers';
 import { NormalizedResponse } from '../../types/api.types';
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/start-entity-request.handler.spec.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/start-entity-request.handler.spec.ts
index 9efad1f5ca..4c88fa24ad 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/start-entity-request.handler.spec.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/start-entity-request.handler.spec.ts
@@ -1,4 +1,4 @@
-import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity';
+import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { EntitySchema } from '../../helpers/entity-schema';
 import { EntityRequestAction } from '../../types/request.types';
 import { startEntityHandler } from './start-entity-request.handler';
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/success-entity-request.handler.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/success-entity-request.handler.ts
index bf0d187b9e..9302a6a42c 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/success-entity-request.handler.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-base-handlers/success-entity-request.handler.ts
@@ -1,8 +1,8 @@
 import { CF_ENDPOINT_TYPE } from '../../../../cloud-foundry/src/cf-types';
 import { ClearPaginationOfEntity, ClearPaginationOfType } from '../../actions/pagination.actions';
 import { RecursiveDeleteComplete } from '../../effects/recursive-entity-delete.effect';
-import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity';
-import { entityCatalog } from '../../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../entity-catalog/entity-catalog';
+import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { WrapperRequestActionSuccess } from '../../types/request.types';
 
 export function successEntityHandler(
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.ts
index fb7ef8483e..2fbc4f3eda 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.ts
@@ -5,8 +5,8 @@ import { catchError, map, tap } from 'rxjs/operators';
 import { isHttpErrorResponse } from '../../../core/src/jetstream.helpers';
 import { AppState, InternalAppState } from '../app-state';
 import { RecursiveDelete } from '../effects/recursive-entity-delete.effect';
-import { StratosBaseCatalogEntity } from '../entity-catalog/entity-catalog-entity';
-import { entityCatalog } from '../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../entity-catalog/entity-catalog';
+import { StratosBaseCatalogEntity } from '../entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { ApiRequestTypes, getRequestTypeFromMethod } from '../reducers/api-request-reducer/request-helpers';
 import { PaginatedAction } from '../types/pagination.types';
 import { EntityRequestAction } from '../types/request.types';
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts
index c6b24fd81b..4ae26e792a 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts
@@ -2,12 +2,12 @@ import { HttpRequest } from '@angular/common/http';
 import { Action, Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 
+import { JetStreamErrorResponse } from '../../../core/src/jetstream.helpers';
+import { AppState, InternalAppState } from '../app-state';
 import {
   StratosBaseCatalogEntity,
   StratosCatalogEndpointEntity,
-} from '../entity-catalog/entity-catalog-entity';
-import { JetStreamErrorResponse } from '../../../core/src/jetstream.helpers';
-import { AppState, InternalAppState } from '../app-state';
+} from '../entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { ApiRequestTypes } from '../reducers/api-request-reducer/request-helpers';
 import { NormalizedResponse } from '../types/api.types';
 import { PaginatedAction } from '../types/pagination.types';
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/pagination-request-base-handlers/get-params.pipe.ts b/src/frontend/packages/store/src/entity-request-pipeline/pagination-request-base-handlers/get-params.pipe.ts
index 2ccb2a0856..d02ef516b6 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/pagination-request-base-handlers/get-params.pipe.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/pagination-request-base-handlers/get-params.pipe.ts
@@ -1,9 +1,6 @@
 import { HttpParams } from '@angular/common/http';
 
-import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity';
-import { InternalAppState } from '../../app-state';
 import { resultPerPageParam, resultPerPageParamDefault } from '../../reducers/pagination-reducer/pagination-reducer.types';
-import { selectPaginationState } from '../../selectors/pagination.selectors';
 import { PaginatedAction, PaginationEntityState, PaginationParam } from '../../types/pagination.types';
 
 export function getPaginationParams(paginationState: PaginationEntityState): PaginationParam {
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe.ts b/src/frontend/packages/store/src/entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe.ts
index 1038a7e569..cbc69245b2 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe.ts
@@ -5,7 +5,7 @@ import { map, mergeMap, reduce, switchMap } from 'rxjs/operators';
 
 import { UpdatePaginationMaxedState } from '../../actions/pagination.actions';
 import { AppState } from '../../app-state';
-import { entityCatalog } from '../../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { PaginatedAction, PaginationMaxedState } from '../../types/pagination.types';
 import { ActionDispatcher, JetstreamResponse, PagedJetstreamResponse } from '../entity-request-pipeline.types';
 import { PipelineHttpClient } from '../pipline-http-client.service';
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/pipeline-helpers.ts b/src/frontend/packages/store/src/entity-request-pipeline/pipeline-helpers.ts
index 9c03bc9d79..e587aed932 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/pipeline-helpers.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/pipeline-helpers.ts
@@ -1,6 +1,4 @@
-import { HttpParams } from '@angular/common/http';
-
-import { StratosBaseCatalogEntity } from '../entity-catalog/entity-catalog-entity';
+import { StratosBaseCatalogEntity } from '../entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { IStratosEntityDefinition } from '../entity-catalog/entity-catalog.types';
 import { JetstreamResponse, PagedJetstreamResponse } from './entity-request-pipeline.types';
 
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/pipline-http-client.service.ts b/src/frontend/packages/store/src/entity-request-pipeline/pipline-http-client.service.ts
index 9cf1fd1bac..863ac58cef 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/pipline-http-client.service.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/pipline-http-client.service.ts
@@ -6,7 +6,7 @@ import { filter, first, map, mergeMap } from 'rxjs/operators';
 
 import { environment } from '../../../core/src/environments/environment';
 import { InternalAppState } from '../app-state';
-import { StratosCatalogEndpointEntity } from '../entity-catalog/entity-catalog-entity';
+import { StratosCatalogEndpointEntity } from '../entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { IStratosEndpointDefinition } from '../entity-catalog/entity-catalog.types';
 import { connectedEndpointsOfTypesSelector, endpointOfTypeSelector } from '../selectors/endpoint.selectors';
 
diff --git a/src/frontend/packages/store/src/entity-service-factory.service.ts b/src/frontend/packages/store/src/entity-service-factory.service.ts
index d320c5779d..42e02864b6 100644
--- a/src/frontend/packages/store/src/entity-service-factory.service.ts
+++ b/src/frontend/packages/store/src/entity-service-factory.service.ts
@@ -4,7 +4,7 @@ import { Store } from '@ngrx/store';
 import { GeneralEntityAppState } from './app-state';
 import { EntityRequestAction } from './types/request.types';
 import { EntityMonitorFactory } from './monitors/entity-monitor.factory.service';
-import { entityCatalog } from './entity-catalog/entity-catalog.service';
+import { entityCatalog } from './entity-catalog/entity-catalog';
 import { EntityActionBuilderEntityConfig } from './entity-catalog/entity-catalog.types';
 import { ENTITY_INFO_HANDLER, EntityInfoHandler, EntityService } from './entity-service';
 
diff --git a/src/frontend/packages/store/src/entity-service.spec.ts b/src/frontend/packages/store/src/entity-service.spec.ts
index b8a4a290e5..e0e752ada8 100644
--- a/src/frontend/packages/store/src/entity-service.spec.ts
+++ b/src/frontend/packages/store/src/entity-service.spec.ts
@@ -4,27 +4,25 @@ import { inject, TestBed } from '@angular/core/testing';
 import { Action, Store } from '@ngrx/store';
 import { filter, first, map, pairwise, tap } from 'rxjs/operators';
 
+import { STRATOS_ENDPOINT_TYPE } from '../../core/src/base-entity-schemas';
+import { ENTITY_SERVICE } from '../../core/src/shared/entity.tokens';
+import { generateTestEntityServiceProvider } from '../../core/test-framework/entity-service.helper';
+import { createEntityStore, TestStoreEntity } from '../testing/src/store-test-helper';
 import { APIResponse } from './actions/request.actions';
 import { GeneralAppState } from './app-state';
-import {
-  failedEntityHandler,
-} from './entity-request-pipeline/entity-request-base-handlers/fail-entity-request.handler';
+import { EntityCatalogTestModule, TEST_CATALOGUE_ENTITIES } from './entity-catalog-test.module';
+import { StratosBaseCatalogEntity } from './entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { EntityCatalogEntityConfig, IStratosEndpointDefinition } from './entity-catalog/entity-catalog.types';
+import { failedEntityHandler } from './entity-request-pipeline/entity-request-base-handlers/fail-entity-request.handler';
 import { PipelineResult } from './entity-request-pipeline/entity-request-pipeline.types';
+import { EntityService } from './entity-service';
+import { EntityServiceFactory } from './entity-service-factory.service';
 import { EntitySchema } from './helpers/entity-schema';
+import { EntityMonitor } from './monitors/entity-monitor';
+import { EntityMonitorFactory } from './monitors/entity-monitor.factory.service';
 import { completeApiRequest, startApiRequest } from './reducers/api-request-reducer/request-helpers';
 import { NormalizedResponse } from './types/api.types';
 import { EntityRequestAction, ICFAction } from './types/request.types';
-import { generateTestEntityServiceProvider } from '../../core/test-framework/entity-service.helper';
-import { createEntityStore, TestStoreEntity } from '../testing/src/store-test-helper';
-import { STRATOS_ENDPOINT_TYPE } from '../../core/src/base-entity-schemas';
-import { ENTITY_SERVICE } from '../../core/src/shared/entity.tokens';
-import { EntityMonitor } from './monitors/entity-monitor';
-import { EntityMonitorFactory } from './monitors/entity-monitor.factory.service';
-import { EntityCatalogTestModule, TEST_CATALOGUE_ENTITIES } from './entity-catalog-test.module';
-import { StratosBaseCatalogEntity } from './entity-catalog/entity-catalog-entity';
-import { EntityCatalogEntityConfig, IStratosEndpointDefinition } from './entity-catalog/entity-catalog.types';
-import { EntityService } from './entity-service';
-import { EntityServiceFactory } from './entity-service-factory.service';
 
 function getActionDispatcher(store: Store<any>) {
   return (action: Action) => {
diff --git a/src/frontend/packages/store/src/entity-service.ts b/src/frontend/packages/store/src/entity-service.ts
index 0b3e3066b2..f138ed1e40 100644
--- a/src/frontend/packages/store/src/entity-service.ts
+++ b/src/frontend/packages/store/src/entity-service.ts
@@ -4,14 +4,14 @@ import { combineLatest, Observable } from 'rxjs';
 import { filter, first, map, publishReplay, refCount, switchMap, tap, withLatestFrom } from 'rxjs/operators';
 
 import { GeneralEntityAppState } from './app-state';
+import { entityCatalog } from './entity-catalog/entity-catalog';
+import { EntityActionBuilderEntityConfig } from './entity-catalog/entity-catalog.types';
 import { ActionDispatcher } from './entity-request-pipeline/entity-request-pipeline.types';
+import { EntityMonitor } from './monitors/entity-monitor';
 import { RequestInfoState, UpdatingSection } from './reducers/api-request-reducer/types';
 import { getEntityUpdateSections, getUpdateSectionById } from './selectors/api.selectors';
 import { EntityInfo } from './types/api.types';
 import { EntityRequestAction } from './types/request.types';
-import { EntityMonitor } from './monitors/entity-monitor';
-import { entityCatalog } from './entity-catalog/entity-catalog.service';
-import { EntityActionBuilderEntityConfig } from './entity-catalog/entity-catalog.types';
 
 export const ENTITY_INFO_HANDLER = '__ENTITY_INFO_HANDLER__';
 
@@ -25,7 +25,6 @@ export function isEntityBlocked(entityRequestInfo: RequestInfoState) {
     entityRequestInfo.error ||
     entityRequestInfo.deleting.busy ||
     entityRequestInfo.deleting.deleted;
-  // TODO: RC test removal of updating._root_.busy
 }
 
 const dispatcherFactory = (store: Store<GeneralEntityAppState>, action: EntityRequestAction) => (updatingKey?: string) => {
diff --git a/src/frontend/packages/store/src/monitors/entity-monitor.factory.service.ts b/src/frontend/packages/store/src/monitors/entity-monitor.factory.service.ts
index a3c18a2f81..c7a6dadd26 100644
--- a/src/frontend/packages/store/src/monitors/entity-monitor.factory.service.ts
+++ b/src/frontend/packages/store/src/monitors/entity-monitor.factory.service.ts
@@ -1,15 +1,17 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
-import { entityCatalog } from '../entity-catalog/entity-catalog.service';
+import { AppState } from '../app-state';
+import { entityCatalog } from '../entity-catalog/entity-catalog';
 import { EntityCatalogEntityConfig } from '../entity-catalog/entity-catalog.types';
 import { EntityMonitor } from './entity-monitor';
-import { AppState } from '../app-state';
 
 @Injectable()
 export class EntityMonitorFactory {
 
-  constructor(private store: Store<AppState>) { }
+  constructor(
+    private store: Store<AppState>,
+  ) { }
 
   private monitorCache: {
     [key: string]: EntityMonitor
@@ -29,17 +31,15 @@ export class EntityMonitorFactory {
       if (!catalogEntity) {
         throw new Error(`Could not find catalog entity for endpoint type '${endpointType}' and entity type '${entityType}'`);
       }
-      const monitor = catalogEntity.getEntityMonitor(
+      const monitor = new EntityMonitor<T>(
         this.store,
         id,
-        {
-          startWithNull,
-          schemaKey: entityConfig.schemaKey
-        }
+        catalogEntity.entityKey,
+        catalogEntity.getSchema(entityConfig.schemaKey),
+        startWithNull
       );
       this.monitorCache[cacheKey] = monitor;
       return monitor;
     }
   }
-
 }
diff --git a/src/frontend/packages/store/src/monitors/pagination-monitor.factory.ts b/src/frontend/packages/store/src/monitors/pagination-monitor.factory.ts
index 814898ba23..4b4fa9cddc 100644
--- a/src/frontend/packages/store/src/monitors/pagination-monitor.factory.ts
+++ b/src/frontend/packages/store/src/monitors/pagination-monitor.factory.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { AppState } from '../app-state';
-import { entityCatalog } from '../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../entity-catalog/entity-catalog';
 import { EntityCatalogEntityConfig } from '../entity-catalog/entity-catalog.types';
 import { PaginationMonitor } from './pagination-monitor';
 
diff --git a/src/frontend/packages/store/src/monitors/pagination-monitor.ts b/src/frontend/packages/store/src/monitors/pagination-monitor.ts
index 03e06a4d68..84dd3e5080 100644
--- a/src/frontend/packages/store/src/monitors/pagination-monitor.ts
+++ b/src/frontend/packages/store/src/monitors/pagination-monitor.ts
@@ -18,11 +18,12 @@ import {
   LocalPaginationHelpers,
 } from '../../../core/src/shared/components/list/data-sources-controllers/local-list.helpers';
 import { AppState, GeneralEntityAppState, GeneralRequestDataState } from '../app-state';
-import { StratosBaseCatalogEntity } from '../entity-catalog/entity-catalog-entity';
-import { entityCatalog } from '../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../entity-catalog/entity-catalog';
+import { StratosBaseCatalogEntity } from '../entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { EntityCatalogEntityConfig } from '../entity-catalog/entity-catalog.types';
 import { EntitySchema } from '../helpers/entity-schema';
 import { ActionState, ListActionState } from '../reducers/api-request-reducer/types';
+import { getCurrentPageRequestInfo } from '../reducers/pagination-reducer/pagination-reducer.types';
 import { getAPIRequestDataState, selectEntities } from '../selectors/api.selectors';
 import { selectPaginationState } from '../selectors/pagination.selectors';
 import { PaginationEntityState } from '../types/pagination.types';
@@ -48,6 +49,7 @@ export class PaginationMonitor<T = any, Y extends AppState = GeneralEntityAppSta
    * Emits the current page of entities.
    */
   public currentPage$: Observable<T[]>;
+  public currentPageState$: Observable<ListActionState>;
   /**
    * Emits a boolean stating if the current page is fetching or not.
    */
@@ -121,19 +123,14 @@ export class PaginationMonitor<T = any, Y extends AppState = GeneralEntityAppSta
   private getCurrentPageRequestInfo(
     pagination: PaginationEntityState,
   ): ActionState {
-    if (
-      !pagination ||
-      !pagination.pageRequests ||
-      !pagination.pageRequests[pagination.currentPage]
-    ) {
-      return {
+    return getCurrentPageRequestInfo(
+      pagination,
+      {
         busy: true,
         error: false,
         message: '',
-      };
-    } else {
-      return pagination.pageRequests[pagination.currentPage];
-    }
+      }
+    );
   }
 
   // ### Initialization methods.
@@ -158,6 +155,9 @@ export class PaginationMonitor<T = any, Y extends AppState = GeneralEntityAppSta
       this.currentPage$ = this.createPageObservable(this.pagination$, schema);
     }
     this.currentPageError$ = this.createErrorObservable(this.pagination$);
+    this.currentPageState$ = this.pagination$.pipe(
+      map(pagination => this.getCurrentPageRequestInfo(pagination))
+    );
   }
 
   private createPaginationObservable(
diff --git a/src/frontend/packages/store/src/reducers/api-request-data-reducer/request-data-reducer.factory.ts b/src/frontend/packages/store/src/reducers/api-request-data-reducer/request-data-reducer.factory.ts
index 8947039baa..8797f5abfa 100644
--- a/src/frontend/packages/store/src/reducers/api-request-data-reducer/request-data-reducer.factory.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-data-reducer/request-data-reducer.factory.ts
@@ -1,9 +1,9 @@
 import { Action, ActionReducer } from '@ngrx/store';
 
+import { RECURSIVE_ENTITY_SET_DELETED, SetTreeDeleted } from '../../effects/recursive-entity-delete.effect';
 import { InitCatalogEntitiesAction } from '../../entity-catalog.actions';
-import { entityCatalog } from '../../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { getDefaultStateFromEntityCatalog } from '../../entity-catalog/entity-catalog.store-setup';
-import { RECURSIVE_ENTITY_SET_DELETED, SetTreeDeleted } from '../../effects/recursive-entity-delete.effect';
 import { deepMergeState } from '../../helpers/reducer.helper';
 import { IFlatTree } from '../../helpers/schema-tree-traverse';
 import { ISuccessRequestAction } from '../../types/request.types';
diff --git a/src/frontend/packages/store/src/reducers/api-request-reducer/request-helpers.ts b/src/frontend/packages/store/src/reducers/api-request-reducer/request-helpers.ts
index 3f641545a1..ae52213fd9 100644
--- a/src/frontend/packages/store/src/reducers/api-request-reducer/request-helpers.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-reducer/request-helpers.ts
@@ -1,9 +1,11 @@
 import { Store } from '@ngrx/store';
-import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity';
-import { entityCatalog } from '../../entity-catalog/entity-catalog.service';
+
 import { pathGet } from '../../../../core/src/core/utils.service';
 import { APIResponse } from '../../actions/request.actions';
 import { BaseRequestState, GeneralAppState } from '../../app-state';
+import { BaseEntityRequestAction } from '../../entity-catalog/action-orchestrator/action-orchestrator';
+import { entityCatalog } from '../../entity-catalog/entity-catalog';
+import { StratosBaseCatalogEntity } from '../../entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { mergeState } from '../../helpers/reducer.helper';
 import { NormalizedResponse } from '../../types/api.types';
 import { PaginatedAction } from '../../types/pagination.types';
@@ -17,7 +19,6 @@ import {
   WrapperRequestActionSuccess,
 } from '../../types/request.types';
 import { defaultDeletingActionState, getDefaultRequestState, RequestInfoState, rootUpdatingKey } from './types';
-import { BaseEntityRequestAction } from '../../entity-catalog/action-orchestrator/action-orchestrator';
 
 export function getEntityRequestState(
   state: BaseRequestState,
diff --git a/src/frontend/packages/store/src/reducers/api-request-reducer/succeed-request.ts b/src/frontend/packages/store/src/reducers/api-request-reducer/succeed-request.ts
index 418feaa0fe..71b79e9aaa 100644
--- a/src/frontend/packages/store/src/reducers/api-request-reducer/succeed-request.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-reducer/succeed-request.ts
@@ -1,7 +1,7 @@
 import { isNullOrUndefined } from 'util';
 
-import { BaseEntityRequestAction } from '../../entity-catalog/action-orchestrator/action-orchestrator';
 import { BaseRequestState } from '../../app-state';
+import { BaseEntityRequestAction } from '../../entity-catalog/action-orchestrator/action-orchestrator';
 import { mergeState } from '../../helpers/reducer.helper';
 import { ISuccessRequestAction, WrapperRequestActionSuccess } from '../../types/request.types';
 import {
diff --git a/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts b/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts
index f88d73d7ad..8ab5be4e86 100644
--- a/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts
@@ -6,7 +6,7 @@ import { requestReducerFactory } from './api-request-reducer/request-reducer.fac
 import { RequestInfoState } from './api-request-reducer/types';
 import { chainApiReducers, ExtraApiReducers, requestActions } from './api-request-reducers.generator.helpers';
 import { appStatsReducer } from '../../../cloud-foundry/src/store/reducers/app-stats-request.reducer';
-import { entityCatalog } from '../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../entity-catalog/entity-catalog';
 import { CF_ENDPOINT_TYPE } from '../../../cloud-foundry/src/cf-types';
 
 /**
diff --git a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/recently-visited.reducer.ts b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/recently-visited.reducer.ts
index 0d999fb9f5..2a83934d21 100644
--- a/src/frontend/packages/store/src/reducers/current-user-roles-reducer/recently-visited.reducer.ts
+++ b/src/frontend/packages/store/src/reducers/current-user-roles-reducer/recently-visited.reducer.ts
@@ -10,7 +10,7 @@ import {
 import { AddRecentlyVisitedEntityAction, SetRecentlyVisitedEntityAction } from '../../actions/recently-visited.actions';
 import { IRecentlyVisitedState } from '../../types/recently-visited.types';
 import { addNewHit, cleanRecentsList, getDefaultRecentState } from './recently-visited.reducer.helpers';
-import { entityCatalog } from '../../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { STRATOS_ENDPOINT_TYPE } from '../../../../core/src/base-entity-schemas';
 import { endpointSchemaKey } from '../../helpers/entity-factory';
 
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-clear-pagination-of-entity.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-clear-pagination-of-entity.ts
index f42251932a..8188fc3fff 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-clear-pagination-of-entity.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-clear-pagination-of-entity.ts
@@ -1,4 +1,4 @@
-import { entityCatalog } from '../../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { ClearPaginationOfEntity } from '../../actions/pagination.actions';
 import { PaginationEntityState, PaginationState } from '../../types/pagination.types';
 import { spreadClientPagination } from './pagination-reducer.helper';
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-clear-pagination-type.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-clear-pagination-type.ts
index 25cede1fdd..61cc841a8a 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-clear-pagination-type.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-clear-pagination-type.ts
@@ -1,5 +1,5 @@
 import { EndpointAction } from '../../actions/endpoint.actions';
-import { entityCatalog } from '../../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { PaginationState } from '../../types/pagination.types';
 import { getDefaultPaginationEntityState } from './pagination-reducer-reset-pagination';
 
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-create-pagination.spec.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-create-pagination.spec.ts
index c97da32f57..d9c0465284 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-create-pagination.spec.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-create-pagination.spec.ts
@@ -1,4 +1,4 @@
-import { entityCatalog } from '../../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { CreatePagination } from '../../actions/pagination.actions';
 import { PaginationState } from '../../types/pagination.types';
 import { createNewPaginationSection } from './pagination-reducer-create-pagination';
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-create-pagination.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-create-pagination.ts
index ef05eefaf2..7e57e52957 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-create-pagination.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-create-pagination.ts
@@ -1,4 +1,4 @@
-import { entityCatalog } from '../../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { EntityCatalogEntityConfig } from '../../entity-catalog/entity-catalog.types';
 import { CreatePagination } from '../../actions/pagination.actions';
 import { PaginationEntityState, PaginationState } from '../../types/pagination.types';
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-max-reached.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-max-reached.ts
index b24dc25f4e..3d8080a705 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-max-reached.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-max-reached.ts
@@ -2,7 +2,7 @@ import {
   LocalPaginationHelpers,
 } from '../../../../core/src/shared/components/list/data-sources-controllers/local-list.helpers';
 import { IgnorePaginationMaxedState, UpdatePaginationMaxedState } from '../../actions/pagination.actions';
-import { entityCatalog } from '../../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { PaginationEntityTypeState, PaginationState } from '../../types/pagination.types';
 import { getDefaultPaginationEntityState } from './pagination-reducer-reset-pagination';
 
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-reset-pagination.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-reset-pagination.ts
index 1509f943c2..603b2b767f 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-reset-pagination.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-reset-pagination.ts
@@ -1,5 +1,5 @@
 import { ResetPagination } from '../../actions/pagination.actions';
-import { entityCatalog } from '../../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { PaginationEntityState, PaginationEntityTypeState, PaginationState } from '../../types/pagination.types';
 
 export const defaultClientPaginationPageSize = 9;
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts
index 7cbe24d032..2153fec07a 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts
@@ -18,7 +18,7 @@ import { sortStringify } from '../../../../core/src/core/utils.service';
 import { SetInitialParams } from '../../actions/pagination.actions';
 import { CfValidateEntitiesStart } from '../../actions/request.actions';
 import { AppState, GeneralEntityAppState } from '../../app-state';
-import { entityCatalog } from '../../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { PaginationMonitor } from '../../monitors/pagination-monitor';
 import { selectEntities } from '../../selectors/api.selectors';
 import { selectPaginationState } from '../../selectors/pagination.selectors';
@@ -28,24 +28,7 @@ import {
   PaginationEntityState,
   PaginationParam,
 } from '../../types/pagination.types';
-import { ListActionState } from '../api-request-reducer/types';
-
-export interface PaginationObservables<T> {
-  pagination$: Observable<PaginationEntityState>;
-  entities$: Observable<T[]>;
-  /**
-   * Convenience observable on !!entities
-   */
-  hasEntities$: Observable<boolean>;
-  /**
-   * Convenience observable on pagination totalResults (note - not entities.length. In maxed world this can be different)
-   */
-  totalEntities$: Observable<number>;
-  /**
-   * Equate to current page fetching observable
-   */
-  fetchingEntities$: Observable<boolean>;
-}
+import { getCurrentPageRequestInfo, PaginationObservables } from './pagination-reducer.types';
 
 export function removeEmptyParams(params: PaginationParam) {
   const newObject = {};
@@ -306,14 +289,6 @@ export function hasError(pagination: PaginationEntityState): boolean {
   return pagination && getCurrentPageRequestInfo(pagination).error;
 }
 
-export function getCurrentPageRequestInfo(pagination: PaginationEntityState, valueIfMissing = {
-  busy: false,
-  error: false,
-  message: ''
-}): ListActionState {
-  return pagination.pageRequests[pagination.currentPage] || valueIfMissing;
-}
-
 export function spreadClientPagination(pag: PaginationClientPagination): PaginationClientPagination {
   return {
     ...pag,
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.types.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.types.ts
index 4175f69173..bfaa0c3aeb 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.types.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.types.ts
@@ -1,5 +1,39 @@
+import { Observable } from 'rxjs'; import { PaginationEntityState } from '../../types/pagination.types';
+import { ListActionState } from '../api-request-reducer/types';
 
 
 export const resultPerPageParam = 'results-per-page';
 export const resultPerPageParamDefault = 5;
 
+export interface PaginationObservables<T> {
+  pagination$: Observable<PaginationEntityState>;
+  entities$: Observable<T[]>;
+  /**
+   * Convenience observable on !!entities
+   */
+  hasEntities$: Observable<boolean>;
+  /**
+   * Convenience observable on pagination totalResults (note - not entities.length. In maxed world this can be different)
+   */
+  totalEntities$: Observable<number>;
+  /**
+   * Equate to current page fetching observable
+   */
+  fetchingEntities$: Observable<boolean>;
+}
+
+export function getCurrentPageRequestInfo(pagination: PaginationEntityState, valueIfMissing = {
+  busy: false,
+  error: false,
+  message: ''
+}): ListActionState {
+  if (
+    !pagination ||
+    !pagination.pageRequests ||
+    !pagination.pageRequests[pagination.currentPage]
+  ) {
+    return valueIfMissing;
+  } else {
+    return pagination.pageRequests[pagination.currentPage];
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination.reducer.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination.reducer.ts
index 0784503537..f39aa853f0 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination.reducer.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination.reducer.ts
@@ -27,7 +27,7 @@ import {
 } from '../../actions/pagination.actions';
 import { ApiActionTypes } from '../../actions/request.actions';
 import { InitCatalogEntitiesAction } from '../../entity-catalog.actions';
-import { entityCatalog } from '../../entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { getDefaultStateFromEntityCatalog } from '../../entity-catalog/entity-catalog.store-setup';
 import { mergeState } from '../../helpers/reducer.helper';
 import { PaginationEntityState, PaginationState } from '../../types/pagination.types';
diff --git a/src/frontend/packages/store/src/selectors/current-user-role.selectors.ts b/src/frontend/packages/store/src/selectors/current-user-role.selectors.ts
index 38ac1f8f07..5f52c49b13 100644
--- a/src/frontend/packages/store/src/selectors/current-user-role.selectors.ts
+++ b/src/frontend/packages/store/src/selectors/current-user-role.selectors.ts
@@ -6,8 +6,6 @@ import { CurrentUserRolesAppState } from '../app-state';
 import { ICurrentUserRolesState, IStratosRolesState } from '../types/current-user-roles.types';
 
 
-type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
-
 export const selectCurrentUserRolesState = (state: CurrentUserRolesAppState) => state.currentUserRoles;
 
 export const selectCurrentUserStratosRolesState = (state: ICurrentUserRolesState) => state.internal;
diff --git a/src/frontend/packages/store/src/selectors/favorite-groups.selectors.ts b/src/frontend/packages/store/src/selectors/favorite-groups.selectors.ts
index f7100c7f94..a1b3158b2e 100644
--- a/src/frontend/packages/store/src/selectors/favorite-groups.selectors.ts
+++ b/src/frontend/packages/store/src/selectors/favorite-groups.selectors.ts
@@ -1,9 +1,9 @@
 import { compose } from '@ngrx/store';
 
 import { STRATOS_ENDPOINT_TYPE, userFavoritesEntitySchema } from '../../../core/src/base-entity-schemas';
-import { entityCatalog } from '../entity-catalog/entity-catalog.service';
 import { deriveEndpointFavoriteFromFavorite } from '../../../core/src/core/user-favorite-helpers';
-import { IRequestEntityTypeState, InternalAppState } from '../app-state';
+import { InternalAppState, IRequestEntityTypeState } from '../app-state';
+import { entityCatalog } from '../entity-catalog/entity-catalog';
 import { IUserFavoriteGroup, IUserFavoritesGroups, IUserFavoritesGroupsState } from '../types/favorite-groups.types';
 import { IFavoriteMetadata, UserFavorite } from '../types/user-favorites.types';
 
diff --git a/src/frontend/packages/store/testing/src/store-test-helper.ts b/src/frontend/packages/store/testing/src/store-test-helper.ts
index 8d4ce58cd0..9ad3e9ab30 100644
--- a/src/frontend/packages/store/testing/src/store-test-helper.ts
+++ b/src/frontend/packages/store/testing/src/store-test-helper.ts
@@ -4,7 +4,7 @@ import { Store, StoreModule } from '@ngrx/store';
 
 import { endpointEntitySchema } from '../../../core/src/base-entity-schemas';
 import { AppState } from '../../src/app-state';
-import { entityCatalog } from '../../src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../src/entity-catalog/entity-catalog';
 import { EntityCatalogEntityConfig } from '../../src/entity-catalog/entity-catalog.types';
 import { appReducers } from '../../src/reducers.module';
 import { getDefaultRequestState } from '../../src/reducers/api-request-reducer/types';
diff --git a/src/frontend/packages/store/testing/src/store-test.module.ts b/src/frontend/packages/store/testing/src/store-test.module.ts
index a651b603fb..9bb257559b 100644
--- a/src/frontend/packages/store/testing/src/store-test.module.ts
+++ b/src/frontend/packages/store/testing/src/store-test.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 
 import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../src/entity-catalog.module';
-import { entityCatalog, TestEntityCatalog } from '../../src/entity-catalog/entity-catalog.service';
+import { entityCatalog, TestEntityCatalog } from '../../src/entity-catalog/entity-catalog';
 
 @NgModule({
   imports: [

From cf9e658937e05648c51e9e62570e29cea380d291 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 30 Apr 2020 15:44:58 +0100
Subject: [PATCH 038/176] Fix disabling of polling - fixes #4244

---
 .../user-profile/profile-info/profile-info.component.html       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.html b/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.html
index 0eca5d5d7d..c08c7704c5 100644
--- a/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.html
+++ b/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.html
@@ -86,7 +86,7 @@ <h1>User Profile</h1>
             [ngClass]="{'user-profile__option-warning': pollingEnabled === 'false'}">
             <div class="user-profile__option-inner">
               <mat-slide-toggle color="warn" [checked]="pollingEnabled === 'false'"
-                (change)="updatePolling(timeoutSession)">
+                (change)="updatePolling(pollingEnabled)">
                 <div class="user-profile__option-header">Disable polling
                   <mat-icon *ngIf="pollingEnabled === 'false'" #tooltip="matTooltip"
                     matTooltip="Polling is disabled, some pages may not automatically update."

From f3be1a402d65e9f5901ef2496587712e070601a4 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 30 Apr 2020 17:46:39 +0100
Subject: [PATCH 039/176] Rename GetEntityCatalogEntityHelper

---
 src/frontend/packages/core/src/app.module.ts         |  2 +-
 .../entity-catalog-entity-store-helpers.ts           | 12 ++++++------
 .../src/entity-catalog/entity-catalog.helper.ts      |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/frontend/packages/core/src/app.module.ts b/src/frontend/packages/core/src/app.module.ts
index 7787fddcfe..7d7c2964e1 100644
--- a/src/frontend/packages/core/src/app.module.ts
+++ b/src/frontend/packages/core/src/app.module.ts
@@ -128,7 +128,7 @@ export class AppModule {
     private favoritesConfigMapper: FavoritesConfigMapper,
     ech: EntityCatalogHelper
   ) {
-    EntityCatalogHelpers.SetEntityCatalogEntityHelper(ech);
+    EntityCatalogHelpers.SetEntityCatalogHelper(ech);
 
     eventService.addEventConfig<boolean>({
       eventTriggered: (state: GeneralEntityAppState) => new GlobalEventData(!state.dashboard.timeoutSession),
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts
index 6e79f49192..150d0bea31 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts
@@ -35,7 +35,7 @@ export class EntityCatalogEntityStoreHelpers {
     actionBuilderKey: string,
     action: any,
   ): EntityService<Y> {
-    const helper = EntityCatalogHelpers.GetEntityCatalogEntityHelper();
+    const helper = EntityCatalogHelpers.GetEntityCatalogHelper();
     if (isPaginatedAction(action)) {
       throw new Error(`\`${actionBuilderKey}\` action is of type pagination`);
     }
@@ -52,7 +52,7 @@ export class EntityCatalogEntityStoreHelpers {
     actionBuilderKey: string,
     action: any,
   ): PaginationMonitor<Y> {
-    const helper = EntityCatalogHelpers.GetEntityCatalogEntityHelper();
+    const helper = EntityCatalogHelpers.GetEntityCatalogHelper();
     if (!isPaginatedAction(action)) {
       throw new Error(`\`${actionBuilderKey}\` action is not of type pagination`);
     }
@@ -64,7 +64,7 @@ export class EntityCatalogEntityStoreHelpers {
     actionBuilderKey: string,
     action: any,
   ): PaginationObservables<Y> {
-    const helper = EntityCatalogHelpers.GetEntityCatalogEntityHelper();
+    const helper = EntityCatalogHelpers.GetEntityCatalogHelper();
     if (!isPaginatedAction(action)) {
       throw new Error(`\`${actionBuilderKey}\` action is not of type pagination`);
     }
@@ -104,7 +104,7 @@ export class EntityCatalogEntityStoreHelpers {
   ): ActionDispatcher<K, ABC> {
     return <T extends RequestInfoState | ListActionState>(
       ...args: Parameters<ABC[K]>): Observable<T> => {
-      const helper = EntityCatalogHelpers.GetEntityCatalogEntityHelper();
+      const helper = EntityCatalogHelpers.GetEntityCatalogHelper();
 
       const action = builder(...args);
       helper.store.dispatch(action);
@@ -144,7 +144,7 @@ export class EntityCatalogEntityStoreHelpers {
           startWithNull: false
         }
       ): EntityMonitor<Y> =>
-        new EntityMonitor<Y>(EntityCatalogHelpers.GetEntityCatalogEntityHelper().store, entityId, entityKey, getSchema(params.schemaKey), params.startWithNull)
+        new EntityMonitor<Y>(EntityCatalogHelpers.GetEntityCatalogHelper().store, entityId, entityKey, getSchema(params.schemaKey), params.startWithNull)
       ,
       getEntityService: (
         ...args: Parameters<ABC['get']>
@@ -199,7 +199,7 @@ export class EntityCatalogEntityStoreHelpers {
               throw new Error(`\`${key}\` action is of type pagination`);
             }
             return new EntityMonitor<Y>(
-              EntityCatalogHelpers.GetEntityCatalogEntityHelper().store,
+              EntityCatalogHelpers.GetEntityCatalogHelper().store,
               action.guid,
               entityKey,
               getSchema(action.schemaKey),
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog.helper.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog.helper.ts
index c65c640779..c4fc7b45f8 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog.helper.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog.helper.ts
@@ -1,4 +1,4 @@
-import { EntityCatalogHelper as EntityCatalogEntityHelper } from './entity-catalog-entity/entity-catalog.service';
+import { EntityCatalogHelper } from './entity-catalog-entity/entity-catalog.service';
 
 export abstract class EntityCatalogHelpers {
   static readonly endpointType = 'endpoint';
@@ -13,11 +13,11 @@ export abstract class EntityCatalogHelpers {
     return `${endpointType}${entityType.charAt(0).toUpperCase() + entityType.slice(1)}`;
   }
 
-  private static Instance: EntityCatalogEntityHelper;
-  static SetEntityCatalogEntityHelper(ecf: EntityCatalogEntityHelper) {
+  private static Instance: EntityCatalogHelper;
+  static SetEntityCatalogHelper(ecf: EntityCatalogHelper) {
     this.Instance = ecf;
   }
-  static GetEntityCatalogEntityHelper(): EntityCatalogEntityHelper {
+  static GetEntityCatalogHelper(): EntityCatalogHelper {
     return this.Instance;
   }
 }

From 2ffd4340938f8606a3566772ec4bb29bc77589b9 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 30 Apr 2020 17:47:10 +0100
Subject: [PATCH 040/176] Setup EntityCatalogHelper in tests

---
 .../core/test-framework/core-test.helper.ts   | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/frontend/packages/core/test-framework/core-test.helper.ts b/src/frontend/packages/core/test-framework/core-test.helper.ts
index 4568d62a9b..99e36a22d7 100644
--- a/src/frontend/packages/core/test-framework/core-test.helper.ts
+++ b/src/frontend/packages/core/test-framework/core-test.helper.ts
@@ -1,8 +1,12 @@
 import { HttpClientModule } from '@angular/common/http';
+import { NgModule } from '@angular/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { StoreModule } from '@ngrx/store';
+import { createBasicStoreModule } from '@stratos/store/testing';
 
+import { EntityCatalogHelper } from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service';
+import { EntityCatalogHelpers } from '../../store/src/entity-catalog/entity-catalog.helper';
 import { appReducers } from '../../store/src/reducers.module';
 import { CoreModule } from '../src/core/core.module';
 import {
@@ -28,7 +32,18 @@ import {
 import { MultilineTitleComponent } from '../src/shared/components/multiline-title/multiline-title.component';
 import { SharedModule } from '../src/shared/shared.module';
 import { CoreTestingModule } from './core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
+
+
+@NgModule({
+  imports: [CoreModule]
+})
+export class AppTestModule {
+  constructor(
+    ech: EntityCatalogHelper
+  ) {
+    EntityCatalogHelpers.SetEntityCatalogHelper(ech);
+  }
+}
 
 export function generateBaseTestStoreModules() {
   return [
@@ -38,7 +53,8 @@ export function generateBaseTestStoreModules() {
       {
         initialState: createBasicStoreModule(), runtimeChecks: { strictStateImmutability: false, strictActionImmutability: false }
       }
-    )
+    ),
+    AppTestModule
   ];
 }
 

From 0d6463057c41c86058d2e7a87663f165d3644cbf Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 1 May 2020 12:07:20 +0100
Subject: [PATCH 041/176] Fix frontend unit tests

---
 .../list/max-list-message/max-list-message.component.spec.ts    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/packages/core/src/shared/components/list/max-list-message/max-list-message.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/max-list-message/max-list-message.component.spec.ts
index abb3e9ef77..7a1fe8fb5e 100644
--- a/src/frontend/packages/core/src/shared/components/list/max-list-message/max-list-message.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/max-list-message/max-list-message.component.spec.ts
@@ -1,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { MatIconModule } from '@angular/material';
+import { MatIconModule } from '@angular/material/icon';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { createBasicStoreModule } from '../../../../../../store/testing/public-api';

From c92dcacd0626fbbdfb142b71c49b8d64ac05a215 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 1 May 2020 13:12:48 +0100
Subject: [PATCH 042/176] Fix angular 9 issue

---
 .../restore-endpoints/restore-endpoints.component.ts            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
index 2904f6024d..c3483dca50 100644
--- a/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
-import { MatCheckboxChange } from '@angular/material';
+import { MatCheckboxChange } from '@angular/material/checkbox';
 import { Store } from '@ngrx/store';
 import { Observable, of, Subject } from 'rxjs';
 import { first, map } from 'rxjs/operators';

From a4ad722d781e5ccfa6782c5f958ecce3bac4f692 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 1 May 2020 13:21:11 +0100
Subject: [PATCH 043/176] Add deep link warnings on ajsf

---
 ngcc.config.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 ngcc.config.js

diff --git a/ngcc.config.js b/ngcc.config.js
new file mode 100644
index 0000000000..8070a5d38f
--- /dev/null
+++ b/ngcc.config.js
@@ -0,0 +1,16 @@
+// Ignore the deep import warnings on the AJSF library
+module.exports = {
+  packages: {
+    '@cfstratos/ajsf-core': {
+      ignorableDeepImportMatchers: [
+        /lodash\//,
+        /json-schema-draft-06.json$/,
+      ]
+    },
+    '@cfstratos/ajsf-material': {
+      ignorableDeepImportMatchers: [
+        /lodash\//,
+      ]
+    },
+  },
+};

From 2401f9e4eb4356a014d663499be4c5e20cc4d220 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 1 May 2020 13:41:19 +0100
Subject: [PATCH 044/176] Fix tests, ApplicationData type, EntityMonitorFactory
 & PaginationMonitorFactory imports

---
 .../edit-autoscaler-policy-service.spec.ts    |  4 +-
 .../card-autoscaler-default.component.spec.ts | 12 +++--
 ...p-autoscaler-events-config.service.spec.ts | 10 ++++-
 ...scaler-metric-chart-card.component.spec.ts | 12 +++--
 ...r-metric-chart-list-config.service.spec.ts | 14 +++---
 .../entity-relations/entity-relations.spec.ts |  3 +-
 .../applications/application.service.ts       | 12 ++---
 .../cli-info-cloud-foundry.component.ts       |  8 +++-
 .../edit-organization-step.component.ts       |  8 +++-
 .../edit-space/edit-space.component.spec.ts   | 11 ++++-
 .../cloud-foundry-cell-base.component.spec.ts | 10 ++++-
 .../cloud-foundry-cells.component.spec.ts     | 10 ++++-
 .../cloud-foundry-events.component.spec.ts    | 10 ++++-
 ...oud-foundry-organization-base.component.ts |  6 ++-
 ...ndry-organization-events.component.spec.ts |  6 ++-
 .../cloud-foundry-space-base.component.ts     |  6 ++-
 ...oud-foundry-space-events.component.spec.ts |  6 ++-
 ...ud-foundry-space-summary.component.spec.ts |  6 ++-
 .../cloud-foundry-routes.component.spec.ts    | 10 ++++-
 .../detach-apps/detach-apps.component.spec.ts | 15 ++++++-
 .../detach-service-instance.component.spec.ts | 18 +++++++-
 .../services/services-wall.service.spec.ts    |  2 +
 ...fy-user-provided-details.component.spec.ts |  6 ++-
 ...loud-foundry-events-list.component.spec.ts | 10 ++++-
 ...app-service-binding-card.component.spec.ts | 10 ++---
 .../cf-org-card/cf-org-card.component.spec.ts | 11 ++---
 .../cf-service-card.component.spec.ts         |  5 +--
 ...e-instance-apps-attached.component.spec.ts |  2 +-
 .../detach-apps-list-config.service.spec.ts   | 16 ++++++-
 .../detach-apps-list-config.service.ts        |  3 +-
 .../service-instance-card.component.spec.ts   |  2 +-
 .../select-service.component.spec.ts          |  2 +-
 .../cloud-foundry-endpoint-service.helper.ts  |  4 +-
 ...api-endpoint-select-page.component.spec.ts |  4 +-
 .../packages/core/src/core/cf-api.types.ts    |  8 ++--
 .../packages/core/src/core/core.module.ts     |  4 ++
 .../entity-favorite-star.component.spec.ts    |  4 +-
 .../packages/core/src/shared/shared.module.ts |  4 --
 .../application-service-helper.ts             | 44 ++++++++++---------
 .../entity-catalog-entity-store-helpers.ts    | 11 ++---
 40 files changed, 248 insertions(+), 101 deletions(-)

diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.spec.ts
index e927ff0fc9..09d208f0a0 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-service.spec.ts
@@ -1,8 +1,9 @@
 import { inject, TestBed } from '@angular/core/testing';
+import { createEmptyStoreModule } from '@stratos/store/testing';
 
 import { ApplicationsModule } from '../../../../cloud-foundry/src/features/applications/applications.module';
 import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
-import { createEmptyStoreModule } from '@stratos/store/testing';
+import { EntityMonitorFactory } from '../../../../store/src/monitors/entity-monitor.factory.service';
 import { EditAutoscalerPolicyService } from './edit-autoscaler-policy-service';
 
 describe('EditAutoscalerPolicyService', () => {
@@ -11,6 +12,7 @@ describe('EditAutoscalerPolicyService', () => {
       providers: [
         EditAutoscalerPolicyService,
         EntityServiceFactory,
+        EntityMonitorFactory
       ],
       imports: [
         ApplicationsModule,
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts
index bd5c68c372..347c2a3c40 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts
@@ -1,6 +1,7 @@
 import { CommonModule } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { createEmptyStoreModule } from '@stratos/store/testing';
 
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
 import {
@@ -8,14 +9,17 @@ import {
 } from '../../../../cloud-foundry/src/shared/components/running-instances/running-instances.component';
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { ApplicationStateService } from '../../../../core/src/shared/components/application-state/application-state.service';
+import {
+  CopyToClipboardComponent,
+} from '../../../../core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component';
 import { MetadataItemComponent } from '../../../../core/src/shared/components/metadata-item/metadata-item.component';
+import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper';
+import { AppTestModule } from '../../../../core/test-framework/core-test.helper';
+import { EntityCatalogHelper } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service';
 import { EntityMonitorFactory } from '../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
-import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper';
-import { createEmptyStoreModule } from '@stratos/store/testing';
 import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module';
 import { CardAutoscalerDefaultComponent } from './card-autoscaler-default.component';
-import { CopyToClipboardComponent } from '../../../../core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component';
 
 describe('CardAutoscalerDefaultComponent', () => {
   let component: CardAutoscalerDefaultComponent;
@@ -35,12 +39,14 @@ describe('CardAutoscalerDefaultComponent', () => {
         CommonModule,
         NoopAnimationsModule,
         createEmptyStoreModule(),
+        AppTestModule
       ],
       providers: [
         { provide: ApplicationService, useClass: ApplicationServiceMock },
         ApplicationStateService,
         EntityMonitorFactory,
         PaginationMonitorFactory,
+        EntityCatalogHelper
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts
index 9865e668e1..4f00ffdaef 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts
@@ -3,17 +3,20 @@ import { HttpBackend, HttpClient, HttpClientModule } from '@angular/common/http'
 import { HttpTestingController } from '@angular/common/http/testing';
 import { inject, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createEmptyStoreModule } from '@stratos/store/testing';
 
 import { GetApplication } from '../../../../../cloud-foundry/src/actions/application.actions';
 import { cfEntityFactory } from '../../../../../cloud-foundry/src/cf-entity-factory';
 import { applicationEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
 import { ApplicationsModule } from '../../../../../cloud-foundry/src/features/applications/applications.module';
 import { CoreModule } from '../../../../../core/src/core/core.module';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
 import { generateTestApplicationServiceProvider } from '../../../../../core/test-framework/application-service-helper';
+import { AppTestModule } from '../../../../../core/test-framework/core-test.helper';
 import { generateTestEntityServiceProvider } from '../../../../../core/test-framework/entity-service.helper';
-import { createEmptyStoreModule } from '@stratos/store/testing';
+import { EntityCatalogHelper } from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service';
+import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
+import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { CfAutoscalerTestingModule } from '../../../cf-autoscaler-testing.module';
 import { CfAppAutoscalerEventsConfigService } from './cf-app-autoscaler-events-config.service';
 
@@ -28,6 +31,8 @@ describe('CfAppAutoscalerEventsConfigService', () => {
         { provide: HttpBackend, useClass: HttpTestingController },
         CfAppAutoscalerEventsConfigService,
         EntityServiceFactory,
+        EntityMonitorFactory,
+        EntityCatalogHelper,
         generateTestEntityServiceProvider(
           appGuid,
           cfEntityFactory(applicationEntityType),
@@ -45,6 +50,7 @@ describe('CfAppAutoscalerEventsConfigService', () => {
         ApplicationsModule,
         createEmptyStoreModule(),
         RouterTestingModule,
+        AppTestModule
       ]
     });
   });
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts
index 1e1f333790..bc8e376f85 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts
@@ -1,6 +1,6 @@
-/* tslint:disable:max-line-length */
 import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { createEmptyStoreModule } from '@stratos/store/testing';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import {
@@ -14,15 +14,19 @@ import {
   ApplicationStateService,
 } from '../../../../../../core/src/shared/components/application-state/application-state.service';
 import { ConfirmationDialogService } from '../../../../../../core/src/shared/components/confirmation-dialog.service';
+import { generateTestApplicationServiceProvider } from '../../../../../../core/test-framework/application-service-helper';
+import { AppTestModule } from '../../../../../../core/test-framework/core-test.helper';
+import {
+  EntityCatalogHelper,
+} from '../../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service';
 import { EntityMonitorFactory } from '../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
-import { generateTestApplicationServiceProvider } from '../../../../../../core/test-framework/application-service-helper';
-import { createEmptyStoreModule } from '@stratos/store/testing';
 import { CfAutoscalerTestingModule } from '../../../../cf-autoscaler-testing.module';
 import { AppAutoscalerMetricChartCardComponent } from './app-autoscaler-metric-chart-card.component';
 import { AppAutoscalerComboChartComponent } from './combo-chart/combo-chart.component';
 import { AppAutoscalerComboSeriesVerticalComponent } from './combo-chart/combo-series-vertical.component';
 
+/* tslint:disable:max-line-length */
 /* tslint:enable:max-line-length */
 
 describe('AppAutoscalerMetricChartCardComponent', () => {
@@ -40,9 +44,11 @@ describe('AppAutoscalerMetricChartCardComponent', () => {
         createEmptyStoreModule(),
         CoreModule,
         NgxChartsModule,
+        AppTestModule
       ],
       providers: [
         EntityMonitorFactory,
+        EntityCatalogHelper,
         generateTestApplicationServiceProvider('1', '1'),
         ApplicationEnvVarsHelper,
         ApplicationStateService,
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts
index b105b4b8a9..08e9f627eb 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts
@@ -1,22 +1,24 @@
-/* tslint:disable:max-line-length */
 import { DatePipe } from '@angular/common';
 import { inject, TestBed } from '@angular/core/testing';
+import { createEmptyStoreModule } from '@stratos/store/testing';
 
 import {
   ApplicationEnvVarsHelper,
 } from '../../../../../cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import {
   ApplicationStateService,
 } from '../../../../../core/src/shared/components/application-state/application-state.service';
-import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
-import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { MetricsRangeSelectorService } from '../../../../../core/src/shared/services/metrics-range-selector.service';
 import { generateTestApplicationServiceProvider } from '../../../../../core/test-framework/application-service-helper';
-import { createEmptyStoreModule } from '@stratos/store/testing';
+import { AppTestModule } from '../../../../../core/test-framework/core-test.helper';
+import { EntityCatalogHelper } from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service';
+import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
+import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
+import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { CfAutoscalerTestingModule } from '../../../cf-autoscaler-testing.module';
 import { AppAutoscalerMetricChartListConfigService } from './app-autoscaler-metric-chart-list-config.service';
 
+/* tslint:disable:max-line-length */
 
 /* tslint:enable:max-line-length */
 
@@ -30,6 +32,7 @@ describe('AppAutoscalerMetricChartListConfigService', () => {
         DatePipe,
         EntityServiceFactory,
         EntityMonitorFactory,
+        EntityCatalogHelper,
         ApplicationStateService,
         PaginationMonitorFactory,
         MetricsRangeSelectorService
@@ -37,6 +40,7 @@ describe('AppAutoscalerMetricChartListConfigService', () => {
       imports: [
         CfAutoscalerTestingModule,
         createEmptyStoreModule(),
+        AppTestModule
       ]
     });
   });
diff --git a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.spec.ts b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.spec.ts
index a254787c11..577dfc4c72 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.spec.ts
@@ -12,7 +12,8 @@ export class EntityRelationSpecHelper {
       entity: {
         name,
         spaces_url: entityRelationMissingSpacesUrl,
-        quota_definition_url: entityRelationMissingQuotaUrl
+        quota_definition_url: entityRelationMissingQuotaUrl,
+        domains: []
       },
       metadata: {
         guid,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts
index 83ac02da05..625cf6bc8e 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts
@@ -19,7 +19,7 @@ import {
   spaceEntityType,
   stackEntityType,
 } from '../../../../cloud-foundry/src/cf-entity-types';
-import { IApp, IAppSummary, IDomain, IOrganization, ISpace } from '../../../../core/src/core/cf-api.types';
+import { IApp, IAppSummary, IDomain, IOrganization, ISpace, IStack } from '../../../../core/src/core/cf-api.types';
 import {
   ApplicationStateData,
   ApplicationStateService,
@@ -62,8 +62,8 @@ export function createGetApplicationAction(guid: string, endpointGuid: string) {
 
 export interface ApplicationData {
   fetching: boolean;
-  app: EntityInfo<IApp>;
-  stack: EntityInfo;
+  app: APIResource<IApp>;
+  stack: APIResource<IStack>;
   cf: any;
 }
 
@@ -198,10 +198,10 @@ export class ApplicationService {
 
     this.application$ = this.waitForAppEntity$.pipe(
       combineLatest(this.store.select(endpointEntitiesSelector)),
-      filter(([{ entity }]: [EntityInfo, any]) => {
-        return entity && entity.entity && entity.entity.cfGuid;
+      filter(([entityInfo]) => {
+        return !!entityInfo && !!entityInfo.entity && !!entityInfo.entity.entity && !!entityInfo.entity.entity.cfGuid;
       }),
-      map(([{ entity, entityRequestInfo }, endpoints]: [EntityInfo, any]): ApplicationData => {
+      map(([{ entity, entityRequestInfo }, endpoints]): ApplicationData => {
         return {
           fetching: entityRequestInfo.fetching,
           app: entity,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
index 7f168ba8c3..5850782af8 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
@@ -10,6 +10,9 @@ import { CurrentUserPermissionsChecker } from '../../../../../core/src/core/curr
 import { CurrentUserPermissions } from '../../../../../core/src/core/current-user-permissions.config';
 import { getFullEndpointApiUrl } from '../../../../../core/src/features/endpoints/endpoint-helpers';
 import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { RouterNav } from '../../../../../store/src/actions/router.actions';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
@@ -29,8 +32,9 @@ import { CloudFoundrySpaceService } from '../services/cloud-foundry-space.servic
     getActiveRouteCfOrgSpaceProvider,
     CloudFoundryEndpointService,
     CloudFoundryOrganizationService,
-    CloudFoundrySpaceService
-  ]
+    CloudFoundrySpaceService,
+    CloudFoundryUserProvidedServicesService
+  ] // TODO: RC Test
 })
 export class CliInfoCloudFoundryComponent implements OnInit {
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts
index 89823562a9..944717dd12 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts
@@ -13,6 +13,9 @@ import {
 import { IOrganization, IOrgQuotaDefinition } from '../../../../../../core/src/core/cf-api.types';
 import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { endpointSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
@@ -35,8 +38,9 @@ const enum OrgStatus {
   styleUrls: ['./edit-organization-step.component.scss'],
   providers: [
     getActiveRouteCfOrgSpaceProvider,
-    CloudFoundryOrganizationService
-  ]
+    CloudFoundryOrganizationService,
+    CloudFoundryUserProvidedServicesService
+  ] // TODO: RC test
 })
 export class EditOrganizationStepComponent implements OnInit, OnDestroy {
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.spec.ts
index a1c01fa14c..763fbf2a42 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.spec.ts
@@ -1,5 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { TabNavService } from '../../../../../core/tab-nav.service';
 import {
   generateCfBaseTestModules,
@@ -18,7 +21,13 @@ describe('EditSpaceComponent', () => {
     TestBed.configureTestingModule({
       declarations: [EditSpaceComponent, EditSpaceStepComponent],
       imports: generateCfBaseTestModules(),
-      providers: [ActiveRouteCfOrgSpace, generateTestCfEndpointServiceProvider(), TabNavService, CloudFoundryOrganizationService]
+      providers: [
+        ActiveRouteCfOrgSpace,
+        generateTestCfEndpointServiceProvider(),
+        TabNavService,
+        CloudFoundryOrganizationService,
+        CloudFoundryUserProvidedServicesService
+      ]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.spec.ts
index 205c8a732e..ee7518e8c1 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.spec.ts
@@ -18,8 +18,14 @@ describe('CloudFoundryCellBaseComponent', () => {
       imports: generateCfBaseTestModules(),
       providers: [
         CloudFoundryEndpointService,
-        CloudFoundryCellService,
-        ActiveRouteCfOrgSpace,
+        CloudFoundryCellService, {
+          provide: ActiveRouteCfOrgSpace,
+          useValue: {
+            cfGuid: 'cfGuid',
+            orgGuid: 'orgGuid',
+            spaceGuid: 'spaceGuid'
+          }
+        },
         TabNavService,
         CfUserService
       ]
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.spec.ts
index 3d4312faec..a4020756d5 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.spec.ts
@@ -27,8 +27,14 @@ describe('CloudFoundryCellsComponent', () => {
             cellId: 'cellId'
           }),
         },
-        CloudFoundryEndpointService,
-        ActiveRouteCfOrgSpace,
+        CloudFoundryEndpointService, {
+          provide: ActiveRouteCfOrgSpace,
+          useValue: {
+            cfGuid: 'cfGuid',
+            orgGuid: 'orgGuid',
+            spaceGuid: 'spaceGuid'
+          }
+        },
         CfUserService
       ],
     })
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-events/cloud-foundry-events.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-events/cloud-foundry-events.component.spec.ts
index b3c223a491..11639bfe54 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-events/cloud-foundry-events.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-events/cloud-foundry-events.component.spec.ts
@@ -23,8 +23,14 @@ describe('CloudFoundryEventsComponent', () => {
       imports: [...CFBaseTestModules],
       providers: [
         CloudFoundryEndpointService,
-        ActiveRouteCfOrgSpace,
-        CfUserService
+        CfUserService, {
+          provide: ActiveRouteCfOrgSpace,
+          useValue: {
+            cfGuid: 'cfGuid',
+            orgGuid: 'orgGuid',
+            spaceGuid: 'spaceGuid'
+          }
+        }
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts
index 2d72c29d1e..e736760a3b 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts
@@ -18,6 +18,9 @@ import {
   FavoritesConfigMapper,
 } from '../../../../../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
 import { IHeaderBreadcrumb } from '../../../../../../../core/src/shared/components/page-header/page-header.types';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { EntitySchema } from '../../../../../../../store/src/helpers/entity-schema';
 import { UserFavorite } from '../../../../../../../store/src/types/user-favorites.types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
@@ -34,7 +37,8 @@ import { CloudFoundryOrganizationService } from '../../../services/cloud-foundry
     getActiveRouteCfOrgSpaceProvider,
     CfUserService,
     CloudFoundryEndpointService,
-    CloudFoundryOrganizationService
+    CloudFoundryOrganizationService,
+    CloudFoundryUserProvidedServicesService
   ]
 })
 export class CloudFoundryOrganizationBaseComponent {
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component.spec.ts
index 08ea6f028e..2f5fb8fc5a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component.spec.ts
@@ -4,6 +4,9 @@ import {
 } from 'frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper';
 
 import { ListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { CFBaseTestModules } from '../../../../../../test-framework/cf-test-helper';
 import {
   CloudFoundryEventsListComponent,
@@ -34,7 +37,8 @@ describe('CloudFoundryOrganizationEventsComponent', () => {
         generateActiveRouteCfOrgSpaceMock(),
         CloudFoundryOrganizationService,
         CfUserService,
-        CloudFoundryEndpointService
+        CloudFoundryEndpointService,
+        CloudFoundryUserProvidedServicesService
       ],
       imports: [...CFBaseTestModules]
     })
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts
index 91ae786c24..e4f8c9bfb1 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts
@@ -21,6 +21,9 @@ import {
   FavoritesConfigMapper,
 } from '../../../../../../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
 import { IHeaderBreadcrumb } from '../../../../../../../../core/src/shared/components/page-header/page-header.types';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { RouterNav } from '../../../../../../../../store/src/actions/router.actions';
 import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
@@ -38,7 +41,8 @@ import { CloudFoundrySpaceService } from '../../../../services/cloud-foundry-spa
     getActiveRouteCfOrgSpaceProvider,
     CfUserService,
     CloudFoundrySpaceService,
-    CloudFoundryOrganizationService
+    CloudFoundryOrganizationService,
+    CloudFoundryUserProvidedServicesService
   ]
 })
 export class CloudFoundrySpaceBaseComponent implements OnDestroy {
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.spec.ts
index 8981199e29..4a57a1b3fd 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.spec.ts
@@ -4,6 +4,9 @@ import {
 } from 'frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper';
 
 import { ListConfig } from '../../../../../../../../../core/src/shared/components/list/list.component.types';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../../../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { CFBaseTestModules } from '../../../../../../../../test-framework/cf-test-helper';
 import {
   CloudFoundryEventsListComponent,
@@ -36,7 +39,8 @@ describe('CloudFoundrySpaceEventsComponent', () => {
         CloudFoundrySpaceService,
         CfUserService,
         CloudFoundryEndpointService,
-        CloudFoundryOrganizationService
+        CloudFoundryOrganizationService,
+        CloudFoundryUserProvidedServicesService
       ],
       imports: [...CFBaseTestModules]
     })
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts
index 42709f07f1..703250f0b8 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts
@@ -1,5 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../../../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { TabNavService } from '../../../../../../../../../core/tab-nav.service';
 import {
   CloudFoundrySpaceServiceMock,
@@ -37,7 +40,8 @@ describe('CloudFoundrySpaceSummaryComponent', () => {
         { provide: CloudFoundrySpaceService, useClass: CloudFoundrySpaceServiceMock },
         CloudFoundryOrganizationService,
         TabNavService,
-        CfUserService
+        CfUserService,
+        CloudFoundryUserProvidedServicesService
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.spec.ts
index 6bab9d9e05..16b0b07e54 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-routes/cloud-foundry-routes.component.spec.ts
@@ -16,8 +16,14 @@ describe('CloudFoundryRoutesComponent', () => {
       declarations: [CloudFoundryRoutesComponent],
       imports: generateCfBaseTestModules(),
       providers: [
-        CloudFoundryEndpointService,
-        ActiveRouteCfOrgSpace,
+        CloudFoundryEndpointService, {
+          provide: ActiveRouteCfOrgSpace,
+          useValue: {
+            cfGuid: 'cfGuid',
+            orgGuid: 'orgGuid',
+            spaceGuid: 'spaceGuid'
+          }
+        },
         DatePipe,
         CfUserService
       ]
diff --git a/src/frontend/packages/cloud-foundry/src/features/services/detach-service-instance/detach-apps/detach-apps.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/services/detach-service-instance/detach-apps/detach-apps.component.spec.ts
index fc5e06cea0..f74c8c4095 100644
--- a/src/frontend/packages/cloud-foundry/src/features/services/detach-service-instance/detach-apps/detach-apps.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/services/detach-service-instance/detach-apps/detach-apps.component.spec.ts
@@ -1,5 +1,6 @@
 import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
 
 import { generateCfBaseTestModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { DetachAppsComponent } from './detach-apps.component';
@@ -12,7 +13,19 @@ describe('DetachAppsComponent', () => {
     TestBed.configureTestingModule({
       declarations: [DetachAppsComponent],
       imports: generateCfBaseTestModules(),
-      providers: [DatePipe]
+      providers: [
+        DatePipe, {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              params: {
+                serviceInstanceId: 'serviceInstanceId',
+                endpointId: 'endpointId'
+              }
+            }
+          }
+        },
+      ]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/cloud-foundry/src/features/services/detach-service-instance/detach-service-instance.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/services/detach-service-instance/detach-service-instance.component.spec.ts
index 967e1722f2..32ecc4e292 100644
--- a/src/frontend/packages/cloud-foundry/src/features/services/detach-service-instance/detach-service-instance.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/services/detach-service-instance/detach-service-instance.component.spec.ts
@@ -1,5 +1,6 @@
 import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
 
 import { TabNavService } from '../../../../../core/tab-nav.service';
 import { generateCfBaseTestModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
@@ -15,7 +16,22 @@ describe('DetachServiceInstanceComponent', () => {
     TestBed.configureTestingModule({
       declarations: [DetachServiceInstanceComponent, DetachAppsComponent],
       imports: generateCfBaseTestModules(),
-      providers: [DatePipe, TabNavService, ServiceActionHelperService]
+      providers: [
+        DatePipe,
+        TabNavService,
+        ServiceActionHelperService, {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              params: {
+                serviceInstanceId: 'serviceInstanceId',
+                endpointId: 'endpointId'
+              },
+              queryParams: {}
+            },
+          }
+        },
+      ]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/cloud-foundry/src/features/services/services/services-wall.service.spec.ts b/src/frontend/packages/cloud-foundry/src/features/services/services/services-wall.service.spec.ts
index 02d21f816b..a8dd3e4d0f 100644
--- a/src/frontend/packages/cloud-foundry/src/features/services/services/services-wall.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/services/services/services-wall.service.spec.ts
@@ -1,6 +1,7 @@
 import { inject, TestBed } from '@angular/core/testing';
 
 import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
+import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { generateCfBaseTestModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ServicesWallService } from './services-wall.service';
@@ -10,6 +11,7 @@ describe('ServicesWallService', () => {
     TestBed.configureTestingModule({
       providers: [ServicesWallService,
         EntityServiceFactory,
+        EntityMonitorFactory,
         PaginationMonitorFactory],
       imports: generateCfBaseTestModules()
     });
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.spec.ts
index 11a2e8b372..3c6dc6a859 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.spec.ts
@@ -2,6 +2,9 @@ import { HttpClientModule } from '@angular/common/http';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { generateCfBaseTestModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { CsiModeService } from '../csi-mode.service';
 import { SpecifyUserProvidedDetailsComponent } from './specify-user-provided-details.component';
@@ -19,7 +22,8 @@ describe('SpecifyUserProvidedDetailsComponent', () => {
         HttpClientTestingModule
       ],
       providers: [
-        CsiModeService
+        CsiModeService,
+        CloudFoundryUserProvidedServicesService,
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cloud-foundry-events-list/cloud-foundry-events-list.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cloud-foundry-events-list/cloud-foundry-events-list.component.spec.ts
index 7efdde624a..90b3c30f3f 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cloud-foundry-events-list/cloud-foundry-events-list.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cloud-foundry-events-list/cloud-foundry-events-list.component.spec.ts
@@ -22,8 +22,14 @@ describe('CloudFoundryEventsListComponent', () => {
         provide: ListConfig,
         useClass: CfAllEventsConfigService,
       },
-        CloudFoundryEndpointService,
-        ActiveRouteCfOrgSpace,
+        CloudFoundryEndpointService, {
+        provide: ActiveRouteCfOrgSpace,
+        useValue: {
+          cfGuid: 'cfGuid',
+          orgGuid: 'orgGuid',
+          spaceGuid: 'spaceGuid'
+        }
+      },
         CfUserService
       ]
     })
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.spec.ts
index a750364c56..807d3dbc20 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.spec.ts
@@ -6,15 +6,13 @@ import {
   ApplicationStateService,
 } from '../../../../../../../../core/src/shared/components/application-state/application-state.service';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
-import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
-import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import {
   generateTestApplicationServiceProvider,
 } from '../../../../../../../../core/test-framework/application-service-helper';
-import {
-  generateCfBaseTestModules,
-} from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
+import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { generateCfBaseTestModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import {
   ApplicationEnvVarsHelper,
 } from '../../../../../../features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service';
@@ -55,7 +53,7 @@ describe('AppServiceBindingCardComponent', () => {
     component.row = {
       entity: {
         app_guid: '',
-        service_instance_guid: '',
+        service_instance_guid: 'service_instance_guid',
         credentials: {},
         binding_options: {},
         gateway_name: '',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.spec.ts
index a13fb94379..1df1add336 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.spec.ts
@@ -1,13 +1,13 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { Store } from '@ngrx/store';
+import { testSessionData } from '@stratos/store/testing';
 
-import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
-import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
-import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { MetadataCardTestComponents } from '../../../../../../../../core/test-framework/core-test.helper';
-import { testSessionData } from '@stratos/store/testing';
 import { VerifiedSession } from '../../../../../../../../store/src/actions/auth.actions';
+import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
+import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
+import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import {
   generateCfBaseTestModulesNoShared,
   generateTestCfEndpointServiceProvider,
@@ -84,7 +84,8 @@ describe('CfOrgCardComponent', () => {
                 billing_managers_url: '/v2/organizations/a63027a8-e160-4e71-ad59-6675aa94a886/billing_managers',
                 auditors_url: '/v2/organizations/a63027a8-e160-4e71-ad59-6675aa94a886/auditors',
                 app_events_url: '/v2/organizations/a63027a8-e160-4e71-ad59-6675aa94a886/app_events',
-                space_quota_definitions_url: '/v2/organizations/a63027a8-e160-4e71-ad59-6675aa94a886/space_quota_definitions'
+                space_quota_definitions_url: '/v2/organizations/a63027a8-e160-4e71-ad59-6675aa94a886/space_quota_definitions',
+                domains: []
               }
             },
             developers_url: '/v2/spaces/d87ba175-51ec-4cc9-916c-bee26d00e498/developers',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.spec.ts
index c1a9beee23..33a16be1da 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.spec.ts
@@ -4,8 +4,8 @@ import {
   BooleanIndicatorComponent,
 } from '../../../../../../../../core/src/shared/components/boolean-indicator/boolean-indicator.component';
 import { AppChipsComponent } from '../../../../../../../../core/src/shared/components/chips/chips.component';
-import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { MetadataCardTestComponents } from '../../../../../../../../core/test-framework/core-test.helper';
+import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import {
   generateCfBaseTestModulesNoShared,
 } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
@@ -62,11 +62,10 @@ describe('CfServiceCardComponent', () => {
         extra: '',
         tags: [''],
         requires: [''],
-        service_broker_guid: '',
+        service_broker_guid: 'service_broker_guid',
         plan_updateable: 1,
         service_plans_url: '',
         service_plans: [],
-
       },
       metadata: null
     };
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-instance-apps-attached/table-cell-service-instance-apps-attached.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-instance-apps-attached/table-cell-service-instance-apps-attached.component.spec.ts
index babf907da5..57ab449c0e 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-instance-apps-attached/table-cell-service-instance-apps-attached.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-instance-apps-attached/table-cell-service-instance-apps-attached.component.spec.ts
@@ -51,7 +51,7 @@ describe('TableCellServiceInstanceAppsAttachedComponent', () => {
       },
       metadata: {
         created_at: '',
-        guid: '',
+        guid: 'guid',
         updated_at: '',
         url: ''
       }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.spec.ts
index 2468f3170a..ca08e27bfd 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.spec.ts
@@ -1,5 +1,6 @@
 import { DatePipe } from '@angular/common';
 import { inject, TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
 
 import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { DetachAppsListConfigService } from './detach-apps-list-config.service';
@@ -7,7 +8,20 @@ import { DetachAppsListConfigService } from './detach-apps-list-config.service';
 describe('DetachAppsListConfigService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
-      providers: [DetachAppsListConfigService, DatePipe],
+      providers: [
+        DetachAppsListConfigService,
+        DatePipe, {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              params: {
+                serviceInstanceId: 'serviceInstanceId',
+                endpointId: 'endpointId'
+              }
+            }
+          }
+        },
+      ],
       imports: [generateCfBaseTestModules()],
     });
   });
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts
index 7453abfe53..901d169506 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts
@@ -46,8 +46,7 @@ export class DetachAppsListConfigService implements IListConfig<APIResource> {
     },
   }];
 
-  constructor(private store: Store<CFAppState>, private activatedRoute: ActivatedRoute, private datePipe: DatePipe) {
-
+  constructor(private store: Store<CFAppState>, activatedRoute: ActivatedRoute, private datePipe: DatePipe) {
     const { serviceInstanceId, endpointId } = activatedRoute.snapshot.params;
     this.dataSource = new DetachAppsDataSource(endpointId, serviceInstanceId, this.store, this);
   }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.spec.ts
index 0b2af1db9c..f972ad8801 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.spec.ts
@@ -111,7 +111,7 @@ describe('ServiceInstanceCardComponent', () => {
                 extra: '',
                 tags: [''],
                 requires: [''],
-                service_broker_guid: '',
+                service_broker_guid: 'service_broker_guid',
                 plan_updateable: 1,
                 service_plans_url: '',
                 service_plans: [],
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/select-service/select-service.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/select-service/select-service.component.spec.ts
index 9355865ad3..9f62582f19 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/select-service/select-service.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/select-service/select-service.component.spec.ts
@@ -1,6 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import {
   ApplicationStateIconComponent,
 } from '../../../../../core/src/shared/components/application-state/application-state-icon/application-state-icon.component';
@@ -30,6 +29,7 @@ import {
 import {
   MultilineTitleComponent,
 } from '../../../../../core/src/shared/components/multiline-title/multiline-title.component';
+import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { generateCfBaseTestModulesNoShared } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
diff --git a/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts
index e9d28e530e..350302c283 100644
--- a/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts
+++ b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts
@@ -7,6 +7,7 @@ import { testSCFEndpointGuid } from '@stratos/store/testing';
 
 import { CoreModule } from '../../core/src/core/core.module';
 import { SharedModule } from '../../core/src/shared/shared.module';
+import { AppTestModule } from '../../core/test-framework/core-test.helper';
 import { CfUserServiceTestProvider } from '../../core/test-framework/user-service-helper';
 import { EntityServiceFactory } from '../../store/src/entity-service-factory.service';
 import { EntityMonitorFactory } from '../../store/src/monitors/entity-monitor.factory.service';
@@ -174,7 +175,8 @@ export function generateCfStoreModules() {
     StoreModule.forRoot(
       appReducers, { runtimeChecks: { strictStateImmutability: false, strictActionImmutability: false } },
       // Do not include initial store here, it's properties will be ignored as they won't have corresponding reducers in appReducers
-    )
+    ),
+    AppTestModule
   ];
 }
 
diff --git a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-select-page/api-endpoint-select-page.component.spec.ts b/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-select-page/api-endpoint-select-page.component.spec.ts
index a7ea2d0df6..e8e2769c61 100644
--- a/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-select-page/api-endpoint-select-page.component.spec.ts
+++ b/src/frontend/packages/core/src/api-driven-views/features/api-endpoint-select-page/api-endpoint-select-page.component.spec.ts
@@ -21,7 +21,9 @@ describe('ApiEndpointSelectPageComponent', () => {
         SharedModule,
         ApiDrivenViewsModule,
       ],
-      providers: [TabNavService]
+      providers: [
+        TabNavService,
+      ]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/core/cf-api.types.ts b/src/frontend/packages/core/src/core/cf-api.types.ts
index ac83e78b88..2d888d7e9e 100644
--- a/src/frontend/packages/core/src/core/cf-api.types.ts
+++ b/src/frontend/packages/core/src/core/cf-api.types.ts
@@ -2,6 +2,8 @@ import { CfUser } from '../../../cloud-foundry/src/store/types/user.types';
 import { APIResource } from '../../../store/src/types/api.types';
 import { IService, IServiceBinding } from './cf-api-svc.types';
 
+// TODO: Move file to CF package (#3769)
+
 export interface StratosCFEntity {
   cfGuid: string;
 }
@@ -140,8 +142,8 @@ export interface IApp<T = unknown> {
   ports?: number[];
   service_bindings?: APIResource<IServiceBinding>[];
   routes?: T extends string ? string[] : APIResource<IRoute>[];
-  stack?: string | APIResource<IStack>;
-  space?: string | APIResource<ISpace>;
+  stack?: T extends string ? string : APIResource<IStack>;
+  space?: T extends string ? string : APIResource<ISpace>;
   space_url?: string;
   stack_url?: string;
   routes_url?: string;
@@ -182,7 +184,7 @@ export interface IOrganization<T = unknown> {
   default_isolation_segment_guid?: any;
   quota_definition_url?: string;
   spaces_url?: string;
-  domains: APIResource<IDomain>[];
+  domains?: APIResource<IDomain>[];
   domains_url?: string;
   private_domains_url?: string;
   users?: APIResource<CfUser>[];
diff --git a/src/frontend/packages/core/src/core/core.module.ts b/src/frontend/packages/core/src/core/core.module.ts
index 39b6412c5f..245a88e594 100644
--- a/src/frontend/packages/core/src/core/core.module.ts
+++ b/src/frontend/packages/core/src/core/core.module.ts
@@ -7,6 +7,8 @@ import { MomentModule } from 'ngx-moment';
 
 import { EntityCatalogHelper } from '../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service';
 import { EntityServiceFactory } from '../../../store/src/entity-service-factory.service';
+import { EntityMonitorFactory } from '../../../store/src/monitors/entity-monitor.factory.service';
+import { PaginationMonitorFactory } from '../../../store/src/monitors/pagination-monitor.factory';
 import { NoContentMessageComponent } from '../shared/components/no-content-message/no-content-message.component';
 import { RecentEntitiesComponent } from '../shared/components/recent-entities/recent-entities.component';
 import { UserAvatarComponent } from './../shared/components/user-avatar/user-avatar.component';
@@ -78,7 +80,9 @@ import { WindowRef } from './window-ref/window-ref.service';
     EndpointsService,
     UserService,
     EntityServiceFactory,
+    EntityMonitorFactory,
     EntityCatalogHelper,
+    PaginationMonitorFactory,
     UserProfileService,
     CurrentUserPermissionsService,
     {
diff --git a/src/frontend/packages/core/src/core/entity-favorite-star/entity-favorite-star.component.spec.ts b/src/frontend/packages/core/src/core/entity-favorite-star/entity-favorite-star.component.spec.ts
index f0e12ff6c5..5aee8a1959 100644
--- a/src/frontend/packages/core/src/core/entity-favorite-star/entity-favorite-star.component.spec.ts
+++ b/src/frontend/packages/core/src/core/entity-favorite-star/entity-favorite-star.component.spec.ts
@@ -2,12 +2,12 @@ import { OverlayContainer } from '@angular/cdk/overlay';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { BehaviorSubject, of } from 'rxjs';
 
+import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { IFavoriteMetadata, UserFavorite } from '../../../../store/src/types/user-favorites.types';
 import { BaseTestModulesNoShared } from '../../../test-framework/core-test.helper';
 import { ConfirmationDialogService } from '../../shared/components/confirmation-dialog.service';
 import { DialogConfirmComponent } from '../../shared/components/dialog-confirm/dialog-confirm.component';
 import { FavoritesConfigMapper } from '../../shared/components/favorites-meta-card/favorite-config-mapper';
-import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { UserFavoriteManager } from '../user-favorite-manager';
 import { EntityFavoriteStarComponent } from './entity-favorite-star.component';
 
@@ -35,7 +35,7 @@ describe('EntityFavoriteStarComponent', () => {
       declarations: [
         DialogConfirmComponent
       ],
-      imports: [...BaseTestModulesNoShared, ],
+      imports: [...BaseTestModulesNoShared,],
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index b890491046..96b7ae58ea 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -8,9 +8,7 @@ import { NgxChartsModule } from '@swimlane/ngx-charts';
 import {
   ApplicationInstanceChartComponent,
 } from '../../../cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component';
-import { EntityMonitorFactory } from '../../../store/src/monitors/entity-monitor.factory.service';
 import { InternalEventMonitorFactory } from '../../../store/src/monitors/internal-event-monitor.factory';
-import { PaginationMonitorFactory } from '../../../store/src/monitors/pagination-monitor.factory';
 import { CoreModule } from '../core/core.module';
 import { AppNameUniqueDirective } from './app-name-unique.directive/app-name-unique.directive';
 import { AppActionMonitorIconComponent } from './components/app-action-monitor-icon/app-action-monitor-icon.component';
@@ -347,8 +345,6 @@ import { UserPermissionDirective } from './user-permission.directive';
     EndpointListHelper,
     EndpointsListConfigService,
     ConfirmationDialogService,
-    EntityMonitorFactory,
-    PaginationMonitorFactory,
     InternalEventMonitorFactory,
     MetricsRangeSelectorService,
     GitSCMService,
diff --git a/src/frontend/packages/core/test-framework/application-service-helper.ts b/src/frontend/packages/core/test-framework/application-service-helper.ts
index a9caaa3ae8..e6c688dfe5 100644
--- a/src/frontend/packages/core/test-framework/application-service-helper.ts
+++ b/src/frontend/packages/core/test-framework/application-service-helper.ts
@@ -1,5 +1,6 @@
 import { Store } from '@ngrx/store';
 import { Observable, of as observableOf } from 'rxjs';
+import { map } from 'rxjs/internal/operators/map';
 
 import { CFAppState } from '../../cloud-foundry/src/cf-app-state';
 import { ApplicationData, ApplicationService } from '../../cloud-foundry/src/features/applications/application.service';
@@ -20,7 +21,7 @@ function createEntity<T>(entity: T): APIResource<T> {
   return {
     metadata: {
       created_at: '',
-      guid: '',
+      guid: 'mockEntityGuid',
       updated_at: '',
       url: ''
     },
@@ -35,42 +36,43 @@ export class ApplicationServiceMock {
   appGuid = ApplicationServiceMock.appGuid;
   application$: Observable<ApplicationData> = observableOf(({
     cf: {
-      guid: 'mockCfGuid'
+      guid: this.cfGuid
     },
     app: {
-      metadata: {},
-      entity: {
+      metadata: {
+        guid: this.appGuid
       },
-      entityRequestInfo: {} as RequestInfoState
-    } as EntityInfo,
+      entity: {
+        space_guid: 'mockSpaceGuid',
+        cfGuid: this.cfGuid
+      } as IApp,
+    } as APIResource<IApp>,
     stack: {
       entity: {
       },
     },
     fetching: false
   } as ApplicationData));
-  app$: Observable<EntityInfo<APIResource<IApp>>> = observableOf({
-    entity: { entity: {} }
-  } as EntityInfo<APIResource<IApp>>);
-  appSummary$: Observable<EntityInfo<IAppSummary>> = observableOf({
+  app$: Observable<EntityInfo<APIResource<IApp>>> = this.application$.pipe(
+    map(appData => {
+      return {
+        entity: appData.app,
+        entityRequestInfo: {
+
+        } as RequestInfoState
+      }
+    })
+  );
+  appSummary$: Observable<EntityInfo<APIResource<IAppSummary>>> = observableOf({
     entityRequestInfo: { fetching: false }
-  } as EntityInfo<IAppSummary>);
+  } as EntityInfo<APIResource<IAppSummary>>);
   appStats$: Observable<AppStat[]> = observableOf(new Array<AppStat>());
   applicationStratProject$: Observable<EnvVarStratosProject> =
     observableOf({ deploySource: { type: 'github', timestamp: 0, commit: '' }, deployOverrides: null });
   isFetchingApp$: Observable<boolean> = observableOf(false);
   isFetchingEnvVars$: Observable<boolean> = observableOf(false);
   isUpdatingEnvVars$: Observable<boolean> = observableOf(false);
-  waitForAppEntity$: Observable<EntityInfo> = observableOf({
-    entity: createEntity({
-      space: {
-        metadata: {},
-        entity: {
-          domains: []
-        }
-      }
-    })
-  } as EntityInfo);
+  waitForAppEntity$: Observable<EntityInfo<APIResource<IApp>>> = this.app$;
   appEnvVars = {
     entities$: observableOf(new Array<APIResource<any>>())
   };
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts
index 150d0bea31..756e89042d 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts
@@ -37,10 +37,11 @@ export class EntityCatalogEntityStoreHelpers {
   ): EntityService<Y> {
     const helper = EntityCatalogHelpers.GetEntityCatalogHelper();
     if (isPaginatedAction(action)) {
-      throw new Error(`\`${actionBuilderKey}\` action is of type pagination`);
+      throw new Error(`\`${actionBuilderKey}\` action for entity \`${action.entityType}\` is of type pagination`);
     }
     if (!action.guid) {
-      throw new Error(`\`${actionBuilderKey}\` action has no guid`);
+      console.log('1: ', action);
+      throw new Error(`\`${actionBuilderKey}\` action for entity \`${action.entityType}\` has no guid`);
     }
     return helper.esf.create<Y>(
       action.guid,
@@ -54,7 +55,7 @@ export class EntityCatalogEntityStoreHelpers {
   ): PaginationMonitor<Y> {
     const helper = EntityCatalogHelpers.GetEntityCatalogHelper();
     if (!isPaginatedAction(action)) {
-      throw new Error(`\`${actionBuilderKey}\` action is not of type pagination`);
+      throw new Error(`\`${actionBuilderKey}\` action for entity \`${action.entityType}\` is not of type pagination`);
     }
     const pAction = action as PaginatedAction;
     return helper.pmf.create<Y>(pAction.paginationKey, pAction, pAction.flattenPagination);
@@ -66,7 +67,7 @@ export class EntityCatalogEntityStoreHelpers {
   ): PaginationObservables<Y> {
     const helper = EntityCatalogHelpers.GetEntityCatalogHelper();
     if (!isPaginatedAction(action)) {
-      throw new Error(`\`${actionBuilderKey}\` action is not of type pagination`);
+      throw new Error(`\`${actionBuilderKey}\` action for entity \`${action.entityType}\` is not of type pagination`);
     }
     const pAction = action as PaginatedAction;
     return helper.getPaginationObservables<Y>({
@@ -118,7 +119,7 @@ export class EntityCatalogEntityStoreHelpers {
       const schemaKey = schema ? schema.schemaKey : null;
 
       if (!rAction.guid) {
-        throw new Error(`\`${actionKey}\` action has no guid`);
+        throw new Error(`\`${actionKey}\` action for entity \`${rAction.entityType}\` has no guid`);
       }
 
       return es.getEntityMonitor(

From e49e1f91e43db4e86383cf2c793c3317661ad6a4 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 1 May 2020 14:19:59 +0100
Subject: [PATCH 045/176] Fix other tests

---
 .../space-quota.action-builders.ts             | 12 ++++++++++++
 .../space-quota-definition.component.ts        |  2 +-
 .../core/current-user-permissions.checker.ts   |  4 +---
 .../current-user-permissions.service.spec.ts   | 15 +++++++++++++++
 .../edit-quota-step.component.spec.ts          | 18 ++++++++++++++++--
 .../edit-quota/edit-quota.component.spec.ts    | 18 ++++++++++++++++--
 .../edit-space-quota-step.component.spec.ts    | 18 ++++++++++++++++--
 .../edit-space-quota-step.component.ts         |  2 +-
 .../edit-space-quota.component.spec.ts         | 18 ++++++++++++++++--
 .../table-cell-service.component.spec.ts       |  6 +++---
 .../action-orchestrator.spec.ts                | 15 ---------------
 11 files changed, 97 insertions(+), 31 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/space-quota.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/space-quota.action-builders.ts
index ffd1b134c7..e88d809b44 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/space-quota.action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/space-quota.action-builders.ts
@@ -7,10 +7,17 @@ import {
   CreateSpaceQuotaDefinition,
   DisassociateSpaceQuota,
   GetOrganizationSpaceQuotaDefinitions,
+  GetSpaceQuotaDefinition,
   UpdateSpaceQuotaDefinition,
 } from '../actions/quota-definitions.actions';
+import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
 
 export interface SpaceQuotaDefinitionActionBuilders extends OrchestratedActionBuilders {
+  get: (
+    guid: string,
+    endpointGuid: string,
+    { includeRelations, populateMissing }: CFBasePipelineRequestActionMeta
+  ) => GetSpaceQuotaDefinition
   create: (
     id: string,
     endpointGuid: string,
@@ -44,6 +51,11 @@ export interface SpaceQuotaDefinitionActionBuilders extends OrchestratedActionBu
 }
 
 export const spaceQuotaDefinitionActionBuilders: SpaceQuotaDefinitionActionBuilders = {
+  get: (
+    guid: string,
+    endpointGuid: string,
+    { includeRelations, populateMissing }: CFBasePipelineRequestActionMeta
+  ) => new GetSpaceQuotaDefinition(guid, endpointGuid, includeRelations, populateMissing),
   create: (
     id: string,
     endpointGuid: string,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.ts
index cd34aed01f..d628729313 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.ts
@@ -58,7 +58,7 @@ export class SpaceQuotaDefinitionComponent extends QuotaDefinitionBaseComponent
     const quotaGuid$ = this.quotaGuid ? of(this.quotaGuid) : this.space$.pipe(map(space => space.entity.space_quota_definition_guid));
     const entityInfo$ = quotaGuid$.pipe(
       first(),
-      switchMap(quotaGuid => cfEntityCatalog.spaceQuota.store.getEntityService(quotaGuid, this.cfGuid).entityObs$)
+      switchMap(quotaGuid => cfEntityCatalog.spaceQuota.store.getEntityService(quotaGuid, this.cfGuid, {}).entityObs$)
     );
 
     this.quotaDefinition$ = entityInfo$.pipe(
diff --git a/src/frontend/packages/core/src/core/current-user-permissions.checker.ts b/src/frontend/packages/core/src/core/current-user-permissions.checker.ts
index 234279fec8..b72dc13b78 100644
--- a/src/frontend/packages/core/src/core/current-user-permissions.checker.ts
+++ b/src/frontend/packages/core/src/core/current-user-permissions.checker.ts
@@ -193,9 +193,7 @@ export class CurrentUserPermissionsChecker {
         const createFFObs = guid =>
           // For admins we don't have the ff list which is usually fetched right at the start,
           // so this can't be a pagination monitor on its own (which doesn't fetch if list is missing)
-          cfEntityCatalog.featureFlag.store.getPaginationService(guid).entities$
-          ;
-
+          cfEntityCatalog.featureFlag.store.getPaginationService(guid).entities$;
         return combineLatest(guids.map(createFFObs));
       }),
       map(endpointFeatureFlags => endpointFeatureFlags.some(featureFlags => this.checkFeatureFlag(featureFlags, permission))),
diff --git a/src/frontend/packages/core/src/core/current-user-permissions.service.spec.ts b/src/frontend/packages/core/src/core/current-user-permissions.service.spec.ts
index a9b23771ca..68f2cc7822 100644
--- a/src/frontend/packages/core/src/core/current-user-permissions.service.spec.ts
+++ b/src/frontend/packages/core/src/core/current-user-permissions.service.spec.ts
@@ -12,6 +12,7 @@ import { APIResource } from '../../../store/src/types/api.types';
 import { EndpointModel } from '../../../store/src/types/endpoint.types';
 import { BaseEntityValues } from '../../../store/src/types/entity.types';
 import { PaginationState } from '../../../store/src/types/pagination.types';
+import { AppTestModule } from '../../test-framework/core-test.helper';
 import { endpointEntitySchema } from '../base-entity-schemas';
 import { generateStratosEntities } from '../base-entity-types';
 import { CFFeatureFlagTypes } from '../shared/components/cf-auth/cf-auth.types';
@@ -928,6 +929,7 @@ describe('CurrentUserPermissionsService', () => {
           ]
         },
         createBasicStoreModule(createStoreState()),
+        AppTestModule
       ],
 
     });
@@ -984,6 +986,19 @@ describe('CurrentUserPermissionsService', () => {
     ).subscribe();
   });
 
+  it('should allow if feature flag with cf', done => {
+    service.can(
+      [new PermissionConfig(PermissionTypes.FEATURE_FLAG, CFFeatureFlagTypes.private_domain_creation)],
+      'c80420ca-204b-4879-bf69-b6b7a202ad87'
+    ).pipe(
+      tap(can => {
+        expect(can).toBe(false);
+        done();
+      }),
+      first()
+    ).subscribe();
+  });
+
   it('should not allow if no feature flag', done => {
     service.can(
       [new PermissionConfig(PermissionTypes.FEATURE_FLAG, CFFeatureFlagTypes.user_org_creation)],
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts b/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts
index e7122f0e0d..3267ef2916 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts
+++ b/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts
@@ -1,9 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
 
+import { CFBaseTestModules } from '../../../../../../cloud-foundry/test-framework/cf-test-helper';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { QuotaDefinitionFormComponent } from '../../quota-definition-form/quota-definition-form.component';
 import { EditQuotaStepComponent } from './edit-quota-step.component';
-import { CFBaseTestModules } from '../../../../../../cloud-foundry/test-framework/cf-test-helper';
 
 describe('EditQuotaStepComponent', () => {
   let component: EditQuotaStepComponent;
@@ -13,7 +14,20 @@ describe('EditQuotaStepComponent', () => {
     TestBed.configureTestingModule({
       declarations: [EditQuotaStepComponent, QuotaDefinitionFormComponent, QuotaDefinitionFormComponent],
       imports: [...CFBaseTestModules],
-      providers: [PaginationMonitorFactory]
+      providers: [
+        PaginationMonitorFactory, {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              params: {
+                quotaId: 'quotaId',
+                cfId: 'cfGuid'
+              },
+              queryParams: {}
+            },
+          }
+        }
+      ]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota.component.spec.ts b/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota.component.spec.ts
index 29f7a610d8..b97b9f9401 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota.component.spec.ts
+++ b/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota.component.spec.ts
@@ -1,10 +1,11 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
 
+import { CFBaseTestModules } from '../../../../../cloud-foundry/test-framework/cf-test-helper';
 import { TabNavService } from '../../../../tab-nav.service';
 import { QuotaDefinitionFormComponent } from '../quota-definition-form/quota-definition-form.component';
 import { EditQuotaStepComponent } from './edit-quota-step/edit-quota-step.component';
 import { EditQuotaComponent } from './edit-quota.component';
-import { CFBaseTestModules } from '../../../../../cloud-foundry/test-framework/cf-test-helper';
 
 describe('EditQuotaComponent', () => {
   let component: EditQuotaComponent;
@@ -14,7 +15,20 @@ describe('EditQuotaComponent', () => {
     TestBed.configureTestingModule({
       declarations: [EditQuotaComponent, EditQuotaStepComponent, QuotaDefinitionFormComponent],
       imports: [...CFBaseTestModules],
-      providers: [TabNavService]
+      providers: [
+        TabNavService, {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              params: {
+                quotaId: 'quotaId',
+                cfId: 'cfGuid'
+              },
+              queryParams: {}
+            },
+          }
+        }
+      ]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts b/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts
index 74d77d5265..052372456f 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts
+++ b/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts
@@ -1,9 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
 
+import { CFBaseTestModules } from '../../../../../../cloud-foundry/test-framework/cf-test-helper';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { SpaceQuotaDefinitionFormComponent } from '../../space-quota-definition-form/space-quota-definition-form.component';
 import { EditSpaceQuotaStepComponent } from './edit-space-quota-step.component';
-import { CFBaseTestModules } from '../../../../../../cloud-foundry/test-framework/cf-test-helper';
 
 describe('EditSpaceQuotaStepComponent', () => {
   let component: EditSpaceQuotaStepComponent;
@@ -15,7 +16,20 @@ describe('EditSpaceQuotaStepComponent', () => {
       imports: [
         ...CFBaseTestModules
       ],
-      providers: [PaginationMonitorFactory]
+      providers: [
+        PaginationMonitorFactory, {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              params: {
+                quotaId: 'quotaId',
+                endpointId: 'endpointId'
+              },
+              queryParams: {}
+            },
+          }
+        }
+      ]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts b/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
index c1d149dcc5..aabd09ab98 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
+++ b/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
@@ -41,7 +41,7 @@ export class EditSpaceQuotaStepComponent implements OnDestroy {
   }
 
   fetchQuotaDefinition() {
-    this.spaceQuotaDefinition$ = cfEntityCatalog.spaceQuota.store.getEntityService(this.spaceQuotaGuid, this.cfGuid).waitForEntity$.pipe(
+    this.spaceQuotaDefinition$ = cfEntityCatalog.spaceQuota.store.getEntityService(this.spaceQuotaGuid, this.cfGuid, {}).waitForEntity$.pipe(
       map(data => data.entity),
       tap((resource) => this.quota = resource.entity)
     );
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.spec.ts b/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.spec.ts
index 5e43bc144c..b79767e811 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.spec.ts
+++ b/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.spec.ts
@@ -1,10 +1,11 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
 
+import { CFBaseTestModules } from '../../../../../cloud-foundry/test-framework/cf-test-helper';
 import { TabNavService } from '../../../../tab-nav.service';
 import { SpaceQuotaDefinitionFormComponent } from '../space-quota-definition-form/space-quota-definition-form.component';
 import { EditSpaceQuotaStepComponent } from './edit-space-quota-step/edit-space-quota-step.component';
 import { EditSpaceQuotaComponent } from './edit-space-quota.component';
-import { CFBaseTestModules } from '../../../../../cloud-foundry/test-framework/cf-test-helper';
 
 describe('EditSpaceQuotaComponent', () => {
   let component: EditSpaceQuotaComponent;
@@ -14,7 +15,20 @@ describe('EditSpaceQuotaComponent', () => {
     TestBed.configureTestingModule({
       declarations: [EditSpaceQuotaComponent, EditSpaceQuotaStepComponent, SpaceQuotaDefinitionFormComponent],
       imports: [...CFBaseTestModules],
-      providers: [TabNavService]
+      providers: [
+        TabNavService, {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              params: {
+                quotaId: 'quotaId',
+                endpointId: 'endpointId'
+              },
+              queryParams: {}
+            },
+          }
+        }
+      ]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.spec.ts
index 6ae314b013..34643e9869 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.spec.ts
@@ -33,11 +33,11 @@ describe('TableCellServiceComponent', () => {
     component = fixture.componentInstance;
     component.row = {
       entity: {
-        service_plan_guid: '',
+        service_plan_guid: 'service_plan_guid',
         space_guid: '',
         dashboard_url: '',
         type: '',
-        service_guid: '',
+        service_guid: 'service_guid',
         service_plan_url: '',
         service_bindings_url: '',
         service_keys_url: '',
@@ -46,7 +46,7 @@ describe('TableCellServiceComponent', () => {
       },
       metadata: {
         created_at: '',
-        guid: '',
+        guid: 'guid',
         updated_at: '',
         url: ''
       }
diff --git a/src/frontend/packages/store/src/entity-catalog/action-orchestrator/action-orchestrator.spec.ts b/src/frontend/packages/store/src/entity-catalog/action-orchestrator/action-orchestrator.spec.ts
index f87cdf89a5..217eeccea5 100644
--- a/src/frontend/packages/store/src/entity-catalog/action-orchestrator/action-orchestrator.spec.ts
+++ b/src/frontend/packages/store/src/entity-catalog/action-orchestrator/action-orchestrator.spec.ts
@@ -1,6 +1,5 @@
 import { PaginatedAction } from '../../types/pagination.types';
 import { EntityRequestAction } from '../../types/request.types';
-import { EntityActionDispatcherManager } from '../action-dispatcher/action-dispatcher';
 import { ActionOrchestrator, OrchestratedActionBuilders } from './action-orchestrator';
 import { getPaginationAction, getRequestAction, hasActions } from './action-orchestrator.spec.helpers';
 
@@ -50,18 +49,4 @@ describe('ActionOrchestrator', () => {
     hasActions(actionOrchestrator, ['get', 'remove', 'update', 'create', 'getMultiple', 'customAction101', 'customAction202']);
   });
 
-  it('should get entity action dispatcher', () => {
-    const actionBuilders: OrchestratedActionBuilders = {
-      get: guid => getRequestAction(),
-      remove: guid => getRequestAction(),
-      update: guid => getRequestAction(),
-      create: () => getRequestAction(),
-      getMultiple: () => getPaginationAction(),
-      customAction101: () => getPaginationAction(),
-      customAction202: guid => getRequestAction()
-    };
-    const actionOrchestrator = new ActionOrchestrator('BasePlusCustom', actionBuilders);
-    const dispatcher = actionOrchestrator.getEntityActionDispatcher(() => { });
-    expect(dispatcher instanceof EntityActionDispatcherManager).toBe(true);
-  });
 });

From 24b3866b709260139eb4fab5a511e6315a0dc2ed Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 1 May 2020 15:08:11 +0100
Subject: [PATCH 046/176] Fix app wall

---
 .../deploy-application-step3.component.ts                     | 4 +++-
 .../components/list/list-types/app/cf-apps-data-source.ts     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step3/deploy-application-step3.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step3/deploy-application-step3.component.ts
index b676eda5b5..7e34bdc40b 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step3/deploy-application-step3.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step3/deploy-application-step3.component.ts
@@ -79,7 +79,9 @@ export class DeployApplicationStep3Component implements OnDestroy {
       this.appGuid = guid;
 
       // Update the root app wall list
-      cfEntityCatalog.application.api.getMultiple(undefined, CfAppsDataSource.paginationKey);
+      cfEntityCatalog.application.api.getMultiple(undefined, CfAppsDataSource.paginationKey, {
+        includeRelations: CfAppsDataSource.includeRelations,
+      });
 
       // Pre-fetch the app env vars
       cfEntityCatalog.appEnvVar.api.getMultiple(this.appGuid, this.deployer.cfGuid);
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-apps-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-apps-data-source.ts
index 284ae8a40f..dead5bc6b5 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-apps-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-apps-data-source.ts
@@ -51,7 +51,9 @@ export class CfAppsDataSource extends CFListDataSource<APIResource> {
     startingCfGuidFilter?: string
   ) {
     const syncNeeded = paginationKey !== seedPaginationKey;
-    const action = cfEntityCatalog.application.actions.getMultiple(undefined, CfAppsDataSource.paginationKey);
+    const action = cfEntityCatalog.application.actions.getMultiple(undefined, CfAppsDataSource.paginationKey, {
+      includeRelations: CfAppsDataSource.includeRelations,
+    });
 
     const dispatchSequencer = new DispatchSequencer(store);
 

From 7f76cf8e407ef74ff67138de369e7990253f3dbf Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 1 May 2020 16:25:14 +0100
Subject: [PATCH 047/176] Fix configure invite user

---
 ...r-invite-configuration-dialog.component.ts |  6 +-
 .../user-invites/user-invite.service.ts       | 58 +++++++++++--------
 .../card-cf-info/card-cf-info.component.ts    | 11 ++--
 .../entity-catalog-entity-store-helpers.ts    |  1 -
 4 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component.ts
index f5d1ecd678..ba3d856575 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component.ts
@@ -6,7 +6,7 @@ import { Observable, Subscription } from 'rxjs';
 import { first } from 'rxjs/operators';
 
 import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
-import { UserInviteService } from '../user-invite.service';
+import { UserInviteConfigureService } from '../user-invite.service';
 
 
 @Component({
@@ -42,7 +42,7 @@ export class UserInviteConfigurationDialogComponent {
     public fb: FormBuilder,
     public dialogRef: MatDialogRef<UserInviteConfigurationDialogComponent>,
     public snackBar: MatSnackBar,
-    public userInviteService: UserInviteService,
+    public userInviteConfigureService: UserInviteConfigureService,
     @Inject(MAT_DIALOG_DATA) public data: {
       guid: string
     }
@@ -54,7 +54,7 @@ export class UserInviteConfigurationDialogComponent {
   }
 
   submit() {
-    this.userInviteService.configure(
+    this.userInviteConfigureService.configure(
       this.data.guid,
       this.endpointForm.value.clientID,
       this.endpointForm.value.clientSecret)
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/user-invite.service.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/user-invite.service.ts
index c91612ba71..676e0cb299 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/user-invite.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/user-invites/user-invite.service.ts
@@ -54,36 +54,14 @@ interface UserInviteSend {
 }
 
 @Injectable()
-export class UserInviteService {
-
-  configured$: Observable<boolean>;
-  enabled$: Observable<boolean>;
-  canConfigure$: Observable<boolean>;
+export class UserInviteConfigureService {
 
   constructor(
     private store: Store<CFAppState>,
     private http: HttpClient,
     private snackBar: MatSnackBar,
-    cfEndpointService: CloudFoundryEndpointService,
-    private currentUserPermissionsService: CurrentUserPermissionsService,
-    private activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
     private confirmDialog: ConfirmationDialogService,
-  ) {
-    this.configured$ = cfEndpointService.endpoint$.pipe(
-      filter(v => !!v && !!v.entity),
-      // Note - metadata could be falsy if smtp server not configured/other metadata properties are missing
-      map(v => v.entity.metadata && v.entity.metadata.userInviteAllowed === 'true')
-    );
-
-    this.canConfigure$ = combineLatest(
-      waitForCFPermissions(this.store, this.activeRouteCfOrgSpace.cfGuid),
-      this.store.select('auth')
-    ).pipe(
-      map(([cf, auth]) =>
-        cf.global.isAdmin &&
-        auth.sessionData['plugin-config'] && auth.sessionData['plugin-config'].userInvitationsEnabled === 'true')
-    );
-  }
+  ) { }
 
   configure(cfGUID: string, clientID: string, clientSecret: string): Observable<UserInviteBaseResponse> {
     const formData: FormData = new FormData();
@@ -143,9 +121,41 @@ export class UserInviteService {
         }
       });
     });
+  }
+}
+
+@Injectable()
+export class UserInviteService {
+
+  configured$: Observable<boolean>;
+  enabled$: Observable<boolean>;
+  canConfigure$: Observable<boolean>;
+
+  constructor(
+    private store: Store<CFAppState>,
+    private http: HttpClient,
+    cfEndpointService: CloudFoundryEndpointService,
+    private currentUserPermissionsService: CurrentUserPermissionsService,
+    private activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
+  ) {
+    this.configured$ = cfEndpointService.endpoint$.pipe(
+      filter(v => !!v && !!v.entity),
+      // Note - metadata could be falsy if smtp server not configured/other metadata properties are missing
+      map(v => v.entity.metadata && v.entity.metadata.userInviteAllowed === 'true')
+    );
 
+    this.canConfigure$ = combineLatest(
+      waitForCFPermissions(this.store, this.activeRouteCfOrgSpace.cfGuid),
+      this.store.select('auth')
+    ).pipe(
+      map(([cf, auth]) =>
+        cf.global.isAdmin &&
+        auth.sessionData['plugin-config'] && auth.sessionData['plugin-config'].userInvitationsEnabled === 'true')
+    );
   }
 
+
+
   canShowInviteUser(cfGuid: string, orgGuid: string, spaceGuid: string): Observable<boolean> {
     // Can only invite someone to an org or space and user must be admin or org manager
     return !orgGuid ? observableOf(false) : waitForCFPermissions(this.store, cfGuid).pipe(
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts
index 86c6126adc..7c786c9469 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts
@@ -11,7 +11,10 @@ import { CloudFoundryEndpointService } from '../../../../features/cloud-foundry/
 import {
   UserInviteConfigurationDialogComponent,
 } from '../../../../features/cloud-foundry/user-invites/configuration-dialog/user-invite-configuration-dialog.component';
-import { UserInviteService } from '../../../../features/cloud-foundry/user-invites/user-invite.service';
+import {
+  UserInviteConfigureService,
+  UserInviteService,
+} from '../../../../features/cloud-foundry/user-invites/user-invite.service';
 
 
 @Component({
@@ -27,6 +30,7 @@ export class CardCfInfoComponent implements OnInit, OnDestroy {
   constructor(
     public cfEndpointService: CloudFoundryEndpointService,
     public userInviteService: UserInviteService,
+    public userInviteConfigureService: UserInviteConfigureService,
     private dialog: MatDialog,
     private esf: EntityServiceFactory
   ) { }
@@ -72,9 +76,6 @@ export class CardCfInfoComponent implements OnInit, OnDestroy {
       if (metadata.description) {
         return metadata.description + (metadata.build ? ` (${metadata.build})` : '');
       }
-      if (metadata.support === 'pcfdev@pivotal.io') {
-        return 'PCF Dev';
-      }
     }
     return '-';
   }
@@ -88,6 +89,6 @@ export class CardCfInfoComponent implements OnInit, OnDestroy {
   }
 
   deConfigureUserInvites() {
-    this.userInviteService.unconfigure(this.cfEndpointService.cfGuid);
+    this.userInviteConfigureService.unconfigure(this.cfEndpointService.cfGuid);
   }
 }
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts
index 756e89042d..3654e3625c 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts
@@ -40,7 +40,6 @@ export class EntityCatalogEntityStoreHelpers {
       throw new Error(`\`${actionBuilderKey}\` action for entity \`${action.entityType}\` is of type pagination`);
     }
     if (!action.guid) {
-      console.log('1: ', action);
       throw new Error(`\`${actionBuilderKey}\` action for entity \`${action.entityType}\` has no guid`);
     }
     return helper.esf.create<Y>(

From abfcef05ceb387a46e01fa78c0b0db4fcc3b6bdc Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 1 May 2020 16:42:55 +0100
Subject: [PATCH 048/176] Address some todos

---
 .../cli-info-cloud-foundry.component.ts                     | 2 +-
 .../cloud-foundry-base/cloud-foundry-base.component.ts      | 3 ++-
 .../src/features/cloud-foundry/cloud-foundry.module.ts      | 3 ++-
 .../edit-organization-step.component.ts                     | 2 +-
 .../users/invite-users/invite-users.component.ts            | 3 ++-
 .../test-framework/cloud-foundry-endpoint-service.helper.ts | 6 +++++-
 .../cloud-foundry-user-provided-services.service.ts         | 2 --
 7 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
index 5850782af8..a0b0e23cd9 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
@@ -34,7 +34,7 @@ import { CloudFoundrySpaceService } from '../services/cloud-foundry-space.servic
     CloudFoundryOrganizationService,
     CloudFoundrySpaceService,
     CloudFoundryUserProvidedServicesService
-  ] // TODO: RC Test
+  ]
 })
 export class CliInfoCloudFoundryComponent implements OnInit {
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-base/cloud-foundry-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-base/cloud-foundry-base.component.ts
index dea9e6296c..514c908ea0 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-base/cloud-foundry-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry-base/cloud-foundry-base.component.ts
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 import { CfUserService } from '../../../shared/data-services/cf-user.service';
 import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers';
 import { CloudFoundryEndpointService } from '../services/cloud-foundry-endpoint.service';
-import { UserInviteService } from '../user-invites/user-invite.service';
+import { UserInviteConfigureService, UserInviteService } from '../user-invites/user-invite.service';
 
 @Component({
   selector: 'app-cloud-foundry-base',
@@ -12,6 +12,7 @@ import { UserInviteService } from '../user-invites/user-invite.service';
   providers: [
     getActiveRouteCfOrgSpaceProvider,
     UserInviteService,
+    UserInviteConfigureService,
     CfUserService,
     CloudFoundryEndpointService,
   ]
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.module.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.module.ts
index b1cdef38b8..b43e68fcf8 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.module.ts
@@ -134,7 +134,7 @@ import { CloudFoundryUsersComponent } from './tabs/cloud-foundry-users/cloud-fou
 import {
   UserInviteConfigurationDialogComponent,
 } from './user-invites/configuration-dialog/user-invite-configuration-dialog.component';
-import { UserInviteService } from './user-invites/user-invite.service';
+import { UserInviteConfigureService, UserInviteService } from './user-invites/user-invite.service';
 import { InviteUsersCreateComponent } from './users/invite-users/invite-users-create/invite-users-create.component';
 import { InviteUsersComponent } from './users/invite-users/invite-users.component';
 import { UsersRolesConfirmComponent } from './users/manage-users/manage-users-confirm/manage-users-confirm.component';
@@ -245,6 +245,7 @@ import { RemoveUserComponent } from './users/remove-user/remove-user.component';
     // CfRolesService,
     CloudFoundryCellService,
     UserInviteService,
+    UserInviteConfigureService
   ],
   entryComponents: [
     UserInviteConfigurationDialogComponent
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts
index 944717dd12..90d2855b74 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts
@@ -40,7 +40,7 @@ const enum OrgStatus {
     getActiveRouteCfOrgSpaceProvider,
     CloudFoundryOrganizationService,
     CloudFoundryUserProvidedServicesService
-  ] // TODO: RC test
+  ]
 })
 export class EditOrganizationStepComponent implements OnInit, OnDestroy {
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.ts
index 2b6345d244..4d51050514 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users.component.ts
@@ -4,7 +4,7 @@ import { CfUserService } from '../../../../shared/data-services/cf-user.service'
 import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../../cf.helpers';
 import { CloudFoundryEndpointService } from '../../services/cloud-foundry-endpoint.service';
-import { UserInviteService } from '../../user-invites/user-invite.service';
+import { UserInviteConfigureService, UserInviteService } from '../../user-invites/user-invite.service';
 import { CfRolesService } from '../manage-users/cf-roles.service';
 
 @Component({
@@ -14,6 +14,7 @@ import { CfRolesService } from '../manage-users/cf-roles.service';
   providers: [
     getActiveRouteCfOrgSpaceProvider,
     UserInviteService,
+    UserInviteConfigureService,
     CfUserService,
     CfRolesService,
     CloudFoundryEndpointService
diff --git a/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts
index 350302c283..1ff48a305f 100644
--- a/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts
+++ b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts
@@ -17,7 +17,10 @@ import { CFAppState } from '../src/cf-app-state';
 import { CloudFoundryTestingModule } from '../src/cloud-foundry-test.module';
 import { ActiveRouteCfOrgSpace } from '../src/features/cloud-foundry/cf-page.types';
 import { CloudFoundryEndpointService } from '../src/features/cloud-foundry/services/cloud-foundry-endpoint.service';
-import { UserInviteService } from '../src/features/cloud-foundry/user-invites/user-invite.service';
+import {
+  UserInviteConfigureService,
+  UserInviteService,
+} from '../src/features/cloud-foundry/user-invites/user-invite.service';
 import { CfOrgSpaceDataService } from '../src/shared/data-services/cf-org-space-service.service';
 import { CfUserService } from '../src/shared/data-services/cf-user.service';
 import { CloudFoundryService } from '../src/shared/data-services/cloud-foundry.service';
@@ -75,6 +78,7 @@ export function generateTestCfEndpointServiceProvider(guid = testSCFEndpointGuid
     CfUserServiceTestProvider,
     CloudFoundryEndpointService,
     UserInviteService,
+    UserInviteConfigureService,
     HttpClient,
     HttpHandler
   ];
diff --git a/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts b/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts
index 7fcb69adba..f4ad518fad 100644
--- a/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts
+++ b/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts
@@ -100,9 +100,7 @@ export class CloudFoundryUserProvidedServicesService {
     guid: string,
     data: Partial<IUserProvidedServiceInstanceData>,
   ): Observable<RequestInfoState> {
-    // TODO: RC Q
     const updatingKey = cfEntityCatalog.userProvidedService.actions.update(guid, cfGuid, data).updatingKey;
-    // const updatingKey = UpdateUserProvidedServiceInstance.updateServiceInstance;
     return cfEntityCatalog.userProvidedService.api.update<RequestInfoState>(
       guid,
       cfGuid,

From 5a13e8fdcb3bb628a32c14298ad5925078b6e08f Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 4 May 2020 13:24:22 +0100
Subject: [PATCH 049/176] e2e fixes

---
 .../src/actions/app-variables.actions.ts            |  7 +++++--
 .../security-groups.action-builder.ts               |  9 ---------
 .../routes/add-routes/add-routes.component.ts       |  4 ++++
 .../create-quota-step.component.ts                  | 12 ++++++++----
 .../create-space-quota-step.component.ts            | 10 ++++++++--
 .../edit-space-quota-step.component.ts              | 13 ++++++++++---
 .../quota-definition-form.component.ts              | 12 ++++++++----
 .../space-quota-definition-form.component.ts        | 10 ++++++++--
 8 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/actions/app-variables.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/app-variables.actions.ts
index 001f34a547..8a9f974710 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/app-variables.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/app-variables.actions.ts
@@ -1,7 +1,7 @@
 import { Action } from '@ngrx/store';
 
-import { UpdateApplication } from './application.actions';
 import { ListAppEnvVar } from '../shared/components/list/list-types/app-variables/cf-app-variables-data-source';
+import { UpdateApplication } from './application.actions';
 
 export const AppVariables = {
   UPDATE: '[Application Variables] Update',
@@ -12,7 +12,9 @@ export class AppVariablesUpdate implements Action {
   type = AppVariables.UPDATE;
   updatedApplication: UpdateApplication;
 
-  constructor(public cfGuid: string, public appGuid: string) { }
+  constructor(public cfGuid: string, public appGuid: string) {
+    this.guid = 'n/a' // No such thing as an individual app variable guid
+  }
 
   protected createUpdateApplication(allEnvVars: ListAppEnvVar[], selectedItems: ListAppEnvVar[]): UpdateApplication {
     const updateApp: UpdateApplication = {
@@ -26,6 +28,7 @@ export class AppVariablesUpdate implements Action {
     }
     return updateApp;
   }
+  guid: string;
 }
 
 export class AppVariablesDelete extends AppVariablesUpdate {
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/security-groups.action-builder.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/security-groups.action-builder.ts
index 9b03e09ee8..db9b509492 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/security-groups.action-builder.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/security-groups.action-builder.ts
@@ -1,13 +1,8 @@
 import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
-import { FetchDomain } from '../actions/domains.actions';
 import { GetAllSecurityGroups } from '../actions/security-groups-actions';
 import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
 
 export interface SecurityGroupBuilders extends OrchestratedActionBuilders {
-  get: (
-    guid,
-    endpointGuid
-  ) => FetchDomain;
   getMultiple: (
     endpointGuid,
     paginationKey,
@@ -16,10 +11,6 @@ export interface SecurityGroupBuilders extends OrchestratedActionBuilders {
 }
 
 export const securityGroupBuilders: SecurityGroupBuilders = {
-  get: (
-    guid,
-    endpointGuid
-  ) => new FetchDomain(guid, endpointGuid),
   getMultiple: (
     endpointGuid,
     paginationKey,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.ts
index add879d3ec..8d3a3a537b 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.ts
@@ -102,6 +102,7 @@ export class AddRoutesComponent implements OnInit, OnDestroy {
       switchMap(() => this.appService.waitForAppEntity$
         .pipe(
           switchMap(app => {
+            this.spaceGuid = app.entity.entity.space_guid;
             return cfEntityCatalog.space.store.getEntityService(
               app.entity.entity.space_guid,
               app.entity.entity.cfGuid,
@@ -209,6 +210,9 @@ export class AddRoutesComponent implements OnInit, OnDestroy {
       this.cfGuid,
       new Route(domainGuid, this.spaceGuid, host, path, port)
     ).pipe(
+      pairwise(),
+      filter(([oldR, newR]) => oldR.creating && !newR.creating),
+      map(([oldR, newR]) => newR),
       filter(route => !route.creating && !route.fetching),
       mergeMap(route => {
         if (route.error) {
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.ts b/src/frontend/packages/core/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.ts
index 3dd8541e5b..5615ceba74 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.ts
+++ b/src/frontend/packages/core/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.ts
@@ -1,10 +1,11 @@
 import { Component, ViewChild } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { ActivatedRoute } from '@angular/router';
 import { Subscription } from 'rxjs';
 import { filter, map, pairwise } from 'rxjs/operators';
 
 import { cfEntityCatalog } from '../../../../../../cloud-foundry/src/cf-entity-catalog';
+import { ActiveRouteCfOrgSpace } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
+import { getActiveRouteCfOrgSpaceProvider } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component';
 import { QuotaDefinitionFormComponent } from '../../quota-definition-form/quota-definition-form.component';
@@ -13,7 +14,10 @@ import { QuotaDefinitionFormComponent } from '../../quota-definition-form/quota-
 @Component({
   selector: 'app-create-quota-step',
   templateUrl: './create-quota-step.component.html',
-  styleUrls: ['./create-quota-step.component.scss']
+  styleUrls: ['./create-quota-step.component.scss'],
+  providers: [
+    getActiveRouteCfOrgSpaceProvider
+  ]
 })
 export class CreateQuotaStepComponent {
 
@@ -25,9 +29,9 @@ export class CreateQuotaStepComponent {
   form: QuotaDefinitionFormComponent;
 
   constructor(
-    private activatedRoute: ActivatedRoute,
+    activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
   ) {
-    this.cfGuid = this.activatedRoute.snapshot.params.endpointId;
+    this.cfGuid = activeRouteCfOrgSpace.cfGuid;
   }
 
   validate = () => !!this.form && this.form.valid();
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts b/src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts
index a63b5b2489..fcff2cdd29 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts
+++ b/src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts
@@ -4,6 +4,8 @@ import { Observable, Subscription } from 'rxjs';
 import { filter, map, pairwise } from 'rxjs/operators';
 
 import { cfEntityCatalog } from '../../../../../../cloud-foundry/src/cf-entity-catalog';
+import { ActiveRouteCfOrgSpace } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
+import { getActiveRouteCfOrgSpaceProvider } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource } from '../../../../../../store/src/types/api.types';
 import { IQuotaDefinition } from '../../../../core/cf-api.types';
@@ -14,7 +16,10 @@ import { SpaceQuotaDefinitionFormComponent } from '../../space-quota-definition-
 @Component({
   selector: 'app-create-space-quota-step',
   templateUrl: './create-space-quota-step.component.html',
-  styleUrls: ['./create-space-quota-step.component.scss']
+  styleUrls: ['./create-space-quota-step.component.scss'],
+  providers: [
+    getActiveRouteCfOrgSpaceProvider
+  ]
 })
 export class CreateSpaceQuotaStepComponent {
 
@@ -27,9 +32,10 @@ export class CreateSpaceQuotaStepComponent {
   form: SpaceQuotaDefinitionFormComponent;
 
   constructor(
+    activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
     private activatedRoute: ActivatedRoute,
   ) {
-    this.cfGuid = this.activatedRoute.snapshot.params.endpointId;
+    this.cfGuid = activeRouteCfOrgSpace.cfGuid;
     this.orgGuid = this.activatedRoute.snapshot.params.orgId;
   }
 
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts b/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
index aabd09ab98..fa68b038ff 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
+++ b/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
@@ -5,6 +5,8 @@ import { Observable, Subscription } from 'rxjs';
 import { filter, map, pairwise, tap } from 'rxjs/operators';
 
 import { cfEntityCatalog } from '../../../../../../cloud-foundry/src/cf-entity-catalog';
+import { ActiveRouteCfOrgSpace } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
+import { getActiveRouteCfOrgSpaceProvider } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import { AppState } from '../../../../../../store/src/app-state';
 import { APIResource } from '../../../../../../store/src/types/api.types';
 import { ISpaceQuotaDefinition } from '../../../../core/cf-api.types';
@@ -16,7 +18,10 @@ import { SpaceQuotaDefinitionFormComponent } from '../../space-quota-definition-
 @Component({
   selector: 'app-edit-space-quota-step',
   templateUrl: './edit-space-quota-step.component.html',
-  styleUrls: ['./edit-space-quota-step.component.scss']
+  styleUrls: ['./edit-space-quota-step.component.scss'],
+  providers: [
+    getActiveRouteCfOrgSpaceProvider
+  ]
 })
 export class EditSpaceQuotaStepComponent implements OnDestroy {
 
@@ -33,8 +38,10 @@ export class EditSpaceQuotaStepComponent implements OnDestroy {
   constructor(
     private store: Store<AppState>,
     private activatedRoute: ActivatedRoute,
+    private activeRouteCfOrgSpace: ActiveRouteCfOrgSpace
   ) {
-    this.cfGuid = this.activatedRoute.snapshot.params.endpointId;
+
+    this.cfGuid = this.activeRouteCfOrgSpace.cfGuid;
     this.spaceQuotaGuid = this.activatedRoute.snapshot.params.quotaId;
 
     this.fetchQuotaDefinition();
@@ -56,7 +63,7 @@ export class EditSpaceQuotaStepComponent implements OnDestroy {
 
     const action = cfEntityCatalog.spaceQuota.actions.update(this.spaceQuotaGuid, this.cfGuid, formValues);
     this.store.dispatch(action);
-    return cfEntityCatalog.quotaDefinition.store.getEntityMonitor(this.spaceQuotaGuid)
+    return cfEntityCatalog.spaceQuota.store.getEntityMonitor(this.spaceQuotaGuid)
       .getUpdatingSection(action.updatingKey)
       .pipe(
         pairwise(),
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts b/src/frontend/packages/core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts
index ed39df04bd..43a234ef7e 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts
+++ b/src/frontend/packages/core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts
@@ -1,11 +1,12 @@
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { AbstractControl, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms';
-import { ActivatedRoute } from '@angular/router';
 import { Subscription } from 'rxjs';
 import { filter, map, tap } from 'rxjs/operators';
 
 import { cfEntityCatalog } from '../../../../../cloud-foundry/src/cf-entity-catalog';
 import { createEntityRelationPaginationKey } from '../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
+import { ActiveRouteCfOrgSpace } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
+import { getActiveRouteCfOrgSpaceProvider } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
 import { IQuotaDefinition } from '../../../core/cf-api.types';
 import { safeUnsubscribe } from '../../../core/utils.service';
@@ -27,7 +28,10 @@ export interface QuotaFormValues {
 @Component({
   selector: 'app-quota-definition-form',
   templateUrl: './quota-definition-form.component.html',
-  styleUrls: ['./quota-definition-form.component.scss']
+  styleUrls: ['./quota-definition-form.component.scss'],
+  providers: [
+    getActiveRouteCfOrgSpaceProvider
+  ]
 })
 export class QuotaDefinitionFormComponent implements OnInit, OnDestroy {
   quotasSubscription: Subscription;
@@ -38,9 +42,9 @@ export class QuotaDefinitionFormComponent implements OnInit, OnDestroy {
   @Input() quota: IQuotaDefinition;
 
   constructor(
-    private activatedRoute: ActivatedRoute,
+    activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
   ) {
-    this.cfGuid = this.activatedRoute.snapshot.params.endpointId;
+    this.cfGuid = activeRouteCfOrgSpace.cfGuid;
   }
 
   ngOnInit() {
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts b/src/frontend/packages/core/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts
index 154be20360..984c043c03 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts
+++ b/src/frontend/packages/core/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts
@@ -6,6 +6,8 @@ import { filter, map, tap } from 'rxjs/operators';
 
 import { cfEntityCatalog } from '../../../../../cloud-foundry/src/cf-entity-catalog';
 import { createEntityRelationPaginationKey } from '../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
+import { ActiveRouteCfOrgSpace } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
+import { getActiveRouteCfOrgSpaceProvider } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
 import { IQuotaDefinition } from '../../../core/cf-api.types';
 import { safeUnsubscribe } from '../../../core/utils.service';
@@ -14,7 +16,10 @@ import { safeUnsubscribe } from '../../../core/utils.service';
 @Component({
   selector: 'app-space-quota-definition-form',
   templateUrl: './space-quota-definition-form.component.html',
-  styleUrls: ['./space-quota-definition-form.component.scss']
+  styleUrls: ['./space-quota-definition-form.component.scss'],
+  providers: [
+    getActiveRouteCfOrgSpaceProvider
+  ]
 })
 export class SpaceQuotaDefinitionFormComponent implements OnInit, OnDestroy {
   quotasSubscription: Subscription;
@@ -27,9 +32,10 @@ export class SpaceQuotaDefinitionFormComponent implements OnInit, OnDestroy {
   @Input() quota: IQuotaDefinition;
 
   constructor(
+    activeRouteCfOrgSpace: ActiveRouteCfOrgSpace,
     private activatedRoute: ActivatedRoute,
   ) {
-    this.cfGuid = this.activatedRoute.snapshot.params.endpointId;
+    this.cfGuid = activeRouteCfOrgSpace.cfGuid;
     this.orgGuid = this.activatedRoute.snapshot.params.orgId;
   }
 

From 6cba47d284d865aeaefdc81a938ab94e1d523370 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 4 May 2020 14:02:22 +0100
Subject: [PATCH 050/176] Fix another junky guid (endpoint service in org
 service in space service in edit space component)

---
 .../edit-space/edit-space.component.ts        | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.ts
index 76fb5def9f..4f70d85049 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.ts
@@ -1,8 +1,14 @@
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
+import { CfUserService } from '../../../shared/data-services/cf-user.service';
 import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers';
+import { CloudFoundryEndpointService } from '../services/cloud-foundry-endpoint.service';
+import { CloudFoundryOrganizationService } from '../services/cloud-foundry-organization.service';
 import { CloudFoundrySpaceService } from '../services/cloud-foundry-space.service';
 
 @Component({
@@ -11,15 +17,19 @@ import { CloudFoundrySpaceService } from '../services/cloud-foundry-space.servic
   styleUrls: ['./edit-space.component.scss'],
   providers: [
     getActiveRouteCfOrgSpaceProvider,
-    CloudFoundrySpaceService
+    CfUserService,
+    CloudFoundryEndpointService,
+    CloudFoundrySpaceService,
+    CloudFoundryOrganizationService,
+    CloudFoundryUserProvidedServicesService
   ]
 })
-export class EditSpaceComponent implements OnInit {
+export class EditSpaceComponent {
 
   spaceName$: Observable<string>;
   spaceUrl: string;
 
-  constructor(private cfSpaceService: CloudFoundrySpaceService) {
+  constructor(cfSpaceService: CloudFoundrySpaceService) {
 
     this.spaceUrl = '/cloud-foundry/' +
       `${cfSpaceService.cfGuid}/organizations/` +
@@ -29,8 +39,4 @@ export class EditSpaceComponent implements OnInit {
       map(s => s.entity.entity.name)
     );
   }
-
-  ngOnInit() {
-  }
-
 }

From f9c56b2fb9590d3218704c077308e81149617cac Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Mon, 4 May 2020 14:26:34 +0100
Subject: [PATCH 051/176] CF Push: Ensure we refresh token

---
 src/jetstream/plugins/cfapppush/deploy.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/jetstream/plugins/cfapppush/deploy.go b/src/jetstream/plugins/cfapppush/deploy.go
index 0bdc453ddb..a605b07466 100644
--- a/src/jetstream/plugins/cfapppush/deploy.go
+++ b/src/jetstream/plugins/cfapppush/deploy.go
@@ -486,6 +486,14 @@ func (cfAppPush *CFAppPush) getConfigData(echoContext echo.Context, cnsiGUID str
 		return nil, errors.New("Failed to find token record")
 	}
 
+	// Refresh token first - makes sure it will be valid when we do the push
+	refreshedTokenRec, err := p.RefreshOAuthToken(cnsiRecord.SkipSSLValidation, cnsiRecord.GUID, userID, cnsiRecord.ClientId, cnsiRecord.ClientSecret, cnsiRecord.TokenEndpoint)
+	if err != nil {
+		log.Warnf("Couldn't get refresh token for endpoint with GUID %s", cnsiRecord.GUID)
+		sendErrorMessage(clientWebSocket, err, CLOSE_NO_CNSI_USERTOKEN)
+		return nil, fmt.Errorf("Couldn't get refresh token for endpoint with GUID %s", cnsiRecord.GUID)
+	}
+
 	config := &CFPushAppConfig{
 		AuthorizationEndpoint:  cnsiRecord.AuthorizationEndpoint,
 		CFClient:               cnsiRecord.ClientId,
@@ -493,8 +501,8 @@ func (cfAppPush *CFAppPush) getConfigData(echoContext echo.Context, cnsiGUID str
 		APIEndpointURL:         cnsiRecord.APIEndpoint.String(),
 		DopplerLoggingEndpoint: cnsiRecord.DopplerLoggingEndpoint,
 		SkipSSLValidation:      cnsiRecord.SkipSSLValidation,
-		AuthToken:              cnsiTokenRecord.AuthToken,
-		RefreshToken:           cnsiTokenRecord.RefreshToken,
+		AuthToken:              refreshedTokenRec.AuthToken,
+		RefreshToken:           refreshedTokenRec.RefreshToken,
 		OrgGUID:                orgGUID,
 		OrgName:                orgName,
 		SpaceGUID:              spaceGUID,

From 221233010b18b4d72b1c022d4593040e3cd7ad8b Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 4 May 2020 14:27:09 +0100
Subject: [PATCH 052/176] More e2e fixes

---
 .../routes/add-routes/add-routes.component.ts  |  3 +--
 .../create-space-step.component.ts             |  6 ++++--
 .../edit-space-step.component.ts               | 18 ++++++++++--------
 .../add-service-instance/csi-mode.service.ts   |  8 ++++----
 ...d-foundry-user-provided-services.service.ts |  5 +++--
 5 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.ts
index 8d3a3a537b..e680fb1398 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.ts
@@ -212,8 +212,7 @@ export class AddRoutesComponent implements OnInit, OnDestroy {
     ).pipe(
       pairwise(),
       filter(([oldR, newR]) => oldR.creating && !newR.creating),
-      map(([oldR, newR]) => newR),
-      filter(route => !route.creating && !route.fetching),
+      map(([, newR]) => newR),
       mergeMap(route => {
         if (route.error) {
           return observableOf({ success: false, message: `Failed to create route: ${route.message}` });
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.ts
index 8557439921..8d2f3e6d96 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space/create-space-step/create-space-step.component.ts
@@ -3,7 +3,7 @@ import { AbstractControl, FormControl, FormGroup, ValidatorFn, Validators } from
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { Subscription } from 'rxjs';
-import { filter } from 'rxjs/operators';
+import { filter, map, pairwise } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
@@ -81,7 +81,9 @@ export class CreateSpaceStepComponent extends AddEditSpaceStepBase implements On
       },
       orgGuid: this.orgGuid
     }).pipe(
-      filter(o => !!o && !o.fetching && !o.creating),
+      pairwise(),
+      filter(([oldS, newS]) => oldS.creating && !newS.creating),
+      map(([, newS]) => newS),
       this.map('Failed to create space: ')
     );
   }
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.ts
index 3876bbc139..1821334376 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.ts
@@ -3,10 +3,9 @@ import { FormControl, FormGroup } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { Observable, of, Subscription } from 'rxjs';
-import { filter, map, switchMap, take, tap } from 'rxjs/operators';
+import { filter, map, pairwise, switchMap, take, tap } from 'rxjs/operators';
 
 import { AssociateSpaceQuota } from '../../../../../../cloud-foundry/src/actions/quota-definitions.actions';
-import { UpdateSpace } from '../../../../../../cloud-foundry/src/actions/space.actions';
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
@@ -77,7 +76,7 @@ export class EditSpaceStepComponent extends AddEditSpaceStepBase implements OnDe
   submit: StepOnNextFunction = () => {
     const spaceQuotaGuid = this.editSpaceForm.value.quotaDefinition;
 
-    return this.updateSpace$().pipe(
+    return this.updateSpace().pipe(
       switchMap((spaceStateAction) => {
         let message = '';
 
@@ -101,13 +100,16 @@ export class EditSpaceStepComponent extends AddEditSpaceStepBase implements OnDe
     );
   }
 
-  updateSpace$() {
-    return cfEntityCatalog.space.api.update<RequestInfoState>(this.spaceGuid, this.cfGuid, {
+  updateSpace() {
+    const action = cfEntityCatalog.space.actions.update(this.spaceGuid, this.cfGuid, {
       name: this.editSpaceForm.value.spaceName,
       allow_ssh: this.editSpaceForm.value.toggleSsh as boolean,
-    }).pipe(
-      filter(o => !!o && !o.updating[UpdateSpace.UpdateExistingSpace].busy),
-      map((state) => state.updating[UpdateSpace.UpdateExistingSpace])
+    })
+    this.store.dispatch(action);
+    return cfEntityCatalog.space.store.getEntityMonitor(this.spaceGuid).getUpdatingSection(action.updatingKey).pipe(
+      pairwise(),
+      filter(([oldS, newS]) => oldS.busy && !newS.busy),
+      map(([, newS]) => newS),
     );
   }
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/csi-mode.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/csi-mode.service.ts
index 3b7f414439..3c4fa72df5 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/csi-mode.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/csi-mode.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { filter, map } from 'rxjs/operators';
+import { filter, map, pairwise } from 'rxjs/operators';
 
 import { SpaceScopedService } from '../../../../../cloud-foundry/src/features/service-catalog/services.service';
 import { getIdFromRoute } from '../../../../../core/src/core/utils.service';
@@ -136,9 +136,9 @@ export class CsiModeService {
       cfGuid,
       { applicationGuid: appGuid, serviceInstanceGuid, params }
     ).pipe(
-      filter(s => {
-        return s && !s.creating;
-      }),
+      pairwise(),
+      filter(([oldS, newS]) => oldS.creating && !newS.creating),
+      map(([, newS]) => newS),
       map(req => {
         if (req.error) {
           return { success: false, message: `Failed to create service instance binding: ${req.message}` };
diff --git a/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts b/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts
index f4ad518fad..5883b92246 100644
--- a/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts
+++ b/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts
@@ -14,6 +14,7 @@ import { createEntityRelationPaginationKey } from '../../../../cloud-foundry/src
 import { fetchTotalResults } from '../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import { QParam, QParamJoiners } from '../../../../cloud-foundry/src/shared/q-param';
 import { ClearPaginationOfType } from '../../../../store/src/actions/pagination.actions';
+import { EntityCatalogEntityConfig } from '../../../../store/src/entity-catalog/entity-catalog.types';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { RequestInfoState } from '../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource } from '../../../../store/src/types/api.types';
@@ -79,7 +80,6 @@ export class CloudFoundryUserProvidedServicesService {
       cfGuid,
       guid,
       data,
-      // this.userProvidedServiceInstancesEntityConfig
     ).pipe(
       pairwise(),
       filter(([oldV, newV]) => oldV.creating && !newV.creating),
@@ -89,7 +89,8 @@ export class CloudFoundryUserProvidedServicesService {
         if (!v.error) {
           // Problem - Lists with multiple actions aren't updated following the creation of an entity based on secondary action
           // Here the service instance list (1st action SI, 2nd action UPSI) isn't updated so manually do so
-          this.store.dispatch(new ClearPaginationOfType(cfEntityCatalog.service));
+          const serviceEntityConfig: EntityCatalogEntityConfig = cfEntityCatalog.serviceInstance.actions.getMultiple('', '', {});
+          this.store.dispatch(new ClearPaginationOfType(serviceEntityConfig));
         }
       })
     );

From 1404c5719aa4db96de2585cbedb0e4c5972f9a87 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 4 May 2020 14:49:50 +0100
Subject: [PATCH 053/176] Fixes following merge

---
 .../edit-autoscaler-credential.component.ts   | 38 +++++++++++--------
 .../src/store/autoscaler-entity-generator.ts  |  9 ++---
 .../src/store/autoscaler.effects.ts           | 16 ++++----
 3 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts
index 1499f2a13d..1e24a5ed57 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts
@@ -1,24 +1,32 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
-import { Observable, Subscription } from 'rxjs';
-import { map, publishReplay, refCount, distinctUntilChanged, filter, first, pairwise } from 'rxjs/operators';
-import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material';
-import { FormBuilder, FormGroup, Validators, FormControl } from '@angular/forms';
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import {
+  ErrorStateMatcher,
+  MatSnackBar,
+  MatSnackBarRef,
+  ShowOnDirtyErrorStateMatcher,
+  SimpleSnackBar,
+} from '@angular/material';
 import { Store } from '@ngrx/store';
-import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material';
+import { Observable, Subscription } from 'rxjs';
+import { distinctUntilChanged, filter, first, map, pairwise, publishReplay, refCount } from 'rxjs/operators';
 
-import { AppState } from '../../../../store/src/app-state';
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
-import { AppAutoscalerCredential } from '../../store/app-autoscaler.types';
-import { UpdateAppAutoscalerCredentialAction, DeleteAppAutoscalerCredentialAction } from '../../store/app-autoscaler.actions';
-import { EntityService } from '../../../../core/src/core/entity-service';
-import { EntityServiceFactory } from '../../../../core/src/core/entity-service-factory.service';
-import { entityCatalogue } from '../../../../core/src/core/entity-catalogue/entity-catalogue.service';
 import { safeUnsubscribe } from '../../../../core/src/core/utils.service';
-import { AutoscalerConstants } from '../../core/autoscaler-helpers/autoscaler-util';
 import { ConfirmationDialogConfig } from '../../../../core/src/shared/components/confirmation-dialog.config';
+import { ConfirmationDialogService } from '../../../../core/src/shared/components/confirmation-dialog.service';
+import { AppState } from '../../../../store/src/app-state';
+import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
+import { EntityService } from '../../../../store/src/entity-service';
+import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
 import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
 import { selectDeletionInfo } from '../../../../store/src/selectors/api.selectors';
-import { ConfirmationDialogService } from '../../../../core/src/shared/components/confirmation-dialog.service';
+import { AutoscalerConstants } from '../../core/autoscaler-helpers/autoscaler-util';
+import {
+  DeleteAppAutoscalerCredentialAction,
+  UpdateAppAutoscalerCredentialAction,
+} from '../../store/app-autoscaler.actions';
+import { AppAutoscalerCredential } from '../../store/app-autoscaler.types';
 
 @Component({
   selector: 'app-edit-autoscaler-credential',
@@ -148,7 +156,7 @@ export class EditAutoscalerCredentialComponent implements OnInit, OnDestroy {
   deleteCredential(): Observable<ActionState> {
     const action = new DeleteAppAutoscalerCredentialAction(this.applicationService.appGuid, this.applicationService.cfGuid);
     this.store.dispatch(action);
-    const entityKey = entityCatalogue.getEntityKey(action);
+    const entityKey = entityCatalog.getEntityKey(action);
 
     return this.store.select(selectDeletionInfo(entityKey, this.applicationService.appGuid)).pipe(
       pairwise(),
diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
index a776780c39..eaced612c4 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
@@ -2,10 +2,7 @@ import { cfEntityFactory } from '../../../cloud-foundry/src/cf-entity-factory';
 import { metricEntityType } from '../../../cloud-foundry/src/cf-entity-types';
 import { IOrgFavMetadata } from '../../../cloud-foundry/src/cf-metadata-types';
 import { IOrganization } from '../../../core/src/core/cf-api.types';
-import {
-  StratosBaseCatalogEntity,
-  StratosCatalogEntity,
-} from '../../../store/src/entity-catalog/entity-catalog-entity';
+import { StratosBaseCatalogEntity, StratosCatalogEntity } from '../../../store/src/entity-catalog/entity-catalog-entity';
 import { IStratosEndpointDefinition } from '../../../store/src/entity-catalog/entity-catalog.types';
 import { APIResource } from '../../../store/src/types/api.types';
 import { IFavoriteMetadata } from '../../../store/src/types/user-favorites.types';
@@ -17,12 +14,12 @@ import {
 } from './app-autoscaler.types';
 import {
   appAutoscalerAppMetricEntityType,
+  appAutoscalerCredentialEntityType,
   appAutoscalerHealthEntityType,
   appAutoscalerInfoEntityType,
   appAutoscalerPolicyEntityType,
   appAutoscalerPolicyTriggerEntityType,
   appAutoscalerScalingHistoryEntityType,
-  appAutoscalerCredentialEntityType,
   AUTOSCALER_ENDPOINT_TYPE,
   autoscalerEntityFactory,
 } from './autoscaler-entity-factory';
@@ -65,7 +62,7 @@ function generateCredentialEntity(endpointDefinition: IStratosEndpointDefinition
     schema: autoscalerEntityFactory(appAutoscalerCredentialEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogueEntity<IFavoriteMetadata, APIResource<AppAutoscalerPolicy>>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, APIResource<AppAutoscalerPolicy>>(definition);
 }
 
 function generateInfoEntity(endpointDefinition: IStratosEndpointDefinition) {
diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts
index d963b1635b..aedcb9ba6e 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler.effects.ts
@@ -6,10 +6,10 @@ import { Observable } from 'rxjs';
 import { catchError, mergeMap, withLatestFrom } from 'rxjs/operators';
 
 import { PaginationResponse } from '../../../cloud-foundry/src/store/types/cf-api.types';
-import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog.service';
 import { environment } from '../../../core/src/environments/environment';
 import { isHttpErrorResponse } from '../../../core/src/jetstream.helpers';
 import { AppState } from '../../../store/src/app-state';
+import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog.service';
 import { ApiRequestTypes } from '../../../store/src/reducers/api-request-reducer/request-helpers';
 import {
   resultPerPageParam,
@@ -36,11 +36,11 @@ import {
   APP_AUTOSCALER_SCALING_HISTORY,
   AUTOSCALER_INFO,
   AutoscalerPaginationParams,
-  UPDATE_APP_AUTOSCALER_CREDENTIAL,
-  DELETE_APP_AUTOSCALER_CREDENTIAL,
   AutoscalerQuery,
   CREATE_APP_AUTOSCALER_POLICY,
   CreateAppAutoscalerPolicyAction,
+  DELETE_APP_AUTOSCALER_CREDENTIAL,
+  DeleteAppAutoscalerCredentialAction,
   DETACH_APP_AUTOSCALER_POLICY,
   DetachAppAutoscalerPolicyAction,
   FETCH_APP_AUTOSCALER_METRIC,
@@ -50,12 +50,13 @@ import {
   GetAppAutoscalerPolicyAction,
   GetAppAutoscalerPolicyTriggerAction,
   GetAppAutoscalerScalingHistoryAction,
+  UPDATE_APP_AUTOSCALER_CREDENTIAL,
   UPDATE_APP_AUTOSCALER_POLICY,
-  UpdateAppAutoscalerPolicyAction,
   UpdateAppAutoscalerCredentialAction,
-  DeleteAppAutoscalerCredentialAction,
+  UpdateAppAutoscalerPolicyAction,
 } from './app-autoscaler.actions';
 import {
+  AppAutoscalerCredential,
   AppAutoscalerEvent,
   AppAutoscalerFetchPolicyFailedResponse,
   AppAutoscalerMetricData,
@@ -63,7 +64,6 @@ import {
   AppAutoscalerPolicy,
   AppAutoscalerPolicyLocal,
   AppScalingTrigger,
-  AppAutoscalerCredential,
 } from './app-autoscaler.types';
 
 const { proxyAPIVersion } = environment;
@@ -227,7 +227,7 @@ export class AutoscalerEffects {
         }).pipe(
           mergeMap(response => {
             const credentialInfo = response;
-            const entity = entityCatalogue.getEntity(action);
+            const entity = entityCatalog.getEntity(action);
             const mappedData = {
               entities: { [entity.entityKey]: {} },
               result: []
@@ -253,7 +253,7 @@ export class AutoscalerEffects {
           headers: this.addHeaders(action.endpointGuid)
         }).pipe(
           mergeMap(response => {
-            const entity = entityCatalogue.getEntity(action);
+            const entity = entityCatalog.getEntity(action);
             const mappedData = {
               entities: { [entity.entityKey]: {} },
               result: []

From bc6b42102939270102ecac64907cd8e70688939f Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Mon, 4 May 2020 15:15:07 +0100
Subject: [PATCH 054/176] Fix uaa docs. Make UAA endpoint config simpler

---
 deploy/kubernetes/console/README.md            | 18 +++++++++---------
 .../console/templates/deployment.yaml          | 10 +++++++++-
 deploy/kubernetes/console/values.yaml          | 14 ++++++++++----
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/deploy/kubernetes/console/README.md b/deploy/kubernetes/console/README.md
index 5a03fedeba..721aed86cf 100644
--- a/deploy/kubernetes/console/README.md
+++ b/deploy/kubernetes/console/README.md
@@ -22,9 +22,11 @@ Check the repository was successfully added by searching for the `console`, for
 ```
 helm search console
 NAME               	CHART VERSION   APP VERSION	DESCRIPTION                                  
-stratos/console    	3.0.0           3.0.0      	A Helm chart for deploying Stratos UI Console
+stratos/console    	3.1.0           3.1.0      	A Helm chart for deploying Stratos UI Console
 ```
 
+> Note: Version numbers will depend on the version of Stratos available from the Helm repository
+
 > Note: Commands shown in this document are for Helm version 3. For Helm version 2, when installing, instead of supplying the name via the `--name` flag, it is supplied as the first argument, before the chart name.
 
 To install Stratos:
@@ -85,13 +87,11 @@ The following table lists the configurable parameters of the Stratos Helm chart
 |console.mariadb.host|Hostname of the database when using an external db||
 |console.mariadb.port|Port of the database when using an external db|3306|
 |console.mariadb.tls|TLS mode when connecting to database (true, false, skip-verify, preferred)|false|
-|console.uaa.protocol|Protocol to use when authenticating with the UAA|https://|
-|console.uaa.host|Host of the UAA to authenticate with ||
-|console.uaa.port|Port of the UAA to authenticate with ||
-|console.uaa.consoleClient|Client to use when authenticating with the UAA|cf|
-|console.uaa.consoleClientSecret|Client secret to use when authenticating with the UAA||
-|console.uaa.consoleAdminIdentifier|Scope that identifies an admin user of Stratos (e.g. cloud_controller.admin||
-|console.uaa.skipSSLValidation|Skip SSL validation when when authenticating with the UAA|false|
+|uaa.endpoint|URL of the UAA endpoint to authenticate with ||
+|uaa.consoleClient|Client to use when authenticating with the UAA|cf|
+|uaa.consoleClientSecret|Client secret to use when authenticating with the UAA||
+|uaa.consoleAdminIdentifier|Scope that identifies an admin user of Stratos (e.g. cloud_controller.admin||
+|uaa.skipSSLValidation|Skip SSL validation when when authenticating with the UAA|false|
 |env.SMTP_AUTH|Authenticate against the SMTP server using AUTH command when Sending User Invite emails|false|
 |env.SMTP_FROM_ADDRESS|From email address to use when Sending User Invite emails||
 |env.SMTP_USER|User name to use for authentication when Sending User Invite emails||
@@ -280,6 +280,7 @@ UAA configuration can be specified by providing the following configuration.
 Create a yaml file with the content below and and update according to your environment and save to a file called `uaa-config.yaml`.
 ```
 uaa:
+  url: https://uaa.cf-dev.io:2793
   protocol: https://
   port: 2793
   host: uaa.cf-dev.io
@@ -291,7 +292,6 @@ uaa:
 
 To install Stratos with the above specified configuration:
 
-
 ```
 kubectl create namespace console
 helm install my-console stratos/console --namespace=console -f uaa-config.yaml
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 84cbffb744..0be76b839b 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -184,7 +184,15 @@ spec:
           value: stratos.admin
         {{- else }}
         # UAA
-        {{- if or .Values.env.UAA_HOST .Values.env.DOMAIN }}  
+        # Highest priority setting to use is uaa.endpoint
+        {{- if .Values.uaa.endpoint }}
+        - name: UAA_ENDPOINT 
+          value: {{ .Values.uaa.endpoint | quote }}
+        - name: CONSOLE_ADMIN_SCOPE
+          value: {{ default "cloud_controller.admin" .Values.uaa.consoleAdminIdentifier }}
+        - name: SKIP_SSL_VALIDATION 
+          value: {{default "true" .Values.uaa.skipSSLValidation | quote}}
+        {{- else if or .Values.env.UAA_HOST .Values.env.DOMAIN }}          
         - name: UAA_ENDPOINT 
           value: {{ template "scfUaaEndpoint" . }}
         {{- if and .Values.env.DOMAIN (not .Values.console.autoRegisterCF) }}
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index 6c2e83d2ab..3de09c3c6e 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -79,6 +79,7 @@ console:
   tlsSecretName:
 
   # URL of a Cloud Foundry to use for authentication and to auto-register on login
+  # Deprecated
   autoRegisterCF: ~
 
   # Custom annotations to apply to Stateful sets
@@ -142,13 +143,18 @@ mariadb:
     accessMode: ReadWriteOnce
     size: 1Gi
     storageClass:
+
+# UAA configuration
 uaa:
-  protocol: https://
-  port: 
-  host: 
+  # UAA endpoint (e.g. https://uaa.domain:2793)
+  endpoint: ~
+  # Client to use when authenticating (default is 'cf')
   consoleClient: 
+  # Client Secret to use when authenticating (default is '')
   consoleClientSecret: 
-  consoleAdminIdentifier: 
+  # Scope that determines if a user is a Stratos admin
+  consoleAdminIdentifier:
+  # Skip SSL validation when communicating with the UAA
   skipSSLValidation: false
 
 # SCF values compatability 

From be15c43082631c18b189319a0bcd95a8ea006c89 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 4 May 2020 15:36:21 +0100
Subject: [PATCH 055/176] Fix compile issues

---
 src/jetstream/plugins/cfapppush/deploy.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/jetstream/plugins/cfapppush/deploy.go b/src/jetstream/plugins/cfapppush/deploy.go
index a605b07466..a6f1ad7a47 100644
--- a/src/jetstream/plugins/cfapppush/deploy.go
+++ b/src/jetstream/plugins/cfapppush/deploy.go
@@ -479,7 +479,7 @@ func (cfAppPush *CFAppPush) getConfigData(echoContext echo.Context, cnsiGUID str
 		sendErrorMessage(clientWebSocket, err, CLOSE_NO_SESSION)
 		return nil, err
 	}
-	cnsiTokenRecord, found := cfAppPush.portalProxy.GetCNSITokenRecord(cnsiGUID, userID)
+	_, found := cfAppPush.portalProxy.GetCNSITokenRecord(cnsiGUID, userID)
 	if !found {
 		log.Warnf("Failed to retrieve record for CNSI %s", cnsiGUID)
 		sendErrorMessage(clientWebSocket, err, CLOSE_NO_CNSI_USERTOKEN)
@@ -487,7 +487,7 @@ func (cfAppPush *CFAppPush) getConfigData(echoContext echo.Context, cnsiGUID str
 	}
 
 	// Refresh token first - makes sure it will be valid when we do the push
-	refreshedTokenRec, err := p.RefreshOAuthToken(cnsiRecord.SkipSSLValidation, cnsiRecord.GUID, userID, cnsiRecord.ClientId, cnsiRecord.ClientSecret, cnsiRecord.TokenEndpoint)
+	refreshedTokenRec, err := cfAppPush.portalProxy.RefreshOAuthToken(cnsiRecord.SkipSSLValidation, cnsiRecord.GUID, userID, cnsiRecord.ClientId, cnsiRecord.ClientSecret, cnsiRecord.TokenEndpoint)
 	if err != nil {
 		log.Warnf("Couldn't get refresh token for endpoint with GUID %s", cnsiRecord.GUID)
 		sendErrorMessage(clientWebSocket, err, CLOSE_NO_CNSI_USERTOKEN)

From fc89d94eb3a644c824195677aa76c0439cb96147 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 4 May 2020 16:19:22 +0100
Subject: [PATCH 056/176] Minor tweaks to create/delete credentials

---
 .../autoscaler-tab-extension.component.html   |  2 +-
 .../edit-autoscaler-credential.component.html | 46 +++++++++++----
 .../edit-autoscaler-credential.component.scss | 42 +++++++++-----
 .../edit-autoscaler-credential.component.ts   | 57 +++++++++++--------
 .../src/store/app-autoscaler.actions.ts       |  9 +--
 5 files changed, 102 insertions(+), 54 deletions(-)

diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html
index cd6dee7a5d..e7b5be4cc9 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html
+++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html
@@ -12,7 +12,7 @@
     </button>
     <button mat-button name="credential" (click)="manageCredentialPage()" class="nav-button-with-text">
       <span class="nav-button-with-text__span">
-        <mat-icon class="nav-button-with-text__icon">vpn_key</mat-icon> Manage Credential
+        <mat-icon class="nav-button-with-text__icon">vpn_key</mat-icon> Manage Credentials
       </span>
     </button>
   </ng-container>
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.html b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.html
index de59b1fe81..9348e06124 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.html
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.html
@@ -1,26 +1,27 @@
 <app-page-header>
-  <h1>Manage AutoScaler Credential: {{ (applicationService.application$ | async)?.app.entity.name }} </h1>
+  <h1>Manage AutoScaler Credentials: {{ (applicationService.application$ | async)?.app.entity.name }} </h1>
   <div class="page-header-right">
     <button mat-icon-button mat-button routerLink="{{parentUrl}}">
       <mat-icon>clear</mat-icon>
     </button>
   </div>
 </app-page-header>
-<div class="autoscaler-credential-page">
+<div class="autoscaler-credential">
   <app-tile-grid class="app-autoscaler-tile-grid-100">
     <app-tile-group>
       <app-tile>
         <mat-card>
           <mat-card-header>
-            <div>Custom metrics credential</div>
+            <div>
+              <p>Credentials are required when submitting custom metrics to the autoscaler. They can either be supplied
+                or randomly generated</p>
+              <p>Please note, only the latest set of credentials are valid. Creating a new set will invalidate any
+                previously created</p>
+            </div>
           </mat-card-header>
           <mat-card-content>
-              <button class="autoscaler-credential-submit" color="accent" mat-button mat-raised-button
-              (click)="createCredential()" [disabled]="false">Create</button>
-              <button class="autoscaler-credential-submit" color="accent" mat-button mat-raised-button
-              (click)="deleteCredentialConfirm()" [disabled]="false">Delete</button>
-            <form [formGroup]="editCredentialForm" validate class="autoscaler-credential-form">
-              <div class="autoscaler-credential-toggle">
+            <form [formGroup]="editCredentialForm" validate class="autoscaler-credential__form">
+              <div class="autoscaler-credential__toggle">
                 <span>Create random credential</span>
                 <mat-slide-toggle [checked]="!randomCredential" (toggleChange)="toggleChange()">Create specified
                   credential
@@ -41,6 +42,25 @@ <h1>Manage AutoScaler Credential: {{ (applicationService.application$ | async)?.
                 </mat-error>
               </mat-form-field>
             </form>
+            <div class="autoscaler-credential__buttons">
+              <button color="accent" mat-button mat-raised-button (click)="createCredential()"
+                [disabled]="(!randomCredential && !editCredentialForm.valid) || (creating$ | async)">
+                <div class="autoscaler-credential__buttons--spinner">
+                  <mat-progress-spinner *ngIf="creating$ | async; else notCreating" diameter="20" mode="indeterminate">
+                  </mat-progress-spinner>&nbsp;
+                  <ng-template #notCreating>Create</ng-template>
+                </div>
+
+              </button>
+              <button color="accent" class="autoscaler-credential__button" mat-button mat-raised-button
+                (click)="deleteCredentialConfirm()" [disabled]="deleting$ | async">
+                <div class="autoscaler-credential__buttons--spinner">
+                  <mat-progress-spinner *ngIf="deleting$ | async; else notDeleting" diameter="20" mode="indeterminate">
+                  </mat-progress-spinner>&nbsp;
+                  <ng-template #notDeleting>Delete</ng-template>
+                </div>
+              </button>
+            </div>
           </mat-card-content>
         </mat-card>
       </app-tile>
@@ -49,8 +69,12 @@ <h1>Manage AutoScaler Credential: {{ (applicationService.application$ | async)?.
       <app-tile>
         <mat-card>
           <mat-card-header>
-            <div>A new credential generated. Please update the credential setting, and restart your application to
-              ensure your env variable changes take effect.</div>
+            <div>
+              <p>Credentials have been generated. Please apply them to the process used to create the custom metrics.
+                If this is an application's environment variables please restart the application for changes to take
+                effect.</p>
+              <p>Credentials will only be available to view here once. Please ensure they are recorded correctly</p>
+            </div>
           </mat-card-header>
           <mat-card-content>
             <app-code-block>
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.scss b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.scss
index 6239258751..e2a9fd4d93 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.scss
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.scss
@@ -1,22 +1,34 @@
-.autoscaler-credential-form {
-  display: flex;
-  flex-direction: column;
-  margin-top: 10px;
-  max-width: 450px;
-  mat-form-field {
-    width: 100%;
+.autoscaler-credential {
+
+  &__form {
+    display: flex;
+    flex-direction: column;
+    margin-top: 10px;
+    max-width: 450px;
+    mat-form-field {
+      width: 100%;
+    }
   }
-  .autoscaler-credential-toggle {
-    padding: 1em 0 1em 0;
+
+  &__toggle {
+    padding: 1em 0;
     span {
       margin-right: .8em;
     }
   }
-}
 
-.autoscaler-credential-submit {
-  margin-top: 1em;
-  margin-right: 1em;
+  &__buttons {
+    display: flex;
+    button {
+      display: flex;
+      justify-content: center;
+      margin-right: 8px;
+    }
+    &--spinner {
+      align-items: center;
+      display: flex;
+      flex-direction: row;
+      justify-content: center;
+    }
+  }
 }
-
-
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts
index 1e24a5ed57..0210729dbf 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts
@@ -8,8 +8,8 @@ import {
   SimpleSnackBar,
 } from '@angular/material';
 import { Store } from '@ngrx/store';
-import { Observable, Subscription } from 'rxjs';
-import { distinctUntilChanged, filter, first, map, pairwise, publishReplay, refCount } from 'rxjs/operators';
+import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import { delay, filter, first, map, pairwise, publishReplay, refCount, tap } from 'rxjs/operators';
 
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
 import { safeUnsubscribe } from '../../../../core/src/core/utils.service';
@@ -48,6 +48,12 @@ export class EditAutoscalerCredentialComponent implements OnInit, OnDestroy {
   private appAutoscalerCredentialErrorSub: Subscription;
   private appAutoscalerCredentialSnackBarRef: MatSnackBarRef<SimpleSnackBar>;
 
+
+  private creating = new BehaviorSubject(false);
+  public creating$ = this.creating.asObservable();
+  private deleting = new BehaviorSubject(false);
+  public deleting$ = this.deleting.asObservable();
+
   constructor(
     public applicationService: ApplicationService,
     private fb: FormBuilder,
@@ -93,6 +99,7 @@ export class EditAutoscalerCredentialComponent implements OnInit, OnDestroy {
   }
 
   createCredential() {
+    this.creating.next(true);
     let action: UpdateAppAutoscalerCredentialAction;
     if (this.randomCredential) {
       action = new UpdateAppAutoscalerCredentialAction(this.applicationService.appGuid, this.applicationService.cfGuid);
@@ -101,9 +108,6 @@ export class EditAutoscalerCredentialComponent implements OnInit, OnDestroy {
         username: this.editCredentialForm.controls.acusername.value,
         password: this.editCredentialForm.controls.acpassword.value,
       };
-      if (!credential.username || !credential.password) {
-        return;
-      }
       action = new UpdateAppAutoscalerCredentialAction(this.applicationService.appGuid, this.applicationService.cfGuid, credential);
     }
     const updateAppAutoscalerCredentialService: EntityService = this.entityServiceFactory.create(
@@ -115,37 +119,41 @@ export class EditAutoscalerCredentialComponent implements OnInit, OnDestroy {
       publishReplay(1),
       refCount()
     );
-    updateAppAutoscalerCredentialService.entityMonitor.entityRequest$.pipe(
-      filter(request => !!request.error),
-      map(request => {
-        const msg = request.message;
-        request.error = false;
-        request.message = '';
-        return msg;
-      }),
-      distinctUntilChanged(),
-    ).subscribe(errorMessage => {
-      if (this.appAutoscalerCredentialSnackBarRef) {
-        this.appAutoscalerCredentialSnackBarRef.dismiss();
+    updateAppAutoscalerCredentialService.entityMonitor.getUpdatingSection(action.updatingKey).pipe(
+      delay(250),
+      pairwise(),
+      filter(([oldV, newV]) => oldV.busy && !newV.busy),
+      map(([, newV]) => newV),
+      first(),
+    ).subscribe(actionState => {
+      this.creating.next(false);
+      if (actionState.error) {
+        if (this.appAutoscalerCredentialSnackBarRef) {
+          this.appAutoscalerCredentialSnackBarRef.dismiss();
+        }
+        this.appAutoscalerCredentialSnackBarRef =
+          this.appAutoscalerCredentialSnackBar.open(`Failed to create credentials: ${actionState.message}`, 'Dismiss');
       }
-      this.appAutoscalerCredentialSnackBarRef = this.appAutoscalerCredentialSnackBar.open(errorMessage, 'Dismiss');
+
     });
     this.store.dispatch(action);
   }
 
   deleteCredentialConfirm() {
     const confirmation = new ConfirmationDialogConfig(
-      'Delete Credential',
-      'Are you sure you want to delete the credential?',
+      'Delete Credentials',
+      'Are you sure you want to delete the credentials?',
       'Delete',
       true
     );
     this.confirmDialog.open(confirmation, () => {
-      const doUpdate = () => this.deleteCredential();
-      doUpdate().pipe(
+      this.deleteCredential().pipe(
         first(),
       ).subscribe(actionState => {
         if (actionState.error) {
+          if (this.appAutoscalerCredentialSnackBarRef) {
+            this.appAutoscalerCredentialSnackBarRef.dismiss();
+          }
           this.appAutoscalerCredentialSnackBarRef =
             this.appAutoscalerCredentialSnackBar.open(`Failed to delete credential: ${actionState.message}`, 'Dismiss');
         }
@@ -154,14 +162,17 @@ export class EditAutoscalerCredentialComponent implements OnInit, OnDestroy {
   }
 
   deleteCredential(): Observable<ActionState> {
+    this.deleting.next(true);
     const action = new DeleteAppAutoscalerCredentialAction(this.applicationService.appGuid, this.applicationService.cfGuid);
     this.store.dispatch(action);
     const entityKey = entityCatalog.getEntityKey(action);
 
     return this.store.select(selectDeletionInfo(entityKey, this.applicationService.appGuid)).pipe(
+      delay(250),
       pairwise(),
       filter(([oldV, newV]) => oldV.busy && !newV.busy),
-      map(([, newV]) => newV)
+      map(([, newV]) => newV),
+      tap(() => this.deleting.next(false))
     );
   }
 
diff --git a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts
index e889929a5c..c7472cb6f1 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.actions.ts
@@ -1,21 +1,22 @@
+import { HttpRequest } from '@angular/common/http';
+
 import { applicationEntityType } from '../../../cloud-foundry/src/cf-entity-types';
 import { createEntityRelationPaginationKey } from '../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { ApiRequestTypes } from '../../../store/src/reducers/api-request-reducer/request-helpers';
 import { PaginatedAction, PaginationParam } from '../../../store/src/types/pagination.types';
 import { EntityRequestAction } from '../../../store/src/types/request.types';
-import { AppAutoscalerPolicyLocal, AppScalingTrigger, AppAutoscalerCredential } from './app-autoscaler.types';
+import { AppAutoscalerCredential, AppAutoscalerPolicyLocal, AppScalingTrigger } from './app-autoscaler.types';
 import {
   appAutoscalerAppMetricEntityType,
+  appAutoscalerCredentialEntityType,
   appAutoscalerHealthEntityType,
   appAutoscalerInfoEntityType,
   appAutoscalerPolicyEntityType,
   appAutoscalerPolicyTriggerEntityType,
   appAutoscalerScalingHistoryEntityType,
-  appAutoscalerCredentialEntityType,
   AUTOSCALER_ENDPOINT_TYPE,
   autoscalerEntityFactory,
 } from './autoscaler-entity-factory';
-import { HttpRequest } from '@angular/common/http';
 
 export const AppAutoscalerPolicyEvents = {
   GET_APP_AUTOSCALER_POLICY: '[App Autoscaler] Get autoscaler policy',
@@ -250,10 +251,10 @@ export class UpdateAppAutoscalerCredentialAction implements EntityRequestAction
   entity = autoscalerEntityFactory(appAutoscalerCredentialEntityType);
   entityType = appAutoscalerCredentialEntityType;
   endpointType = AUTOSCALER_ENDPOINT_TYPE;
+  updatingKey = UpdateAppAutoscalerCredentialAction.updateKey;
 }
 
 export class DeleteAppAutoscalerCredentialAction implements EntityRequestAction {
-  static updateKey = 'Deleting-Application-Credential';
   constructor(
     public guid: string,
     public endpointGuid: string,

From ff5e2e8a52a005c545c0ad8f7c341d89c2df3e3c Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 4 May 2020 17:17:38 +0100
Subject: [PATCH 057/176] Finish some todos

---
 .../entity-catalog-entity.ts                  |  4 ++--
 .../entity-catalog-entity.types.ts            | 23 ++++++++-----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts
index adfc5469c2..4285a53383 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts
@@ -85,12 +85,12 @@ export class StratosBaseCatalogEntity<
         this.entityKey,
         Object.bind(this.getSchema, this)
       ),
-      ...EntityCatalogEntityStoreHelpers.getPaginationStore<Y>(
+      ...EntityCatalogEntityStoreHelpers.getPaginationStore<Y, ABC>(
         this.actions,
         this.entityKey,
         Object.bind(this.getSchema, this)
       )
-    } as EntityCatalogEntityStore<Y, ABC>; // TODO: RC investigate more
+    };
     this.api = EntityCatalogEntityStoreHelpers.getActionDispatchers(
       this.store,
       actionBuilders as ABC
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.types.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.types.ts
index 7136e1d3ad..0280477e6f 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.types.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.types.ts
@@ -11,7 +11,6 @@ import { PaginationObservables } from '../../reducers/pagination-reducer/paginat
 import { PaginatedAction } from '../../types/pagination.types';
 import { OrchestratedActionBuilders, OrchestratedActionCoreBuilders } from '../action-orchestrator/action-orchestrator';
 
-// TODO: RC tidy up `extends OrchestratedActionBuilders`, could be more specific
 /**
  * Core entity and entities access (entity/entities monitors and services)
  */
@@ -70,18 +69,16 @@ type NonPaginatedActionBuildersWithNevers<ABC extends OrchestratedActionBuilders
 type NonPaginatedActionBuilders<ABC extends OrchestratedActionBuilders> = Omit<NonPaginatedActionBuildersWithNevers<ABC>, NeverKeys<NonPaginatedActionBuildersWithNevers<ABC>>>
 
 
-
-
 /**
  * Provided a typed way to create pagination monitor/service per action (this ultimately only provides ones for paginated actions)
  */
-type EntityCatalogEntityStoreCollections<Y, ABC extends OrchestratedActionBuilders> = {
-  [K in keyof ABC]: {
+type EntityCatalogEntityStoreCollections<Y, ABC extends OrchestratedActionBuilders, PABC extends PaginatedActionBuilders<ABC>> = {
+  [K in keyof PABC]: {
     getPaginationMonitor: (
-      ...args: Parameters<ABC[K]>
+      ...args: Parameters<PABC[K]>
     ) => PaginationMonitor<Y>;
     getPaginationService: (
-      ...args: Parameters<ABC[K]>
+      ...args: Parameters<PABC[K]>
     ) => PaginationObservables<Y>;
   }
 };
@@ -89,21 +86,21 @@ type EntityCatalogEntityStoreCollections<Y, ABC extends OrchestratedActionBuilde
 /**
  * Provided a typed way to create entity monitor/service per action (this ultimately only provides ones for non-paginated actions)
  */
-type EntityCatalogEntityStoreSingles<Y, ABC extends OrchestratedActionBuilders> = {
-  [K in keyof ABC]: {
+type EntityCatalogEntityStoreSingles<Y, ABC extends OrchestratedActionBuilders, SABC extends NonPaginatedActionBuilders<ABC>> = {
+  [K in keyof SABC]: {
     getEntityMonitor: (
       startWithNull: boolean,
-      ...args: Parameters<ABC[K]>
+      ...args: Parameters<SABC[K]>
     ) => EntityMonitor<Y>;
     getEntityService: (
-      ...args: Parameters<ABC[K]>
+      ...args: Parameters<SABC[K]>
     ) => EntityService<Y>
   }
 };
 
 export type CustomEntityCatalogEntityStore<Y, ABC extends OrchestratedActionBuilders> =
-  EntityCatalogEntityStoreCollections<Y, PaginatedActionBuilders<ABC>> &
-  EntityCatalogEntityStoreSingles<Y, NonPaginatedActionBuilders<ABC>>
+  EntityCatalogEntityStoreCollections<Y, ABC, PaginatedActionBuilders<ABC>> &
+  EntityCatalogEntityStoreSingles<Y, ABC, NonPaginatedActionBuilders<ABC>>
 
 
 /**

From 9c4146d41f70a0c21ccbd27bb371f61239e24cba Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 4 May 2020 18:18:26 +0100
Subject: [PATCH 058/176] Uncomment & fix dispatcher unit test

---
 .../action-dispatcher.spec.ts                 | 255 +++++++++---------
 .../entity-catalog-entity.ts                  |   6 +-
 2 files changed, 133 insertions(+), 128 deletions(-)

diff --git a/src/frontend/packages/store/src/entity-catalog/action-dispatcher/action-dispatcher.spec.ts b/src/frontend/packages/store/src/entity-catalog/action-dispatcher/action-dispatcher.spec.ts
index 38572f044d..88cc83b37a 100644
--- a/src/frontend/packages/store/src/entity-catalog/action-dispatcher/action-dispatcher.spec.ts
+++ b/src/frontend/packages/store/src/entity-catalog/action-dispatcher/action-dispatcher.spec.ts
@@ -1,125 +1,130 @@
-// import { Action } from '@ngrx/store';
-
-// import { EntityRequestAction } from '../../types/request.types';
-// import { ActionOrchestrator, OrchestratedActionBuilders } from '../action-orchestrator/action-orchestrator';
-// import { getPaginationAction, getRequestAction } from '../action-orchestrator/action-orchestrator.spec.helpers';
-// import { EntityActionDispatcherManager } from './action-dispatcher';
-
-// function actionDispatcher(action: Action) {
-//   // noop
-// }
-
-// TODO: RC Update tests
-// describe('ActionDispatcher', () => {
-//   it('should not dispatch unknown action', () => {
-//     const actionOrchestrator = new ActionOrchestrator('Empty');
-//     const entityActionDispatcher = new EntityActionDispatcherManager(actionDispatcher, actionOrchestrator);
-//     expect(entityActionDispatcher.getActionDispatcher('get').dispatch('1', '2')).toBe(false);
-//   });
-//   it('should dispatch custom action', () => {
-//     interface CustomOrchestratedActionBuilders extends OrchestratedActionBuilders {
-//       custom: (guid: string) => EntityRequestAction;
-//     }
-//     const actionBuilders = {
-//       custom: guid => getRequestAction(),
-//       customAarb: guid => getRequestAction(),
-//       get: guid => getRequestAction()
-//     } as CustomOrchestratedActionBuilders;
-//     const data = 'adsd';
-//     const data2 = 'adsd2';
-//     const spy = spyOn(actionBuilders, 'custom');
-//     const actionOrchestrator = new ActionOrchestrator('Custom', actionBuilders);
-//     const entityActionDispatcher = new EntityActionDispatcherManager(actionDispatcher, actionOrchestrator);
-//     // By getting action dispatcher
-//     const dipatcher = entityActionDispatcher.getActionDispatcher('custom');
-//     const dipatcher2 = entityActionDispatcher.getActionDispatcher('customAarb');
-//     expect(entityActionDispatcher.getActionDispatcher('custom').dispatch(data)).toBe(true);
-//     expect(spy).toHaveBeenCalledWith(data);
-//     expect(entityActionDispatcher.getActionDispatcher('customAarb').dispatch(data)).toBe(true);
-//     // By dispatching action directly
-//     expect(entityActionDispatcher.dispatchAction('custom', data2)).toBe(true);
-//     expect(spy).toHaveBeenCalledWith(data2);
-//   });
-
-//   it('should dispatch get action', () => {
-//     function getActionBuilder() {
-//       return getRequestAction();
-//     }
-//     const guid = 'guid';
-//     const endpointGuid = 'guid';
-//     const actionBuilders = {
-//       get: getActionBuilder
-//     } as OrchestratedActionBuilders;
-//     const spy = spyOn(actionBuilders, 'get');
-//     const actionOrchestrator = new ActionOrchestrator('get', actionBuilders);
-//     const entityActionDispatcher = new EntityActionDispatcherManager(actionDispatcher, actionOrchestrator);
-//     expect(entityActionDispatcher.dispatchGet(guid, endpointGuid)).toBe(true);
-//     expect(spy).toHaveBeenCalledWith(guid, endpointGuid);
-//   });
-
-//   it('should dispatch delete action', () => {
-//     function getActionBuilder() {
-//       return getRequestAction();
-//     }
-//     const guid = 'guid';
-//     const endpointGuid = 'guid';
-//     const actionBuilders = {
-//       delete: getActionBuilder
-//     } as OrchestratedActionBuilders;
-//     const spy = spyOn(actionBuilders, 'delete');
-//     const actionOrchestrator = new ActionOrchestrator('delete', actionBuilders);
-//     const entityActionDispatcher = new EntityActionDispatcherManager(actionDispatcher, actionOrchestrator);
-//     expect(entityActionDispatcher.dispatchDelete(guid, endpointGuid)).toBe(true);
-//     expect(spy).toHaveBeenCalledWith(guid, endpointGuid);
-//   });
-
-//   it('should dispatch update action', () => {
-//     function getActionBuilder() {
-//       return getRequestAction();
-//     }
-//     const guid = 'guid';
-//     const endpointGuid = 'guid';
-//     const arbData = { arb: true };
-//     const actionBuilders = {
-//       update: getActionBuilder
-//     } as OrchestratedActionBuilders;
-//     const spy = spyOn(actionBuilders, 'update');
-//     const actionOrchestrator = new ActionOrchestrator('update', actionBuilders);
-//     const entityActionDispatcher = new EntityActionDispatcherManager(actionDispatcher, actionOrchestrator);
-//     expect(entityActionDispatcher.dispatchUpdate(guid, endpointGuid, arbData)).toBe(true);
-//     expect(spy).toHaveBeenCalledWith(guid, endpointGuid, arbData);
-//   });
-
-//   it('should dispatch create action', () => {
-//     function getActionBuilder() {
-//       return getRequestAction();
-//     }
-//     const endpointGuid = 'guid';
-//     const aString = 'stringy';
-//     const actionBuilders = {
-//       create: getActionBuilder
-//     } as OrchestratedActionBuilders;
-//     const spy = spyOn(actionBuilders, 'create');
-//     const actionOrchestrator = new ActionOrchestrator('create', actionBuilders);
-//     const entityActionDispatcher = new EntityActionDispatcherManager(actionDispatcher, actionOrchestrator);
-//     expect(entityActionDispatcher.dispatchCreate(endpointGuid, aString)).toBe(true);
-//     expect(spy).toHaveBeenCalledWith(endpointGuid, aString);
-//   });
-
-//   it('should dispatch getMultiple action', () => {
-//     function getActionBuilder() {
-//       return getPaginationAction();
-//     }
-
-//     const actionBuilders = {
-//       getMultiple: getActionBuilder
-//     } as OrchestratedActionBuilders;
-//     const endpointGuid = 'guid';
-//     const paginationKey = 'pagKey';
-//     const spy = spyOn(actionBuilders, 'getMultiple');
-//     const actionOrchestrator = new ActionOrchestrator('getMultiple', actionBuilders);
-//     const entityActionDispatcher = new EntityActionDispatcherManager(actionDispatcher, actionOrchestrator);
-//     expect(entityActionDispatcher.dispatchGetMultiple(endpointGuid, paginationKey)).toBe(true);
-//     expect(spy).toHaveBeenCalledWith(endpointGuid, paginationKey);
-//   });
-// });
+import { Action, Store } from '@ngrx/store';
+import { of } from 'rxjs';
+
+import { AppState } from '../../app-state';
+import { EntityServiceFactory } from '../../entity-service-factory.service';
+import { PaginationMonitorFactory } from '../../monitors/pagination-monitor.factory';
+import { ActionOrchestrator, OrchestratedActionBuilders } from '../action-orchestrator/action-orchestrator';
+import { ActionBuilderConfigMapper } from '../entity-catalog-entity/action-builder-config.mapper';
+import { EntityCatalogEntityStoreHelpers } from '../entity-catalog-entity/entity-catalog-entity-store-helpers';
+import { EntityCatalogHelper } from '../entity-catalog-entity/entity-catalog.service';
+import { EntityCatalogHelpers } from '../entity-catalog.helper';
+
+describe('ActionDispatcher', () => {
+  it('should not dispatch unknown action', () => {
+    const actionBuilders = ActionBuilderConfigMapper.getActionBuilders({}, null, null, null)
+    const actionOrchestrator = new ActionOrchestrator('Empty', actionBuilders);
+
+    const store = {
+      ...EntityCatalogEntityStoreHelpers.createCoreStore(
+        actionOrchestrator,
+        entityType,
+        null
+      ),
+      ...EntityCatalogEntityStoreHelpers.getPaginationStore(
+        actionBuilders,
+        entityType,
+        null
+      )
+    };
+    const entityActionDispatcher = EntityCatalogEntityStoreHelpers.getActionDispatchers(
+      store,
+      actionBuilders
+    )
+    expect(entityActionDispatcher.get).toBeUndefined();
+  });
+
+  const entityType = 'entityType';
+  const endpointType = 'endpointType';
+
+  it('should dispatch actions', () => {
+    const endpointGuid = 'endpoint Guid';
+    const guid = 'guid';
+    const paginationKey = 'asd';
+
+    const getAction = { type: 'get action', entityType, endpointType, guid, endpointGuid };
+    const getMultipleAction = { type: 'getMultiple action', entityType, endpointType, endpointGuid, paginationKey };
+    const customGetAction = { type: 'custom Action', entityType, endpointType, guid }
+    const customGetMultipleAction = { type: 'custom MultipleAction', entityType, endpointType, paginationKey }
+
+    const builders: OrchestratedActionBuilders = {
+      get: (guid: string, endpointGuid: string, extraArgs?: any) => ({
+        ...getAction,
+        guid,
+        endpointGuid
+      }),
+      getMultiple: (endpointGuid: string, paginationKey: string) => ({
+        ...getMultipleAction,
+        endpointGuid,
+        paginationKey
+      }),
+      custom: (guid: string) => ({
+        ...customGetAction,
+        guid
+      }),
+      customMultipleAction: (paginationKey: string) => ({
+        ...customGetMultipleAction,
+        paginationKey
+      }),
+    }
+    const actionBuilders = ActionBuilderConfigMapper.getActionBuilders(builders, null, null, null)
+    const actionOrchestrator = new ActionOrchestrator(entityType, actionBuilders);
+
+    const entityStore = {
+      ...EntityCatalogEntityStoreHelpers.createCoreStore(
+        actionOrchestrator,
+        entityType,
+        (schema: string) => null
+      ),
+      ...EntityCatalogEntityStoreHelpers.getPaginationStore(
+        actionBuilders,
+        entityType,
+        (schema: string) => null
+      )
+    };
+    const entityActionDispatcher = EntityCatalogEntityStoreHelpers.getActionDispatchers(
+      entityStore,
+      actionBuilders
+    )
+
+    const store = {
+      dispatch: (action: Action) => { console.log(action) },
+      select: (...args: any[]) => of(null)
+    } as Store<AppState<any>>
+
+    EntityCatalogHelpers.SetEntityCatalogHelper({
+      store,
+      esf: {
+        create: (guid, action) => of(null)
+      } as unknown as EntityServiceFactory,
+      pmf: {
+        create: (pk, ec, isLocal) => ({
+          currentPageState$: {}
+        })
+      } as unknown as PaginationMonitorFactory
+    } as EntityCatalogHelper)
+    const storeDispatchSpy = spyOn(store, 'dispatch');
+
+    expect(entityActionDispatcher.get).toBeDefined();
+    expect(entityActionDispatcher.get(guid, endpointGuid)).toBeDefined();
+    expect(storeDispatchSpy).toHaveBeenCalledWith(getAction)
+    storeDispatchSpy.calls.reset();
+
+    expect(entityActionDispatcher.custom).toBeDefined();
+    expect(entityActionDispatcher.custom(guid)).toBeDefined();
+    expect(storeDispatchSpy).toHaveBeenCalledWith(customGetAction)
+    storeDispatchSpy.calls.reset();
+
+    expect(entityActionDispatcher.getMultiple).toBeDefined();
+    expect(entityActionDispatcher.getMultiple(endpointGuid, paginationKey)).toBeDefined();
+    expect(storeDispatchSpy).toHaveBeenCalledWith(getMultipleAction)
+    storeDispatchSpy.calls.reset();
+
+    expect(entityActionDispatcher.customMultipleAction).toBeDefined();
+    expect(entityActionDispatcher.customMultipleAction(paginationKey)).toBeDefined();
+    expect(storeDispatchSpy).toHaveBeenCalledWith(customGetMultipleAction)
+    storeDispatchSpy.calls.reset();
+
+  });
+
+});
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts
index 4285a53383..f6207fcff1 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts
@@ -83,15 +83,15 @@ export class StratosBaseCatalogEntity<
       ...EntityCatalogEntityStoreHelpers.createCoreStore<Y, ABC>(
         this.actionOrchestrator,
         this.entityKey,
-        Object.bind(this.getSchema, this)
+        (schemaKey: string) => this.getSchema(schemaKey)
       ),
       ...EntityCatalogEntityStoreHelpers.getPaginationStore<Y, ABC>(
         this.actions,
         this.entityKey,
-        Object.bind(this.getSchema, this)
+        (schemaKey: string) => this.getSchema(schemaKey)
       )
     };
-    this.api = EntityCatalogEntityStoreHelpers.getActionDispatchers(
+    this.api = EntityCatalogEntityStoreHelpers.getActionDispatchers<Y, ABC>(
       this.store,
       actionBuilders as ABC
     );

From c36ba67c3601b946e55bcf59923595acdbe910b9 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 5 May 2020 13:20:40 +0100
Subject: [PATCH 059/176] Move Cloud Foundry code into the correct package

---
 .../src/store/autoscaler-entity-generator.ts  |  7 +--
 .../src/actions/application.actions.ts        |  2 +-
 .../src/actions/organization.actions.ts       |  2 +-
 .../src/actions/quota-definitions.actions.ts  | 11 ++---
 .../src/actions/space.actions.ts              |  2 +-
 .../src}/cf-api-svc.types.ts                  |  2 +-
 .../src}/cf-api.types.ts                      |  4 +-
 .../cloud-foundry/src/cf-entity-generator.ts  | 48 +++++++++----------
 .../cloud-foundry/src/cf-entity-types.ts      | 10 ++--
 .../core => cloud-foundry/src}/cf.helpers.ts  |  6 +--
 .../application.action-builders.ts            |  2 +-
 .../organization.action-builders.ts           |  2 +-
 .../quota-definition.action-builders.ts       |  4 +-
 .../space-quota.action-builders.ts            |  4 +-
 .../space.action-builders.ts                  |  2 +-
 .../entity-relations-from-parent.spec.ts      | 19 +++-----
 .../entity-relations/entity-relations.spec.ts |  2 +-
 .../application-delete.component.ts           |  4 +-
 ...te-instances-routes-list-config.service.ts |  2 +-
 .../delete-app-instances.component.ts         |  2 +-
 .../app-delete-routes-list-config.service.ts  |  2 +-
 .../delete-app-routes.component.ts            |  2 +-
 .../applications/application.service.ts       |  2 +-
 .../application-polling.service.ts            |  8 ++--
 .../application-tabs-base.component.ts        |  2 +-
 .../tabs/build-tab/build-tab.component.ts     |  2 +-
 .../tabs/gitscm-tab/gitscm-tab.component.ts   |  6 +--
 .../create-application-step3.component.ts     |  6 +--
 ...ploy-application-options-step.component.ts |  2 +-
 .../commit-list-wrapper.component.ts          |  6 +--
 .../deploy-application-steps.types.ts         |  2 +-
 .../routes/add-routes/add-routes.component.ts |  6 +--
 .../ssh-application.component.ts              |  4 +-
 .../cloud-foundry/add-edit-space-step-base.ts |  2 +-
 .../create-organization-step.component.ts     |  2 +-
 .../add-quota/add-quota.component.html        |  0
 .../add-quota/add-quota.component.scss        |  0
 .../add-quota/add-quota.component.spec.ts     | 10 ++--
 .../add-quota/add-quota.component.ts          |  4 +-
 .../create-quota-step.component.html          |  0
 .../create-quota-step.component.scss          |  0
 .../create-quota-step.component.spec.ts       |  2 +-
 .../create-quota-step.component.ts            | 10 ++--
 .../add-space-quota.component.html            |  0
 .../add-space-quota.component.scss            |  0
 .../add-space-quota.component.spec.ts         |  4 +-
 .../add-space-quota.component.ts              |  5 +-
 .../create-space-quota-step.component.html    |  0
 .../create-space-quota-step.component.scss    |  0
 .../create-space-quota-step.component.spec.ts |  2 +-
 .../create-space-quota-step.component.ts      | 14 +++---
 .../features/cloud-foundry/cf-cell.helpers.ts | 12 ++---
 .../src/features/cloud-foundry/cf.helpers.ts  |  4 +-
 .../cli-info-cloud-foundry.component.ts       |  2 +-
 .../cloud-foundry/cloud-foundry.module.ts     | 46 ++++++------------
 .../cloud-foundry/cloud-foundry.routing.ts    | 22 ++++-----
 .../edit-organization-step.component.ts       |  2 +-
 .../edit-quota-step.component.html            |  0
 .../edit-quota-step.component.scss            |  0
 .../edit-quota-step.component.spec.ts         |  2 +-
 .../edit-quota-step.component.ts              | 25 ++++------
 .../edit-quota/edit-quota.component.html      |  0
 .../edit-quota/edit-quota.component.scss      |  0
 .../edit-quota/edit-quota.component.spec.ts   |  4 +-
 .../edit-quota/edit-quota.component.ts        |  6 +--
 .../edit-space-quota-step.component.html      |  0
 .../edit-space-quota-step.component.scss      |  0
 .../edit-space-quota-step.component.spec.ts   |  2 +-
 .../edit-space-quota-step.component.ts        | 21 ++++----
 .../edit-space-quota.component.html           |  0
 .../edit-space-quota.component.scss           |  0
 .../edit-space-quota.component.spec.ts        |  4 +-
 .../edit-space-quota.component.ts             |  8 ++--
 .../quota-definition-base.component.ts        | 13 ++---
 .../quota-definition-form.component.html      |  0
 .../quota-definition-form.component.scss      |  0
 .../quota-definition-form.component.ts        | 18 ++++---
 .../quota-definition.component.ts             |  4 +-
 .../cloud-foundry-endpoint.service.ts         |  2 +-
 .../services/cloud-foundry-org-space-quota.ts |  6 +--
 .../cloud-foundry-organization-quota.ts       |  6 +--
 .../cloud-foundry-organization.service.ts     | 18 +++----
 .../services/cloud-foundry-space-quota.ts     |  6 +--
 .../services/cloud-foundry-space.service.ts   | 12 ++---
 ...space-quota-definition-form.component.html |  0
 ...space-quota-definition-form.component.scss |  0
 .../space-quota-definition-form.component.ts  | 12 ++---
 .../space-quota-definition.component.ts       |  4 +-
 .../cloud-foundry-cell.service.ts             |  2 +-
 .../cloud-foundry-cells.component.ts          |  6 ++-
 ...y-organization-space-quotas.component.html |  0
 ...y-organization-space-quotas.component.scss |  0
 ...rganization-space-quotas.component.spec.ts | 10 ++--
 ...dry-organization-space-quotas.component.ts | 14 +++---
 .../cloud-foundry-quotas.component.html       |  0
 .../cloud-foundry-quotas.component.scss       |  0
 .../cloud-foundry-quotas.component.spec.ts    | 11 ++---
 .../cloud-foundry-quotas.component.ts         | 10 ++--
 .../invite-users-create.component.ts          |  8 ++--
 .../users/manage-users/cf-roles.service.ts    |  2 +-
 .../manage-users-modify.component.ts          |  4 +-
 .../service-summary.component.ts              |  2 +-
 .../service-catalog/services-helper.ts        | 18 +++----
 .../service-catalog/services.service.ts       | 18 +++----
 .../detach-apps/detach-apps.component.ts      |  6 +--
 .../detach-service-instance.component.ts      |  8 ++--
 .../services/services-wall.service.ts         |  2 +-
 .../add-service-instance.component.ts         |  4 +-
 .../bind-apps-step.component.ts               |  4 +-
 .../create-service-instance-helper.service.ts |  8 +---
 .../select-plan-step.component.ts             |  2 +-
 .../specify-details-step.component.ts         | 10 +++-
 ...specify-user-provided-details.component.ts |  2 +-
 .../card-cf-info/card-cf-info.component.ts    |  2 +-
 .../card-cf-recent-apps.component.ts          |  4 +-
 ...compact-service-instance-card.component.ts |  2 +-
 .../service-broker-card.component.ts          |  8 ++--
 ...service-recent-instances-card.component.ts |  2 +-
 .../service-summary-card.component.ts         |  2 +-
 .../shared/components/components.module.ts    | 20 ++++----
 .../create-application-step1.component.ts     |  2 +-
 .../cf-app-instances-config.service.ts        |  8 +++-
 .../app-route/cf-app-routes-data-source.ts    |  2 +-
 ...app-service-binding-card.component.spec.ts | 10 ++--
 .../app-service-binding-card.component.ts     | 12 ++---
 .../app-service-binding-data-source.ts        |  2 +-
 ...app-service-binding-list-config.service.ts |  2 +-
 .../app/TableCellAppCfOrgSpaceBase.ts         |  2 +-
 .../app/card/card-app.component.spec.ts       |  6 +--
 .../list-types/app/card/card-app.component.ts |  2 +-
 .../list-types/app/cf-app-config.service.ts   |  2 +-
 .../table-cell-app-cforgspace.component.ts    |  2 +-
 .../cf-buildpack-card.component.ts            |  2 +-
 .../cf-buildpacks-list-config.service.ts      |  2 +-
 .../cf-cell-apps-list-config.service.ts       |  4 +-
 .../cf-cell-apps/cf-cell-apps-source.ts       |  4 +-
 .../cf-cell-health-list-config.service.ts     |  8 ++--
 .../cf-cells/cf-cells-list-config.service.ts  |  8 ++--
 .../cf-events/cf-events-config.service.ts     |  2 +-
 .../table-cell-event-detail.component.spec.ts |  2 +-
 .../table-cell-event-detail.component.ts      |  2 +-
 .../cf-feature-flags-data-source.ts           |  2 +-
 .../cf-feature-flags-list-config.service.ts   |  6 ++-
 ...cell-feature-flag-description.component.ts |  3 +-
 ...table-cell-feature-flag-state.component.ts |  2 +-
 .../cf-org-card/cf-org-card.component.ts      |  4 +-
 .../cf-orgs/cf-orgs-list-config.service.ts    |  2 +-
 .../cf-quotas-data-source.service.ts          | 22 +++++----
 .../cf-quotas-list-config.service.spec.ts     |  8 ++--
 .../cf-quotas-list-config.service.ts          | 24 +++++-----
 .../table-cell-quota.component.html           |  0
 .../table-cell-quota.component.scss           |  0
 .../table-cell-quota.component.spec.ts        |  4 +-
 .../table-cell-quota.component.ts             |  4 +-
 .../cf-routes/cf-routes-data-source-base.ts   |  2 +-
 .../cf-routes/cf-routes-data-source.ts        |  6 +--
 .../cf-security-groups-card.component.ts      |  2 +-
 .../cf-service-card.component.ts              |  4 +-
 .../cf-service-instances-list-config.base.ts  | 12 ++---
 .../cf-user-service-instances-list-config.ts  |  2 +-
 .../table-cell-service-active.component.ts    |  2 +-
 .../table-cell-service-bindable.component.ts  |  2 +-
 ...e-cell-service-cf-breadcrumbs.component.ts |  2 +-
 .../table-cell-service-provider.component.ts  |  2 +-
 ...table-cell-service-references.component.ts |  2 +-
 .../table-cell-service-tags.component.ts      |  2 +-
 .../cf-space-apps-list-config.service.ts      |  2 +-
 .../cf-space-quotas-data-source.service.ts    | 24 +++++-----
 ...f-space-quotas-list-config.service.spec.ts |  8 ++--
 .../cf-space-quotas-list-config.service.ts    | 22 ++++-----
 .../cf-space-routes-data-source.ts            |  6 +--
 ...s-service-instances-list-config.service.ts |  2 +-
 ...ervice-instance-apps-attached.component.ts |  2 +-
 ...le-cell-service-instance-tags.component.ts |  2 +-
 .../table-cell-service-last-op.component.html |  0
 .../table-cell-service-last-op.component.scss |  0
 ...ble-cell-service-last-op.component.spec.ts | 10 ++--
 .../table-cell-service-last-op.component.ts   |  6 +--
 .../table-cell-service.component.html         |  0
 .../table-cell-service.component.scss         |  0
 .../table-cell-service.component.spec.ts      |  8 +++-
 .../table-cell-service.component.ts           | 16 ++-----
 .../table-cell-space-name.component.ts        |  2 +-
 .../cf-space-card/cf-space-card.component.ts  |  8 ++--
 .../cf-spaces-list-config.service.ts          |  2 +-
 ...f-users-space-roles-data-source.service.ts | 12 +++--
 ...f-users-space-roles-list-config.service.ts |  2 +-
 ...able-cell-org-space-role.component.spec.ts |  8 ++--
 .../table-cell-org-space-role.component.ts    |  2 +-
 .../table-cell-select-org.component.ts        |  2 +-
 .../cf-org-permission-cell.component.ts       |  2 +-
 .../cf-space-permission-cell.component.ts     |  2 +-
 .../cf-users/cf-user-list-config.service.ts   |  2 +-
 .../detach-apps-list-config.service.ts        |  2 +-
 .../github-commits-data-source.ts             | 10 ++--
 ...hub-commits-list-config-app-tab.service.ts |  6 +--
 ...b-commits-list-config-base.service.spec.ts | 10 ++--
 ...github-commits-list-config-base.service.ts |  4 +-
 ...thub-commits-list-config-deploy.service.ts |  6 ++-
 .../table-cell-commit-author.component.html   |  0
 .../table-cell-commit-author.component.scss   |  0
 ...table-cell-commit-author.component.spec.ts |  6 ++-
 .../table-cell-commit-author.component.ts     |  4 +-
 .../service-plans-data-source.ts              |  6 +--
 .../service-plans-list-config.service.ts      |  2 +-
 ...able-cell-service-plan-extras.component.ts |  2 +-
 ...table-cell-service-plan-price.component.ts |  2 +-
 ...able-cell-service-plan-public.component.ts |  2 +-
 .../service-instance-card.component.ts        |  2 +-
 ...rovided-service-instance-card.component.ts |  2 +-
 .../select-service.component.ts               |  2 +-
 .../service-icon/service-icon.component.ts    |  2 +-
 .../service-plan-price.component.ts           |  2 +-
 .../service-plan-public.component.ts          |  4 +-
 .../cf-org-space-service.service.ts           |  2 +-
 .../shared/data-services/cf-user.service.ts   |  2 +-
 .../service-action-helper.service.ts          | 10 ++--
 .../reducers/application-route.reducer.ts     |  8 ++--
 .../current-user-cf-roles.reducer.ts          |  2 +-
 .../current-user-roles-space.reducer.ts       |  2 +-
 .../reducers/organization-quota.reducer.ts    |  2 +-
 .../reducers/organization-space.reducer.ts    | 13 ++---
 .../src/store/reducers/routes.reducer.ts      |  2 +-
 .../reducers/service-instance.reducer.ts      |  2 +-
 .../src/store/reducers/space-quota.reducer.ts | 10 ++--
 .../src/store/reducers/users.reducer.ts       |  2 +-
 .../src/store/types/route.types.ts            |  2 +-
 .../src/store/types/user.types.ts             |  2 +-
 .../core/current-user-permissions.checker.ts  |  2 +-
 .../current-user-permissions.service.spec.ts  |  2 +-
 .../table-cell/table-cell.component.ts        |  4 --
 .../service-instance-last-op.component.ts     |  2 +-
 .../services/cf-org-space-label.service.ts    |  4 +-
 ...-foundry-user-provided-services.service.ts |  2 +-
 .../application-service-helper.ts             |  6 +--
 .../entity-relations-spec-helper.ts           |  2 +-
 .../request-data-reducer.factory.spec.ts      |  2 +-
 ...endpoint-disconnect-application.reducer.ts |  2 +-
 .../application-create-e2e.spec.ts            |  2 +-
 .../application/application-e2e-helpers.ts    |  2 +-
 .../application-routes-e2e.spec.ts            |  2 +-
 .../application/application-view-e2e.spec.ts  |  2 +-
 .../applications/application-wall-e2e.spec.ts |  2 +-
 .../org-level/org-spaces-e2e.spec.ts          |  2 +-
 .../space-level/space-routes-e2e.spec.ts      |  2 +-
 src/test-e2e/helpers/cf-helpers.ts            |  6 +--
 .../marketplace/services-helper-e2e.ts        |  2 +-
 247 files changed, 589 insertions(+), 651 deletions(-)
 rename src/frontend/packages/{core/src/core => cloud-foundry/src}/cf-api-svc.types.ts (98%)
 rename src/frontend/packages/{core/src/core => cloud-foundry/src}/cf-api.types.ts (98%)
 rename src/frontend/packages/{core/src/core => cloud-foundry/src}/cf.helpers.ts (72%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/add-quota/add-quota.component.html (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/add-quota/add-quota.component.scss (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/add-quota/add-quota.component.spec.ts (75%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/add-quota/add-quota.component.ts (71%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.html (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.scss (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.spec.ts (91%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.ts (82%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/add-space-quota/add-space-quota.component.html (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/add-space-quota/add-space-quota.component.scss (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/add-space-quota/add-space-quota.component.spec.ts (86%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/add-space-quota/add-space-quota.component.ts (72%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.html (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.scss (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.spec.ts (91%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts (82%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/cf-cell.helpers.ts (83%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.html (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.scss (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts (91%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts (76%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/edit-quota/edit-quota.component.html (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/edit-quota/edit-quota.component.scss (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/edit-quota/edit-quota.component.spec.ts (86%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/edit-quota/edit-quota.component.ts (75%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.html (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.scss (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts (91%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts (82%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.html (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.scss (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.spec.ts (86%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.ts (77%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.html (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.scss (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts (86%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.html (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.scss (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts (87%)
 rename src/frontend/packages/{core/src/features/cloud-foundry/tabs/cloud-foundry-organizations => cloud-foundry/src/features/cloud-foundry/tabs}/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.html (100%)
 rename src/frontend/packages/{core/src/features/cloud-foundry/tabs/cloud-foundry-organizations => cloud-foundry/src/features/cloud-foundry/tabs}/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.scss (100%)
 rename src/frontend/packages/{core/src/features/cloud-foundry/tabs/cloud-foundry-organizations => cloud-foundry/src/features/cloud-foundry/tabs}/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts (71%)
 rename src/frontend/packages/{core/src/features/cloud-foundry/tabs/cloud-foundry-organizations => cloud-foundry/src/features/cloud-foundry/tabs}/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.ts (58%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.html (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.scss (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.spec.ts (89%)
 rename src/frontend/packages/{core => cloud-foundry}/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.ts (66%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/cf-quotas/cf-quotas-data-source.service.ts (69%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.spec.ts (71%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.ts (82%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.html (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.scss (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.spec.ts (95%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.ts (76%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-data-source.service.ts (66%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.spec.ts (72%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.ts (79%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.html (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.scss (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.spec.ts (78%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.ts (79%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.html (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.scss (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.spec.ts (85%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.ts (85%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/github-commits/github-commits-data-source.ts (86%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/github-commits/github-commits-list-config-app-tab.service.ts (95%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.spec.ts (68%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.ts (92%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/github-commits/github-commits-list-config-deploy.service.ts (89%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.html (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.scss (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.spec.ts (78%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.ts (64%)

diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
index fe10d93c33..5488618732 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
@@ -1,11 +1,8 @@
+import { IOrganization } from '../../../cloud-foundry/src/cf-api.types';
 import { cfEntityFactory } from '../../../cloud-foundry/src/cf-entity-factory';
 import { metricEntityType } from '../../../cloud-foundry/src/cf-entity-types';
 import { IOrgFavMetadata } from '../../../cloud-foundry/src/cf-metadata-types';
-import { IOrganization } from '../../../core/src/core/cf-api.types';
-import {
-  StratosBaseCatalogEntity,
-  StratosCatalogEntity,
-} from '../../../store/src/entity-catalog/entity-catalog-entity';
+import { StratosBaseCatalogEntity, StratosCatalogEntity } from '../../../store/src/entity-catalog/entity-catalog-entity';
 import { IStratosEndpointDefinition } from '../../../store/src/entity-catalog/entity-catalog.types';
 import { APIResource } from '../../../store/src/types/api.types';
 import { IFavoriteMetadata } from '../../../store/src/types/user-favorites.types';
diff --git a/src/frontend/packages/cloud-foundry/src/actions/application.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/application.actions.ts
index a7574dedc8..cfcc8e2679 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/application.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/application.actions.ts
@@ -1,10 +1,10 @@
 import { HttpHeaders, HttpParams, HttpRequest } from '@angular/common/http';
 
-import { IApp } from '../../../core/src/core/cf-api.types';
 import { pick } from '../../../store/src/helpers/reducer.helper';
 import { ActionMergeFunction } from '../../../store/src/types/api.types';
 import { PaginatedAction, PaginationParam } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
+import { IApp } from '../cf-api.types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import { applicationEntityType, appStatsEntityType } from '../cf-entity-types';
 import { CF_ENDPOINT_TYPE } from '../cf-types';
diff --git a/src/frontend/packages/cloud-foundry/src/actions/organization.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/organization.actions.ts
index ad7d9b7fa1..ff01a09be0 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/organization.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/organization.actions.ts
@@ -1,9 +1,9 @@
 import { HttpParams, HttpRequest } from '@angular/common/http';
 
-import { IUpdateOrganization } from '../../../core/src/core/cf-api.types';
 import { getActions } from '../../../store/src/actions/action.helper';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
+import { IUpdateOrganization } from '../cf-api.types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import {
   cfUserEntityType,
diff --git a/src/frontend/packages/cloud-foundry/src/actions/quota-definitions.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/quota-definitions.actions.ts
index 7c5678b1c2..e06451854c 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/quota-definitions.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/quota-definitions.actions.ts
@@ -1,15 +1,14 @@
-import { IQuotaDefinition } from '../../../core/src/core/cf-api.types';
-import {
-  QuotaFormValues,
-} from '../../../core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component';
+import { HttpParams, HttpRequest } from '@angular/common/http';
+
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
-import { CFEntityConfig } from '../cf-types';
+import { IQuotaDefinition } from '../cf-api.types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import { organizationEntityType, quotaDefinitionEntityType, spaceQuotaEntityType } from '../cf-entity-types';
+import { CFEntityConfig } from '../cf-types';
 import { EntityInlineChildAction, EntityInlineParentAction } from '../entity-relations/entity-relations.types';
+import { QuotaFormValues } from '../features/cloud-foundry/quota-definition-form/quota-definition-form.component';
 import { CFStartAction } from './cf-action.types';
-import { HttpRequest, HttpParams } from '@angular/common/http';
 
 export const GET_QUOTA_DEFINITION = '[QuotaDefinition] Get one';
 export const GET_QUOTA_DEFINITION_SUCCESS = '[QuotaDefinition] Get one success';
diff --git a/src/frontend/packages/cloud-foundry/src/actions/space.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/space.actions.ts
index 87ee30f019..59eb1a2ce6 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/space.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/space.actions.ts
@@ -1,9 +1,9 @@
 import { HttpParams, HttpRequest } from '@angular/common/http';
 
-import { IUpdateSpace } from '../../../core/src/core/cf-api.types';
 import { getActions } from '../../../store/src/actions/action.helper';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { ICFAction } from '../../../store/src/types/request.types';
+import { IUpdateSpace } from '../cf-api.types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import {
   applicationEntityType,
diff --git a/src/frontend/packages/core/src/core/cf-api-svc.types.ts b/src/frontend/packages/cloud-foundry/src/cf-api-svc.types.ts
similarity index 98%
rename from src/frontend/packages/core/src/core/cf-api-svc.types.ts
rename to src/frontend/packages/cloud-foundry/src/cf-api-svc.types.ts
index d841890001..d96017aab4 100644
--- a/src/frontend/packages/core/src/core/cf-api-svc.types.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-api-svc.types.ts
@@ -1,4 +1,4 @@
-import { APIResource } from '../../../store/src/types/api.types';
+import { APIResource } from '../../store/src/types/api.types';
 import { IApp, IOrganization, IRoute, ISpace } from './cf-api.types';
 
 export interface ILastOperation {
diff --git a/src/frontend/packages/core/src/core/cf-api.types.ts b/src/frontend/packages/cloud-foundry/src/cf-api.types.ts
similarity index 98%
rename from src/frontend/packages/core/src/core/cf-api.types.ts
rename to src/frontend/packages/cloud-foundry/src/cf-api.types.ts
index 9442951898..f347bfe82d 100644
--- a/src/frontend/packages/core/src/core/cf-api.types.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-api.types.ts
@@ -1,6 +1,6 @@
-import { CfUser } from '../../../cloud-foundry/src/store/types/user.types';
-import { APIResource } from '../../../store/src/types/api.types';
+import { APIResource } from '../../store/src/types/api.types';
 import { IService, IServiceBinding } from './cf-api-svc.types';
+import { CfUser } from './store/types/user.types';
 
 export interface StratosCFEntity {
   cfGuid: string;
diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
index 8bd4634a96..f273aa91e7 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -3,30 +3,6 @@ import * as moment from 'moment';
 import { combineLatest, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import {
-  IService,
-  IServiceBinding,
-  IServiceBroker,
-  IServiceInstance,
-  IServicePlan,
-  IUserProvidedServiceInstance,
-} from '../../core/src/core/cf-api-svc.types';
-import {
-  IApp,
-  IAppSummary,
-  IBuildpack,
-  ICfV2Info,
-  IDomain,
-  IFeatureFlag,
-  IOrganization,
-  IOrgQuotaDefinition,
-  IPrivateDomain,
-  IRoute,
-  ISecurityGroup,
-  ISpace,
-  ISpaceQuotaDefinition,
-  IStack,
-} from '../../core/src/core/cf-api.types';
 import { urlValidationExpression } from '../../core/src/core/utils.service';
 import { BaseEndpointAuth } from '../../core/src/features/endpoints/endpoint-auth';
 import { AppState } from '../../store/src/app-state';
@@ -50,6 +26,30 @@ import { endpointDisconnectRemoveEntitiesReducer } from '../../store/src/reducer
 import { APIResource } from '../../store/src/types/api.types';
 import { PaginatedAction } from '../../store/src/types/pagination.types';
 import { IFavoriteMetadata } from '../../store/src/types/user-favorites.types';
+import {
+  IService,
+  IServiceBinding,
+  IServiceBroker,
+  IServiceInstance,
+  IServicePlan,
+  IUserProvidedServiceInstance,
+} from './cf-api-svc.types';
+import {
+  IApp,
+  IAppSummary,
+  IBuildpack,
+  ICfV2Info,
+  IDomain,
+  IFeatureFlag,
+  IOrganization,
+  IOrgQuotaDefinition,
+  IPrivateDomain,
+  IRoute,
+  ISecurityGroup,
+  ISpace,
+  ISpaceQuotaDefinition,
+  IStack,
+} from './cf-api.types';
 import { cfEntityFactory } from './cf-entity-factory';
 import { addCfQParams, addCfRelationParams } from './cf-entity-relations.getters';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-types.ts b/src/frontend/packages/cloud-foundry/src/cf-entity-types.ts
index d6dafde146..a058e5a008 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-types.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-types.ts
@@ -1,3 +1,6 @@
+import { IRequestEntityTypeState } from '../../store/src/app-state';
+import { APIResource } from '../../store/src/types/api.types';
+import { BaseEntityValues } from '../../store/src/types/entity.types';
 import {
   IService,
   IServiceBinding,
@@ -6,7 +9,7 @@ import {
   IServicePlan,
   IServicePlanVisibility,
   IUserProvidedServiceInstance,
-} from '../../core/src/core/cf-api-svc.types';
+} from './cf-api-svc.types';
 import {
   IApp,
   IAppSummary,
@@ -20,10 +23,7 @@ import {
   ISpace,
   ISpaceQuotaDefinition,
   IStack,
-} from '../../core/src/core/cf-api.types';
-import { IRequestEntityTypeState } from '../../store/src/app-state';
-import { APIResource } from '../../store/src/types/api.types';
-import { BaseEntityValues } from '../../store/src/types/entity.types';
+} from './cf-api.types';
 import { AppStats } from './store/types/app-metadata.types';
 import { GitBranch, GitCommit, GitRepo } from './store/types/git.types';
 import { CfUser } from './store/types/user.types';
diff --git a/src/frontend/packages/core/src/core/cf.helpers.ts b/src/frontend/packages/cloud-foundry/src/cf.helpers.ts
similarity index 72%
rename from src/frontend/packages/core/src/core/cf.helpers.ts
rename to src/frontend/packages/cloud-foundry/src/cf.helpers.ts
index 64b0471ecb..ca70a62c1c 100644
--- a/src/frontend/packages/core/src/core/cf.helpers.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf.helpers.ts
@@ -1,8 +1,6 @@
-import { CfApplicationState } from '../../../cloud-foundry/src/store/types/application.types';
-import { APIResource } from '../../../store/src/types/api.types';
+import { APIResource } from '../../store/src/types/api.types';
 import { IApp } from './cf-api.types';
-
-// TODO: Move contents to cf cf.helpers.ts #3769
+import { CfApplicationState } from './store/types/application.types';
 
 export function getStartedAppInstanceCount(apps: APIResource<IApp>[]): number {
   if (!apps || !apps.length) {
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/application.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/application.action-builders.ts
index 7cd8457d40..992dd00e9d 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/application.action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/application.action-builders.ts
@@ -1,4 +1,3 @@
-import { IApp } from '../../../core/src/core/cf-api.types';
 import { AppMetadataTypes } from '../actions/app-metadata.actions';
 import { AssignRouteToApplication } from '../actions/application-service-routes.actions';
 import {
@@ -11,6 +10,7 @@ import {
   UpdateExistingApplication,
 } from '../actions/application.actions';
 import { GetAllAppsInSpace } from '../actions/space.actions';
+import { IApp } from '../cf-api.types';
 import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
 import { CFOrchestratedActionBuilders } from './cf.action-builder.types';
 
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/organization.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/organization.action-builders.ts
index ed7b3c364f..5b923e73c9 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/organization.action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/organization.action-builders.ts
@@ -1,10 +1,10 @@
-import { IUpdateOrganization } from '../../../core/src/core/cf-api.types';
 import {
   DeleteOrganization,
   GetAllOrganizations,
   GetOrganization,
   UpdateOrganization,
 } from '../actions/organization.actions';
+import { IUpdateOrganization } from '../cf-api.types';
 import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
 import { CFOrchestratedActionBuilders } from './cf.action-builder.types';
 
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/quota-definition.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/quota-definition.action-builders.ts
index 20f6360368..ebd32f838b 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/quota-definition.action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/quota-definition.action-builders.ts
@@ -1,7 +1,4 @@
 import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
-import {
-  QuotaFormValues,
-} from '../../../core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component';
 import {
   CreateQuotaDefinition,
   GetOrganizationSpaceQuotaDefinitions,
@@ -9,6 +6,7 @@ import {
   UpdateQuotaDefinition,
 } from '../actions/quota-definitions.actions';
 import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
+import { QuotaFormValues } from '../features/cloud-foundry/quota-definition-form/quota-definition-form.component';
 
 export interface QuotaDefinitionActionBuilder extends OrchestratedActionBuilders {
   create: (
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/space-quota.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/space-quota.action-builders.ts
index 8566696b38..3459f2a7ae 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/space-quota.action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/space-quota.action-builders.ts
@@ -1,7 +1,4 @@
 import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
-import {
-  QuotaFormValues,
-} from '../../../core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component';
 import {
   AssociateSpaceQuota,
   CreateSpaceQuotaDefinition,
@@ -9,6 +6,7 @@ import {
   GetOrganizationSpaceQuotaDefinitions,
   UpdateSpaceQuotaDefinition,
 } from '../actions/quota-definitions.actions';
+import { QuotaFormValues } from '../features/cloud-foundry/quota-definition-form/quota-definition-form.component';
 
 export interface SpaceQuotaDefinitionActionBuilders extends OrchestratedActionBuilders {
   create: (
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/space.action-builders.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/space.action-builders.ts
index 6439af8730..5b72e1a9a8 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/space.action-builders.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/space.action-builders.ts
@@ -1,7 +1,7 @@
-import { IUpdateSpace } from '../../../core/src/core/cf-api.types';
 import { OrchestratedActionBuilders } from '../../../store/src/entity-catalog/action-orchestrator/action-orchestrator';
 import { GetAllOrganizationSpaces } from '../actions/organization.actions';
 import { CreateSpace, DeleteSpace, GetAllSpaces, GetSpace, UpdateSpace } from '../actions/space.actions';
+import { IUpdateSpace } from '../cf-api.types';
 import { CFBasePipelineRequestActionMeta } from '../cf-entity-generator';
 
 export interface SpaceActionBuilders extends OrchestratedActionBuilders {
diff --git a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-from-parent.spec.ts b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-from-parent.spec.ts
index 7ddbb0378b..675fee0208 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-from-parent.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-from-parent.spec.ts
@@ -1,30 +1,23 @@
 import { inject, TestBed } from '@angular/core/testing';
 import { Store } from '@ngrx/store';
+import { createBasicStoreModule, createEntityStoreState, TestStoreEntity } from '@stratos/store/testing';
 import { first } from 'rxjs/operators';
 
-import { ISpace } from '../../../core/src/core/cf-api.types';
-import {
-  EntityCatalogTestModuleManualStore,
-  TEST_CATALOGUE_ENTITIES,
-} from '../../../store/src/entity-catalog-test.module';
-import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
-import {
-  createBasicStoreModule,
-  createEntityStoreState,
-  TestStoreEntity,
-} from '@stratos/store/testing';
 import { RequestTypes } from '../../../store/src/actions/request.actions';
 import { AppState } from '../../../store/src/app-state';
+import { EntityCatalogTestModuleManualStore, TEST_CATALOGUE_ENTITIES } from '../../../store/src/entity-catalog-test.module';
+import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog.service';
+import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
 import { EntityRelationSpecHelper } from '../../../store/src/helpers/entity-relations/entity-relations-spec-helper';
 import { APIResource } from '../../../store/src/types/api.types';
 import { WrapperRequestActionSuccess } from '../../../store/src/types/request.types';
-import { CF_ENDPOINT_TYPE } from '../cf-types';
 import { GetAllOrganizationSpaces } from '../actions/organization.actions';
+import { ISpace } from '../cf-api.types';
 import { CFAppState } from '../cf-app-state';
 import { cfEntityFactory } from '../cf-entity-factory';
 import { generateCFEntities } from '../cf-entity-generator';
 import { organizationEntityType, spaceEntityType } from '../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../cf-types';
 import { populatePaginationFromParent } from './entity-relations';
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.spec.ts b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.spec.ts
index a254787c11..e71a02254b 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.spec.ts
@@ -1,5 +1,5 @@
-import { IOrganization, IOrgQuotaDefinition, ISpace } from '../../../core/src/core/cf-api.types';
 import { APIResource } from '../../../store/src/types/api.types';
+import { IOrganization, IOrgQuotaDefinition, ISpace } from '../cf-api.types';
 
 export const entityRelationMissingSpacesUrl = 'spaces_url';
 export const entityRelationMissingQuotaGuid = 'quota_guid';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/application-delete.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/application-delete.component.ts
index 41846a8b01..a01ce5a91e 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/application-delete.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/application-delete.component.ts
@@ -11,8 +11,6 @@ import {
   serviceInstancesEntityType,
   userProvidedServiceInstanceEntityType,
 } from '../../../../../cloud-foundry/src/cf-entity-types';
-import { IServiceBinding } from '../../../../../core/src/core/cf-api-svc.types';
-import { IApp, IRoute } from '../../../../../core/src/core/cf-api.types';
 import {
   AppMonitorComponentTypes,
 } from '../../../../../core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component';
@@ -26,6 +24,8 @@ import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-m
 import { PaginationMonitor } from '../../../../../store/src/monitors/pagination-monitor';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { IServiceBinding } from '../../../cf-api-svc.types';
+import { IApp, IRoute } from '../../../cf-api.types';
 import { CF_ENDPOINT_TYPE } from '../../../cf-types';
 import { RoutesActionBuilders } from '../../../entity-action-builders/routes.action-builder';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/app-delete-instances-routes-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/app-delete-instances-routes-list-config.service.ts
index 60bb59f73e..c593542c2a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/app-delete-instances-routes-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/app-delete-instances-routes-list-config.service.ts
@@ -10,7 +10,6 @@ import { serviceBindingEntityType, serviceEntityType } from '../../../../../../c
 import {
   createEntityRelationPaginationKey,
 } from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { IServiceBinding } from '../../../../../../core/src/core/cf-api-svc.types';
 import { CurrentUserPermissionsService } from '../../../../../../core/src/core/current-user-permissions.service';
 import { RowState } from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
 import { ListViewTypes } from '../../../../../../core/src/shared/components/list/list.component.types';
@@ -19,6 +18,7 @@ import { IEntityMetadata } from '../../../../../../store/src/entity-catalog/enti
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../../../store/src/types/api.types';
+import { IServiceBinding } from '../../../../cf-api-svc.types';
 import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 import { ServiceBindingActionBuilders } from '../../../../entity-action-builders/service-binding.action-builders';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.ts
index 04e6dd37d4..0d2fa3e95e 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.ts
@@ -1,9 +1,9 @@
 import { Component, EventEmitter, OnDestroy, Output } from '@angular/core';
 import { Subscription } from 'rxjs';
 
-import { IServiceInstance } from '../../../../../../core/src/core/cf-api-svc.types';
 import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../store/src/types/api.types';
+import { IServiceInstance } from '../../../../cf-api-svc.types';
 import { AppDeleteServiceInstancesListConfigService } from './app-delete-instances-routes-list-config.service';
 
 @Component({
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-routes/app-delete-routes-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-routes/app-delete-routes-list-config.service.ts
index fae78a0995..e99d7c41c8 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-routes/app-delete-routes-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-routes/app-delete-routes-list-config.service.ts
@@ -4,12 +4,12 @@ import { Store } from '@ngrx/store';
 import { Observable, of as observableOf } from 'rxjs';
 
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
-import { IRoute } from '../../../../../../core/src/core/cf-api.types';
 import { CurrentUserPermissionsService } from '../../../../../../core/src/core/current-user-permissions.service';
 import { ConfirmationDialogService } from '../../../../../../core/src/shared/components/confirmation-dialog.service';
 import { RowState } from '../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
 import { IListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../store/src/types/api.types';
+import { IRoute } from '../../../../cf-api.types';
 import {
   CfAppRoutesListConfigServiceBase,
 } from '../../../../shared/components/list/list-types/app-route/cf-app-routes-list-config-base';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-routes/delete-app-routes.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-routes/delete-app-routes.component.ts
index d11933f61c..f53b60cacd 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-routes/delete-app-routes.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-routes/delete-app-routes.component.ts
@@ -1,9 +1,9 @@
 import { Component, EventEmitter, OnDestroy, Output } from '@angular/core';
 import { Subscription } from 'rxjs';
 
-import { IServiceBinding } from '../../../../../../core/src/core/cf-api-svc.types';
 import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../store/src/types/api.types';
+import { IServiceBinding } from '../../../../cf-api-svc.types';
 import { AppDeleteRoutesListConfigService } from './app-delete-routes-list-config.service';
 
 @Component({
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts
index 61bf728b50..060b26ba9a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts
@@ -24,7 +24,6 @@ import {
   spaceWithOrgEntityType,
   stackEntityType,
 } from '../../../../cloud-foundry/src/cf-entity-types';
-import { IApp, IAppSummary, IDomain, IOrganization, ISpace } from '../../../../core/src/core/cf-api.types';
 import {
   ApplicationStateData,
   ApplicationStateService,
@@ -46,6 +45,7 @@ import { selectUpdateInfo } from '../../../../store/src/selectors/api.selectors'
 import { endpointEntitiesSelector } from '../../../../store/src/selectors/endpoint.selectors';
 import { APIResource, EntityInfo } from '../../../../store/src/types/api.types';
 import { PaginatedAction, PaginationEntityState } from '../../../../store/src/types/pagination.types';
+import { IApp, IAppSummary, IDomain, IOrganization, ISpace } from '../../cf-api.types';
 import { cfEntityFactory } from '../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE, CFEntityConfig } from '../../cf-types';
 import { createEntityRelationKey } from '../../entity-relations/entity-relations.types';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-polling.service.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-polling.service.ts
index 3796e52a22..e9a0608553 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-polling.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-polling.service.ts
@@ -3,16 +3,16 @@ import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 import { first, map, tap } from 'rxjs/operators';
 
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 import { appStatsEntityType, appSummaryEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
-import { IApp } from '../../../../../../core/src/core/cf-api.types';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityService } from '../../../../../../store/src/entity-service';
 import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
 import { ENTITY_SERVICE } from '../../../../../../core/src/shared/entity.tokens';
 import { AppState } from '../../../../../../store/src/app-state';
+import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { EntityService } from '../../../../../../store/src/entity-service';
 import { selectDashboardState } from '../../../../../../store/src/selectors/dashboard.selectors';
 import { APIResource } from '../../../../../../store/src/types/api.types';
+import { IApp } from '../../../../cf-api.types';
+import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 import { ApplicationService } from '../../application.service';
 
 @Injectable()
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts
index c0b9a3e987..57d7db82c1 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts
@@ -6,7 +6,6 @@ import { filter, first, map, startWith, switchMap, withLatestFrom } from 'rxjs/o
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
 import { applicationEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
 import { IAppFavMetadata } from '../../../../../../cloud-foundry/src/cf-metadata-types';
-import { IApp, IOrganization, ISpace } from '../../../../../../core/src/core/cf-api.types';
 import { CurrentUserPermissions } from '../../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../../core/src/core/current-user-permissions.service';
 import { EndpointsService } from '../../../../../../core/src/core/endpoints.service';
@@ -38,6 +37,7 @@ import { endpointEntitiesSelector } from '../../../../../../store/src/selectors/
 import { APIResource } from '../../../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../../../store/src/types/endpoint.types';
 import { UpdateExistingApplication } from '../../../../actions/application.actions';
+import { IApp, IOrganization, ISpace } from '../../../../cf-api.types';
 import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 import { ApplicationService } from '../../application.service';
 import { ApplicationPollingService } from './application-polling.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts
index dce77b69da..9ca4d20b23 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts
@@ -8,7 +8,6 @@ import { AppMetadataTypes, GetAppStatsAction } from '../../../../../../../../clo
 import { UpdateExistingApplication } from '../../../../../../../../cloud-foundry/src/actions/application.actions';
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
 import { applicationEntityType, appStatsEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types';
-import { IAppSummary } from '../../../../../../../../core/src/core/cf-api.types';
 import { CurrentUserPermissions } from '../../../../../../../../core/src/core/current-user-permissions.config';
 import { getFullEndpointApiUrl } from '../../../../../../../../core/src/features/endpoints/endpoint-helpers';
 import { ConfirmationDialogConfig } from '../../../../../../../../core/src/shared/components/confirmation-dialog.config';
@@ -20,6 +19,7 @@ import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/
 import { EntityService } from '../../../../../../../../store/src/entity-service';
 import { ActionState } from '../../../../../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource, EntityInfo } from '../../../../../../../../store/src/types/api.types';
+import { IAppSummary } from '../../../../../../cf-api.types';
 import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
 import { ApplicationMonitorService } from '../../../../application-monitor.service';
 import { ApplicationData, ApplicationService } from '../../../../application.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.ts
index 32506fe4f9..5fe4a0365e 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.ts
@@ -6,9 +6,6 @@ import { Observable, of as observableOf, Subscription } from 'rxjs';
 import { distinctUntilChanged, filter, map, take, tap } from 'rxjs/operators';
 
 import { GitCommit, GitRepo } from '../../../../../../../../cloud-foundry/src/store/types/git.types';
-import {
-  GithubCommitsListConfigServiceAppTab,
-} from '../../../../../../../../core/src/shared/components/list/list-types/github-commits/github-commits-list-config-app-tab.service';
 import { ListConfig } from '../../../../../../../../core/src/shared/components/list/list.component.types';
 import { GitSCMService, GitSCMType } from '../../../../../../../../core/src/shared/data-services/scm/scm.service';
 import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog.service';
@@ -19,6 +16,9 @@ import { CFAppState } from '../../../../../../cf-app-state';
 import { gitBranchesEntityType, gitCommitEntityType, gitRepoEntityType } from '../../../../../../cf-entity-types';
 import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
 import { GitMeta } from '../../../../../../entity-action-builders/git-action-builder';
+import {
+  GithubCommitsListConfigServiceAppTab,
+} from '../../../../../../shared/components/list/list-types/github-commits/github-commits-list-config-app-tab.service';
 import { GitBranch } from '../../../../../../store/types/github.types';
 import { ApplicationService } from '../../../../application.service';
 import { EnvVarStratosProject } from '../build-tab/application-env-vars.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step3/create-application-step3.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step3/create-application-step3.component.ts
index 83e6e1575b..caee7c149d 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step3/create-application-step3.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step3/create-application-step3.component.ts
@@ -16,13 +16,13 @@ import {
 import { selectNewAppState } from '../../../../../../cloud-foundry/src/store/effects/create-app-effects';
 import { selectCfRequestInfo } from '../../../../../../cloud-foundry/src/store/selectors/api.selectors';
 import { CreateNewApplicationState } from '../../../../../../cloud-foundry/src/store/types/create-application.types';
-import { IDomain } from '../../../../../../core/src/core/cf-api.types';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
+import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
 import { getDefaultRequestState, RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource } from '../../../../../../store/src/types/api.types';
+import { IDomain } from '../../../../cf-api.types';
 import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 import { createEntityRelationKey } from '../../../../entity-relations/entity-relations.types';
 import { createGetApplicationAction } from '../../application.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-options-step/deploy-application-options-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-options-step/deploy-application-options-step.component.ts
index 884071a5cf..c54944e4e6 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-options-step/deploy-application-options-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-options-step/deploy-application-options-step.component.ts
@@ -16,12 +16,12 @@ import {
   selectSourceType,
 } from '../../../../../../cloud-foundry/src/store/selectors/deploy-application.selector';
 import { OverrideAppDetails, SourceType } from '../../../../../../cloud-foundry/src/store/types/deploy-application.types';
-import { IDomain } from '../../../../../../core/src/core/cf-api.types';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../../../store/src/types/api.types';
+import { IDomain } from '../../../../cf-api.types';
 import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 import {
   ApplicationEnvVarsHelper,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2-1/commit-list-wrapper/commit-list-wrapper.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2-1/commit-list-wrapper/commit-list-wrapper.component.ts
index fec6ae441c..7ab8a997ce 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2-1/commit-list-wrapper/commit-list-wrapper.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2-1/commit-list-wrapper/commit-list-wrapper.component.ts
@@ -6,11 +6,11 @@ import { filter, map, mergeMap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { GitCommit } from '../../../../../../../cloud-foundry/src/store/types/git.types';
-import {
-  GithubCommitsListConfigServiceDeploy,
-} from '../../../../../../../core/src/shared/components/list/list-types/github-commits/github-commits-list-config-deploy.service';
 import { ListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { GitSCMService } from '../../../../../../../core/src/shared/data-services/scm/scm.service';
+import {
+  GithubCommitsListConfigServiceDeploy,
+} from '../../../../../shared/components/list/list-types/github-commits/github-commits-list-config-deploy.service';
 
 @Component({
   selector: 'app-commit-list-wrapper',
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-steps.types.ts b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-steps.types.ts
index d991638e17..175e5328b8 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-steps.types.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-steps.types.ts
@@ -5,12 +5,12 @@ import { Observable, of } from 'rxjs';
 import { filter, first, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
 import { SourceType } from '../../../../../cloud-foundry/src/store/types/deploy-application.types';
-import { IFeatureFlag } from '../../../../../core/src/core/cf-api.types';
 import { PermissionConfig, PermissionTypes } from '../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../core/src/core/current-user-permissions.service';
 import { CFFeatureFlagTypes } from '../../../../../core/src/shared/components/cf-auth/cf-auth.types';
 import { PaginationMonitor } from '../../../../../store/src/monitors/pagination-monitor';
 import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+import { IFeatureFlag } from '../../../cf-api.types';
 import { CFAppState } from '../../../cf-app-state';
 import {
   createCfFeatureFlagFetchAction,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.ts
index 8c5e71e8bf..bd8de38099 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.ts
@@ -14,17 +14,17 @@ import {
 import { createEntityRelationKey } from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { selectCfRequestInfo } from '../../../../../../cloud-foundry/src/store/selectors/api.selectors';
 import { Route, RouteMode } from '../../../../../../cloud-foundry/src/store/types/route.types';
-import { IDomain, ISpace } from '../../../../../../core/src/core/cf-api.types';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
 import { pathGet } from '../../../../../../core/src/core/utils.service';
 import {
   StepOnNextFunction,
   StepOnNextResult,
 } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
+import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
 import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource } from '../../../../../../store/src/types/api.types';
+import { IDomain, ISpace } from '../../../../cf-api.types';
 import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 import { ApplicationService } from '../../application.service';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/ssh-application/ssh-application.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/ssh-application/ssh-application.component.ts
index c48c1f029c..6aa0845227 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/ssh-application/ssh-application.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/ssh-application/ssh-application.component.ts
@@ -1,14 +1,14 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
-import { NEVER, Observable, Subject, Subscription } from 'rxjs';
+import { NEVER, Observable, Subject } from 'rxjs';
 import websocketConnect, { normalClosureMessage } from 'rxjs-websockets';
 import { catchError, first, map, switchMap, tap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
-import { IApp } from '../../../../../core/src/core/cf-api.types';
 import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
 import { SshViewerComponent } from '../../../../../core/src/shared/components/ssh-viewer/ssh-viewer.component';
+import { IApp } from '../../../cf-api.types';
 import { ApplicationService } from '../application.service';
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-edit-space-step-base.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-edit-space-step-base.ts
index 8074e720e7..c173dbb8e2 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-edit-space-step-base.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-edit-space-step-base.ts
@@ -11,7 +11,6 @@ import {
   spaceQuotaEntityType,
 } from '../../../../cloud-foundry/src/cf-entity-types';
 import { createEntityRelationPaginationKey } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { ISpaceQuotaDefinition } from '../../../../core/src/core/cf-api.types';
 import { StepOnNextResult } from '../../../../core/src/shared/components/stepper/step/step.component';
 import { getPaginationKey } from '../../../../store/src/actions/pagination.actions';
 import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
@@ -20,6 +19,7 @@ import { PaginationMonitorFactory } from '../../../../store/src/monitors/paginat
 import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../store/src/types/pagination.types';
+import { ISpaceQuotaDefinition } from '../../cf-api.types';
 import { cfEntityFactory } from '../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE, CFEntityConfig } from '../../cf-types';
 import { SpaceQuotaDefinitionActionBuilders } from '../../entity-action-builders/space-quota.action-builders';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts
index 02408e0b7d..06d29c0696 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-organization/create-organization-step/create-organization-step.component.ts
@@ -12,7 +12,6 @@ import {
   createEntityRelationPaginationKey,
 } from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { selectCfRequestInfo } from '../../../../../../cloud-foundry/src/store/selectors/api.selectors';
-import { IOrganization, IOrgQuotaDefinition } from '../../../../../../core/src/core/cf-api.types';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { IEntityMetadata } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
@@ -20,6 +19,7 @@ import { endpointSchemaKey } from '../../../../../../store/src/helpers/entity-fa
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../../../store/src/types/api.types';
+import { IOrganization, IOrgQuotaDefinition } from '../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 import { QuotaDefinitionActionBuilder } from '../../../../entity-action-builders/quota-definition.action-builders';
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/add-quota/add-quota.component.html b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.html
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/add-quota/add-quota.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.html
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/add-quota/add-quota.component.scss b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.scss
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/add-quota/add-quota.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.scss
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/add-quota/add-quota.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.spec.ts
similarity index 75%
rename from src/frontend/packages/core/src/features/cloud-foundry/add-quota/add-quota.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.spec.ts
index 9e9c9c488a..80bc70ebd1 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/add-quota/add-quota.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.spec.ts
@@ -1,12 +1,8 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import {
-  LongRunningCfOperationsService,
-} from '../../../../../cloud-foundry/src/shared/data-services/long-running-cf-op.service';
-import {
-  generateCfBaseTestModules,
-} from '../../../../../cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper';
-import { TabNavService } from '../../../../tab-nav.service';
+import { TabNavService } from '../../../../../core/tab-nav.service';
+import { generateCfBaseTestModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { LongRunningCfOperationsService } from '../../../shared/data-services/long-running-cf-op.service';
 import { QuotaDefinitionFormComponent } from '../quota-definition-form/quota-definition-form.component';
 import { AddQuotaComponent } from './add-quota.component';
 import { CreateQuotaStepComponent } from './create-quota-step/create-quota-step.component';
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/add-quota/add-quota.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.ts
similarity index 71%
rename from src/frontend/packages/core/src/features/cloud-foundry/add-quota/add-quota.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.ts
index cce80f142c..29625aad97 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/add-quota/add-quota.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 
-import { ActiveRouteCfOrgSpace } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
-import { getActiveRouteCfOrgSpaceProvider } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
+import { ActiveRouteCfOrgSpace } from '../cf-page.types';
+import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers';
 
 // TODO: Move CF code to CF Module #3769. There's a few quota related components to move
 
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.html b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.html
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.html
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.scss b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.scss
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.scss
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.spec.ts
similarity index 91%
rename from src/frontend/packages/core/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.spec.ts
index 865d586e5b..8491748aef 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.spec.ts
@@ -1,9 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
+import { CFBaseTestModules } from '../../../../../test-framework/cf-test-helper';
 import { QuotaDefinitionFormComponent } from '../../quota-definition-form/quota-definition-form.component';
 import { CreateQuotaStepComponent } from './create-quota-step.component';
-import { CFBaseTestModules } from '../../../../../../cloud-foundry/test-framework/cf-test-helper';
 
 describe('CreateQuotaStepComponent', () => {
   let component: CreateQuotaStepComponent;
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.ts
similarity index 82%
rename from src/frontend/packages/core/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.ts
index 64d39dd41e..f2b744d91b 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component.ts
@@ -5,16 +5,14 @@ import { Store } from '@ngrx/store';
 import { Subscription } from 'rxjs';
 import { filter, map, pairwise } from 'rxjs/operators';
 
-import { CF_ENDPOINT_TYPE } from '../../../../../../cloud-foundry/src/cf-types';
-import {
-  QuotaDefinitionActionBuilder,
-} from '../../../../../../cloud-foundry/src/entity-action-builders/quota-definition.action-builders';
+import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { AppState } from '../../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { IEntityMetadata } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
-import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component';
+import { quotaDefinitionEntityType } from '../../../../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
+import { QuotaDefinitionActionBuilder } from '../../../../entity-action-builders/quota-definition.action-builders';
 import { QuotaDefinitionFormComponent } from '../../quota-definition-form/quota-definition-form.component';
-import { quotaDefinitionEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
 
 
 @Component({
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/add-space-quota.component.html b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.html
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/add-space-quota.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.html
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/add-space-quota.component.scss b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.scss
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/add-space-quota.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.scss
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/add-space-quota.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.spec.ts
similarity index 86%
rename from src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/add-space-quota.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.spec.ts
index b06d57ce24..a9f62d776d 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/add-space-quota.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../tab-nav.service';
+import { TabNavService } from '../../../../../core/tab-nav.service';
+import { CFBaseTestModules } from '../../../../test-framework/cf-test-helper';
 import { SpaceQuotaDefinitionFormComponent } from '../space-quota-definition-form/space-quota-definition-form.component';
 import { AddSpaceQuotaComponent } from './add-space-quota.component';
 import { CreateSpaceQuotaStepComponent } from './create-space-quota-step/create-space-quota-step.component';
-import { CFBaseTestModules } from '../../../../../cloud-foundry/test-framework/cf-test-helper';
 
 describe('AddSpaceQuotaComponent', () => {
   let component: AddSpaceQuotaComponent;
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/add-space-quota.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.ts
similarity index 72%
rename from src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/add-space-quota.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.ts
index fc8d6f13df..77707617d5 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/add-space-quota.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/add-space-quota.component.ts
@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
-import { getActiveRouteCfOrgSpaceProvider } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
-import { ActiveRouteCfOrgSpace } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
+
+import { ActiveRouteCfOrgSpace } from '../cf-page.types';
+import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers';
 
 @Component({
   selector: 'app-add-space-quota',
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.html b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.html
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.html
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.scss b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.scss
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.scss
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.spec.ts
similarity index 91%
rename from src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.spec.ts
index 4534e426fb..4607826a80 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.spec.ts
@@ -1,9 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
+import { CFBaseTestModules } from '../../../../../test-framework/cf-test-helper';
 import { SpaceQuotaDefinitionFormComponent } from '../../space-quota-definition-form/space-quota-definition-form.component';
 import { CreateSpaceQuotaStepComponent } from './create-space-quota-step.component';
-import { CFBaseTestModules } from '../../../../../../cloud-foundry/test-framework/cf-test-helper';
 
 describe('CreateSpaceQuotaStepComponent', () => {
   let component: CreateSpaceQuotaStepComponent;
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts
similarity index 82%
rename from src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts
index b1371907dc..be2878ed4c 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component.ts
@@ -4,18 +4,16 @@ import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 import { filter, map, pairwise } from 'rxjs/operators';
 
-import { CF_ENDPOINT_TYPE } from '../../../../../../cloud-foundry/src/cf-types';
-import {
-  SpaceQuotaDefinitionActionBuilders,
-} from '../../../../../../cloud-foundry/src/entity-action-builders/space-quota.action-builders';
+import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { AppState } from '../../../../../../store/src/app-state';
-import { APIResource } from '../../../../../../store/src/types/api.types';
-import { IQuotaDefinition } from '../../../../core/cf-api.types';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { IEntityMetadata } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
-import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component';
+import { APIResource } from '../../../../../../store/src/types/api.types';
+import { IQuotaDefinition } from '../../../../cf-api.types';
+import { spaceQuotaEntityType } from '../../../../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
+import { SpaceQuotaDefinitionActionBuilders } from '../../../../entity-action-builders/space-quota.action-builders';
 import { SpaceQuotaDefinitionFormComponent } from '../../space-quota-definition-form/space-quota-definition-form.component';
-import { spaceQuotaEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
 
 
 @Component({
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/cf-cell.helpers.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf-cell.helpers.ts
similarity index 83%
rename from src/frontend/packages/core/src/features/cloud-foundry/cf-cell.helpers.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf-cell.helpers.ts
index 04de176b8e..c0673a5c49 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/cf-cell.helpers.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf-cell.helpers.ts
@@ -2,18 +2,16 @@ import { Store } from '@ngrx/store';
 import { Observable, of } from 'rxjs';
 import { filter, first, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
-import { FetchCFCellMetricsPaginatedAction } from '../../../../cloud-foundry/src/actions/cf-metrics.actions';
-import { CFEntityConfig } from '../../../../cloud-foundry/src/cf-types';
-import {
-  CellMetrics,
-} from '../../../../cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service';
+import { endpointHasMetricsByAvailable } from '../../../../core/src/features/endpoints/endpoint-helpers';
+import { MetricQueryType } from '../../../../core/src/shared/services/metrics-range-selector.types';
 import { MetricQueryConfig } from '../../../../store/src/actions/metrics.actions';
 import { AppState } from '../../../../store/src/app-state';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { IMetrics } from '../../../../store/src/types/base-metric.types';
-import { MetricQueryType } from '../../shared/services/metrics-range-selector.types';
-import { endpointHasMetricsByAvailable } from '../endpoints/endpoint-helpers';
+import { FetchCFCellMetricsPaginatedAction } from '../../actions/cf-metrics.actions';
+import { CFEntityConfig } from '../../cf-types';
+import { CellMetrics } from './tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service';
 
 export class CfCellHelper {
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts
index 96d7f27b3f..e5cd657029 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts
@@ -19,8 +19,6 @@ import {
   UserRoleInSpace,
 } from '../../../../cloud-foundry/src/store/types/user.types';
 import { UserRoleLabels } from '../../../../cloud-foundry/src/store/types/users-roles.types';
-import { IServiceInstance, IUserProvidedServiceInstance } from '../../../../core/src/core/cf-api-svc.types';
-import { ISpace } from '../../../../core/src/core/cf-api.types';
 import {
   CurrentUserPermissions,
   PermissionConfig,
@@ -42,6 +40,8 @@ import { selectPaginationState } from '../../../../store/src/selectors/paginatio
 import { APIResource } from '../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 import { PaginatedAction, PaginationEntityState } from '../../../../store/src/types/pagination.types';
+import { IServiceInstance, IUserProvidedServiceInstance } from '../../cf-api-svc.types';
+import { ISpace } from '../../cf-api.types';
 import { cfEntityFactory } from '../../cf-entity-factory';
 import { CFEntityConfig } from '../../cf-types';
 import { ActiveRouteCfCell, ActiveRouteCfOrgSpace } from './cf-page.types';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
index 7f168ba8c3..60258a2c1a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
@@ -5,7 +5,6 @@ import { first, map } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import { CFAppCLIInfoContext } from '../../../../../cloud-foundry/src/shared/components/cli-info/cli-info.component';
-import { IOrganization, ISpace } from '../../../../../core/src/core/cf-api.types';
 import { CurrentUserPermissionsChecker } from '../../../../../core/src/core/current-user-permissions.checker';
 import { CurrentUserPermissions } from '../../../../../core/src/core/current-user-permissions.config';
 import { getFullEndpointApiUrl } from '../../../../../core/src/features/endpoints/endpoint-helpers';
@@ -14,6 +13,7 @@ import { RouterNav } from '../../../../../store/src/actions/router.actions';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
 import { getPreviousRoutingState } from '../../../../../store/src/types/routing.type';
+import { IOrganization, ISpace } from '../../../cf-api.types';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers';
 import { CloudFoundryEndpointService } from '../services/cloud-foundry-endpoint.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.module.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.module.ts
index b1cdef38b8..47504cbabb 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.module.ts
@@ -3,38 +3,6 @@ import { RouterModule } from '@angular/router';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import { CoreModule } from '../../../../core/src/core/core.module';
-import { AddQuotaComponent } from '../../../../core/src/features/cloud-foundry/add-quota/add-quota.component';
-import {
-  CreateQuotaStepComponent,
-} from '../../../../core/src/features/cloud-foundry/add-quota/create-quota-step/create-quota-step.component';
-import {
-  AddSpaceQuotaComponent,
-} from '../../../../core/src/features/cloud-foundry/add-space-quota/add-space-quota.component';
-import {
-  CreateSpaceQuotaStepComponent,
-} from '../../../../core/src/features/cloud-foundry/add-space-quota/create-space-quota-step/create-space-quota-step.component';
-import {
-  EditQuotaStepComponent,
-} from '../../../../core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component';
-import { EditQuotaComponent } from '../../../../core/src/features/cloud-foundry/edit-quota/edit-quota.component';
-import {
-  EditSpaceQuotaStepComponent,
-} from '../../../../core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component';
-import {
-  EditSpaceQuotaComponent,
-} from '../../../../core/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component';
-import {
-  QuotaDefinitionFormComponent,
-} from '../../../../core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component';
-import {
-  SpaceQuotaDefinitionFormComponent,
-} from '../../../../core/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component';
-import {
-  CloudFoundryOrganizationSpaceQuotasComponent,
-} from '../../../../core/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component';
-import {
-  CloudFoundryQuotasComponent,
-} from '../../../../core/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
 import { CloudFoundryComponentsModule } from '../../shared/components/components.module';
 import {
@@ -44,6 +12,10 @@ import { AddOrganizationComponent } from './add-organization/add-organization.co
 import {
   CreateOrganizationStepComponent,
 } from './add-organization/create-organization-step/create-organization-step.component';
+import { AddQuotaComponent } from './add-quota/add-quota.component';
+import { CreateQuotaStepComponent } from './add-quota/create-quota-step/create-quota-step.component';
+import { AddSpaceQuotaComponent } from './add-space-quota/add-space-quota.component';
+import { CreateSpaceQuotaStepComponent } from './add-space-quota/create-space-quota-step/create-space-quota-step.component';
 import { AddSpaceComponent } from './add-space/add-space.component';
 import { CreateSpaceStepComponent } from './add-space/create-space-step/create-space-step.component';
 import { ActiveRouteCfCell, ActiveRouteCfOrgSpace } from './cf-page.types';
@@ -54,11 +26,17 @@ import { CloudFoundryRoutingModule } from './cloud-foundry.routing';
 import { CloudFoundryComponent } from './cloud-foundry/cloud-foundry.component';
 import { EditOrganizationStepComponent } from './edit-organization/edit-organization-step/edit-organization-step.component';
 import { EditOrganizationComponent } from './edit-organization/edit-organization.component';
+import { EditQuotaStepComponent } from './edit-quota/edit-quota-step/edit-quota-step.component';
+import { EditQuotaComponent } from './edit-quota/edit-quota.component';
+import { EditSpaceQuotaStepComponent } from './edit-space-quota/edit-space-quota-step/edit-space-quota-step.component';
+import { EditSpaceQuotaComponent } from './edit-space-quota/edit-space-quota.component';
 import { EditSpaceStepComponent } from './edit-space/edit-space-step/edit-space-step.component';
 import { EditSpaceComponent } from './edit-space/edit-space.component';
+import { QuotaDefinitionFormComponent } from './quota-definition-form/quota-definition-form.component';
 import { QuotaDefinitionComponent } from './quota-definition/quota-definition.component';
 import { CloudFoundryEndpointService } from './services/cloud-foundry-endpoint.service';
 import { CloudFoundryOrganizationService } from './services/cloud-foundry-organization.service';
+import { SpaceQuotaDefinitionFormComponent } from './space-quota-definition-form/space-quota-definition-form.component';
 import { SpaceQuotaDefinitionComponent } from './space-quota-definition/space-quota-definition.component';
 import { CfAdminAddUserWarningComponent } from './tabs/cf-admin-add-user-warning/cf-admin-add-user-warning.component';
 import { CloudFoundryBuildPacksComponent } from './tabs/cloud-foundry-build-packs/cloud-foundry-build-packs.component';
@@ -79,6 +57,9 @@ import { CloudFoundryCellsComponent } from './tabs/cloud-foundry-cells/cloud-fou
 import { CloudFoundryEventsComponent } from './tabs/cloud-foundry-events/cloud-foundry-events.component';
 import { CloudFoundryFeatureFlagsComponent } from './tabs/cloud-foundry-feature-flags/cloud-foundry-feature-flags.component';
 import { CloudFoundryFirehoseComponent } from './tabs/cloud-foundry-firehose/cloud-foundry-firehose.component';
+import {
+  CloudFoundryOrganizationSpaceQuotasComponent,
+} from './tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component';
 import {
   CloudFoundryInviteUserLinkComponent,
 } from './tabs/cloud-foundry-organizations/cloud-foundry-invite-user-link/cloud-foundry-invite-user-link.component';
@@ -124,6 +105,7 @@ import {
 import {
   CloudFoundryOrganizationsComponent,
 } from './tabs/cloud-foundry-organizations/cloud-foundry-organizations.component';
+import { CloudFoundryQuotasComponent } from './tabs/cloud-foundry-quotas/cloud-foundry-quotas.component';
 import { CloudFoundryRoutesComponent } from './tabs/cloud-foundry-routes/cloud-foundry-routes.component';
 import {
   CloudFoundrySecurityGroupsComponent,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.routing.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.routing.ts
index 6b9076d688..cdfcacbe8b 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.routing.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.routing.ts
@@ -6,27 +6,17 @@ import { StratosActionType } from '../../../../core/src/core/extension/extension
 import {
   PageNotFoundComponentComponent,
 } from '../../../../core/src/core/page-not-found-component/page-not-found-component.component';
-import { AddQuotaComponent } from '../../../../core/src/features/cloud-foundry/add-quota/add-quota.component';
-import {
-  AddSpaceQuotaComponent,
-} from '../../../../core/src/features/cloud-foundry/add-space-quota/add-space-quota.component';
-import { EditQuotaComponent } from '../../../../core/src/features/cloud-foundry/edit-quota/edit-quota.component';
-import {
-  EditSpaceQuotaComponent,
-} from '../../../../core/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component';
-import {
-  CloudFoundryOrganizationSpaceQuotasComponent,
-} from '../../../../core/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component';
-import {
-  CloudFoundryQuotasComponent,
-} from '../../../../core/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component';
 import { AddOrganizationComponent } from './add-organization/add-organization.component';
+import { AddQuotaComponent } from './add-quota/add-quota.component';
+import { AddSpaceQuotaComponent } from './add-space-quota/add-space-quota.component';
 import { AddSpaceComponent } from './add-space/add-space.component';
 import { CliInfoCloudFoundryComponent } from './cli-info-cloud-foundry/cli-info-cloud-foundry.component';
 import { CloudFoundryBaseComponent } from './cloud-foundry-base/cloud-foundry-base.component';
 import { CloudFoundryTabsBaseComponent } from './cloud-foundry-tabs-base/cloud-foundry-tabs-base.component';
 import { CloudFoundryComponent } from './cloud-foundry/cloud-foundry.component';
 import { EditOrganizationComponent } from './edit-organization/edit-organization.component';
+import { EditQuotaComponent } from './edit-quota/edit-quota.component';
+import { EditSpaceQuotaComponent } from './edit-space-quota/edit-space-quota.component';
 import { EditSpaceComponent } from './edit-space/edit-space.component';
 import { QuotaDefinitionComponent } from './quota-definition/quota-definition.component';
 import { SpaceQuotaDefinitionComponent } from './space-quota-definition/space-quota-definition.component';
@@ -47,6 +37,9 @@ import { CloudFoundryCellsComponent } from './tabs/cloud-foundry-cells/cloud-fou
 import { CloudFoundryEventsComponent } from './tabs/cloud-foundry-events/cloud-foundry-events.component';
 import { CloudFoundryFeatureFlagsComponent } from './tabs/cloud-foundry-feature-flags/cloud-foundry-feature-flags.component';
 import { CloudFoundryFirehoseComponent } from './tabs/cloud-foundry-firehose/cloud-foundry-firehose.component';
+import {
+  CloudFoundryOrganizationSpaceQuotasComponent,
+} from './tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component';
 import {
   CloudFoundryOrganizationBaseComponent,
 } from './tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component';
@@ -89,6 +82,7 @@ import {
 import {
   CloudFoundryOrganizationsComponent,
 } from './tabs/cloud-foundry-organizations/cloud-foundry-organizations.component';
+import { CloudFoundryQuotasComponent } from './tabs/cloud-foundry-quotas/cloud-foundry-quotas.component';
 import { CloudFoundryRoutesComponent } from './tabs/cloud-foundry-routes/cloud-foundry-routes.component';
 import {
   CloudFoundrySecurityGroupsComponent,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts
index 0624440521..7f8aed46a5 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts
@@ -10,7 +10,6 @@ import { organizationEntityType, quotaDefinitionEntityType } from '../../../../.
 import {
   createEntityRelationPaginationKey,
 } from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { IOrganization, IOrgQuotaDefinition } from '../../../../../../core/src/core/cf-api.types';
 import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
@@ -20,6 +19,7 @@ import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/p
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { selectRequestInfo } from '../../../../../../store/src/selectors/api.selectors';
 import { APIResource } from '../../../../../../store/src/types/api.types';
+import { IOrganization, IOrgQuotaDefinition } from '../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 import { QuotaDefinitionActionBuilder } from '../../../../entity-action-builders/quota-definition.action-builders';
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.html b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.html
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.html
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.scss b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.scss
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.scss
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts
similarity index 91%
rename from src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts
index e7122f0e0d..ebc8c854fd 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts
@@ -1,9 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
+import { CFBaseTestModules } from '../../../../../test-framework/cf-test-helper';
 import { QuotaDefinitionFormComponent } from '../../quota-definition-form/quota-definition-form.component';
 import { EditQuotaStepComponent } from './edit-quota-step.component';
-import { CFBaseTestModules } from '../../../../../../cloud-foundry/test-framework/cf-test-helper';
 
 describe('EditQuotaStepComponent', () => {
   let component: EditQuotaStepComponent;
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts
similarity index 76%
rename from src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts
index 5bb4a1ef34..74c979f923 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts
@@ -4,26 +4,21 @@ import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 import { filter, first, map, pairwise, tap } from 'rxjs/operators';
 
-import { CF_ENDPOINT_TYPE } from '../../../../../../cloud-foundry/src/cf-types';
-import {
-  GetQuotaDefinition,
-  UpdateQuotaDefinition,
-} from '../../../../../../cloud-foundry/src/actions/quota-definitions.actions';
-import {
-  QuotaDefinitionActionBuilder,
-} from '../../../../../../cloud-foundry/src/entity-action-builders/quota-definition.action-builders';
-import { ActiveRouteCfOrgSpace } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
-import { getActiveRouteCfOrgSpaceProvider } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
+import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
+import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { AppState } from '../../../../../../store/src/app-state';
-import { APIResource } from '../../../../../../store/src/types/api.types';
-import { IQuotaDefinition } from '../../../../core/cf-api.types';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { IEntityMetadata } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
 import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
-import { safeUnsubscribe } from '../../../../core/utils.service';
-import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component';
+import { APIResource } from '../../../../../../store/src/types/api.types';
+import { GetQuotaDefinition, UpdateQuotaDefinition } from '../../../../actions/quota-definitions.actions';
+import { IQuotaDefinition } from '../../../../cf-api.types';
+import { quotaDefinitionEntityType } from '../../../../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
+import { QuotaDefinitionActionBuilder } from '../../../../entity-action-builders/quota-definition.action-builders';
+import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
+import { getActiveRouteCfOrgSpaceProvider } from '../../cf.helpers';
 import { QuotaDefinitionFormComponent } from '../../quota-definition-form/quota-definition-form.component';
-import { quotaDefinitionEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
 
 
 @Component({
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota.component.html b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.html
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.html
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota.component.scss b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.scss
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.scss
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.spec.ts
similarity index 86%
rename from src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.spec.ts
index 29f7a610d8..9fdea8aa31 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../tab-nav.service';
+import { TabNavService } from '../../../../../core/tab-nav.service';
+import { CFBaseTestModules } from '../../../../test-framework/cf-test-helper';
 import { QuotaDefinitionFormComponent } from '../quota-definition-form/quota-definition-form.component';
 import { EditQuotaStepComponent } from './edit-quota-step/edit-quota-step.component';
 import { EditQuotaComponent } from './edit-quota.component';
-import { CFBaseTestModules } from '../../../../../cloud-foundry/test-framework/cf-test-helper';
 
 describe('EditQuotaComponent', () => {
   let component: EditQuotaComponent;
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.ts
similarity index 75%
rename from src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.ts
index 5ce1ba244b..671e9c5170 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota.component.ts
@@ -2,9 +2,9 @@ import { Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
 import { QUOTA_FROM_LIST } from '../../../shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service';
-import { getActiveRouteCfOrgSpaceProvider } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
-import { ActiveRouteCfOrgSpace } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
-import { QUOTA_ORG_GUID } from '../../../../../cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component';
+import { ActiveRouteCfOrgSpace } from '../cf-page.types';
+import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers';
+import { QUOTA_ORG_GUID } from '../quota-definition/quota-definition.component';
 
 @Component({
   selector: 'app-edit-quota',
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.html b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.html
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.html
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.scss b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.scss
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.scss
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts
similarity index 91%
rename from src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts
index 74d77d5265..8b6a6f50d3 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts
@@ -1,9 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
+import { CFBaseTestModules } from '../../../../../test-framework/cf-test-helper';
 import { SpaceQuotaDefinitionFormComponent } from '../../space-quota-definition-form/space-quota-definition-form.component';
 import { EditSpaceQuotaStepComponent } from './edit-space-quota-step.component';
-import { CFBaseTestModules } from '../../../../../../cloud-foundry/test-framework/cf-test-helper';
 
 describe('EditSpaceQuotaStepComponent', () => {
   let component: EditSpaceQuotaStepComponent;
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
similarity index 82%
rename from src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
index cd832da790..718b97fa69 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
@@ -4,24 +4,19 @@ import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 import { filter, map, pairwise, tap } from 'rxjs/operators';
 
-import { CF_ENDPOINT_TYPE } from '../../../../../../cloud-foundry/src/cf-types';
-import {
-  GetSpaceQuotaDefinition,
-  UpdateSpaceQuotaDefinition,
-} from '../../../../../../cloud-foundry/src/actions/quota-definitions.actions';
-import {
-  SpaceQuotaDefinitionActionBuilders,
-} from '../../../../../../cloud-foundry/src/entity-action-builders/space-quota.action-builders';
+import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
+import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { AppState } from '../../../../../../store/src/app-state';
-import { APIResource } from '../../../../../../store/src/types/api.types';
-import { IQuotaDefinition } from '../../../../core/cf-api.types';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { IEntityMetadata } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
 import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
-import { safeUnsubscribe } from '../../../../core/utils.service';
-import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component';
+import { APIResource } from '../../../../../../store/src/types/api.types';
+import { GetSpaceQuotaDefinition, UpdateSpaceQuotaDefinition } from '../../../../actions/quota-definitions.actions';
+import { IQuotaDefinition } from '../../../../cf-api.types';
+import { spaceQuotaEntityType } from '../../../../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
+import { SpaceQuotaDefinitionActionBuilders } from '../../../../entity-action-builders/space-quota.action-builders';
 import { SpaceQuotaDefinitionFormComponent } from '../../space-quota-definition-form/space-quota-definition-form.component';
-import { spaceQuotaEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
 
 
 @Component({
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.html b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.html
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.html
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.scss b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.scss
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.scss
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.spec.ts
similarity index 86%
rename from src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.spec.ts
index 5e43bc144c..8f6a7189b2 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../tab-nav.service';
+import { TabNavService } from '../../../../../core/tab-nav.service';
+import { CFBaseTestModules } from '../../../../test-framework/cf-test-helper';
 import { SpaceQuotaDefinitionFormComponent } from '../space-quota-definition-form/space-quota-definition-form.component';
 import { EditSpaceQuotaStepComponent } from './edit-space-quota-step/edit-space-quota-step.component';
 import { EditSpaceQuotaComponent } from './edit-space-quota.component';
-import { CFBaseTestModules } from '../../../../../cloud-foundry/test-framework/cf-test-helper';
 
 describe('EditSpaceQuotaComponent', () => {
   let component: EditSpaceQuotaComponent;
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.ts
similarity index 77%
rename from src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.ts
index c2d832587a..15e07f989c 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota.component.ts
@@ -2,11 +2,9 @@ import { Component } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
 import { QUOTA_FROM_LIST } from '../../../shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service';
-import { getActiveRouteCfOrgSpaceProvider } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
-import { ActiveRouteCfOrgSpace } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
-import {
-  QUOTA_SPACE_GUID
-} from '../../../../../cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component';
+import { ActiveRouteCfOrgSpace } from '../cf-page.types';
+import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers';
+import { QUOTA_SPACE_GUID } from '../space-quota-definition/space-quota-definition.component';
 
 @Component({
   selector: 'app-edit-space-quota',
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-base/quota-definition-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-base/quota-definition-base.component.ts
index 89fdc4cf30..55a9bd6dfc 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-base/quota-definition-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-base/quota-definition-base.component.ts
@@ -3,21 +3,16 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of, Subscription } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 
-import {
-  IOrganization,
-  IOrgQuotaDefinition,
-  ISpace,
-  ISpaceQuotaDefinition,
-} from '../../../../../core/src/core/cf-api.types';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
 import { AppState } from '../../../../../store/src/app-state';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
+import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { endpointEntitiesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
 import { APIResource } from '../../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
-import { CF_ENDPOINT_TYPE } from '../../../cf-types';
+import { IOrganization, IOrgQuotaDefinition, ISpace, ISpaceQuotaDefinition } from '../../../cf-api.types';
 import { organizationEntityType, spaceEntityType } from '../../../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../../../cf-types';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 
 export class QuotaDefinitionBaseComponent {
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.html b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.html
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.html
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.scss b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.scss
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.scss
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts
similarity index 86%
rename from src/frontend/packages/core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts
index 0f73bbfb4b..0b50dec782 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition-form/quota-definition-form.component.ts
@@ -5,22 +5,20 @@ import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 import { filter, map, tap } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
-import { cfEntityFactory } from '../../../../../cloud-foundry/src/cf-entity-factory';
-import { quotaDefinitionEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cloud-foundry/src/cf-types';
-import {
-  QuotaDefinitionActionBuilder,
-} from '../../../../../cloud-foundry/src/entity-action-builders/quota-definition.action-builders';
-import { createEntityRelationPaginationKey } from '../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
+import { safeUnsubscribe } from '../../../../../core/src/core/utils.service';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
 import { IEntityMetadata } from '../../../../../store/src/entity-catalog/entity-catalog.types';
 import { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../../store/src/types/api.types';
-import { IQuotaDefinition } from '../../../core/cf-api.types';
-import { safeUnsubscribe } from '../../../core/utils.service';
+import { IQuotaDefinition } from '../../../cf-api.types';
+import { CFAppState } from '../../../cf-app-state';
+import { cfEntityFactory } from '../../../cf-entity-factory';
+import { quotaDefinitionEntityType } from '../../../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../../../cf-types';
+import { QuotaDefinitionActionBuilder } from '../../../entity-action-builders/quota-definition.action-builders';
+import { createEntityRelationPaginationKey } from '../../../entity-relations/entity-relations.types';
 
 export interface QuotaFormValues {
   name: string;
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.ts
index de3bb0449e..cc99dd9c3e 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.ts
@@ -5,14 +5,14 @@ import { Observable, of, Subscription } from 'rxjs';
 import { filter, first, map, switchMap } from 'rxjs/operators';
 
 import { GetQuotaDefinition } from '../../../../../cloud-foundry/src/actions/quota-definitions.actions';
-import { IOrganization, IOrgQuotaDefinition, ISpace } from '../../../../../core/src/core/cf-api.types';
 import { CurrentUserPermissions } from '../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../core/src/core/current-user-permissions.service';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
 import { AppState } from '../../../../../store/src/app-state';
+import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { APIResource } from '../../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
+import { IOrganization, IOrgQuotaDefinition, ISpace } from '../../../cf-api.types';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers';
 import { QuotaDefinitionBaseComponent } from '../quota-definition-base/quota-definition-base.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service.ts
index a5b1ba50c8..9131a86614 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service.ts
@@ -19,7 +19,6 @@ import {
   createEntityRelationPaginationKey,
 } from '../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { CfApplicationState } from '../../../../../cloud-foundry/src/store/types/application.types';
-import { IApp, ICfV2Info, IOrganization, ISpace } from '../../../../../core/src/core/cf-api.types';
 import { EndpointsService } from '../../../../../core/src/core/endpoints.service';
 import { GetAllEndpoints } from '../../../../../store/src/actions/endpoint.actions';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
@@ -37,6 +36,7 @@ import { EndpointModel, EndpointUser } from '../../../../../store/src/types/endp
 import { PaginatedAction } from '../../../../../store/src/types/pagination.types';
 import { GetAllRoutes } from '../../../actions/route.actions';
 import { GetSpaceRoutes } from '../../../actions/space.actions';
+import { IApp, ICfV2Info, IOrganization, ISpace } from '../../../cf-api.types';
 import { cfEntityFactory } from '../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../cf-types';
 import { CfInfoDefinitionActionBuilders } from '../../../entity-action-builders/cf-info.action-builders';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-org-space-quota.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-org-space-quota.ts
index 10da08098e..0e89121107 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-org-space-quota.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-org-space-quota.ts
@@ -1,13 +1,13 @@
 import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { filter, first, map, switchMap } from 'rxjs/operators';
 
-import { CFEntityConfig } from '../../../cf-types';
-import { IApp, IOrganization, ISpace } from '../../../../../core/src/core/cf-api.types';
 import { truthyIncludingZero } from '../../../../../core/src/core/utils.service';
 import { determineCardStatus } from '../../../../../core/src/shared/components/cards/card-status/card-status.component';
-import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { StratosStatus } from '../../../../../core/src/shared/shared.types';
+import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { IApp, IOrganization, ISpace } from '../../../cf-api.types';
+import { CFEntityConfig } from '../../../cf-types';
 import { CloudFoundryEndpointService } from './cloud-foundry-endpoint.service';
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization-quota.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization-quota.ts
index 74d85d945a..932894115e 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization-quota.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization-quota.ts
@@ -1,11 +1,11 @@
 import { Observable } from 'rxjs';
 
 import { organizationEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
-import { IApp, IOrganization } from '../../../../../core/src/core/cf-api.types';
-import { getEntityFlattenedList, getStartedAppInstanceCount } from '../../../../../core/src/core/cf.helpers';
-import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { StratosStatus } from '../../../../../core/src/shared/shared.types';
+import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { IApp, IOrganization } from '../../../cf-api.types';
+import { getEntityFlattenedList, getStartedAppInstanceCount } from '../../../cf.helpers';
 import { CloudFoundryEndpointService } from './cloud-foundry-endpoint.service';
 import { OrgSpaceQuotaHelper } from './cloud-foundry-org-space-quota';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization.service.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization.service.ts
index a1c41cc54b..71e35081fb 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization.service.ts
@@ -13,15 +13,6 @@ import {
   spaceEntityType,
 } from '../../../../../cloud-foundry/src/cf-entity-types';
 import { OrgUserRoleNames } from '../../../../../cloud-foundry/src/store/types/user.types';
-import {
-  IApp,
-  IOrganization,
-  IOrgQuotaDefinition,
-  IPrivateDomain,
-  ISpace,
-  ISpaceQuotaDefinition,
-} from '../../../../../core/src/core/cf-api.types';
-import { getEntityFlattenedList, getStartedAppInstanceCount } from '../../../../../core/src/core/cf.helpers';
 import {
   CloudFoundryUserProvidedServicesService,
 } from '../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
@@ -30,7 +21,16 @@ import { IEntityMetadata } from '../../../../../store/src/entity-catalog/entity-
 import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
+import {
+  IApp,
+  IOrganization,
+  IOrgQuotaDefinition,
+  IPrivateDomain,
+  ISpace,
+  ISpaceQuotaDefinition,
+} from '../../../cf-api.types';
 import { CF_ENDPOINT_TYPE } from '../../../cf-types';
+import { getEntityFlattenedList, getStartedAppInstanceCount } from '../../../cf.helpers';
 import { OrganizationActionBuilders } from '../../../entity-action-builders/organization.action-builders';
 import { createEntityRelationKey } from '../../../entity-relations/entity-relations.types';
 import { CfUserService } from '../../../shared/data-services/cf-user.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space-quota.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space-quota.ts
index 871c66f3ce..1be45b3e30 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space-quota.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space-quota.ts
@@ -1,11 +1,11 @@
 import { Observable } from 'rxjs';
 
 import { spaceEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
-import { IApp, ISpace } from '../../../../../core/src/core/cf-api.types';
-import { getStartedAppInstanceCount } from '../../../../../core/src/core/cf.helpers';
-import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { StratosStatus } from '../../../../../core/src/shared/shared.types';
+import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { IApp, ISpace } from '../../../cf-api.types';
+import { getStartedAppInstanceCount } from '../../../cf.helpers';
 import { CloudFoundryEndpointService } from './cloud-foundry-endpoint.service';
 import { OrgSpaceQuotaHelper } from './cloud-foundry-org-space-quota';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space.service.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space.service.ts
index 8b34067470..86b1adbfa8 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space.service.ts
@@ -13,14 +13,16 @@ import {
   spaceQuotaEntityType,
 } from '../../../../../cloud-foundry/src/cf-entity-types';
 import { SpaceUserRoleNames } from '../../../../../cloud-foundry/src/store/types/user.types';
-import { IApp, IOrgQuotaDefinition, IRoute, ISpace, ISpaceQuotaDefinition } from '../../../../../core/src/core/cf-api.types';
-import { getStartedAppInstanceCount } from '../../../../../core/src/core/cf.helpers';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
-import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import {
   CloudFoundryUserProvidedServicesService,
 } from '../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
+import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
+import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
+import { IApp, IOrgQuotaDefinition, IRoute, ISpace, ISpaceQuotaDefinition } from '../../../cf-api.types';
+import { CF_ENDPOINT_TYPE } from '../../../cf-types';
+import { getStartedAppInstanceCount } from '../../../cf.helpers';
 import { createEntityRelationKey } from '../../../entity-relations/entity-relations.types';
 import { CfUserService } from '../../../shared/data-services/cf-user.service';
 import { fetchServiceInstancesCount } from '../../service-catalog/services-helper';
@@ -28,8 +30,6 @@ import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { getSpaceRolesString } from '../cf.helpers';
 import { CloudFoundryEndpointService } from './cloud-foundry-endpoint.service';
 import { CloudFoundryOrganizationService, createOrgQuotaDefinition } from './cloud-foundry-organization.service';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
-import { CF_ENDPOINT_TYPE } from '../../../cf-types';
 
 @Injectable()
 export class CloudFoundrySpaceService {
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.html b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.html
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.html
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.scss b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.scss
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.scss
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts
similarity index 87%
rename from src/frontend/packages/core/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts
index a5055fbf0a..d5f75b46d4 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition-form/space-quota-definition-form.component.ts
@@ -5,17 +5,17 @@ import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 import { filter, map, tap } from 'rxjs/operators';
 
-import { GetOrganizationSpaceQuotaDefinitions } from '../../../../../cloud-foundry/src/actions/quota-definitions.actions';
-import { cfEntityFactory } from '../../../../../cloud-foundry/src/cf-entity-factory';
-import { spaceQuotaEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
-import { createEntityRelationPaginationKey } from '../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
+import { safeUnsubscribe } from '../../../../../core/src/core/utils.service';
 import { AppState } from '../../../../../store/src/app-state';
 import { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../../store/src/types/api.types';
-import { IQuotaDefinition } from '../../../core/cf-api.types';
-import { safeUnsubscribe } from '../../../core/utils.service';
+import { GetOrganizationSpaceQuotaDefinitions } from '../../../actions/quota-definitions.actions';
+import { IQuotaDefinition } from '../../../cf-api.types';
+import { cfEntityFactory } from '../../../cf-entity-factory';
+import { spaceQuotaEntityType } from '../../../cf-entity-types';
+import { createEntityRelationPaginationKey } from '../../../entity-relations/entity-relations.types';
 
 
 @Component({
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.ts
index da9f999835..80d627b749 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.ts
@@ -5,14 +5,14 @@ import { Observable, of, Subscription } from 'rxjs';
 import { filter, first, map, switchMap } from 'rxjs/operators';
 
 import { GetSpaceQuotaDefinition } from '../../../../../cloud-foundry/src/actions/quota-definitions.actions';
-import { IOrganization, ISpace, ISpaceQuotaDefinition } from '../../../../../core/src/core/cf-api.types';
 import { CurrentUserPermissions } from '../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../core/src/core/current-user-permissions.service';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
 import { AppState } from '../../../../../store/src/app-state';
+import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { APIResource } from '../../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
+import { IOrganization, ISpace, ISpaceQuotaDefinition } from '../../../cf-api.types';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers';
 import { QuotaDefinitionBaseComponent } from '../quota-definition-base/quota-definition-base.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service.ts
index b4de7ce575..fb6c1e76ec 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service.ts
@@ -3,7 +3,6 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 
-import { CfCellHelper } from '../../../../../../../core/src/features/cloud-foundry/cf-cell.helpers';
 import { MetricsConfig } from '../../../../../../../core/src/shared/components/metrics-chart/metrics-chart.component';
 import { MetricsLineChartConfig } from '../../../../../../../core/src/shared/components/metrics-chart/metrics-chart.types';
 import {
@@ -17,6 +16,7 @@ import { PaginationMonitorFactory } from '../../../../../../../store/src/monitor
 import { IMetricMatrixResult, IMetrics, IMetricVectorResult } from '../../../../../../../store/src/types/base-metric.types';
 import { IMetricCell } from '../../../../../../../store/src/types/metric.types';
 import { FetchCFCellMetricsAction } from '../../../../../actions/cf-metrics.actions';
+import { CfCellHelper } from '../../../cf-cell.helpers';
 import { ActiveRouteCfCell } from '../../../cf-page.types';
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.ts
index cbb3e7b409..39e488c615 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cells.component.ts
@@ -2,11 +2,13 @@ import { Component } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 
-import { CfCellHelper } from '../../../../../../core/src/features/cloud-foundry/cf-cell.helpers';
 import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
 import { AppState } from '../../../../../../store/src/app-state';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
-import { CfCellsListConfigService } from '../../../../shared/components/list/list-types/cf-cells/cf-cells-list-config.service';
+import {
+  CfCellsListConfigService,
+} from '../../../../shared/components/list/list-types/cf-cells/cf-cells-list-config.service';
+import { CfCellHelper } from '../../cf-cell.helpers';
 import { getActiveRouteCfCellProvider } from '../../cf.helpers';
 import { CloudFoundryEndpointService } from '../../services/cloud-foundry-endpoint.service';
 
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.html b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.html
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.html
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.scss b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.scss
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.scss
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts
similarity index 71%
rename from src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts
index ff80a49040..3cda3f2573 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.spec.ts
@@ -1,14 +1,12 @@
 import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { CFBaseTestModules } from '../../../../../../../cloud-foundry/test-framework/cf-test-helper';
-import {
-  generateTestCfEndpointServiceProvider,
-} from '../../../../../../../cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper';
-import { TabNavService } from '../../../../../../tab-nav.service';
+import { TabNavService } from '../../../../../../core/tab-nav.service';
+import { CFBaseTestModules } from '../../../../../test-framework/cf-test-helper';
+import { generateTestCfEndpointServiceProvider } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import {
   CfSpaceQuotasListConfigService,
-} from '../../../../../shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service';
+} from '../../../../shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service';
 import { CloudFoundryOrganizationSpaceQuotasComponent } from './cloud-foundry-organization-space-quotas.component';
 
 describe('CloudFoundryOrganizationSpaceQuotasComponent', () => {
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.ts
similarity index 58%
rename from src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.ts
index 10a8fbb830..9c814c204c 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organization-space-quotas/cloud-foundry-organization-space-quotas.component.ts
@@ -1,16 +1,14 @@
 import { Component } from '@angular/core';
 import { Observable } from 'rxjs';
 
-import { CurrentUserPermissions } from '../../../../../core/current-user-permissions.config';
+import { CurrentUserPermissions } from '../../../../../../core/src/core/current-user-permissions.config';
+import { CurrentUserPermissionsService } from '../../../../../../core/src/core/current-user-permissions.service';
+import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
 import {
   CfSpaceQuotasListConfigService,
-} from '../../../../../shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service';
-import { ListConfig } from '../../../../../shared/components/list/list.component.types';
-import { CurrentUserPermissionsService } from './../../../../../core/current-user-permissions.service';
-import {
-  CloudFoundryEndpointService
-} from '../../../../../../../cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service';
-import { ActiveRouteCfOrgSpace } from '../../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
+} from '../../../../shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service';
+import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
+import { CloudFoundryEndpointService } from '../../services/cloud-foundry-endpoint.service';
 
 @Component({
   selector: 'app-cloud-foundry-organization-space-quotas',
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.html b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.html
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.html
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.html
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.scss b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.scss
similarity index 100%
rename from src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.scss
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.scss
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.spec.ts
similarity index 89%
rename from src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.spec.ts
index fdba1e50b3..45606154a2 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.spec.ts
@@ -1,16 +1,15 @@
 import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { TabNavService } from '../../../../../tab-nav.service';
-
-import { CloudFoundryQuotasComponent } from './cloud-foundry-quotas.component';
 import {
-  CfOrgsListConfigService
+  CfOrgsListConfigService,
 } from '../../../../../../cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-orgs-list-config.service';
+import { CFBaseTestModules } from '../../../../../../cloud-foundry/test-framework/cf-test-helper';
 import {
-  generateTestCfEndpointServiceProvider
+  generateTestCfEndpointServiceProvider,
 } from '../../../../../../cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper';
-import { CFBaseTestModules } from '../../../../../../cloud-foundry/test-framework/cf-test-helper';
+import { TabNavService } from '../../../../../../core/tab-nav.service';
+import { CloudFoundryQuotasComponent } from './cloud-foundry-quotas.component';
 
 describe('CloudFoundryQuotasComponent', () => {
   let component: CloudFoundryQuotasComponent;
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.ts
similarity index 66%
rename from src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.ts
rename to src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.ts
index b1af025890..566ea33df0 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-quotas/cloud-foundry-quotas.component.ts
@@ -1,15 +1,13 @@
 import { Component } from '@angular/core';
 import { Observable } from 'rxjs';
 
-import { CurrentUserPermissions } from '../../../../core/current-user-permissions.config';
+import { CurrentUserPermissions } from '../../../../../../core/src/core/current-user-permissions.config';
+import { CurrentUserPermissionsService } from '../../../../../../core/src/core/current-user-permissions.service';
+import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
 import {
   CfQuotasListConfigService,
 } from '../../../../shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service';
-import { ListConfig } from '../../../../shared/components/list/list.component.types';
-import { CurrentUserPermissionsService } from './../../../../core/current-user-permissions.service';
-import {
-  CloudFoundryEndpointService
-} from '../../../../../../cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service';
+import { CloudFoundryEndpointService } from '../../services/cloud-foundry-endpoint.service';
 
 @Component({
   selector: 'app-cloud-foundry-quotas',
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.ts
index 48081d40ab..b9c00e3507 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/invite-users/invite-users-create/invite-users-create.component.ts
@@ -3,9 +3,6 @@ import { Store } from '@ngrx/store';
 import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { IOrganization, ISpace } from '../../../../../../../core/src/core/cf-api.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityServiceFactory } from '../../../../../../../store/src/entity-service-factory.service';
 import {
   StackedInputActionResult,
 } from '../../../../../../../core/src/shared/components/stacked-input-actions/stacked-input-action/stacked-input-action.component';
@@ -15,10 +12,13 @@ import {
 } from '../../../../../../../core/src/shared/components/stacked-input-actions/stacked-input-actions.component';
 import { StepOnNextFunction } from '../../../../../../../core/src/shared/components/stepper/step/step.component';
 import { ClearPaginationOfType } from '../../../../../../../store/src/actions/pagination.actions';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { EntityServiceFactory } from '../../../../../../../store/src/entity-service-factory.service';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { CF_ENDPOINT_TYPE, CFEntityConfig } from '../../../../../cf-types';
+import { IOrganization, ISpace } from '../../../../../cf-api.types';
 import { CFAppState } from '../../../../../cf-app-state';
 import { cfUserEntityType, organizationEntityType, spaceEntityType } from '../../../../../cf-entity-types';
+import { CF_ENDPOINT_TYPE, CFEntityConfig } from '../../../../../cf-types';
 import { SpaceUserRoleNames } from '../../../../../store/types/user.types';
 import { UserRoleLabels } from '../../../../../store/types/users-roles.types';
 import { ActiveRouteCfOrgSpace } from '../../../cf-page.types';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.ts
index f078fc0ed1..159d973506 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/cf-roles.service.ts
@@ -17,7 +17,6 @@ import {
   createEntityRelationKey,
   createEntityRelationPaginationKey,
 } from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { IOrganization, ISpace } from '../../../../../../core/src/core/cf-api.types';
 import { CurrentUserPermissionsChecker } from '../../../../../../core/src/core/current-user-permissions.checker';
 import { CurrentUserPermissionsService } from '../../../../../../core/src/core/current-user-permissions.service';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
@@ -32,6 +31,7 @@ import {
 } from '../../../../../../store/src/selectors/users-roles.selector';
 import { APIResource, EntityInfo } from '../../../../../../store/src/types/api.types';
 import { UsersRolesSetChanges } from '../../../../actions/users-roles.actions';
+import { IOrganization, ISpace } from '../../../../cf-api.types';
 import { CFAppState } from '../../../../cf-app-state';
 import { cfEntityFactory } from '../../../../cf-entity-factory';
 import { organizationEntityType, spaceEntityType } from '../../../../cf-entity-types';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.ts
index 1db4ca0090..a0459b25b0 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.ts
@@ -1,4 +1,3 @@
-/* tslint:disable:max-line-length */
 import {
   ChangeDetectorRef,
   Component,
@@ -28,7 +27,6 @@ import {
   tap,
 } from 'rxjs/operators';
 
-import { IOrganization } from '../../../../../../../core/src/core/cf-api.types';
 import {
   ITableListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
@@ -42,6 +40,7 @@ import {
 } from '../../../../../../../store/src/selectors/users-roles.selector';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { UsersRolesFlipSetRoles, UsersRolesSetOrg } from '../../../../../actions/users-roles.actions';
+import { IOrganization } from '../../../../../cf-api.types';
 import { CFAppState } from '../../../../../cf-app-state';
 import {
   TableCellRoleOrgSpaceComponent,
@@ -55,6 +54,7 @@ import { getRowMetadata } from '../../../cf.helpers';
 import { CfRolesService } from '../cf-roles.service';
 import { SpaceRolesListWrapperComponent } from './space-roles-list-wrapper/space-roles-list-wrapper.component';
 
+/* tslint:disable:max-line-length */
 
 /* tslint:enable:max-line-length */
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-summary/service-summary.component.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-summary/service-summary.component.ts
index c163b4de45..4303146964 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-summary/service-summary.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-summary/service-summary.component.ts
@@ -4,9 +4,9 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
-import { IServiceInstance, IServicePlan } from '../../../../../core/src/core/cf-api-svc.types';
 import { RouterNav } from '../../../../../store/src/actions/router.actions';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { IServiceInstance, IServicePlan } from '../../../cf-api-svc.types';
 import { ServicesService } from '../services.service';
 
 @Component({
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/services-helper.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/services-helper.ts
index 248875a0ee..f708133ade 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/services-helper.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/services-helper.ts
@@ -4,15 +4,6 @@ import { Observable, of as observableOf } from 'rxjs';
 import { combineLatest, filter, first, map, share, switchMap } from 'rxjs/operators';
 
 import { createEntityRelationPaginationKey } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import {
-  IService,
-  IServiceBroker,
-  IServiceExtra,
-  IServiceInstance,
-  IServicePlan,
-  IServicePlanExtra,
-  IServicePlanVisibility,
-} from '../../../../core/src/core/cf-api-svc.types';
 import { getIdFromRoute, safeStringToObj } from '../../../../core/src/core/utils.service';
 import { StratosStatus } from '../../../../core/src/shared/shared.types';
 import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
@@ -24,6 +15,15 @@ import { getPaginationObservables } from '../../../../store/src/reducers/paginat
 import { APIResource } from '../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../store/src/types/pagination.types';
 import { EntityRequestAction } from '../../../../store/src/types/request.types';
+import {
+  IService,
+  IServiceBroker,
+  IServiceExtra,
+  IServiceInstance,
+  IServicePlan,
+  IServicePlanExtra,
+  IServicePlanVisibility,
+} from '../../cf-api-svc.types';
 import { CFAppState } from '../../cf-app-state';
 import { cfEntityFactory } from '../../cf-entity-factory';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/services.service.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/services.service.ts
index e51f6b2275..178183a321 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/services.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/services.service.ts
@@ -4,15 +4,6 @@ import { Store } from '@ngrx/store';
 import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
 import { combineLatest, filter, first, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
-import {
-  IService,
-  IServiceBroker,
-  IServiceExtra,
-  IServiceInstance,
-  IServicePlan,
-  IServicePlanVisibility,
-} from '../../../../core/src/core/cf-api-svc.types';
-import { ISpace } from '../../../../core/src/core/cf-api.types';
 import { getIdFromRoute } from '../../../../core/src/core/utils.service';
 import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
 import { EntityService } from '../../../../store/src/entity-service';
@@ -20,6 +11,15 @@ import { EntityServiceFactory } from '../../../../store/src/entity-service-facto
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../store/src/types/api.types';
+import {
+  IService,
+  IServiceBroker,
+  IServiceExtra,
+  IServiceInstance,
+  IServicePlan,
+  IServicePlanVisibility,
+} from '../../cf-api-svc.types';
+import { ISpace } from '../../cf-api.types';
 import { CFAppState } from '../../cf-app-state';
 import { cfEntityFactory } from '../../cf-entity-factory';
 import { serviceBrokerEntityType, servicePlanVisibilityEntityType, spaceEntityType } from '../../cf-entity-types';
diff --git a/src/frontend/packages/cloud-foundry/src/features/services/detach-service-instance/detach-apps/detach-apps.component.ts b/src/frontend/packages/cloud-foundry/src/features/services/detach-service-instance/detach-apps/detach-apps.component.ts
index ce4e523171..96bcc9cb02 100644
--- a/src/frontend/packages/cloud-foundry/src/features/services/detach-service-instance/detach-apps/detach-apps.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/services/detach-service-instance/detach-apps/detach-apps.component.ts
@@ -2,12 +2,12 @@ import { Component, EventEmitter, OnDestroy, Output } from '@angular/core';
 import { Observable, of as observableOf, Subscription } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { IServiceBinding } from '../../../../../../core/src/core/cf-api-svc.types';
+import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
+import { APIResource } from '../../../../../../store/src/types/api.types';
+import { IServiceBinding } from '../../../../cf-api-svc.types';
 import {
   DetachAppsListConfigService,
 } from '../../../../shared/components/list/list-types/detach-apps/detach-apps-list-config.service';
-import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
-import { APIResource } from '../../../../../../store/src/types/api.types';
 
 @Component({
   selector: 'app-detach-apps',
diff --git a/src/frontend/packages/cloud-foundry/src/features/services/detach-service-instance/detach-service-instance.component.ts b/src/frontend/packages/cloud-foundry/src/features/services/detach-service-instance/detach-service-instance.component.ts
index 8db10f06a6..00ebcdbf5c 100644
--- a/src/frontend/packages/cloud-foundry/src/features/services/detach-service-instance/detach-service-instance.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/services/detach-service-instance/detach-service-instance.component.ts
@@ -5,21 +5,21 @@ import { Store } from '@ngrx/store';
 import { Observable, of as observableOf, ReplaySubject } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
-import { CF_ENDPOINT_TYPE } from '../../../cf-types';
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import { serviceBindingEntityType, serviceInstancesEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
 import {
   ServiceActionHelperService,
 } from '../../../../../cloud-foundry/src/shared/data-services/service-action-helper.service';
-import { IServiceBinding, IServiceInstance } from '../../../../../core/src/core/cf-api-svc.types';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import {
   AppMonitorComponentTypes,
 } from '../../../../../core/src/shared/components/app-action-monitor-icon/app-action-monitor-icon.component';
 import { ITableColumn } from '../../../../../core/src/shared/components/list/list-table/table.types';
 import { RouterNav } from '../../../../../store/src/actions/router.actions';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
+import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { IServiceBinding, IServiceInstance } from '../../../cf-api-svc.types';
+import { CF_ENDPOINT_TYPE } from '../../../cf-types';
 
 @Component({
   selector: 'app-detach-service-instance',
diff --git a/src/frontend/packages/cloud-foundry/src/features/services/services/services-wall.service.ts b/src/frontend/packages/cloud-foundry/src/features/services/services/services-wall.service.ts
index 3d76cfcc5c..8174266905 100644
--- a/src/frontend/packages/cloud-foundry/src/features/services/services/services-wall.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/services/services/services-wall.service.ts
@@ -5,12 +5,12 @@ import { filter, map, publishReplay, refCount } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import { serviceEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
-import { IService } from '../../../../../core/src/core/cf-api-svc.types';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../../store/src/types/pagination.types';
+import { IService } from '../../../cf-api-svc.types';
 import { cfEntityFactory } from '../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../cf-types';
 import { createEntityRelationPaginationKey } from '../../../entity-relations/entity-relations.types';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.ts
index dcdb7795b3..849d26cb6b 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.ts
@@ -45,8 +45,6 @@ import {
 import {
   selectCreateServiceInstance,
 } from '../../../../../../cloud-foundry/src/store/selectors/create-service-instance.selectors';
-import { IServiceInstance } from '../../../../../../core/src/core/cf-api-svc.types';
-import { IApp, ISpace } from '../../../../../../core/src/core/cf-api.types';
 import { getIdFromRoute } from '../../../../../../core/src/core/utils.service';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { IEntityMetadata } from '../../../../../../store/src/entity-catalog/entity-catalog.types';
@@ -55,6 +53,8 @@ import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/p
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../../../store/src/types/pagination.types';
+import { IServiceInstance } from '../../../../cf-api-svc.types';
+import { IApp, ISpace } from '../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 import { ApplicationActionBuilders } from '../../../../entity-action-builders/application.action-builders';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/bind-apps-step/bind-apps-step.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/bind-apps-step/bind-apps-step.component.ts
index 2bba06cd52..2bc9d8ca61 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/bind-apps-step/bind-apps-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/bind-apps-step/bind-apps-step.component.ts
@@ -5,12 +5,12 @@ import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'r
 
 import { SetCreateServiceInstanceApp } from '../../../../../../cloud-foundry/src/actions/create-service-instance.actions';
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
-import { IServicePlan } from '../../../../../../core/src/core/cf-api-svc.types';
-import { IApp } from '../../../../../../core/src/core/cf-api.types';
 import { pathGet, safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
 import { StepOnNextResult } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource } from '../../../../../../store/src/types/api.types';
+import { IServicePlan } from '../../../../cf-api-svc.types';
+import { IApp } from '../../../../cf-api.types';
 import { SchemaFormConfig } from '../../schema-form/schema-form.component';
 
 @Component({
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/create-service-instance-helper.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/create-service-instance-helper.service.ts
index 45bd998cc6..d84d2c65b4 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/create-service-instance-helper.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/create-service-instance-helper.service.ts
@@ -9,19 +9,13 @@ import {
   servicePlanVisibilityEntityType,
 } from '../../../../../cloud-foundry/src/cf-entity-types';
 import { createEntityRelationPaginationKey } from '../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import {
-  IService,
-  IServiceBroker,
-  IServiceInstance,
-  IServicePlan,
-  IServicePlanVisibility,
-} from '../../../../../core/src/core/cf-api-svc.types';
 import { CF_GUID } from '../../../../../core/src/shared/entity.tokens';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
 import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { IService, IServiceBroker, IServiceInstance, IServicePlan, IServicePlanVisibility } from '../../../cf-api-svc.types';
 import { cfEntityFactory } from '../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../cf-types';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/select-plan-step/select-plan-step.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/select-plan-step/select-plan-step.component.ts
index 2912f86215..1378d6bc51 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/select-plan-step/select-plan-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/select-plan-step/select-plan-step.component.ts
@@ -37,11 +37,11 @@ import {
 import {
   selectCreateServiceInstance,
 } from '../../../../../../cloud-foundry/src/store/selectors/create-service-instance.selectors';
-import { IServicePlan } from '../../../../../../core/src/core/cf-api-svc.types';
 import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
 import { StepOnNextResult } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { StratosStatus } from '../../../../../../core/src/shared/shared.types';
 import { APIResource } from '../../../../../../store/src/types/api.types';
+import { IServicePlan } from '../../../../cf-api-svc.types';
 import { CreateServiceInstanceHelperServiceFactory } from '../create-service-instance-helper-service-factory.service';
 import { CreateServiceInstanceHelper } from '../create-service-instance-helper.service';
 import { CsiModeService } from '../csi-mode.service';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.ts
index 61ef2e0af5..a584590fb6 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-details-step/specify-details-step.component.ts
@@ -3,7 +3,13 @@ import { AfterContentInit, Component, Input, OnDestroy } from '@angular/core';
 import { AbstractControl, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms';
 import { MatChipInputEvent } from '@angular/material/chips';
 import { Store } from '@ngrx/store';
-import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
 import {
   combineLatest,
   distinctUntilChanged,
@@ -23,7 +29,6 @@ import {
   SetCreateServiceInstanceOrg,
   SetServiceInstanceGuid,
 } from '../../../../../../cloud-foundry/src/actions/create-service-instance.actions';
-import { IServiceInstance, IServicePlan } from '../../../../../../core/src/core/cf-api-svc.types';
 import { pathGet, safeStringToObj } from '../../../../../../core/src/core/utils.service';
 import { StepOnNextResult } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
@@ -31,6 +36,7 @@ import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity
 import { getDefaultRequestState, RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource, NormalizedResponse } from '../../../../../../store/src/types/api.types';
 import { UpdateServiceInstance } from '../../../../actions/service-instances.actions';
+import { IServiceInstance, IServicePlan } from '../../../../cf-api-svc.types';
 import { CFAppState } from '../../../../cf-app-state';
 import { appEnvVarsEntityType, serviceBindingEntityType, serviceInstancesEntityType } from '../../../../cf-entity-types';
 import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts
index 433f914488..2cc2cfcc8f 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts
@@ -22,7 +22,6 @@ import { createEntityRelationKey } from '../../../../../../cloud-foundry/src/ent
 import {
   selectCreateServiceInstance,
 } from '../../../../../../cloud-foundry/src/store/selectors/create-service-instance.selectors';
-import { IUserProvidedServiceInstance } from '../../../../../../core/src/core/cf-api-svc.types';
 import { safeUnsubscribe, urlValidationExpression } from '../../../../../../core/src/core/utils.service';
 import { environment } from '../../../../../../core/src/environments/environment';
 import {
@@ -35,6 +34,7 @@ import {
 } from '../../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { APIResource } from '../../../../../../store/src/types/api.types';
+import { IUserProvidedServiceInstance } from '../../../../cf-api-svc.types';
 import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 import { CreateServiceFormMode, CsiModeService } from './../csi-mode.service';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts
index 86c6126adc..1537de32e7 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { ICfV2Info } from 'frontend/packages/core/src/core/cf-api.types';
+import { ICfV2Info } from 'frontend/packages/cloud-foundry/src/cf-api.types';
 import { APIResource, EntityInfo } from 'frontend/packages/store/src/types/api.types';
 import { Observable, Subscription } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.ts
index 147e03657b..587eabdb72 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component.ts
@@ -8,11 +8,11 @@ import {
   appDataSort,
   CloudFoundryEndpointService,
 } from '../../../../../../cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service';
-import { IApp } from '../../../../../../core/src/core/cf-api.types';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { APIResource } from '../../../../../../store/src/types/api.types';
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
+import { IApp } from '../../../../cf-api.types';
 import { appStatsEntityType } from '../../../../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 
 const RECENT_ITEMS_COUNT = 10;
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/compact-service-instance-card/compact-service-instance-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/compact-service-instance-card/compact-service-instance-card.component.ts
index 1b7b16622d..ad2b3f68fa 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/compact-service-instance-card/compact-service-instance-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/compact-service-instance-card/compact-service-instance-card.component.ts
@@ -1,8 +1,8 @@
 import { Component, Input, OnInit } from '@angular/core';
 
-import { IServiceInstance } from '../../../../../../core/src/core/cf-api-svc.types';
 import { AppChip } from '../../../../../../core/src/shared/components/chips/chips.component';
 import { APIResource } from '../../../../../../store/src/types/api.types';
+import { IServiceInstance } from '../../../../cf-api-svc.types';
 
 @Component({
   selector: 'app-compact-service-instance-card',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/service-broker-card/service-broker-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/service-broker-card/service-broker-card.component.ts
index 079ba90a05..66c01fed13 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/service-broker-card/service-broker-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/service-broker-card/service-broker-card.component.ts
@@ -5,14 +5,14 @@ import { filter, map, switchMap, take, tap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
 import { ServicesService } from '../../../../../../cloud-foundry/src/features/service-catalog/services.service';
-import { IServiceBroker } from '../../../../../../core/src/core/cf-api-svc.types';
-import { ISpace } from '../../../../../../core/src/core/cf-api.types';
+import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
-import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
 import { APIResource } from '../../../../../../store/src/types/api.types';
-import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
+import { IServiceBroker } from '../../../../cf-api-svc.types';
+import { ISpace } from '../../../../cf-api.types';
 import { spaceEntityType } from '../../../../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
 
 @Component({
   selector: 'app-service-broker-card',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/service-recent-instances-card/service-recent-instances-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/service-recent-instances-card/service-recent-instances-card.component.ts
index 5e6b407498..f84441a6ae 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/service-recent-instances-card/service-recent-instances-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/service-recent-instances-card/service-recent-instances-card.component.ts
@@ -3,8 +3,8 @@ import { Observable } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 
 import { ServicesService } from '../../../../../../cloud-foundry/src/features/service-catalog/services.service';
-import { IServiceInstance } from '../../../../../../core/src/core/cf-api-svc.types';
 import { APIResource } from '../../../../../../store/src/types/api.types';
+import { IServiceInstance } from '../../../../cf-api-svc.types';
 
 const RECENT_ITEMS_COUNT = 10;
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/service-summary-card/service-summary-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/service-summary-card/service-summary-card.component.ts
index d08a01d6d9..27d2a27587 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/service-summary-card/service-summary-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/service-summary-card/service-summary-card.component.ts
@@ -6,9 +6,9 @@ import { ServicesService } from '../../../../../../cloud-foundry/src/features/se
 import {
   ServiceTag,
 } from '../../../../../../cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component';
-import { IService } from '../../../../../../core/src/core/cf-api-svc.types';
 import { AppChip } from '../../../../../../core/src/shared/components/chips/chips.component';
 import { APIResource } from '../../../../../../store/src/types/api.types';
+import { IService } from '../../../../cf-api-svc.types';
 
 
 @Component({
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts b/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
index 0eab5d7bd5..a4e3c8e057 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
@@ -3,15 +3,6 @@ import { ApplicationModule, NgModule, Type } from '@angular/core';
 import { MaterialDesignFrameworkModule } from 'stratos-angular6-json-schema-form';
 
 import { CoreModule } from '../../../../core/src/core/core.module';
-import {
-  TableCellQuotaComponent,
-} from '../../../../core/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component';
-import {
-  TableCellServiceLastOpComponent,
-} from '../../../../core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component';
-import {
-  TableCellServiceComponent,
-} from '../../../../core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component';
 import { CardCell, TableCellCustom } from '../../../../core/src/shared/components/list/list.types';
 import {
   ServiceInstanceLastOpComponent,
@@ -107,6 +98,7 @@ import {
   TableCellFeatureFlagStateComponent,
 } from './list/list-types/cf-feature-flags/table-cell-feature-flag-state/table-cell-feature-flag-state.component';
 import { CfOrgCardComponent } from './list/list-types/cf-orgs/cf-org-card/cf-org-card.component';
+import { TableCellQuotaComponent } from './list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component';
 import {
   TableCellRouteAppsAttachedComponent,
 } from './list/list-types/cf-routes/table-cell-route-apps-attached/table-cell-route-apps-attached.component';
@@ -140,6 +132,12 @@ import {
 import {
   TableCellServiceInstanceTagsComponent,
 } from './list/list-types/cf-spaces-service-instances/table-cell-service-instance-tags/table-cell-service-instance-tags.component';
+import {
+  TableCellServiceLastOpComponent,
+} from './list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component';
+import {
+  TableCellServiceComponent,
+} from './list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component';
 import {
   TableCellSpaceNameComponent,
 } from './list/list-types/cf-spaces-service-instances/table-cell-space-name/table-cell-space-name.component';
@@ -157,6 +155,9 @@ import {
 import {
   CfSpacePermissionCellComponent,
 } from './list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component';
+import {
+  TableCellCommitAuthorComponent,
+} from './list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component';
 import {
   TableCellAServicePlanExtrasComponent,
 } from './list/list-types/service-plans/table-cell-service-plan-extras/table-cell-service-plan-extras.component';
@@ -222,6 +223,7 @@ const cfListTableCells: Type<TableCellCustom<any>>[] = [
   TableCellServiceActiveComponent,
   TableCellServiceReferencesComponent,
   TableCellServiceInstanceTagsComponent,
+  TableCellCommitAuthorComponent,
 ];
 
 const cfListCards: Type<CardCell<any>>[] = [
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/create-application/create-application-step1/create-application-step1.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/create-application/create-application-step1/create-application-step1.component.ts
index a949b6f8d0..e455fddee4 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/create-application/create-application-step1/create-application-step1.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/create-application/create-application-step1/create-application-step1.component.ts
@@ -5,10 +5,10 @@ import { Store } from '@ngrx/store';
 import { asapScheduler, Observable, of } from 'rxjs';
 import { map, observeOn, startWith, switchMap, withLatestFrom } from 'rxjs/operators';
 
-import { ISpace } from '../../../../../../core/src/core/cf-api.types';
 import { PermissionStrings } from '../../../../../../core/src/core/current-user-permissions.config';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { SetCFDetails } from '../../../../actions/create-applications-page.actions';
+import { ISpace } from '../../../../cf-api.types';
 import { CFAppState } from '../../../../cf-app-state';
 import { getSpacesFromOrgWithRole } from '../../../../store/selectors/cf-current-user-role.selectors';
 import { CfOrgSpaceDataService } from '../../../data-services/cf-org-space-service.service';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts
index c4f09cb617..83d7992262 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts
@@ -8,14 +8,17 @@ import { DeleteApplicationInstance } from '../../../../../../../cloud-foundry/sr
 import { FetchApplicationMetricsAction } from '../../../../../../../cloud-foundry/src/actions/cf-metrics.actions';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { UtilsService } from '../../../../../../../core/src/core/utils.service';
-import { CfCellHelper } from '../../../../../../../core/src/features/cloud-foundry/cf-cell.helpers';
 import { ConfirmationDialogConfig } from '../../../../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../../../core/src/shared/components/confirmation-dialog.service';
 import {
   getIntegerFieldSortFunction,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/local-filtering-sorting';
 import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
-import { IListAction, IListConfig, ListViewTypes } from '../../../../../../../core/src/shared/components/list/list.component.types';
+import {
+  IListAction,
+  IListConfig,
+  ListViewTypes,
+} from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { MetricQueryType } from '../../../../../../../core/src/shared/services/metrics-range-selector.types';
 import { MetricQueryConfig } from '../../../../../../../store/src/actions/metrics.actions';
 import { EntityServiceFactory } from '../../../../../../../store/src/entity-service-factory.service';
@@ -23,6 +26,7 @@ import { PaginationMonitorFactory } from '../../../../../../../store/src/monitor
 import { IMetricMatrixResult, IMetrics } from '../../../../../../../store/src/types/base-metric.types';
 import { IMetricApplication } from '../../../../../../../store/src/types/metric.types';
 import { ApplicationService } from '../../../../../features/applications/application.service';
+import { CfCellHelper } from '../../../../../features/cloud-foundry/cf-cell.helpers';
 import { ListAppInstance } from './app-instance-types';
 import { CfAppInstancesDataSource } from './cf-app-instances-data-source';
 import { TableCellCfCellComponent } from './table-cell-cf-cell/table-cell-cf-cell.component';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-data-source.ts
index f66e3556dd..130a5a454c 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-data-source.ts
@@ -1,13 +1,13 @@
 import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { IRoute } from '../../../../../../../core/src/core/cf-api.types';
 import {
   IListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
+import { IRoute } from '../../../../../cf-api.types';
 import { ApplicationService } from '../../../../../features/applications/application.service';
 import { CfRoutesDataSourceBase } from '../cf-routes/cf-routes-data-source-base';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.spec.ts
index a750364c56..adff6cfe8b 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.spec.ts
@@ -1,20 +1,18 @@
 import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { IServiceInstance } from '../../../../../../../../core/src/core/cf-api-svc.types';
 import {
   ApplicationStateService,
 } from '../../../../../../../../core/src/shared/components/application-state/application-state.service';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
-import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
-import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import {
   generateTestApplicationServiceProvider,
 } from '../../../../../../../../core/test-framework/application-service-helper';
-import {
-  generateCfBaseTestModules,
-} from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
+import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { generateCfBaseTestModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { IServiceInstance } from '../../../../../../cf-api-svc.types';
 import {
   ApplicationEnvVarsHelper,
 } from '../../../../../../features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts
index 671f85f971..83af4e06e6 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts
@@ -4,12 +4,6 @@ import { MatDialog } from '@angular/material/dialog';
 import { combineLatest as observableCombineLatest, Observable, of as observableOf, of } from 'rxjs';
 import { filter, first, map, switchMap } from 'rxjs/operators';
 
-import {
-  IService,
-  IServiceBinding,
-  IServiceInstance,
-  IUserProvidedServiceInstance,
-} from '../../../../../../../../core/src/core/cf-api-svc.types';
 import { CurrentUserPermissions } from '../../../../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../../../../core/src/core/current-user-permissions.service';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
@@ -22,6 +16,12 @@ import { ComponentEntityMonitorConfig } from '../../../../../../../../core/src/s
 import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { APIResource, EntityInfo } from '../../../../../../../../store/src/types/api.types';
+import {
+  IService,
+  IServiceBinding,
+  IServiceInstance,
+  IUserProvidedServiceInstance,
+} from '../../../../../../cf-api-svc.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import {
   serviceBindingEntityType,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-data-source.ts
index 6b324918a8..d416ccbe40 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-data-source.ts
@@ -14,7 +14,6 @@ import {
 } from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { ApplicationService } from '../../../../../../../cloud-foundry/src/features/applications/application.service';
 import { getRowMetadata } from '../../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
-import { IServiceBinding } from '../../../../../../../core/src/core/cf-api-svc.types';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
@@ -22,6 +21,7 @@ import { IListConfig } from '../../../../../../../core/src/shared/components/lis
 import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { IEntityMetadata } from '../../../../../../../store/src/entity-catalog/entity-catalog.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { IServiceBinding } from '../../../../../cf-api-svc.types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { ServiceBindingActionBuilders } from '../../../../../entity-action-builders/service-binding.action-builders';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts
index 6dd1fccbab..139a5c0960 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts
@@ -4,7 +4,6 @@ import { Store } from '@ngrx/store';
 import { switchMap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { IServiceBinding } from '../../../../../../../core/src/core/cf-api-svc.types';
 import { CurrentUserPermissions } from '../../../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
 import {
@@ -20,6 +19,7 @@ import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { GetAppServiceBindings } from '../../../../../actions/application-service-routes.actions';
+import { IServiceBinding } from '../../../../../cf-api-svc.types';
 import { ApplicationService } from '../../../../../features/applications/application.service';
 import { isServiceInstance, isUserProvidedServiceInstance } from '../../../../../features/cloud-foundry/cf.helpers';
 import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/TableCellAppCfOrgSpaceBase.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/TableCellAppCfOrgSpaceBase.ts
index 8a8ced84d6..4996c4d1ca 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/TableCellAppCfOrgSpaceBase.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/TableCellAppCfOrgSpaceBase.ts
@@ -1,10 +1,10 @@
 import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { IApp } from '../../../../../../../core/src/core/cf-api.types';
 import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
 import { CfOrgSpaceLabelService } from '../../../../../../../core/src/shared/services/cf-org-space-label.service';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { IApp } from '../../../../../cf-api.types';
 
 
 export class TableCellAppCfOrgSpaceBase extends TableCellCustom<APIResource<IApp>> {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.spec.ts
index 31eb3c697d..2e382833c0 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.spec.ts
@@ -1,15 +1,15 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
-import { IApp } from '../../../../../../../../core/src/core/cf-api.types';
 import { CoreModule } from '../../../../../../../../core/src/core/core.module';
 import {
   ApplicationStateService,
 } from '../../../../../../../../core/src/shared/components/application-state/application-state.service';
-import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { SharedModule } from '../../../../../../../../core/src/shared/shared.module';
-import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResourceMetadata } from '../../../../../../../../store/src/types/api.types';
+import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { IApp } from '../../../../../../cf-api.types';
 import { CfOrgSpaceLinksComponent } from '../../../../cf-org-space-links/cf-org-space-links.component';
 import { RunningInstancesComponent } from '../../../../running-instances/running-instances.component';
 import { CardAppComponent } from './card-app.component';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts
index 692f9f8c9b..77ed5f809e 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts
@@ -6,7 +6,6 @@ import { map, startWith } from 'rxjs/operators';
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
 import { applicationEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types';
 import { IAppFavMetadata } from '../../../../../../../../cloud-foundry/src/cf-metadata-types';
-import { IApp, ISpace } from '../../../../../../../../core/src/core/cf-api.types';
 import { getFavoriteFromCfEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
 import {
   ApplicationStateData,
@@ -20,6 +19,7 @@ import { CfOrgSpaceLabelService } from '../../../../../../../../core/src/shared/
 import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../core/src/shared/shared.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
+import { IApp, ISpace } from '../../../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { ApplicationService } from '../../../../../../features/applications/application.service';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-app-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-app-config.service.ts
index bc314a9aa7..a2b5398834 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-app-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-app-config.service.ts
@@ -6,7 +6,6 @@ import { filter, first, map, switchMap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { applicationEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
-import { IApp } from '../../../../../../../core/src/core/cf-api.types';
 import { UtilsService } from '../../../../../../../core/src/core/utils.service';
 import {
   createTableColumnFavorite,
@@ -21,6 +20,7 @@ import {
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../../../store/src/types/user-favorites.types';
+import { IApp } from '../../../../../cf-api.types';
 import { CfOrgSpaceDataService, createCfOrgSpaceFilterConfig } from '../../../../data-services/cf-org-space-service.service';
 import { CardAppComponent } from './card/card-app.component';
 import { CfAppsDataSource } from './cf-apps-data-source';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-cforgspace/table-cell-app-cforgspace.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-cforgspace/table-cell-app-cforgspace.component.ts
index 891b8aa15d..f5c2fdb4c9 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-cforgspace/table-cell-app-cforgspace.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-cforgspace/table-cell-app-cforgspace.component.ts
@@ -2,8 +2,8 @@ import { Component, Input } from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
-import { IApp, ISpace } from '../../../../../../../../core/src/core/cf-api.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IApp, ISpace } from '../../../../../../cf-api.types';
 import { TableCellAppCfOrgSpaceBase } from '../TableCellAppCfOrgSpaceBase';
 
 @Component({
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpack-card/cf-buildpack-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpack-card/cf-buildpack-card.component.ts
index 59234152ae..05088b0e4d 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpack-card/cf-buildpack-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpack-card/cf-buildpack-card.component.ts
@@ -1,8 +1,8 @@
 import { Component } from '@angular/core';
 
-import { IBuildpack } from '../../../../../../../../core/src/core/cf-api.types';
 import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IBuildpack } from '../../../../../../cf-api.types';
 
 @Component({
   selector: 'app-cf-buildpack-card',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-list-config.service.ts
index 4f9b8b0f76..779c9cbcad 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-list-config.service.ts
@@ -2,9 +2,9 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { IBuildpack } from '../../../../../../../core/src/core/cf-api.types';
 import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { IBuildpack } from '../../../../../cf-api.types';
 import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import { CfBuildpackCardComponent } from './cf-buildpack-card/cf-buildpack-card.component';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-list-config.service.ts
index a825265f43..6bc5cdfb94 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-list-config.service.ts
@@ -2,12 +2,12 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { IApp, ISpace } from '../../../../../../../core/src/core/cf-api.types';
-import { EntityServiceFactory } from '../../../../../../../store/src/entity-service-factory.service';
 import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
 import { ListViewTypes } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
+import { EntityServiceFactory } from '../../../../../../../store/src/entity-service-factory.service';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { IApp, ISpace } from '../../../../../cf-api.types';
 import { ActiveRouteCfCell } from '../../../../../features/cloud-foundry/cf-page.types';
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import { CfCellApp, CfCellAppsDataSource } from './cf-cell-apps-source';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-source.ts
index 3dbc2319f2..a2190a35e2 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-source.ts
@@ -9,18 +9,18 @@ import {
   organizationEntityType,
   spaceEntityType,
 } from '../../../../../../../cloud-foundry/src/cf-entity-types';
-import { IApp } from '../../../../../../../core/src/core/cf-api.types';
-import { EntityServiceFactory } from '../../../../../../../store/src/entity-service-factory.service';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { MetricQueryType } from '../../../../../../../core/src/shared/services/metrics-range-selector.types';
 import { MetricQueryConfig } from '../../../../../../../store/src/actions/metrics.actions';
+import { EntityServiceFactory } from '../../../../../../../store/src/entity-service-factory.service';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { IMetrics, IMetricVectorResult } from '../../../../../../../store/src/types/base-metric.types';
 import { IMetricApplication } from '../../../../../../../store/src/types/metric.types';
 import { FetchCFMetricsPaginatedAction } from '../../../../../actions/cf-metrics.actions';
+import { IApp } from '../../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { createEntityRelationKey } from '../../../../../entity-relations/entity-relations.types';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-health/cf-cell-health-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-health/cf-cell-health-list-config.service.ts
index 5b5272fe7a..7f859aa4bb 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-health/cf-cell-health-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-health/cf-cell-health-list-config.service.ts
@@ -1,12 +1,12 @@
-// tslint:disable:max-line-length
 import { DatePipe } from '@angular/common';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { first, tap } from 'rxjs/operators';
 
-import { CfCellHelper } from '../../../../../../../core/src/features/cloud-foundry/cf-cell.helpers';
-import { BooleanIndicatorType } from '../../../../../../../core/src/shared/components/boolean-indicator/boolean-indicator.component';
+import {
+  BooleanIndicatorType,
+} from '../../../../../../../core/src/shared/components/boolean-indicator/boolean-indicator.component';
 import {
   TableCellBooleanIndicatorComponent,
   TableCellBooleanIndicatorComponentConfig,
@@ -17,12 +17,14 @@ import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { FetchCFCellMetricsPaginatedAction } from '../../../../../actions/cf-metrics.actions';
 import { CFAppState } from '../../../../../cf-app-state';
+import { CfCellHelper } from '../../../../../features/cloud-foundry/cf-cell.helpers';
 import {
   CloudFoundryCellService,
 } from '../../../../../features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell.service';
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import { CfCellHealthDataSource, CfCellHealthEntry, CfCellHealthState } from './cf-cell-health-source';
 
+// tslint:disable:max-line-length
 
 // TODO: Move file to CF package (#3769)
 // tslint:enable:max-line-length
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cells/cf-cells-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cells/cf-cells-list-config.service.ts
index 85150f28e4..019ab20631 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cells/cf-cells-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cells/cf-cells-list-config.service.ts
@@ -1,12 +1,12 @@
-// tslint:disable:max-line-length
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { first, tap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { CfCellHelper } from '../../../../../../../core/src/features/cloud-foundry/cf-cell.helpers';
-import { BooleanIndicatorType } from '../../../../../../../core/src/shared/components/boolean-indicator/boolean-indicator.component';
+import {
+  BooleanIndicatorType,
+} from '../../../../../../../core/src/shared/components/boolean-indicator/boolean-indicator.component';
 import {
   TableCellBooleanIndicatorComponent,
   TableCellBooleanIndicatorComponentConfig,
@@ -17,10 +17,12 @@ import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { IMetricVectorResult } from '../../../../../../../store/src/types/base-metric.types';
 import { IMetricCell } from '../../../../../../../store/src/types/metric.types';
+import { CfCellHelper } from '../../../../../features/cloud-foundry/cf-cell.helpers';
 import { ActiveRouteCfCell } from '../../../../../features/cloud-foundry/cf-page.types';
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import { CfCellsDataSource } from './cf-cells-data-source';
 
+// tslint:disable:max-line-length
 
 // tslint:enable:max-line-length
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/cf-events-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/cf-events-config.service.ts
index 10bf21bcfd..95d10424cd 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/cf-events-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/cf-events-config.service.ts
@@ -2,7 +2,6 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { distinctUntilChanged, first, map } from 'rxjs/operators';
 
-import { CfEvent } from '../../../../../../../core/src/core/cf-api.types';
 import { arraysEqual } from '../../../../../../../core/src/core/utils.service';
 import {
   valueOrCommonFalsy,
@@ -16,6 +15,7 @@ import {
 import { AddParams, RemoveParams } from '../../../../../../../store/src/actions/pagination.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
+import { CfEvent } from '../../../../../cf-api.types';
 import { CFAppState } from '../../../../../cf-app-state';
 import { QParam, QParamJoiners } from '../../../../q-param';
 import { CfEventsDataSource } from './cf-events-data-source';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-detail/table-cell-event-detail.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-detail/table-cell-event-detail.component.spec.ts
index 9226ebe168..777f255527 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-detail/table-cell-event-detail.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-detail/table-cell-event-detail.component.spec.ts
@@ -1,9 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { CfEvent } from '../../../../../../../../core/src/core/cf-api.types';
 import { CoreModule } from '../../../../../../../../core/src/core/core.module';
 import { ValuesPipe } from '../../../../../../../../core/src/shared/pipes/values.pipe';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { CfEvent } from '../../../../../../cf-api.types';
 import { EventMetadataComponent } from '../event-metadata/event-metadata.component';
 import { TableCellEventDetailComponent } from './table-cell-event-detail.component';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-detail/table-cell-event-detail.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-detail/table-cell-event-detail.component.ts
index 843a92aa6a..6133dbfe14 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-detail/table-cell-event-detail.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-detail/table-cell-event-detail.component.ts
@@ -1,8 +1,8 @@
 import { Component } from '@angular/core';
 
-import { CfEvent } from '../../../../../../../../core/src/core/cf-api.types';
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { CfEvent } from '../../../../../../cf-api.types';
 
 /* tslint:disable:no-access-missing-member https://github.com/mgechev/codelyzer/issues/191*/
 @Component({
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-data-source.ts
index 3981cf1173..ec59dc5a39 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-data-source.ts
@@ -2,12 +2,12 @@ import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { featureFlagEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
-import { IFeatureFlag } from '../../../../../../../core/src/core/cf-api.types';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { PaginationEntityState } from '../../../../../../../store/src/types/pagination.types';
+import { IFeatureFlag } from '../../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { createCfFeatureFlagFetchAction } from './cf-feature-flags-data-source.helpers';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-list-config.service.ts
index e308c75400..f943e373ad 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-list-config.service.ts
@@ -2,15 +2,17 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { IFeatureFlag } from '../../../../../../../core/src/core/cf-api.types';
 import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
 import { IListFilter, ListViewTypes } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
+import { IFeatureFlag } from '../../../../../cf-api.types';
 import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import { CfFeatureFlagsDataSource } from './cf-feature-flags-data-source';
+import {
+  TableCellFeatureFlagDescriptionComponent,
+} from './table-cell-feature-flag-description/table-cell-feature-flag-description.component';
 import { TableCellFeatureFlagStateComponent } from './table-cell-feature-flag-state/table-cell-feature-flag-state.component';
-import { TableCellFeatureFlagDescriptionComponent } from './table-cell-feature-flag-description/table-cell-feature-flag-description.component';
 
 @Injectable()
 export class CfFeatureFlagsListConfigService extends BaseCfListConfig<IFeatureFlag> {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/table-cell-feature-flag-description/table-cell-feature-flag-description.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/table-cell-feature-flag-description/table-cell-feature-flag-description.component.ts
index 36d5c4eab7..5d7938f1f7 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/table-cell-feature-flag-description/table-cell-feature-flag-description.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/table-cell-feature-flag-description/table-cell-feature-flag-description.component.ts
@@ -1,6 +1,7 @@
 import { Component, Input } from '@angular/core';
+import { IFeatureFlag } from 'frontend/packages/cloud-foundry/src/cf-api.types';
 import { TableCellCustom } from 'frontend/packages/core/src/shared/components/list/list.types';
-import { IFeatureFlag } from 'frontend/packages/core/src/core/cf-api.types';
+
 import { FeatureFlagDescriptions } from '../cf-feature-flags-data-source';
 
 @Component({
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/table-cell-feature-flag-state/table-cell-feature-flag-state.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/table-cell-feature-flag-state/table-cell-feature-flag-state.component.ts
index 20b720023b..1d8725ddc4 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/table-cell-feature-flag-state/table-cell-feature-flag-state.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/table-cell-feature-flag-state/table-cell-feature-flag-state.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 
-import { IFeatureFlag } from '../../../../../../../../core/src/core/cf-api.types';
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
+import { IFeatureFlag } from '../../../../../../cf-api.types';
 
 @Component({
   selector: 'app-table-cell-feature-flag-state',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.ts
index f6a004f6b6..c43911bdcb 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.ts
@@ -6,8 +6,6 @@ import { map, publishReplay, refCount, switchMap, tap } from 'rxjs/operators';
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
 import { organizationEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types';
 import { createUserRoleInOrg } from '../../../../../../../../cloud-foundry/src/store/types/user.types';
-import { IApp, IOrganization } from '../../../../../../../../core/src/core/cf-api.types';
-import { getStartedAppInstanceCount } from '../../../../../../../../core/src/core/cf.helpers';
 import { CurrentUserPermissions } from '../../../../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../../../../core/src/core/current-user-permissions.service';
 import { getFavoriteFromCfEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
@@ -28,7 +26,9 @@ import { PaginationMonitorFactory } from '../../../../../../../../store/src/moni
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { EndpointUser } from '../../../../../../../../store/src/types/endpoint.types';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
+import { IApp, IOrganization } from '../../../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
+import { getStartedAppInstanceCount } from '../../../../../../cf.helpers';
 import { getOrgRolesString } from '../../../../../../features/cloud-foundry/cf.helpers';
 import {
   CloudFoundryEndpointService,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-orgs-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-orgs-list-config.service.ts
index 3c04ae7467..4ab0ef44aa 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-orgs-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-orgs-list-config.service.ts
@@ -2,9 +2,9 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { IOrganization } from '../../../../../../../core/src/core/cf-api.types';
 import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { IOrganization } from '../../../../../cf-api.types';
 import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import { CfOrgCardComponent } from './cf-org-card/cf-org-card.component';
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-quotas/cf-quotas-data-source.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/cf-quotas-data-source.service.ts
similarity index 69%
rename from src/frontend/packages/core/src/shared/components/list/list-types/cf-quotas/cf-quotas-data-source.service.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/cf-quotas-data-source.service.ts
index 548c5675c3..476e90fe2a 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-quotas/cf-quotas-data-source.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/cf-quotas-data-source.service.ts
@@ -3,19 +3,21 @@ import { of } from 'rxjs';
 import { distinctUntilChanged, map } from 'rxjs/operators';
 
 import { GetQuotaDefinitions } from '../../../../../../../cloud-foundry/src/actions/quota-definitions.actions';
-import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { cfEntityFactory } from '../../../../../../../cloud-foundry/src/cf-entity-factory';
-import { quotaDefinitionEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
 import {
-  createEntityRelationPaginationKey,
-} from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { getRowMetadata } from '../../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
+  ListDataSource,
+} from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
+import {
+  getDefaultRowState,
+} from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
+import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
-import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { EntityMonitor } from '../../../../../../../store/src/monitors/entity-monitor';
-import { ListDataSource } from '../../data-sources-controllers/list-data-source';
-import { getDefaultRowState } from '../../data-sources-controllers/list-data-source-types';
-import { IListConfig } from '../../list.component.types';
+import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { CFAppState } from '../../../../../cf-app-state';
+import { cfEntityFactory } from '../../../../../cf-entity-factory';
+import { quotaDefinitionEntityType } from '../../../../../cf-entity-types';
+import { createEntityRelationPaginationKey } from '../../../../../entity-relations/entity-relations.types';
+import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 
 export class CfQuotasDataSourceService extends ListDataSource<APIResource> {
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.spec.ts
similarity index 71%
rename from src/frontend/packages/core/src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.spec.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.spec.ts
index 33e1baf7df..edb7b87023 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.spec.ts
@@ -1,11 +1,11 @@
 import { DatePipe } from '@angular/common';
 import { inject, TestBed } from '@angular/core/testing';
 
-import { CfQuotasListConfigService } from './cf-quotas-list-config.service';
+import { CFBaseTestModules } from '../../../../../../test-framework/cf-test-helper';
 import {
-  generateTestCfEndpointServiceProvider
-} from '../../../../../../../cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper';
-import { CFBaseTestModules } from '../../../../../../../cloud-foundry/test-framework/cf-test-helper';
+  generateTestCfEndpointServiceProvider,
+} from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { CfQuotasListConfigService } from './cf-quotas-list-config.service';
 
 describe('CfQuotasListConfigService', () => {
   beforeEach(() => {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.ts
similarity index 82%
rename from src/frontend/packages/core/src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.ts
index b1fd91bab2..9840ba444f 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/cf-quotas-list-config.service.ts
@@ -3,21 +3,23 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 
+import { DeleteQuotaDefinition } from '../../../../../../../cloud-foundry/src/actions/quota-definitions.actions';
+import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
+import { ActiveRouteCfOrgSpace } from '../../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
+import {
+  BaseCfListConfig,
+} from '../../../../../../../cloud-foundry/src/shared/components/list/list-types/base-cf/base-cf-list-config';
+import { CurrentUserPermissions } from '../../../../../../../core/src/core/current-user-permissions.config';
+import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
+import { ConfirmationDialogConfig } from '../../../../../../../core/src/shared/components/confirmation-dialog.config';
+import { ConfirmationDialogService } from '../../../../../../../core/src/shared/components/confirmation-dialog.service';
+import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
+import { IListAction, ListViewTypes } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { IQuotaDefinition } from '../../../../../core/cf-api.types';
-import { CurrentUserPermissions } from '../../../../../core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../../core/current-user-permissions.service';
-import { ConfirmationDialogConfig } from '../../../confirmation-dialog.config';
-import { ConfirmationDialogService } from '../../../confirmation-dialog.service';
-import { ITableColumn } from '../../list-table/table.types';
-import { IListAction, ListViewTypes } from '../../list.component.types';
+import { IQuotaDefinition } from '../../../../../cf-api.types';
 import { CfQuotasDataSourceService } from './cf-quotas-data-source.service';
 import { TableCellQuotaComponent } from './table-cell-quota/table-cell-quota.component';
-import { BaseCfListConfig } from '../../../../../../../cloud-foundry/src/shared/components/list/list-types/base-cf/base-cf-list-config';
-import { ActiveRouteCfOrgSpace } from '../../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
-import { DeleteQuotaDefinition } from '../../../../../../../cloud-foundry/src/actions/quota-definitions.actions';
-import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 
 export const QUOTA_FROM_LIST = 'list';
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.html
similarity index 100%
rename from src/frontend/packages/core/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.html
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.html
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.scss
similarity index 100%
rename from src/frontend/packages/core/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.scss
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.scss
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.spec.ts
similarity index 95%
rename from src/frontend/packages/core/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.spec.ts
index 011a58c91b..10e4abeef9 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.spec.ts
@@ -1,9 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createBasicStoreModule } from '@stratos/store/testing';
 
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
-import { createBasicStoreModule } from '@stratos/store/testing';
-import { IQuotaDefinition } from '../../../../../../core/cf-api.types';
+import { IQuotaDefinition } from '../../../../../../cf-api.types';
 import { TableCellQuotaComponent } from './table-cell-quota.component';
 
 describe('TableCellQuotaComponent', () => {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.ts
similarity index 76%
rename from src/frontend/packages/core/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.ts
index 7958398fbd..83a47399bc 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component.ts
@@ -1,8 +1,8 @@
 import { Component, OnInit } from '@angular/core';
 
+import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
-import { IQuotaDefinition } from '../../../../../../core/cf-api.types';
-import { TableCellCustom } from '../../../list.types';
+import { IQuotaDefinition } from '../../../../../../cf-api.types';
 
 @Component({
   selector: 'app-table-cell-quota',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source-base.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source-base.ts
index f862c9380d..21194e6800 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source-base.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source-base.ts
@@ -4,7 +4,6 @@ import { map, switchMap, tap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { routeEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
-import { IRoute } from '../../../../../../../core/src/core/cf-api.types';
 import { safeUnsubscribe } from '../../../../../../../core/src/core/utils.service';
 import {
   ListPaginationMultiFilterChange,
@@ -18,6 +17,7 @@ import { entityCatalog } from '../../../../../../../store/src/entity-catalog/ent
 import { PaginationMonitor } from '../../../../../../../store/src/monitors/pagination-monitor';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginatedAction, PaginationParam } from '../../../../../../../store/src/types/pagination.types';
+import { IRoute } from '../../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { getRoute, isTCPRoute } from '../../../../../features/applications/routes/routes.helper';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source.ts
index 27a4ce752b..8270d4daaa 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source.ts
@@ -1,15 +1,15 @@
 import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { IRoute } from '../../../../../../../core/src/core/cf-api.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import {
   IListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
+import { IRoute } from '../../../../../cf-api.types';
 import { routeEntityType } from '../../../../../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CfRoutesDataSourceBase } from '../cf-routes/cf-routes-data-source-base';
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.ts
index c827fb2335..a93e2e1137 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component.ts
@@ -1,9 +1,9 @@
 import { Component, OnInit } from '@angular/core';
 
-import { IRule, IRuleType, ISpace } from '../../../../../../../../core/src/core/cf-api.types';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
 import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IRule, IRuleType, ISpace } from '../../../../../../cf-api.types';
 import {
   CloudFoundryEndpointService,
 } from '../../../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.ts
index eb28c1b577..9ef621de29 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.ts
@@ -3,13 +3,13 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
-import { IService, IServiceExtra } from '../../../../../../../../core/src/core/cf-api-svc.types';
-import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
 import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { CfOrgSpaceLabelService } from '../../../../../../../../core/src/shared/services/cf-org-space-label.service';
 import { RouterNav } from '../../../../../../../../store/src/actions/router.actions';
+import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IService, IServiceExtra } from '../../../../../../cf-api-svc.types';
 import { getServiceBrokerName, getServiceName } from '../../../../../../features/service-catalog/services-helper';
 
 export interface ServiceTag {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts
index 8ae65a4138..12d081c77a 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts
@@ -5,19 +5,12 @@ import { Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { IServiceInstance } from '../../../../../../../core/src/core/cf-api-svc.types';
 import { CurrentUserPermissions } from '../../../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { ITableColumn, ITableText } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
-import {
-  TableCellServiceLastOpComponent,
-} from '../../../../../../../core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component';
-import {
-  TableCellServiceComponent,
-} from '../../../../../../../core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component';
 import {
   defaultPaginationPageSizeOptionsTable,
   IListAction,
@@ -26,6 +19,7 @@ import {
 } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { IServiceInstance } from '../../../../../cf-api-svc.types';
 import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service';
 import { CANCEL_ORG_ID_PARAM, CANCEL_SPACE_ID_PARAM } from '../../../add-service-instance/csi-mode.service';
 import {
@@ -38,6 +32,10 @@ import {
 import {
   TableCellServiceInstanceTagsComponent,
 } from '../cf-spaces-service-instances/table-cell-service-instance-tags/table-cell-service-instance-tags.component';
+import {
+  TableCellServiceLastOpComponent,
+} from '../cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component';
+import { TableCellServiceComponent } from '../cf-spaces-service-instances/table-cell-service/table-cell-service.component';
 
 interface CanCache {
   [spaceGuid: string]: Observable<boolean>;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts
index 707759b41b..6a375c2522 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts
@@ -5,7 +5,6 @@ import { Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { IUserProvidedServiceInstance } from '../../../../../../../core/src/core/cf-api-svc.types';
 import { CurrentUserPermissions } from '../../../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
 import {
@@ -20,6 +19,7 @@ import {
 } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { IUserProvidedServiceInstance } from '../../../../../cf-api-svc.types';
 import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service';
 import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-active/table-cell-service-active.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-active/table-cell-service-active.component.ts
index 101b1416f1..0cb53ef299 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-active/table-cell-service-active.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-active/table-cell-service-active.component.ts
@@ -1,8 +1,8 @@
 import { Component, Input } from '@angular/core';
 
-import { IService } from '../../../../../../../../core/src/core/cf-api-svc.types';
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IService } from '../../../../../../cf-api-svc.types';
 
 @Component({
   selector: 'app-table-cell-service-active',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-bindable/table-cell-service-bindable.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-bindable/table-cell-service-bindable.component.ts
index c712a163fa..fb4815f3fc 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-bindable/table-cell-service-bindable.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-bindable/table-cell-service-bindable.component.ts
@@ -1,8 +1,8 @@
 import { Component, Input } from '@angular/core';
 
-import { IService } from '../../../../../../../../core/src/core/cf-api-svc.types';
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IService } from '../../../../../../cf-api-svc.types';
 
 @Component({
   selector: 'app-table-cell-service-bindable',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-cf-breadcrumbs/table-cell-service-cf-breadcrumbs.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-cf-breadcrumbs/table-cell-service-cf-breadcrumbs.component.ts
index b9bc892439..18d6d45838 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-cf-breadcrumbs/table-cell-service-cf-breadcrumbs.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-cf-breadcrumbs/table-cell-service-cf-breadcrumbs.component.ts
@@ -1,10 +1,10 @@
 import { Component, Input } from '@angular/core';
 import { Store } from '@ngrx/store';
 
-import { IService } from '../../../../../../../../core/src/core/cf-api-svc.types';
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { CfOrgSpaceLabelService } from '../../../../../../../../core/src/shared/services/cf-org-space-label.service';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IService } from '../../../../../../cf-api-svc.types';
 import { CFAppState } from '../../../../../../cf-app-state';
 
 @Component({
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-provider/table-cell-service-provider.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-provider/table-cell-service-provider.component.ts
index 2d54a4389d..2e7687d1d5 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-provider/table-cell-service-provider.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-provider/table-cell-service-provider.component.ts
@@ -1,8 +1,8 @@
 import { Component, Input } from '@angular/core';
 
-import { IService, IServiceExtra } from '../../../../../../../../core/src/core/cf-api-svc.types';
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IService, IServiceExtra } from '../../../../../../cf-api-svc.types';
 
 @Component({
   selector: 'app-table-cell-service-provider',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-references/table-cell-service-references.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-references/table-cell-service-references.component.ts
index c147decdec..00c308ba7b 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-references/table-cell-service-references.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-references/table-cell-service-references.component.ts
@@ -1,8 +1,8 @@
 import { Component, Input } from '@angular/core';
 
-import { IService, IServiceExtra } from '../../../../../../../../core/src/core/cf-api-svc.types';
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IService, IServiceExtra } from '../../../../../../cf-api-svc.types';
 
 @Component({
   selector: 'app-table-cell-service-references',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-tags/table-cell-service-tags.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-tags/table-cell-service-tags.component.ts
index 2ed6fd4f93..786bcaffc4 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-tags/table-cell-service-tags.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-tags/table-cell-service-tags.component.ts
@@ -1,10 +1,10 @@
 import { Component, Input } from '@angular/core';
 import { of } from 'rxjs';
 
-import { IService } from '../../../../../../../../core/src/core/cf-api-svc.types';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IService } from '../../../../../../cf-api-svc.types';
 import { ServiceTag } from '../cf-service-card/cf-service-card.component';
 
 @Component({
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.ts
index 69f867b749..60065a1ebb 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.ts
@@ -5,7 +5,6 @@ import { Store } from '@ngrx/store';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { applicationEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
 import { ISpaceFavMetadata } from '../../../../../../../cloud-foundry/src/cf-metadata-types';
-import { IApp } from '../../../../../../../core/src/core/cf-api.types';
 import {
   createTableColumnFavorite,
 } from '../../../../../../../core/src/shared/components/list/list-table/table-cell-favorite/table-cell-favorite.component';
@@ -18,6 +17,7 @@ import {
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { UserFavorite } from '../../../../../../../store/src/types/user-favorites.types';
+import { IApp } from '../../../../../cf-api.types';
 import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service';
 import { TableCellAppNameComponent } from '../app/table-cell-app-name/table-cell-app-name.component';
 import { TableCellAppStatusComponent } from '../app/table-cell-app-status/table-cell-app-status.component';
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-data-source.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-data-source.service.ts
similarity index 66%
rename from src/frontend/packages/core/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-data-source.service.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-data-source.service.ts
index 635cac7e07..38f5b495c3 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-data-source.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-data-source.service.ts
@@ -3,21 +3,21 @@ import { of } from 'rxjs';
 import { distinctUntilChanged, map } from 'rxjs/operators';
 
 import {
-  GetOrganizationSpaceQuotaDefinitions,
-} from '../../../../../../../cloud-foundry/src/actions/quota-definitions.actions';
-import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { cfEntityFactory } from '../../../../../../../cloud-foundry/src/cf-entity-factory';
-import { spaceQuotaEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
+  ListDataSource,
+} from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import {
-  createEntityRelationPaginationKey,
-} from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { getRowMetadata } from '../../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
+  getDefaultRowState,
+} from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
+import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
-import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { EntityMonitor } from '../../../../../../../store/src/monitors/entity-monitor';
-import { ListDataSource } from '../../data-sources-controllers/list-data-source';
-import { getDefaultRowState } from '../../data-sources-controllers/list-data-source-types';
-import { IListConfig } from '../../list.component.types';
+import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { GetOrganizationSpaceQuotaDefinitions } from '../../../../../actions/quota-definitions.actions';
+import { CFAppState } from '../../../../../cf-app-state';
+import { cfEntityFactory } from '../../../../../cf-entity-factory';
+import { spaceQuotaEntityType } from '../../../../../cf-entity-types';
+import { createEntityRelationPaginationKey } from '../../../../../entity-relations/entity-relations.types';
+import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 
 export class CfOrgSpaceQuotasDataSourceService extends ListDataSource<APIResource> {
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.spec.ts
similarity index 72%
rename from src/frontend/packages/core/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.spec.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.spec.ts
index df0b70c4b7..bb899820da 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.spec.ts
@@ -1,11 +1,11 @@
 import { DatePipe } from '@angular/common';
 import { inject, TestBed } from '@angular/core/testing';
 
-import { CfSpaceQuotasListConfigService } from './cf-space-quotas-list-config.service';
+import { CFBaseTestModules } from '../../../../../../test-framework/cf-test-helper';
 import {
-  generateTestCfEndpointServiceProvider
-} from '../../../../../../../cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper';
-import { CFBaseTestModules } from '../../../../../../../cloud-foundry/test-framework/cf-test-helper';
+  generateTestCfEndpointServiceProvider,
+} from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { CfSpaceQuotasListConfigService } from './cf-space-quotas-list-config.service';
 
 describe('CfSpaceQuotasListConfigService', () => {
   beforeEach(() => {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.ts
similarity index 79%
rename from src/frontend/packages/core/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.ts
index 6905bfbd3c..3cfc6e83c1 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-list-config.service.ts
@@ -3,22 +3,22 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 
+import { CurrentUserPermissions } from '../../../../../../../core/src/core/current-user-permissions.config';
+import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
+import { ConfirmationDialogConfig } from '../../../../../../../core/src/shared/components/confirmation-dialog.config';
+import { ConfirmationDialogService } from '../../../../../../../core/src/shared/components/confirmation-dialog.service';
+import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
+import { IListAction, ListViewTypes } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { IQuotaDefinition } from '../../../../../core/cf-api.types';
-import { CurrentUserPermissions } from '../../../../../core/current-user-permissions.config';
-import { CurrentUserPermissionsService } from '../../../../../core/current-user-permissions.service';
-import { ConfirmationDialogConfig } from '../../../confirmation-dialog.config';
-import { ConfirmationDialogService } from '../../../confirmation-dialog.service';
-import { ITableColumn } from '../../list-table/table.types';
-import { IListAction, ListViewTypes } from '../../list.component.types';
+import { DeleteSpaceQuotaDefinition } from '../../../../../actions/quota-definitions.actions';
+import { IQuotaDefinition } from '../../../../../cf-api.types';
+import { CFAppState } from '../../../../../cf-app-state';
+import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
+import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import { QUOTA_FROM_LIST } from '../cf-quotas/cf-quotas-list-config.service';
 import { TableCellQuotaComponent } from '../cf-quotas/table-cell-quota/table-cell-quota.component';
 import { CfOrgSpaceQuotasDataSourceService } from './cf-space-quotas-data-source.service';
-import { BaseCfListConfig } from '../../../../../../../cloud-foundry/src/shared/components/list/list-types/base-cf/base-cf-list-config';
-import { ActiveRouteCfOrgSpace } from '../../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
-import { DeleteSpaceQuotaDefinition } from '../../../../../../../cloud-foundry/src/actions/quota-definitions.actions';
-import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 
 @Injectable()
 export class CfSpaceQuotasListConfigService extends BaseCfListConfig<APIResource<IQuotaDefinition>> {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-data-source.ts
index e29bca0710..6f56260fa3 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-data-source.ts
@@ -1,6 +1,5 @@
 import { Store } from '@ngrx/store';
 
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
   applicationEntityType,
@@ -12,14 +11,15 @@ import {
   createEntityRelationKey,
   createEntityRelationPaginationKey,
 } from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { IRoute } from '../../../../../../../core/src/core/cf-api.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import {
   IListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
+import { IRoute } from '../../../../../cf-api.types';
+import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CfRoutesDataSourceBase } from '../cf-routes/cf-routes-data-source-base';
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-list-config.service.ts
index 96c8638a85..2b60252659 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-list-config.service.ts
@@ -3,10 +3,10 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { IServiceInstance } from '../../../../../../../core/src/core/cf-api-svc.types';
 import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { IServiceInstance } from '../../../../../cf-api-svc.types';
 import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service';
 import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service';
 import { CfServiceInstancesListConfigBase } from '../cf-services/cf-service-instances-list-config.base';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-instance-apps-attached/table-cell-service-instance-apps-attached.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-instance-apps-attached/table-cell-service-instance-apps-attached.component.ts
index 5270763504..b8632ee7b5 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-instance-apps-attached/table-cell-service-instance-apps-attached.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-instance-apps-attached/table-cell-service-instance-apps-attached.component.ts
@@ -2,11 +2,11 @@ import { Component, Input, OnInit } from '@angular/core';
 import { BehaviorSubject, combineLatest, Observable, of } from 'rxjs';
 import { filter, first, map, switchMap } from 'rxjs/operators';
 
-import { IServiceInstance } from '../../../../../../../../core/src/core/cf-api-svc.types';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IServiceInstance } from '../../../../../../cf-api-svc.types';
 import {
   applicationEntityType,
   serviceBindingEntityType,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-instance-tags/table-cell-service-instance-tags.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-instance-tags/table-cell-service-instance-tags.component.ts
index 624d8fb1af..fe237bc1a9 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-instance-tags/table-cell-service-instance-tags.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-instance-tags/table-cell-service-instance-tags.component.ts
@@ -1,10 +1,10 @@
 import { Component, Input } from '@angular/core';
 import { of as observableOf } from 'rxjs';
 
-import { IServiceInstance, IUserProvidedServiceInstance } from '../../../../../../../../core/src/core/cf-api-svc.types';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IServiceInstance, IUserProvidedServiceInstance } from '../../../../../../cf-api-svc.types';
 
 interface Tag {
   value: string;
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.html
similarity index 100%
rename from src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.html
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.html
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.scss
similarity index 100%
rename from src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.scss
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.scss
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.spec.ts
similarity index 78%
rename from src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.spec.ts
index 0b6685da67..962d651039 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.spec.ts
@@ -1,9 +1,13 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import {
+  BooleanIndicatorComponent,
+} from '../../../../../../../../core/src/shared/components/boolean-indicator/boolean-indicator.component';
+import {
+  ServiceInstanceLastOpComponent,
+} from '../../../../../../../../core/src/shared/components/service-instance-last-op/service-instance-last-op.component';
+import { BaseTestModulesNoShared } from '../../../../../../../../core/test-framework/core-test.helper';
 import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
-import { BaseTestModulesNoShared } from '../../../../../../../test-framework/core-test.helper';
-import { BooleanIndicatorComponent } from '../../../../boolean-indicator/boolean-indicator.component';
-import { ServiceInstanceLastOpComponent } from '../../../../service-instance-last-op/service-instance-last-op.component';
 import { TableCellServiceLastOpComponent } from './table-cell-service-last-op.component';
 
 describe('TableCellServiceLastOpComponent', () => {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.ts
similarity index 79%
rename from src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.ts
index 6146a2da25..5d545f0a67 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.ts
@@ -1,9 +1,9 @@
 import { Component, Input, OnInit } from '@angular/core';
 
-import { userProvidedServiceInstanceEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types';
+import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
-import { IServiceInstance } from '../../../../../../core/cf-api-svc.types';
-import { TableCellCustom } from '../../../list.types';
+import { IServiceInstance } from '../../../../../../cf-api-svc.types';
+import { userProvidedServiceInstanceEntityType } from '../../../../../../cf-entity-types';
 
 @Component({
   selector: 'app-table-cell-service-last-op',
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.html
similarity index 100%
rename from src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.html
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.html
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.scss
similarity index 100%
rename from src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.scss
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.scss
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.spec.ts
similarity index 85%
rename from src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.spec.ts
index 6ae314b013..16b9fb172e 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.spec.ts
@@ -6,9 +6,13 @@ import {
 import {
   generateCfBaseTestModulesNoShared,
 } from '../../../../../../../../cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper';
+import {
+  BooleanIndicatorComponent,
+} from '../../../../../../../../core/src/shared/components/boolean-indicator/boolean-indicator.component';
+import {
+  ServiceInstanceLastOpComponent,
+} from '../../../../../../../../core/src/shared/components/service-instance-last-op/service-instance-last-op.component';
 import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
-import { BooleanIndicatorComponent } from '../../../../boolean-indicator/boolean-indicator.component';
-import { ServiceInstanceLastOpComponent } from '../../../../service-instance-last-op/service-instance-last-op.component';
 import { TableCellServiceComponent } from './table-cell-service.component';
 
 describe('TableCellServiceComponent', () => {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.ts
similarity index 85%
rename from src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.ts
index 9f35194807..b034dfa991 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.ts
@@ -2,20 +2,14 @@ import { Component, Input, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 import { filter, first, map, switchMap } from 'rxjs/operators';
 
-import {
-  serviceBrokerEntityType,
-  userProvidedServiceInstanceEntityType,
-} from '../../../../../../../../cloud-foundry/src/cf-entity-types';
-import { CF_ENDPOINT_TYPE } from '../../../../../../../../cloud-foundry/src/cf-types';
-import {
-  getCfService,
-  getServiceName,
-} from '../../../../../../../../cloud-foundry/src/features/service-catalog/services-helper';
+import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
-import { IServiceBroker, IServiceInstance } from '../../../../../../core/cf-api-svc.types';
-import { TableCellCustom } from '../../../list.types';
+import { IServiceBroker, IServiceInstance } from '../../../../../../cf-api-svc.types';
+import { serviceBrokerEntityType, userProvidedServiceInstanceEntityType } from '../../../../../../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
+import { getCfService, getServiceName } from '../../../../../../features/service-catalog/services-helper';
 
 // TODO: Move CF code to CF Module #3769
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-space-name/table-cell-space-name.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-space-name/table-cell-space-name.component.ts
index b0351f346c..9c4debc316 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-space-name/table-cell-space-name.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-space-name/table-cell-space-name.component.ts
@@ -1,9 +1,9 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 
-import { IServiceInstance } from '../../../../../../../../core/src/core/cf-api-svc.types';
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IServiceInstance } from '../../../../../../cf-api-svc.types';
 
 @Component({
   selector: 'app-table-cell-space-name',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.ts
index 9a9452fa8e..ff2becb477 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.ts
@@ -6,8 +6,6 @@ import { map, switchMap, tap } from 'rxjs/operators';
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
 import { spaceEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types';
 import { ISpaceFavMetadata } from '../../../../../../../../cloud-foundry/src/cf-metadata-types';
-import { IApp, ISpace } from '../../../../../../../../core/src/core/cf-api.types';
-import { getStartedAppInstanceCount } from '../../../../../../../../core/src/core/cf.helpers';
 import { CurrentUserPermissions } from '../../../../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../../../../core/src/core/current-user-permissions.service';
 import { getFavoriteFromCfEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
@@ -21,14 +19,16 @@ import {
   MetaCardMenuItem,
 } from '../../../../../../../../core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component';
 import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types';
-import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
-import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../core/src/shared/shared.types';
 import { RouterNav } from '../../../../../../../../store/src/actions/router.actions';
+import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
+import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { EndpointUser } from '../../../../../../../../store/src/types/endpoint.types';
 import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
+import { IApp, ISpace } from '../../../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
+import { getStartedAppInstanceCount } from '../../../../../../cf.helpers';
 import { getSpaceRolesString } from '../../../../../../features/cloud-foundry/cf.helpers';
 import {
   CloudFoundryEndpointService,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-spaces-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-spaces-list-config.service.ts
index 41dd14a73b..4571a58385 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-spaces-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-spaces-list-config.service.ts
@@ -2,11 +2,11 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { ISpace } from '../../../../../../../core/src/core/cf-api.types';
 import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
 import { IListConfig, ListViewTypes } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { ISpace } from '../../../../../cf-api.types';
 import {
   CloudFoundryOrganizationService,
 } from '../../../../../features/cloud-foundry/services/cloud-foundry-organization.service';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-data-source.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-data-source.service.ts
index 9e4928567e..97b79c7098 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-data-source.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-data-source.service.ts
@@ -7,15 +7,17 @@ import {
   organizationEntityType,
   spaceEntityType,
 } from '../../../../../../../cloud-foundry/src/cf-entity-types';
+import { createEntityRelationKey } from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
+import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
+import {
+  ListDataSource,
+} from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
+import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginationEntityState } from '../../../../../../../store/src/types/pagination.types';
+import { ISpace } from '../../../../../cf-api.types';
 import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 import { CfRolesService } from '../../../../../features/cloud-foundry/users/manage-users/cf-roles.service';
-import { createEntityRelationKey } from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { ListDataSource } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
-import { ISpace } from '../../../../../../../core/src/core/cf-api.types';
-import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
-import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 
 export class CfUsersSpaceRolesDataSourceService extends ListDataSource<APIResource<ISpace>> {
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-list-config.service.ts
index 9f2cabb6aa..6471894a4f 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-list-config.service.ts
@@ -4,13 +4,13 @@ import { first } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { SpaceUserRoleNames } from '../../../../../../../cloud-foundry/src/store/types/user.types';
-import { ISpace } from '../../../../../../../core/src/core/cf-api.types';
 import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
 import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
 import { IListConfig, ListViewTypes } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { selectUsersRolesRoles } from '../../../../../../../store/src/selectors/users-roles.selector';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { ISpace } from '../../../../../cf-api.types';
 import { CfUsersSpaceRolesDataSourceService } from './cf-users-space-roles-data-source.service';
 import { TableCellRoleOrgSpaceComponent } from './table-cell-org-space-role/table-cell-org-space-role.component';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.spec.ts
index c25d5da480..6f8b033576 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.spec.ts
@@ -1,18 +1,18 @@
+import { HttpClientModule } from '@angular/common/http';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
-import { ISpace } from '../../../../../../../../core/src/core/cf-api.types';
 import { CoreModule } from '../../../../../../../../core/src/core/core.module';
+import { CfUserServiceTestProvider } from '../../../../../../../../core/test-framework/user-service-helper';
 import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
-import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { CfUserServiceTestProvider } from '../../../../../../../../core/test-framework/user-service-helper';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { ISpace } from '../../../../../../cf-api.types';
 import { ActiveRouteCfOrgSpace } from '../../../../../../features/cloud-foundry/cf-page.types';
 import { CfRolesService } from '../../../../../../features/cloud-foundry/users/manage-users/cf-roles.service';
 import { CfRoleCheckboxComponent } from '../../../../cf-role-checkbox/cf-role-checkbox.component';
 import { TableCellRoleOrgSpaceComponent } from './table-cell-org-space-role.component';
-import { HttpClientModule } from '@angular/common/http';
 
 describe('TableCellSpaceRoleComponent', () => {
   let component: TableCellRoleOrgSpaceComponent;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.ts
index 9ff2fe14c9..0dcea0d3fb 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.ts
@@ -1,8 +1,8 @@
 import { Component } from '@angular/core';
 
-import { ISpace } from '../../../../../../../../core/src/core/cf-api.types';
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { ISpace } from '../../../../../../cf-api.types';
 
 @Component({
   selector: 'app-table-cell-org-space-role',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component.ts
index 63c7dff469..1f8f147977 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component.ts
@@ -5,10 +5,10 @@ import { first, map } from 'rxjs/operators';
 
 import { UsersRolesSetOrg } from '../../../../../../../../cloud-foundry/src/actions/users-roles.actions';
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
-import { IOrganization } from '../../../../../../../../core/src/core/cf-api.types';
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { selectUsersRolesOrgGuid } from '../../../../../../../../store/src/selectors/users-roles.selector';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IOrganization } from '../../../../../../cf-api.types';
 import { ActiveRouteCfOrgSpace } from '../../../../../../features/cloud-foundry/cf-page.types';
 import { CfRolesService } from '../../../../../../features/cloud-foundry/users/manage-users/cf-roles.service';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-org-permission-cell/cf-org-permission-cell.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-org-permission-cell/cf-org-permission-cell.component.ts
index 39545b54a2..c2c8836999 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-org-permission-cell/cf-org-permission-cell.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-org-permission-cell/cf-org-permission-cell.component.ts
@@ -11,7 +11,6 @@ import {
   IUserPermissionInOrg,
   OrgUserRoleNames,
 } from '../../../../../../../../cloud-foundry/src/store/types/user.types';
-import { IOrganization } from '../../../../../../../../core/src/core/cf-api.types';
 import { CurrentUserPermissions } from '../../../../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../../../../core/src/core/current-user-permissions.service';
 import { arrayHelper } from '../../../../../../../../core/src/core/helper-classes/array.helper';
@@ -19,6 +18,7 @@ import { AppChip } from '../../../../../../../../core/src/shared/components/chip
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
 import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IOrganization } from '../../../../../../cf-api.types';
 import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
 import { getOrgRoles } from '../../../../../../features/cloud-foundry/cf.helpers';
 import { CfUserService } from '../../../../../data-services/cf-user.service';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component.ts
index 8da4cdbc59..0619a8cea3 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component.ts
@@ -12,13 +12,13 @@ import {
   IUserPermissionInSpace,
   SpaceUserRoleNames,
 } from '../../../../../../../../cloud-foundry/src/store/types/user.types';
-import { IOrganization, ISpace } from '../../../../../../../../core/src/core/cf-api.types';
 import { CurrentUserPermissions } from '../../../../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../../../../core/src/core/current-user-permissions.service';
 import { arrayHelper } from '../../../../../../../../core/src/core/helper-classes/array.helper';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
 import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IOrganization, ISpace } from '../../../../../../cf-api.types';
 import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
 import { getSpaceRoles } from '../../../../../../features/cloud-foundry/cf.helpers';
 import { CfUserService } from '../../../../../data-services/cf-user.service';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.ts
index 4eab25e436..ceaeaf77bf 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.ts
@@ -7,7 +7,6 @@ import { UsersRolesSetUsers } from '../../../../../../../cloud-foundry/src/actio
 import { GetAllUsersAsAdmin } from '../../../../../../../cloud-foundry/src/actions/users.actions';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { CfUser } from '../../../../../../../cloud-foundry/src/store/types/user.types';
-import { IOrganization, ISpace } from '../../../../../../../core/src/core/cf-api.types';
 import { CurrentUserPermissionsChecker } from '../../../../../../../core/src/core/current-user-permissions.checker';
 import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
 import { ITableColumn, ITableText } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
@@ -23,6 +22,7 @@ import { entityCatalog } from '../../../../../../../store/src/entity-catalog/ent
 import { selectPaginationState } from '../../../../../../../store/src/selectors/pagination.selectors';
 import { APIResource, EntityInfo } from '../../../../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
+import { IOrganization, ISpace } from '../../../../../cf-api.types';
 import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
 import {
   canUpdateOrgSpaceRoles,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts
index a3cc6ae5f2..00b65075c6 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-list-config.service.ts
@@ -3,11 +3,11 @@ import { Injectable } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 
-import { IServiceBinding } from '../../../../../../../core/src/core/cf-api-svc.types';
 import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
 import { IListConfig, ListViewTypes } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { IServiceBinding } from '../../../../../cf-api-svc.types';
 import { CFAppState } from '../../../../../cf-app-state';
 import { DetachAppsDataSource } from './detach-apps-data-source';
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-data-source.ts
similarity index 86%
rename from src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-data-source.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-data-source.ts
index c93962a412..b0d2b6b987 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-data-source.ts
@@ -7,12 +7,12 @@ import { gitCommitEntityType } from '../../../../../../../cloud-foundry/src/cf-e
 import { CF_ENDPOINT_TYPE } from '../../../../../../../cloud-foundry/src/cf-types';
 import { GitMeta } from '../../../../../../../cloud-foundry/src/entity-action-builders/git-action-builder';
 import { GitCommit } from '../../../../../../../cloud-foundry/src/store/types/git.types';
+import {
+  ListDataSource,
+} from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
+import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
+import { GitSCM } from '../../../../../../../core/src/shared/data-services/scm/scm';
 import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { GitSCM } from '../../../../data-services/scm/scm';
-import { ListDataSource } from '../../data-sources-controllers/list-data-source';
-import { IListConfig } from '../../list.component.types';
-
-
 
 export class GithubCommitsDataSource extends ListDataSource<GitCommit> {
   store: Store<CFAppState>;
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-app-tab.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-app-tab.service.ts
similarity index 95%
rename from src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-app-tab.service.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-app-tab.service.ts
index 9d8fbab53c..520a3281e6 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-app-tab.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-app-tab.service.ts
@@ -18,12 +18,12 @@ import { CF_ENDPOINT_TYPE } from '../../../../../../../cloud-foundry/src/cf-type
 import { ApplicationService } from '../../../../../../../cloud-foundry/src/features/applications/application.service';
 import { selectCfEntity } from '../../../../../../../cloud-foundry/src/store/selectors/api.selectors';
 import { GitBranch, GitCommit } from '../../../../../../../cloud-foundry/src/store/types/git.types';
+import { IListAction } from '../../../../../../../core/src/shared/components/list/list.component.types';
+import { GitSCM } from '../../../../../../../core/src/shared/data-services/scm/scm';
+import { GitSCMService, GitSCMType } from '../../../../../../../core/src/shared/data-services/scm/scm.service';
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
 import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { EntityServiceFactory } from '../../../../../../../store/src/entity-service-factory.service';
-import { GitSCM } from '../../../../data-services/scm/scm';
-import { GitSCMService, GitSCMType } from '../../../../data-services/scm/scm.service';
-import { IListAction } from '../../list.component.types';
 import { GithubCommitsDataSource } from './github-commits-data-source';
 import { GithubCommitsListConfigServiceBase } from './github-commits-list-config-base.service';
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.spec.ts
similarity index 68%
rename from src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.spec.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.spec.ts
index 18e7d8b678..977fd14079 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.spec.ts
@@ -2,11 +2,11 @@ import { CommonModule, DatePipe } from '@angular/common';
 import { inject, TestBed } from '@angular/core/testing';
 
 import { ApplicationService } from '../../../../../../../cloud-foundry/src/features/applications/application.service';
-import { ApplicationServiceMock } from '../../../../../../test-framework/application-service-helper';
-import { CoreTestingModule } from '../../../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
-import { CoreModule } from '../../../../../core/core.module';
-import { SharedModule } from '../../../../shared.module';
+import { CoreModule } from '../../../../../../../core/src/core/core.module';
+import { SharedModule } from '../../../../../../../core/src/shared/shared.module';
+import { ApplicationServiceMock } from '../../../../../../../core/test-framework/application-service-helper';
+import { CoreTestingModule } from '../../../../../../../core/test-framework/core-test.modules';
+import { createBasicStoreModule } from '../../../../../../../store/testing/public-api';
 import { GithubCommitsListConfigServiceBase } from './github-commits-list-config-base.service';
 
 // TODO: Move this file to cf package - #3769
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.ts
similarity index 92%
rename from src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.ts
index cdae19f5bb..6f970a4250 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.ts
@@ -5,8 +5,8 @@ import { BehaviorSubject } from 'rxjs';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { GitCommit } from '../../../../../../../cloud-foundry/src/store/types/git.types';
-import { ITableColumn } from '../../list-table/table.types';
-import { IListConfig, ListViewTypes } from '../../list.component.types';
+import { ITableColumn } from '../../../../../../../core/src/shared/components/list/list-table/table.types';
+import { IListConfig, ListViewTypes } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { GithubCommitsDataSource } from './github-commits-data-source';
 import { TableCellCommitAuthorComponent } from './table-cell-commit-author/table-cell-commit-author.component';
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-deploy.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-deploy.service.ts
similarity index 89%
rename from src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-deploy.service.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-deploy.service.ts
index 85fe999819..316a171890 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/github-commits-list-config-deploy.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-deploy.service.ts
@@ -6,8 +6,10 @@ import { filter, first, map } from 'rxjs/operators';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { selectApplicationSource } from '../../../../../../../cloud-foundry/src/store/selectors/deploy-application.selector';
 import { DeployApplicationSource } from '../../../../../../../cloud-foundry/src/store/types/deploy-application.types';
-import { GitSCMService, GitSCMType } from '../../../../data-services/scm/scm.service';
-import { TableCellRadioComponent } from '../../list-table/table-cell-radio/table-cell-radio.component';
+import {
+  TableCellRadioComponent,
+} from '../../../../../../../core/src/shared/components/list/list-table/table-cell-radio/table-cell-radio.component';
+import { GitSCMService, GitSCMType } from '../../../../../../../core/src/shared/data-services/scm/scm.service';
 import { GithubCommitsDataSource } from './github-commits-data-source';
 import { GithubCommitsListConfigServiceBase } from './github-commits-list-config-base.service';
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.html
similarity index 100%
rename from src/frontend/packages/core/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.html
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.html
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.scss
similarity index 100%
rename from src/frontend/packages/core/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.scss
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.scss
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.spec.ts
similarity index 78%
rename from src/frontend/packages/core/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.spec.ts
index 71827d0b5e..ef6dce4ecb 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.spec.ts
@@ -1,7 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { BaseTestModulesNoShared } from '../../../../../../../test-framework/core-test.helper';
-import { GithubCommitAuthorComponent } from '../../../../github-commit-author/github-commit-author.component';
+import {
+  GithubCommitAuthorComponent,
+} from '../../../../../../../../core/src/shared/components/github-commit-author/github-commit-author.component';
+import { BaseTestModulesNoShared } from '../../../../../../../../core/test-framework/core-test.helper';
 import { TableCellCommitAuthorComponent } from './table-cell-commit-author.component';
 
 describe('TableCellCommitAuthorComponent', () => {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.ts
similarity index 64%
rename from src/frontend/packages/core/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.ts
index e54e7b5698..76a1c7a4e1 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.ts
@@ -1,6 +1,6 @@
-import { Component, Input } from '@angular/core';
+import { Component } from '@angular/core';
 
-import { TableCellCustom } from '../../../list.types';
+import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 
 @Component({
   selector: 'app-table-cell-commit-author',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/service-plans-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/service-plans-data-source.ts
index 2020eb9613..0d4e0fee86 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/service-plans-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/service-plans-data-source.ts
@@ -14,16 +14,16 @@ import { getRowMetadata } from '../../../../../../../cloud-foundry/src/features/
 import {
   populateServicePlanExtraTyped,
 } from '../../../../../../../cloud-foundry/src/features/service-catalog/services-helper';
-import { IServicePlan } from '../../../../../../../core/src/core/cf-api-svc.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
+import { IServicePlan } from '../../../../../cf-api-svc.types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
+import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 
 export class ServicePlansDataSource extends ListDataSource<APIResource<IServicePlan>> {
   constructor(
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/service-plans-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/service-plans-list-config.service.ts
index d38a332de8..ee6602b8b2 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/service-plans-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/service-plans-list-config.service.ts
@@ -5,7 +5,6 @@ import { Store } from '@ngrx/store';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { getServicePlanName } from '../../../../../../../cloud-foundry/src/features/service-catalog/services-helper';
 import { ServicesService } from '../../../../../../../cloud-foundry/src/features/service-catalog/services.service';
-import { IServicePlan } from '../../../../../../../core/src/core/cf-api-svc.types';
 import {
   IListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source-types';
@@ -17,6 +16,7 @@ import {
 } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { IServicePlan } from '../../../../../cf-api-svc.types';
 import { ServicePlansDataSource } from './service-plans-data-source';
 import {
   TableCellAServicePlanExtrasComponent,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/table-cell-service-plan-extras/table-cell-service-plan-extras.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/table-cell-service-plan-extras/table-cell-service-plan-extras.component.ts
index 3c64cb0a2b..54802f42da 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/table-cell-service-plan-extras/table-cell-service-plan-extras.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/table-cell-service-plan-extras/table-cell-service-plan-extras.component.ts
@@ -1,8 +1,8 @@
 import { Component } from '@angular/core';
 
-import { IServicePlan } from '../../../../../../../../core/src/core/cf-api-svc.types';
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IServicePlan } from '../../../../../../cf-api-svc.types';
 
 @Component({
   selector: 'app-table-cell-service-plan-extras',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/table-cell-service-plan-price/table-cell-service-plan-price.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/table-cell-service-plan-price/table-cell-service-plan-price.component.ts
index 668b779530..9c178e613e 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/table-cell-service-plan-price/table-cell-service-plan-price.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/table-cell-service-plan-price/table-cell-service-plan-price.component.ts
@@ -1,8 +1,8 @@
 import { Component, Input } from '@angular/core';
 
-import { IServicePlan } from '../../../../../../../../core/src/core/cf-api-svc.types';
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IServicePlan } from '../../../../../../cf-api-svc.types';
 import { canShowServicePlanCosts } from '../../../../../../features/service-catalog/services-helper';
 
 @Component({
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/table-cell-service-plan-public/table-cell-service-plan-public.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/table-cell-service-plan-public/table-cell-service-plan-public.component.ts
index 5177975a6b..fa675a2c14 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/table-cell-service-plan-public/table-cell-service-plan-public.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/table-cell-service-plan-public/table-cell-service-plan-public.component.ts
@@ -1,8 +1,8 @@
 import { Component } from '@angular/core';
 
-import { IServicePlan } from '../../../../../../../../core/src/core/cf-api-svc.types';
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IServicePlan } from '../../../../../../cf-api-svc.types';
 
 @Component({
   selector: 'app-table-cell-service-plan-public',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts
index 9364faf37a..feee1f3964 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts
@@ -4,7 +4,6 @@ import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
 
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
 import { serviceInstancesEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types';
-import { IServiceInstance } from '../../../../../../../../core/src/core/cf-api-svc.types';
 import { CurrentUserPermissions } from '../../../../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../../../../core/src/core/current-user-permissions.service';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
@@ -16,6 +15,7 @@ import { CfOrgSpaceLabelService } from '../../../../../../../../core/src/shared/
 import { ComponentEntityMonitorConfig } from '../../../../../../../../core/src/shared/shared.types';
 import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IServiceInstance } from '../../../../../../cf-api-svc.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import {
   getServiceBrokerName,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts
index e21657ecd0..190fbc0b64 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts
@@ -4,7 +4,6 @@ import { BehaviorSubject, of as observableOf } from 'rxjs';
 
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
 import { userProvidedServiceInstanceEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types';
-import { IUserProvidedServiceInstance } from '../../../../../../../../core/src/core/cf-api-svc.types';
 import { CurrentUserPermissions } from '../../../../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../../../../core/src/core/current-user-permissions.service';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
@@ -15,6 +14,7 @@ import { CardCell } from '../../../../../../../../core/src/shared/components/lis
 import { CfOrgSpaceLabelService } from '../../../../../../../../core/src/shared/services/cf-org-space-label.service';
 import { ComponentEntityMonitorConfig } from '../../../../../../../../core/src/shared/shared.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { IUserProvidedServiceInstance } from '../../../../../../cf-api-svc.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/select-service/select-service.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/select-service/select-service.component.ts
index c00320b4e5..501aba54d3 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/select-service/select-service.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/select-service/select-service.component.ts
@@ -4,11 +4,11 @@ import { Store } from '@ngrx/store';
 import { BehaviorSubject, combineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
 import { filter, map, switchMap, tap } from 'rxjs/operators';
 
-import { IService } from '../../../../../core/src/core/cf-api-svc.types';
 import { StepOnNextResult } from '../../../../../core/src/shared/components/stepper/step/step.component';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource } from '../../../../../store/src/types/api.types';
 import { SetCreateServiceInstanceServiceGuid } from '../../../actions/create-service-instance.actions';
+import { IService } from '../../../cf-api-svc.types';
 import { CFAppState } from '../../../cf-app-state';
 import { cfEntityFactory } from '../../../cf-entity-factory';
 import { serviceEntityType } from '../../../cf-entity-types';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/service-icon/service-icon.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/service-icon/service-icon.component.ts
index ca158f95af..18f23b8984 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/service-icon/service-icon.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/service-icon/service-icon.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 
-import { IService, IServiceExtra } from '../../../../../core/src/core/cf-api-svc.types';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { IService, IServiceExtra } from '../../../cf-api-svc.types';
 
 @Component({
   selector: 'app-service-icon',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-price/service-plan-price.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-price/service-plan-price.component.ts
index a811238323..43c493f1d9 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-price/service-plan-price.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-price/service-plan-price.component.ts
@@ -2,8 +2,8 @@ import { registerLocaleData } from '@angular/common';
 import localeFr from '@angular/common/locales/fr';
 import { Component, Input } from '@angular/core';
 
-import { IServicePlan, IServicePlanCost } from '../../../../../core/src/core/cf-api-svc.types';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { IServicePlan, IServicePlanCost } from '../../../cf-api-svc.types';
 
 
 @Component({
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.ts
index d50491f5fb..4802d25f1d 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.ts
@@ -8,10 +8,10 @@ import {
   getServicePlanAccessibilityCardStatus,
 } from '../../../../../cloud-foundry/src/features/service-catalog/services-helper';
 import { ServicesService } from '../../../../../cloud-foundry/src/features/service-catalog/services.service';
-import { IServiceBroker, IServicePlan } from '../../../../../core/src/core/cf-api-svc.types';
-import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { StratosStatus } from '../../../../../core/src/shared/shared.types';
+import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { IServiceBroker, IServicePlan } from '../../../cf-api-svc.types';
 
 @Component({
   selector: 'app-service-plan-public',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-org-space-service.service.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-org-space-service.service.ts
index b24ccb35a1..94bfd44977 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-org-space-service.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-org-space-service.service.ts
@@ -17,7 +17,6 @@ import {
 import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
 import { organizationEntityType, spaceEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
 import { createEntityRelationKey } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { IOrganization, ISpace } from '../../../../core/src/core/cf-api.types';
 import { safeUnsubscribe } from '../../../../core/src/core/utils.service';
 import {
   ListPaginationMultiFilterChange,
@@ -36,6 +35,7 @@ import { selectPaginationState } from '../../../../store/src/selectors/paginatio
 import { APIResource } from '../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 import { PaginatedAction, PaginationParam } from '../../../../store/src/types/pagination.types';
+import { IOrganization, ISpace } from '../../cf-api.types';
 import { cfEntityFactory } from '../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../cf-types';
 import { QParam, QParamJoiners } from '../q-param';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-user.service.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-user.service.ts
index 706d2dfa56..6869c07f90 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-user.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/cf-user.service.ts
@@ -16,7 +16,6 @@ import {
   UserRoleInOrg,
   UserRoleInSpace,
 } from '../../../../cloud-foundry/src/store/types/user.types';
-import { IOrganization, ISpace } from '../../../../core/src/core/cf-api.types';
 import {
   LocalPaginationHelpers,
 } from '../../../../core/src/shared/components/list/data-sources-controllers/local-list.helpers';
@@ -34,6 +33,7 @@ import {
 } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../store/src/types/pagination.types';
+import { IOrganization, ISpace } from '../../cf-api.types';
 import { cfEntityFactory } from '../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../cf-types';
 import { UserActionBuilders } from '../../entity-action-builders/user.action-builders';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/service-action-helper.service.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/service-action-helper.service.ts
index 349c1928cb..d29eb57145 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/service-action-helper.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/service-action-helper.service.ts
@@ -3,7 +3,6 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, first, map, pairwise } from 'rxjs/operators';
 
-import { CF_ENDPOINT_TYPE } from '../../cf-types';
 import {
   DeleteUserProvidedInstance,
   UpdateUserProvidedServiceInstance,
@@ -14,16 +13,17 @@ import {
   serviceInstancesEntityType,
   userProvidedServiceInstanceEntityType,
 } from '../../../../cloud-foundry/src/cf-entity-types';
-import { IServiceBinding, IServiceInstance, IUserProvidedServiceInstance } from '../../../../core/src/core/cf-api-svc.types';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata, EntityCatalogEntityConfig } from '../../../../store/src/entity-catalog/entity-catalog.types';
-import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
 import { ConfirmationDialogConfig } from '../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../core/src/shared/components/confirmation-dialog.service';
 import { RouterNav, RouterQueryParams } from '../../../../store/src/actions/router.actions';
+import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
+import { EntityCatalogEntityConfig, IEntityMetadata } from '../../../../store/src/entity-catalog/entity-catalog.types';
+import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
 import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource, EntityInfo } from '../../../../store/src/types/api.types';
 import { UpdateServiceInstance } from '../../actions/service-instances.actions';
+import { IServiceBinding, IServiceInstance, IUserProvidedServiceInstance } from '../../cf-api-svc.types';
+import { CF_ENDPOINT_TYPE } from '../../cf-types';
 import { ServiceBindingActionBuilders } from '../../entity-action-builders/service-binding.action-builders';
 import { ServiceInstanceActionBuilders } from '../../entity-action-builders/service-instance.action.builders';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/application-route.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/application-route.reducer.ts
index 1695edbbb8..f5138fe60f 100644
--- a/src/frontend/packages/cloud-foundry/src/store/reducers/application-route.reducer.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/application-route.reducer.ts
@@ -1,9 +1,9 @@
-import { ASSIGN_ROUTE_SUCCESS, AssignRouteToApplication } from '../../actions/application-service-routes.actions';
-import { BaseRouteAction, RouteEvents } from '../../actions/route.actions';
+import { IRequestEntityTypeState } from '../../../../store/src/app-state';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { APISuccessOrFailedAction } from '../../../../store/src/types/request.types';
-import { IApp } from '../../../../core/src/core/cf-api.types';
-import { IRequestEntityTypeState } from '../../../../store/src/app-state';
+import { ASSIGN_ROUTE_SUCCESS, AssignRouteToApplication } from '../../actions/application-service-routes.actions';
+import { BaseRouteAction, RouteEvents } from '../../actions/route.actions';
+import { IApp } from '../../cf-api.types';
 
 export function updateApplicationRoutesReducer() {
   return (
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-cf-roles.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-cf-roles.reducer.ts
index 095a5bb40c..3cb9fbf328 100644
--- a/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-cf-roles.reducer.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-cf-roles.reducer.ts
@@ -1,7 +1,7 @@
-import { ISpace } from '../../../../../core/src/core/cf-api.types';
 import { APIResource } from '../../../../../store/src/types/api.types';
 import { getDefaultEndpointRoles } from '../../../../../store/src/types/current-user-roles.types';
 import { GetCurrentUserRelationsComplete, UserRelationTypes } from '../../../actions/permissions.actions';
+import { ISpace } from '../../../cf-api.types';
 import { ICfRolesState, IOrgsRoleState } from '../../types/cf-current-user-roles.types';
 import { createOrgRoleStateState } from './current-user-roles-org.reducer';
 import { currentUserOrgRolesReducer } from './current-user-roles-orgs.reducer';
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-space.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-space.reducer.ts
index bf04b91a40..fda7c35762 100644
--- a/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-space.reducer.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/current-user-roles-reducer/current-user-roles-space.reducer.ts
@@ -1,6 +1,6 @@
-import { ISpace } from '../../../../../core/src/core/cf-api.types';
 import { APIResource } from '../../../../../store/src/types/api.types';
 import { UserRelationTypes } from '../../../actions/permissions.actions';
+import { ISpace } from '../../../cf-api.types';
 import { ISpaceRoleState } from '../../types/cf-current-user-roles.types';
 
 export const defaultUserSpaceRoleState: ISpaceRoleState = {
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/organization-quota.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/organization-quota.reducer.ts
index 4923fd1376..314a6288b5 100644
--- a/src/frontend/packages/cloud-foundry/src/store/reducers/organization-quota.reducer.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/organization-quota.reducer.ts
@@ -1,7 +1,7 @@
-import { IOrganization } from '../../../../core/src/core/cf-api.types';
 import { IRequestEntityTypeState } from '../../../../store/src/app-state';
 import { APIResource, NormalizedResponse } from '../../../../store/src/types/api.types';
 import { APISuccessOrFailedAction } from '../../../../store/src/types/request.types';
+import { IOrganization } from '../../cf-api.types';
 import { getCFEntityKey } from '../../cf-entity-helpers';
 
 type entityOrgType = APIResource<IOrganization<string>>;
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/organization-space.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/organization-space.reducer.ts
index 482104d0c0..8853e0eb5d 100644
--- a/src/frontend/packages/cloud-foundry/src/store/reducers/organization-space.reducer.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/organization-space.reducer.ts
@@ -1,15 +1,10 @@
-import {
-  CREATE_SPACE_SUCCESS,
-  CreateSpace,
-  DELETE_SPACE_SUCCESS,
-  DeleteSpace,
-} from '../../actions/space.actions';
-import { spaceEntityType } from '../../cf-entity-types';
-import { getCFEntityKey } from '../../cf-entity-helpers';
-import { IOrganization, ISpace } from '../../../../core/src/core/cf-api.types';
 import { IRequestEntityTypeState } from '../../../../store/src/app-state';
 import { APIResource, NormalizedResponse } from '../../../../store/src/types/api.types';
 import { APISuccessOrFailedAction } from '../../../../store/src/types/request.types';
+import { CREATE_SPACE_SUCCESS, CreateSpace, DELETE_SPACE_SUCCESS, DeleteSpace } from '../../actions/space.actions';
+import { IOrganization, ISpace } from '../../cf-api.types';
+import { getCFEntityKey } from '../../cf-entity-helpers';
+import { spaceEntityType } from '../../cf-entity-types';
 
 type entityOrgType = APIResource<IOrganization<string>>;
 // Note - This reducer will be updated when we address general deletion of entities within inline lists (not paginated lists)
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/routes.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/routes.reducer.ts
index c976b9276e..67746f0033 100644
--- a/src/frontend/packages/cloud-foundry/src/store/reducers/routes.reducer.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/routes.reducer.ts
@@ -1,9 +1,9 @@
-import { IAppSummary, IRoute } from '../../../../core/src/core/cf-api.types';
 import { IRequestEntityTypeState } from '../../../../store/src/app-state';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { APISuccessOrFailedAction } from '../../../../store/src/types/request.types';
 import { ASSIGN_ROUTE_SUCCESS, AssignRouteToApplication } from '../../actions/application-service-routes.actions';
 import { DeleteRoute, RouteEvents, UnmapRoute } from '../../actions/route.actions';
+import { IAppSummary, IRoute } from '../../cf-api.types';
 
 export function routeReducer(state: IRequestEntityTypeState<APIResource<IRoute>>, action: APISuccessOrFailedAction) {
   switch (action.type) {
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/service-instance.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/service-instance.reducer.ts
index 8e9d775159..c97537a6a1 100644
--- a/src/frontend/packages/cloud-foundry/src/store/reducers/service-instance.reducer.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/service-instance.reducer.ts
@@ -1,4 +1,3 @@
-import { IServiceBinding, IServiceInstance, IUserProvidedServiceInstance } from '../../../../core/src/core/cf-api-svc.types';
 import { IRequestEntityTypeState } from '../../../../store/src/app-state';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { APISuccessOrFailedAction } from '../../../../store/src/types/request.types';
@@ -8,6 +7,7 @@ import {
   DELETE_SERVICE_BINDING_ACTION_SUCCESS,
   DeleteServiceBinding,
 } from '../../actions/service-bindings.actions';
+import { IServiceBinding, IServiceInstance, IUserProvidedServiceInstance } from '../../cf-api-svc.types';
 import { getCFEntityKey } from '../../cf-entity-helpers';
 import { serviceBindingEntityType } from '../../cf-entity-types';
 
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/space-quota.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/space-quota.reducer.ts
index ebe034d55e..299c2e2393 100644
--- a/src/frontend/packages/cloud-foundry/src/store/reducers/space-quota.reducer.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/space-quota.reducer.ts
@@ -1,14 +1,14 @@
-import { getCFEntityKey } from '../../cf-entity-helpers';
-import { ISpace, ISpaceQuotaDefinition } from '../../../../core/src/core/cf-api.types';
+import { IRequestEntityTypeState } from '../../../../store/src/app-state';
+import { APIResource, NormalizedResponse } from '../../../../store/src/types/api.types';
+import { APISuccessOrFailedAction } from '../../../../store/src/types/request.types';
 import {
   ASSOCIATE_SPACE_QUOTA_DEFINITION_SUCCESS,
   AssociateSpaceQuota,
   DISASSOCIATE_SPACE_QUOTA_DEFINITION_SUCCESS,
   DisassociateSpaceQuota,
 } from '../../actions/quota-definitions.actions';
-import { IRequestEntityTypeState } from '../../../../store/src/app-state';
-import { APIResource, NormalizedResponse } from '../../../../store/src/types/api.types';
-import { APISuccessOrFailedAction } from '../../../../store/src/types/request.types';
+import { ISpace, ISpaceQuotaDefinition } from '../../cf-api.types';
+import { getCFEntityKey } from '../../cf-entity-helpers';
 
 type entityOrgType = APIResource<ISpace>;
 export function updateSpaceQuotaReducer(
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/users.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/users.reducer.ts
index d49783980a..42376488c6 100644
--- a/src/frontend/packages/cloud-foundry/src/store/reducers/users.reducer.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/users.reducer.ts
@@ -1,4 +1,3 @@
-import { IOrganization, ISpace } from '../../../../core/src/core/cf-api.types';
 import { DISCONNECT_ENDPOINTS_SUCCESS, DisconnectEndpoint } from '../../../../store/src/actions/endpoint.actions';
 import { IRequestEntityTypeState } from '../../../../store/src/app-state';
 import { deepMergeState } from '../../../../store/src/helpers/reducer.helper';
@@ -11,6 +10,7 @@ import {
   createDefaultUserRelations,
   REMOVE_ROLE_SUCCESS,
 } from '../../actions/users.actions';
+import { IOrganization, ISpace } from '../../cf-api.types';
 import { cfUserEntityType } from '../../cf-entity-types';
 import {
   CfUser,
diff --git a/src/frontend/packages/cloud-foundry/src/store/types/route.types.ts b/src/frontend/packages/cloud-foundry/src/store/types/route.types.ts
index fbdb5ae53a..2c1e36676e 100644
--- a/src/frontend/packages/cloud-foundry/src/store/types/route.types.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/types/route.types.ts
@@ -1,5 +1,5 @@
-import { IApp } from '../../../../core/src/core/cf-api.types';
 import { APIResource } from '../../../../store/src/types/api.types';
+import { IApp } from '../../cf-api.types';
 
 
 export class Route {
diff --git a/src/frontend/packages/cloud-foundry/src/store/types/user.types.ts b/src/frontend/packages/cloud-foundry/src/store/types/user.types.ts
index 98921949ea..7995365bab 100644
--- a/src/frontend/packages/cloud-foundry/src/store/types/user.types.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/types/user.types.ts
@@ -1,5 +1,5 @@
-import { IOrganization, ISpace } from '../../../../core/src/core/cf-api.types';
 import { APIResource } from '../../../../store/src/types/api.types';
+import { IOrganization, ISpace } from '../../cf-api.types';
 
 export function getDefaultCfUserMissingRoles(): CfUserMissingRoles {
   return {
diff --git a/src/frontend/packages/core/src/core/current-user-permissions.checker.ts b/src/frontend/packages/core/src/core/current-user-permissions.checker.ts
index f0050f0832..4cf334a573 100644
--- a/src/frontend/packages/core/src/core/current-user-permissions.checker.ts
+++ b/src/frontend/packages/core/src/core/current-user-permissions.checker.ts
@@ -2,6 +2,7 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators';
 
+import { IFeatureFlag } from '../../../cloud-foundry/src/cf-api.types';
 import {
   createCfFeatureFlagFetchAction,
 } from '../../../cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/cf-feature-flags-data-source.helpers';
@@ -24,7 +25,6 @@ import {
 } from '../../../store/src/selectors/current-user-role.selectors';
 import { connectedEndpointsSelector } from '../../../store/src/selectors/endpoint.selectors';
 import { CFFeatureFlagTypes } from '../shared/components/cf-auth/cf-auth.types';
-import { IFeatureFlag } from './cf-api.types';
 import {
   PermissionConfig,
   PermissionStrings,
diff --git a/src/frontend/packages/core/src/core/current-user-permissions.service.spec.ts b/src/frontend/packages/core/src/core/current-user-permissions.service.spec.ts
index a9b23771ca..0516ae7d48 100644
--- a/src/frontend/packages/core/src/core/current-user-permissions.service.spec.ts
+++ b/src/frontend/packages/core/src/core/current-user-permissions.service.spec.ts
@@ -2,6 +2,7 @@ import { TestBed } from '@angular/core/testing';
 import { createBasicStoreModule, createEntityStoreState, TestStoreEntity } from '@stratos/store/testing';
 import { first, tap } from 'rxjs/operators';
 
+import { IFeatureFlag } from '../../../cloud-foundry/src/cf-api.types';
 import { cfEntityFactory } from '../../../cloud-foundry/src/cf-entity-factory';
 import { generateCFEntities } from '../../../cloud-foundry/src/cf-entity-generator';
 import { featureFlagEntityType } from '../../../cloud-foundry/src/cf-entity-types';
@@ -15,7 +16,6 @@ import { PaginationState } from '../../../store/src/types/pagination.types';
 import { endpointEntitySchema } from '../base-entity-schemas';
 import { generateStratosEntities } from '../base-entity-types';
 import { CFFeatureFlagTypes } from '../shared/components/cf-auth/cf-auth.types';
-import { IFeatureFlag } from './cf-api.types';
 import {
   CurrentUserPermissions,
   PermissionConfig,
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.ts
index 62ef19ec1a..beb3046000 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.ts
@@ -21,9 +21,6 @@ import {
 import {
   TableCellEndpointStatusComponent,
 } from '../../list-types/endpoint/table-cell-endpoint-status/table-cell-endpoint-status.component';
-import {
-  TableCellCommitAuthorComponent,
-} from '../../list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component';
 import { TableCellCustom } from '../../list.types';
 import { TableCellDefaultComponent } from '../app-table-cell-default/app-table-cell-default.component';
 import { TableCellActionsComponent } from '../table-cell-actions/table-cell-actions.component';
@@ -52,7 +49,6 @@ export const listTableCells: Type<TableCellCustom<any>>[] = [
   TableCellEndpointNameComponent,
   TableCellBooleanIndicatorComponent,
   TableCellRadioComponent,
-  TableCellCommitAuthorComponent,
   TableCellRequestMonitorIconComponent,
   TableCellFavoriteComponent,
   TableCellEndpointDetailsComponent,
diff --git a/src/frontend/packages/core/src/shared/components/service-instance-last-op/service-instance-last-op.component.ts b/src/frontend/packages/core/src/shared/components/service-instance-last-op/service-instance-last-op.component.ts
index ba147899fb..42bc95634e 100644
--- a/src/frontend/packages/core/src/shared/components/service-instance-last-op/service-instance-last-op.component.ts
+++ b/src/frontend/packages/core/src/shared/components/service-instance-last-op/service-instance-last-op.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 
+import { IServiceInstance } from '../../../../../cloud-foundry/src/cf-api-svc.types';
 import { APIResource } from '../../../../../store/src/types/api.types';
-import { IServiceInstance } from '../../../core/cf-api-svc.types';
 
 // TODO: Move CF code to CF Module #3769
 
diff --git a/src/frontend/packages/core/src/shared/services/cf-org-space-label.service.ts b/src/frontend/packages/core/src/shared/services/cf-org-space-label.service.ts
index 933441c5d6..607f13f7f1 100644
--- a/src/frontend/packages/core/src/shared/services/cf-org-space-label.service.ts
+++ b/src/frontend/packages/core/src/shared/services/cf-org-space-label.service.ts
@@ -2,17 +2,17 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
 import { filter, first, map } from 'rxjs/operators';
 
+import { IOrganization, ISpace } from '../../../../cloud-foundry/src/cf-api.types';
 import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
 import { organizationEntityType, spaceEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
 import { haveMultiConnectedCfs } from '../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import { selectCfEntity } from '../../../../cloud-foundry/src/store/selectors/api.selectors';
+import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
 import { endpointSchemaKey } from '../../../../store/src/helpers/entity-factory';
 import { selectEntity } from '../../../../store/src/selectors/api.selectors';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 import { STRATOS_ENDPOINT_TYPE } from '../../base-entity-schemas';
-import { IOrganization, ISpace } from '../../core/cf-api.types';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
 
 export class CfOrgSpaceLabelService {
 
diff --git a/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts b/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts
index 6fa1765b3b..a4860eb481 100644
--- a/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts
+++ b/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts
@@ -9,6 +9,7 @@ import {
   IUserProvidedServiceInstanceData,
   UpdateUserProvidedServiceInstance,
 } from '../../../../cloud-foundry/src/actions/user-provided-service.actions';
+import { IUserProvidedServiceInstance } from '../../../../cloud-foundry/src/cf-api-svc.types';
 import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
 import {
   organizationEntityType,
@@ -33,7 +34,6 @@ import { RequestInfoState } from '../../../../store/src/reducers/api-request-red
 import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../store/src/types/pagination.types';
-import { IUserProvidedServiceInstance } from '../../core/cf-api-svc.types';
 
 
 @Injectable()
diff --git a/src/frontend/packages/core/test-framework/application-service-helper.ts b/src/frontend/packages/core/test-framework/application-service-helper.ts
index e4fcb83dab..00a88d5f61 100644
--- a/src/frontend/packages/core/test-framework/application-service-helper.ts
+++ b/src/frontend/packages/core/test-framework/application-service-helper.ts
@@ -1,6 +1,7 @@
 import { Store } from '@ngrx/store';
 import { Observable, of as observableOf } from 'rxjs';
 
+import { IApp, IAppSummary, IDomain, ISpace } from '../../cloud-foundry/src/cf-api.types';
 import { CFAppState } from '../../cloud-foundry/src/cf-app-state';
 import { ApplicationData, ApplicationService } from '../../cloud-foundry/src/features/applications/application.service';
 import {
@@ -8,15 +9,14 @@ import {
   EnvVarStratosProject,
 } from '../../cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service';
 import { AppStat } from '../../cloud-foundry/src/store/types/app-metadata.types';
+import { EntityServiceFactory } from '../../store/src/entity-service-factory.service';
+import { PaginationMonitorFactory } from '../../store/src/monitors/pagination-monitor.factory';
 import { RequestInfoState } from '../../store/src/reducers/api-request-reducer/types';
 import { APIResource, EntityInfo } from '../../store/src/types/api.types';
-import { IApp, IAppSummary, IDomain, ISpace } from '../src/core/cf-api.types';
-import { EntityServiceFactory } from '../../store/src/entity-service-factory.service';
 import {
   ApplicationStateData,
   ApplicationStateService,
 } from '../src/shared/components/application-state/application-state.service';
-import { PaginationMonitorFactory } from '../../store/src/monitors/pagination-monitor.factory';
 
 function createEntity<T>(entity: T): APIResource<T> {
   return {
diff --git a/src/frontend/packages/store/src/helpers/entity-relations/entity-relations-spec-helper.ts b/src/frontend/packages/store/src/helpers/entity-relations/entity-relations-spec-helper.ts
index afc78335b1..59c22c0183 100644
--- a/src/frontend/packages/store/src/helpers/entity-relations/entity-relations-spec-helper.ts
+++ b/src/frontend/packages/store/src/helpers/entity-relations/entity-relations-spec-helper.ts
@@ -1,4 +1,4 @@
-import { IOrganization, IOrgQuotaDefinition, ISpace } from '../../../../core/src/core/cf-api.types';
+import { IOrganization, IOrgQuotaDefinition, ISpace } from '../../../../cloud-foundry/src/cf-api.types';
 import { APIResource } from '../../types/api.types';
 
 export const entityRelationMissingSpacesUrl = 'spaces_url';
diff --git a/src/frontend/packages/store/src/reducers/api-request-data-reducer/request-data-reducer.factory.spec.ts b/src/frontend/packages/store/src/reducers/api-request-data-reducer/request-data-reducer.factory.spec.ts
index f9d4b4f898..e0226b57e3 100644
--- a/src/frontend/packages/store/src/reducers/api-request-data-reducer/request-data-reducer.factory.spec.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-data-reducer/request-data-reducer.factory.spec.ts
@@ -1,5 +1,5 @@
+import { IDomain } from '../../../../cloud-foundry/src/cf-api.types';
 import { domainEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
-import { IDomain } from '../../../../core/src/core/cf-api.types';
 import { APIResource } from '../../types/api.types';
 import { EntityRequestAction, ISuccessRequestAction } from '../../types/request.types';
 import { requestDataReducerFactory } from './request-data-reducer.factory';
diff --git a/src/frontend/packages/store/src/reducers/endpoint-disconnect-application.reducer.ts b/src/frontend/packages/store/src/reducers/endpoint-disconnect-application.reducer.ts
index 8074954644..254e9462d9 100644
--- a/src/frontend/packages/store/src/reducers/endpoint-disconnect-application.reducer.ts
+++ b/src/frontend/packages/store/src/reducers/endpoint-disconnect-application.reducer.ts
@@ -1,4 +1,4 @@
-import { IApp, StratosCFEntity } from '../../../core/src/core/cf-api.types';
+import { StratosCFEntity } from '../../../cloud-foundry/src/cf-api.types';
 import { DISCONNECT_ENDPOINTS_SUCCESS, DisconnectEndpoint, UNREGISTER_ENDPOINTS_SUCCESS } from '../actions/endpoint.actions';
 import { IRequestEntityTypeState } from '../app-state';
 import { APIResource } from '../types/api.types';
diff --git a/src/test-e2e/application/application-create-e2e.spec.ts b/src/test-e2e/application/application-create-e2e.spec.ts
index 8b3fa56b78..a8dcab97b1 100644
--- a/src/test-e2e/application/application-create-e2e.spec.ts
+++ b/src/test-e2e/application/application-create-e2e.spec.ts
@@ -1,6 +1,6 @@
 import { browser } from 'protractor';
 
-import { IApp } from '../../frontend/packages/core/src/core/cf-api.types';
+import { IApp } from '../../frontend/packages/cloud-foundry/src/cf-api.types';
 import { APIResource } from '../../frontend/packages/store/src/types/api.types';
 import { ApplicationsPage } from '../applications/applications.po';
 import { e2e } from '../e2e';
diff --git a/src/test-e2e/application/application-e2e-helpers.ts b/src/test-e2e/application/application-e2e-helpers.ts
index 6927fff558..52646ae9b3 100644
--- a/src/test-e2e/application/application-e2e-helpers.ts
+++ b/src/test-e2e/application/application-e2e-helpers.ts
@@ -1,6 +1,6 @@
 import { browser, promise } from 'protractor';
 
-import { IApp, IRoute, ISpace } from '../../frontend/packages/core/src/core/cf-api.types';
+import { IApp, IRoute, ISpace } from '../../frontend/packages/cloud-foundry/src/cf-api.types';
 import { APIResource } from '../../frontend/packages/store/src/types/api.types';
 import { e2e, E2ESetup } from '../e2e';
 import { E2EConfigCloudFoundry } from '../e2e.types';
diff --git a/src/test-e2e/application/application-routes-e2e.spec.ts b/src/test-e2e/application/application-routes-e2e.spec.ts
index c3a0df34c4..6a0ee1ec60 100644
--- a/src/test-e2e/application/application-routes-e2e.spec.ts
+++ b/src/test-e2e/application/application-routes-e2e.spec.ts
@@ -1,6 +1,6 @@
 import { browser, promise, protractor } from 'protractor';
 
-import { IApp } from '../../frontend/packages/core/src/core/cf-api.types';
+import { IApp } from '../../frontend/packages/cloud-foundry/src/cf-api.types';
 import { APIResource } from '../../frontend/packages/store/src/types/api.types';
 import { e2e } from '../e2e';
 import { CFHelpers } from '../helpers/cf-helpers';
diff --git a/src/test-e2e/application/application-view-e2e.spec.ts b/src/test-e2e/application/application-view-e2e.spec.ts
index a947956d90..c2d51b6b78 100644
--- a/src/test-e2e/application/application-view-e2e.spec.ts
+++ b/src/test-e2e/application/application-view-e2e.spec.ts
@@ -1,6 +1,6 @@
 import { protractor } from 'protractor';
 
-import { IApp } from '../../frontend/packages/core/src/core/cf-api.types';
+import { IApp } from '../../frontend/packages/cloud-foundry/src/cf-api.types';
 import { APIResource } from '../../frontend/packages/store/src/types/api.types';
 import { ApplicationsPage } from '../applications/applications.po';
 import { e2e } from '../e2e';
diff --git a/src/test-e2e/applications/application-wall-e2e.spec.ts b/src/test-e2e/applications/application-wall-e2e.spec.ts
index e28265cf62..fc8f6d3da0 100644
--- a/src/test-e2e/applications/application-wall-e2e.spec.ts
+++ b/src/test-e2e/applications/application-wall-e2e.spec.ts
@@ -1,6 +1,6 @@
 import { browser, promise } from 'protractor';
 
-import { IOrganization, ISpace } from '../../frontend/packages/core/src/core/cf-api.types';
+import { IOrganization, ISpace } from '../../frontend/packages/cloud-foundry/src/cf-api.types';
 import { APIResource } from '../../frontend/packages/store/src/types/api.types';
 import { ApplicationE2eHelper } from '../application/application-e2e-helpers';
 import { e2e } from '../e2e';
diff --git a/src/test-e2e/cloud-foundry/org-level/org-spaces-e2e.spec.ts b/src/test-e2e/cloud-foundry/org-level/org-spaces-e2e.spec.ts
index 379eb0c18d..1ddf2be05e 100644
--- a/src/test-e2e/cloud-foundry/org-level/org-spaces-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/org-level/org-spaces-e2e.spec.ts
@@ -1,6 +1,6 @@
 import { browser, promise } from 'protractor';
 
-import { IOrganization } from '../../../frontend/packages/core/src/core/cf-api.types';
+import { IOrganization } from '../../../frontend/packages/cloud-foundry/src/cf-api.types';
 import { APIResource } from '../../../frontend/packages/store/src/types/api.types';
 import { e2e } from '../../e2e';
 import { E2EConfigCloudFoundry } from '../../e2e.types';
diff --git a/src/test-e2e/cloud-foundry/space-level/space-routes-e2e.spec.ts b/src/test-e2e/cloud-foundry/space-level/space-routes-e2e.spec.ts
index 40bba803d7..386a8bf593 100644
--- a/src/test-e2e/cloud-foundry/space-level/space-routes-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/space-level/space-routes-e2e.spec.ts
@@ -1,6 +1,6 @@
 import { browser, promise } from 'protractor';
 
-import { ISpace } from '../../../frontend/packages/core/src/core/cf-api.types';
+import { ISpace } from '../../../frontend/packages/cloud-foundry/src/cf-api.types';
 import { APIResource } from '../../../frontend/packages/store/src/types/api.types';
 import { e2e } from '../../e2e';
 import { E2EConfigCloudFoundry } from '../../e2e.types';
diff --git a/src/test-e2e/helpers/cf-helpers.ts b/src/test-e2e/helpers/cf-helpers.ts
index b5d3a2238e..69b074e4ce 100644
--- a/src/test-e2e/helpers/cf-helpers.ts
+++ b/src/test-e2e/helpers/cf-helpers.ts
@@ -1,7 +1,5 @@
 import { browser, promise } from 'protractor';
 
-import { CFResponse } from '../../frontend/packages/cloud-foundry/src/store/types/cf-api.types';
-import { CfUser } from '../../frontend/packages/cloud-foundry/src/store/types/user.types';
 import {
   IApp,
   IDomain,
@@ -10,7 +8,9 @@ import {
   IRoute,
   ISpace,
   ISpaceQuotaDefinition,
-} from '../../frontend/packages/core/src/core/cf-api.types';
+} from '../../frontend/packages/cloud-foundry/src/cf-api.types';
+import { CFResponse } from '../../frontend/packages/cloud-foundry/src/store/types/cf-api.types';
+import { CfUser } from '../../frontend/packages/cloud-foundry/src/store/types/user.types';
 import { APIResource } from '../../frontend/packages/store/src/types/api.types';
 import { ApplicationPageSummaryTab } from '../application/po/application-page-summary.po';
 import { CfTopLevelPage } from '../cloud-foundry/cf-level/cf-top-level-page.po';
diff --git a/src/test-e2e/marketplace/services-helper-e2e.ts b/src/test-e2e/marketplace/services-helper-e2e.ts
index ae923cab80..7e358eb5f8 100644
--- a/src/test-e2e/marketplace/services-helper-e2e.ts
+++ b/src/test-e2e/marketplace/services-helper-e2e.ts
@@ -1,7 +1,7 @@
 import { browser, promise, protractor } from 'protractor';
 
+import { IServiceInstance } from '../../frontend/packages/cloud-foundry/src/cf-api-svc.types';
 import { CFResponse, createEmptyCfResponse } from '../../frontend/packages/cloud-foundry/src/store/types/cf-api.types';
-import { IServiceInstance } from '../../frontend/packages/core/src/core/cf-api-svc.types';
 import { APIResource } from '../../frontend/packages/store/src/types/api.types';
 import { e2e, E2ESetup } from '../e2e';
 import { CFHelpers } from '../helpers/cf-helpers';

From b5da7f4ac5974534d625d280b85f2bf2e1e073ad Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 5 May 2020 14:05:33 +0100
Subject: [PATCH 060/176] More moves

---
 .../cloud-foundry-organization.service.ts     |  6 +--
 .../services/cloud-foundry-space.service.ts   |  6 +--
 ...specify-user-provided-details.component.ts |  4 +-
 .../cf-org-space-links.component.spec.ts      |  2 +-
 .../cf-org-space-links.component.ts           |  2 +-
 .../app/TableCellAppCfOrgSpaceBase.ts         |  2 +-
 .../list-types/app/card/card-app.component.ts |  2 +-
 .../cf-service-card.component.ts              |  2 +-
 ...e-cell-service-cf-breadcrumbs.component.ts |  2 +-
 .../cf-space-card.component.spec.ts           | 14 +++----
 .../service-instance-card.component.ts        |  2 +-
 ...rovided-service-instance-card.component.ts |  2 +-
 .../services/cf-org-space-label.service.ts    | 12 +++---
 ...-foundry-user-provided-services.service.ts | 40 +++++++++----------
 .../table-cell/table-cell.component.spec.ts   | 36 ++++-------------
 .../packages/core/src/shared/shared.module.ts |  4 +-
 16 files changed, 58 insertions(+), 80 deletions(-)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/services/cf-org-space-label.service.ts (84%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/services/cloud-foundry-user-provided-services.service.ts (87%)

diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization.service.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization.service.ts
index 71e35081fb..35584dd3c2 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-organization.service.ts
@@ -13,9 +13,6 @@ import {
   spaceEntityType,
 } from '../../../../../cloud-foundry/src/cf-entity-types';
 import { OrgUserRoleNames } from '../../../../../cloud-foundry/src/store/types/user.types';
-import {
-  CloudFoundryUserProvidedServicesService,
-} from '../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
 import { IEntityMetadata } from '../../../../../store/src/entity-catalog/entity-catalog.types';
 import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
@@ -34,6 +31,9 @@ import { getEntityFlattenedList, getStartedAppInstanceCount } from '../../../cf.
 import { OrganizationActionBuilders } from '../../../entity-action-builders/organization.action-builders';
 import { createEntityRelationKey } from '../../../entity-relations/entity-relations.types';
 import { CfUserService } from '../../../shared/data-services/cf-user.service';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../shared/services/cloud-foundry-user-provided-services.service';
 import { fetchServiceInstancesCount } from '../../service-catalog/services-helper';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { getOrgRolesString } from '../cf.helpers';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space.service.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space.service.ts
index 86b1adbfa8..c8cb96e8c8 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space.service.ts
@@ -13,9 +13,6 @@ import {
   spaceQuotaEntityType,
 } from '../../../../../cloud-foundry/src/cf-entity-types';
 import { SpaceUserRoleNames } from '../../../../../cloud-foundry/src/store/types/user.types';
-import {
-  CloudFoundryUserProvidedServicesService,
-} from '../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
 import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
@@ -25,6 +22,9 @@ import { CF_ENDPOINT_TYPE } from '../../../cf-types';
 import { getStartedAppInstanceCount } from '../../../cf.helpers';
 import { createEntityRelationKey } from '../../../entity-relations/entity-relations.types';
 import { CfUserService } from '../../../shared/data-services/cf-user.service';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../shared/services/cloud-foundry-user-provided-services.service';
 import { fetchServiceInstancesCount } from '../../service-catalog/services-helper';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { getSpaceRolesString } from '../cf.helpers';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts
index 2cc2cfcc8f..441142deec 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts
@@ -29,13 +29,11 @@ import {
 } from '../../../../../../core/src/shared/app-name-unique.directive/app-name-unique.directive';
 import { StepOnNextResult } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { isValidJsonValidator } from '../../../../../../core/src/shared/form-validators';
-import {
-  CloudFoundryUserProvidedServicesService,
-} from '../../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { APIResource } from '../../../../../../store/src/types/api.types';
 import { IUserProvidedServiceInstance } from '../../../../cf-api-svc.types';
 import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
+import { CloudFoundryUserProvidedServicesService } from '../../../services/cloud-foundry-user-provided-services.service';
 import { CreateServiceFormMode, CsiModeService } from './../csi-mode.service';
 
 const { proxyAPIVersion, cfAPIVersion } = environment;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-org-space-links/cf-org-space-links.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cf-org-space-links/cf-org-space-links.component.spec.ts
index f9c13ac18a..dc3c440bff 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cf-org-space-links/cf-org-space-links.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cf-org-space-links/cf-org-space-links.component.spec.ts
@@ -2,8 +2,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { of } from 'rxjs';
 
-import { CfOrgSpaceLabelService } from '../../../../../core/src/shared/services/cf-org-space-label.service';
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { CfOrgSpaceLabelService } from '../../services/cf-org-space-label.service';
 import { CfOrgSpaceLinksComponent } from './cf-org-space-links.component';
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-org-space-links/cf-org-space-links.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cf-org-space-links/cf-org-space-links.component.ts
index 23262a6a8d..e8e0b8bbe0 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cf-org-space-links/cf-org-space-links.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cf-org-space-links/cf-org-space-links.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 
-import { CfOrgSpaceLabelService } from '../../../../../core/src/shared/services/cf-org-space-label.service';
+import { CfOrgSpaceLabelService } from '../../services/cf-org-space-label.service';
 
 @Component({
   selector: 'app-cf-org-space-links',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/TableCellAppCfOrgSpaceBase.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/TableCellAppCfOrgSpaceBase.ts
index 4996c4d1ca..718db5975e 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/TableCellAppCfOrgSpaceBase.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/TableCellAppCfOrgSpaceBase.ts
@@ -2,9 +2,9 @@ import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { TableCellCustom } from '../../../../../../../core/src/shared/components/list/list.types';
-import { CfOrgSpaceLabelService } from '../../../../../../../core/src/shared/services/cf-org-space-label.service';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { IApp } from '../../../../../cf-api.types';
+import { CfOrgSpaceLabelService } from '../../../../services/cf-org-space-label.service';
 
 
 export class TableCellAppCfOrgSpaceBase extends TableCellCustom<APIResource<IApp>> {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts
index 77ed5f809e..f282b1dc3d 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts
@@ -15,13 +15,13 @@ import {
   FavoritesConfigMapper,
 } from '../../../../../../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
 import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types';
-import { CfOrgSpaceLabelService } from '../../../../../../../../core/src/shared/services/cf-org-space-label.service';
 import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../core/src/shared/shared.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
 import { IApp, ISpace } from '../../../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { ApplicationService } from '../../../../../../features/applications/application.service';
+import { CfOrgSpaceLabelService } from '../../../../../services/cf-org-space-label.service';
 
 @Component({
   selector: 'app-card-app',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.ts
index 9ef621de29..c6943f5800 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-card/cf-service-card.component.ts
@@ -5,12 +5,12 @@ import { Observable } from 'rxjs';
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
 import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types';
-import { CfOrgSpaceLabelService } from '../../../../../../../../core/src/shared/services/cf-org-space-label.service';
 import { RouterNav } from '../../../../../../../../store/src/actions/router.actions';
 import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { IService, IServiceExtra } from '../../../../../../cf-api-svc.types';
 import { getServiceBrokerName, getServiceName } from '../../../../../../features/service-catalog/services-helper';
+import { CfOrgSpaceLabelService } from '../../../../../services/cf-org-space-label.service';
 
 export interface ServiceTag {
   value: string;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-cf-breadcrumbs/table-cell-service-cf-breadcrumbs.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-cf-breadcrumbs/table-cell-service-cf-breadcrumbs.component.ts
index 18d6d45838..ec34e51905 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-cf-breadcrumbs/table-cell-service-cf-breadcrumbs.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/table-cell-service-cf-breadcrumbs/table-cell-service-cf-breadcrumbs.component.ts
@@ -2,10 +2,10 @@ import { Component, Input } from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
-import { CfOrgSpaceLabelService } from '../../../../../../../../core/src/shared/services/cf-org-space-label.service';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { IService } from '../../../../../../cf-api-svc.types';
 import { CFAppState } from '../../../../../../cf-app-state';
+import { CfOrgSpaceLabelService } from '../../../../../services/cf-org-space-label.service';
 
 @Component({
   selector: 'app-table-cell-service-cf-breadcrumbs',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.spec.ts
index 8ed58476df..5d3228031f 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.spec.ts
@@ -1,16 +1,13 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { Store } from '@ngrx/store';
+import { testSessionData } from '@stratos/store/testing';
 
-import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
-import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
-import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
-import {
-  CloudFoundryUserProvidedServicesService,
-} from '../../../../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { MetadataCardTestComponents } from '../../../../../../../../core/test-framework/core-test.helper';
-import { testSessionData } from '@stratos/store/testing';
 import { VerifiedSession } from '../../../../../../../../store/src/actions/auth.actions';
+import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
+import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
+import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import {
   generateCfBaseTestModulesNoShared,
   generateTestCfEndpointServiceProvider,
@@ -20,6 +17,9 @@ import {
   CloudFoundryOrganizationService,
 } from '../../../../../../features/cloud-foundry/services/cloud-foundry-organization.service';
 import { CfOrgSpaceDataService } from '../../../../../data-services/cf-org-space-service.service';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../../../services/cloud-foundry-user-provided-services.service';
 import { CfSpaceCardComponent } from './cf-space-card.component';
 
 describe('CfSpaceCardComponent', () => {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts
index feee1f3964..1636331357 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts
@@ -11,7 +11,6 @@ import {
   MetaCardMenuItem,
 } from '../../../../../../../../core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component';
 import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types';
-import { CfOrgSpaceLabelService } from '../../../../../../../../core/src/shared/services/cf-org-space-label.service';
 import { ComponentEntityMonitorConfig } from '../../../../../../../../core/src/shared/shared.types';
 import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
@@ -24,6 +23,7 @@ import {
   getServiceSummaryUrl,
 } from '../../../../../../features/service-catalog/services-helper';
 import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service';
+import { CfOrgSpaceLabelService } from '../../../../../services/cf-org-space-label.service';
 
 @Component({
   selector: 'app-service-instance-card',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts
index 190fbc0b64..e8dacad1d2 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts
@@ -11,12 +11,12 @@ import {
   MetaCardMenuItem,
 } from '../../../../../../../../core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component';
 import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types';
-import { CfOrgSpaceLabelService } from '../../../../../../../../core/src/shared/services/cf-org-space-label.service';
 import { ComponentEntityMonitorConfig } from '../../../../../../../../core/src/shared/shared.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { IUserProvidedServiceInstance } from '../../../../../../cf-api-svc.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service';
+import { CfOrgSpaceLabelService } from '../../../../../services/cf-org-space-label.service';
 
 
 @Component({
diff --git a/src/frontend/packages/core/src/shared/services/cf-org-space-label.service.ts b/src/frontend/packages/cloud-foundry/src/shared/services/cf-org-space-label.service.ts
similarity index 84%
rename from src/frontend/packages/core/src/shared/services/cf-org-space-label.service.ts
rename to src/frontend/packages/cloud-foundry/src/shared/services/cf-org-space-label.service.ts
index 607f13f7f1..f5aed74d84 100644
--- a/src/frontend/packages/core/src/shared/services/cf-org-space-label.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/services/cf-org-space-label.service.ts
@@ -2,17 +2,17 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
 import { filter, first, map } from 'rxjs/operators';
 
-import { IOrganization, ISpace } from '../../../../cloud-foundry/src/cf-api.types';
-import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
-import { organizationEntityType, spaceEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
-import { haveMultiConnectedCfs } from '../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
-import { selectCfEntity } from '../../../../cloud-foundry/src/store/selectors/api.selectors';
+import { STRATOS_ENDPOINT_TYPE } from '../../../../core/src/base-entity-schemas';
 import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
 import { endpointSchemaKey } from '../../../../store/src/helpers/entity-factory';
 import { selectEntity } from '../../../../store/src/selectors/api.selectors';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
-import { STRATOS_ENDPOINT_TYPE } from '../../base-entity-schemas';
+import { IOrganization, ISpace } from '../../cf-api.types';
+import { CFAppState } from '../../cf-app-state';
+import { organizationEntityType, spaceEntityType } from '../../cf-entity-types';
+import { haveMultiConnectedCfs } from '../../features/cloud-foundry/cf.helpers';
+import { selectCfEntity } from '../../store/selectors/api.selectors';
 
 export class CfOrgSpaceLabelService {
 
diff --git a/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts b/src/frontend/packages/cloud-foundry/src/shared/services/cloud-foundry-user-provided-services.service.ts
similarity index 87%
rename from src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts
rename to src/frontend/packages/cloud-foundry/src/shared/services/cloud-foundry-user-provided-services.service.ts
index a4860eb481..d63e87d7f2 100644
--- a/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/services/cloud-foundry-user-provided-services.service.ts
@@ -3,37 +3,35 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
 import { filter, first, map, pairwise, tap } from 'rxjs/operators';
 
+import { ClearPaginationOfType } from '../../../../store/src/actions/pagination.actions';
+import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
+import { EntityCatalogEntityConfig, IEntityMetadata } from '../../../../store/src/entity-catalog/entity-catalog.types';
+import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
+import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
+import { RequestInfoState } from '../../../../store/src/reducers/api-request-reducer/types';
+import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+import { APIResource } from '../../../../store/src/types/api.types';
+import { PaginatedAction } from '../../../../store/src/types/pagination.types';
 import {
   CreateUserProvidedServiceInstance,
   getUserProvidedServiceInstanceRelations,
   IUserProvidedServiceInstanceData,
   UpdateUserProvidedServiceInstance,
-} from '../../../../cloud-foundry/src/actions/user-provided-service.actions';
-import { IUserProvidedServiceInstance } from '../../../../cloud-foundry/src/cf-api-svc.types';
-import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
+} from '../../actions/user-provided-service.actions';
+import { IUserProvidedServiceInstance } from '../../cf-api-svc.types';
+import { CFAppState } from '../../cf-app-state';
 import {
   organizationEntityType,
   serviceInstancesEntityType,
   spaceEntityType,
   userProvidedServiceInstanceEntityType,
-} from '../../../../cloud-foundry/src/cf-entity-types';
-import { CF_ENDPOINT_TYPE } from '../../../../cloud-foundry/src/cf-types';
-import {
-  UserProvidedServiceActionBuilder,
-} from '../../../../cloud-foundry/src/entity-action-builders/user-provided-service.action-builders';
-import { createEntityRelationPaginationKey } from '../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { fetchTotalResults } from '../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
-import { QParam, QParamJoiners } from '../../../../cloud-foundry/src/shared/q-param';
-import { selectCfRequestInfo } from '../../../../cloud-foundry/src/store/selectors/api.selectors';
-import { ClearPaginationOfType } from '../../../../store/src/actions/pagination.actions';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityCatalogEntityConfig, IEntityMetadata } from '../../../../store/src/entity-catalog/entity-catalog.types';
-import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
-import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
-import { RequestInfoState } from '../../../../store/src/reducers/api-request-reducer/types';
-import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
-import { APIResource } from '../../../../store/src/types/api.types';
-import { PaginatedAction } from '../../../../store/src/types/pagination.types';
+} from '../../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../../cf-types';
+import { UserProvidedServiceActionBuilder } from '../../entity-action-builders/user-provided-service.action-builders';
+import { createEntityRelationPaginationKey } from '../../entity-relations/entity-relations.types';
+import { fetchTotalResults } from '../../features/cloud-foundry/cf.helpers';
+import { selectCfRequestInfo } from '../../store/selectors/api.selectors';
+import { QParam, QParamJoiners } from '../q-param';
 
 
 @Injectable()
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.spec.ts
index e630f5f39d..c72cfd8a8e 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.spec.ts
@@ -1,24 +1,6 @@
 /* tslint:disable:max-line-length */
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import {
-  CfOrgSpaceLinksComponent,
-} from '../../../../../../../cloud-foundry/src/shared/components/cf-org-space-links/cf-org-space-links.component';
-import {
-  CfRoleCheckboxComponent,
-} from '../../../../../../../cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component';
-import {
-  EventTabActorIconPipe,
-} from '../../../../../../../cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-action/event-tab-actor-icon.pipe';
-import {
-  RunningInstancesComponent,
-} from '../../../../../../../cloud-foundry/src/shared/components/running-instances/running-instances.component';
-import {
-  ServicePlanPriceComponent,
-} from '../../../../../../../cloud-foundry/src/shared/components/service-plan-price/service-plan-price.component';
-import {
-  ServicePlanPublicComponent,
-} from '../../../../../../../cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component';
 import { CoreModule } from '../../../../../core/core.module';
 import { UtilsService } from '../../../../../core/utils.service';
 import { PercentagePipe } from '../../../../pipes/percentage.pipe';
@@ -32,8 +14,6 @@ import { ApplicationStateComponent } from '../../../application-state/applicatio
 import { ApplicationStateService } from '../../../application-state/application-state.service';
 import { BooleanIndicatorComponent } from '../../../boolean-indicator/boolean-indicator.component';
 import { AppChipsComponent } from '../../../chips/chips.component';
-import { GithubCommitAuthorComponent } from '../../../github-commit-author/github-commit-author.component';
-import { ServiceInstanceLastOpComponent } from '../../../service-instance-last-op/service-instance-last-op.component';
 import { UsageGaugeComponent } from '../../../usage-gauge/usage-gauge.component';
 import { listTableCells, TableCellComponent } from './table-cell.component';
 
@@ -50,22 +30,22 @@ describe('TableCellComponent', () => {
         AppActionMonitorIconComponent,
         TableCellComponent,
         ...listTableCells,
-        EventTabActorIconPipe,
+        // EventTabActorIconPipe,
         ValuesPipe,
         ApplicationStateComponent,
         ApplicationStateIconComponent,
         ApplicationStateIconPipe,
         UsageGaugeComponent,
         PercentagePipe,
-        RunningInstancesComponent,
+        // RunningInstancesComponent,
         AppChipsComponent,
         BooleanIndicatorComponent,
-        CfRoleCheckboxComponent,
-        GithubCommitAuthorComponent,
-        ServicePlanPriceComponent,
-        ServicePlanPublicComponent,
-        CfOrgSpaceLinksComponent,
-        ServiceInstanceLastOpComponent
+        // CfRoleCheckboxComponent,
+        // GithubCommitAuthorComponent,
+        // ServicePlanPriceComponent,
+        // ServicePlanPublicComponent,
+        // CfOrgSpaceLinksComponent,
+        // ServiceInstanceLastOpComponent
       ],
       imports: [
         CoreModule
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index c380a0c102..6d6bfe0492 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -8,6 +8,9 @@ import { NgxChartsModule } from '@swimlane/ngx-charts';
 import {
   ApplicationInstanceChartComponent,
 } from '../../../cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../cloud-foundry/src/shared/services/cloud-foundry-user-provided-services.service';
 import { EntityMonitorFactory } from '../../../store/src/monitors/entity-monitor.factory.service';
 import { InternalEventMonitorFactory } from '../../../store/src/monitors/internal-event-monitor.factory';
 import { PaginationMonitorFactory } from '../../../store/src/monitors/pagination-monitor.factory';
@@ -125,7 +128,6 @@ import { PercentagePipe } from './pipes/percentage.pipe';
 import { UptimePipe } from './pipes/uptime.pipe';
 import { UsageBytesPipe } from './pipes/usage-bytes.pipe';
 import { ValuesPipe } from './pipes/values.pipe';
-import { CloudFoundryUserProvidedServicesService } from './services/cloud-foundry-user-provided-services.service';
 import { LongRunningOperationsService } from './services/long-running-op.service';
 import { MetricsRangeSelectorService } from './services/metrics-range-selector.service';
 import { UserPermissionDirective } from './user-permission.directive';

From b4c87154b427e64c3da0b250d1eeca25839beb1a Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 5 May 2020 12:49:19 +0100
Subject: [PATCH 061/176] UX changes following mini-review

---
 .../autoscaler-helpers/autoscaler-util.ts     |   4 -
 .../edit-autoscaler-credential.component.html | 155 +++++++++---------
 .../edit-autoscaler-credential.component.scss |  31 +++-
 .../edit-autoscaler-credential.component.ts   |  32 ++--
 4 files changed, 125 insertions(+), 97 deletions(-)

diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts
index e090b4457a..9e73dfed78 100644
--- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts
+++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler-helpers/autoscaler-util.ts
@@ -64,10 +64,6 @@ export class AutoscalerConstants {
     instance_max_count: 10,
     initial_min_instance_count: 5
   };
-  public static CredentialDefault = {
-    username: 'my-username',
-    password: 'my-password',
-  };
 
   public static metricMap: { [metricName: string]: AppAutoscalerMetricMapInfo } = {
     memoryused: {
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.html b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.html
index 9348e06124..4cca1085f5 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.html
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.html
@@ -7,82 +7,83 @@ <h1>Manage AutoScaler Credentials: {{ (applicationService.application$ | async)?
   </div>
 </app-page-header>
 <div class="autoscaler-credential">
-  <app-tile-grid class="app-autoscaler-tile-grid-100">
-    <app-tile-group>
-      <app-tile>
-        <mat-card>
-          <mat-card-header>
-            <div>
-              <p>Credentials are required when submitting custom metrics to the autoscaler. They can either be supplied
-                or randomly generated</p>
-              <p>Please note, only the latest set of credentials are valid. Creating a new set will invalidate any
-                previously created</p>
-            </div>
-          </mat-card-header>
-          <mat-card-content>
-            <form [formGroup]="editCredentialForm" validate class="autoscaler-credential__form">
-              <div class="autoscaler-credential__toggle">
-                <span>Create random credential</span>
-                <mat-slide-toggle [checked]="!randomCredential" (toggleChange)="toggleChange()">Create specified
-                  credential
-                </mat-slide-toggle>
-              </div>
-              <mat-form-field>
-                <input matInput placeholder="Username" name="acusername" formControlName="acusername" type="text"
-                  required>
-                <mat-error *ngIf="editCredentialForm.get('acusername').hasError('required')">
-                  Username is required
-                </mat-error>
-              </mat-form-field>
-              <mat-form-field>
-                <input matInput placeholder="Password" name="acpassword" formControlName="acpassword" type="text"
-                  required>
-                <mat-error *ngIf="editCredentialForm.get('acpassword').hasError('required')">
-                  Password is required
-                </mat-error>
-              </mat-form-field>
-            </form>
-            <div class="autoscaler-credential__buttons">
-              <button color="accent" mat-button mat-raised-button (click)="createCredential()"
-                [disabled]="(!randomCredential && !editCredentialForm.valid) || (creating$ | async)">
-                <div class="autoscaler-credential__buttons--spinner">
-                  <mat-progress-spinner *ngIf="creating$ | async; else notCreating" diameter="20" mode="indeterminate">
-                  </mat-progress-spinner>&nbsp;
-                  <ng-template #notCreating>Create</ng-template>
-                </div>
+  <mat-card class="autoscaler-credential__card">
+    <mat-card-header>
+      <mat-icon>add_box</mat-icon>Create
+    </mat-card-header>
+    <mat-card-content>
+      <div>
+        <p>Credentials are required when submitting custom metrics to the autoscaler. They can either be randomly
+          generated or supplied.</p>
+        <p><i>Please note, only the latest set of credentials are valid. Creating a new set will invalidate any
+            previously created.</i></p>
+      </div>
+      <form [formGroup]="editCredentialForm" validate class="autoscaler-credential__form">
+        <div class="autoscaler-credential__toggle">
+          <span>Type</span>
+          <mat-radio-group formControlName="actype" (change)="toggleChange()">
+            <mat-radio-button checked [value]="true">Random</mat-radio-button>
+            <mat-radio-button [value]="false">Custom</mat-radio-button>
+          </mat-radio-group>
+        </div>
+        <mat-form-field>
+          <input matInput placeholder="Username" name="acusername" formControlName="acusername" type="text" required>
+          <mat-error *ngIf="editCredentialForm.get('acusername').hasError('required')">
+            Username is required
+          </mat-error>
+        </mat-form-field>
+        <mat-form-field>
+          <input matInput placeholder="Password" name="acpassword" formControlName="acpassword" type="text" required>
+          <mat-error *ngIf="editCredentialForm.get('acpassword').hasError('required')">
+            Password is required
+          </mat-error>
+        </mat-form-field>
+      </form>
+      <div class="autoscaler-credential__buttons">
+        <button color="accent" mat-button mat-raised-button (click)="createCredential()"
+          [disabled]="(!editCredentialForm.valid) || (creating$ | async)">
+          <div class="autoscaler-credential__buttons--spinner">
+            <mat-progress-spinner *ngIf="creating$ | async; else notCreating" diameter="20" mode="indeterminate">
+            </mat-progress-spinner>&nbsp;
+            <ng-template #notCreating>Create</ng-template>
+          </div>
+        </button>
+      </div>
+      <div *ngIf="appAutoscalerCredential$ | async as credential">
+        <p>Credentials have been generated. Use the following details to PUT custom metric data</p>
+        <p><i>They will only be available to view here once. Please ensure they are
+            recorded correctly</i></p>
+        <ul>
+          <li>Username: {{credential.username}}</li>
+          <li>Password: {{credential.password}}</li>
+          <li>Authorization Header: {{credential.authHeader}}</li>
+          <li>URL: {{credential.fullUrl}}</li>
+        </ul>
+      </div>
+    </mat-card-content>
+  </mat-card>
+  <mat-card class="autoscaler-credential__card">
+    <mat-card-header>
+      <mat-icon>delete</mat-icon>Delete
+    </mat-card-header>
+    <mat-card-content>
+      <div>
+        <p>
+          Delete the last credentials that were created.
+        </p>
+      </div>
+      <div class="autoscaler-credential__buttons">
+        <button color="accent" class="autoscaler-credential__button" mat-button mat-raised-button
+          (click)="deleteCredentialConfirm()" [disabled]="deleting$ | async">
+          <div class="autoscaler-credential__buttons--spinner">
+            <mat-progress-spinner *ngIf="deleting$ | async; else notDeleting" diameter="20" mode="indeterminate">
+            </mat-progress-spinner>&nbsp;
+            <ng-template #notDeleting>Delete</ng-template>
+          </div>
+        </button>
+      </div>
+    </mat-card-content>
+  </mat-card>
+
 
-              </button>
-              <button color="accent" class="autoscaler-credential__button" mat-button mat-raised-button
-                (click)="deleteCredentialConfirm()" [disabled]="deleting$ | async">
-                <div class="autoscaler-credential__buttons--spinner">
-                  <mat-progress-spinner *ngIf="deleting$ | async; else notDeleting" diameter="20" mode="indeterminate">
-                  </mat-progress-spinner>&nbsp;
-                  <ng-template #notDeleting>Delete</ng-template>
-                </div>
-              </button>
-            </div>
-          </mat-card-content>
-        </mat-card>
-      </app-tile>
-    </app-tile-group>
-    <app-tile-group *ngIf="appAutoscalerCredential$ | async as credential">
-      <app-tile>
-        <mat-card>
-          <mat-card-header>
-            <div>
-              <p>Credentials have been generated. Please apply them to the process used to create the custom metrics.
-                If this is an application's environment variables please restart the application for changes to take
-                effect.</p>
-              <p>Credentials will only be available to view here once. Please ensure they are recorded correctly</p>
-            </div>
-          </mat-card-header>
-          <mat-card-content>
-            <app-code-block>
-              <pre>{{ credential | json }}</pre>
-            </app-code-block>
-          </mat-card-content>
-        </mat-card>
-      </app-tile>
-    </app-tile-group>
-  </app-tile-grid>
 </div>
\ No newline at end of file
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.scss b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.scss
index e2a9fd4d93..90941d50a4 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.scss
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.scss
@@ -1,19 +1,37 @@
 .autoscaler-credential {
 
+  &__card {
+
+    &:first-of-type {
+      margin-bottom: 24px;
+    }
+
+    mat-card-header {
+      align-items: center;
+      display: flex;
+    }
+  }
+
   &__form {
     display: flex;
     flex-direction: column;
-    margin-top: 10px;
-    max-width: 450px;
+    margin-top: 15px;
     mat-form-field {
-      width: 100%;
+      max-width: 350px;
     }
   }
 
   &__toggle {
-    padding: 1em 0;
-    span {
-      margin-right: .8em;
+    display: flex;
+    flex-direction: column;
+    padding-bottom: 7px;
+
+    mat-radio-group {
+      padding-top: 10px;
+      mat-radio-button {
+        padding-right: 12px;
+
+      }
     }
   }
 
@@ -23,6 +41,7 @@
       display: flex;
       justify-content: center;
       margin-right: 8px;
+      width: 100px;
     }
     &--spinner {
       align-items: center;
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts
index 0210729dbf..ad0895d862 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts
@@ -21,7 +21,6 @@ import { EntityService } from '../../../../store/src/entity-service';
 import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
 import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
 import { selectDeletionInfo } from '../../../../store/src/selectors/api.selectors';
-import { AutoscalerConstants } from '../../core/autoscaler-helpers/autoscaler-util';
 import {
   DeleteAppAutoscalerCredentialAction,
   UpdateAppAutoscalerCredentialAction,
@@ -42,7 +41,6 @@ export class EditAutoscalerCredentialComponent implements OnInit, OnDestroy {
   applicationName$: Observable<string>;
 
   public editCredentialForm: FormGroup;
-  public randomCredential = true;
   public appAutoscalerCredential$: Observable<AppAutoscalerCredential>;
 
   private appAutoscalerCredentialErrorSub: Subscription;
@@ -63,8 +61,9 @@ export class EditAutoscalerCredentialComponent implements OnInit, OnDestroy {
     private confirmDialog: ConfirmationDialogService,
   ) {
     this.editCredentialForm = this.fb.group({
-      acusername: new FormControl({ value: '', disabled: this.randomCredential }, Validators.required),
-      acpassword: new FormControl({ value: '', disabled: this.randomCredential }, Validators.required),
+      actype: new FormControl({ value: true }),
+      acusername: new FormControl({ value: '', disabled: true }, Validators.required),
+      acpassword: new FormControl({ value: '', disabled: true }, Validators.required),
     });
   }
 
@@ -84,15 +83,14 @@ export class EditAutoscalerCredentialComponent implements OnInit, OnDestroy {
   }
 
   toggleChange() {
-    this.randomCredential = !this.randomCredential;
-    if (this.randomCredential) {
+    if (this.editCredentialForm.controls.actype.value) {
       this.editCredentialForm.controls.acusername.setValue('');
       this.editCredentialForm.controls.acpassword.setValue('');
       this.editCredentialForm.controls.acusername.disable();
       this.editCredentialForm.controls.acpassword.disable();
     } else {
-      this.editCredentialForm.controls.acusername.setValue(AutoscalerConstants.CredentialDefault.username);
-      this.editCredentialForm.controls.acpassword.setValue(AutoscalerConstants.CredentialDefault.password);
+      this.editCredentialForm.controls.acusername.setValue('');
+      this.editCredentialForm.controls.acpassword.setValue('');
       this.editCredentialForm.controls.acusername.enable();
       this.editCredentialForm.controls.acpassword.enable();
     }
@@ -101,7 +99,7 @@ export class EditAutoscalerCredentialComponent implements OnInit, OnDestroy {
   createCredential() {
     this.creating.next(true);
     let action: UpdateAppAutoscalerCredentialAction;
-    if (this.randomCredential) {
+    if (this.editCredentialForm.controls.actype.value) {
       action = new UpdateAppAutoscalerCredentialAction(this.applicationService.appGuid, this.applicationService.cfGuid);
     } else {
       const credential: AppAutoscalerCredential = {
@@ -115,12 +113,26 @@ export class EditAutoscalerCredentialComponent implements OnInit, OnDestroy {
       action,
     );
     this.appAutoscalerCredential$ = updateAppAutoscalerCredentialService.entityObs$.pipe(
+      filter(({ entity, entityRequestInfo }) => {
+        console.log(entity, entityRequestInfo)
+        return entityRequestInfo && !entityRequestInfo.creating && !entityRequestInfo.deleting.busy;
+      }),
       map(({ entity }) => entity ? entity.entity : null),
+      map(creds => {
+        if (!creds) {
+          return;
+        }
+        return {
+          ...creds,
+          authHeader: 'basic ' + btoa(`${creds.username}:${creds.password}`),
+          fullUrl: `${creds.url}/v1/apps/${creds.app_id}/metrics`
+        }
+      }),
       publishReplay(1),
       refCount()
     );
     updateAppAutoscalerCredentialService.entityMonitor.getUpdatingSection(action.updatingKey).pipe(
-      delay(250),
+      delay(150),
       pairwise(),
       filter(([oldV, newV]) => oldV.busy && !newV.busy),
       map(([, newV]) => newV),

From 0db932add94fdfb7f83b4e0a7bfb85c31974912a Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 5 May 2020 16:47:14 +0100
Subject: [PATCH 062/176] Hide manage credentials button for pre 3.0.0
 autoscalers

---
 .../autoscaler-tab-extension.component.html   |  3 ++-
 .../autoscaler-tab-extension.component.ts     | 22 +++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html
index e7b5be4cc9..5e44e8f544 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html
+++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html
@@ -10,7 +10,8 @@
         <mat-icon class="nav-button-with-text__icon">delete</mat-icon> Delete Policy
       </span>
     </button>
-    <button mat-button name="credential" (click)="manageCredentialPage()" class="nav-button-with-text">
+    <button *ngIf="canManageCredentials$ | async" mat-button name="credential" (click)="manageCredentialPage()"
+      class="nav-button-with-text">
       <span class="nav-button-with-text__span">
         <mat-icon class="nav-button-with-text__icon">vpn_key</mat-icon> Manage Credentials
       </span>
diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
index 2efd5109e4..efab7dda2b 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
@@ -24,7 +24,7 @@ import { ActionState } from '../../../../store/src/reducers/api-request-reducer/
 import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { selectDeletionInfo } from '../../../../store/src/selectors/api.selectors';
 import { APIResource } from '../../../../store/src/types/api.types';
-import { isAutoscalerEnabled } from '../../core/autoscaler-helpers/autoscaler-available';
+import { fetchAutoscalerInfo, isAutoscalerEnabled } from '../../core/autoscaler-helpers/autoscaler-available';
 import { AutoscalerConstants } from '../../core/autoscaler-helpers/autoscaler-util';
 import {
   AutoscalerPaginationParams,
@@ -34,11 +34,11 @@ import {
   GetAppAutoscalerScalingHistoryAction,
 } from '../../store/app-autoscaler.actions';
 import {
+  AppAutoscaleMetricChart,
   AppAutoscalerMetricData,
   AppAutoscalerPolicyLocal,
   AppAutoscalerScalingHistory,
   AppScalingTrigger,
-  AppAutoscaleMetricChart,
 } from '../../store/app-autoscaler.types';
 import { appAutoscalerAppMetricEntityType, autoscalerEntityFactory } from '../../store/autoscaler-entity-factory';
 
@@ -63,6 +63,8 @@ import { appAutoscalerAppMetricEntityType, autoscalerEntityFactory } from '../..
 })
 export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
 
+  canManageCredentials$: Observable<boolean>;
+
   scalingRuleColumns: string[] = ['metric', 'condition', 'action'];
   specificDateColumns: string[] = ['from', 'to', 'init', 'min', 'max'];
   recurringScheduleColumns: string[] = ['effect', 'repeat', 'from', 'to', 'init', 'min', 'max'];
@@ -128,6 +130,22 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
   ) { }
 
   ngOnInit() {
+
+    this.canManageCredentials$ = fetchAutoscalerInfo(
+      this.applicationService.cfGuid,
+      this.entityServiceFactory
+    ).pipe(
+      filter(info => !!info && !!info.entity && !!info.entity.entity),
+      map(info => {
+        const build = info.entity.entity.build;
+        const buildParts = build.split('.');
+        if (buildParts.length < 0) {
+          return false;
+        }
+        return Number.parseInt(buildParts[0]) >= 3
+      })
+    )
+
     this.appAutoscalerPolicyService = this.entityServiceFactory.create(
       this.applicationService.appGuid,
       new GetAppAutoscalerPolicyAction(this.applicationService.appGuid, this.applicationService.cfGuid)

From 1770174d392b7e673dc5fec8e016312240bed27f Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 5 May 2020 17:12:43 +0100
Subject: [PATCH 063/176] More moves

---
 .../card-autoscaler-default.component.spec.ts | 10 ++++++----
 ...scaler-metric-chart-card.component.spec.ts | 10 ++++------
 ...r-metric-chart-list-config.service.spec.ts | 12 +++++-------
 .../actions/deploy-applications.actions.ts    |  4 ++--
 .../src/cloud-foundry-test.module.ts          |  6 +++---
 .../git-action-builder.ts                     |  2 +-
 .../applications/application.service.spec.ts  |  8 ++++----
 .../applications/application.service.ts       |  5 +----
 .../application-base.component.spec.ts        |  4 +---
 .../application/application-base.component.ts |  4 +---
 .../application-tabs-base.component.spec.ts   |  4 +---
 .../application-tabs-base.component.ts        |  6 ++----
 .../build-tab/build-tab.component.spec.ts     |  4 +---
 .../tabs/build-tab/build-tab.component.ts     |  2 +-
 .../events-tab/events-tab.component.spec.ts   |  4 +---
 .../tabs/gitscm-tab/gitscm-tab.component.ts   |  2 +-
 .../instances-tab.component.spec.ts           |  6 ++----
 .../log-stream-tab.component.spec.ts          |  8 +++-----
 .../metrics-tab/metrics-tab.component.spec.ts |  4 +---
 .../services-tab.component.spec.ts            |  8 +++-----
 .../variables-tab.component.spec.ts           |  4 +---
 .../cli-info-application.component.spec.ts    |  4 +---
 ...create-application-step2.component.spec.ts |  4 +++-
 .../create-application-step2.component.ts     |  4 +---
 .../create-application.component.spec.ts      |  8 +++++---
 .../commit-list-wrapper.component.ts          |  2 +-
 ...deploy-application-step2.component.spec.ts |  2 +-
 .../deploy-application-step2.component.ts     |  4 ++--
 .../github-project-exists.directive.spec.ts   |  2 +-
 .../github-project-exists.directive.ts        |  2 +-
 .../edit-application.component.spec.ts        |  4 +---
 .../edit-application.component.ts             |  4 ++--
 .../add-service-instance.component.spec.ts    | 10 +++++-----
 ...fy-user-provided-details.component.spec.ts |  6 +++++-
 ...specify-user-provided-details.component.ts |  4 +---
 .../card-app-instances.component.spec.ts      |  6 ++----
 .../card-app-uptime.component.spec.ts         |  8 ++++----
 .../card-app-usage.component.spec.ts          |  4 +---
 .../compact-app-card.component.spec.ts        |  8 ++------
 .../compact-app-card.component.ts             |  5 +----
 .../shared/components/components.module.ts    |  7 +++++--
 ...app-service-binding-card.component.spec.ts |  4 +---
 .../app/card/card-app.component.spec.ts       |  4 +---
 .../list-types/app/card/card-app.component.ts |  5 +----
 ...ll-app-cforgspace-header.component.spec.ts |  4 +---
 ...able-cell-app-cforgspace.component.spec.ts |  4 +---
 .../table-cell-app-status.component.spec.ts   |  4 +---
 .../table-cell-app-status.component.ts        |  5 +----
 .../github-commits-data-source.ts             |  2 +-
 ...hub-commits-list-config-app-tab.service.ts |  4 ++--
 ...thub-commits-list-config-deploy.service.ts |  2 +-
 ...cell-service-plan-extras.component.spec.ts |  4 +---
 .../shared/data-services/scm/github-scm.ts    |  4 ++--
 .../shared/data-services/scm/gitlab-scm.ts    |  2 +-
 .../shared/data-services/scm/scm.service.ts   |  2 +-
 .../src/shared/data-services/scm/scm.ts       |  2 +-
 .../app-name-unique.directive.spec.ts         | 19 ++++++++++---------
 .../app-name-unique.directive.ts              |  7 +++----
 .../application-state.service.spec.ts         |  0
 .../services}/application-state.service.ts    |  9 +++------
 .../src/store/effects/github.effects.ts       |  4 ++--
 .../cloud-foundry-endpoint-service.helper.ts  |  2 +-
 .../application-state.component.ts            |  5 ++---
 .../table-cell-actions.component.ts           |  4 ++--
 .../table-cell/table-cell.component.spec.ts   |  4 ++--
 .../components/list/list.component.spec.ts    |  8 ++++----
 .../packages/core/src/shared/shared.module.ts |  9 ++-------
 .../packages/core/src/shared/shared.types.ts  |  6 ++++++
 .../application-service-helper.ts             |  8 ++++----
 69 files changed, 148 insertions(+), 204 deletions(-)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/data-services/scm/github-scm.ts (93%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/data-services/scm/gitlab-scm.ts (97%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/data-services/scm/scm.service.ts (91%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/data-services/scm/scm.ts (91%)
 rename src/frontend/packages/{core/src/shared => cloud-foundry/src/shared/directives}/app-name-unique.directive/app-name-unique.directive.spec.ts (66%)
 rename src/frontend/packages/{core/src/shared => cloud-foundry/src/shared/directives}/app-name-unique.directive/app-name-unique.directive.ts (94%)
 rename src/frontend/packages/{core/src/shared/components/application-state => cloud-foundry/src/shared/services}/application-state.service.spec.ts (100%)
 rename src/frontend/packages/{core/src/shared/components/application-state => cloud-foundry/src/shared/services}/application-state.service.ts (97%)

diff --git a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts
index bd5c68c372..9817f03e2d 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts
@@ -1,21 +1,23 @@
 import { CommonModule } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { createEmptyStoreModule } from '@stratos/store/testing';
 
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
 import {
   RunningInstancesComponent,
 } from '../../../../cloud-foundry/src/shared/components/running-instances/running-instances.component';
+import { ApplicationStateService } from '../../../../cloud-foundry/src/shared/services/application-state.service';
 import { CoreModule } from '../../../../core/src/core/core.module';
-import { ApplicationStateService } from '../../../../core/src/shared/components/application-state/application-state.service';
+import {
+  CopyToClipboardComponent,
+} from '../../../../core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component';
 import { MetadataItemComponent } from '../../../../core/src/shared/components/metadata-item/metadata-item.component';
+import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper';
 import { EntityMonitorFactory } from '../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
-import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper';
-import { createEmptyStoreModule } from '@stratos/store/testing';
 import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module';
 import { CardAutoscalerDefaultComponent } from './card-autoscaler-default.component';
-import { CopyToClipboardComponent } from '../../../../core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component';
 
 describe('CardAutoscalerDefaultComponent', () => {
   let component: CardAutoscalerDefaultComponent;
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts
index 1e1f333790..3a96447b75 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts
@@ -1,6 +1,6 @@
-/* tslint:disable:max-line-length */
 import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { createEmptyStoreModule } from '@stratos/store/testing';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import {
@@ -9,20 +9,18 @@ import {
 import {
   ServiceActionHelperService,
 } from '../../../../../../cloud-foundry/src/shared/data-services/service-action-helper.service';
+import { ApplicationStateService } from '../../../../../../cloud-foundry/src/shared/services/application-state.service';
 import { CoreModule } from '../../../../../../core/src/core/core.module';
-import {
-  ApplicationStateService,
-} from '../../../../../../core/src/shared/components/application-state/application-state.service';
 import { ConfirmationDialogService } from '../../../../../../core/src/shared/components/confirmation-dialog.service';
+import { generateTestApplicationServiceProvider } from '../../../../../../core/test-framework/application-service-helper';
 import { EntityMonitorFactory } from '../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
-import { generateTestApplicationServiceProvider } from '../../../../../../core/test-framework/application-service-helper';
-import { createEmptyStoreModule } from '@stratos/store/testing';
 import { CfAutoscalerTestingModule } from '../../../../cf-autoscaler-testing.module';
 import { AppAutoscalerMetricChartCardComponent } from './app-autoscaler-metric-chart-card.component';
 import { AppAutoscalerComboChartComponent } from './combo-chart/combo-chart.component';
 import { AppAutoscalerComboSeriesVerticalComponent } from './combo-chart/combo-series-vertical.component';
 
+/* tslint:disable:max-line-length */
 /* tslint:enable:max-line-length */
 
 describe('AppAutoscalerMetricChartCardComponent', () => {
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts
index b105b4b8a9..a0590b5e17 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts
@@ -1,22 +1,20 @@
-/* tslint:disable:max-line-length */
 import { DatePipe } from '@angular/common';
 import { inject, TestBed } from '@angular/core/testing';
+import { createEmptyStoreModule } from '@stratos/store/testing';
 
 import {
   ApplicationEnvVarsHelper,
 } from '../../../../../cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service';
+import { ApplicationStateService } from '../../../../../cloud-foundry/src/shared/services/application-state.service';
+import { MetricsRangeSelectorService } from '../../../../../core/src/shared/services/metrics-range-selector.service';
+import { generateTestApplicationServiceProvider } from '../../../../../core/test-framework/application-service-helper';
 import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
-import {
-  ApplicationStateService,
-} from '../../../../../core/src/shared/components/application-state/application-state.service';
 import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
-import { MetricsRangeSelectorService } from '../../../../../core/src/shared/services/metrics-range-selector.service';
-import { generateTestApplicationServiceProvider } from '../../../../../core/test-framework/application-service-helper';
-import { createEmptyStoreModule } from '@stratos/store/testing';
 import { CfAutoscalerTestingModule } from '../../../cf-autoscaler-testing.module';
 import { AppAutoscalerMetricChartListConfigService } from './app-autoscaler-metric-chart-list-config.service';
 
+/* tslint:disable:max-line-length */
 
 /* tslint:enable:max-line-length */
 
diff --git a/src/frontend/packages/cloud-foundry/src/actions/deploy-applications.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/deploy-applications.actions.ts
index 41a7be9d28..93e66ecaca 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/deploy-applications.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/deploy-applications.actions.ts
@@ -1,10 +1,10 @@
 import { Action } from '@ngrx/store';
 
-import { GitSCM } from '../../../core/src/shared/data-services/scm/scm';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
 import { EntityRequestAction } from '../../../store/src/types/request.types';
-import { CF_ENDPOINT_TYPE } from '../cf-types';
 import { gitBranchesEntityType, gitCommitEntityType } from '../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../cf-types';
+import { GitSCM } from '../shared/data-services/scm/scm';
 import { DockerAppDetails, GitAppDetails, OverrideAppDetails, SourceType } from '../store/types/deploy-application.types';
 import { GitBranch, GitCommit } from '../store/types/git.types';
 
diff --git a/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts b/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts
index a9406f1e60..292795f132 100644
--- a/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/cloud-foundry-test.module.ts
@@ -4,13 +4,13 @@ import { EffectsModule } from '@ngrx/effects';
 
 import { generateASEntities } from '../../cf-autoscaler/src/store/autoscaler-entity-generator';
 import { generateStratosEntities } from '../../core/src/base-entity-types';
-import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../store/src/entity-catalog.module';
-import { entityCatalog, TestEntityCatalog } from '../../store/src/entity-catalog/entity-catalog.service';
 import { getGitHubAPIURL, GITHUB_API_URL } from '../../core/src/core/github.helpers';
 import { LoggerService } from '../../core/src/core/logger.service';
-import { GitSCMService } from '../../core/src/shared/data-services/scm/scm.service';
+import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../store/src/entity-catalog.module';
+import { entityCatalog, TestEntityCatalog } from '../../store/src/entity-catalog/entity-catalog.service';
 import { generateCFEntities } from './cf-entity-generator';
 import { LongRunningCfOperationsService } from './shared/data-services/long-running-cf-op.service';
+import { GitSCMService } from './shared/data-services/scm/scm.service';
 import { CloudFoundryStoreModule } from './store/cloud-foundry.store.module';
 
 @NgModule({
diff --git a/src/frontend/packages/cloud-foundry/src/entity-action-builders/git-action-builder.ts b/src/frontend/packages/cloud-foundry/src/entity-action-builders/git-action-builder.ts
index a99f04df18..8d6ac2d049 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-action-builders/git-action-builder.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-action-builders/git-action-builder.ts
@@ -1,4 +1,3 @@
-import { GitSCM } from '../../../core/src/shared/data-services/scm/scm';
 import {
   EntityRequestActionConfig,
   KnownEntityActionBuilder,
@@ -10,6 +9,7 @@ import { FetchGitHubRepoInfo } from '../actions/github.actions';
 import {
   EnvVarStratosProject,
 } from '../features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service';
+import { GitSCM } from '../shared/data-services/scm/scm';
 
 export interface GitRepoActionBuilders extends OrchestratedActionBuilders {
   getRepoInfo: (
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application.service.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application.service.spec.ts
index e2b2120d71..42ba5c9893 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application.service.spec.ts
@@ -6,16 +6,16 @@ import { cfEntityFactory } from '../../../../cloud-foundry/src/cf-entity-factory
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { ExtensionService } from '../../../../core/src/core/extension/extension-service';
 import { getGitHubAPIURL, GITHUB_API_URL } from '../../../../core/src/core/github.helpers';
-import { ApplicationStateService } from '../../../../core/src/shared/components/application-state/application-state.service';
-import { GitSCMService } from '../../../../core/src/shared/data-services/scm/scm.service';
-import { EntityMonitorFactory } from '../../../../store/src/monitors/entity-monitor.factory.service';
-import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { generateTestApplicationServiceProvider } from '../../../../core/test-framework/application-service-helper';
 import { generateTestEntityServiceProvider } from '../../../../core/test-framework/entity-service.helper';
+import { EntityMonitorFactory } from '../../../../store/src/monitors/entity-monitor.factory.service';
+import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { AppStoreModule } from '../../../../store/src/store.module';
 import { generateCfStoreModules } from '../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { applicationEntityType } from '../../cf-entity-types';
 import { LongRunningCfOperationsService } from '../../shared/data-services/long-running-cf-op.service';
+import { GitSCMService } from '../../shared/data-services/scm/scm.service';
+import { ApplicationStateService } from '../../shared/services/application-state.service';
 import { ApplicationService } from './application.service';
 import { ApplicationEnvVarsHelper } from './application/application-tabs-base/tabs/build-tab/application-env-vars.service';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts
index 060b26ba9a..725cbfe1c3 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts
@@ -24,10 +24,6 @@ import {
   spaceWithOrgEntityType,
   stackEntityType,
 } from '../../../../cloud-foundry/src/cf-entity-types';
-import {
-  ApplicationStateData,
-  ApplicationStateService,
-} from '../../../../core/src/shared/components/application-state/application-state.service';
 import { APP_GUID, CF_GUID } from '../../../../core/src/shared/entity.tokens';
 import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
 import { EntityService } from '../../../../store/src/entity-service';
@@ -49,6 +45,7 @@ import { IApp, IAppSummary, IDomain, IOrganization, ISpace } from '../../cf-api.
 import { cfEntityFactory } from '../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE, CFEntityConfig } from '../../cf-types';
 import { createEntityRelationKey } from '../../entity-relations/entity-relations.types';
+import { ApplicationStateData, ApplicationStateService } from '../../shared/services/application-state.service';
 import { AppStat } from '../../store/types/app-metadata.types';
 import {
   ApplicationEnvVarsHelper,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.spec.ts
index 0a06f492ae..c906d8833d 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.spec.ts
@@ -2,10 +2,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { CoreModule } from '../../../../../core/src/core/core.module';
-import {
-  ApplicationStateService,
-} from '../../../../../core/src/shared/components/application-state/application-state.service';
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { ApplicationStateService } from '../../../shared/services/application-state.service';
 import { ApplicationBaseComponent } from './application-base.component';
 import { ApplicationEnvVarsHelper } from './application-tabs-base/tabs/build-tab/application-env-vars.service';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.ts
index 79b42a6f9f..7a77cf1155 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-base.component.ts
@@ -3,12 +3,10 @@ import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
-import {
-  ApplicationStateService,
-} from '../../../../../core/src/shared/components/application-state/application-state.service';
 import { APP_GUID, CF_GUID, ENTITY_SERVICE } from '../../../../../core/src/shared/entity.tokens';
 import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
+import { ApplicationStateService } from '../../../shared/services/application-state.service';
 import { ApplicationService, createGetApplicationAction } from '../application.service';
 import { ApplicationEnvVarsHelper } from './application-tabs-base/tabs/build-tab/application-env-vars.service';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.spec.ts
index 5a5465658f..5245f9e37a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.spec.ts
@@ -10,15 +10,13 @@ import { cfEntityFactory } from '../../../../../../cloud-foundry/src/cf-entity-f
 import { CoreModule } from '../../../../../../core/src/core/core.module';
 import { getGitHubAPIURL, GITHUB_API_URL } from '../../../../../../core/src/core/github.helpers';
 import { MDAppModule } from '../../../../../../core/src/core/md.module';
-import {
-  ApplicationStateService,
-} from '../../../../../../core/src/shared/components/application-state/application-state.service';
 import { SharedModule } from '../../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../../core/tab-nav.service';
 import { generateTestApplicationServiceProvider } from '../../../../../../core/test-framework/application-service-helper';
 import { generateTestEntityServiceProvider } from '../../../../../../core/test-framework/entity-service.helper';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { applicationEntityType } from '../../../../cf-entity-types';
+import { ApplicationStateService } from '../../../../shared/services/application-state.service';
 import { ApplicationTabsBaseComponent } from './application-tabs-base.component';
 import { ApplicationEnvVarsHelper } from './tabs/build-tab/application-env-vars.service';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts
index 57d7db82c1..3b7417c870 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts
@@ -19,14 +19,10 @@ import {
 import { getFavoriteFromCfEntity } from '../../../../../../core/src/core/user-favorite-helpers';
 import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
 import { IPageSideNavTab } from '../../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component';
-import {
-  ApplicationStateData,
-} from '../../../../../../core/src/shared/components/application-state/application-state.service';
 import {
   FavoritesConfigMapper,
 } from '../../../../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
 import { IHeaderBreadcrumb } from '../../../../../../core/src/shared/components/page-header/page-header.types';
-import { GitSCMService, GitSCMType } from '../../../../../../core/src/shared/data-services/scm/scm.service';
 import { ENTITY_SERVICE } from '../../../../../../core/src/shared/entity.tokens';
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
@@ -39,6 +35,8 @@ import { EndpointModel } from '../../../../../../store/src/types/endpoint.types'
 import { UpdateExistingApplication } from '../../../../actions/application.actions';
 import { IApp, IOrganization, ISpace } from '../../../../cf-api.types';
 import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
+import { GitSCMService, GitSCMType } from '../../../../shared/data-services/scm/scm.service';
+import { ApplicationStateData } from '../../../../shared/services/application-state.service';
 import { ApplicationService } from '../../application.service';
 import { ApplicationPollingService } from './application-polling.service';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.spec.ts
index 68237dbf99..c857d51f56 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.spec.ts
@@ -6,9 +6,6 @@ import { RouterTestingModule } from '@angular/router/testing';
 
 import { CoreModule } from '../../../../../../../../core/src/core/core.module';
 import { GITHUB_API_URL } from '../../../../../../../../core/src/core/github.helpers';
-import {
-  ApplicationStateService,
-} from '../../../../../../../../core/src/shared/components/application-state/application-state.service';
 import { APP_GUID, CF_GUID, ENTITY_SERVICE } from '../../../../../../../../core/src/shared/entity.tokens';
 import { SharedModule } from '../../../../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../../../../core/tab-nav.service';
@@ -17,6 +14,7 @@ import { EntityServiceFactory } from '../../../../../../../../store/src/entity-s
 import { AppStoreModule } from '../../../../../../../../store/src/store.module';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { CloudFoundryComponentsModule } from '../../../../../../shared/components/components.module';
+import { ApplicationStateService } from '../../../../../../shared/services/application-state.service';
 import { ApplicationService } from '../../../../application.service';
 import { cfApplicationEntityServiceFactory } from '../../../application-base.component';
 import { ApplicationPollComponent } from '../../application-poll/application-poll.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts
index 9ca4d20b23..43c608efde 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts
@@ -12,7 +12,6 @@ import { CurrentUserPermissions } from '../../../../../../../../core/src/core/cu
 import { getFullEndpointApiUrl } from '../../../../../../../../core/src/features/endpoints/endpoint-helpers';
 import { ConfirmationDialogConfig } from '../../../../../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
-import { GitSCMService, GitSCMType } from '../../../../../../../../core/src/shared/data-services/scm/scm.service';
 import { ENTITY_SERVICE } from '../../../../../../../../core/src/shared/entity.tokens';
 import { ResetPagination } from '../../../../../../../../store/src/actions/pagination.actions';
 import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog.service';
@@ -21,6 +20,7 @@ import { ActionState } from '../../../../../../../../store/src/reducers/api-requ
 import { APIResource, EntityInfo } from '../../../../../../../../store/src/types/api.types';
 import { IAppSummary } from '../../../../../../cf-api.types';
 import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
+import { GitSCMService, GitSCMType } from '../../../../../../shared/data-services/scm/scm.service';
 import { ApplicationMonitorService } from '../../../../application-monitor.service';
 import { ApplicationData, ApplicationService } from '../../../../application.service';
 import { DEPLOY_TYPES_IDS } from '../../../../deploy-application/deploy-application-steps.types';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/events-tab/events-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/events-tab/events-tab.component.spec.ts
index a7327ca322..e996e1fd9c 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/events-tab/events-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/events-tab/events-tab.component.spec.ts
@@ -4,9 +4,6 @@ import { Store } from '@ngrx/store';
 
 import { CoreModule } from '../../../../../../../../core/src/core/core.module';
 import { MDAppModule } from '../../../../../../../../core/src/core/md.module';
-import {
-  ApplicationStateService,
-} from '../../../../../../../../core/src/shared/components/application-state/application-state.service';
 import { SharedModule } from '../../../../../../../../core/src/shared/shared.module';
 import {
   getPaginationAction,
@@ -21,6 +18,7 @@ import { cfEventEntityType } from '../../../../../../cf-entity-types';
 import {
   CloudFoundryEventsListComponent,
 } from '../../../../../../shared/components/cloud-foundry-events-list/cloud-foundry-events-list.component';
+import { ApplicationStateService } from '../../../../../../shared/services/application-state.service';
 import { ApplicationService } from '../../../../application.service';
 import { ApplicationEnvVarsHelper } from '../build-tab/application-env-vars.service';
 import { EventsTabComponent } from './events-tab.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.ts
index 5fe4a0365e..937738a9ab 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.ts
@@ -7,7 +7,6 @@ import { distinctUntilChanged, filter, map, take, tap } from 'rxjs/operators';
 
 import { GitCommit, GitRepo } from '../../../../../../../../cloud-foundry/src/store/types/git.types';
 import { ListConfig } from '../../../../../../../../core/src/shared/components/list/list.component.types';
-import { GitSCMService, GitSCMType } from '../../../../../../../../core/src/shared/data-services/scm/scm.service';
 import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { EntityService } from '../../../../../../../../store/src/entity-service';
 import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
@@ -19,6 +18,7 @@ import { GitMeta } from '../../../../../../entity-action-builders/git-action-bui
 import {
   GithubCommitsListConfigServiceAppTab,
 } from '../../../../../../shared/components/list/list-types/github-commits/github-commits-list-config-app-tab.service';
+import { GitSCMService, GitSCMType } from '../../../../../../shared/data-services/scm/scm.service';
 import { GitBranch } from '../../../../../../store/types/github.types';
 import { ApplicationService } from '../../../../application.service';
 import { EnvVarStratosProject } from '../build-tab/application-env-vars.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.spec.ts
index ac8cd5ea4a..57ce8bb5e9 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.spec.ts
@@ -1,21 +1,19 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { testSCFEndpointGuid } from '@stratos/store/testing';
 
 import { CoreModule } from '../../../../../../../../core/src/core/core.module';
-import {
-  ApplicationStateService,
-} from '../../../../../../../../core/src/shared/components/application-state/application-state.service';
 import { CF_GUID } from '../../../../../../../../core/src/shared/entity.tokens';
 import { SharedModule } from '../../../../../../../../core/src/shared/shared.module';
 import { ApplicationServiceMock } from '../../../../../../../../core/test-framework/application-service-helper';
-import { testSCFEndpointGuid } from '@stratos/store/testing';
 import { AppStoreModule } from '../../../../../../../../store/src/store.module';
 import {
   generateCfStoreModules,
   generateTestCfEndpointServiceProvider,
 } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { CloudFoundryComponentsModule } from '../../../../../../shared/components/components.module';
+import { ApplicationStateService } from '../../../../../../shared/services/application-state.service';
 import { ApplicationService } from '../../../../application.service';
 import { ApplicationEnvVarsHelper } from '../build-tab/application-env-vars.service';
 import { InstancesTabComponent } from './instances-tab.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component.spec.ts
index 8bc76d3ac1..362e8fc328 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component.spec.ts
@@ -7,19 +7,17 @@ import { GetApplication } from '../../../../../../../../cloud-foundry/src/action
 import { cfEntityFactory } from '../../../../../../../../cloud-foundry/src/cf-entity-factory';
 import { CoreModule } from '../../../../../../../../core/src/core/core.module';
 import { MDAppModule } from '../../../../../../../../core/src/core/md.module';
-import {
-  ApplicationStateService,
-} from '../../../../../../../../core/src/shared/components/application-state/application-state.service';
 import { LogViewerComponent } from '../../../../../../../../core/src/shared/components/log-viewer/log-viewer.component';
-import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
-import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import {
   generateTestApplicationServiceProvider,
 } from '../../../../../../../../core/test-framework/application-service-helper';
 import { generateTestEntityServiceProvider } from '../../../../../../../../core/test-framework/entity-service.helper';
+import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
+import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { AppStoreModule } from '../../../../../../../../store/src/store.module';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { applicationEntityType } from '../../../../../../cf-entity-types';
+import { ApplicationStateService } from '../../../../../../shared/services/application-state.service';
 import { ApplicationEnvVarsHelper } from '../build-tab/application-env-vars.service';
 import { LogStreamTabComponent } from './log-stream-tab.component';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/metrics-tab/metrics-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/metrics-tab/metrics-tab.component.spec.ts
index fdc73fff41..8cd276c7bc 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/metrics-tab/metrics-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/metrics-tab/metrics-tab.component.spec.ts
@@ -4,9 +4,6 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { GetApplication } from '../../../../../../../../cloud-foundry/src/actions/application.actions';
 import { cfEntityFactory } from '../../../../../../../../cloud-foundry/src/cf-entity-factory';
 import { MDAppModule } from '../../../../../../../../core/src/core/md.module';
-import {
-  ApplicationStateService,
-} from '../../../../../../../../core/src/shared/components/application-state/application-state.service';
 import { SharedModule } from '../../../../../../../../core/src/shared/shared.module';
 import {
   generateTestApplicationServiceProvider,
@@ -14,6 +11,7 @@ import {
 import { generateTestEntityServiceProvider } from '../../../../../../../../core/test-framework/entity-service.helper';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { applicationEntityType } from '../../../../../../cf-entity-types';
+import { ApplicationStateService } from '../../../../../../shared/services/application-state.service';
 import { ApplicationEnvVarsHelper } from '../build-tab/application-env-vars.service';
 import { MetricsTabComponent } from './metrics-tab.component';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/services-tab/services-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/services-tab/services-tab.component.spec.ts
index 2b562878eb..37f1e5ff66 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/services-tab/services-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/services-tab/services-tab.component.spec.ts
@@ -1,16 +1,14 @@
 import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import {
-  ApplicationStateService,
-} from '../../../../../../../../core/src/shared/components/application-state/application-state.service';
-import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
-import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import {
   generateTestApplicationServiceProvider,
 } from '../../../../../../../../core/test-framework/application-service-helper';
+import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
+import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { generateCfBaseTestModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ServiceActionHelperService } from '../../../../../../shared/data-services/service-action-helper.service';
+import { ApplicationStateService } from '../../../../../../shared/services/application-state.service';
 import { ApplicationEnvVarsHelper } from '../build-tab/application-env-vars.service';
 import { ServicesTabComponent } from './services-tab.component';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/variables-tab/variables-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/variables-tab/variables-tab.component.spec.ts
index 734b270857..59803701f9 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/variables-tab/variables-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/variables-tab/variables-tab.component.spec.ts
@@ -4,12 +4,10 @@ import { StoreModule } from '@ngrx/store';
 
 import { CoreModule } from '../../../../../../../../core/src/core/core.module';
 import { MDAppModule } from '../../../../../../../../core/src/core/md.module';
-import {
-  ApplicationStateService,
-} from '../../../../../../../../core/src/shared/components/application-state/application-state.service';
 import { SharedModule } from '../../../../../../../../core/src/shared/shared.module';
 import { ApplicationServiceMock } from '../../../../../../../../core/test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { ApplicationStateService } from '../../../../../../shared/services/application-state.service';
 import { ApplicationService } from '../../../../application.service';
 import { ApplicationEnvVarsHelper } from '../build-tab/application-env-vars.service';
 import { VariablesTabComponent } from './variables-tab.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.spec.ts
index ed687aef72..165d17b84c 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.spec.ts
@@ -5,9 +5,6 @@ import { GetApplication } from '../../../../../cloud-foundry/src/actions/applica
 import { cfEntityFactory } from '../../../../../cloud-foundry/src/cf-entity-factory';
 import { CoreModule } from '../../../../../core/src/core/core.module';
 import { MDAppModule } from '../../../../../core/src/core/md.module';
-import {
-  ApplicationStateService,
-} from '../../../../../core/src/shared/components/application-state/application-state.service';
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../core/tab-nav.service';
 import { generateTestApplicationServiceProvider } from '../../../../../core/test-framework/application-service-helper';
@@ -15,6 +12,7 @@ import { generateTestEntityServiceProvider } from '../../../../../core/test-fram
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { applicationEntityType } from '../../../cf-entity-types';
 import { CloudFoundryComponentsModule } from '../../../shared/components/components.module';
+import { ApplicationStateService } from '../../../shared/services/application-state.service';
 import { ApplicationEnvVarsHelper } from '../application/application-tabs-base/tabs/build-tab/application-env-vars.service';
 import { CliInfoApplicationComponent } from './cli-info-application.component';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step2/create-application-step2.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step2/create-application-step2.component.spec.ts
index 3236d84f37..ef3c6a255a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step2/create-application-step2.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step2/create-application-step2.component.spec.ts
@@ -1,5 +1,5 @@
 import { CommonModule } from '@angular/common';
-import { HttpClientModule, HttpClient, HttpBackend } from '@angular/common/http';
+import { HttpBackend, HttpClient, HttpClientModule } from '@angular/common/http';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -7,6 +7,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { CoreModule } from '../../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../../core/src/shared/shared.module';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { CloudFoundryComponentsModule } from './../../../../shared/components/components.module';
 import { CreateApplicationStep2Component } from './create-application-step2.component';
 
 describe('CreateApplicationStep2Component', () => {
@@ -23,6 +24,7 @@ describe('CreateApplicationStep2Component', () => {
         CommonModule,
         CoreModule,
         SharedModule,
+        CloudFoundryComponentsModule,
         NoopAnimationsModule,
         HttpClientModule,
         HttpClientTestingModule,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step2/create-application-step2.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step2/create-application-step2.component.ts
index 3274819966..09002d671a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step2/create-application-step2.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step2/create-application-step2.component.ts
@@ -7,10 +7,8 @@ import { map } from 'rxjs/operators';
 
 import { SetNewAppName } from '../../../../../../cloud-foundry/src/actions/create-applications-page.actions';
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
-import {
-  AppNameUniqueChecking,
-} from '../../../../../../core/src/shared/app-name-unique.directive/app-name-unique.directive';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
+import { AppNameUniqueChecking } from '../../../../shared/directives/app-name-unique.directive/app-name-unique.directive';
 
 @Component({
   selector: 'app-create-application-step2',
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application.component.spec.ts
index c791cea8e5..0d161c70ff 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application.component.spec.ts
@@ -6,16 +6,17 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { CoreModule } from '../../../../../core/src/core/core.module';
+import { SharedModule } from '../../../../../core/src/shared/shared.module';
+import { TabNavService } from '../../../../../core/tab-nav.service';
 import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { InternalEventMonitorFactory } from '../../../../../store/src/monitors/internal-event-monitor.factory';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
-import { SharedModule } from '../../../../../core/src/shared/shared.module';
-import { TabNavService } from '../../../../../core/tab-nav.service';
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import {
   CreateApplicationStep1Component,
 } from '../../../shared/components/create-application/create-application-step1/create-application-step1.component';
 import { CloudFoundryService } from '../../../shared/data-services/cloud-foundry.service';
+import { AppNameUniqueDirective } from '../../../shared/directives/app-name-unique.directive/app-name-unique.directive';
 import { CreateApplicationStep2Component } from './create-application-step2/create-application-step2.component';
 import { CreateApplicationStep3Component } from './create-application-step3/create-application-step3.component';
 import { CreateApplicationComponent } from './create-application.component';
@@ -30,7 +31,8 @@ describe('CreateApplicationComponent', () => {
         CreateApplicationComponent,
         CreateApplicationStep1Component,
         CreateApplicationStep2Component,
-        CreateApplicationStep3Component
+        CreateApplicationStep3Component,
+        AppNameUniqueDirective,
       ],
       imports: [
         ...generateCfStoreModules(),
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2-1/commit-list-wrapper/commit-list-wrapper.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2-1/commit-list-wrapper/commit-list-wrapper.component.ts
index 7ab8a997ce..4d916391d9 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2-1/commit-list-wrapper/commit-list-wrapper.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2-1/commit-list-wrapper/commit-list-wrapper.component.ts
@@ -7,10 +7,10 @@ import { filter, map, mergeMap } from 'rxjs/operators';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { GitCommit } from '../../../../../../../cloud-foundry/src/store/types/git.types';
 import { ListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import { GitSCMService } from '../../../../../../../core/src/shared/data-services/scm/scm.service';
 import {
   GithubCommitsListConfigServiceDeploy,
 } from '../../../../../shared/components/list/list-types/github-commits/github-commits-list-config-deploy.service';
+import { GitSCMService } from '../../../../../shared/data-services/scm/scm.service';
 
 @Component({
   selector: 'app-commit-list-wrapper',
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.spec.ts
index 91c1be15b0..e3089600fd 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.spec.ts
@@ -6,9 +6,9 @@ import { RouterTestingModule } from '@angular/router/testing';
 
 import { CoreModule } from '../../../../../../core/src/core/core.module';
 import { getGitHubAPIURL, GITHUB_API_URL } from '../../../../../../core/src/core/github.helpers';
-import { GitSCMService } from '../../../../../../core/src/shared/data-services/scm/scm.service';
 import { SharedModule } from '../../../../../../core/src/shared/shared.module';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { GitSCMService } from '../../../../shared/data-services/scm/scm.service';
 import { ApplicationDeploySourceTypes } from '../deploy-application-steps.types';
 import { GithubProjectExistsDirective } from '../github-project-exists.directive';
 import { DeployApplicationFsComponent } from './deploy-application-fs/deploy-application-fs.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.ts
index 949bec2fc7..1a8b0909b2 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-step2/deploy-application-step2.component.ts
@@ -53,12 +53,12 @@ import {
 import { GitCommit, GitRepo } from '../../../../../../cloud-foundry/src/store/types/git.types';
 import { GitBranch } from '../../../../../../cloud-foundry/src/store/types/github.types';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
-import { GitSCM } from '../../../../../../core/src/shared/data-services/scm/scm';
-import { GitSCMService, GitSCMType } from '../../../../../../core/src/shared/data-services/scm/scm.service';
 import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { CF_ENDPOINT_TYPE, CFEntityConfig } from '../../../../cf-types';
+import { GitSCM } from '../../../../shared/data-services/scm/scm';
+import { GitSCMService, GitSCMType } from '../../../../shared/data-services/scm/scm.service';
 import { ApplicationDeploySourceTypes, DEPLOY_TYPES_IDS } from '../deploy-application-steps.types';
 
 @Component({
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/github-project-exists.directive.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/github-project-exists.directive.spec.ts
index ef257b7919..de2ca64431 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/github-project-exists.directive.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/github-project-exists.directive.spec.ts
@@ -6,10 +6,10 @@ import { Store } from '@ngrx/store';
 
 import { CoreModule } from '../../../../../core/src/core/core.module';
 import { getGitHubAPIURL, GITHUB_API_URL } from '../../../../../core/src/core/github.helpers';
-import { GitSCMService } from '../../../../../core/src/shared/data-services/scm/scm.service';
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { CFAppState } from '../../../cf-app-state';
+import { GitSCMService } from '../../../shared/data-services/scm/scm.service';
 import { GithubProjectExistsDirective } from './github-project-exists.directive';
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/github-project-exists.directive.ts b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/github-project-exists.directive.ts
index 8130df31a0..ac555207ef 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/github-project-exists.directive.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/github-project-exists.directive.ts
@@ -7,7 +7,7 @@ import { debounceTime, filter, first, map, tap } from 'rxjs/operators';
 import { CheckProjectExists } from '../../../../../cloud-foundry/src/actions/deploy-applications.actions';
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import { selectDeployAppState } from '../../../../../cloud-foundry/src/store/selectors/deploy-application.selector';
-import { GitSCMService, GitSCMType } from '../../../../../core/src/shared/data-services/scm/scm.service';
+import { GitSCMService, GitSCMType } from '../../../shared/data-services/scm/scm.service';
 
 interface GithubProjectExistsResponse {
   githubProjectDoesNotExist: boolean;
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/edit-application/edit-application.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/edit-application/edit-application.component.spec.ts
index a67f90a8f8..e69e917396 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/edit-application/edit-application.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/edit-application/edit-application.component.spec.ts
@@ -7,9 +7,6 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { GetApplication } from '../../../../../cloud-foundry/src/actions/application.actions';
 import { cfEntityFactory } from '../../../../../cloud-foundry/src/cf-entity-factory';
 import { CoreModule } from '../../../../../core/src/core/core.module';
-import {
-  ApplicationStateService,
-} from '../../../../../core/src/shared/components/application-state/application-state.service';
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../core/tab-nav.service';
 import {
@@ -19,6 +16,7 @@ import {
 import { generateTestEntityServiceProvider } from '../../../../../core/test-framework/entity-service.helper';
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { applicationEntityType } from '../../../cf-entity-types';
+import { ApplicationStateService } from '../../../shared/services/application-state.service';
 import { ApplicationService } from '../application.service';
 import { ApplicationEnvVarsHelper } from '../application/application-tabs-base/tabs/build-tab/application-env-vars.service';
 import { EditApplicationComponent } from './edit-application.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/edit-application/edit-application.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/edit-application/edit-application.component.ts
index c65207fecb..e6d94e7058 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/edit-application/edit-application.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/edit-application/edit-application.component.ts
@@ -9,11 +9,11 @@ import { filter, map, take } from 'rxjs/operators';
 import { AppMetadataTypes } from '../../../../../cloud-foundry/src/actions/app-metadata.actions';
 import { SetCFDetails, SetNewAppName } from '../../../../../cloud-foundry/src/actions/create-applications-page.actions';
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
+import { StepOnNextFunction } from '../../../../../core/src/shared/components/stepper/step/step.component';
 import {
   AppNameUniqueChecking,
   AppNameUniqueDirective,
-} from '../../../../../core/src/shared/app-name-unique.directive/app-name-unique.directive';
-import { StepOnNextFunction } from '../../../../../core/src/shared/components/stepper/step/step.component';
+} from '../../../shared/directives/app-name-unique.directive/app-name-unique.directive';
 import { ApplicationService } from '../application.service';
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.spec.ts
index 2ed822d223..8b9f0c988e 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/add-service-instance/add-service-instance.component.spec.ts
@@ -1,9 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MaterialDesignFrameworkModule } from 'stratos-angular6-json-schema-form';
 
-import {
-  AppNameUniqueDirective,
-} from '../../../../../../core/src/shared/app-name-unique.directive/app-name-unique.directive';
 import {
   ApplicationStateIconComponent,
 } from '../../../../../../core/src/shared/components/application-state/application-state-icon/application-state-icon.component';
@@ -15,6 +12,9 @@ import {
 } from '../../../../../../core/src/shared/components/boolean-indicator/boolean-indicator.component';
 import { CardStatusComponent } from '../../../../../../core/src/shared/components/cards/card-status/card-status.component';
 import { AppChipsComponent } from '../../../../../../core/src/shared/components/chips/chips.component';
+import {
+  CopyToClipboardComponent,
+} from '../../../../../../core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component';
 import { FocusDirective } from '../../../../../../core/src/shared/components/focus.directive';
 import {
   MetaCardComponent,
@@ -37,16 +37,17 @@ import {
 } from '../../../../../../core/src/shared/components/multiline-title/multiline-title.component';
 import { PageHeaderModule } from '../../../../../../core/src/shared/components/page-header/page-header.module';
 import { SteppersModule } from '../../../../../../core/src/shared/components/stepper/steppers.module';
+import { TabNavService } from '../../../../../../core/tab-nav.service';
 import { EntityMonitorFactory } from '../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { InternalEventMonitorFactory } from '../../../../../../store/src/monitors/internal-event-monitor.factory';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
-import { TabNavService } from '../../../../../../core/tab-nav.service';
 import { generateCfBaseTestModulesNoShared } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ServicesService } from '../../../../features/service-catalog/services.service';
 import { ServicesServiceMock } from '../../../../features/service-catalog/services.service.mock';
 import { CfOrgSpaceDataService } from '../../../data-services/cf-org-space-service.service';
 import { CloudFoundryService } from '../../../data-services/cloud-foundry.service';
 import { LongRunningCfOperationsService } from '../../../data-services/long-running-cf-op.service';
+import { AppNameUniqueDirective } from '../../../directives/app-name-unique.directive/app-name-unique.directive';
 import { CfOrgSpaceLinksComponent } from '../../cf-org-space-links/cf-org-space-links.component';
 import {
   CreateApplicationStep1Component,
@@ -79,7 +80,6 @@ import {
   SpecifyUserProvidedDetailsComponent,
 } from '../specify-user-provided-details/specify-user-provided-details.component';
 import { AddServiceInstanceComponent } from './add-service-instance.component';
-import { CopyToClipboardComponent } from '../../../../../../core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component';
 
 describe('AddServiceInstanceComponent', () => {
   let component: AddServiceInstanceComponent;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.spec.ts
index 11a2e8b372..2900b6bbe2 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.spec.ts
@@ -3,6 +3,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { generateCfBaseTestModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { AppNameUniqueDirective } from '../../../directives/app-name-unique.directive/app-name-unique.directive';
 import { CsiModeService } from '../csi-mode.service';
 import { SpecifyUserProvidedDetailsComponent } from './specify-user-provided-details.component';
 
@@ -12,7 +13,10 @@ describe('SpecifyUserProvidedDetailsComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [SpecifyUserProvidedDetailsComponent],
+      declarations: [
+        SpecifyUserProvidedDetailsComponent,
+        AppNameUniqueDirective,
+      ],
       imports: [
         ...generateCfBaseTestModules(),
         HttpClientModule,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts
index 441142deec..a2ad3823c5 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts
@@ -24,15 +24,13 @@ import {
 } from '../../../../../../cloud-foundry/src/store/selectors/create-service-instance.selectors';
 import { safeUnsubscribe, urlValidationExpression } from '../../../../../../core/src/core/utils.service';
 import { environment } from '../../../../../../core/src/environments/environment';
-import {
-  AppNameUniqueChecking,
-} from '../../../../../../core/src/shared/app-name-unique.directive/app-name-unique.directive';
 import { StepOnNextResult } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { isValidJsonValidator } from '../../../../../../core/src/shared/form-validators';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { APIResource } from '../../../../../../store/src/types/api.types';
 import { IUserProvidedServiceInstance } from '../../../../cf-api-svc.types';
 import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
+import { AppNameUniqueChecking } from '../../../directives/app-name-unique.directive/app-name-unique.directive';
 import { CloudFoundryUserProvidedServicesService } from '../../../services/cloud-foundry-user-provided-services.service';
 import { CreateServiceFormMode, CsiModeService } from './../csi-mode.service';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.spec.ts
index 9529f0c601..14e8fe5c9e 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.spec.ts
@@ -12,15 +12,13 @@ import {
 import {
   ApplicationStateComponent,
 } from '../../../../../../core/src/shared/components/application-state/application-state.component';
-import {
-  ApplicationStateService,
-} from '../../../../../../core/src/shared/components/application-state/application-state.service';
 import { CardStatusComponent } from '../../../../../../core/src/shared/components/cards/card-status/card-status.component';
 import { ConfirmationDialogService } from '../../../../../../core/src/shared/components/confirmation-dialog.service';
-import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { ApplicationServiceMock } from '../../../../../../core/test-framework/application-service-helper';
+import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ApplicationService } from '../../../../features/applications/application.service';
+import { ApplicationStateService } from '../../../services/application-state.service';
 import { RunningInstancesComponent } from '../../running-instances/running-instances.component';
 import { CardAppInstancesComponent } from './card-app-instances.component';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-uptime/card-app-uptime.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-uptime/card-app-uptime.component.spec.ts
index 2be1fdf89c..7c0ee13707 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-uptime/card-app-uptime.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-uptime/card-app-uptime.component.spec.ts
@@ -12,19 +12,19 @@ import {
 import {
   ApplicationStateComponent,
 } from '../../../../../../core/src/shared/components/application-state/application-state.component';
-import {
-  ApplicationStateService,
-} from '../../../../../../core/src/shared/components/application-state/application-state.service';
 import { CardStatusComponent } from '../../../../../../core/src/shared/components/cards/card-status/card-status.component';
+import {
+  CopyToClipboardComponent,
+} from '../../../../../../core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component';
 import { MetadataItemComponent } from '../../../../../../core/src/shared/components/metadata-item/metadata-item.component';
 import { UptimePipe } from '../../../../../../core/src/shared/pipes/uptime.pipe';
 import { ApplicationServiceMock } from '../../../../../../core/test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ApplicationMonitorService } from '../../../../features/applications/application-monitor.service';
 import { ApplicationService } from '../../../../features/applications/application.service';
+import { ApplicationStateService } from '../../../services/application-state.service';
 import { CardAppStatusComponent } from '../card-app-status/card-app-status.component';
 import { CardAppUptimeComponent } from './card-app-uptime.component';
-import { CopyToClipboardComponent } from '../../../../../../core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component';
 
 describe('CardAppUptimeComponent', () => {
   let component: CardAppUptimeComponent;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-usage/card-app-usage.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-usage/card-app-usage.component.spec.ts
index 75d5f1f9b2..5e067e8926 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-usage/card-app-usage.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-usage/card-app-usage.component.spec.ts
@@ -12,9 +12,6 @@ import {
 import {
   ApplicationStateComponent,
 } from '../../../../../../core/src/shared/components/application-state/application-state.component';
-import {
-  ApplicationStateService,
-} from '../../../../../../core/src/shared/components/application-state/application-state.service';
 import { CardStatusComponent } from '../../../../../../core/src/shared/components/cards/card-status/card-status.component';
 import {
   TableCellStatusDirective,
@@ -24,6 +21,7 @@ import { ApplicationServiceMock } from '../../../../../../core/test-framework/ap
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ApplicationMonitorService } from '../../../../features/applications/application-monitor.service';
 import { ApplicationService } from '../../../../features/applications/application.service';
+import { ApplicationStateService } from '../../../services/application-state.service';
 import { CardAppStatusComponent } from '../card-app-status/card-app-status.component';
 import { CardAppUsageComponent } from './card-app-usage.component';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.spec.ts
index d706c20216..8054860739 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.spec.ts
@@ -6,13 +6,9 @@ import {
 import {
   ApplicationStateIconPipe,
 } from '../../../../../../../core/src/shared/components/application-state/application-state-icon/application-state-icon.pipe';
-import {
-  ApplicationStateService,
-} from '../../../../../../../core/src/shared/components/application-state/application-state.service';
-import {
-  generateCfBaseTestModulesNoShared,
-} from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { generateCfBaseTestModulesNoShared } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
+import { ApplicationStateService } from '../../../../services/application-state.service';
 import { CompactAppCardComponent } from './compact-app-card.component';
 
 describe('CompactAppCardComponent', () => {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.ts
index 6006ee7bc3..fd1e0e1539 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component.ts
@@ -6,12 +6,9 @@ import { map, startWith } from 'rxjs/operators';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { ApplicationService } from '../../../../../../../cloud-foundry/src/features/applications/application.service';
 import { ActiveRouteCfOrgSpace } from '../../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
-import {
-  ApplicationStateData,
-  ApplicationStateService,
-} from '../../../../../../../core/src/shared/components/application-state/application-state.service';
 import { BREADCRUMB_URL_PARAM } from '../../../../../../../core/src/shared/components/breadcrumbs/breadcrumbs.types';
 import { StratosStatus } from '../../../../../../../core/src/shared/shared.types';
+import { ApplicationStateData, ApplicationStateService } from '../../../../services/application-state.service';
 
 
 @Component({
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts b/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
index a4e3c8e057..72093e3d2b 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
@@ -8,6 +8,7 @@ import {
   ServiceInstanceLastOpComponent,
 } from '../../../../core/src/shared/components/service-instance-last-op/service-instance-last-op.component';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
+import { AppNameUniqueDirective } from '../directives/app-name-unique.directive/app-name-unique.directive';
 import {
   AddServiceInstanceBaseStepComponent,
 } from './add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component';
@@ -290,7 +291,8 @@ const cfListCards: Type<CardCell<any>>[] = [
     ...cfListTableCells,
     ...cfListCards,
     ServiceInstanceLastOpComponent,
-    TableCellFeatureFlagDescriptionComponent
+    TableCellFeatureFlagDescriptionComponent,
+    AppNameUniqueDirective,
   ],
   exports: [
     ServiceIconComponent,
@@ -328,7 +330,8 @@ const cfListCards: Type<CardCell<any>>[] = [
     ServicePlanPublicComponent,
     ServicePlanPriceComponent,
     CreateApplicationStep1Component,
-    CloudFoundryEventsListComponent
+    CloudFoundryEventsListComponent,
+    AppNameUniqueDirective,
   ],
   entryComponents: [
     CfEndpointDetailsComponent,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.spec.ts
index adff6cfe8b..a75455858b 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.spec.ts
@@ -1,9 +1,6 @@
 import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import {
-  ApplicationStateService,
-} from '../../../../../../../../core/src/shared/components/application-state/application-state.service';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
 import {
   generateTestApplicationServiceProvider,
@@ -17,6 +14,7 @@ import {
   ApplicationEnvVarsHelper,
 } from '../../../../../../features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service';
 import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service';
+import { ApplicationStateService } from '../../../../../services/application-state.service';
 import { CfOrgSpaceLinksComponent } from '../../../../cf-org-space-links/cf-org-space-links.component';
 import { ServiceIconComponent } from '../../../../service-icon/service-icon.component';
 import { AppServiceBindingCardComponent } from './app-service-binding-card.component';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.spec.ts
index 2e382833c0..b0734cebe9 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.spec.ts
@@ -2,14 +2,12 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { CoreModule } from '../../../../../../../../core/src/core/core.module';
-import {
-  ApplicationStateService,
-} from '../../../../../../../../core/src/shared/components/application-state/application-state.service';
 import { SharedModule } from '../../../../../../../../core/src/shared/shared.module';
 import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResourceMetadata } from '../../../../../../../../store/src/types/api.types';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { IApp } from '../../../../../../cf-api.types';
+import { ApplicationStateService } from '../../../../../services/application-state.service';
 import { CfOrgSpaceLinksComponent } from '../../../../cf-org-space-links/cf-org-space-links.component';
 import { RunningInstancesComponent } from '../../../../running-instances/running-instances.component';
 import { CardAppComponent } from './card-app.component';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts
index f282b1dc3d..168d43fd25 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts
@@ -7,10 +7,6 @@ import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-sta
 import { applicationEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types';
 import { IAppFavMetadata } from '../../../../../../../../cloud-foundry/src/cf-metadata-types';
 import { getFavoriteFromCfEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
-import {
-  ApplicationStateData,
-  ApplicationStateService,
-} from '../../../../../../../../core/src/shared/components/application-state/application-state.service';
 import {
   FavoritesConfigMapper,
 } from '../../../../../../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
@@ -21,6 +17,7 @@ import { UserFavorite } from '../../../../../../../../store/src/types/user-favor
 import { IApp, ISpace } from '../../../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { ApplicationService } from '../../../../../../features/applications/application.service';
+import { ApplicationStateData, ApplicationStateService } from '../../../../../services/application-state.service';
 import { CfOrgSpaceLabelService } from '../../../../../services/cf-org-space-label.service';
 
 @Component({
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-cforgspace-header/table-cell-app-cforgspace-header.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-cforgspace-header/table-cell-app-cforgspace-header.component.spec.ts
index 38ef9aa2bc..064ed53be4 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-cforgspace-header/table-cell-app-cforgspace-header.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-cforgspace-header/table-cell-app-cforgspace-header.component.spec.ts
@@ -11,11 +11,9 @@ import {
 import {
   ApplicationStateComponent,
 } from '../../../../../../../../core/src/shared/components/application-state/application-state.component';
-import {
-  ApplicationStateService,
-} from '../../../../../../../../core/src/shared/components/application-state/application-state.service';
 import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { ApplicationStateService } from '../../../../../services/application-state.service';
 import { TableCellAppStatusComponent } from '../table-cell-app-status/table-cell-app-status.component';
 
 describe('TableCellAppStatusComponent', () => {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-cforgspace/table-cell-app-cforgspace.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-cforgspace/table-cell-app-cforgspace.component.spec.ts
index 38ef9aa2bc..064ed53be4 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-cforgspace/table-cell-app-cforgspace.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-cforgspace/table-cell-app-cforgspace.component.spec.ts
@@ -11,11 +11,9 @@ import {
 import {
   ApplicationStateComponent,
 } from '../../../../../../../../core/src/shared/components/application-state/application-state.component';
-import {
-  ApplicationStateService,
-} from '../../../../../../../../core/src/shared/components/application-state/application-state.service';
 import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { ApplicationStateService } from '../../../../../services/application-state.service';
 import { TableCellAppStatusComponent } from '../table-cell-app-status/table-cell-app-status.component';
 
 describe('TableCellAppStatusComponent', () => {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-status/table-cell-app-status.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-status/table-cell-app-status.component.spec.ts
index 807f663ad9..73d730dac9 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-status/table-cell-app-status.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-status/table-cell-app-status.component.spec.ts
@@ -11,11 +11,9 @@ import {
 import {
   ApplicationStateComponent,
 } from '../../../../../../../../core/src/shared/components/application-state/application-state.component';
-import {
-  ApplicationStateService,
-} from '../../../../../../../../core/src/shared/components/application-state/application-state.service';
 import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { ApplicationStateService } from '../../../../../services/application-state.service';
 import { TableCellAppStatusComponent } from './table-cell-app-status.component';
 
 describe('TableCellAppStatusComponent', () => {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-status/table-cell-app-status.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-status/table-cell-app-status.component.ts
index 4024d1e75a..2dab839d58 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-status/table-cell-app-status.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/table-cell-app-status/table-cell-app-status.component.ts
@@ -4,12 +4,9 @@ import { Observable } from 'rxjs';
 import { startWith } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
-import {
-  ApplicationStateData,
-  ApplicationStateService,
-} from '../../../../../../../../core/src/shared/components/application-state/application-state.service';
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { ApplicationService } from '../../../../../../features/applications/application.service';
+import { ApplicationStateData, ApplicationStateService } from '../../../../../services/application-state.service';
 
 @Component({
   selector: 'app-table-cell-app-status',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-data-source.ts
index b0d2b6b987..a373e1a278 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-data-source.ts
@@ -11,8 +11,8 @@ import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import { GitSCM } from '../../../../../../../core/src/shared/data-services/scm/scm';
 import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { GitSCM } from '../../../../data-services/scm/scm';
 
 export class GithubCommitsDataSource extends ListDataSource<GitCommit> {
   store: Store<CFAppState>;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-app-tab.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-app-tab.service.ts
index 520a3281e6..782afe6563 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-app-tab.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-app-tab.service.ts
@@ -19,11 +19,11 @@ import { ApplicationService } from '../../../../../../../cloud-foundry/src/featu
 import { selectCfEntity } from '../../../../../../../cloud-foundry/src/store/selectors/api.selectors';
 import { GitBranch, GitCommit } from '../../../../../../../cloud-foundry/src/store/types/git.types';
 import { IListAction } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import { GitSCM } from '../../../../../../../core/src/shared/data-services/scm/scm';
-import { GitSCMService, GitSCMType } from '../../../../../../../core/src/shared/data-services/scm/scm.service';
 import { RouterNav } from '../../../../../../../store/src/actions/router.actions';
 import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { EntityServiceFactory } from '../../../../../../../store/src/entity-service-factory.service';
+import { GitSCM } from '../../../../data-services/scm/scm';
+import { GitSCMService, GitSCMType } from '../../../../data-services/scm/scm.service';
 import { GithubCommitsDataSource } from './github-commits-data-source';
 import { GithubCommitsListConfigServiceBase } from './github-commits-list-config-base.service';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-deploy.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-deploy.service.ts
index 316a171890..569bcf6b38 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-deploy.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-deploy.service.ts
@@ -9,7 +9,7 @@ import { DeployApplicationSource } from '../../../../../../../cloud-foundry/src/
 import {
   TableCellRadioComponent,
 } from '../../../../../../../core/src/shared/components/list/list-table/table-cell-radio/table-cell-radio.component';
-import { GitSCMService, GitSCMType } from '../../../../../../../core/src/shared/data-services/scm/scm.service';
+import { GitSCMService, GitSCMType } from '../../../../data-services/scm/scm.service';
 import { GithubCommitsDataSource } from './github-commits-data-source';
 import { GithubCommitsListConfigServiceBase } from './github-commits-list-config-base.service';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/table-cell-service-plan-extras/table-cell-service-plan-extras.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/table-cell-service-plan-extras/table-cell-service-plan-extras.component.spec.ts
index 0bc43fb871..6164a33490 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/table-cell-service-plan-extras/table-cell-service-plan-extras.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/table-cell-service-plan-extras/table-cell-service-plan-extras.component.spec.ts
@@ -2,11 +2,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { StoreModule } from '@ngrx/store';
 
 import { CoreModule } from '../../../../../../../../core/src/core/core.module';
-import {
-  ApplicationStateService,
-} from '../../../../../../../../core/src/shared/components/application-state/application-state.service';
 import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { ApplicationStateService } from '../../../../../services/application-state.service';
 import { TableCellAServicePlanExtrasComponent } from './table-cell-service-plan-extras.component';
 
 describe('TableCellAServicePlanExtrasComponent', () => {
diff --git a/src/frontend/packages/core/src/shared/data-services/scm/github-scm.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/github-scm.ts
similarity index 93%
rename from src/frontend/packages/core/src/shared/data-services/scm/github-scm.ts
rename to src/frontend/packages/cloud-foundry/src/shared/data-services/scm/github-scm.ts
index 5de5a777ca..311af0f68c 100644
--- a/src/frontend/packages/core/src/shared/data-services/scm/github-scm.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/github-scm.ts
@@ -2,8 +2,8 @@ import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
-import { GitBranch, GitCommit, GitRepo } from '../../../../../cloud-foundry/src/store/types/git.types';
-import { getGitHubAPIURL } from '../../../core/github.helpers';
+import { getGitHubAPIURL } from '../../../../../core/src/core/github.helpers';
+import { GitBranch, GitCommit, GitRepo } from '../../../store/types/git.types';
 import { GitSCM, SCMIcon } from './scm';
 import { GitSCMType } from './scm.service';
 
diff --git a/src/frontend/packages/core/src/shared/data-services/scm/gitlab-scm.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/gitlab-scm.ts
similarity index 97%
rename from src/frontend/packages/core/src/shared/data-services/scm/gitlab-scm.ts
rename to src/frontend/packages/cloud-foundry/src/shared/data-services/scm/gitlab-scm.ts
index 2b6daa1931..8ef522070e 100644
--- a/src/frontend/packages/core/src/shared/data-services/scm/gitlab-scm.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/gitlab-scm.ts
@@ -3,7 +3,7 @@ import { Observable, of as observableOf } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { Md5 } from 'ts-md5/dist/md5';
 
-import { GitBranch, GitCommit, GitRepo } from '../../../../../cloud-foundry/src/store/types/git.types';
+import { GitBranch, GitCommit, GitRepo } from '../../../store/types/git.types';
 import { GitSCM, SCMIcon } from './scm';
 import { GitSCMType } from './scm.service';
 
diff --git a/src/frontend/packages/core/src/shared/data-services/scm/scm.service.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/scm.service.ts
similarity index 91%
rename from src/frontend/packages/core/src/shared/data-services/scm/scm.service.ts
rename to src/frontend/packages/cloud-foundry/src/shared/data-services/scm/scm.service.ts
index 82e87ed2c8..99b116519f 100644
--- a/src/frontend/packages/core/src/shared/data-services/scm/scm.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/scm.service.ts
@@ -1,6 +1,6 @@
 import { Inject, Injectable } from '@angular/core';
 
-import { GITHUB_API_URL } from '../../../core/github.helpers';
+import { GITHUB_API_URL } from '../../../../../core/src/core/github.helpers';
 import { GitHubSCM } from './github-scm';
 import { GitLabSCM } from './gitlab-scm';
 import { GitSCM } from './scm';
diff --git a/src/frontend/packages/core/src/shared/data-services/scm/scm.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/scm.ts
similarity index 91%
rename from src/frontend/packages/core/src/shared/data-services/scm/scm.ts
rename to src/frontend/packages/cloud-foundry/src/shared/data-services/scm/scm.ts
index eb25e03cb9..4737ef2931 100644
--- a/src/frontend/packages/core/src/shared/data-services/scm/scm.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/scm/scm.ts
@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
 
-import { GitBranch, GitCommit, GitRepo } from '../../../../../cloud-foundry/src/store/types/git.types';
+import { GitBranch, GitCommit, GitRepo } from '../../../store/types/git.types';
 import { GitSCMType } from './scm.service';
 
 export interface SCMIcon {
diff --git a/src/frontend/packages/core/src/shared/app-name-unique.directive/app-name-unique.directive.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/directives/app-name-unique.directive/app-name-unique.directive.spec.ts
similarity index 66%
rename from src/frontend/packages/core/src/shared/app-name-unique.directive/app-name-unique.directive.spec.ts
rename to src/frontend/packages/cloud-foundry/src/shared/directives/app-name-unique.directive/app-name-unique.directive.spec.ts
index d7ce7bfa7b..d19c066a77 100644
--- a/src/frontend/packages/core/src/shared/app-name-unique.directive/app-name-unique.directive.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/directives/app-name-unique.directive/app-name-unique.directive.spec.ts
@@ -7,17 +7,18 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { Store } from '@ngrx/store';
 import { createBasicStoreModule } from '@stratos/store/testing';
 
-import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
-import { ActiveRouteCfOrgSpace } from '../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
-import { CfUserService } from '../../../../cloud-foundry/src/shared/data-services/cf-user.service';
-import { AppStoreModule } from '../../../../store/src/store.module';
-import { CoreTestingModule } from '../../../test-framework/core-test.modules';
-import { CoreModule } from '../../core/core.module';
-import { ExtensionService } from '../../core/extension/extension-service';
-import { getGitHubAPIURL, GITHUB_API_URL } from '../../core/github.helpers';
-import { SharedModule } from '../shared.module';
+import { CoreModule } from '../../../../../core/src/core/core.module';
+import { ExtensionService } from '../../../../../core/src/core/extension/extension-service';
+import { getGitHubAPIURL, GITHUB_API_URL } from '../../../../../core/src/core/github.helpers';
+import { SharedModule } from '../../../../../core/src/shared/shared.module';
+import { CoreTestingModule } from '../../../../../core/test-framework/core-test.modules';
+import { AppStoreModule } from '../../../../../store/src/store.module';
+import { CFAppState } from '../../../cf-app-state';
+import { ActiveRouteCfOrgSpace } from '../../../features/cloud-foundry/cf-page.types';
+import { CfUserService } from '../../data-services/cf-user.service';
 import { AppNameUniqueDirective } from './app-name-unique.directive';
 
+
 describe('AppNameUniqueDirective', () => {
 
   beforeEach(() => {
diff --git a/src/frontend/packages/core/src/shared/app-name-unique.directive/app-name-unique.directive.ts b/src/frontend/packages/cloud-foundry/src/shared/directives/app-name-unique.directive/app-name-unique.directive.ts
similarity index 94%
rename from src/frontend/packages/core/src/shared/app-name-unique.directive/app-name-unique.directive.ts
rename to src/frontend/packages/cloud-foundry/src/shared/directives/app-name-unique.directive/app-name-unique.directive.ts
index 7244df86a2..eab0dac1b9 100644
--- a/src/frontend/packages/core/src/shared/app-name-unique.directive/app-name-unique.directive.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/directives/app-name-unique.directive/app-name-unique.directive.ts
@@ -5,10 +5,9 @@ import { Store } from '@ngrx/store';
 import { Observable, of as observableOf, throwError as observableThrowError, timer as observableTimer } from 'rxjs';
 import { catchError, filter, map, switchMap, take } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
-import { selectNewAppState } from '../../../../cloud-foundry/src/store/effects/create-app-effects';
-import { environment } from '../../environments/environment.prod';
-
+import { CFAppState } from '../../../cf-app-state';
+import { environment } from './../../../../../core/src/environments/environment.prod';
+import { selectNewAppState } from './../../../store/effects/create-app-effects';
 
 /* tslint:disable:no-use-before-declare  */
 const APP_UNIQUE_NAME_PROVIDER = {
diff --git a/src/frontend/packages/core/src/shared/components/application-state/application-state.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/services/application-state.service.spec.ts
similarity index 100%
rename from src/frontend/packages/core/src/shared/components/application-state/application-state.service.spec.ts
rename to src/frontend/packages/cloud-foundry/src/shared/services/application-state.service.spec.ts
diff --git a/src/frontend/packages/core/src/shared/components/application-state/application-state.service.ts b/src/frontend/packages/cloud-foundry/src/shared/services/application-state.service.ts
similarity index 97%
rename from src/frontend/packages/core/src/shared/components/application-state/application-state.service.ts
rename to src/frontend/packages/cloud-foundry/src/shared/services/application-state.service.ts
index f9ac1d84c8..751994c0f0 100644
--- a/src/frontend/packages/core/src/shared/components/application-state/application-state.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/services/application-state.service.ts
@@ -1,12 +1,9 @@
 import { Injectable } from '@angular/core';
 
-import { AppStat } from '../../../../../cloud-foundry/src/store/types/app-metadata.types';
-import { StratosStatus } from '../../shared.types';
+import { StratosStatus, StratosStatusMetadata } from '../../../../core/src/shared/shared.types';
+import { AppStat } from '../../store/types/app-metadata.types';
 
-export interface ApplicationStateData {
-  label: string;
-  subLabel?: string;
-  indicator: StratosStatus;
+export interface ApplicationStateData extends StratosStatusMetadata {
   actions: {
     [key: string]: boolean
   };
diff --git a/src/frontend/packages/cloud-foundry/src/store/effects/github.effects.ts b/src/frontend/packages/cloud-foundry/src/store/effects/github.effects.ts
index e2bd9fc694..7f7bf7c633 100644
--- a/src/frontend/packages/cloud-foundry/src/store/effects/github.effects.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/effects/github.effects.ts
@@ -5,17 +5,17 @@ import { Store } from '@ngrx/store';
 import { catchError, mergeMap } from 'rxjs/operators';
 
 import { LoggerService } from '../../../../core/src/core/logger.service';
-import { GitSCMService, GitSCMType } from '../../../../core/src/shared/data-services/scm/scm.service';
 import { NormalizedResponse } from '../../../../store/src/types/api.types';
 import {
   StartRequestAction,
   WrapperRequestActionFailed,
   WrapperRequestActionSuccess,
 } from '../../../../store/src/types/request.types';
-import { CF_ENDPOINT_TYPE } from '../../cf-types';
 import { FETCH_GITHUB_REPO, FetchGitHubRepoInfo } from '../../actions/github.actions';
 import { CFAppState } from '../../cf-app-state';
 import { gitRepoEntityType } from '../../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../../cf-types';
+import { GitSCMService, GitSCMType } from '../../shared/data-services/scm/scm.service';
 import { createFailedGithubRequestMessage } from './deploy-app.effects';
 
 // TODO: Remove this in favour of action builder config.
diff --git a/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts
index 7a72e4072a..71f7a8b9ea 100644
--- a/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts
+++ b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts
@@ -193,6 +193,6 @@ export function generateCfBaseTestModulesNoShared() {
 export function generateCfBaseTestModules() {
   return [
     ...generateCfBaseTestModulesNoShared(),
-    SharedModule
+    SharedModule,
   ];
 }
diff --git a/src/frontend/packages/core/src/shared/components/application-state/application-state.component.ts b/src/frontend/packages/core/src/shared/components/application-state/application-state.component.ts
index 8a3cb8c0c5..f548f70336 100644
--- a/src/frontend/packages/core/src/shared/components/application-state/application-state.component.ts
+++ b/src/frontend/packages/core/src/shared/components/application-state/application-state.component.ts
@@ -2,8 +2,7 @@ import { Component, Input, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 
-import { StratosStatus } from '../../shared.types';
-import { ApplicationStateData } from './application-state.service';
+import { StratosStatus, StratosStatusMetadata } from '../../shared.types';
 
 @Component({
   selector: 'app-application-state',
@@ -13,7 +12,7 @@ import { ApplicationStateData } from './application-state.service';
 export class ApplicationStateComponent implements OnInit {
 
   @Input()
-  public state: Observable<ApplicationStateData>;
+  public state: Observable<StratosStatusMetadata>;
 
   public status$: Observable<StratosStatus>;
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-actions/table-cell-actions.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-actions/table-cell-actions.component.ts
index 189d183027..858dba6ce4 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-actions/table-cell-actions.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-actions/table-cell-actions.component.ts
@@ -3,7 +3,7 @@ import { Store } from '@ngrx/store';
 import { BehaviorSubject, combineLatest, Observable, of as observableOf } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
+import { AppState } from '../../../../../../../store/src/app-state';
 import { RowState } from '../../data-sources-controllers/list-data-source-types';
 import { IListAction, ListConfig } from '../../list.component.types';
 import { TableCellCustom } from '../../list.types';
@@ -40,7 +40,7 @@ export class TableCellActionsComponent<T> extends TableCellCustom<T> implements
 
   private subjects: BehaviorSubject<T>[] = [];
 
-  constructor(private store: Store<CFAppState>, public listConfig: ListConfig<T>) {
+  constructor(private store: Store<AppState>, public listConfig: ListConfig<T>) {
     super();
     this.actions = listConfig.getSingleActions();
   }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.spec.ts
index c72cfd8a8e..5edaec239c 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.spec.ts
@@ -1,6 +1,6 @@
-/* tslint:disable:max-line-length */
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { ApplicationStateService } from '../../../../../../../cloud-foundry/src/shared/services/application-state.service';
 import { CoreModule } from '../../../../../core/core.module';
 import { UtilsService } from '../../../../../core/utils.service';
 import { PercentagePipe } from '../../../../pipes/percentage.pipe';
@@ -11,12 +11,12 @@ import {
 } from '../../../application-state/application-state-icon/application-state-icon.component';
 import { ApplicationStateIconPipe } from '../../../application-state/application-state-icon/application-state-icon.pipe';
 import { ApplicationStateComponent } from '../../../application-state/application-state.component';
-import { ApplicationStateService } from '../../../application-state/application-state.service';
 import { BooleanIndicatorComponent } from '../../../boolean-indicator/boolean-indicator.component';
 import { AppChipsComponent } from '../../../chips/chips.component';
 import { UsageGaugeComponent } from '../../../usage-gauge/usage-gauge.component';
 import { listTableCells, TableCellComponent } from './table-cell.component';
 
+/* tslint:disable:max-line-length */
 
 /* tslint:enable:max-line-length */
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list.component.spec.ts
index 98ae59bcc2..adebf67719 100644
--- a/src/frontend/packages/core/src/shared/components/list/list.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list.component.spec.ts
@@ -2,20 +2,20 @@ import { ChangeDetectorRef, NgZone } from '@angular/core';
 import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Store } from '@ngrx/store';
+import { createBasicStoreModule } from '@stratos/store/testing';
 import { BehaviorSubject, of as observableOf } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 
+import { ApplicationStateService } from '../../../../../cloud-foundry/src/shared/services/application-state.service';
 import { ListView } from '../../../../../store/src/actions/list.actions';
 import { GeneralAppState } from '../../../../../store/src/app-state';
+import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
+import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource } from '../../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
 import { CoreModule } from '../../../core/core.module';
-import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
-import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { SharedModule } from '../../shared.module';
-import { ApplicationStateService } from '../application-state/application-state.service';
 import { EndpointCardComponent } from './list-types/endpoint/endpoint-card/endpoint-card.component';
 import { EndpointListHelper } from './list-types/endpoint/endpoint-list.helpers';
 import { EndpointsListConfigService } from './list-types/endpoint/endpoints-list-config.service';
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index 6d6bfe0492..611693ad60 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -8,6 +8,8 @@ import { NgxChartsModule } from '@swimlane/ngx-charts';
 import {
   ApplicationInstanceChartComponent,
 } from '../../../cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component';
+import { GitSCMService } from '../../../cloud-foundry/src/shared/data-services/scm/scm.service';
+import { ApplicationStateService } from '../../../cloud-foundry/src/shared/services/application-state.service';
 import {
   CloudFoundryUserProvidedServicesService,
 } from '../../../cloud-foundry/src/shared/services/cloud-foundry-user-provided-services.service';
@@ -15,7 +17,6 @@ import { EntityMonitorFactory } from '../../../store/src/monitors/entity-monitor
 import { InternalEventMonitorFactory } from '../../../store/src/monitors/internal-event-monitor.factory';
 import { PaginationMonitorFactory } from '../../../store/src/monitors/pagination-monitor.factory';
 import { CoreModule } from '../core/core.module';
-import { AppNameUniqueDirective } from './app-name-unique.directive/app-name-unique.directive';
 import { AppActionMonitorIconComponent } from './components/app-action-monitor-icon/app-action-monitor-icon.component';
 import { AppActionMonitorComponent } from './components/app-action-monitor/app-action-monitor.component';
 import {
@@ -23,7 +24,6 @@ import {
 } from './components/application-state/application-state-icon/application-state-icon.component';
 import { ApplicationStateIconPipe } from './components/application-state/application-state-icon/application-state-icon.pipe';
 import { ApplicationStateComponent } from './components/application-state/application-state.component';
-import { ApplicationStateService } from './components/application-state/application-state.service';
 import { BlurDirective } from './components/blur.directive';
 import { BooleanIndicatorComponent } from './components/boolean-indicator/boolean-indicator.component';
 import { BreadcrumbsComponent } from './components/breadcrumbs/breadcrumbs.component';
@@ -121,7 +121,6 @@ import {
 } from './components/upload-progress-indicator/upload-progress-indicator.component';
 import { UsageGaugeComponent } from './components/usage-gauge/usage-gauge.component';
 import { UserProfileBannerComponent } from './components/user-profile-banner/user-profile-banner.component';
-import { GitSCMService } from './data-services/scm/scm.service';
 import { CapitalizeFirstPipe } from './pipes/capitalizeFirstLetter.pipe';
 import { MbToHumanSizePipe } from './pipes/mb-to-human-size.pipe';
 import { PercentagePipe } from './pipes/percentage.pipe';
@@ -217,8 +216,6 @@ import { UserPermissionDirective } from './user-permission.directive';
     TileSelectorComponent,
     MarkdownPreviewComponent,
     MarkdownContentObserverDirective,
-    AppNameUniqueDirective,
-    AppNameUniqueDirective,
     EndpointCardComponent,
     SimpleUsageChartComponent,
     PageSubNavComponent,
@@ -319,12 +316,10 @@ import { UserPermissionDirective } from './user-permission.directive';
     TileSelectorComponent,
     MarkdownPreviewComponent,
     MarkdownContentObserverDirective,
-    AppNameUniqueDirective,
     SimpleUsageChartComponent,
     EntitySummaryTitleComponent,
     MarkdownPreviewComponent,
     MarkdownContentObserverDirective,
-    AppNameUniqueDirective,
     PollingIndicatorComponent,
     UnlimitedInputComponent,
     JsonViewerComponent,
diff --git a/src/frontend/packages/core/src/shared/shared.types.ts b/src/frontend/packages/core/src/shared/shared.types.ts
index d5cdae0c6d..fb1ee12899 100644
--- a/src/frontend/packages/core/src/shared/shared.types.ts
+++ b/src/frontend/packages/core/src/shared/shared.types.ts
@@ -16,6 +16,12 @@ export enum StratosStatus {
   BUSY = 'busy'
 }
 
+export interface StratosStatusMetadata {
+  label: string;
+  subLabel?: string;
+  indicator: StratosStatus;
+}
+
 export type PartialAppState = Partial<CFAppState>;
 
 export type PickAppState = keyof CFAppState;
diff --git a/src/frontend/packages/core/test-framework/application-service-helper.ts b/src/frontend/packages/core/test-framework/application-service-helper.ts
index 00a88d5f61..1b2a1363db 100644
--- a/src/frontend/packages/core/test-framework/application-service-helper.ts
+++ b/src/frontend/packages/core/test-framework/application-service-helper.ts
@@ -8,15 +8,15 @@ import {
   ApplicationEnvVarsHelper,
   EnvVarStratosProject,
 } from '../../cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service';
+import {
+  ApplicationStateData,
+  ApplicationStateService,
+} from '../../cloud-foundry/src/shared/services/application-state.service';
 import { AppStat } from '../../cloud-foundry/src/store/types/app-metadata.types';
 import { EntityServiceFactory } from '../../store/src/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../store/src/monitors/pagination-monitor.factory';
 import { RequestInfoState } from '../../store/src/reducers/api-request-reducer/types';
 import { APIResource, EntityInfo } from '../../store/src/types/api.types';
-import {
-  ApplicationStateData,
-  ApplicationStateService,
-} from '../src/shared/components/application-state/application-state.service';
 
 function createEntity<T>(entity: T): APIResource<T> {
   return {

From d3d0d2537741a98c90089bbc73d7013ed4237788 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 5 May 2020 17:28:52 +0100
Subject: [PATCH 064/176] Fix references to CFAppState

---
 .../src/features/cloud-foundry/cf.helpers.ts  | 11 +++++----
 .../edit-endpoint-step.component.ts           | 24 +++++++++++--------
 .../packages/core/src/logged-in.service.ts    |  4 ++--
 .../card-number-metric.component.ts           |  4 ++--
 .../components/cf-auth/cf-auth.service.ts     |  5 ++--
 .../extension-buttons.component.ts            |  4 ++--
 .../favorites-global-list.component.ts        |  4 ++--
 .../favorites-meta-card.component.ts          |  4 ++--
 .../endpoint/endpoint-list.helpers.ts         |  6 ++---
 .../endpoint/endpoints-data-source.ts         |  8 +++----
 .../endpoint/endpoints-list-config.service.ts |  4 ++--
 .../metrics-chart/metrics-chart.component.ts  |  8 +++----
 .../page-header-events.component.ts           |  4 ++--
 .../page-header/page-header.component.ts      | 11 ++++-----
 .../recent-entities.component.ts              |  8 +++----
 .../stepper/steppers/steppers.component.ts    |  4 ++--
 .../packages/core/src/shared/shared.types.ts  |  6 ++---
 .../src/shared/user-permission.directive.ts   |  4 ++--
 .../application-service-helper.ts             |  4 ++--
 19 files changed, 65 insertions(+), 62 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts
index e5cd657029..bcdf93556a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts
@@ -32,6 +32,7 @@ import {
 } from '../../../../core/src/shared/components/list/data-sources-controllers/local-filtering-sorting';
 import { SetClientFilter } from '../../../../store/src/actions/pagination.actions';
 import { RouterNav } from '../../../../store/src/actions/router.actions';
+import { AppState } from '../../../../store/src/app-state';
 import { MultiActionListEntity } from '../../../../store/src/monitors/pagination-monitor';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
@@ -297,7 +298,7 @@ export function canUpdateOrgRoles(
   return perms.can(CurrentUserPermissions.ORGANIZATION_CHANGE_ROLES, cfGuid, orgGuid);
 }
 
-export function waitForCFPermissions(store: Store<CFAppState>, cfGuid: string): Observable<ICfRolesState> {
+export function waitForCFPermissions(store: Store<AppState>, cfGuid: string): Observable<ICfRolesState> {
   return store.select<ICfRolesState>(getCurrentUserCFEndpointRolesState(cfGuid)).pipe(
     filter(cf => cf && cf.state.initialised),
     first(),
@@ -306,14 +307,14 @@ export function waitForCFPermissions(store: Store<CFAppState>, cfGuid: string):
   );
 }
 
-export function selectConnectedCfs(store: Store<CFAppState>): Observable<EndpointModel[]> {
+export function selectConnectedCfs(store: Store<AppState>): Observable<EndpointModel[]> {
   return store.select(endpointEntitiesSelector).pipe(
     map(endpoints => Object.values(endpoints)),
     map(endpoints => endpoints.filter(endpoint => endpoint.cnsi_type === 'cf' && endpoint.connectionStatus === 'connected')),
   );
 }
 
-export function haveMultiConnectedCfs(store: Store<CFAppState>): Observable<boolean> {
+export function haveMultiConnectedCfs(store: Store<AppState>): Observable<boolean> {
   return selectConnectedCfs(store).pipe(
     map(connectedCfs => connectedCfs.length > 1)
   );
@@ -329,7 +330,7 @@ export function createFetchTotalResultsPagKey(standardActionKey: string): string
 
 export function fetchTotalResults(
   action: PaginatedAction,
-  store: Store<CFAppState>,
+  store: Store<AppState>,
   paginationMonitorFactory: PaginationMonitorFactory
 ): Observable<number> {
   const newAction = {
@@ -425,7 +426,7 @@ export function isUserProvidedServiceInstance(obj: any): IUserProvidedServiceIns
 export function someFeatureFlags(
   ff: CFFeatureFlagTypes[],
   cfGuid: string,
-  store: Store<CFAppState>,
+  store: Store<AppState>,
   userPerms: CurrentUserPermissionsService,
 ): Observable<boolean> {
   return waitForCFPermissions(store, cfGuid).pipe(
diff --git a/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts b/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts
index ce966903ba..de64bcea67 100644
--- a/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts
@@ -1,20 +1,24 @@
-import { ActivatedRoute } from '@angular/router';
 import { Component, OnDestroy } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
-import { filter, map, first, pairwise, startWith } from 'rxjs/operators';
-import { EndpointModel } from './../../../../../../store/src/types/endpoint.types';
+import { filter, first, map, pairwise } from 'rxjs/operators';
+
+import { AppState } from '../../../../../../store/src/app-state';
+import { selectUpdateInfo } from '../../../../../../store/src/selectors/api.selectors';
+import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component';
+import { getFullEndpointApiUrl, getSSOClientRedirectURI } from '../../endpoint-helpers';
 import { UpdateEndpoint } from './../../../../../../store/src/actions/endpoint.actions';
-import { IStratosEndpointDefinition, EntityCatalogSchemas } from './../../../../../../store/src/entity-catalog/entity-catalog.types';
 import { entityCatalog } from './../../../../../../store/src/entity-catalog/entity-catalog.service';
+import {
+  EntityCatalogSchemas,
+  IStratosEndpointDefinition,
+} from './../../../../../../store/src/entity-catalog/entity-catalog.types';
 import { endpointEntitiesSelector } from './../../../../../../store/src/selectors/endpoint.selectors';
-import { StepOnNextFunction } from '../../../../shared/components/stepper/step/step.component';
-import { selectUpdateInfo } from '../../../../../../store/src/selectors/api.selectors';
-import { safeUnsubscribe, getIdFromRoute } from './../../../../core/utils.service';
-import { getFullEndpointApiUrl, getSSOClientRedirectURI } from '../../endpoint-helpers';
+import { EndpointModel } from './../../../../../../store/src/types/endpoint.types';
+import { getIdFromRoute, safeUnsubscribe } from './../../../../core/utils.service';
 import { IStepperStep } from './../../../../shared/components/stepper/step/step.component';
-import { CFAppState } from 'frontend/packages/cloud-foundry/src/cf-app-state';
 
 interface EndpointModelMap {
   [id: string]: EndpointModel;
@@ -42,7 +46,7 @@ export class EditEndpointStepComponent implements OnDestroy, IStepperStep {
   setClientInfo = false;
 
   constructor(
-    private store: Store<CFAppState>,
+    private store: Store<AppState>,
     activatedRoute: ActivatedRoute,
   ) {
     this.editEndpoint = new FormGroup({
diff --git a/src/frontend/packages/core/src/logged-in.service.ts b/src/frontend/packages/core/src/logged-in.service.ts
index 7db8ed0ddc..b083dd237c 100644
--- a/src/frontend/packages/core/src/logged-in.service.ts
+++ b/src/frontend/packages/core/src/logged-in.service.ts
@@ -5,8 +5,8 @@ import { Store } from '@ngrx/store';
 import { fromEvent, interval, merge, Subscription } from 'rxjs';
 import { tap, withLatestFrom } from 'rxjs/operators';
 
-import { CFAppState } from '../../cloud-foundry/src/cf-app-state';
 import { VerifySession } from '../../store/src/actions/auth.actions';
+import { AppState } from '../../store/src/app-state';
 import { AuthState } from '../../store/src/reducers/auth.reducer';
 import { selectDashboardState } from '../../store/src/selectors/dashboard.selectors';
 import { DashboardState } from './../../store/src/reducers/dashboard-reducer';
@@ -17,7 +17,7 @@ import { PageVisible } from './core/page-visible';
 export class LoggedInService {
   constructor(
     @Inject(DOCUMENT) private document: Document,
-    private store: Store<CFAppState>,
+    private store: Store<AppState>,
     private dialog: MatDialog,
     private ngZone: NgZone
   ) {
diff --git a/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.ts b/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.ts
index e347f07b14..ca4bfcbc57 100644
--- a/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.ts
+++ b/src/frontend/packages/core/src/shared/components/cards/card-number-metric/card-number-metric.component.ts
@@ -2,8 +2,8 @@ import { Component, Input, OnChanges, OnInit } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { BehaviorSubject } from 'rxjs';
 
-import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
+import { AppState } from '../../../../../../store/src/app-state';
 import { UtilsService } from '../../../../core/utils.service';
 import { StratosStatus } from '../../../shared.types';
 import { determineCardStatus } from '../card-status/card-status.component';
@@ -34,7 +34,7 @@ export class CardNumberMetricComponent implements OnInit, OnChanges {
   status$ = new BehaviorSubject<StratosStatus>(StratosStatus.NONE);
   isUnlimited: boolean;
 
-  constructor(private utils: UtilsService, private store: Store<CFAppState>) { }
+  constructor(private utils: UtilsService, private store: Store<AppState>) { }
 
   ngOnInit() {
     this.format();
diff --git a/src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.service.ts b/src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.service.ts
index 39cd232897..f4caccccdb 100644
--- a/src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.service.ts
+++ b/src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.service.ts
@@ -3,8 +3,7 @@ import { Store } from '@ngrx/store';
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
-import { IRequestEntityTypeState } from '../../../../../store/src/app-state';
+import { AppState, IRequestEntityTypeState } from '../../../../../store/src/app-state';
 import { selectSessionData } from '../../../../../store/src/reducers/auth.reducer';
 import { endpointEntitiesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
 import { SessionData } from '../../../../../store/src/types/auth.types';
@@ -46,7 +45,7 @@ export class CfAuthService {
   // WIP: Async/Sync calls. Need to review once store stuff done
   session: SessionData;
 
-  constructor(private store: Store<CFAppState>) {
+  constructor(private store: Store<AppState>) {
     this.endpoints$ = store.select(endpointEntitiesSelector);
     this.sessionData$ = store.select<SessionData>(selectSessionData());
   }
diff --git a/src/frontend/packages/core/src/shared/components/extension-buttons/extension-buttons.component.ts b/src/frontend/packages/core/src/shared/components/extension-buttons/extension-buttons.component.ts
index e1c0826400..d16ebf598a 100644
--- a/src/frontend/packages/core/src/shared/components/extension-buttons/extension-buttons.component.ts
+++ b/src/frontend/packages/core/src/shared/components/extension-buttons/extension-buttons.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, OnInit } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { of } from 'rxjs';
 
-import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
+import { AppState } from '../../../../../store/src/app-state';
 import {
   getActionsFromExtensions,
   StratosActionMetadata,
@@ -21,7 +21,7 @@ export class ExtensionButtonsComponent implements OnInit {
   @Input() type: StratosActionType;
 
   constructor(
-    private store: Store<CFAppState>
+    private store: Store<AppState>
   ) { }
 
   ngOnInit() {
diff --git a/src/frontend/packages/core/src/shared/components/favorites-global-list/favorites-global-list.component.ts b/src/frontend/packages/core/src/shared/components/favorites-global-list/favorites-global-list.component.ts
index 1559f873f6..ffd96652f0 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-global-list/favorites-global-list.component.ts
+++ b/src/frontend/packages/core/src/shared/components/favorites-global-list/favorites-global-list.component.ts
@@ -3,7 +3,7 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
+import { AppState } from '../../../../../store/src/app-state';
 import { getFavoriteInfoObservable } from '../../../../../store/src/helpers/store-helpers';
 import {
   IFavoriteEntity,
@@ -22,7 +22,7 @@ export class FavoritesGlobalListComponent implements OnInit {
   public favInfo$: Observable<IFavoritesInfo>;
   public favoriteGroups$: Observable<IGroupedFavorites[]>;
   constructor(
-    private store: Store<CFAppState>,
+    private store: Store<AppState>,
     private userFavoriteManager: UserFavoriteManager
   ) { }
 
diff --git a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.ts b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.ts
index 7476f5156f..8942291beb 100644
--- a/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.ts
+++ b/src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.ts
@@ -3,10 +3,10 @@ import { Store } from '@ngrx/store';
 import { isObservable, Observable, of as observableOf } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import {
   RemoveUserFavoriteAction,
 } from '../../../../../store/src/actions/user-favourites-actions/remove-user-favorite-action';
+import { AppState } from '../../../../../store/src/app-state';
 import { endpointEntitiesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../store/src/types/user-favorites.types';
 import { userFavoritesEntitySchema } from '../../../base-entity-schemas';
@@ -113,7 +113,7 @@ export class FavoritesMetaCardComponent {
   }
 
   constructor(
-    private store: Store<CFAppState>,
+    private store: Store<AppState>,
     private confirmDialog: ConfirmationDialogService
   ) { }
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers.ts
index a90bb816ad..54f21c86eb 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-list.helpers.ts
@@ -4,18 +4,18 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
 import { map, pairwise } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { DisconnectEndpoint, UnregisterEndpoint } from '../../../../../../../store/src/actions/endpoint.actions';
 import { ShowSnackBar } from '../../../../../../../store/src/actions/snackBar.actions';
 import { GetSystemInfo } from '../../../../../../../store/src/actions/system.actions';
+import { AppState } from '../../../../../../../store/src/app-state';
 import { EndpointsEffect } from '../../../../../../../store/src/effects/endpoint.effects';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
 import { selectDeletionInfo, selectUpdateInfo } from '../../../../../../../store/src/selectors/api.selectors';
 import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
 import { STRATOS_ENDPOINT_TYPE } from '../../../../../base-entity-schemas';
 import { CurrentUserPermissions } from '../../../../../core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../core/current-user-permissions.service';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { LoggerService } from '../../../../../core/logger.service';
 import {
   ConnectEndpointDialogComponent,
@@ -44,7 +44,7 @@ function isEndpointListDetailsComponent(obj: any): EndpointListDetailsComponent
 export class EndpointListHelper {
   private endpointEntityKey = entityCatalog.getEntityKey(STRATOS_ENDPOINT_TYPE, endpointSchemaKey);
   constructor(
-    private store: Store<CFAppState>,
+    private store: Store<AppState>,
     private dialog: MatDialog,
     private currentUserPermissionsService: CurrentUserPermissionsService,
     private confirmDialog: ConfirmationDialogService,
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 af213cc031..1f2999e41b 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,20 +1,20 @@
 import { Store } from '@ngrx/store';
 
-import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { GetAllEndpoints } from '../../../../../../../store/src/actions/endpoint.actions';
-import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
+import { AppState } from '../../../../../../../store/src/app-state';
 import { EntityMonitorFactory } from '../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { InternalEventMonitorFactory } from '../../../../../../../store/src/monitors/internal-event-monitor.factory';
 import { PaginationMonitorFactory } from '../../../../../../../store/src/monitors/pagination-monitor.factory';
+import { EndpointModel } from '../../../../../../../store/src/types/endpoint.types';
 import { IListConfig } from '../../list.component.types';
 import { BaseEndpointsDataSource } from './base-endpoints-data-source';
 
 
 export class EndpointsDataSource extends BaseEndpointsDataSource {
-  store: Store<CFAppState>;
+  store: Store<AppState>;
 
   constructor(
-    store: Store<CFAppState>,
+    store: Store<AppState>,
     listConfig: IListConfig<EndpointModel>,
     paginationMonitorFactory: PaginationMonitorFactory,
     entityMonitorFactory: EntityMonitorFactory,
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 8483e01383..da59a9313b 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
@@ -2,8 +2,8 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { filter } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { ListView } from '../../../../../../../store/src/actions/list.actions';
+import { AppState } from '../../../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { EntityMonitorFactory } from '../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { InternalEventMonitorFactory } from '../../../../../../../store/src/monitors/internal-event-monitor.factory';
@@ -100,7 +100,7 @@ export class EndpointsListConfigService implements IListConfig<EndpointModel> {
   enableTextFilter = true;
 
   constructor(
-    private store: Store<CFAppState>,
+    private store: Store<AppState>,
     paginationMonitorFactory: PaginationMonitorFactory,
     entityMonitorFactory: EntityMonitorFactory,
     internalEventMonitorFactory: InternalEventMonitorFactory,
diff --git a/src/frontend/packages/core/src/shared/components/metrics-chart/metrics-chart.component.ts b/src/frontend/packages/core/src/shared/components/metrics-chart/metrics-chart.component.ts
index dfa08eac16..87c950e6ae 100644
--- a/src/frontend/packages/core/src/shared/components/metrics-chart/metrics-chart.component.ts
+++ b/src/frontend/packages/core/src/shared/components/metrics-chart/metrics-chart.component.ts
@@ -3,17 +3,17 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable, Subscription, timer } from 'rxjs';
 import { debounce, distinctUntilChanged, map, startWith } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import { MetricsAction } from '../../../../../store/src/actions/metrics.actions';
+import { AppState } from '../../../../../store/src/app-state';
+import { EntityMonitor } from '../../../../../store/src/monitors/entity-monitor';
+import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import {
   ChartSeries,
   IMetrics,
   MetricResultTypes,
   MetricsFilterSeries,
 } from '../../../../../store/src/types/base-metric.types';
-import { EntityMonitor } from '../../../../../store/src/monitors/entity-monitor';
 import { MetricsRangeSelectorComponent } from '../metrics-range-selector/metrics-range-selector.component';
-import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { MetricsChartTypes, MetricsLineChartConfig, YAxisTickFormattingFunc } from './metrics-chart.types';
 import { MetricsChartManager } from './metrics.component.manager';
 
@@ -66,7 +66,7 @@ export class MetricsChartComponent implements OnInit, OnDestroy, AfterContentIni
   public isFetching$: Observable<boolean>;
 
   constructor(
-    private store: Store<CFAppState>,
+    private store: Store<AppState>,
     private entityMonitorFactory: EntityMonitorFactory
   ) { }
   private sort(metricsArray: ChartSeries[]) {
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 6020174c55..eb328ff6f1 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
@@ -5,7 +5,7 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { first, map, publishReplay, refCount, share } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
+import { AppState } from '../../../../../../store/src/app-state';
 import { endpointEventKey, GlobalEventService, IGlobalEvent } from '../../../global-events.service';
 
 
@@ -39,7 +39,7 @@ export class PageHeaderEventsComponent implements OnInit {
   private events$: Observable<any>;
   constructor(
     private activatedRoute: ActivatedRoute,
-    private store: Store<CFAppState>,
+    private store: Store<AppState>,
     private eventService: GlobalEventService,
   ) { }
 
diff --git a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.ts b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.ts
index 4a595b6138..eed02e3470 100644
--- a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.ts
+++ b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.ts
@@ -1,4 +1,3 @@
-import { selectDashboardState } from './../../../../../store/src/selectors/dashboard.selectors';
 import { TemplatePortal } from '@angular/cdk/portal';
 import { AfterViewInit, Component, Input, OnDestroy, TemplateRef, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
@@ -6,23 +5,23 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import { Logout } from '../../../../../store/src/actions/auth.actions';
 import { ToggleSideNav } from '../../../../../store/src/actions/dashboard-actions';
 import { AddRecentlyVisitedEntityAction } from '../../../../../store/src/actions/recently-visited.actions';
+import { AppState } from '../../../../../store/src/app-state';
 import { EntityCatalogHelpers } from '../../../../../store/src/entity-catalog/entity-catalog.helper';
-import { AuthState } from '../../../../../store/src/reducers/auth.reducer';
 import { selectIsMobile } from '../../../../../store/src/selectors/dashboard.selectors';
 import { InternalEventSeverity } from '../../../../../store/src/types/internal-events.types';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../store/src/types/user-favorites.types';
 import { TabNavService } from '../../../../tab-nav.service';
+import { UserProfileService } from '../../../core/user-profile.service';
 import { IPageSideNavTab } from '../../../features/dashboard/page-side-nav/page-side-nav.component';
 import { GlobalEventService, IGlobalEvent } from '../../global-events.service';
 import { StratosStatus } from '../../shared.types';
 import { FavoritesConfigMapper } from '../favorites-meta-card/favorite-config-mapper';
-import { BREADCRUMB_URL_PARAM, IHeaderBreadcrumb, IHeaderBreadcrumbLink } from './page-header.types';
-import { UserProfileService } from '../../../core/user-profile.service';
+import { selectDashboardState } from './../../../../../store/src/selectors/dashboard.selectors';
 import { UserProfileInfo } from './../../../../../store/src/types/user-profile.types';
+import { BREADCRUMB_URL_PARAM, IHeaderBreadcrumb, IHeaderBreadcrumbLink } from './page-header.types';
 
 @Component({
   selector: 'app-page-header',
@@ -149,7 +148,7 @@ export class PageHeaderComponent implements OnDestroy, AfterViewInit {
   }
 
   constructor(
-    private store: Store<CFAppState>,
+    private store: Store<AppState>,
     private route: ActivatedRoute,
     private tabNavService: TabNavService,
     private router: Router,
diff --git a/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.ts b/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.ts
index cc2bac8f5e..fcd86c1dc6 100644
--- a/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.ts
+++ b/src/frontend/packages/core/src/shared/components/recent-entities/recent-entities.component.ts
@@ -4,7 +4,7 @@ import * as moment from 'moment';
 import { Observable, of as observableOf } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
+import { AppState } from '../../../../../store/src/app-state';
 import { endpointSchemaKey } from '../../../../../store/src/helpers/entity-factory';
 import { endpointEntitiesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
 import { recentlyVisitedSelector } from '../../../../../store/src/selectors/recently-visitied.selectors';
@@ -28,7 +28,7 @@ interface IRelevanceModifiers {
 class RenderableRecent {
   public mostRecentHit: moment.Moment;
   public subText$: Observable<string>;
-  constructor(readonly entity: IRecentlyVisitedEntity, private store: Store<CFAppState>) {
+  constructor(readonly entity: IRecentlyVisitedEntity, private store: Store<AppState>) {
     if (entity.entityType === endpointSchemaKey) {
       this.subText$ = observableOf(entity.prettyType);
     } else {
@@ -71,7 +71,7 @@ class CountedRecentEntitiesManager {
     [guid: string]: RenderableRecent
   };
 
-  constructor(recentState: IRecentlyVisitedState, private store: Store<CFAppState>) {
+  constructor(recentState: IRecentlyVisitedState, private store: Store<AppState>) {
     const { entities, hits } = recentState;
     const mostRecentTime = hits[0] ? moment(hits[0].date) : moment();
 
@@ -162,7 +162,7 @@ export class RecentEntitiesComponent {
   public recentEntities$: Observable<RenderableRecent[]>;
   public frecentEntities$: Observable<RenderableRecent[]>;
   public hasHits$: Observable<boolean>;
-  constructor(store: Store<CFAppState>) {
+  constructor(store: Store<AppState>) {
     const recentEntities$ = store.select(recentlyVisitedSelector);
     this.hasHits$ = recentEntities$.pipe(
       map(recentEntities => recentEntities && !!recentEntities.hits && recentEntities.hits.length > 0)
diff --git a/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.ts b/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.ts
index 0d18094869..1e0776289c 100644
--- a/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.ts
+++ b/src/frontend/packages/core/src/shared/components/stepper/steppers/steppers.component.ts
@@ -14,8 +14,8 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
 import { catchError, first, map, switchMap } from 'rxjs/operators';
 
-import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
 import { IRouterNavPayload, RouterNav } from '../../../../../../store/src/actions/router.actions';
+import { AppState } from '../../../../../../store/src/app-state';
 import { getPreviousRoutingState } from '../../../../../../store/src/types/routing.type';
 import { LoggerService } from '../../../../core/logger.service';
 import { BASE_REDIRECT_QUERY } from '../stepper.types';
@@ -61,7 +61,7 @@ export class SteppersComponent implements OnInit, AfterContentInit, OnDestroy {
   }>;
   constructor(
     private steppersService: SteppersService,
-    private store: Store<CFAppState>,
+    private store: Store<AppState>,
     private snackBar: MatSnackBar,
     private logger: LoggerService,
     private route: ActivatedRoute
diff --git a/src/frontend/packages/core/src/shared/shared.types.ts b/src/frontend/packages/core/src/shared/shared.types.ts
index fb1ee12899..a3da5a1e89 100644
--- a/src/frontend/packages/core/src/shared/shared.types.ts
+++ b/src/frontend/packages/core/src/shared/shared.types.ts
@@ -1,4 +1,4 @@
-import { CFAppState } from '../../../cloud-foundry/src/cf-app-state';
+import { AppState } from '../../../store/src/app-state';
 import { EntitySchema } from '../../../store/src/helpers/entity-schema';
 
 
@@ -22,7 +22,7 @@ export interface StratosStatusMetadata {
   indicator: StratosStatus;
 }
 
-export type PartialAppState = Partial<CFAppState>;
+export type PartialAppState = Partial<AppState>;
 
-export type PickAppState = keyof CFAppState;
+export type PickAppState = keyof AppState;
 
diff --git a/src/frontend/packages/core/src/shared/user-permission.directive.ts b/src/frontend/packages/core/src/shared/user-permission.directive.ts
index 94843fc9b9..6cb7102f04 100644
--- a/src/frontend/packages/core/src/shared/user-permission.directive.ts
+++ b/src/frontend/packages/core/src/shared/user-permission.directive.ts
@@ -3,8 +3,8 @@ import { Store } from '@ngrx/store';
 import { Observable, of as observableOf, Subscription } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 
-import { CFAppState } from '../../../cloud-foundry/src/cf-app-state';
 import { waitForCFPermissions } from '../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
+import { AppState } from '../../../store/src/app-state';
 import { CurrentUserPermissions } from '../core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../core/current-user-permissions.service';
 
@@ -28,7 +28,7 @@ export class UserPermissionDirective implements OnDestroy, OnInit {
   private canSub: Subscription;
 
   constructor(
-    private store: Store<CFAppState>,
+    private store: Store<AppState>,
     private templateRef: TemplateRef<any>,
     private viewContainer: ViewContainerRef,
     private currentUserPermissionsService: CurrentUserPermissionsService,
diff --git a/src/frontend/packages/core/test-framework/application-service-helper.ts b/src/frontend/packages/core/test-framework/application-service-helper.ts
index 1b2a1363db..865dfa2879 100644
--- a/src/frontend/packages/core/test-framework/application-service-helper.ts
+++ b/src/frontend/packages/core/test-framework/application-service-helper.ts
@@ -2,7 +2,6 @@ import { Store } from '@ngrx/store';
 import { Observable, of as observableOf } from 'rxjs';
 
 import { IApp, IAppSummary, IDomain, ISpace } from '../../cloud-foundry/src/cf-api.types';
-import { CFAppState } from '../../cloud-foundry/src/cf-app-state';
 import { ApplicationData, ApplicationService } from '../../cloud-foundry/src/features/applications/application.service';
 import {
   ApplicationEnvVarsHelper,
@@ -13,6 +12,7 @@ import {
   ApplicationStateService,
 } from '../../cloud-foundry/src/shared/services/application-state.service';
 import { AppStat } from '../../cloud-foundry/src/store/types/app-metadata.types';
+import { AppState } from '../../store/src/app-state';
 import { EntityServiceFactory } from '../../store/src/entity-service-factory.service';
 import { PaginationMonitorFactory } from '../../store/src/monitors/pagination-monitor.factory';
 import { RequestInfoState } from '../../store/src/reducers/api-request-reducer/types';
@@ -90,7 +90,7 @@ export function generateTestApplicationServiceProvider(appGuid: string, cfGuid:
   return {
     provide: ApplicationService,
     useFactory: (
-      store: Store<CFAppState>,
+      store: Store<AppState>,
       entityServiceFactory: EntityServiceFactory,
       applicationStateService: ApplicationStateService,
       applicationEnvVarsService: ApplicationEnvVarsHelper,

From e60b0e589c113ef27ad79946e17f9c9179639e00 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 5 May 2020 18:00:29 +0100
Subject: [PATCH 065/176] Fix issue with unit tests

---
 .../packages/core/test-framework/application-service-helper.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/frontend/packages/core/test-framework/application-service-helper.ts b/src/frontend/packages/core/test-framework/application-service-helper.ts
index 865dfa2879..f75f6c8e07 100644
--- a/src/frontend/packages/core/test-framework/application-service-helper.ts
+++ b/src/frontend/packages/core/test-framework/application-service-helper.ts
@@ -2,6 +2,7 @@ import { Store } from '@ngrx/store';
 import { Observable, of as observableOf } from 'rxjs';
 
 import { IApp, IAppSummary, IDomain, ISpace } from '../../cloud-foundry/src/cf-api.types';
+import { CFAppState } from '../../cloud-foundry/src/cf-app-state';
 import { ApplicationData, ApplicationService } from '../../cloud-foundry/src/features/applications/application.service';
 import {
   ApplicationEnvVarsHelper,
@@ -99,7 +100,7 @@ export function generateTestApplicationServiceProvider(appGuid: string, cfGuid:
       const appService = new ApplicationService(
         cfGuid,
         appGuid,
-        store,
+        store as Store<CFAppState>,
         entityServiceFactory,
         applicationStateService,
         applicationEnvVarsService,

From 4beec6a086daf451126a58dffd75e70ae7bc0549 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 6 May 2020 09:33:07 +0100
Subject: [PATCH 066/176] Fix unit test * scss linting

---
 .../edit-autoscaler-credential.component.spec.ts             | 4 ++--
 .../edit-autoscaler-policy-step2.component.scss              | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.spec.ts
index 67aa232e81..7db7aed1b8 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.spec.ts
@@ -3,12 +3,12 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 
-import { CoreModule } from '../../../../core/src/core/core.module';
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
+import { CoreModule } from '../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../core/tab-nav.service';
 import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper';
-import { createBasicStoreModule } from '../../../../core/test-framework/store-test-helper';
+import { createBasicStoreModule } from '../../../../store/testing/public-api';
 import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module';
 import { EditAutoscalerCredentialComponent } from './edit-autoscaler-credential.component';
 
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss
index 93413f1bd3..817d71e32d 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.scss
@@ -30,11 +30,10 @@
 
 .autoscaler-edit-select {
   input {
-    background: white;
-    left: 0em;
+    left: 0;
     position: absolute;
     top: .5em;
     width: 90%;
     z-index: 200;
   }
-}
\ No newline at end of file
+}

From 7689ed9aeba3c95286b2c15c7affcc41eab61e26 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 6 May 2020 14:48:27 +0100
Subject: [PATCH 067/176] Helm Chart: Fix Helm 3 compatibility with
 Release.Time

---
 deploy/kubernetes/console/templates/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 0be76b839b..3cb926ce2e 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -227,7 +227,7 @@ spec:
         - name: HELM_CHART_VERSION
           value: "{{ .Chart.Version }}"
         - name: HELM_LAST_MODIFIED
-          value: "{{ .Release.Time }}"
+          value: "seconds:{{ now | unixEpoch }} nanos:0 "        
         - name: SSO_LOGIN
           value: {{default "false" .Values.console.ssoLogin | quote}}
         - name: SSO_OPTIONS

From 577bc5e9dffc4b4370594955ee69f938ee634245 Mon Sep 17 00:00:00 2001
From: macevil <30493519+macevil@users.noreply.github.com>
Date: Wed, 6 May 2020 16:39:06 +0200
Subject: [PATCH 068/176] Add nodeSelector implementation and tests to
 kubernetes helm deployment. (#4252)

* Add nodeSelector template and tests

Add nodeSelector template to the helm deployment:
- deployment.yaml
- database.yaml
- config-init.yaml

Add tests to validate nodeSelector template to
- deployment_test.yaml

Create tests to validate nodeSelector template to
- database_test.yaml
- config_init_test.yaml

* Add c&p fix and another nodeSelector test

Add fix for c&p bug to
- database.yaml
- deployment.yaml

Add test to validate nodeSelector template to
- config_init_test.yaml

Add test config to
- database-test.yaml
- deployment-test.yaml

* Remove test

Remove test to validate nodeSelector template to
    - config_init_test.yaml
---
 deploy/kubernetes/console/templates/config-init.yaml |  8 ++++++++
 deploy/kubernetes/console/templates/database.yaml    |  4 ++++
 deploy/kubernetes/console/templates/deployment.yaml  |  4 ++++
 .../kubernetes/console/tests/config_init_test.yaml   | 12 ++++++++++++
 deploy/kubernetes/console/tests/database-test.yaml   | 12 ++++++++++++
 deploy/kubernetes/console/tests/deployment_test.yaml |  8 ++++++++
 6 files changed, 48 insertions(+)
 create mode 100644 deploy/kubernetes/console/tests/config_init_test.yaml
 create mode 100644 deploy/kubernetes/console/tests/database-test.yaml

diff --git a/deploy/kubernetes/console/templates/config-init.yaml b/deploy/kubernetes/console/templates/config-init.yaml
index 6313d3ab8c..4653fa4184 100644
--- a/deploy/kubernetes/console/templates/config-init.yaml
+++ b/deploy/kubernetes/console/templates/config-init.yaml
@@ -94,6 +94,10 @@ spec:
 {{ toYaml .Values.console.podExtraLabels | nindent 8 }}
 {{- end }}
     spec:
+{{- if .Values.configInit }}
+      nodeSelector:
+{{ toYaml .Values.configInit.nodeSelector | indent 8 }}
+{{- end }}
       containers:
       - env:
         - name: "STRATOS_VOLUME_MIGRATION"
@@ -170,6 +174,10 @@ spec:
         app.kubernetes.io/version: "{{ .Chart.AppVersion }}"
         helm.sh/chart:  "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     spec:
+{{- if .Values.configInit }}
+      nodeSelector:
+{{ toYaml .Values.configInit.nodeSelector | indent 8 }}
+{{- end }}
       containers:
       - env:
         - name: "NAMESPACE"
diff --git a/deploy/kubernetes/console/templates/database.yaml b/deploy/kubernetes/console/templates/database.yaml
index 45af491bca..3ce1c6026a 100644
--- a/deploy/kubernetes/console/templates/database.yaml
+++ b/deploy/kubernetes/console/templates/database.yaml
@@ -49,6 +49,10 @@ spec:
         {{ toYaml .Values.console.podExtraLabels | nindent 8 }}
         {{- end}}        
     spec:
+{{- if .Values.mariadb }}
+      nodeSelector:
+{{ toYaml .Values.mariadb.nodeSelector | indent 8 }}
+{{- end }}
       containers:
       - name: mariadb
         image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.mariadb}}:{{.Values.consoleVersion}}
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 0be76b839b..bd8990ac3c 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -47,6 +47,10 @@ spec:
 {{ toYaml .Values.console.podExtraLabels | indent 8 }}
 {{- end }}
     spec:
+{{- if .Values.console }}
+      nodeSelector:
+{{ toYaml .Values.console.nodeSelector | indent 8 }}
+{{- end }}
       containers:
       - image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.console}}:{{.Values.consoleVersion}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
diff --git a/deploy/kubernetes/console/tests/config_init_test.yaml b/deploy/kubernetes/console/tests/config_init_test.yaml
new file mode 100644
index 0000000000..85778e7267
--- /dev/null
+++ b/deploy/kubernetes/console/tests/config_init_test.yaml
@@ -0,0 +1,12 @@
+suite: test stratos configInit
+templates:
+  - config-init.yaml
+tests:
+  - it: should set kubernetes.io/arch if configInit.nodeSelector.kubernetes.io/arch is set
+    set:
+      configInit.nodeSelector.kubernetes.io/arch: amd64
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector.kubernetes.io/arch
+          value: amd64
+        documentIndex: 3
\ No newline at end of file
diff --git a/deploy/kubernetes/console/tests/database-test.yaml b/deploy/kubernetes/console/tests/database-test.yaml
new file mode 100644
index 0000000000..be52ea6bb9
--- /dev/null
+++ b/deploy/kubernetes/console/tests/database-test.yaml
@@ -0,0 +1,12 @@
+suite: test stratos database
+templates:
+  - database.yaml
+tests:
+  - it: should set kubernetes.io/arch if mariadb.nodeSelector.kubernetes.io/arch is set
+    set:
+      mariadb.nodeSelector.kubernetes.io/arch: amd64
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector.kubernetes.io/arch
+          value: amd64
+        documentIndex: 0
\ No newline at end of file
diff --git a/deploy/kubernetes/console/tests/deployment_test.yaml b/deploy/kubernetes/console/tests/deployment_test.yaml
index b451ba5a3a..9aa6137c08 100644
--- a/deploy/kubernetes/console/tests/deployment_test.yaml
+++ b/deploy/kubernetes/console/tests/deployment_test.yaml
@@ -67,3 +67,11 @@ tests:
           content:
             name: AUTO_REG_CF_URL
             value: https://autoreg.test.com
+  - it: should set kubernetes.io/arch if console.nodeSelector.kubernetes.io/arch is set
+    set:
+      console.nodeSelector.kubernetes.io/arch: amd64
+    asserts:
+      - equal:
+          path: spec.template.spec.nodeSelector.kubernetes.io/arch
+          value: amd64
+        documentIndex: 0
\ No newline at end of file

From fc1c90bb29660c4473f0ed3bce5d571983b4bcd6 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 6 May 2020 17:31:19 +0100
Subject: [PATCH 069/176] Autoscaler improvements

---
 .../application-autoscaler-e2e.spec.ts        | 41 ++++++++-----------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/test-e2e/application/application-autoscaler-e2e.spec.ts b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
index 2ac4460241..973fb97ff2 100644
--- a/src/test-e2e/application/application-autoscaler-e2e.spec.ts
+++ b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
@@ -19,7 +19,7 @@ import { PageAutoscalerMetricBase } from './po/page-autoscaler-metric-base.po';
 
 let applicationE2eHelper: ApplicationE2eHelper;
 
-describe('Autoscaler -', () => {
+fdescribe('Autoscaler -', () => {
 
   beforeAll(() => {
     const setup = e2e.setup(ConsoleUserType.user)
@@ -365,22 +365,16 @@ describe('Autoscaler -', () => {
       expect(createPolicy.stepper.canNext()).toBeTruthy();
 
       createPolicy.stepper.clickEditButton();
-      createPolicy.stepper.getScheduleStartTime().then((startTime: moment.Moment) => {
-
-        const now = moment();
-        const diff = moment.duration(now.diff(startTime));
-
-        console.log('Testing schedule start time. Should be at least a minute into future');
-        console.log(`Now: ${now.toString()}. StartTime: ${startTime.toString()}. Diff (ms): ${diff.asMilliseconds()}`);
-        if (diff.asMinutes() > -1) {
-          const scheduleStartDate1 = moment().tz('UTC').add(1, 'minutes').add(15, 'seconds');
-          const scheduleEndDate1 = moment().tz('UTC').add(2, 'days');
-          console.log(`Updating schedule. Start: ${scheduleStartDate1.toString()}. End ${scheduleEndDate1.toString()}`);
-          createPolicy.stepper.getStepperForm().waitUntilShown();
-          createPolicy.stepper.getStepperForm().fill({ start_date_time: scheduleStartDate1.format(dateAndTimeFormat) });
-          return createPolicy.stepper.getStepperForm().fill({ end_date_time: scheduleEndDate1.format(dateAndTimeFormat) });
-        }
-      });
+
+      // When setting the start time it must be after the current time. It seems like AS checks to the nearest minute, so start time needs
+      // to be at least +1m from now
+
+      const scheduleStartDate1 = moment().tz('UTC').add(1, 'minutes').add(15, 'seconds');
+      const scheduleEndDate1 = moment().tz('UTC').add(2, 'days');
+      console.log(`Setting schedule. Now: ${moment().tz('UTC').toString()}. Start: ${scheduleStartDate1.toString()}. End ${scheduleEndDate1.toString()}`);
+      createPolicy.stepper.getStepperForm().waitUntilShown();
+      createPolicy.stepper.getStepperForm().fill({ start_date_time: scheduleStartDate1.format(dateAndTimeFormat) });
+      createPolicy.stepper.getStepperForm().fill({ end_date_time: scheduleEndDate1.format(dateAndTimeFormat) });
       createPolicy.stepper.clickDoneButton();
 
       expect(createPolicy.stepper.canNext()).toBeTruthy();
@@ -461,7 +455,7 @@ describe('Autoscaler -', () => {
       });
 
       // This depends on scheduleStartDate1
-      extendE2ETestTime(120000);
+      extendE2ETestTime(180000);
 
       /**
        * Find the required scaling event row via row count and row content
@@ -479,7 +473,6 @@ describe('Autoscaler -', () => {
             eventPageBase.list.table.getCell(0, 2).getText(),
             eventPageBase.list.table.getCell(0, 4).getText()
           ]).then(([type, action]) => {
-            e2e.debugLog('');
             return type === 'schedule' && action === '+1 instance(s) because limited by min instances 2';
           });
         });
@@ -492,16 +485,18 @@ describe('Autoscaler -', () => {
             eventPageBase.list.header.isRefreshing()
           ]))
         ).subscribe(([foundRow, isRefreshing]) => {
-          e2e.debugLog('Waiting for event row: Checking');
+          // These console.logs help by
+          // .. Showing the actual time we're checking, which can be compared with schedule start/end times
+          // .. Showing when successful runs complete, over time this should show on average events take to show
           if (isRefreshing) {
-            e2e.debugLog('Waiting for event row: Skip actions... list is refreshing');
+            console.log(`${moment().toString()}: Waiting for event row: Skip actions... list is refreshing`);
             return;
           }
           if (foundRow) {
-            e2e.debugLog('Waiting for event row: Found row!');
+            console.log(`${moment().toString()}: Waiting for event row: Found row!`);
             sub.unsubscribe();
           } else {
-            e2e.debugLog('Waiting for event row: manually refreshing list');
+            console.log(`${moment().toString()}: Waiting for event row: manually refreshing list`);
             eventPageBase.list.header.refresh();
           }
         });

From 5c3aaa14c9a26fee70a94ff57f58d186641a76d9 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 6 May 2020 20:09:20 +0100
Subject: [PATCH 070/176] Fix unit tests

---
 .../edit-endpoint-step.component.spec.ts      | 43 +++++++++++++----
 .../edit-endpoint-step.component.ts           | 10 ++--
 .../edit-endpoint.component.spec.ts           | 47 ++++++++++++++-----
 3 files changed, 74 insertions(+), 26 deletions(-)

diff --git a/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.spec.ts
index 7a47fcc353..2ee96995c5 100644
--- a/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.spec.ts
+++ b/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.spec.ts
@@ -1,24 +1,43 @@
+import { CommonModule } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
 
-import { EditOrganizationStepComponent } from './../../../../../../cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component';
-import { ActiveRouteCfOrgSpace } from './../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
-import { generateCfBaseTestModules, generateTestCfEndpointServiceProvider } from '../../../../../../cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper';
+import { createBasicStoreModule } from '../../../../../../store/testing/public-api';
+import { CoreTestingModule } from '../../../../../test-framework/core-test.modules';
+import { CoreModule } from '../../../../core/core.module';
+import { SharedModule } from './../../../../shared/shared.module';
+import { EditEndpointStepComponent } from './edit-endpoint-step.component';
 
-describe('EditOrganizationStepComponent', () => {
-  let component: EditOrganizationStepComponent;
-  let fixture: ComponentFixture<EditOrganizationStepComponent>;
+describe('EditEndpointStepComponent', () => {
+  let component: EditEndpointStepComponent;
+  let fixture: ComponentFixture<EditEndpointStepComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [EditOrganizationStepComponent],
-      imports: generateCfBaseTestModules(),
-      providers: [ActiveRouteCfOrgSpace, generateTestCfEndpointServiceProvider()]
+      declarations: [EditEndpointStepComponent],
+      imports: [
+        CoreTestingModule,
+        createBasicStoreModule(),
+        CommonModule,
+        CoreModule,
+        SharedModule,
+      ],
+      providers: [
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              params: { id: 'guid' }
+            }
+          }
+        },
+      ]
     })
       .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(EditOrganizationStepComponent);
+    fixture = TestBed.createComponent(EditEndpointStepComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
@@ -26,4 +45,8 @@ describe('EditOrganizationStepComponent', () => {
   it('should create', () => {
     expect(component).toBeTruthy();
   });
+
+  afterAll(() => {
+    component.ngOnDestroy();
+  });
 });
diff --git a/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts b/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts
index de64bcea67..5e5f090998 100644
--- a/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts
@@ -82,7 +82,10 @@ export class EditEndpointStepComponent implements OnDestroy, IStepperStep {
     );
 
     // Fill the form in with the endpoint data
-    this.endpoint$.pipe(first()).subscribe(endpoint => {
+    this.endpoint$.pipe(
+      filter(ep => !!ep),
+      first()
+    ).subscribe(endpoint => {
       this.setAdvancedFields(endpoint);
       this.editEndpoint.setValue({
         name: endpoint.name,
@@ -152,9 +155,10 @@ export class EditEndpointStepComponent implements OnDestroy, IStepperStep {
 
   // Only show the Client ID and Client Secret fields if the endpoint type is Cloud Foundry
   setAdvancedFields(endpoint: any) {
-    this.showAdvancedFields = endpoint.cnsi_type === 'cf';
+    const isCloudFoundry = endpoint && endpoint.cnsi_type === 'cf';
+    this.showAdvancedFields = isCloudFoundry;
     // Only allow SSL if the endpoint type is Cloud Foundry
-    this.endpointTypeSupportsSSO = endpoint.cnsi_type === 'cf';
+    this.endpointTypeSupportsSSO = isCloudFoundry;
   }
 
 }
diff --git a/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint.component.spec.ts b/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint.component.spec.ts
index c3db68ed45..9b94a55029 100644
--- a/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint.component.spec.ts
+++ b/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint.component.spec.ts
@@ -1,28 +1,49 @@
+import { CommonModule } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 
-import { ActiveRouteCfOrgSpace } from './../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
-import { EditOrganizationStepComponent } from './../../../../../cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component';
-import { EditOrganizationComponent } from './../../../../../cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization.component';
-import { generateCfBaseTestModules, generateTestCfEndpointServiceProvider } from '../../../../../cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper';
-
+import { createBasicStoreModule } from '../../../../../store/testing/public-api';
 import { TabNavService } from '../../../../tab-nav.service';
+import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
+import { CoreModule } from '../../../core/core.module';
+import { SharedModule } from '../../../shared/shared.module';
+import { EditEndpointStepComponent } from './edit-endpoint-step/edit-endpoint-step.component';
+import { EditEndpointComponent } from './edit-endpoint.component';
 
-describe('EditOrganizationComponent', () => {
-  let component: EditOrganizationComponent;
-  let fixture: ComponentFixture<EditOrganizationComponent>;
+describe('EditEndpointComponent', () => {
+  let component: EditEndpointComponent;
+  let fixture: ComponentFixture<EditEndpointComponent>;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [EditOrganizationComponent, EditOrganizationStepComponent],
-      imports: generateCfBaseTestModules(),
-      providers: [ActiveRouteCfOrgSpace, generateTestCfEndpointServiceProvider(), TabNavService]
-
+      declarations: [EditEndpointComponent, EditEndpointStepComponent],
+      imports: [
+        CoreTestingModule,
+        createBasicStoreModule(),
+        CommonModule,
+        CoreModule,
+        SharedModule,
+        RouterTestingModule,
+      ],
+      providers: [
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              params: { id: 'guid' },
+              queryParams: { breadcrumbs: '' }
+            }
+          }
+        },
+        TabNavService
+      ]
     })
       .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(EditOrganizationComponent);
+    fixture = TestBed.createComponent(EditEndpointComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

From 8fac8f0185a4a611524522ac22495f08e598764a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 6 May 2020 20:28:37 +0100
Subject: [PATCH 071/176] More moves

---
 .../cf-app-autoscaler-events-data-source.ts           |  2 +-
 .../app-autoscaler-metric-chart-data-source.ts        |  2 +-
 .../src/features/cloud-foundry/cf.helpers.ts          |  8 --------
 .../manage-users-modify.component.ts                  |  2 +-
 .../app-service-binding-data-source.ts                |  2 +-
 .../list/list-types/app/cf-apps-data-source.ts        |  3 ++-
 .../cf-buildpacks/cf-buildpacks-data-source.ts        |  7 +++----
 .../list-types/cf-events/cf-events-data-source.ts     |  4 ++--
 .../list-types/cf-orgs/cf-orgs-data-source.service.ts |  2 +-
 .../cf-quotas/cf-quotas-data-source.service.ts        |  2 +-
 .../cf-routes/cf-routes-data-source-base.ts           |  3 ++-
 .../cf-security-groups-data-source.ts                 |  5 ++---
 .../cf-select-users-data-source.service.ts            |  2 +-
 .../list-types/cf-services/cf-services-data-source.ts |  6 +++---
 .../cf-space-apps-data-source.service.ts              |  6 +++---
 .../cf-space-quotas-data-source.service.ts            |  2 +-
 .../cf-spaces-service-instances-data-source.ts        |  2 +-
 .../cf-spaces-user-service-instances-data-source.ts   |  9 +++++----
 .../cf-spaces/cf-spaces-data-source.service.ts        |  6 +++---
 .../list-types/cf-stacks/cf-stacks-data-source.ts     |  8 ++++----
 .../cf-users-space-roles-data-source.service.ts       |  2 +-
 .../cf-users/cf-user-data-source.service.ts           |  2 +-
 .../list-types/detach-apps/detach-apps-data-source.ts |  6 +++---
 .../service-instances-data-source.ts                  |  2 +-
 .../service-plans/service-plans-data-source.ts        |  2 +-
 .../service-instances-wall-data-source.ts             |  2 +-
 .../table-cell-request-monitor-icon.component.ts      |  3 +--
 .../src/shared/components/list/list.component.spec.ts |  3 +--
 .../packages/store/src/helpers/store-helpers.ts       | 11 ++++++++++-
 src/frontend/packages/store/src/public-api.ts         |  3 +++
 30 files changed, 61 insertions(+), 58 deletions(-)

diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts
index 3305480068..22d2449f95 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-data-source.ts
@@ -1,7 +1,7 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
-import { getRowMetadata } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import { ListDataSource } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
 import { MetricsRangeSelectorService } from '../../../../../core/src/shared/services/metrics-range-selector.service';
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts
index e33e839e12..bbff81af73 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-data-source.ts
@@ -1,7 +1,7 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
-import { getRowMetadata } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import { ListDataSource } from '../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../core/src/shared/components/list/list.component.types';
 import { MetricsRangeSelectorService } from '../../../../../core/src/shared/services/metrics-range-selector.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts
index bcdf93556a..a4160264fe 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts
@@ -33,7 +33,6 @@ import {
 import { SetClientFilter } from '../../../../store/src/actions/pagination.actions';
 import { RouterNav } from '../../../../store/src/actions/router.actions';
 import { AppState } from '../../../../store/src/app-state';
-import { MultiActionListEntity } from '../../../../store/src/monitors/pagination-monitor';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { endpointEntitiesSelector } from '../../../../store/src/selectors/endpoint.selectors';
@@ -215,13 +214,6 @@ function hasRole(user: CfUser, guid: string, roleType: string) {
   return false;
 }
 
-export const getRowMetadata = (entity: APIResource | MultiActionListEntity) => {
-  if (entity instanceof MultiActionListEntity) {
-    return entity.entity.metadata ? entity.entity.metadata.guid : null;
-  }
-  return entity.metadata ? entity.metadata.guid : null;
-};
-
 export function getActiveRouteCfOrgSpace(activatedRoute: ActivatedRoute) {
   return ({
     cfGuid: getIdFromRoute(activatedRoute, 'endpointId'),
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.ts
index a0459b25b0..a65366f5d0 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.ts
@@ -12,6 +12,7 @@ import {
 } from '@angular/core';
 import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 import { BehaviorSubject, combineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
 import {
   catchError,
@@ -50,7 +51,6 @@ import {
 } from '../../../../../shared/components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component';
 import { CfUser, OrgUserRoleNames } from '../../../../../store/types/user.types';
 import { ActiveRouteCfOrgSpace } from '../../../cf-page.types';
-import { getRowMetadata } from '../../../cf.helpers';
 import { CfRolesService } from '../cf-roles.service';
 import { SpaceRolesListWrapperComponent } from './space-roles-list-wrapper/space-roles-list-wrapper.component';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-data-source.ts
index d416ccbe40..c4062835e6 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-data-source.ts
@@ -1,4 +1,5 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
@@ -13,7 +14,6 @@ import {
   createEntityRelationPaginationKey,
 } from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { ApplicationService } from '../../../../../../../cloud-foundry/src/features/applications/application.service';
-import { getRowMetadata } from '../../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-apps-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-apps-data-source.ts
index f20011ad2b..eb6e0b65fe 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-apps-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-apps-data-source.ts
@@ -1,4 +1,5 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 import { Subscription } from 'rxjs';
 import { tag } from 'rxjs-spy/operators/tag';
 import { debounceTime, delay, distinctUntilChanged, map, withLatestFrom } from 'rxjs/operators';
@@ -29,7 +30,7 @@ import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginationParam } from '../../../../../../../store/src/types/pagination.types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
-import { cfOrgSpaceFilter, getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
+import { cfOrgSpaceFilter } from '../../../../../features/cloud-foundry/cf.helpers';
 import { CFListDataSource } from '../../../../cf-list-data-source';
 import { createCfOrSpaceMultipleFilterFn } from '../../../../data-services/cf-org-space-service.service';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-data-source.ts
index 240c641023..a4b80071a5 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-buildpacks/cf-buildpacks-data-source.ts
@@ -1,6 +1,6 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 
-import { FetchAllBuildpacks } from '../../../../../../../cloud-foundry/src/actions/buildpack.action';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { buildpackEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
 import {
@@ -10,13 +10,12 @@ import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
-import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
-import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
 
 export class CfBuildpacksDataSource extends ListDataSource<APIResource> {
   constructor(store: Store<CFAppState>, cfGuid: string, listConfig?: IListConfig<APIResource>) {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/cf-events-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/cf-events-data-source.ts
index 42368617ee..ecd9e100b1 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/cf-events-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/cf-events-data-source.ts
@@ -1,4 +1,5 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 
 import {
   ListDataSource,
@@ -7,12 +8,11 @@ import { IListConfig } from '../../../../../../../core/src/shared/components/lis
 import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { IEntityMetadata } from '../../../../../../../store/src/entity-catalog/entity-catalog.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CFAppState } from '../../../../../cf-app-state';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { cfEventEntityType } from '../../../../../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CfEventActionBuilders } from '../../../../../entity-action-builders/cf-event.action-builders';
-import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 import { QParam, QParamJoiners } from '../../../../q-param';
 
 export class CfEventsDataSource extends ListDataSource<APIResource> {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-orgs-data-source.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-orgs-data-source.service.ts
index f4ab223495..9149423b08 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-orgs-data-source.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-orgs-data-source.service.ts
@@ -1,4 +1,5 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { organizationEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
@@ -8,7 +9,6 @@ import {
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
-import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 import { CloudFoundryEndpointService } from '../../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
 
 export class CfOrgsDataSourceService extends ListDataSource<APIResource> {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/cf-quotas-data-source.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/cf-quotas-data-source.service.ts
index 476e90fe2a..09c980b0d2 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/cf-quotas-data-source.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-quotas/cf-quotas-data-source.service.ts
@@ -1,4 +1,5 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 import { of } from 'rxjs';
 import { distinctUntilChanged, map } from 'rxjs/operators';
 
@@ -17,7 +18,6 @@ import { CFAppState } from '../../../../../cf-app-state';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { quotaDefinitionEntityType } from '../../../../../cf-entity-types';
 import { createEntityRelationPaginationKey } from '../../../../../entity-relations/entity-relations.types';
-import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 
 export class CfQuotasDataSourceService extends ListDataSource<APIResource> {
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source-base.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source-base.ts
index 21194e6800..a3387ad2c1 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source-base.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/cf-routes-data-source-base.ts
@@ -1,4 +1,5 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 import { combineLatest, Observable, Subscription } from 'rxjs';
 import { map, switchMap, tap } from 'rxjs/operators';
 
@@ -21,7 +22,7 @@ import { IRoute } from '../../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { getRoute, isTCPRoute } from '../../../../../features/applications/routes/routes.helper';
-import { cfOrgSpaceFilter, getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
+import { cfOrgSpaceFilter } from '../../../../../features/cloud-foundry/cf.helpers';
 import { CFListDataSource } from '../../../../cf-list-data-source';
 import { createCfOrSpaceMultipleFilterFn } from '../../../../data-services/cf-org-space-service.service';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-data-source.ts
index 670afdb18c..fe3f9c79d5 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-security-groups/cf-security-groups-data-source.ts
@@ -1,6 +1,6 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 
-import { GetAllSecurityGroups } from '../../../../../../../cloud-foundry/src/actions/security-groups-actions';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { securityGroupEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
 import {
@@ -10,11 +10,10 @@ import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
-import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 
 export class CfSecurityGroupsDataSource extends ListDataSource<APIResource> {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-select-users/cf-select-users-data-source.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-select-users/cf-select-users-data-source.service.ts
index 670ee1ba62..e30ec5e1bc 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-select-users/cf-select-users-data-source.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-select-users/cf-select-users-data-source.service.ts
@@ -1,4 +1,5 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { cfUserEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
@@ -12,7 +13,6 @@ import { IListConfig } from '../../../../../../../core/src/shared/components/lis
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
-import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 
 export class CfSelectUsersDataSourceService extends ListDataSource<APIResource> {
   constructor(
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-data-source.ts
index 651f3bd158..3aca176f75 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-data-source.ts
@@ -1,20 +1,20 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { serviceEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
 import {
   createEntityRelationPaginationKey,
 } from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { endpointSchemaKey } from '../../../../../../../store/src/helpers/entity-factory';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginationEntityState } from '../../../../../../../store/src/types/pagination.types';
-import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
+import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 
 export class CfServicesDataSource extends ListDataSource<APIResource> {
   constructor(store: Store<CFAppState>, endpointGuid: string, listConfig?: IListConfig<APIResource>) {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-data-source.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-data-source.service.ts
index f7721a1783..730eade50a 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-data-source.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-data-source.service.ts
@@ -1,20 +1,20 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { applicationEntityType, spaceEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
 import {
   createEntityRelationPaginationKey,
 } from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
-import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
+import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service';
 
 export class CfSpaceAppsDataSource extends ListDataSource<APIResource> {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-data-source.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-data-source.service.ts
index 38f5b495c3..39cc613e32 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-data-source.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-quotas/cf-space-quotas-data-source.service.ts
@@ -1,4 +1,5 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 import { of } from 'rxjs';
 import { distinctUntilChanged, map } from 'rxjs/operators';
 
@@ -17,7 +18,6 @@ import { CFAppState } from '../../../../../cf-app-state';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { spaceQuotaEntityType } from '../../../../../cf-entity-types';
 import { createEntityRelationPaginationKey } from '../../../../../entity-relations/entity-relations.types';
-import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 
 export class CfOrgSpaceQuotasDataSourceService extends ListDataSource<APIResource> {
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-data-source.ts
index 0635f65e7a..cb02cdb49d 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-data-source.ts
@@ -1,4 +1,5 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
@@ -24,7 +25,6 @@ import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { ServiceInstanceActionBuilders } from '../../../../../entity-action-builders/service-instance.action.builders';
-import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 
 export class CfSpacesServiceInstancesDataSource extends ListDataSource<APIResource> {
   constructor(cfGuid: string, spaceGuid: string, store: Store<CFAppState>, listConfig?: IListConfig<APIResource>) {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-user-service-instances-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-user-service-instances-data-source.ts
index b444fefc85..027775bc80 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-user-service-instances-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-user-service-instances-data-source.ts
@@ -1,6 +1,6 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 
-import { GetAllUserProvidedServices } from '../../../../../../../cloud-foundry/src/actions/user-provided-service.actions';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
   applicationEntityType,
@@ -21,12 +21,13 @@ import {
   defaultPaginationPageSizeOptionsTable,
   IListConfig,
 } from '../../../../../../../core/src/shared/components/list/list.component.types';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
-import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
-import { UserProvidedServiceActionBuilder } from '../../../../../entity-action-builders/user-provided-service.action-builders';
+import {
+  UserProvidedServiceActionBuilder,
+} from '../../../../../entity-action-builders/user-provided-service.action-builders';
 
 export class CfSpacesUserServiceInstancesDataSource extends ListDataSource<APIResource> {
   constructor(cfGuid: string, spaceGuid: string, store: Store<CFAppState>, listConfig?: IListConfig<APIResource>) {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-spaces-data-source.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-spaces-data-source.service.ts
index 21e1121ab9..665b29e9ce 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-spaces-data-source.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-spaces-data-source.service.ts
@@ -1,4 +1,5 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
@@ -14,12 +15,11 @@ import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
+import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
-import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
-import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
 
 export class CfSpacesDataSourceService extends ListDataSource<APIResource> {
   constructor(cfGuid: string, orgGuid: string, store: Store<CFAppState>, listConfig?: IListConfig<APIResource>) {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-data-source.ts
index 1a0c89eab6..6785fc1099 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-stacks/cf-stacks-data-source.ts
@@ -1,18 +1,18 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from '../../../../../../../store/src/entity-catalog/entity-catalog.types';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { IEntityMetadata } from '../../../../../../../store/src/entity-catalog/entity-catalog.types';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { stackEntityType } from '../../../../../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { StackActionBuilders } from '../../../../../entity-action-builders/stack-action-builders';
-import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 
 export class CfStacksDataSource extends ListDataSource<APIResource> {
   constructor(store: Store<CFAppState>, cfGuid: string, listConfig?: IListConfig<APIResource>) {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-data-source.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-data-source.service.ts
index 97b79c7098..a922ee27b8 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-data-source.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-data-source.service.ts
@@ -1,4 +1,5 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 
 import { GetAllOrganizationSpacesWithOrgs } from '../../../../../../../cloud-foundry/src/actions/organization.actions';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
@@ -16,7 +17,6 @@ import { IListConfig } from '../../../../../../../core/src/shared/components/lis
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginationEntityState } from '../../../../../../../store/src/types/pagination.types';
 import { ISpace } from '../../../../../cf-api.types';
-import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 import { CfRolesService } from '../../../../../features/cloud-foundry/users/manage-users/cf-roles.service';
 
 export class CfUsersSpaceRolesDataSourceService extends ListDataSource<APIResource<ISpace>> {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-data-source.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-data-source.service.ts
index 2ea98c7d1d..73462af393 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-data-source.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-data-source.service.ts
@@ -1,4 +1,5 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { cfUserEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
@@ -10,7 +11,6 @@ import { ListConfig } from '../../../../../../../core/src/shared/components/list
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginatedAction, PaginationEntityState } from '../../../../../../../store/src/types/pagination.types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
-import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 import { UserListUsersVisible, userListUserVisibleKey } from './cf-user-list-helpers';
 
 function createUserVisibilityFilter(userHasRoles: (user: CfUser) => boolean):
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-data-source.ts
index 6006fc1d0a..ce942d1687 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/detach-apps/detach-apps-data-source.ts
@@ -1,20 +1,20 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 
 import {
   createEntityRelationPaginationKey,
 } from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import {
   ListDataSource,
 } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CFAppState } from '../../../../../cf-app-state';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { serviceBindingEntityType, serviceBindingNoBindingsEntityType } from '../../../../../cf-entity-types';
-import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
+import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 
 export class DetachAppsDataSource extends ListDataSource<APIResource> {
   constructor(cfGuid: string, serviceInstanceGuid: string, store: Store<CFAppState>, listConfig?: IListConfig<APIResource>) {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-data-source.ts
index 09bb9e0867..6d97e7c9c9 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-instances/service-instances-data-source.ts
@@ -1,4 +1,5 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
@@ -17,7 +18,6 @@ import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginationEntityState } from '../../../../../../../store/src/types/pagination.types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
-import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 
 export class ServiceInstancesDataSource extends ListDataSource<APIResource> {
   constructor(cfGuid: string, serviceGuid: string, store: Store<CFAppState>, listConfig?: IListConfig<APIResource>) {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/service-plans-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/service-plans-data-source.ts
index 0d4e0fee86..a9bdad8370 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/service-plans-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/service-plans/service-plans-data-source.ts
@@ -1,4 +1,5 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import {
@@ -10,7 +11,6 @@ import {
   createEntityRelationKey,
   createEntityRelationPaginationKey,
 } from '../../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
-import { getRowMetadata } from '../../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import {
   populateServicePlanExtraTyped,
 } from '../../../../../../../cloud-foundry/src/features/service-catalog/services-helper';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-data-source.ts
index 57ffd72bc7..7ad73d92d3 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instances-wall-data-source.ts
@@ -1,4 +1,5 @@
 import { Store } from '@ngrx/store';
+import { getRowMetadata } from '@stratos/store';
 
 import { GetAllUserProvidedServices } from '../../../../../../../cloud-foundry/src/actions/user-provided-service.actions';
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
@@ -20,7 +21,6 @@ import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginatedAction, PaginationParam } from '../../../../../../../store/src/types/pagination.types';
 import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { ServiceInstanceActionBuilders } from '../../../../../entity-action-builders/service-instance.action.builders';
-import { getRowMetadata } from '../../../../../features/cloud-foundry/cf.helpers';
 import { CFListDataSource } from '../../../../cf-list-data-source';
 import { createCfOrSpaceMultipleFilterFn } from '../../../../data-services/cf-org-space-service.service';
 
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-request-monitor-icon/table-cell-request-monitor-icon.component.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-request-monitor-icon/table-cell-request-monitor-icon.component.ts
index db2cb2883e..6bb2311dfb 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-request-monitor-icon/table-cell-request-monitor-icon.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-request-monitor-icon/table-cell-request-monitor-icon.component.ts
@@ -1,7 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { schema } from 'normalizr';
+import { getRowMetadata } from '@stratos/store';
 
-import { getRowMetadata } from '../../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import { EntitySchema } from '../../../../../../../store/src/helpers/entity-schema';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { AppMonitorComponentTypes } from '../../../app-action-monitor-icon/app-action-monitor-icon.component';
diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list.component.spec.ts
index adebf67719..6a7ce0ac11 100644
--- a/src/frontend/packages/core/src/shared/components/list/list.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list.component.spec.ts
@@ -6,7 +6,6 @@ import { createBasicStoreModule } from '@stratos/store/testing';
 import { BehaviorSubject, of as observableOf } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 
-import { ApplicationStateService } from '../../../../../cloud-foundry/src/shared/services/application-state.service';
 import { ListView } from '../../../../../store/src/actions/list.actions';
 import { GeneralAppState } from '../../../../../store/src/app-state';
 import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
@@ -123,7 +122,7 @@ describe('ListComponent', () => {
       TestBed.configureTestingModule({
         providers: [
           { provide: ListConfig, useClass: EndpointsListConfigService },
-          ApplicationStateService,
+          // ApplicationStateService,
           PaginationMonitorFactory,
           EntityMonitorFactory,
           EndpointListHelper
diff --git a/src/frontend/packages/store/src/helpers/store-helpers.ts b/src/frontend/packages/store/src/helpers/store-helpers.ts
index eae4f97a71..15f69e72db 100644
--- a/src/frontend/packages/store/src/helpers/store-helpers.ts
+++ b/src/frontend/packages/store/src/helpers/store-helpers.ts
@@ -2,9 +2,11 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
+import { IFavoritesInfo } from '../../../core/src/core/user-favorite-manager';
 import { AppState } from '../app-state';
+import { MultiActionListEntity } from '../monitors/pagination-monitor';
 import { errorFetchingFavoritesSelector, fetchingFavoritesSelector } from '../selectors/favorite-groups.selectors';
-import { IFavoritesInfo } from '../../../core/src/core/user-favorite-manager';
+import { APIResource } from '../types/api.types';
 
 
 export function getDashboardStateSessionId(username?: string) {
@@ -30,3 +32,10 @@ export function getFavoriteInfoObservable(store: Store<AppState>): Observable<IF
     }))
   );
 }
+
+export const getRowMetadata = (entity: APIResource | MultiActionListEntity) => {
+  if (entity instanceof MultiActionListEntity) {
+    return entity.entity.metadata ? entity.entity.metadata.guid : null;
+  }
+  return entity.metadata ? entity.metadata.guid : null;
+};
diff --git a/src/frontend/packages/store/src/public-api.ts b/src/frontend/packages/store/src/public-api.ts
index 3977ce3af7..ac373eccf4 100644
--- a/src/frontend/packages/store/src/public-api.ts
+++ b/src/frontend/packages/store/src/public-api.ts
@@ -1,3 +1,6 @@
 /*
  * Public API Surface of store
  */
+
+ // Helpers
+ export * from './helpers/store-helpers';

From 17780e1a6ce540fdcefbae9d3299240d0523bbd8 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 6 May 2020 20:43:11 +0100
Subject: [PATCH 072/176] Move serice instance last op

---
 .../src/shared/components/components.module.ts              | 4 +---
 .../table-cell-service-last-op.component.spec.ts            | 4 +---
 .../table-cell-service/table-cell-service.component.spec.ts | 4 +---
 .../service-instance-card.component.spec.ts                 | 4 +---
 .../service-instance-last-op.component.html                 | 0
 .../service-instance-last-op.component.scss                 | 0
 .../service-instance-last-op.component.spec.ts              | 6 ++++--
 .../service-instance-last-op.component.ts                   | 4 +---
 8 files changed, 9 insertions(+), 17 deletions(-)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/service-instance-last-op/service-instance-last-op.component.html (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/service-instance-last-op/service-instance-last-op.component.scss (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/service-instance-last-op/service-instance-last-op.component.spec.ts (84%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/service-instance-last-op/service-instance-last-op.component.ts (77%)

diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts b/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
index 72093e3d2b..b51c66d8c1 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
@@ -4,9 +4,6 @@ import { MaterialDesignFrameworkModule } from 'stratos-angular6-json-schema-form
 
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { CardCell, TableCellCustom } from '../../../../core/src/shared/components/list/list.types';
-import {
-  ServiceInstanceLastOpComponent,
-} from '../../../../core/src/shared/components/service-instance-last-op/service-instance-last-op.component';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
 import { AppNameUniqueDirective } from '../directives/app-name-unique.directive/app-name-unique.directive';
 import {
@@ -178,6 +175,7 @@ import { RunningInstancesComponent } from './running-instances/running-instances
 import { SchemaFormComponent } from './schema-form/schema-form.component';
 import { SelectServiceComponent } from './select-service/select-service.component';
 import { ServiceIconComponent } from './service-icon/service-icon.component';
+import { ServiceInstanceLastOpComponent } from './service-instance-last-op/service-instance-last-op.component';
 import { ServicePlanPriceComponent } from './service-plan-price/service-plan-price.component';
 import { ServicePlanPublicComponent } from './service-plan-public/service-plan-public.component';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.spec.ts
index 962d651039..00239ea2a1 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component.spec.ts
@@ -3,11 +3,9 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import {
   BooleanIndicatorComponent,
 } from '../../../../../../../../core/src/shared/components/boolean-indicator/boolean-indicator.component';
-import {
-  ServiceInstanceLastOpComponent,
-} from '../../../../../../../../core/src/shared/components/service-instance-last-op/service-instance-last-op.component';
 import { BaseTestModulesNoShared } from '../../../../../../../../core/test-framework/core-test.helper';
 import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
+import { ServiceInstanceLastOpComponent } from '../../../../service-instance-last-op/service-instance-last-op.component';
 import { TableCellServiceLastOpComponent } from './table-cell-service-last-op.component';
 
 describe('TableCellServiceLastOpComponent', () => {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.spec.ts
index 16b9fb172e..15388cb1ce 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.spec.ts
@@ -9,10 +9,8 @@ import {
 import {
   BooleanIndicatorComponent,
 } from '../../../../../../../../core/src/shared/components/boolean-indicator/boolean-indicator.component';
-import {
-  ServiceInstanceLastOpComponent,
-} from '../../../../../../../../core/src/shared/components/service-instance-last-op/service-instance-last-op.component';
 import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
+import { ServiceInstanceLastOpComponent } from '../../../../service-instance-last-op/service-instance-last-op.component';
 import { TableCellServiceComponent } from './table-cell-service.component';
 
 describe('TableCellServiceComponent', () => {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.spec.ts
index 0b2af1db9c..ff9a0a7b84 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.spec.ts
@@ -1,8 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import {
-  ServiceInstanceLastOpComponent,
-} from '../../../../../../../../core/src/shared/components/service-instance-last-op/service-instance-last-op.component';
 import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
@@ -10,6 +7,7 @@ import { generateCfBaseTestModules } from '../../../../../../../test-framework/c
 import { ServicesWallService } from '../../../../../../features/services/services/services-wall.service';
 import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service';
 import { CfOrgSpaceLinksComponent } from '../../../../cf-org-space-links/cf-org-space-links.component';
+import { ServiceInstanceLastOpComponent } from '../../../../service-instance-last-op/service-instance-last-op.component';
 import {
   TableCellServiceBindableComponent,
 } from '../../cf-services/table-cell-service-bindable/table-cell-service-bindable.component';
diff --git a/src/frontend/packages/core/src/shared/components/service-instance-last-op/service-instance-last-op.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/service-instance-last-op/service-instance-last-op.component.html
similarity index 100%
rename from src/frontend/packages/core/src/shared/components/service-instance-last-op/service-instance-last-op.component.html
rename to src/frontend/packages/cloud-foundry/src/shared/components/service-instance-last-op/service-instance-last-op.component.html
diff --git a/src/frontend/packages/core/src/shared/components/service-instance-last-op/service-instance-last-op.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/service-instance-last-op/service-instance-last-op.component.scss
similarity index 100%
rename from src/frontend/packages/core/src/shared/components/service-instance-last-op/service-instance-last-op.component.scss
rename to src/frontend/packages/cloud-foundry/src/shared/components/service-instance-last-op/service-instance-last-op.component.scss
diff --git a/src/frontend/packages/core/src/shared/components/service-instance-last-op/service-instance-last-op.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/service-instance-last-op/service-instance-last-op.component.spec.ts
similarity index 84%
rename from src/frontend/packages/core/src/shared/components/service-instance-last-op/service-instance-last-op.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/service-instance-last-op/service-instance-last-op.component.spec.ts
index 08d78f240a..9a29b6dc57 100644
--- a/src/frontend/packages/core/src/shared/components/service-instance-last-op/service-instance-last-op.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/service-instance-last-op/service-instance-last-op.component.spec.ts
@@ -1,7 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { BaseTestModulesNoShared } from '../../../../test-framework/core-test.helper';
-import { BooleanIndicatorComponent } from '../boolean-indicator/boolean-indicator.component';
+import {
+  BooleanIndicatorComponent,
+} from '../../../../../core/src/shared/components/boolean-indicator/boolean-indicator.component';
+import { BaseTestModulesNoShared } from '../../../../../core/test-framework/core-test.helper';
 import { ServiceInstanceLastOpComponent } from './service-instance-last-op.component';
 
 describe('ServiceInstanceLastOpComponent', () => {
diff --git a/src/frontend/packages/core/src/shared/components/service-instance-last-op/service-instance-last-op.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/service-instance-last-op/service-instance-last-op.component.ts
similarity index 77%
rename from src/frontend/packages/core/src/shared/components/service-instance-last-op/service-instance-last-op.component.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/service-instance-last-op/service-instance-last-op.component.ts
index 42bc95634e..6b61fd014b 100644
--- a/src/frontend/packages/core/src/shared/components/service-instance-last-op/service-instance-last-op.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/service-instance-last-op/service-instance-last-op.component.ts
@@ -1,9 +1,7 @@
 import { Component, Input } from '@angular/core';
 
-import { IServiceInstance } from '../../../../../cloud-foundry/src/cf-api-svc.types';
 import { APIResource } from '../../../../../store/src/types/api.types';
-
-// TODO: Move CF code to CF Module #3769
+import { IServiceInstance } from '../../../cf-api-svc.types';
 
 @Component({
   selector: 'app-service-instance-last-op',

From 3daf8ab08a2e40b0a184edc0f31e00f221de3a07 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Thu, 7 May 2020 08:13:37 +0100
Subject: [PATCH 073/176] Fix disabling of polling (#4260)

- fixes #4244
---
 .../user-profile/profile-info/profile-info.component.html       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.html b/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.html
index 0eca5d5d7d..c08c7704c5 100644
--- a/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.html
+++ b/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.html
@@ -86,7 +86,7 @@ <h1>User Profile</h1>
             [ngClass]="{'user-profile__option-warning': pollingEnabled === 'false'}">
             <div class="user-profile__option-inner">
               <mat-slide-toggle color="warn" [checked]="pollingEnabled === 'false'"
-                (change)="updatePolling(timeoutSession)">
+                (change)="updatePolling(pollingEnabled)">
                 <div class="user-profile__option-header">Disable polling
                   <mat-icon *ngIf="pollingEnabled === 'false'" #tooltip="matTooltip"
                     matTooltip="Polling is disabled, some pages may not automatically update."

From 535a040de574adf2493b1dd13157c86b43aab105 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 7 May 2020 08:14:09 +0100
Subject: [PATCH 074/176] Add Helm 3 lint check to the Travis Helm Chart job
 (#4263)

* Helm Chart: Fix Helm 3 compatibility with Release.Time

* Add helm 3 lint
---
 deploy/ci/travis/helm-chart-unit-tests.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/deploy/ci/travis/helm-chart-unit-tests.sh b/deploy/ci/travis/helm-chart-unit-tests.sh
index aa1d106565..a98d0d694e 100755
--- a/deploy/ci/travis/helm-chart-unit-tests.sh
+++ b/deploy/ci/travis/helm-chart-unit-tests.sh
@@ -24,3 +24,15 @@ helm unittest console
 
 # Run lint
 helm lint console
+
+# Run helm3 lint as well
+echo "Installing Helm 3"
+export BINARY_NAME=helm3
+curl -fsSL -o get_helm3.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3
+chmod 700 get_helm3.sh
+./get_helm3.sh
+
+# RUn Helm 3 lint
+helm3 lint console
+
+echo "All done"

From 178a4242b5f123780cfeb78772443554e670624a Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 7 May 2020 10:00:37 +0100
Subject: [PATCH 075/176] Increase users table page size before searching for
 `e2e` user

---
 src/test-e2e/application/application-autoscaler-e2e.spec.ts | 2 +-
 src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test-e2e/application/application-autoscaler-e2e.spec.ts b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
index 973fb97ff2..2ba7f2faf6 100644
--- a/src/test-e2e/application/application-autoscaler-e2e.spec.ts
+++ b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
@@ -19,7 +19,7 @@ import { PageAutoscalerMetricBase } from './po/page-autoscaler-metric-base.po';
 
 let applicationE2eHelper: ApplicationE2eHelper;
 
-fdescribe('Autoscaler -', () => {
+describe('Autoscaler -', () => {
 
   beforeAll(() => {
     const setup = e2e.setup(ConsoleUserType.user)
diff --git a/src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts b/src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts
index f2fdc7f861..f1dfc8851f 100644
--- a/src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts
@@ -58,6 +58,7 @@ describe('Manage Users Stepper', () => {
     cfPage.goToUsersTab();
 
     const usersTable = new CFUsersListComponent();
+    usersTable.pagination.setPageSize('80', 'mat-select-3')
     usersTable.header.setSearchText(userName);
     let usersRow = -1;
     usersTable.table.findRow('username', userName)

From eb71605aaedc2b14408f2923d99089290faee40a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 7 May 2020 10:28:30 +0100
Subject: [PATCH 076/176] Helm node selector docs and values (#4264)

* Add nodeSelector template and tests

Add nodeSelector template to the helm deployment:
- deployment.yaml
- database.yaml
- config-init.yaml

Add tests to validate nodeSelector template to
- deployment_test.yaml

Create tests to validate nodeSelector template to
- database_test.yaml
- config_init_test.yaml

* Add c&p fix and another nodeSelector test

Add fix for c&p bug to
- database.yaml
- deployment.yaml

Add test to validate nodeSelector template to
- config_init_test.yaml

Add test config to
- database-test.yaml
- deployment-test.yaml

* Remove test

Remove test to validate nodeSelector template to
    - config_init_test.yaml

* More gates on node selector. Added to values.yaml and README

Co-authored-by: Johannes Jungkunst <macevil@gmail.com>
---
 deploy/kubernetes/console/README.md                  | 3 +++
 deploy/kubernetes/console/templates/config-init.yaml | 4 +++-
 deploy/kubernetes/console/templates/database.yaml    | 4 +++-
 deploy/kubernetes/console/templates/deployment.yaml  | 4 +++-
 deploy/kubernetes/console/values.yaml                | 9 +++++++++
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/deploy/kubernetes/console/README.md b/deploy/kubernetes/console/README.md
index 721aed86cf..dee1153dd4 100644
--- a/deploy/kubernetes/console/README.md
+++ b/deploy/kubernetes/console/README.md
@@ -115,6 +115,9 @@ The following table lists the configurable parameters of the Stratos Helm chart
 |console.service.extraLabels|Additional labels to be added to all service resources||
 |console.service.ingress.annotations|Annotations to be added to the ingress resource||
 |console.service.ingress.extraLabels|Additional labels to be added to the ingress resource||
+|console.nodeSelector|Node selectors to use for the console Pod||
+|mariadb.nodeSelector|Node selectors to use for the database Pod||
+|configInit.nodeSelector|Node selectors to use for the configuration Pod||
 
 ## Accessing the Console
 
diff --git a/deploy/kubernetes/console/templates/config-init.yaml b/deploy/kubernetes/console/templates/config-init.yaml
index 4653fa4184..e6d2f3582a 100644
--- a/deploy/kubernetes/console/templates/config-init.yaml
+++ b/deploy/kubernetes/console/templates/config-init.yaml
@@ -95,8 +95,10 @@ spec:
 {{- end }}
     spec:
 {{- if .Values.configInit }}
+{{- if .Values.configInit.nodeSelector }}
       nodeSelector:
-{{ toYaml .Values.configInit.nodeSelector | indent 8 }}
+{{ toYaml .Values.configInit.nodeSelector | trim  | indent 8 }}
+{{- end }}
 {{- end }}
       containers:
       - env:
diff --git a/deploy/kubernetes/console/templates/database.yaml b/deploy/kubernetes/console/templates/database.yaml
index 3ce1c6026a..2f23173f49 100644
--- a/deploy/kubernetes/console/templates/database.yaml
+++ b/deploy/kubernetes/console/templates/database.yaml
@@ -50,8 +50,10 @@ spec:
         {{- end}}        
     spec:
 {{- if .Values.mariadb }}
+{{- if .Values.mariadb.nodeSelector }}
       nodeSelector:
-{{ toYaml .Values.mariadb.nodeSelector | indent 8 }}
+{{ toYaml .Values.mariadb.nodeSelector | trim | indent 8 }}
+{{- end }}
 {{- end }}
       containers:
       - name: mariadb
diff --git a/deploy/kubernetes/console/templates/deployment.yaml b/deploy/kubernetes/console/templates/deployment.yaml
index 6bd5dd0d54..5446aefec3 100644
--- a/deploy/kubernetes/console/templates/deployment.yaml
+++ b/deploy/kubernetes/console/templates/deployment.yaml
@@ -48,8 +48,10 @@ spec:
 {{- end }}
     spec:
 {{- if .Values.console }}
+{{- if .Values.console.nodeSelector }}
       nodeSelector:
-{{ toYaml .Values.console.nodeSelector | indent 8 }}
+{{ toYaml .Values.console.nodeSelector | trim | indent 8 }}
+{{- end }}
 {{- end }}
       containers:
       - image: {{.Values.kube.registry.hostname}}/{{.Values.kube.organization}}/{{.Values.images.console}}:{{.Values.consoleVersion}}
diff --git a/deploy/kubernetes/console/values.yaml b/deploy/kubernetes/console/values.yaml
index 3de09c3c6e..d2d25823db 100644
--- a/deploy/kubernetes/console/values.yaml
+++ b/deploy/kubernetes/console/values.yaml
@@ -105,6 +105,9 @@ console:
 
   # Extra labels to apply to Pods
   podExtraLabels: {}
+
+  # Node Selector for console Pod
+  nodeSelector: {}
   
 images:
   console: stratos-console
@@ -143,7 +146,13 @@ mariadb:
     accessMode: ReadWriteOnce
     size: 1Gi
     storageClass:
+  # Node selector for the database pod
+  nodeSelector: {}
 
+configInit:
+  # Node selector for the config init pod
+  nodeSelector: {}
+  
 # UAA configuration
 uaa:
   # UAA endpoint (e.g. https://uaa.domain:2793)

From cbc20cc3ef153abeea1b26dc8fdd919d7fb9e23a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 7 May 2020 10:58:27 +0100
Subject: [PATCH 077/176] Fix favourites helper

---
 .../cf-autoscaler/src/cf-autoscaler.module.ts |   6 +-
 .../src/core/autoscaler.module.ts             |   4 +-
 .../cloud-foundry/src/cf-entity-generator.ts  |   8 +
 .../cloud-foundry/src/cf-favorites-helpers.ts |  25 ++
 .../cloud-foundry/src/cloud-foundry.module.ts |   4 +-
 .../application-tabs-base.component.ts        |   4 +-
 .../build-tab/build-tab.component.spec.ts     |   4 +-
 .../instances-tab.component.spec.ts           |   4 +-
 .../applications/applications.module.ts       |   4 +-
 .../cli-info-application.component.spec.ts    |   4 +-
 ...create-application-step2.component.spec.ts |   4 +-
 .../create-application.module.ts              |   4 +-
 .../deploy-application.component.spec.ts      |   4 +-
 .../deploy-application.module.ts              |   4 +-
 .../cloud-foundry/cloud-foundry.module.ts     |   4 +-
 ...oud-foundry-organization-base.component.ts |   5 +-
 .../cloud-foundry-space-base.component.ts     |   5 +-
 .../service-catalog/service-catalog.module.ts |   4 +-
 .../src/features/services/services.module.ts  |   4 +-
 .../src/shared/cf-shared.module.ts            | 379 ++++++++++++++++++
 .../shared/components/components.module.ts    | 343 ----------------
 .../github-commit-author.component.html       |   0
 .../github-commit-author.component.scss       |   0
 .../github-commit-author.component.spec.ts    |   3 +-
 .../github-commit-author.component.ts         |   3 +-
 .../list-types/app/card/card-app.component.ts |   5 +-
 .../cf-org-card/cf-org-card.component.ts      |   5 +-
 .../cf-space-card/cf-space-card.component.ts  |   5 +-
 ...table-cell-commit-author.component.spec.ts |   4 +-
 .../core/src/core/user-favorite-helpers.ts    |  24 +-
 .../dashboard-base.component.ts               |  22 +-
 .../meta-card.component.spec.ts               |   6 +-
 .../meta-card-base/meta-card.component.ts     |  12 +-
 .../table-cell-radio.component.spec.ts        |   6 +-
 .../table-cell/table-cell.component.spec.ts   |   2 -
 ...table-cell-endpoint-name.component.spec.ts |   8 +-
 .../metrics-chart.component.spec.ts           |  19 +-
 .../metrics-range-selector.component.ts       |   5 +-
 .../packages/core/src/shared/shared.module.ts |  16 -
 .../entity-catalog/entity-catalog.types.ts    |   7 +
 40 files changed, 516 insertions(+), 463 deletions(-)
 create mode 100644 src/frontend/packages/cloud-foundry/src/cf-favorites-helpers.ts
 create mode 100644 src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts
 delete mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/github-commit-author/github-commit-author.component.html (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/github-commit-author/github-commit-author.component.scss (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/github-commit-author/github-commit-author.component.spec.ts (95%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/github-commit-author/github-commit-author.component.ts (79%)

diff --git a/src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts
index bba86237ea..a32adf024c 100644
--- a/src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts
+++ b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts
@@ -5,11 +5,11 @@ import { EffectsModule } from '@ngrx/effects';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 import { of } from 'rxjs';
 
-import { CloudFoundryComponentsModule } from '../../cloud-foundry/src/shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../cloud-foundry/src/shared/cf-shared.module';
 import { CoreModule } from '../../core/src/core/core.module';
-import { EntityCatalogModule } from '../../store/src/entity-catalog.module';
 import { MDAppModule } from '../../core/src/core/md.module';
 import { SharedModule } from '../../core/src/shared/shared.module';
+import { EntityCatalogModule } from '../../store/src/entity-catalog.module';
 import { AutoscalerModule } from './core/autoscaler.module';
 import { AutoscalerTabExtensionComponent } from './features/autoscaler-tab-extension/autoscaler-tab-extension.component';
 import { generateASEntities } from './store/autoscaler-entity-generator';
@@ -38,7 +38,7 @@ const customRoutes: Routes = [
     SharedModule,
     MDAppModule,
     NgxChartsModule,
-    CloudFoundryComponentsModule,
+    CloudFoundrySharedModule,
     AutoscalerModule,
     RouterModule.forRoot(customRoutes),
     EntityCatalogModule.forFeature(generateASEntities),
diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
index 05795f3f22..cf10352a73 100644
--- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
+++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import { ApplicationService } from '../../../cloud-foundry/src/features/applications/application.service';
-import { CloudFoundryComponentsModule } from '../../../cloud-foundry/src/shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../../cloud-foundry/src/shared/cf-shared.module';
 import { CoreModule } from '../../../core/src/core/core.module';
 import { SharedModule } from '../../../core/src/shared/shared.module';
 import { AutoscalerBaseComponent } from '../features/autoscaler-base.component';
@@ -54,7 +54,7 @@ import { AutoscalerRoutingModule } from './autoscaler.routing';
     SharedModule,
     AutoscalerRoutingModule,
     NgxChartsModule,
-    CloudFoundryComponentsModule,
+    CloudFoundrySharedModule,
   ],
   declarations: [
     AutoscalerBaseComponent,
diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
index f273aa91e7..98113b9896 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -3,6 +3,7 @@ import * as moment from 'moment';
 import { combineLatest, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 
+import { EndpointHealthCheck } from '../../core/endpoints-health-checks';
 import { urlValidationExpression } from '../../core/src/core/utils.service';
 import { BaseEndpointAuth } from '../../core/src/features/endpoints/endpoint-auth';
 import { AppState } from '../../store/src/app-state';
@@ -13,6 +14,7 @@ import {
 } from '../../store/src/entity-catalog/entity-catalog-entity';
 import { entityCatalog } from '../../store/src/entity-catalog/entity-catalog.service';
 import {
+  IEntityMetadata,
   IStratosEntityDefinition,
   StratosEndpointExtensionDefinition,
 } from '../../store/src/entity-catalog/entity-catalog.types';
@@ -88,6 +90,7 @@ import {
   userProvidedServiceInstanceEntityType,
 } from './cf-entity-types';
 import { CfErrorResponse, getCfError } from './cf-error-helpers';
+import { getFavoriteFromCfEntity } from './cf-favorites-helpers';
 import { IAppFavMetadata, IBasicCFMetaData, IOrgFavMetadata, ISpaceFavMetadata } from './cf-metadata-types';
 import { CF_ENDPOINT_TYPE } from './cf-types';
 import { appEnvVarActionBuilders } from './entity-action-builders/application-env-var.action-builders';
@@ -160,6 +163,11 @@ export function generateCFEntities(): StratosBaseCatalogEntity[] {
     authTypes: [BaseEndpointAuth.UsernamePassword, BaseEndpointAuth.SSO],
     listDetailsComponent: CfEndpointDetailsComponent,
     renderPriority: 1,
+    healthCheck: new EndpointHealthCheck(CF_ENDPOINT_TYPE, (endpoint) => {
+      entityCatalog.getEntity<IEntityMetadata, any, CfInfoDefinitionActionBuilders>(CF_ENDPOINT_TYPE, cfInfoEntityType)
+        .actionDispatchManager.dispatchGet(endpoint.guid);
+    }),
+    favoriteFromEntity: getFavoriteFromCfEntity,
     globalPreRequest: (request, action) => {
       return addCfRelationParams(request, action);
     },
diff --git a/src/frontend/packages/cloud-foundry/src/cf-favorites-helpers.ts b/src/frontend/packages/cloud-foundry/src/cf-favorites-helpers.ts
new file mode 100644
index 0000000000..05c628ff38
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/cf-favorites-helpers.ts
@@ -0,0 +1,25 @@
+import { FavoritesConfigMapper } from '../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
+import { IEntityMetadata } from '../../store/src/entity-catalog/entity-catalog.types';
+import { UserFavorite } from '../../store/src/types/user-favorites.types';
+import { CfAPIResource } from './store/types/cf-api.types';
+
+export function getFavoriteFromCfEntity<T extends IEntityMetadata = IEntityMetadata>(
+  entity,
+  entityKey: string,
+  favoritesConfigMapper: FavoritesConfigMapper
+): UserFavorite<T> {
+  if (isCfEntity(entity as CfAPIResource)) {
+    return favoritesConfigMapper.getFavoriteFromEntity<T>(
+      entityKey,
+      'cf',
+      entity.entity.cfGuid,
+      entity
+    );
+  }
+  return null;
+}
+
+function isCfEntity(entity: CfAPIResource) {
+  return entity && entity.entity.cfGuid && entity.metadata && entity.metadata.guid;
+}
+
diff --git a/src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts b/src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts
index c37a2f10a3..b0c95e4042 100644
--- a/src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts
@@ -15,7 +15,7 @@ import { ApplicationsModule } from './features/applications/applications.module'
 import { CloudFoundryModule } from './features/cloud-foundry/cloud-foundry.module';
 import { ServiceCatalogModule } from './features/service-catalog/service-catalog.module';
 import { ServicesModule } from './features/services/services.module';
-import { CloudFoundryComponentsModule } from './shared/components/components.module';
+import { CloudFoundrySharedModule } from './shared/cf-shared.module';
 import { CfUserService } from './shared/data-services/cf-user.service';
 import { CloudFoundryService } from './shared/data-services/cloud-foundry.service';
 import { LongRunningCfOperationsService } from './shared/data-services/long-running-cf-op.service';
@@ -71,7 +71,7 @@ function infoValidator(action: ICFAction, dispatcher) {
     ServicesModule,
     CloudFoundryStoreModule,
     // FIXME: Ensure that anything lazy loaded is not included here - #3675
-    CloudFoundryComponentsModule,
+    CloudFoundrySharedModule,
     // FIXME: Move cf effects into cf module - #3675
     // EffectsModule.for Root([
     //   PermissionsEffects,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts
index 3b7417c870..a4d6ebb229 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts
@@ -16,7 +16,7 @@ import {
   StratosActionType,
   StratosTabType,
 } from '../../../../../../core/src/core/extension/extension-service';
-import { getFavoriteFromCfEntity } from '../../../../../../core/src/core/user-favorite-helpers';
+import { getFavoriteFromEntity } from '../../../../../../core/src/core/user-favorite-helpers';
 import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
 import { IPageSideNavTab } from '../../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component';
 import {
@@ -52,7 +52,7 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy {
 
   public favorite$ = this.applicationService.app$.pipe(
     filter(app => !!app),
-    map(app => getFavoriteFromCfEntity<IAppFavMetadata>(app.entity, applicationEntityType, this.favoritesConfigMapper))
+    map(app => getFavoriteFromEntity<IAppFavMetadata>(app.entity, applicationEntityType, this.favoritesConfigMapper, CF_ENDPOINT_TYPE))
   );
 
   isBusyUpdating$: Observable<{ updating: boolean }>;
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.spec.ts
index c857d51f56..d64402168e 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.spec.ts
@@ -13,7 +13,7 @@ import { ApplicationServiceMock } from '../../../../../../../../core/test-framew
 import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { AppStoreModule } from '../../../../../../../../store/src/store.module';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { CloudFoundryComponentsModule } from '../../../../../../shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../../../../../shared/cf-shared.module';
 import { ApplicationStateService } from '../../../../../../shared/services/application-state.service';
 import { ApplicationService } from '../../../../application.service';
 import { cfApplicationEntityServiceFactory } from '../../../application-base.component';
@@ -42,7 +42,7 @@ describe('BuildTabComponent', () => {
         NoopAnimationsModule,
         HttpClientModule,
         HttpClientTestingModule,
-        CloudFoundryComponentsModule
+        CloudFoundrySharedModule
       ],
       providers: [
         { provide: ApplicationService, useClass: ApplicationServiceMock },
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.spec.ts
index 57ce8bb5e9..8649396f5f 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.spec.ts
@@ -12,7 +12,7 @@ import {
   generateCfStoreModules,
   generateTestCfEndpointServiceProvider,
 } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { CloudFoundryComponentsModule } from '../../../../../../shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../../../../../shared/cf-shared.module';
 import { ApplicationStateService } from '../../../../../../shared/services/application-state.service';
 import { ApplicationService } from '../../../../application.service';
 import { ApplicationEnvVarsHelper } from '../build-tab/application-env-vars.service';
@@ -31,7 +31,7 @@ describe('InstancesTabComponent', () => {
         SharedModule,
         RouterTestingModule,
         NoopAnimationsModule,
-        CloudFoundryComponentsModule
+        CloudFoundrySharedModule
       ],
       providers: [
         generateTestCfEndpointServiceProvider(),
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/applications.module.ts b/src/frontend/packages/cloud-foundry/src/features/applications/applications.module.ts
index 1440aa2cf8..ec68b659c6 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/applications.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/applications.module.ts
@@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';
 
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
-import { CloudFoundryComponentsModule } from '../../shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../shared/cf-shared.module';
 import { ApplicationDeleteComponent } from './application-delete/application-delete.component';
 import {
   DeleteAppServiceInstancesComponent,
@@ -43,7 +43,7 @@ import { SshApplicationComponent } from './ssh-application/ssh-application.compo
     CoreModule,
     SharedModule,
     ApplicationsRoutingModule,
-    CloudFoundryComponentsModule
+    CloudFoundrySharedModule
   ],
   declarations: [
     ApplicationWallComponent,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.spec.ts
index 165d17b84c..48091fca47 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.spec.ts
@@ -11,7 +11,7 @@ import { generateTestApplicationServiceProvider } from '../../../../../core/test
 import { generateTestEntityServiceProvider } from '../../../../../core/test-framework/entity-service.helper';
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { applicationEntityType } from '../../../cf-entity-types';
-import { CloudFoundryComponentsModule } from '../../../shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../../shared/cf-shared.module';
 import { ApplicationStateService } from '../../../shared/services/application-state.service';
 import { ApplicationEnvVarsHelper } from '../application/application-tabs-base/tabs/build-tab/application-env-vars.service';
 import { CliInfoApplicationComponent } from './cli-info-application.component';
@@ -32,7 +32,7 @@ describe('CliInfoApplicationComponent', () => {
         SharedModule,
         MDAppModule,
         RouterTestingModule,
-        CloudFoundryComponentsModule
+        CloudFoundrySharedModule
       ],
       providers: [
         generateTestEntityServiceProvider(
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step2/create-application-step2.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step2/create-application-step2.component.spec.ts
index ef3c6a255a..83db5d9ab7 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step2/create-application-step2.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step2/create-application-step2.component.spec.ts
@@ -7,7 +7,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { CoreModule } from '../../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../../core/src/shared/shared.module';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { CloudFoundryComponentsModule } from './../../../../shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../../../shared/cf-shared.module';
 import { CreateApplicationStep2Component } from './create-application-step2.component';
 
 describe('CreateApplicationStep2Component', () => {
@@ -24,7 +24,7 @@ describe('CreateApplicationStep2Component', () => {
         CommonModule,
         CoreModule,
         SharedModule,
-        CloudFoundryComponentsModule,
+        CloudFoundrySharedModule,
         NoopAnimationsModule,
         HttpClientModule,
         HttpClientTestingModule,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application.module.ts b/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application.module.ts
index 9404279b6f..a3dffb7264 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application.module.ts
@@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';
 
 import { CoreModule } from '../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
-import { CloudFoundryComponentsModule } from '../../../shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../../shared/cf-shared.module';
 import { CreateApplicationStep2Component } from './create-application-step2/create-application-step2.component';
 import { CreateApplicationStep3Component } from './create-application-step3/create-application-step3.component';
 import { CreateApplicationComponent } from './create-application.component';
@@ -13,7 +13,7 @@ import { CreateApplicationComponent } from './create-application.component';
     CommonModule,
     CoreModule,
     SharedModule,
-    CloudFoundryComponentsModule
+    CloudFoundrySharedModule
   ],
   declarations: [
     CreateApplicationComponent,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application.component.spec.ts
index 05f643078b..109a98e22f 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application.component.spec.ts
@@ -9,7 +9,7 @@ import { getGitHubAPIURL, GITHUB_API_URL } from '../../../../../core/src/core/gi
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../core/tab-nav.service';
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { CloudFoundryComponentsModule } from '../../../shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../../shared/cf-shared.module';
 import { CfOrgSpaceDataService } from '../../../shared/data-services/cf-org-space-service.service';
 import { ApplicationEnvVarsHelper } from '../application/application-tabs-base/tabs/build-tab/application-env-vars.service';
 import { CreateApplicationModule } from '../create-application/create-application.module';
@@ -69,7 +69,7 @@ describe('DeployApplicationComponent', () => {
         HttpClientModule,
         HttpClientTestingModule,
         HttpClientModule,
-        CloudFoundryComponentsModule
+        CloudFoundrySharedModule
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application.module.ts b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application.module.ts
index e3c316dd51..5b7e64475c 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application.module.ts
@@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';
 
 import { CoreModule } from '../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
-import { CloudFoundryComponentsModule } from '../../../shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../../shared/cf-shared.module';
 import { CreateApplicationModule } from '../create-application/create-application.module';
 import {
   DeployApplicationOptionsStepComponent,
@@ -27,7 +27,7 @@ import { GithubProjectExistsDirective } from './github-project-exists.directive'
     SharedModule,
     CommonModule,
     CreateApplicationModule,
-    CloudFoundryComponentsModule
+    CloudFoundrySharedModule
   ],
   declarations: [
     DeployApplicationComponent,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.module.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.module.ts
index 47504cbabb..d6a3658769 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.module.ts
@@ -4,7 +4,7 @@ import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
-import { CloudFoundryComponentsModule } from '../../shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../shared/cf-shared.module';
 import {
   CFEndpointsListConfigService,
 } from '../../shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service';
@@ -140,7 +140,7 @@ import { RemoveUserComponent } from './users/remove-user/remove-user.component';
     CloudFoundryRoutingModule,
     RouterModule,
     NgxChartsModule,
-    CloudFoundryComponentsModule
+    CloudFoundrySharedModule
   ],
   declarations: [
     CloudFoundryBaseComponent,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts
index 2d72c29d1e..12b30a8255 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts
@@ -11,7 +11,7 @@ import {
   StratosActionType,
   StratosTabType,
 } from '../../../../../../../core/src/core/extension/extension-service';
-import { getFavoriteFromCfEntity } from '../../../../../../../core/src/core/user-favorite-helpers';
+import { getFavoriteFromEntity } from '../../../../../../../core/src/core/user-favorite-helpers';
 import { environment } from '../../../../../../../core/src/environments/environment.prod';
 import { IPageSideNavTab } from '../../../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component';
 import {
@@ -21,6 +21,7 @@ import { IHeaderBreadcrumb } from '../../../../../../../core/src/shared/componen
 import { EntitySchema } from '../../../../../../../store/src/helpers/entity-schema';
 import { UserFavorite } from '../../../../../../../store/src/types/user-favorites.types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
+import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CfUserService } from '../../../../../shared/data-services/cf-user.service';
 import { getActiveRouteCfOrgSpaceProvider } from '../../../cf.helpers';
 import { CloudFoundryEndpointService } from '../../../services/cloud-foundry-endpoint.service';
@@ -92,7 +93,7 @@ export class CloudFoundryOrganizationBaseComponent {
     this.schema = cfEntityFactory(organizationEntityType);
     this.favorite$ = cfOrgService.org$.pipe(
       first(),
-      map(org => getFavoriteFromCfEntity<IOrgFavMetadata>(org.entity, organizationEntityType, favoritesConfigMapper))
+      map(org => getFavoriteFromEntity<IOrgFavMetadata>(org.entity, organizationEntityType, favoritesConfigMapper, CF_ENDPOINT_TYPE))
     );
     this.name$ = cfOrgService.org$.pipe(
       map(org => org.entity.entity.name),
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts
index 91ae786c24..459f7b7841 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts
@@ -13,7 +13,7 @@ import {
   StratosActionType,
   StratosTabType,
 } from '../../../../../../../../core/src/core/extension/extension-service';
-import { getFavoriteFromCfEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
+import { getFavoriteFromEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
 import { environment } from '../../../../../../../../core/src/environments/environment.prod';
 import { IPageSideNavTab } from '../../../../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
@@ -24,6 +24,7 @@ import { IHeaderBreadcrumb } from '../../../../../../../../core/src/shared/compo
 import { RouterNav } from '../../../../../../../../store/src/actions/router.actions';
 import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
+import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
 import { CfUserService } from '../../../../../../shared/data-services/cf-user.service';
 import { getActiveRouteCfOrgSpaceProvider } from '../../../../cf.helpers';
 import { CloudFoundryEndpointService } from '../../../../services/cloud-foundry-endpoint.service';
@@ -111,7 +112,7 @@ export class CloudFoundrySpaceBaseComponent implements OnDestroy {
     favoritesConfigMapper: FavoritesConfigMapper
   ) {
     this.favorite$ = cfSpaceService.space$.pipe(
-      map(space => getFavoriteFromCfEntity<ISpaceFavMetadata>(space.entity, spaceEntityType, favoritesConfigMapper))
+      map(space => getFavoriteFromEntity<ISpaceFavMetadata>(space.entity, spaceEntityType, favoritesConfigMapper, CF_ENDPOINT_TYPE))
     );
     this.isFetching$ = cfSpaceService.space$.pipe(
       map(space => space.entityRequestInfo.fetching)
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog.module.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog.module.ts
index 27c2c6566c..015bb2c5af 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-catalog.module.ts
@@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';
 
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
-import { CloudFoundryComponentsModule } from '../../shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../shared/cf-shared.module';
 import { CreateApplicationModule } from '../applications/create-application/create-application.module';
 import { ServiceBaseComponent } from './service-base/service-base.component';
 import { ServiceCatalogPageComponent } from './service-catalog-page/service-catalog-page.component';
@@ -20,7 +20,7 @@ import { ServiceTabsBaseComponent } from './service-tabs-base/service-tabs-base.
     ServiceCatalogRoutingModule,
     CoreModule,
     CreateApplicationModule,
-    CloudFoundryComponentsModule,
+    CloudFoundrySharedModule,
   ],
   declarations: [
     ServiceCatalogPageComponent,
diff --git a/src/frontend/packages/cloud-foundry/src/features/services/services.module.ts b/src/frontend/packages/cloud-foundry/src/features/services/services.module.ts
index 58a6326f70..628dced999 100644
--- a/src/frontend/packages/cloud-foundry/src/features/services/services.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/services/services.module.ts
@@ -7,7 +7,7 @@ import {
 import { ServiceCatalogModule } from '../../../../cloud-foundry/src/features/service-catalog/service-catalog.module';
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
-import { CloudFoundryComponentsModule } from '../../shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../shared/cf-shared.module';
 import { DetachAppsComponent } from './detach-service-instance/detach-apps/detach-apps.component';
 import { DetachServiceInstanceComponent } from './detach-service-instance/detach-service-instance.component';
 import { ServicesWallComponent } from './services-wall/services-wall.component';
@@ -21,7 +21,7 @@ import { ServicesRoutingModule } from './services.routing';
     ServicesRoutingModule,
     ServiceCatalogModule,
     CreateApplicationModule,
-    CloudFoundryComponentsModule,
+    CloudFoundrySharedModule,
   ],
   declarations: [
     ServicesWallComponent,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts b/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts
new file mode 100644
index 0000000000..1d1e4255b8
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts
@@ -0,0 +1,379 @@
+import { CommonModule } from '@angular/common';
+import { ApplicationModule, NgModule, Type } from '@angular/core';
+import { MaterialDesignFrameworkModule } from 'stratos-angular6-json-schema-form';
+
+import { CoreModule } from '../../../core/src/core/core.module';
+import { CardCell, TableCellCustom } from '../../../core/src/shared/components/list/list.types';
+import { SharedModule } from '../../../core/src/shared/shared.module';
+import {
+  ApplicationInstanceChartComponent,
+} from '../features/applications/application/application-instance-chart/application-instance-chart.component';
+import {
+  AddServiceInstanceBaseStepComponent,
+} from './components/add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component';
+import {
+  AddServiceInstanceComponent,
+} from './components/add-service-instance/add-service-instance/add-service-instance.component';
+import { BindAppsStepComponent } from './components/add-service-instance/bind-apps-step/bind-apps-step.component';
+import { NoServicePlansComponent } from './components/add-service-instance/no-service-plans/no-service-plans.component';
+import { SelectPlanStepComponent } from './components/add-service-instance/select-plan-step/select-plan-step.component';
+import {
+  SpecifyDetailsStepComponent,
+} from './components/add-service-instance/specify-details-step/specify-details-step.component';
+import {
+  SpecifyUserProvidedDetailsComponent,
+} from './components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component';
+import { CardAppInstancesComponent } from './components/cards/card-app-instances/card-app-instances.component';
+import { CardAppStatusComponent } from './components/cards/card-app-status/card-app-status.component';
+import { CardAppUptimeComponent } from './components/cards/card-app-uptime/card-app-uptime.component';
+import { CardAppUsageComponent } from './components/cards/card-app-usage/card-app-usage.component';
+import { CardCfInfoComponent } from './components/cards/card-cf-info/card-cf-info.component';
+import {
+  CardCfOrgUserDetailsComponent,
+} from './components/cards/card-cf-org-user-details/card-cf-org-user-details.component';
+import { CardCfRecentAppsComponent } from './components/cards/card-cf-recent-apps/card-cf-recent-apps.component';
+import { CompactAppCardComponent } from './components/cards/card-cf-recent-apps/compact-app-card/compact-app-card.component';
+import { CardCfSpaceDetailsComponent } from './components/cards/card-cf-space-details/card-cf-space-details.component';
+import { CardCfUserInfoComponent } from './components/cards/card-cf-user-info/card-cf-user-info.component';
+import {
+  CompactServiceInstanceCardComponent,
+} from './components/cards/compact-service-instance-card/compact-service-instance-card.component';
+import { ServiceBrokerCardComponent } from './components/cards/service-broker-card/service-broker-card.component';
+import {
+  ServiceRecentInstancesCardComponent,
+} from './components/cards/service-recent-instances-card/service-recent-instances-card.component';
+import { ServiceSummaryCardComponent } from './components/cards/service-summary-card/service-summary-card.component';
+import { CfEndpointDetailsComponent } from './components/cf-endpoint-details/cf-endpoint-details.component';
+import { CfEndpointsMissingComponent } from './components/cf-endpoints-missing/cf-endpoints-missing.component';
+import { CfOrgSpaceLinksComponent } from './components/cf-org-space-links/cf-org-space-links.component';
+import { CfRoleCheckboxComponent } from './components/cf-role-checkbox/cf-role-checkbox.component';
+import { CliCommandComponent } from './components/cli-info/cli-command/cli-command.component';
+import { CliInfoComponent } from './components/cli-info/cli-info.component';
+import { CloudFoundryEventsListComponent } from './components/cloud-foundry-events-list/cloud-foundry-events-list.component';
+import {
+  CreateApplicationStep1Component,
+} from './components/create-application/create-application-step1/create-application-step1.component';
+import { GithubCommitAuthorComponent } from './components/github-commit-author/github-commit-author.component';
+import {
+  TableCellCfCellComponent,
+} from './components/list/list-types/app-instance/table-cell-cf-cell/table-cell-cf-cell.component';
+import {
+  TableCellUsageComponent,
+} from './components/list/list-types/app-instance/table-cell-usage/table-cell-usage.component';
+import {
+  AppServiceBindingCardComponent,
+} from './components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component';
+import {
+  TableCellEditVariableComponent,
+} from './components/list/list-types/app-variables/table-cell-edit-variable/table-cell-edit-variable.component';
+import { CardAppComponent } from './components/list/list-types/app/card/card-app.component';
+import {
+  TableCellAppCfOrgSpaceHeaderComponent,
+} from './components/list/list-types/app/table-cell-app-cforgspace-header/table-cell-app-cforgspace-header.component';
+import {
+  TableCellAppCfOrgSpaceComponent,
+} from './components/list/list-types/app/table-cell-app-cforgspace/table-cell-app-cforgspace.component';
+import {
+  TableCellAppInstancesComponent,
+} from './components/list/list-types/app/table-cell-app-instances/table-cell-app-instances.component';
+import {
+  TableCellAppNameComponent,
+} from './components/list/list-types/app/table-cell-app-name/table-cell-app-name.component';
+import {
+  TableCellAppStatusComponent,
+} from './components/list/list-types/app/table-cell-app-status/table-cell-app-status.component';
+import {
+  CfBuildpackCardComponent,
+} from './components/list/list-types/cf-buildpacks/cf-buildpack-card/cf-buildpack-card.component';
+import {
+  TableCellConfirmOrgSpaceComponent,
+} from './components/list/list-types/cf-confirm-roles/table-cell-confirm-org-space/table-cell-confirm-org-space.component';
+import {
+  TableCellConfirmRoleAddRemComponent,
+} from './components/list/list-types/cf-confirm-roles/table-cell-confirm-role-add-rem/table-cell-confirm-role-add-rem.component';
+import { EventMetadataComponent } from './components/list/list-types/cf-events/event-metadata/event-metadata.component';
+import {
+  TableCellEventActeeComponent,
+} from './components/list/list-types/cf-events/table-cell-event-actee/table-cell-event-actee.component';
+import {
+  EventTabActorIconPipe,
+} from './components/list/list-types/cf-events/table-cell-event-action/event-tab-actor-icon.pipe';
+import {
+  TableCellEventActionComponent,
+} from './components/list/list-types/cf-events/table-cell-event-action/table-cell-event-action.component';
+import {
+  TableCellEventDetailComponent,
+} from './components/list/list-types/cf-events/table-cell-event-detail/table-cell-event-detail.component';
+import {
+  TableCellEventTimestampComponent,
+} from './components/list/list-types/cf-events/table-cell-event-timestamp/table-cell-event-timestamp.component';
+import {
+  TableCellEventTypeComponent,
+} from './components/list/list-types/cf-events/table-cell-event-type/table-cell-event-type.component';
+import {
+  TableCellFeatureFlagDescriptionComponent,
+} from './components/list/list-types/cf-feature-flags/table-cell-feature-flag-description/table-cell-feature-flag-description.component';
+import {
+  TableCellFeatureFlagStateComponent,
+} from './components/list/list-types/cf-feature-flags/table-cell-feature-flag-state/table-cell-feature-flag-state.component';
+import { CfOrgCardComponent } from './components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component';
+import { TableCellQuotaComponent } from './components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component';
+import {
+  TableCellRouteAppsAttachedComponent,
+} from './components/list/list-types/cf-routes/table-cell-route-apps-attached/table-cell-route-apps-attached.component';
+import { TableCellRouteComponent } from './components/list/list-types/cf-routes/table-cell-route/table-cell-route.component';
+import {
+  TableCellTCPRouteComponent,
+} from './components/list/list-types/cf-routes/table-cell-tcproute/table-cell-tcproute.component';
+import {
+  CfSecurityGroupsCardComponent,
+} from './components/list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component';
+import { CfServiceCardComponent } from './components/list/list-types/cf-services/cf-service-card/cf-service-card.component';
+import {
+  TableCellServiceActiveComponent,
+} from './components/list/list-types/cf-services/table-cell-service-active/table-cell-service-active.component';
+import {
+  TableCellServiceBindableComponent,
+} from './components/list/list-types/cf-services/table-cell-service-bindable/table-cell-service-bindable.component';
+import {
+  TableCellServiceCfBreadcrumbsComponent,
+} from './components/list/list-types/cf-services/table-cell-service-cf-breadcrumbs/table-cell-service-cf-breadcrumbs.component';
+import {
+  TableCellServiceProviderComponent,
+} from './components/list/list-types/cf-services/table-cell-service-provider/table-cell-service-provider.component';
+import {
+  TableCellServiceReferencesComponent,
+} from './components/list/list-types/cf-services/table-cell-service-references/table-cell-service-references.component';
+import {
+  TableCellServiceTagsComponent,
+} from './components/list/list-types/cf-services/table-cell-service-tags/table-cell-service-tags.component';
+import {
+  TableCellServiceInstanceAppsAttachedComponent,
+} from './components/list/list-types/cf-spaces-service-instances/table-cell-service-instance-apps-attached/table-cell-service-instance-apps-attached.component';
+import {
+  TableCellServiceInstanceTagsComponent,
+} from './components/list/list-types/cf-spaces-service-instances/table-cell-service-instance-tags/table-cell-service-instance-tags.component';
+import {
+  TableCellServiceLastOpComponent,
+} from './components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component';
+import {
+  TableCellServiceComponent,
+} from './components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component';
+import {
+  TableCellSpaceNameComponent,
+} from './components/list/list-types/cf-spaces-service-instances/table-cell-space-name/table-cell-space-name.component';
+import { CfSpaceCardComponent } from './components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component';
+import { CfStacksCardComponent } from './components/list/list-types/cf-stacks/cf-stacks-card/cf-stacks-card.component';
+import {
+  TableCellRoleOrgSpaceComponent,
+} from './components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component';
+import {
+  TableCellSelectOrgComponent,
+} from './components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component';
+import {
+  CfOrgPermissionCellComponent,
+} from './components/list/list-types/cf-users/cf-org-permission-cell/cf-org-permission-cell.component';
+import {
+  CfSpacePermissionCellComponent,
+} from './components/list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component';
+import {
+  TableCellCommitAuthorComponent,
+} from './components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component';
+import {
+  TableCellAServicePlanExtrasComponent,
+} from './components/list/list-types/service-plans/table-cell-service-plan-extras/table-cell-service-plan-extras.component';
+import {
+  TableCellAServicePlanPriceComponent,
+} from './components/list/list-types/service-plans/table-cell-service-plan-price/table-cell-service-plan-price.component';
+import {
+  TableCellAServicePlanPublicComponent,
+} from './components/list/list-types/service-plans/table-cell-service-plan-public/table-cell-service-plan-public.component';
+import {
+  ServiceInstanceCardComponent,
+} from './components/list/list-types/services-wall/service-instance-card/service-instance-card.component';
+import {
+  UserProvidedServiceInstanceCardComponent,
+} from './components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component';
+import { RunningInstancesComponent } from './components/running-instances/running-instances.component';
+import { SchemaFormComponent } from './components/schema-form/schema-form.component';
+import { SelectServiceComponent } from './components/select-service/select-service.component';
+import { ServiceIconComponent } from './components/service-icon/service-icon.component';
+import { ServiceInstanceLastOpComponent } from './components/service-instance-last-op/service-instance-last-op.component';
+import { ServicePlanPriceComponent } from './components/service-plan-price/service-plan-price.component';
+import { ServicePlanPublicComponent } from './components/service-plan-public/service-plan-public.component';
+import { GitSCMService } from './data-services/scm/scm.service';
+import { AppNameUniqueDirective } from './directives/app-name-unique.directive/app-name-unique.directive';
+import { ApplicationStateService } from './services/application-state.service';
+import { CloudFoundryUserProvidedServicesService } from './services/cloud-foundry-user-provided-services.service';
+
+// tslint:disable:max-line-length
+// tslint:enable:max-line-length
+
+const cfListTableCells: Type<TableCellCustom<any>>[] = [
+  TableCellServiceInstanceAppsAttachedComponent,
+  TableCellServiceComponent,
+  TableCellServiceLastOpComponent,
+  TableCellRouteAppsAttachedComponent,
+  CfOrgPermissionCellComponent,
+  CfSpacePermissionCellComponent,
+  TableCellFeatureFlagStateComponent,
+  TableCellFeatureFlagDescriptionComponent,
+  TableCellConfirmOrgSpaceComponent,
+  TableCellSelectOrgComponent,
+  TableCellAppStatusComponent,
+  TableCellRoleOrgSpaceComponent,
+  TableCellConfirmRoleAddRemComponent,
+  TableCellSpaceNameComponent,
+  TableCellAppCfOrgSpaceHeaderComponent,
+  TableCellAppCfOrgSpaceComponent,
+  TableCellAServicePlanPublicComponent,
+  TableCellAServicePlanPriceComponent,
+  TableCellAServicePlanExtrasComponent,
+  TableCellCfCellComponent,
+  TableCellRouteComponent,
+  TableCellTCPRouteComponent,
+  TableCellAppInstancesComponent,
+  TableCellAppNameComponent,
+  TableCellEditVariableComponent,
+  TableCellEventTimestampComponent,
+  TableCellEventTypeComponent,
+  TableCellEventActionComponent,
+  TableCellEventDetailComponent,
+  TableCellUsageComponent,
+  TableCellQuotaComponent,
+  TableCellEventActeeComponent,
+  TableCellServiceTagsComponent,
+  TableCellServiceCfBreadcrumbsComponent,
+  TableCellServiceProviderComponent,
+  TableCellServiceBindableComponent,
+  TableCellServiceActiveComponent,
+  TableCellServiceReferencesComponent,
+  TableCellServiceInstanceTagsComponent,
+  TableCellCommitAuthorComponent,
+];
+
+const cfListCards: Type<CardCell<any>>[] = [
+  AppServiceBindingCardComponent,
+  CardAppComponent,
+  CfOrgCardComponent,
+  CfSpaceCardComponent,
+  CfBuildpackCardComponent,
+  CfSecurityGroupsCardComponent,
+  CfStacksCardComponent,
+  CfServiceCardComponent,
+  ServiceInstanceCardComponent,
+  UserProvidedServiceInstanceCardComponent,
+];
+
+// listTableCells.push();
+
+@NgModule({
+  imports: [
+    CommonModule,
+    CoreModule,
+    SharedModule,
+    ApplicationModule,
+    MaterialDesignFrameworkModule,
+  ],
+  declarations: [
+    ServiceIconComponent,
+    CfEndpointDetailsComponent,
+    CliCommandComponent,
+    CliInfoComponent,
+    CfEndpointsMissingComponent,
+    CfRoleCheckboxComponent,
+    CfOrgSpaceLinksComponent,
+    SelectServiceComponent,
+    SpecifyDetailsStepComponent,
+    AddServiceInstanceComponent,
+    SelectPlanStepComponent,
+    NoServicePlansComponent,
+    BindAppsStepComponent,
+    SpecifyUserProvidedDetailsComponent,
+    AddServiceInstanceBaseStepComponent,
+    SchemaFormComponent,
+    CardAppStatusComponent,
+    CardAppInstancesComponent,
+    CardAppUsageComponent,
+    CardAppUptimeComponent,
+    CardCfInfoComponent,
+    CardCfUserInfoComponent,
+    CardCfOrgUserDetailsComponent,
+    CardCfSpaceDetailsComponent,
+    CardCfRecentAppsComponent,
+    CompactAppCardComponent,
+    ServiceSummaryCardComponent,
+    ServiceBrokerCardComponent,
+    ServiceRecentInstancesCardComponent,
+    CompactServiceInstanceCardComponent,
+    RunningInstancesComponent,
+    ServicePlanPublicComponent,
+    ServicePlanPriceComponent,
+    CreateApplicationStep1Component,
+    EventTabActorIconPipe,
+    CloudFoundryEventsListComponent,
+    EventMetadataComponent,
+    ...cfListTableCells,
+    ...cfListCards,
+    ServiceInstanceLastOpComponent,
+    TableCellFeatureFlagDescriptionComponent,
+    AppNameUniqueDirective,
+    ApplicationInstanceChartComponent,
+    GithubCommitAuthorComponent,
+  ],
+  exports: [
+    ServiceIconComponent,
+    CfEndpointDetailsComponent,
+    CliCommandComponent,
+    CliInfoComponent,
+    CfEndpointsMissingComponent,
+    CfRoleCheckboxComponent,
+    CfOrgSpaceLinksComponent,
+    SelectServiceComponent,
+    SpecifyDetailsStepComponent,
+    AddServiceInstanceComponent,
+    SelectPlanStepComponent,
+    NoServicePlansComponent,
+    BindAppsStepComponent,
+    SpecifyUserProvidedDetailsComponent,
+    AddServiceInstanceBaseStepComponent,
+    CfServiceCardComponent,
+    SchemaFormComponent,
+    CardAppStatusComponent,
+    CardAppInstancesComponent,
+    CardAppUsageComponent,
+    CardAppUptimeComponent,
+    CardCfInfoComponent,
+    CardCfUserInfoComponent,
+    CardCfOrgUserDetailsComponent,
+    CardCfSpaceDetailsComponent,
+    CardCfRecentAppsComponent,
+    CompactAppCardComponent,
+    ServiceSummaryCardComponent,
+    ServiceBrokerCardComponent,
+    ServiceRecentInstancesCardComponent,
+    CompactServiceInstanceCardComponent,
+    RunningInstancesComponent,
+    ServicePlanPublicComponent,
+    ServicePlanPriceComponent,
+    CreateApplicationStep1Component,
+    CloudFoundryEventsListComponent,
+    AppNameUniqueDirective,
+    ApplicationInstanceChartComponent,
+    GithubCommitAuthorComponent,
+  ],
+  entryComponents: [
+    CfEndpointDetailsComponent,
+    NoServicePlansComponent,
+    EventMetadataComponent,
+
+    ...cfListTableCells,
+    ...cfListCards
+  ],
+  providers: [
+    ApplicationStateService,
+    GitSCMService,
+    CloudFoundryUserProvidedServicesService,
+  ]
+})
+export class CloudFoundrySharedModule { }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts b/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
deleted file mode 100644
index b51c66d8c1..0000000000
--- a/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
+++ /dev/null
@@ -1,343 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { ApplicationModule, NgModule, Type } from '@angular/core';
-import { MaterialDesignFrameworkModule } from 'stratos-angular6-json-schema-form';
-
-import { CoreModule } from '../../../../core/src/core/core.module';
-import { CardCell, TableCellCustom } from '../../../../core/src/shared/components/list/list.types';
-import { SharedModule } from '../../../../core/src/shared/shared.module';
-import { AppNameUniqueDirective } from '../directives/app-name-unique.directive/app-name-unique.directive';
-import {
-  AddServiceInstanceBaseStepComponent,
-} from './add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component';
-import { AddServiceInstanceComponent } from './add-service-instance/add-service-instance/add-service-instance.component';
-import { BindAppsStepComponent } from './add-service-instance/bind-apps-step/bind-apps-step.component';
-import { NoServicePlansComponent } from './add-service-instance/no-service-plans/no-service-plans.component';
-import { SelectPlanStepComponent } from './add-service-instance/select-plan-step/select-plan-step.component';
-import { SpecifyDetailsStepComponent } from './add-service-instance/specify-details-step/specify-details-step.component';
-import {
-  SpecifyUserProvidedDetailsComponent,
-} from './add-service-instance/specify-user-provided-details/specify-user-provided-details.component';
-import { CardAppInstancesComponent } from './cards/card-app-instances/card-app-instances.component';
-import { CardAppStatusComponent } from './cards/card-app-status/card-app-status.component';
-import { CardAppUptimeComponent } from './cards/card-app-uptime/card-app-uptime.component';
-import { CardAppUsageComponent } from './cards/card-app-usage/card-app-usage.component';
-import { CardCfInfoComponent } from './cards/card-cf-info/card-cf-info.component';
-import { CardCfOrgUserDetailsComponent } from './cards/card-cf-org-user-details/card-cf-org-user-details.component';
-import { CardCfRecentAppsComponent } from './cards/card-cf-recent-apps/card-cf-recent-apps.component';
-import { CompactAppCardComponent } from './cards/card-cf-recent-apps/compact-app-card/compact-app-card.component';
-import { CardCfSpaceDetailsComponent } from './cards/card-cf-space-details/card-cf-space-details.component';
-import { CardCfUserInfoComponent } from './cards/card-cf-user-info/card-cf-user-info.component';
-import {
-  CompactServiceInstanceCardComponent,
-} from './cards/compact-service-instance-card/compact-service-instance-card.component';
-import { ServiceBrokerCardComponent } from './cards/service-broker-card/service-broker-card.component';
-import {
-  ServiceRecentInstancesCardComponent,
-} from './cards/service-recent-instances-card/service-recent-instances-card.component';
-import { ServiceSummaryCardComponent } from './cards/service-summary-card/service-summary-card.component';
-import { CfEndpointDetailsComponent } from './cf-endpoint-details/cf-endpoint-details.component';
-import { CfEndpointsMissingComponent } from './cf-endpoints-missing/cf-endpoints-missing.component';
-import { CfOrgSpaceLinksComponent } from './cf-org-space-links/cf-org-space-links.component';
-import { CfRoleCheckboxComponent } from './cf-role-checkbox/cf-role-checkbox.component';
-import { CliCommandComponent } from './cli-info/cli-command/cli-command.component';
-import { CliInfoComponent } from './cli-info/cli-info.component';
-import { CloudFoundryEventsListComponent } from './cloud-foundry-events-list/cloud-foundry-events-list.component';
-import {
-  CreateApplicationStep1Component,
-} from './create-application/create-application-step1/create-application-step1.component';
-import { TableCellCfCellComponent } from './list/list-types/app-instance/table-cell-cf-cell/table-cell-cf-cell.component';
-import { TableCellUsageComponent } from './list/list-types/app-instance/table-cell-usage/table-cell-usage.component';
-import {
-  AppServiceBindingCardComponent,
-} from './list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component';
-import {
-  TableCellEditVariableComponent,
-} from './list/list-types/app-variables/table-cell-edit-variable/table-cell-edit-variable.component';
-import { CardAppComponent } from './list/list-types/app/card/card-app.component';
-import {
-  TableCellAppCfOrgSpaceHeaderComponent,
-} from './list/list-types/app/table-cell-app-cforgspace-header/table-cell-app-cforgspace-header.component';
-import {
-  TableCellAppCfOrgSpaceComponent,
-} from './list/list-types/app/table-cell-app-cforgspace/table-cell-app-cforgspace.component';
-import {
-  TableCellAppInstancesComponent,
-} from './list/list-types/app/table-cell-app-instances/table-cell-app-instances.component';
-import { TableCellAppNameComponent } from './list/list-types/app/table-cell-app-name/table-cell-app-name.component';
-import { TableCellAppStatusComponent } from './list/list-types/app/table-cell-app-status/table-cell-app-status.component';
-import { CfBuildpackCardComponent } from './list/list-types/cf-buildpacks/cf-buildpack-card/cf-buildpack-card.component';
-import {
-  TableCellConfirmOrgSpaceComponent,
-} from './list/list-types/cf-confirm-roles/table-cell-confirm-org-space/table-cell-confirm-org-space.component';
-import {
-  TableCellConfirmRoleAddRemComponent,
-} from './list/list-types/cf-confirm-roles/table-cell-confirm-role-add-rem/table-cell-confirm-role-add-rem.component';
-import { EventMetadataComponent } from './list/list-types/cf-events/event-metadata/event-metadata.component';
-import {
-  TableCellEventActeeComponent,
-} from './list/list-types/cf-events/table-cell-event-actee/table-cell-event-actee.component';
-import { EventTabActorIconPipe } from './list/list-types/cf-events/table-cell-event-action/event-tab-actor-icon.pipe';
-import {
-  TableCellEventActionComponent,
-} from './list/list-types/cf-events/table-cell-event-action/table-cell-event-action.component';
-import {
-  TableCellEventDetailComponent,
-} from './list/list-types/cf-events/table-cell-event-detail/table-cell-event-detail.component';
-import {
-  TableCellEventTimestampComponent,
-} from './list/list-types/cf-events/table-cell-event-timestamp/table-cell-event-timestamp.component';
-import {
-  TableCellEventTypeComponent,
-} from './list/list-types/cf-events/table-cell-event-type/table-cell-event-type.component';
-import {
-  TableCellFeatureFlagDescriptionComponent,
-} from './list/list-types/cf-feature-flags/table-cell-feature-flag-description/table-cell-feature-flag-description.component';
-import {
-  TableCellFeatureFlagStateComponent,
-} from './list/list-types/cf-feature-flags/table-cell-feature-flag-state/table-cell-feature-flag-state.component';
-import { CfOrgCardComponent } from './list/list-types/cf-orgs/cf-org-card/cf-org-card.component';
-import { TableCellQuotaComponent } from './list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component';
-import {
-  TableCellRouteAppsAttachedComponent,
-} from './list/list-types/cf-routes/table-cell-route-apps-attached/table-cell-route-apps-attached.component';
-import { TableCellRouteComponent } from './list/list-types/cf-routes/table-cell-route/table-cell-route.component';
-import { TableCellTCPRouteComponent } from './list/list-types/cf-routes/table-cell-tcproute/table-cell-tcproute.component';
-import {
-  CfSecurityGroupsCardComponent,
-} from './list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component';
-import { CfServiceCardComponent } from './list/list-types/cf-services/cf-service-card/cf-service-card.component';
-import {
-  TableCellServiceActiveComponent,
-} from './list/list-types/cf-services/table-cell-service-active/table-cell-service-active.component';
-import {
-  TableCellServiceBindableComponent,
-} from './list/list-types/cf-services/table-cell-service-bindable/table-cell-service-bindable.component';
-import {
-  TableCellServiceCfBreadcrumbsComponent,
-} from './list/list-types/cf-services/table-cell-service-cf-breadcrumbs/table-cell-service-cf-breadcrumbs.component';
-import {
-  TableCellServiceProviderComponent,
-} from './list/list-types/cf-services/table-cell-service-provider/table-cell-service-provider.component';
-import {
-  TableCellServiceReferencesComponent,
-} from './list/list-types/cf-services/table-cell-service-references/table-cell-service-references.component';
-import {
-  TableCellServiceTagsComponent,
-} from './list/list-types/cf-services/table-cell-service-tags/table-cell-service-tags.component';
-import {
-  TableCellServiceInstanceAppsAttachedComponent,
-} from './list/list-types/cf-spaces-service-instances/table-cell-service-instance-apps-attached/table-cell-service-instance-apps-attached.component';
-import {
-  TableCellServiceInstanceTagsComponent,
-} from './list/list-types/cf-spaces-service-instances/table-cell-service-instance-tags/table-cell-service-instance-tags.component';
-import {
-  TableCellServiceLastOpComponent,
-} from './list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component';
-import {
-  TableCellServiceComponent,
-} from './list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component';
-import {
-  TableCellSpaceNameComponent,
-} from './list/list-types/cf-spaces-service-instances/table-cell-space-name/table-cell-space-name.component';
-import { CfSpaceCardComponent } from './list/list-types/cf-spaces/cf-space-card/cf-space-card.component';
-import { CfStacksCardComponent } from './list/list-types/cf-stacks/cf-stacks-card/cf-stacks-card.component';
-import {
-  TableCellRoleOrgSpaceComponent,
-} from './list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component';
-import {
-  TableCellSelectOrgComponent,
-} from './list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component';
-import {
-  CfOrgPermissionCellComponent,
-} from './list/list-types/cf-users/cf-org-permission-cell/cf-org-permission-cell.component';
-import {
-  CfSpacePermissionCellComponent,
-} from './list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component';
-import {
-  TableCellCommitAuthorComponent,
-} from './list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component';
-import {
-  TableCellAServicePlanExtrasComponent,
-} from './list/list-types/service-plans/table-cell-service-plan-extras/table-cell-service-plan-extras.component';
-import {
-  TableCellAServicePlanPriceComponent,
-} from './list/list-types/service-plans/table-cell-service-plan-price/table-cell-service-plan-price.component';
-import {
-  TableCellAServicePlanPublicComponent,
-} from './list/list-types/service-plans/table-cell-service-plan-public/table-cell-service-plan-public.component';
-import {
-  ServiceInstanceCardComponent,
-} from './list/list-types/services-wall/service-instance-card/service-instance-card.component';
-import {
-  UserProvidedServiceInstanceCardComponent,
-} from './list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component';
-import { RunningInstancesComponent } from './running-instances/running-instances.component';
-import { SchemaFormComponent } from './schema-form/schema-form.component';
-import { SelectServiceComponent } from './select-service/select-service.component';
-import { ServiceIconComponent } from './service-icon/service-icon.component';
-import { ServiceInstanceLastOpComponent } from './service-instance-last-op/service-instance-last-op.component';
-import { ServicePlanPriceComponent } from './service-plan-price/service-plan-price.component';
-import { ServicePlanPublicComponent } from './service-plan-public/service-plan-public.component';
-
-// tslint:disable:max-line-length
-// tslint:enable:max-line-length
-
-const cfListTableCells: Type<TableCellCustom<any>>[] = [
-  TableCellServiceInstanceAppsAttachedComponent,
-  TableCellServiceComponent,
-  TableCellServiceLastOpComponent,
-  TableCellRouteAppsAttachedComponent,
-  CfOrgPermissionCellComponent,
-  CfSpacePermissionCellComponent,
-  TableCellFeatureFlagStateComponent,
-  TableCellFeatureFlagDescriptionComponent,
-  TableCellConfirmOrgSpaceComponent,
-  TableCellSelectOrgComponent,
-  TableCellAppStatusComponent,
-  TableCellRoleOrgSpaceComponent,
-  TableCellConfirmRoleAddRemComponent,
-  TableCellSpaceNameComponent,
-  TableCellAppCfOrgSpaceHeaderComponent,
-  TableCellAppCfOrgSpaceComponent,
-  TableCellAServicePlanPublicComponent,
-  TableCellAServicePlanPriceComponent,
-  TableCellAServicePlanExtrasComponent,
-  TableCellCfCellComponent,
-  TableCellRouteComponent,
-  TableCellTCPRouteComponent,
-  TableCellAppInstancesComponent,
-  TableCellAppNameComponent,
-  TableCellEditVariableComponent,
-  TableCellEventTimestampComponent,
-  TableCellEventTypeComponent,
-  TableCellEventActionComponent,
-  TableCellEventDetailComponent,
-  TableCellUsageComponent,
-  TableCellQuotaComponent,
-  TableCellEventActeeComponent,
-  TableCellServiceTagsComponent,
-  TableCellServiceCfBreadcrumbsComponent,
-  TableCellServiceProviderComponent,
-  TableCellServiceBindableComponent,
-  TableCellServiceActiveComponent,
-  TableCellServiceReferencesComponent,
-  TableCellServiceInstanceTagsComponent,
-  TableCellCommitAuthorComponent,
-];
-
-const cfListCards: Type<CardCell<any>>[] = [
-  AppServiceBindingCardComponent,
-  CardAppComponent,
-  CfOrgCardComponent,
-  CfSpaceCardComponent,
-  CfBuildpackCardComponent,
-  CfSecurityGroupsCardComponent,
-  CfStacksCardComponent,
-  CfServiceCardComponent,
-  ServiceInstanceCardComponent,
-  UserProvidedServiceInstanceCardComponent,
-];
-
-// listTableCells.push();
-
-@NgModule({
-  imports: [
-    CommonModule,
-    CoreModule,
-    SharedModule,
-    ApplicationModule,
-    MaterialDesignFrameworkModule,
-  ],
-  declarations: [
-    ServiceIconComponent,
-    CfEndpointDetailsComponent,
-    CliCommandComponent,
-    CliInfoComponent,
-    CfEndpointsMissingComponent,
-    CfRoleCheckboxComponent,
-    CfOrgSpaceLinksComponent,
-    SelectServiceComponent,
-    SpecifyDetailsStepComponent,
-    AddServiceInstanceComponent,
-    SelectPlanStepComponent,
-    NoServicePlansComponent,
-    BindAppsStepComponent,
-    SpecifyUserProvidedDetailsComponent,
-    AddServiceInstanceBaseStepComponent,
-    SchemaFormComponent,
-    CardAppStatusComponent,
-    CardAppInstancesComponent,
-    CardAppUsageComponent,
-    CardAppUptimeComponent,
-    CardCfInfoComponent,
-    CardCfUserInfoComponent,
-    CardCfOrgUserDetailsComponent,
-    CardCfSpaceDetailsComponent,
-    CardCfRecentAppsComponent,
-    CompactAppCardComponent,
-    ServiceSummaryCardComponent,
-    ServiceBrokerCardComponent,
-    ServiceRecentInstancesCardComponent,
-    CompactServiceInstanceCardComponent,
-    RunningInstancesComponent,
-    ServicePlanPublicComponent,
-    ServicePlanPriceComponent,
-    CreateApplicationStep1Component,
-    EventTabActorIconPipe,
-    CloudFoundryEventsListComponent,
-    EventMetadataComponent,
-    ...cfListTableCells,
-    ...cfListCards,
-    ServiceInstanceLastOpComponent,
-    TableCellFeatureFlagDescriptionComponent,
-    AppNameUniqueDirective,
-  ],
-  exports: [
-    ServiceIconComponent,
-    CfEndpointDetailsComponent,
-    CliCommandComponent,
-    CliInfoComponent,
-    CfEndpointsMissingComponent,
-    CfRoleCheckboxComponent,
-    CfOrgSpaceLinksComponent,
-    SelectServiceComponent,
-    SpecifyDetailsStepComponent,
-    AddServiceInstanceComponent,
-    SelectPlanStepComponent,
-    NoServicePlansComponent,
-    BindAppsStepComponent,
-    SpecifyUserProvidedDetailsComponent,
-    AddServiceInstanceBaseStepComponent,
-    CfServiceCardComponent,
-    SchemaFormComponent,
-    CardAppStatusComponent,
-    CardAppInstancesComponent,
-    CardAppUsageComponent,
-    CardAppUptimeComponent,
-    CardCfInfoComponent,
-    CardCfUserInfoComponent,
-    CardCfOrgUserDetailsComponent,
-    CardCfSpaceDetailsComponent,
-    CardCfRecentAppsComponent,
-    CompactAppCardComponent,
-    ServiceSummaryCardComponent,
-    ServiceBrokerCardComponent,
-    ServiceRecentInstancesCardComponent,
-    CompactServiceInstanceCardComponent,
-    RunningInstancesComponent,
-    ServicePlanPublicComponent,
-    ServicePlanPriceComponent,
-    CreateApplicationStep1Component,
-    CloudFoundryEventsListComponent,
-    AppNameUniqueDirective,
-  ],
-  entryComponents: [
-    CfEndpointDetailsComponent,
-    NoServicePlansComponent,
-    EventMetadataComponent,
-
-    ...cfListTableCells,
-    ...cfListCards
-  ]
-})
-export class CloudFoundryComponentsModule { }
diff --git a/src/frontend/packages/core/src/shared/components/github-commit-author/github-commit-author.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/github-commit-author/github-commit-author.component.html
similarity index 100%
rename from src/frontend/packages/core/src/shared/components/github-commit-author/github-commit-author.component.html
rename to src/frontend/packages/cloud-foundry/src/shared/components/github-commit-author/github-commit-author.component.html
diff --git a/src/frontend/packages/core/src/shared/components/github-commit-author/github-commit-author.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/github-commit-author/github-commit-author.component.scss
similarity index 100%
rename from src/frontend/packages/core/src/shared/components/github-commit-author/github-commit-author.component.scss
rename to src/frontend/packages/cloud-foundry/src/shared/components/github-commit-author/github-commit-author.component.scss
diff --git a/src/frontend/packages/core/src/shared/components/github-commit-author/github-commit-author.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/github-commit-author/github-commit-author.component.spec.ts
similarity index 95%
rename from src/frontend/packages/core/src/shared/components/github-commit-author/github-commit-author.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/github-commit-author/github-commit-author.component.spec.ts
index 86cf4c6a8c..a04d43d743 100644
--- a/src/frontend/packages/core/src/shared/components/github-commit-author/github-commit-author.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/github-commit-author/github-commit-author.component.spec.ts
@@ -1,5 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { async, ComponentFixture, TestBed } from './@angular/core/testing';
 import { GithubCommitAuthorComponent } from './github-commit-author.component';
 
 describe('GithubCommitAuthorComponent', () => {
diff --git a/src/frontend/packages/core/src/shared/components/github-commit-author/github-commit-author.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/github-commit-author/github-commit-author.component.ts
similarity index 79%
rename from src/frontend/packages/core/src/shared/components/github-commit-author/github-commit-author.component.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/github-commit-author/github-commit-author.component.ts
index 00a89fc8c5..359e35c1e2 100644
--- a/src/frontend/packages/core/src/shared/components/github-commit-author/github-commit-author.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/github-commit-author/github-commit-author.component.ts
@@ -1,5 +1,6 @@
 import { Component, Input } from '@angular/core';
-import { GitCommit } from '../../../../../cloud-foundry/src/store/types/git.types';
+
+import { GitCommit } from '../../../store/types/git.types';
 
 @Component({
   selector: 'app-github-commit-author',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts
index 168d43fd25..64a79a420e 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts
@@ -6,7 +6,7 @@ import { map, startWith } from 'rxjs/operators';
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
 import { applicationEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types';
 import { IAppFavMetadata } from '../../../../../../../../cloud-foundry/src/cf-metadata-types';
-import { getFavoriteFromCfEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
+import { getFavoriteFromEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
 import {
   FavoritesConfigMapper,
 } from '../../../../../../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
@@ -16,6 +16,7 @@ import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
 import { IApp, ISpace } from '../../../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
+import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
 import { ApplicationService } from '../../../../../../features/applications/application.service';
 import { ApplicationStateData, ApplicationStateService } from '../../../../../services/application-state.service';
 import { CfOrgSpaceLabelService } from '../../../../../services/cf-org-space-label.service';
@@ -55,7 +56,7 @@ export class CardAppComponent extends CardCell<APIResource<IApp>> implements OnI
       this.row.entity.space_guid
     );
 
-    this.favorite = getFavoriteFromCfEntity(this.row, applicationEntityType, this.favoritesConfigMapper);
+    this.favorite = getFavoriteFromEntity(this.row, applicationEntityType, this.favoritesConfigMapper, CF_ENDPOINT_TYPE);
 
     const initState = this.appStateService.get(this.row.entity, null);
     this.applicationState$ = ApplicationService.getApplicationState(
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.ts
index c43911bdcb..c229dd2e8d 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.ts
@@ -8,7 +8,7 @@ import { organizationEntityType } from '../../../../../../../../cloud-foundry/sr
 import { createUserRoleInOrg } from '../../../../../../../../cloud-foundry/src/store/types/user.types';
 import { CurrentUserPermissions } from '../../../../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../../../../core/src/core/current-user-permissions.service';
-import { getFavoriteFromCfEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
+import { getFavoriteFromEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
 import { truthyIncludingZeroString } from '../../../../../../../../core/src/core/utils.service';
 import { ConfirmationDialogConfig } from '../../../../../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
@@ -38,6 +38,7 @@ import {
   createOrgQuotaDefinition,
 } from '../../../../../../features/cloud-foundry/services/cloud-foundry-organization.service';
 import { CfUserService } from '../../../../../data-services/cf-user.service';
+import { CF_ENDPOINT_TYPE } from './../../../../../../cf-types';
 
 
 @Component({
@@ -101,7 +102,7 @@ export class CfOrgCardComponent extends CardCell<APIResource<IOrganization>> imp
       refCount()
     );
 
-    this.favorite = getFavoriteFromCfEntity(this.row, organizationEntityType, this.favoritesConfigMapper);
+    this.favorite = getFavoriteFromEntity(this.row, organizationEntityType, this.favoritesConfigMapper, CF_ENDPOINT_TYPE);
 
     const allApps$: Observable<APIResource<IApp>[]> = this.cfEndpointService.appsPagObs.hasEntities$.pipe(
       switchMap(hasAll => hasAll ? this.cfEndpointService.getAppsInOrgViaAllApps(this.row) : observableOf(null))
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.ts
index ff2becb477..5d5886c3bb 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.ts
@@ -8,7 +8,7 @@ import { spaceEntityType } from '../../../../../../../../cloud-foundry/src/cf-en
 import { ISpaceFavMetadata } from '../../../../../../../../cloud-foundry/src/cf-metadata-types';
 import { CurrentUserPermissions } from '../../../../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../../../../core/src/core/current-user-permissions.service';
-import { getFavoriteFromCfEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
+import { getFavoriteFromEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
 import { truthyIncludingZeroString } from '../../../../../../../../core/src/core/utils.service';
 import { ConfirmationDialogConfig } from '../../../../../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
@@ -28,6 +28,7 @@ import { EndpointUser } from '../../../../../../../../store/src/types/endpoint.t
 import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
 import { IApp, ISpace } from '../../../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
+import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
 import { getStartedAppInstanceCount } from '../../../../../../cf.helpers';
 import { getSpaceRolesString } from '../../../../../../features/cloud-foundry/cf.helpers';
 import {
@@ -80,7 +81,7 @@ export class CfSpaceCardComponent extends CardCell<APIResource<ISpace>> implemen
     this.spaceGuid = this.row.metadata.guid;
     this.entityConfig = new ComponentEntityMonitorConfig(this.spaceGuid, cfEntityFactory(spaceEntityType));
     this.orgGuid = this.cfOrgService.orgGuid;
-    this.favorite = getFavoriteFromCfEntity(this.row, spaceEntityType, this.favoritesConfigMapper);
+    this.favorite = getFavoriteFromEntity(this.row, spaceEntityType, this.favoritesConfigMapper, CF_ENDPOINT_TYPE);
     this.cardMenu = [
       {
         label: 'Edit',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.spec.ts
index ef6dce4ecb..92e0e8de98 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/table-cell-commit-author/table-cell-commit-author.component.spec.ts
@@ -1,9 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import {
-  GithubCommitAuthorComponent,
-} from '../../../../../../../../core/src/shared/components/github-commit-author/github-commit-author.component';
 import { BaseTestModulesNoShared } from '../../../../../../../../core/test-framework/core-test.helper';
+import { GithubCommitAuthorComponent } from '../../../../github-commit-author/github-commit-author.component';
 import { TableCellCommitAuthorComponent } from './table-cell-commit-author.component';
 
 describe('TableCellCommitAuthorComponent', () => {
diff --git a/src/frontend/packages/core/src/core/user-favorite-helpers.ts b/src/frontend/packages/core/src/core/user-favorite-helpers.ts
index 484869305e..cd802d69c4 100644
--- a/src/frontend/packages/core/src/core/user-favorite-helpers.ts
+++ b/src/frontend/packages/core/src/core/user-favorite-helpers.ts
@@ -1,27 +1,27 @@
 import { CfAPIResource } from '../../../cloud-foundry/src/store/types/cf-api.types';
+import { IEntityMetadata } from '../../../store/src/entity-catalog/entity-catalog.types';
 import { EndpointModel } from '../../../store/src/types/endpoint.types';
 import { IFavoriteMetadata, UserFavorite } from '../../../store/src/types/user-favorites.types';
 import { FavoritesConfigMapper } from '../shared/components/favorites-meta-card/favorite-config-mapper';
-import { IEntityMetadata } from '../../../store/src/entity-catalog/entity-catalog.types';
+import { entityCatalog } from './../../../store/src/entity-catalog/entity-catalog.service';
 
 export function isEndpointTypeFavorite(favorite: UserFavorite<IFavoriteMetadata>) {
   return !favorite.entityId;
 }
 
-// TODO: Move cf specific code to cf package - #3769
-export function getFavoriteFromCfEntity<T extends IEntityMetadata = IEntityMetadata>(
+// Uses the endpoint definition to get the helper that can look up an entitty
+export function getFavoriteFromEntity<T extends IEntityMetadata = IEntityMetadata>(
   entity,
   entityKey: string,
-  favoritesConfigMapper: FavoritesConfigMapper
-) {
-  if (isCfEntity(entity as CfAPIResource)) {
-    return favoritesConfigMapper.getFavoriteFromEntity<T>(
-      entityKey,
-      'cf',
-      entity.entity.cfGuid,
-      entity
-    );
+  favoritesConfigMapper: FavoritesConfigMapper,
+  entityType: string
+): UserFavorite<T> {
+  // Use entity catalog to get favorite for the given endpoint type
+  const endpoint = entityCatalog.getEndpoint(entityType);
+  if (endpoint && endpoint.definition && endpoint.definition.favoriteFromEntity) {
+    return endpoint.definition.favoriteFromEntity(entity, entityKey, favoritesConfigMapper);
   }
+
   return null;
 }
 
diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts
index 91e4819fba..fef972f035 100644
--- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts
+++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts
@@ -5,22 +5,15 @@ import { MatDrawer } from '@angular/material';
 import { ActivatedRoute, ActivatedRouteSnapshot, NavigationEnd, Route, Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog.service';
-import { IEntityMetadata } from 'frontend/packages/store/src/entity-catalog/entity-catalog.types';
 import { combineLatest, Observable, of, Subscription } from 'rxjs';
 import { distinctUntilChanged, filter, map, startWith, withLatestFrom } from 'rxjs/operators';
 
 import { GetCurrentUsersRelations } from '../../../../../cloud-foundry/src/actions/permissions.actions';
-import { cfInfoEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
-import { CF_ENDPOINT_TYPE } from '../../../../../cloud-foundry/src/cf-types';
-import {
-  CfInfoDefinitionActionBuilders,
-} from '../../../../../cloud-foundry/src/entity-action-builders/cf-info.action-builders';
 import { CloseSideNav, DisableMobileNav, EnableMobileNav } from '../../../../../store/src/actions/dashboard-actions';
 import { GetUserFavoritesAction } from '../../../../../store/src/actions/user-favourites-actions/get-user-favorites-action';
 import { DashboardOnlyAppState } from '../../../../../store/src/app-state';
 import { DashboardState } from '../../../../../store/src/reducers/dashboard-reducer';
 import { selectDashboardState } from '../../../../../store/src/selectors/dashboard.selectors';
-import { EndpointHealthCheck } from '../../../../endpoints-health-checks';
 import { TabNavService } from '../../../../tab-nav.service';
 import { CustomizationService } from '../../../core/customizations.types';
 import { EndpointsService } from '../../../core/endpoints.service';
@@ -142,13 +135,14 @@ export class DashboardBaseComponent implements OnInit, OnDestroy, AfterViewInit
       ),
       this.tabNavService.tabSubNav$
     );
-    // TODO: Move cf code out to cf module #3849
-    this.endpointsService.registerHealthCheck(
-      new EndpointHealthCheck(CF_ENDPOINT_TYPE, (endpoint) => {
-        entityCatalog.getEntity<IEntityMetadata, any, CfInfoDefinitionActionBuilders>(CF_ENDPOINT_TYPE, cfInfoEntityType)
-          .actionDispatchManager.dispatchGet(endpoint.guid);
-      })
-    );
+
+    // Register all health checks for endpoint types that support this
+    entityCatalog.getAllEndpointTypes().forEach(epType => {
+      if (epType && epType.definition && epType.definition.healthCheck) {
+        this.endpointsService.registerHealthCheck(epType.definition.healthCheck);
+      }
+    });
+
     this.dispatchRelations();
     this.store.dispatch(new GetUserFavoritesAction());
   }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.spec.ts
index 7de7f3464a..93b850ca5e 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component.spec.ts
@@ -2,15 +2,15 @@ import { Component, ViewChild } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreModule } from '@ngrx/store';
+import { createBasicStoreModule } from '@stratos/store/testing';
 import { Observable, of } from 'rxjs';
 
 import { EntitySchema } from '../../../../../../../../store/src/helpers/entity-schema';
+import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
 import { CoreTestingModule } from '../../../../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
 import * as favoriteHelpers from '../../../../../../core/user-favorite-helpers';
 import { UserFavoriteManager } from '../../../../../../core/user-favorite-manager';
-import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { SharedModule } from '../../../../../shared.module';
 import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../shared.types';
 import { FavoritesConfigMapper } from '../../../../favorites-meta-card/favorite-config-mapper';
@@ -152,7 +152,7 @@ describe('MetaCardComponent', () => {
 
   it('should set favorite from entityConfig if not set', () => {
     spyOn(favoritesConfigMapper, 'getPrettyTypeName').and.returnValue('prettyName');
-    spyOn(favoriteHelpers, 'getFavoriteFromCfEntity').and.returnValue(favorite);
+    spyOn(favoriteHelpers, 'getFavoriteFromEntity').and.returnValue(favorite);
     component.entityConfig = entityConfig;
     fixture.detectChanges();
 
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 34ac89593b..c4cc4b670e 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
@@ -2,10 +2,10 @@ import { Component, ContentChild, ContentChildren, Input, OnDestroy, QueryList }
 import { combineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
 import { first, map, tap } from 'rxjs/operators';
 
+import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
-import { getFavoriteFromCfEntity } from '../../../../../../core/user-favorite-helpers';
+import { getFavoriteFromEntity } from '../../../../../../core/user-favorite-helpers';
 import { safeUnsubscribe } from '../../../../../../core/utils.service';
-import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../shared.types';
 import { FavoritesConfigMapper } from '../../../../favorites-meta-card/favorite-config-mapper';
 import { MetaCardItemComponent } from '../meta-card-item/meta-card-item.component';
@@ -77,7 +77,13 @@ export class MetaCardComponent implements OnDestroy {
       if (!this.favorite) {
         this.entityMonitorSub = entityMonitor.entity$.pipe(
           first(),
-          tap(entity => this.favorite = getFavoriteFromCfEntity(entity, entityConfig.schema.key, this.favoritesConfigMapper))
+          tap(entity => this.favorite = getFavoriteFromEntity(
+            entity,
+            entityConfig.schema.key,
+            this.favoritesConfigMapper,
+            entityConfig.schema.endpointType,
+            entityConfig
+          ))
         ).subscribe();
       }
     }
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-radio/table-cell-radio.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-radio/table-cell-radio.component.spec.ts
index 63ec9866f1..60a884ed59 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-radio/table-cell-radio.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell-radio/table-cell-radio.component.spec.ts
@@ -1,8 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { ApplicationService } from '../../../../../../../cloud-foundry/src/features/applications/application.service';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
-import { ApplicationServiceMock } from '../../../../../../test-framework/application-service-helper';
 import { CoreModule } from '../../../../../core/core.module';
 import { IListDataSource } from '../../data-sources-controllers/list-data-source-types';
 import { TableCellRadioComponent } from './table-cell-radio.component';
@@ -16,9 +14,7 @@ describe('TableCellRadioComponent', () => {
       TestBed.configureTestingModule({
         declarations: [TableCellRadioComponent],
         imports: [CoreModule],
-        providers: [
-          { provide: ApplicationService, useClass: ApplicationServiceMock }
-        ]
+        providers: []
       }).compileComponents();
     })
   );
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.spec.ts
index 5edaec239c..b7ff749166 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-cell/table-cell.component.spec.ts
@@ -1,6 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { ApplicationStateService } from '../../../../../../../cloud-foundry/src/shared/services/application-state.service';
 import { CoreModule } from '../../../../../core/core.module';
 import { UtilsService } from '../../../../../core/utils.service';
 import { PercentagePipe } from '../../../../pipes/percentage.pipe';
@@ -51,7 +50,6 @@ describe('TableCellComponent', () => {
         CoreModule
       ],
       providers: [
-        ApplicationStateService,
         UtilsService,
       ]
     })
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.spec.ts
index 384f6ad9d5..02c3cb866a 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/table-cell-endpoint-name/table-cell-endpoint-name.component.spec.ts
@@ -1,9 +1,9 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { CFBaseTestModules } from '../../../../../../../../cloud-foundry/test-framework/cf-test-helper';
+import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { EndpointModel } from '../../../../../../../../store/src/types/endpoint.types';
+import { BaseTestModules } from '../../../../../../../test-framework/core-test.helper';
 import { CoreModule } from '../../../../../../core/core.module';
-import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { TableCellEndpointNameComponent } from './table-cell-endpoint-name.component';
 
 describe('TableCellEndpointNameComponent', () => {
@@ -14,9 +14,7 @@ describe('TableCellEndpointNameComponent', () => {
     TestBed.configureTestingModule({
       imports: [
         CoreModule,
-        // CoreTestingModule,
-        // createBasicStoreModule(),
-        ...CFBaseTestModules
+        ...BaseTestModules,
       ],
       providers: [
         EntityMonitorFactory,
diff --git a/src/frontend/packages/core/src/shared/components/metrics-chart/metrics-chart.component.spec.ts b/src/frontend/packages/core/src/shared/components/metrics-chart/metrics-chart.component.spec.ts
index 98fa58a275..09af467030 100644
--- a/src/frontend/packages/core/src/shared/components/metrics-chart/metrics-chart.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/metrics-chart/metrics-chart.component.spec.ts
@@ -2,8 +2,6 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { createBasicStoreModule } from '@stratos/store/testing';
 
-import { FetchApplicationMetricsAction } from '../../../../../cloud-foundry/src/actions/cf-metrics.actions';
-import { MetricQueryConfig } from '../../../../../store/src/actions/metrics.actions';
 import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
 import { CoreModule } from '../../../core/core.module';
 import { MDAppModule } from '../../../core/md.module';
@@ -35,14 +33,15 @@ xdescribe('MetricsChartComponent', () => {
     component = fixture.componentInstance;
     component.chartConfig = new MetricsLineChartConfig();
     component.chartConfig.xAxisLabel = 'Time';
-    component.metricsConfig = {
-      metricsAction: new FetchApplicationMetricsAction(
-        '1',
-        '2',
-        new MetricQueryConfig('test'),
-      ),
-      getSeriesName: () => 'test'
-    };
+    // TODO: Don't use action in another package
+    // component.metricsConfig = {
+    //   metricsAction: new FetchApplicationMetricsAction(
+    //     '1',
+    //     '2',
+    //     new MetricQueryConfig('test'),
+    //   ),
+    //   getSeriesName: () => 'test'
+    // };
     fixture.detectChanges();
   });
 
diff --git a/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.ts b/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.ts
index 5cd0b3e7c5..d485087726 100644
--- a/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.ts
+++ b/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.ts
@@ -2,11 +2,10 @@ import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core
 import * as moment from 'moment';
 import { Subscription } from 'rxjs';
 
-import { metricEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
 import { MetricsAction } from '../../../../../store/src/actions/metrics.actions';
-import { IMetrics } from '../../../../../store/src/types/base-metric.types';
 import { EntityMonitor } from '../../../../../store/src/monitors/entity-monitor';
 import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
+import { IMetrics } from '../../../../../store/src/types/base-metric.types';
 import { MetricsRangeSelectorManagerService } from '../../services/metrics-range-selector-manager.service';
 import { ITimeRange, MetricQueryType } from '../../services/metrics-range-selector.types';
 
@@ -57,7 +56,7 @@ export class MetricsRangeSelectorComponent implements OnDestroy {
       action.guid,
       // Look specifically for metrics entity type for the given endpoint. See #3783
       {
-        entityType: metricEntityType,
+        entityType: action.entityType,
         endpointType: action.endpointType
       }
     );
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index 611693ad60..15b63c044e 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -5,14 +5,6 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
-import {
-  ApplicationInstanceChartComponent,
-} from '../../../cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component';
-import { GitSCMService } from '../../../cloud-foundry/src/shared/data-services/scm/scm.service';
-import { ApplicationStateService } from '../../../cloud-foundry/src/shared/services/application-state.service';
-import {
-  CloudFoundryUserProvidedServicesService,
-} from '../../../cloud-foundry/src/shared/services/cloud-foundry-user-provided-services.service';
 import { EntityMonitorFactory } from '../../../store/src/monitors/entity-monitor.factory.service';
 import { InternalEventMonitorFactory } from '../../../store/src/monitors/internal-event-monitor.factory';
 import { PaginationMonitorFactory } from '../../../store/src/monitors/pagination-monitor.factory';
@@ -51,7 +43,6 @@ import { FavoritesGlobalListComponent } from './components/favorites-global-list
 import { FavoritesMetaCardComponent } from './components/favorites-meta-card/favorites-meta-card.component';
 import { FileInputComponent } from './components/file-input/file-input.component';
 import { FocusDirective } from './components/focus.directive';
-import { GithubCommitAuthorComponent } from './components/github-commit-author/github-commit-author.component';
 import { IntroScreenComponent } from './components/intro-screen/intro-screen.component';
 import { JsonViewerComponent } from './components/json-viewer/json-viewer.component';
 import { listCardComponents } from './components/list/list-cards/card.types';
@@ -189,12 +180,10 @@ import { UserPermissionDirective } from './user-permission.directive';
     EnvVarViewComponent,
     RingChartComponent,
     MetricsChartComponent,
-    ApplicationInstanceChartComponent,
     StratosTitleComponent,
     IntroScreenComponent,
     EnumerateComponent,
     UploadProgressIndicatorComponent,
-    GithubCommitAuthorComponent,
     UserProfileBannerComponent,
     AppActionMonitorComponent,
     AppActionMonitorIconComponent,
@@ -286,13 +275,11 @@ import { UserPermissionDirective } from './user-permission.directive';
     CardNumberMetricComponent,
     EnvVarViewComponent,
     MetricsChartComponent,
-    ApplicationInstanceChartComponent,
     StratosTitleComponent,
     IntroScreenComponent,
     UserProfileBannerComponent,
     EnumerateComponent,
     UploadProgressIndicatorComponent,
-    GithubCommitAuthorComponent,
     AppActionMonitorComponent,
     AppActionMonitorIconComponent,
     UserPermissionDirective,
@@ -341,7 +328,6 @@ import { UserPermissionDirective } from './user-permission.directive';
   ],
   providers: [
     ListConfig,
-    ApplicationStateService,
     EndpointListHelper,
     EndpointsListConfigService,
     // CfUserService,
@@ -352,9 +338,7 @@ import { UserPermissionDirective } from './user-permission.directive';
     InternalEventMonitorFactory,
     // ServiceActionHelperService,
     MetricsRangeSelectorService,
-    GitSCMService,
     LongRunningOperationsService,
-    CloudFoundryUserProvidedServicesService
   ]
 })
 export class SharedModule { }
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts
index 80e9d7a61a..a1128d2e73 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts
@@ -1,8 +1,10 @@
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 
+import { EndpointHealthCheck } from '../../../core/endpoints-health-checks';
 import { EndpointAuthTypeConfig } from '../../../core/src/core/extension/extension-types';
 import { Omit } from '../../../core/src/core/utils.service';
+import { FavoritesConfigMapper } from '../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
 import { StratosStatus } from '../../../core/src/shared/shared.types';
 import { GeneralEntityAppState } from '../app-state';
 import {
@@ -15,6 +17,7 @@ import {
   PaginationPageIteratorConfig,
 } from '../entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe';
 import { EntitySchema } from '../helpers/entity-schema';
+import { UserFavorite } from '../types/user-favorites.types';
 
 export interface EntityCatalogEntityConfig {
   entityType: string;
@@ -98,6 +101,10 @@ export interface IStratosEndpointDefinition<T = EntityCatalogSchemas | EntitySch
   readonly globalPreRequest?: PreApiRequest;
   readonly globalPrePaginationRequest?: PrePaginationApiRequest;
   readonly globalErrorMessageHandler?: ApiErrorMessageHandler;
+  readonly healthCheck?: EndpointHealthCheck;
+  readonly favoriteFromEntity?: <M extends IEntityMetadata = IEntityMetadata>(
+    entity: any, entityKey: string, favoritesConfigMapper: FavoritesConfigMapper
+  ) => UserFavorite<M>;
 }
 
 export interface StratosEndpointExtensionDefinition extends Omit<IStratosEndpointDefinition, 'schema'> { }

From a8b6ac00de4425b2c8752de38b0956acbee0595b Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 7 May 2020 16:46:04 +0100
Subject: [PATCH 078/176] Disable random route override setting when deploying
 apps in e2e tests - pushes route over max 63 chars

---
 src/test-e2e/application/application-deploy-helper.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/test-e2e/application/application-deploy-helper.ts b/src/test-e2e/application/application-deploy-helper.ts
index 03f7c456a3..05be4096d1 100644
--- a/src/test-e2e/application/application-deploy-helper.ts
+++ b/src/test-e2e/application/application-deploy-helper.ts
@@ -207,9 +207,10 @@ export function createApplicationDeployTests(type = CREATE_APP_DEPLOY_TEST_TYPE.
       const overrides = deployApp.getOverridesForm();
       overrides.waitUntilShown();
 
-      if (type !== CREATE_APP_DEPLOY_TEST_TYPE.DOCKER) {
-        overrides.fill({ name: res.testAppName, random_route: true });
-      }
+      // Adding a random route appends to the app name... which bumps route over 63 character max
+      // if (type !== CREATE_APP_DEPLOY_TEST_TYPE.DOCKER) {
+      //   overrides.fill({ name: res.testAppName, random_route: true });
+      // }
 
       e2e.debugLog(`${loggingPrefix} Overrides Step - overrides set`);
     });

From 99debc04bf84338cd8609bde344f5921f2cc2bbb Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Thu, 7 May 2020 17:21:05 +0100
Subject: [PATCH 079/176] Override name but do not set a random route

---
 src/test-e2e/application/application-deploy-helper.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test-e2e/application/application-deploy-helper.ts b/src/test-e2e/application/application-deploy-helper.ts
index 05be4096d1..ab6b5a4057 100644
--- a/src/test-e2e/application/application-deploy-helper.ts
+++ b/src/test-e2e/application/application-deploy-helper.ts
@@ -208,9 +208,9 @@ export function createApplicationDeployTests(type = CREATE_APP_DEPLOY_TEST_TYPE.
       overrides.waitUntilShown();
 
       // Adding a random route appends to the app name... which bumps route over 63 character max
-      // if (type !== CREATE_APP_DEPLOY_TEST_TYPE.DOCKER) {
-      //   overrides.fill({ name: res.testAppName, random_route: true });
-      // }
+      if (type !== CREATE_APP_DEPLOY_TEST_TYPE.DOCKER) {
+        overrides.fill({ name: res.testAppName });
+      }
 
       e2e.debugLog(`${loggingPrefix} Overrides Step - overrides set`);
     });

From 40a9f2eb5677f449f5adba4ab040ba0faf812fa0 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 7 May 2020 17:21:40 +0100
Subject: [PATCH 080/176] Fix unit tests

---
 .../delete-app-instances.component.spec.ts            |  4 +++-
 .../delete-app-routes.component.spec.ts               |  4 +++-
 .../application-instance-chart.component.spec.ts      |  2 ++
 .../application-poll.component.spec.ts                |  4 +++-
 .../tabs/gitscm-tab/gitscm-tab.component.spec.ts      |  7 ++++++-
 .../routes-tab/routes-tab.component.spec.ts           |  8 ++++----
 .../cli-info-cloud-foundry.component.spec.ts          |  6 ++++++
 .../edit-organization-step.component.spec.ts          |  5 ++++-
 .../edit-organization.component.spec.ts               | 11 +++++++++--
 .../edit-space/edit-space.component.spec.ts           | 11 ++++++++++-
 .../cloud-foundry-organization-base.component.spec.ts |  5 ++++-
 ...loud-foundry-organization-events.component.spec.ts |  6 +++++-
 .../cloud-foundry-space-base.component.spec.ts        |  5 ++++-
 .../cloud-foundry-space-events.component.spec.ts      |  6 +++++-
 .../cloud-foundry-space-summary.component.spec.ts     |  6 +++++-
 .../specify-user-provided-details.component.spec.ts   |  4 +++-
 .../github-commit-author.component.spec.ts            |  3 ++-
 .../app-service-binding-list-config.service.spec.ts   |  4 +++-
 ...r-provided-service-instance-card.component.spec.ts |  8 +++++---
 .../meta-card/meta-card-base/meta-card.component.ts   |  3 +--
 20 files changed, 87 insertions(+), 25 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.spec.ts
index 4864ddf0ae..3cd2e19cb9 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.spec.ts
@@ -11,6 +11,7 @@ import { ServiceActionHelperService } from '../../../../shared/data-services/ser
 import {
   ApplicationEnvVarsHelper,
 } from '../../application/application-tabs-base/tabs/build-tab/application-env-vars.service';
+import { ApplicationStateService } from './../../../../shared/services/application-state.service';
 import { DeleteAppServiceInstancesComponent } from './delete-app-instances.component';
 
 describe('DeleteAppInstancesComponent', () => {
@@ -31,7 +32,8 @@ describe('DeleteAppInstancesComponent', () => {
         generateTestApplicationServiceProvider(cfId, appId),
         ApplicationEnvVarsHelper,
         DatePipe,
-        ServiceActionHelperService
+        ServiceActionHelperService,
+        ApplicationStateService,
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-routes/delete-app-routes.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-routes/delete-app-routes.component.spec.ts
index 2506b0a9fc..763d19e9e0 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-routes/delete-app-routes.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-routes/delete-app-routes.component.spec.ts
@@ -10,6 +10,7 @@ import { applicationEntityType } from '../../../../cf-entity-types';
 import {
   ApplicationEnvVarsHelper,
 } from '../../application/application-tabs-base/tabs/build-tab/application-env-vars.service';
+import { ApplicationStateService } from './../../../../shared/services/application-state.service';
 import { DeleteAppRoutesComponent } from './delete-app-routes.component';
 
 describe('DeleteAppRoutesComponent', () => {
@@ -29,7 +30,8 @@ describe('DeleteAppRoutesComponent', () => {
         ),
         generateTestApplicationServiceProvider(cfId, appId),
         ApplicationEnvVarsHelper,
-        DatePipe
+        DatePipe,
+        ApplicationStateService
       ]
 
     })
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.spec.ts
index ebdde598a6..07fb0f11ed 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-instance-chart/application-instance-chart.component.spec.ts
@@ -5,6 +5,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { CoreModule } from '../../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../../core/src/shared/shared.module';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { CloudFoundrySharedModule } from './../../../../shared/cf-shared.module';
 import { ApplicationInstanceChartComponent } from './application-instance-chart.component';
 
 describe('ApplicationInstanceChartComponent', () => {
@@ -18,6 +19,7 @@ describe('ApplicationInstanceChartComponent', () => {
         RouterTestingModule,
         CoreModule,
         SharedModule,
+        CloudFoundrySharedModule,
         NoopAnimationsModule
       ]
     })
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-poll/application-poll.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-poll/application-poll.component.spec.ts
index 89d58bc765..052864aa51 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-poll/application-poll.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-poll/application-poll.component.spec.ts
@@ -8,6 +8,7 @@ import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { applicationEntityType } from '../../../../../cf-entity-types';
 import { ApplicationPollingService } from '../application-polling.service';
 import { ApplicationEnvVarsHelper } from '../tabs/build-tab/application-env-vars.service';
+import { ApplicationStateService } from './../../../../../shared/services/application-state.service';
 import { ApplicationPollComponent } from './application-poll.component';
 
 describe('ApplicationPollComponent', () => {
@@ -28,7 +29,8 @@ describe('ApplicationPollComponent', () => {
           new GetApplication(appId, cfId)
         ),
         generateTestApplicationServiceProvider(cfId, appId),
-        ApplicationEnvVarsHelper
+        ApplicationEnvVarsHelper,
+        ApplicationStateService,
       ],
       imports: generateCfBaseTestModules()
     })
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.spec.ts
index cff6701346..f7a0939e21 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.spec.ts
@@ -11,6 +11,10 @@ import { SharedModule } from '../../../../../../../../core/src/shared/shared.mod
 import { ApplicationServiceMock } from '../../../../../../../../core/test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ApplicationService } from '../../../../application.service';
+import {
+  GithubCommitAuthorComponent,
+} from './../../../../../../shared/components/github-commit-author/github-commit-author.component';
+import { GitSCMService } from './../../../../../../shared/data-services/scm/scm.service';
 import { GitSCMTabComponent } from './gitscm-tab.component';
 
 describe('GitSCMTabComponent', () => {
@@ -18,7 +22,7 @@ describe('GitSCMTabComponent', () => {
   let fixture: ComponentFixture<GitSCMTabComponent>;
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [GitSCMTabComponent],
+      declarations: [GitSCMTabComponent, GithubCommitAuthorComponent],
       imports: [
         ...generateCfStoreModules(),
         CoreModule,
@@ -32,6 +36,7 @@ describe('GitSCMTabComponent', () => {
         { provide: ApplicationService, useClass: ApplicationServiceMock },
         { provide: GITHUB_API_URL, useFactory: getGitHubAPIURL },
         DatePipe,
+        GitSCMService,
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component.spec.ts
index ff19f3b799..b1914fc5d2 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component.spec.ts
@@ -4,9 +4,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import {
   generateTestApplicationServiceProvider,
 } from '../../../../../../../../../core/test-framework/application-service-helper';
-import {
-  generateCfBaseTestModules,
-} from '../../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { generateCfBaseTestModules } from '../../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { ApplicationStateService } from '../../../../../../../shared/services/application-state.service';
 import { ApplicationEnvVarsHelper } from '../../build-tab/application-env-vars.service';
 import { RoutesTabComponent } from './routes-tab.component';
 
@@ -21,7 +20,8 @@ describe('RoutesTabComponent', () => {
       providers: [
         generateTestApplicationServiceProvider('test', 'test'),
         ApplicationEnvVarsHelper,
-        DatePipe
+        DatePipe,
+        ApplicationStateService,
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.spec.ts
index ed2c36975c..2ab8872fb0 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.spec.ts
@@ -7,6 +7,10 @@ import {
 } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { CliCommandComponent } from '../../../shared/components/cli-info/cli-command/cli-command.component';
 import { CliInfoComponent } from '../../../shared/components/cli-info/cli-info.component';
+import { ApplicationStateService } from '../../../shared/services/application-state.service';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../shared/services/cloud-foundry-user-provided-services.service';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { CloudFoundryEndpointService } from '../services/cloud-foundry-endpoint.service';
 import { CliInfoCloudFoundryComponent } from './cli-info-cloud-foundry.component';
@@ -23,6 +27,8 @@ describe('CliInfoCloudFoundryComponent', () => {
         CloudFoundryEndpointService,
         generateTestCfEndpointServiceProvider(),
         ActiveRouteCfOrgSpace,
+        ApplicationStateService,
+        CloudFoundryUserProvidedServicesService,
         TabNavService
       ]
     })
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.spec.ts
index fe3c60c481..12cbcf54ef 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.spec.ts
@@ -4,6 +4,9 @@ import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
 } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../../shared/services/cloud-foundry-user-provided-services.service';
 import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
 import { EditOrganizationStepComponent } from './edit-organization-step.component';
 
@@ -15,7 +18,7 @@ describe('EditOrganizationStepComponent', () => {
     TestBed.configureTestingModule({
       declarations: [EditOrganizationStepComponent],
       imports: generateCfBaseTestModules(),
-      providers: [ActiveRouteCfOrgSpace, generateTestCfEndpointServiceProvider()]
+      providers: [ActiveRouteCfOrgSpace, generateTestCfEndpointServiceProvider(), CloudFoundryUserProvidedServicesService]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization.component.spec.ts
index ecead39a28..e176d3137a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization.component.spec.ts
@@ -5,6 +5,9 @@ import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
 } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../shared/services/cloud-foundry-user-provided-services.service';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { EditOrganizationStepComponent } from './edit-organization-step/edit-organization-step.component';
 import { EditOrganizationComponent } from './edit-organization.component';
@@ -17,8 +20,12 @@ describe('EditOrganizationComponent', () => {
     TestBed.configureTestingModule({
       declarations: [EditOrganizationComponent, EditOrganizationStepComponent],
       imports: generateCfBaseTestModules(),
-      providers: [ActiveRouteCfOrgSpace, generateTestCfEndpointServiceProvider(), TabNavService]
-
+      providers: [
+        ActiveRouteCfOrgSpace,
+        generateTestCfEndpointServiceProvider(),
+        TabNavService,
+        CloudFoundryUserProvidedServicesService,
+      ]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.spec.ts
index a1c01fa14c..8b6b5b4a40 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.spec.ts
@@ -5,6 +5,9 @@ import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
 } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../shared/services/cloud-foundry-user-provided-services.service';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { CloudFoundryOrganizationService } from '../services/cloud-foundry-organization.service';
 import { EditSpaceStepComponent } from './edit-space-step/edit-space-step.component';
@@ -18,7 +21,13 @@ describe('EditSpaceComponent', () => {
     TestBed.configureTestingModule({
       declarations: [EditSpaceComponent, EditSpaceStepComponent],
       imports: generateCfBaseTestModules(),
-      providers: [ActiveRouteCfOrgSpace, generateTestCfEndpointServiceProvider(), TabNavService, CloudFoundryOrganizationService]
+      providers: [
+        ActiveRouteCfOrgSpace,
+        generateTestCfEndpointServiceProvider(),
+        TabNavService,
+        CloudFoundryOrganizationService,
+        CloudFoundryUserProvidedServicesService,
+      ]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.spec.ts
index d2ac962cbf..2270c81012 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.spec.ts
@@ -5,6 +5,9 @@ import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
 } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../../../shared/services/cloud-foundry-user-provided-services.service';
 import { CloudFoundryOrganizationBaseComponent } from './cloud-foundry-organization-base.component';
 
 describe('CloudFoundryOrganizationBaseComponent', () => {
@@ -15,7 +18,7 @@ describe('CloudFoundryOrganizationBaseComponent', () => {
     TestBed.configureTestingModule({
       declarations: [CloudFoundryOrganizationBaseComponent],
       imports: generateCfBaseTestModules(),
-      providers: [...generateTestCfEndpointServiceProvider(), TabNavService]
+      providers: [...generateTestCfEndpointServiceProvider(), TabNavService, CloudFoundryUserProvidedServicesService]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component.spec.ts
index 08ea6f028e..1a987f6fb4 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-events/cloud-foundry-organization-events.component.spec.ts
@@ -12,6 +12,9 @@ import {
   CfOrganizationEventsConfigService,
 } from '../../../../../shared/components/list/list-types/cf-events/types/cf-org-events-config.service';
 import { CfUserService } from '../../../../../shared/data-services/cf-user.service';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../../../shared/services/cloud-foundry-user-provided-services.service';
 import { CloudFoundryEndpointService } from '../../../services/cloud-foundry-endpoint.service';
 import { CloudFoundryOrganizationService } from '../../../services/cloud-foundry-organization.service';
 import { CloudFoundryOrganizationEventsComponent } from './cloud-foundry-organization-events.component';
@@ -34,7 +37,8 @@ describe('CloudFoundryOrganizationEventsComponent', () => {
         generateActiveRouteCfOrgSpaceMock(),
         CloudFoundryOrganizationService,
         CfUserService,
-        CloudFoundryEndpointService
+        CloudFoundryEndpointService,
+        CloudFoundryUserProvidedServicesService,
       ],
       imports: [...CFBaseTestModules]
     })
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.spec.ts
index 38dfaf8ce3..b525621558 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.spec.ts
@@ -5,6 +5,9 @@ import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
 } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../../../../shared/services/cloud-foundry-user-provided-services.service';
 import { CloudFoundrySpaceBaseComponent } from './cloud-foundry-space-base.component';
 
 describe('CloudFoundrySpaceBaseComponent', () => {
@@ -15,7 +18,7 @@ describe('CloudFoundrySpaceBaseComponent', () => {
     TestBed.configureTestingModule({
       declarations: [CloudFoundrySpaceBaseComponent],
       imports: generateCfBaseTestModules(),
-      providers: [generateTestCfEndpointServiceProvider(), TabNavService]
+      providers: [generateTestCfEndpointServiceProvider(), TabNavService, CloudFoundryUserProvidedServicesService]
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.spec.ts
index 8981199e29..9232d66e64 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-events/cloud-foundry-space-events.component.spec.ts
@@ -12,6 +12,9 @@ import {
   CfSpaceEventsConfigService,
 } from '../../../../../../../shared/components/list/list-types/cf-events/types/cf-space-events-config.service';
 import { CfUserService } from '../../../../../../../shared/data-services/cf-user.service';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../../../../../shared/services/cloud-foundry-user-provided-services.service';
 import { CloudFoundryEndpointService } from '../../../../../services/cloud-foundry-endpoint.service';
 import { CloudFoundryOrganizationService } from '../../../../../services/cloud-foundry-organization.service';
 import { CloudFoundrySpaceService } from '../../../../../services/cloud-foundry-space.service';
@@ -36,7 +39,8 @@ describe('CloudFoundrySpaceEventsComponent', () => {
         CloudFoundrySpaceService,
         CfUserService,
         CloudFoundryEndpointService,
-        CloudFoundryOrganizationService
+        CloudFoundryOrganizationService,
+        CloudFoundryUserProvidedServicesService,
       ],
       imports: [...CFBaseTestModules]
     })
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts
index 42709f07f1..175b9dfb14 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts
@@ -18,6 +18,9 @@ import {
   CardCfSpaceDetailsComponent,
 } from '../../../../../../../shared/components/cards/card-cf-space-details/card-cf-space-details.component';
 import { CfUserService } from '../../../../../../../shared/data-services/cf-user.service';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../../../../../shared/services/cloud-foundry-user-provided-services.service';
 import { CloudFoundryEndpointService } from '../../../../../services/cloud-foundry-endpoint.service';
 import { CloudFoundryOrganizationService } from '../../../../../services/cloud-foundry-organization.service';
 import { CloudFoundrySpaceService } from '../../../../../services/cloud-foundry-space.service';
@@ -37,7 +40,8 @@ describe('CloudFoundrySpaceSummaryComponent', () => {
         { provide: CloudFoundrySpaceService, useClass: CloudFoundrySpaceServiceMock },
         CloudFoundryOrganizationService,
         TabNavService,
-        CfUserService
+        CfUserService,
+        CloudFoundryUserProvidedServicesService,
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.spec.ts
index 2900b6bbe2..4fa276d943 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.spec.ts
@@ -4,6 +4,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { generateCfBaseTestModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { AppNameUniqueDirective } from '../../../directives/app-name-unique.directive/app-name-unique.directive';
+import { CloudFoundryUserProvidedServicesService } from '../../../services/cloud-foundry-user-provided-services.service';
 import { CsiModeService } from '../csi-mode.service';
 import { SpecifyUserProvidedDetailsComponent } from './specify-user-provided-details.component';
 
@@ -23,7 +24,8 @@ describe('SpecifyUserProvidedDetailsComponent', () => {
         HttpClientTestingModule
       ],
       providers: [
-        CsiModeService
+        CsiModeService,
+        CloudFoundryUserProvidedServicesService,
       ]
     })
       .compileComponents();
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/github-commit-author/github-commit-author.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/github-commit-author/github-commit-author.component.spec.ts
index a04d43d743..86cf4c6a8c 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/github-commit-author/github-commit-author.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/github-commit-author/github-commit-author.component.spec.ts
@@ -1,4 +1,5 @@
-import { async, ComponentFixture, TestBed } from './@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
 import { GithubCommitAuthorComponent } from './github-commit-author.component';
 
 describe('GithubCommitAuthorComponent', () => {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.spec.ts
index e9b6d2de3a..076d755dd6 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.spec.ts
@@ -7,6 +7,7 @@ import {
   ApplicationEnvVarsHelper,
 } from '../../../../../features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service';
 import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service';
+import { ApplicationStateService } from '../../../../services/application-state.service';
 import { AppServiceBindingListConfigService } from './app-service-binding-list-config.service';
 
 describe('AppServiceBindingListConfigService', () => {
@@ -17,7 +18,8 @@ describe('AppServiceBindingListConfigService', () => {
         generateTestApplicationServiceProvider('1', '1'),
         ApplicationEnvVarsHelper,
         DatePipe,
-        ServiceActionHelperService
+        ServiceActionHelperService,
+        ApplicationStateService,
       ],
       imports: generateCfBaseTestModules()
     });
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.spec.ts
index 29ee3c45b1..b29953ba7f 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.spec.ts
@@ -3,11 +3,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
-import {
-  generateCfBaseTestModules,
-} from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { generateCfBaseTestModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ServicesWallService } from '../../../../../../features/services/services/services-wall.service';
 import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../../../services/cloud-foundry-user-provided-services.service';
 import { CfOrgSpaceLinksComponent } from '../../../../cf-org-space-links/cf-org-space-links.component';
 import { UserProvidedServiceInstanceCardComponent } from './user-provided-service-instance-card.component';
 
@@ -25,6 +26,7 @@ describe('UserProvidedServiceInstanceCardComponent', () => {
         EntityMonitorFactory,
         PaginationMonitorFactory,
         ServiceActionHelperService,
+        CloudFoundryUserProvidedServicesService,
       ]
     })
       .compileComponents();
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 c4cc4b670e..868d8477d4 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
@@ -81,8 +81,7 @@ export class MetaCardComponent implements OnDestroy {
             entity,
             entityConfig.schema.key,
             this.favoritesConfigMapper,
-            entityConfig.schema.endpointType,
-            entityConfig
+            entityConfig.schema.endpointType
           ))
         ).subscribe();
       }

From 5edc001a97cff9ec8e94df24da70bd46cedc417c Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 8 May 2020 17:57:19 +0100
Subject: [PATCH 081/176] EE Test improvements (#4274)

* Speed up form fill

* Manage users fix?

* Wait slightly longer

* Improve error output in tests

* Fix invite users error msg check

* Fix manage users e2e

* Need checked in form to check box correctly
---
 .../cf-level/manage-quota-e2e.spec.ts         | 17 ++++----
 .../cloud-foundry/invite-users-e2e.helper.ts  |  8 +++-
 .../manage-users-stepper-e2e.spec.ts          |  3 +-
 .../cloud-foundry/users-removal-e2e.helper.ts | 25 +++++------
 src/test-e2e/po/component.po.ts               |  6 +--
 src/test-e2e/po/form.po.ts                    | 42 +++++++++++++++++--
 src/test-e2e/po/list.po.ts                    |  8 ++--
 7 files changed, 79 insertions(+), 30 deletions(-)

diff --git a/src/test-e2e/cloud-foundry/cf-level/manage-quota-e2e.spec.ts b/src/test-e2e/cloud-foundry/cf-level/manage-quota-e2e.spec.ts
index 592e8bfb98..e70910bfc2 100644
--- a/src/test-e2e/cloud-foundry/cf-level/manage-quota-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/cf-level/manage-quota-e2e.spec.ts
@@ -75,13 +75,16 @@ describe('Manage Quota', () => {
     });
 
     it('- should create quota', () => {
-      quotaFormPage.stepper.setName(secondQuotaName);
-      quotaFormPage.stepper.setTotalServices('1');
-      quotaFormPage.stepper.setTotalRoutes('10');
-      quotaFormPage.stepper.setMemoryLimit('1024');
-      quotaFormPage.stepper.setInstanceMemoryLimit('1');
-      quotaFormPage.stepper.setTotalReservedRoutePorts('1');
-      quotaFormPage.stepper.setAppInstanceLimit('1');
+      const obj = {};
+      obj[quotaFormPage.stepper.name] = secondQuotaName;
+      obj[quotaFormPage.stepper.totalServices] = '1';
+      obj[quotaFormPage.stepper.totalRoutes] = '10';
+      obj[quotaFormPage.stepper.memoryLimit] = '1024';
+      obj[quotaFormPage.stepper.instanceMemoryLimit] = '1';
+      obj[quotaFormPage.stepper.totalReservedRoutePorts] = '1';
+      obj[quotaFormPage.stepper.appInstanceLimit] = '1';
+      quotaFormPage.stepper.getStepperForm().fill(obj);
+      expect(quotaFormPage.stepper.canNext()).toBeTruthy();
       quotaFormPage.submit();
       quotaFormPage.stepper.waitUntilNotShown();
       cfTopLevelPage.clickOnQuota(secondQuotaName);
diff --git a/src/test-e2e/cloud-foundry/invite-users-e2e.helper.ts b/src/test-e2e/cloud-foundry/invite-users-e2e.helper.ts
index 43c6e0ec60..2591e7d680 100644
--- a/src/test-e2e/cloud-foundry/invite-users-e2e.helper.ts
+++ b/src/test-e2e/cloud-foundry/invite-users-e2e.helper.ts
@@ -164,7 +164,13 @@ export function setupInviteUserTests(
       inviteUserStepper.snackBar.waitForMessage('Failed to invite one or more users. Please address per user message and try again');
       expect(stackedActions.isInputSuccess(0)).toBe(true);
       expect(stackedActions.isInputSuccess(1)).toBe(false);
-      expect(stackedActions.getInputMessage(1)).toBe(`${slightlyValidEmail} is invalid email.`);
+
+      // Check message - flexibility on old and newer UAA
+      stackedActions.getInputMessage(1).then(msg => {
+        const okay = msg === `${slightlyValidEmail} is invalid email.` || msg === 'No authentication provider found.';
+        expect(okay).toBeTruthy('Error message is not as expected');
+      });
+
       // Clear state
       inviteUserStepper.cancel();
       usersTable.inviteUser();
diff --git a/src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts b/src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts
index f1dfc8851f..e16b6ecd1a 100644
--- a/src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts
@@ -58,7 +58,8 @@ describe('Manage Users Stepper', () => {
     cfPage.goToUsersTab();
 
     const usersTable = new CFUsersListComponent();
-    usersTable.pagination.setPageSize('80', 'mat-select-3')
+    // Not suew we can do this, if the pager is not in view?
+    // usersTable.pagination.setPageSize('80', 'mat-select-3');
     usersTable.header.setSearchText(userName);
     let usersRow = -1;
     usersTable.table.findRow('username', userName)
diff --git a/src/test-e2e/cloud-foundry/users-removal-e2e.helper.ts b/src/test-e2e/cloud-foundry/users-removal-e2e.helper.ts
index de42eecabb..931679b0a4 100644
--- a/src/test-e2e/cloud-foundry/users-removal-e2e.helper.ts
+++ b/src/test-e2e/cloud-foundry/users-removal-e2e.helper.ts
@@ -117,9 +117,9 @@ export function setupCfUserRemovalTests(
     removeUsersStepper.waitUntilShown('Remove Users Stepper');
 
     // ... check button state
-    expect(removeUsersStepper.canPrevious()).toBeFalsy();
-    expect(removeUsersStepper.canCancel()).toBeTruthy();
-    expect(removeUsersStepper.canNext()).toBeTruthy();
+    expect(removeUsersStepper.canPrevious()).toBeFalsy('Previous button should not be visible');
+    expect(removeUsersStepper.canCancel()).toBeTruthy('Cancel button should be visible and enabled');
+    expect(removeUsersStepper.canNext()).toBeTruthy('Next button should be visible and enabled');
   });
 
   it('Confirm roles removal', () => {
@@ -140,15 +140,16 @@ export function setupCfUserRemovalTests(
       actionTableDate = createActionTableDate(orgTarget, spaceTarget);
     }
 
-    expect(confirmStep.actionTable.table.getTableData()).toEqual(actionTableDate);
-    expect(removeUsersStepper.canPrevious()).toBeFalsy();
-    expect(removeUsersStepper.canCancel()).toBeTruthy();
-    expect(removeUsersStepper.canNext()).toBeTruthy();
+    expect(confirmStep.actionTable.table.getTableData()).toEqual(actionTableDate, 'Table data did not match expected content');
+    expect(removeUsersStepper.canPrevious()).toBeFalsy('Previous button should not be visible');
+    expect(removeUsersStepper.canCancel()).toBeTruthy('Cancel button should be visible and enabled');
+    expect(removeUsersStepper.canNext()).toBeTruthy('Next button should be visible and enabled');
+
 
     // apply roles removal changes
     removeUsersStepper.next();
 
-    confirmStep.actionTable.table.waitUntilNotBusy();
+    confirmStep.actionTable.table.waitUntilNotBusy('Failed to wait for busy state');
 
     // Wait until all of the spinners have gone
     const spinners = element.all(by.tagName('mat-progress-spinner'));
@@ -163,10 +164,10 @@ export function setupCfUserRemovalTests(
       actionTableDate = createActionTableDate(orgTarget, spaceTarget, 'done');
     }
 
-    expect(confirmStep.actionTable.table.getTableData()).toEqual(actionTableDate);
-    expect(removeUsersStepper.canPrevious()).toBeFalsy();
-    expect(removeUsersStepper.canCancel()).toBeFalsy();
-    expect(removeUsersStepper.canNext()).toBeTruthy();
+    expect(confirmStep.actionTable.table.getTableData()).toEqual(actionTableDate, 'Table data did not match expected content');
+    expect(removeUsersStepper.canPrevious()).toBeFalsy('Previous button should not be visible');
+    expect(removeUsersStepper.canCancel()).toBeFalsy('Cancel button should not be visible//enabled');
+    expect(removeUsersStepper.canNext()).toBeTruthy('Next button should be visible and enabled');
 
     // close
     removeUsersStepper.next();
diff --git a/src/test-e2e/po/component.po.ts b/src/test-e2e/po/component.po.ts
index 2f1c9ab62c..62157e2be0 100644
--- a/src/test-e2e/po/component.po.ts
+++ b/src/test-e2e/po/component.po.ts
@@ -10,8 +10,8 @@ const until = protractor.ExpectedConditions;
  */
 export class Component {
 
-  public static waitUntilNotShown(elm): promise.Promise<void> {
-    return browser.wait(until.invisibilityOf(elm), 5000);
+  public static waitUntilNotShown(elm, failMsg?: string): promise.Promise<void> {
+    return browser.wait(until.invisibilityOf(elm), 5000, failMsg);
   }
 
   public static scrollIntoView(elm: ElementFinder): promise.Promise<void> {
@@ -37,7 +37,7 @@ export class Component {
     return browser.wait(until.presenceOf(this.locator), waitDuration, elementDescription + ' taking too long to appear in the DOM')
       .then(() => browser.wait(until.visibilityOf(this.locator), waitDuration, elementDescription + ' not visible timing out'))
       // Slight delay for animations
-      .then(() => browser.driver.sleep(100));
+      .then(() => browser.driver.sleep(250));
   }
 
   waitUntilNotShown(description = 'Element'): promise.Promise<void> {
diff --git a/src/test-e2e/po/form.po.ts b/src/test-e2e/po/form.po.ts
index 292ec3b189..c8fa98f619 100644
--- a/src/test-e2e/po/form.po.ts
+++ b/src/test-e2e/po/form.po.ts
@@ -83,8 +83,35 @@ export class FormComponent extends Component {
     return this.getFields().count();
   }
 
-  getFieldsMapped(): promise.Promise<FormItem[]> {
-    return this.getFields().map(this.mapField);
+  getFieldsMapped(mapper?: (elm: ElementFinder, index: number) => FormItem | any): promise.Promise<FormItem[]> {
+    return mapper ? this.getFields().map(mapper) : this.getFields().map(this.mapField);
+  }
+
+  // Less fields to fetch == quicker tests
+  mapFieldFormFill(elm: ElementFinder, index: number): FormItem | any {
+    return {
+      index,
+      type: elm.getAttribute('type'),
+      sendKeys: elm.sendKeys,
+      clear: elm.clear,
+      click: elm.click,
+      checked: elm.getAttribute('aria-checked').then(v => v === 'true'),
+      tag: elm.getTagName(),
+      multiple: elm.getAttribute('multiple'),
+      id: elm.getAttribute('name').then(name => {
+        if (name) {
+          return name;
+        } else {
+          return elm.getAttribute('formcontrolname').then(controlName => {
+            if (controlName) {
+              return controlName;
+            } else {
+              return elm.getAttribute('id');
+            }
+          });
+        }
+      })
+    };
   }
 
   mapField(elm: ElementFinder, index: number): FormItem | any {
@@ -174,9 +201,18 @@ export class FormComponent extends Component {
     });
   }
 
+  getControlsMapFormFill(): promise.Promise<FormItemMap> {
+    return this.getFieldsMapped(this.mapFieldFormFill).then(items => {
+      const form = {};
+      items.forEach((item: FormItem) => form[item.id.toLowerCase()] = item);
+      return form;
+    });
+  }
+
+
   // Fill the form fields in the specified object
   fill(fields: { [fieldKey: string]: string | boolean | number[] }, expectFailure = false): promise.Promise<void> {
-    return this.getControlsMap().then(ctrls => {
+    return this.getControlsMapFormFill().then(ctrls => {
       Object.keys(fields).forEach(field => {
         const ctrl = ctrls[field] as FormItem;
         const value: any = fields[field];
diff --git a/src/test-e2e/po/list.po.ts b/src/test-e2e/po/list.po.ts
index d119bc21d8..2519345d92 100644
--- a/src/test-e2e/po/list.po.ts
+++ b/src/test-e2e/po/list.po.ts
@@ -93,11 +93,13 @@ export class ListTableComponent extends Component {
     });
   }
 
-  waitUntilNotBusy() {
+  waitUntilNotBusy(failMsg?: string) {
     return Component.waitUntilNotShown(
-      this.locator.element(by.css('.table-row__deletion-bar-wrapper'))
+      this.locator.element(by.css('.table-row__deletion-bar-wrapper')),
+      'Failed to wait for list busy indicator to be shown'
     ).then(() => Component.waitUntilNotShown(
-      this.locator.element(by.css('.table-row-wrapper__blocked'))
+      this.locator.element(by.css('.table-row-wrapper__blocked')),
+      'Failed to wait for list busy indicator to be not shown'
     ));
   }
 

From 91861f2e36569f49cedf12808ecbed5d831f397a Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Fri, 8 May 2020 19:39:20 +0100
Subject: [PATCH 082/176] Fix row highligh & Improve metrics summary view
 (#4270)

* Fix row highlight (see app github tab commit table)
- wasn't showing after list in list changes
- fixes #4243

* Improve metrics view

* Fix code climate issues

* Fix 2 more code climate issues

* Fix merge issue

* Fix dark mode box shadow
- dark mode styling overode disabling of box shadow

* Fix multiple metrics requests due to recreated list cards

* Fix most additional /stratos requests on load of endpoints page with metrics

* Fix unit tests

* Fix EndpointCardComponent test

* Fix root list colour in metrics summary page dark mode

* Fix first row alignment in users table

* Fix invite user e2e test (see #4272)

* Disable random route override setting when deploying apps in e2e tests
- pushes route over max 63 chars

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>
---
 .../cf-endpoint-details.component.scss        |  2 +-
 .../packages/core/sass/_all-theme.scss        |  4 +-
 .../packages/core/src/base-entity-types.ts    | 10 ++-
 .../metrics-endpoint-details.component.html   |  9 ++
 .../metrics-endpoint-details.component.scss   | 16 ++++
 ...metrics-endpoint-details.component.spec.ts | 37 ++++++++
 .../metrics-endpoint-details.component.ts     | 88 ++++++++++++++++++
 .../src/features/metrics/metrics.helpers.ts   | 74 +++++++++++++++
 .../src/features/metrics/metrics.module.ts    | 15 ++--
 .../metrics/metrics/metrics.component.html    | 90 ++++++++++---------
 .../metrics/metrics/metrics.component.scss    | 80 ++++++++++++++++-
 .../metrics/metrics.component.theme.scss      | 21 +++++
 .../metrics/metrics/metrics.component.ts      | 61 ++++++-------
 .../list/list-cards/card/card.component.ts    | 14 ++-
 .../table-row/table-row.component.html        |  4 +-
 .../table-row/table-row.component.scss        |  7 +-
 .../table-row/table-row.component.theme.scss  |  8 ++
 .../endpoint-card.component.spec.ts           | 16 +++-
 .../store/src/actions/metrics-api.actions.ts  | 18 +++-
 .../store/src/effects/metrics.effects.ts      |  4 +-
 .../src/reducers/system-endpoints.reducer.ts  | 13 +++
 .../store/src/types/endpoint.types.ts         |  3 +-
 22 files changed, 494 insertions(+), 100 deletions(-)
 create mode 100644 src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.html
 create mode 100644 src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.scss
 create mode 100644 src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.spec.ts
 create mode 100644 src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts
 create mode 100644 src/frontend/packages/core/src/features/metrics/metrics.helpers.ts
 create mode 100644 src/frontend/packages/core/src/features/metrics/metrics/metrics.component.theme.scss

diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-details/cf-endpoint-details.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-details/cf-endpoint-details.component.scss
index 5b7707aa0e..4a125b2a60 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-details/cf-endpoint-details.component.scss
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cf-endpoint-details/cf-endpoint-details.component.scss
@@ -11,6 +11,6 @@
     align-items: center;
     display: flex;
     justify-content: center;
-    width: 32px;
+    margin-right: 8px;
   }
 }
diff --git a/src/frontend/packages/core/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss
index a6fdef57e5..4f657dbc93 100644
--- a/src/frontend/packages/core/sass/_all-theme.scss
+++ b/src/frontend/packages/core/sass/_all-theme.scss
@@ -67,6 +67,7 @@
 @import '../../cloud-foundry/src/features/applications/application-wall/application-wall.component.theme';
 @import '../../core/src/features/error-page/error-page/error-page.component.theme';
 @import '../../core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.theme';
+@import '../../core/src/features/metrics/metrics/metrics.component.theme';
 
 // Defaults
 $side-nav-light-text: #fff;
@@ -160,7 +161,8 @@ $side-nav-light-active: #484848;
   @include code-block-theme($theme, $app-theme);
   @include copy-to-clipboard-theme($theme, $app-theme);
   @include app-user-avatar-theme($theme, $app-theme);
-  @include restore-endpoints-theme($theme, $app-theme)
+  @include restore-endpoints-theme($theme, $app-theme);
+  @include metrics-component-theme($theme, $app-theme);
 }
 
 @function app-generate-nav-theme($theme, $nav-theme: null) {
diff --git a/src/frontend/packages/core/src/base-entity-types.ts b/src/frontend/packages/core/src/base-entity-types.ts
index 33ba893917..37f2c840ac 100644
--- a/src/frontend/packages/core/src/base-entity-types.ts
+++ b/src/frontend/packages/core/src/base-entity-types.ts
@@ -1,8 +1,9 @@
-import { systemEndpointsReducer } from '../../store/src/reducers/system-endpoints.reducer';
+import { StratosCatalogEndpointEntity, StratosCatalogEntity } from '../../store/src/entity-catalog/entity-catalog-entity';
 import {
   addOrUpdateUserFavoriteMetadataReducer,
   deleteUserFavoriteMetadataReducer,
 } from '../../store/src/reducers/favorite.reducer';
+import { systemEndpointsReducer } from '../../store/src/reducers/system-endpoints.reducer';
 import {
   endpointEntitySchema,
   STRATOS_ENDPOINT_TYPE,
@@ -10,8 +11,10 @@ import {
   userFavoritesEntitySchema,
   userProfileEntitySchema,
 } from './base-entity-schemas';
-import { StratosCatalogEndpointEntity, StratosCatalogEntity } from '../../store/src/entity-catalog/entity-catalog-entity';
 import { BaseEndpointAuth } from './features/endpoints/endpoint-auth';
+import {
+  MetricsEndpointDetailsComponent,
+} from './features/metrics/metrics-endpoint-details/metrics-endpoint-details.component';
 
 //
 // These types are used to represent the base stratos types.
@@ -94,7 +97,8 @@ export function generateStratosEntities() {
       tokenSharing: true,
       logoUrl: '/core/assets/endpoint-icons/metrics.svg',
       authTypes: [BaseEndpointAuth.UsernamePassword, BaseEndpointAuth.None],
-      renderPriority: 1
+      renderPriority: 1,
+      listDetailsComponent: MetricsEndpointDetailsComponent,
     },
       metadata => `/endpoints/metrics/${metadata.guid}`
     )
diff --git a/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.html b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.html
new file mode 100644
index 0000000000..d15144178e
--- /dev/null
+++ b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.html
@@ -0,0 +1,9 @@
+<div class="metrics-details" *ngIf="data$ | async as info">
+  <div class="metrics-details__line">
+    <mat-icon *ngIf="info.warning" class="metrics-details__icon text-warning">warning</mat-icon>
+    {{ info.ok }}
+    <ng-container *ngIf="info.total > 0"> / {{info.total}}</ng-container>
+    <ng-container *ngIf="info.plural"> sources</ng-container>
+    <ng-container *ngIf="!info.plural"> source</ng-container>
+  </div>
+</div>
diff --git a/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.scss b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.scss
new file mode 100644
index 0000000000..c18a9f0f79
--- /dev/null
+++ b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.scss
@@ -0,0 +1,16 @@
+.metrics-details {
+  display: flex;
+  flex-direction: column;
+
+  &__line {
+    align-items: center;
+    display: flex;
+  }
+
+  &__icon {
+    align-items: center;
+    display: flex;
+    justify-content: center;
+    margin-right: 8px;
+  }
+}
diff --git a/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.spec.ts b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.spec.ts
new file mode 100644
index 0000000000..b825e86948
--- /dev/null
+++ b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.spec.ts
@@ -0,0 +1,37 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { createBasicStoreModule } from '../../../../../store/testing/src/store-test-helper';
+import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
+import { SharedModule } from '../../../shared/shared.module';
+import { MetricsService } from '../services/metrics-service';
+import { CoreModule } from './../../../core/core.module';
+import { MetricsEndpointDetailsComponent } from './metrics-endpoint-details.component';
+
+describe('MetricsEndpointDetailsComponent', () => {
+  let component: MetricsEndpointDetailsComponent;
+  let fixture: ComponentFixture<MetricsEndpointDetailsComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CoreModule,
+        SharedModule,
+        CoreTestingModule,
+        createBasicStoreModule()
+      ],
+      declarations: [ MetricsEndpointDetailsComponent ],
+      providers: [ MetricsService ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MetricsEndpointDetailsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts
new file mode 100644
index 0000000000..0b47762037
--- /dev/null
+++ b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts
@@ -0,0 +1,88 @@
+import { Component, Input } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
+import { distinctUntilChanged, filter, map, publishReplay, refCount, tap } from 'rxjs/operators';
+
+import { MetricsStratosAction } from '../../../../../store/src/actions/metrics-api.actions';
+import { AppState } from '../../../../../store/src/app-state';
+import { EndpointListDetailsComponent } from '../../../shared/components/list/list-types/endpoint/endpoint-list.helpers';
+import { mapMetricsData } from '../metrics.helpers';
+import { MetricsEndpointProvider, MetricsService } from '../services/metrics-service';
+import { EndpointModel } from './../../../../../store/src/types/endpoint.types';
+
+
+interface MetricsDetailsInfo {
+  ok: number;
+  total: number;
+  warning: boolean;
+  plural: boolean;
+}
+
+@Component({
+  selector: 'app-metrics-endpoint-details',
+  templateUrl: './metrics-endpoint-details.component.html',
+  styleUrls: ['./metrics-endpoint-details.component.scss']
+})
+export class MetricsEndpointDetailsComponent extends EndpointListDetailsComponent {
+
+  data$: Observable<MetricsDetailsInfo>;
+
+  // The guid of the metrics endpoint that this row shows
+  guid$ = new BehaviorSubject<string>(null);
+
+  constructor(
+    public store: Store<AppState>,
+    private metricsService: MetricsService
+  ) {
+    super();
+
+    const endpoints$ = this.metricsService.metricsEndpoints$.pipe(
+      filter(endpoints => !!endpoints),
+      distinctUntilChanged()
+    );
+
+    const guid$ = this.guid$.asObservable().pipe(
+      filter(guid => !!guid),
+      distinctUntilChanged()
+    );
+
+    // Raw endpoint data for this metrics endpoint
+    this.data$ = combineLatest(
+      endpoints$,
+      guid$
+    ).pipe(
+      map(([endpoints, guid]) => endpoints.find((item) => item.provider.guid === guid)),
+      filter(provider => !!provider),
+      tap(data => {
+        if (!this.hasStratosData(data)) {
+          this.store.dispatch(new MetricsStratosAction(data.provider.guid));
+        }
+      }),
+      map((provider) => this.processProvider(provider)),
+      publishReplay(1),
+      refCount()
+    );
+  }
+
+  private hasStratosData(provider: MetricsEndpointProvider): boolean {
+    const data = provider.provider;
+    return !!data && !!data.metadata && !!data.metadata.metrics_stratos;
+  }
+
+  private processProvider(provider: MetricsEndpointProvider): MetricsDetailsInfo {
+    const hasStratosData = this.hasStratosData(provider);
+    const parsed = mapMetricsData(provider);
+    const known = parsed.filter(item => item.known).length;
+    return {
+      ok: known,
+      total: hasStratosData ? parsed.length : -1,
+      warning: known === 0,
+      plural: hasStratosData ? parsed.length !== 1 : known !== 1,
+    };
+  }
+
+  @Input()
+  set row(data: EndpointModel) {
+    this.guid$.next(data.guid);
+  }
+}
diff --git a/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts b/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts
new file mode 100644
index 0000000000..f3bb9d0763
--- /dev/null
+++ b/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts
@@ -0,0 +1,74 @@
+import { Observable, of as observableOf } from 'rxjs';
+
+import { StratosStatus } from '../../shared/shared.types';
+import { EndpointIcon, getFullEndpointApiUrl } from '../endpoints/endpoint-helpers';
+import { entityCatalog } from './../../../../store/src/entity-catalog/entity-catalog.service';
+import { MetricsEndpointProvider } from './services/metrics-service';
+
+// Info for an endpoint that a metrics endpoint provides for
+export interface MetricsEndpointInfo {
+  name: string;
+  icon: EndpointIcon;
+  type: string;
+  known: boolean;
+  url: string;
+  metadata: {
+    metrics_job?: string;
+    metrics_environment?: string;
+  };
+  status: Observable<StratosStatus>;
+}
+
+// Process the endpoint and Stratos marker file data to give a single list of endpoitns
+// linked to this metrics endpoint, comprising those that are known in Stratos and those that are not
+export function mapMetricsData(ep: MetricsEndpointProvider): MetricsEndpointInfo[] {
+    const data: MetricsEndpointInfo[] = [];
+
+    // Add all of the known endpoints first
+    ep.endpoints.forEach(endpoint => {
+      const catalogEndpoint = entityCatalog.getEndpoint(endpoint.cnsi_type, endpoint.sub_type);
+
+      data.push({
+        known: true,
+        name: endpoint.name,
+        url: getFullEndpointApiUrl(endpoint),
+        type: catalogEndpoint.definition.label,
+        icon: {
+          name: catalogEndpoint.definition.icon,
+          font: 'stratos-icons'
+        },
+        metadata: {
+          metrics_job: endpoint.metadata ? endpoint.metadata.metrics_job : null,
+          metrics_environment: endpoint.metadata ? endpoint.metadata.metrics_environment : null
+        },
+        status: observableOf(StratosStatus.OK)
+      });
+    });
+
+    // Add all of the potentially unknown endpoints
+    if (ep.provider && ep.provider.metadata && ep.provider.metadata && ep.provider.metadata.metrics_stratos
+    && Array.isArray(ep.provider.metadata.metrics_stratos)) {
+      ep.provider.metadata.metrics_stratos.forEach(endp => {
+        // See if we already know about this endpoint
+        const hasEndpoint = data.findIndex(i => i.url === endp.url || i.url === endp.cfEndpoint) !== -1;
+        if (!hasEndpoint) {
+          const catalogEndpoint = entityCatalog.getEndpoint(endp.type, '');
+          data.push({
+            known: false,
+            name: '<Unregistered Endpoint>',
+            url: endp.cfEndpoint || endp.url,
+            type: catalogEndpoint.definition.label,
+            icon: {
+              name: catalogEndpoint.definition.icon,
+              font: 'stratos-icons'
+            },
+            metadata: {
+              metrics_job: endp.job
+            },
+            status: observableOf(StratosStatus.WARNING)
+          });
+        }
+      });
+    }
+    return data;
+  }
diff --git a/src/frontend/packages/core/src/features/metrics/metrics.module.ts b/src/frontend/packages/core/src/features/metrics/metrics.module.ts
index 7aa2a94888..9c14db9211 100644
--- a/src/frontend/packages/core/src/features/metrics/metrics.module.ts
+++ b/src/frontend/packages/core/src/features/metrics/metrics.module.ts
@@ -1,10 +1,12 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { MetricsComponent } from './metrics/metrics.component';
-import { MetricsRoutingModule } from './metrics.routing';
-import { MetricsService } from './services/metrics-service';
+import { NgModule } from '@angular/core';
+
 import { CoreModule } from '../../core/core.module';
 import { SharedModule } from '../../shared/shared.module';
+import { MetricsEndpointDetailsComponent } from './metrics-endpoint-details/metrics-endpoint-details.component';
+import { MetricsRoutingModule } from './metrics.routing';
+import { MetricsComponent } from './metrics/metrics.component';
+import { MetricsService } from './services/metrics-service';
 
 @NgModule({
   imports: [
@@ -13,9 +15,12 @@ import { SharedModule } from '../../shared/shared.module';
     SharedModule,
     MetricsRoutingModule,
   ],
-  declarations: [MetricsComponent],
+  declarations: [MetricsComponent, MetricsEndpointDetailsComponent],
   providers: [
     MetricsService,
+  ],
+  entryComponents: [
+    MetricsEndpointDetailsComponent,
   ]
 })
 export class MetricsModule { }
diff --git a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.html b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.html
index 3d5b4dfaf9..6407fa952b 100644
--- a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.html
+++ b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.html
@@ -1,4 +1,4 @@
-<app-page-header [breadcrumbs]="breadcrumbs$ | async">{{ (metricsEndpoint$ | async)?.entity.provider.name }}</app-page-header>
+<app-page-header [breadcrumbs]="breadcrumbs$ | async">{{ (metricsEndpoint$ | async)?.provider.name }}</app-page-header>
 
 <div *ngIf="(metricsEndpoint$ | async) as ep">
   <mat-card>
@@ -6,57 +6,67 @@
       <div class="metrics-info">
         <mat-icon>equalizer</mat-icon>
         <div>
-          <div>{{ ep.entity.provider.name }}</div>
+          <div>{{ ep.provider.name }}</div>
           <h2 class="metrics-url">
-            <a target="metrics" href="{{ ep.entity.provider.token_endpoint }}">{{ ep.entity.provider.token_endpoint }}</a>
+            <a target="metrics" href="{{ ep.provider.token_endpoint }}">{{ ep.provider.token_endpoint }}</a>
           </h2>
+          <div *ngIf="error">
+            <p>This metrics endpoint does not provide a Stratos metadata file</p>
+          </div>
         </div>
       </div>
     </mat-card-content>
   </mat-card>
 
-  <div class="metrics-detail" *ngIf="ep.entity.endpoints && ep.entity.endpoints.length >0">
-    <P>Provides metrics for the following endpoints:</P>
-  </div>
-
-  <div class="metrics-detail" *ngIf="!ep.entity.endpoints || ep.entity.endpoints.length === 0">
-    <P>Does not provide metrics for any endpoints</P>
-  </div>
-
-  <div>
-    <div *ngFor="let svc of ep.entity.endpoints" class="metric-endpoint">
-      <mat-card class="metrics-provision">
-        <mat-card-content>
-          <div class="metrics-info">
-            <mat-icon fontSet="{{ ep.metadata[svc.guid].icon.font }}">{{ ep.metadata[svc.guid].icon.name }}</mat-icon>
-            <div class="metrics-metadata">
-              <div>{{ svc.name }}</div>
-              <div>{{ ep.metadata[svc.guid].type }}</div>
-              <div class="metrics-metadata__cols">
-                <div class="metrics-metadata__two-cols">
-                  <app-metadata-item icon="link" label="Address">{{ svc.url }}</app-metadata-item>
-                  <app-metadata-item icon="history" label="Prometheus Job">{{ svc.metadata.metrics_job || 'N/A' }}</app-metadata-item>
-                  <app-metadata-item icon="history" label="Prometheus Environment">{{ svc.metadata.metrics_environment || 'N/A' }}</app-metadata-item>
-                </div>
-                <div class="metrics-metadata__two-cols">
-                  <div class="metrics-extra" *ngIf="svc.metadata && svc.metadata.metrics_job && (jobDetails$ | async) as jobDetails">
-                    <div *ngIf="jobDetails[svc.metadata.metrics_job]">
-                      <app-metadata-item icon="help_outline" label="Exporter Health">{{
-                        jobDetails[svc.metadata.metrics_job].health | uppercase }}</app-metadata-item>
-                      <app-metadata-item icon="schedule" label="Exporter Last Scrape">{{
-                        jobDetails[svc.metadata.metrics_job].lastScrape | date:'medium' }}</app-metadata-item>
-                      <app-metadata-item icon="error_outline" label="Exporter Last Error">{{
-                        jobDetails[svc.metadata.metrics_job].lastError || 'None' }}</app-metadata-item>
+  <div *ngIf="metricsInfo$ | async as infos">
+    <div class="metrics-detail" *ngIf="infos.length === 0">
+      <p>This metrics endpoint does not provide data for any endpoints</p>
+    </div>
+    <div *ngIf="infos.length > 0">
+      <div class="metrics-tree__root"></div>
+        <ul class="metrics-tree tree">
+          <li *ngFor="let info of infos" class="metric-endpoint">
+            <mat-card class="metrics-provision">
+            <app-card-status *ngIf="info.status" [status$]="info.status"></app-card-status>
+              <mat-card-content>
+              <div class="metrics-info">
+                <mat-icon fontSet="{{ info.icon.font }}">{{info.icon.name }}</mat-icon>
+                <div class="metrics-metadata">
+                  <div>{{ info.name }}</div>
+                  <div>{{ info.type }}</div>
+                  <div class="metrics-metadata__cols">
+                    <div class="metrics-metadata__two-cols">
+                      <app-metadata-item icon="link" label="Address" [clipboardValue]="info.url">{{ info.url }}</app-metadata-item>
+                      <app-metadata-item icon="history" label="Prometheus Job">{{ info.metadata.metrics_job || 'N/A' }}</app-metadata-item>
+                      <app-metadata-item icon="history" label="Prometheus Environment">{{ info.metadata.metrics_environment || 'N/A' }}</app-metadata-item>
+                    </div>
+                    <div class="metrics-metadata__two-cols">
+                      <div class="metrics-extra" *ngIf="info.metadata.metrics_job && (jobDetails$ | async) as jobDetails">
+                        <div *ngIf="jobDetails[info.metadata.metrics_job]">
+                          <app-metadata-item icon="help_outline" label="Exporter Health">{{
+                            jobDetails[info.metadata.metrics_job].health | uppercase }}</app-metadata-item>
+                          <app-metadata-item icon="schedule" label="Exporter Last Scrape">{{
+                            jobDetails[info.metadata.metrics_job].lastScrape | date:'medium' }}</app-metadata-item>
+                          <app-metadata-item icon="error_outline" label="Exporter Last Error">{{
+                            jobDetails[info.metadata.metrics_job].lastError || 'None' }}</app-metadata-item>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <div *ngIf="!info.known">
+                    <div class="metrics-unknown">
+                      <mat-icon class="text-warning">warning</mat-icon>
+                      <div>The metrics endpoint reports that it provides data for this endpoint which is not registered with Stratos</div>
                     </div>
+                    <div class="metrics-unknown__detail">This could be intentional or there may be a mismatch in the endpoint address used by this Metrics endpoint and that which is registered with Stratos.</div>
                   </div>
                 </div>
               </div>
-            </div>
-          </div>
-        </mat-card-content>
-      </mat-card>
+            </mat-card-content>
+          </mat-card>
+        </li>
+      </ul>
     </div>
   </div>
 </div>
 
-
diff --git a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.scss b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.scss
index 859d78a163..3280ff302b 100644
--- a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.scss
+++ b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.scss
@@ -9,13 +9,23 @@
   }
   &-info {
     display: flex;
-    mat-icon {
+    > mat-icon {
       font-size: 48px;
       height: 48px;
       margin-right: 8px;
       width: 48px;
     }
   }
+  &-unknown {
+    display: flex;
+    mat-icon {
+      margin-right: 8px;
+    }
+    &__detail {
+      margin-left: 32px;
+      opacity: .8;
+    }
+  }
   &-metadata {
     width: 100%;
     div {
@@ -42,5 +52,73 @@
       margin-top: 0;
     }
   }
+  &-detail {
+    padding-top: 12px;
+  }
+}
+
+// Adapted from: http://cssdeck.com/labs/pure-css-tree-menu-framework
+$hz-indent-top: 60px;
+$hz-indent-left: 40px;
+$hz-indent-width: 40px;
+$tree-indicator-width: 3px;
+
+.metrics-tree {
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+
+  &__root {
+    height: 24px;
+    margin-left: $hz-indent-left;
+    width: 3px;
+  }
+}
+
+.tree,
+.tree ul {
+  list-style: none;
+  margin: 0 0 0 $hz-indent-left;
+  padding: 0;
+  position: relative;
+}
+
+.tree ul {
+  margin-left: .5em;
+}
+
+.tree::before,
+.tree ul::before {
+  border-left: $tree-indicator-width solid;
+  bottom: 0;
+  content: '';
+  display: block;
+  left: 0;
+  position: absolute;
+  top: 0;
+  width: 0;
+}
+
+.tree li {
+  margin: 0;
+  padding: 0 $hz-indent-width;
+  position: relative;
 }
 
+.tree li::before {
+  border-top: $tree-indicator-width solid;
+  content: '';
+  display: block;
+  height: 0;
+  left: 0;
+  margin-top: -1px;
+  position: absolute;
+  top: $hz-indent-top;
+  width: $hz-indent-width;
+}
+
+.tree li:last-child::before {
+  bottom: 0;
+  height: auto;
+  top: $hz-indent-top;
+}
diff --git a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.theme.scss b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.theme.scss
new file mode 100644
index 0000000000..f89c2e350a
--- /dev/null
+++ b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.theme.scss
@@ -0,0 +1,21 @@
+@mixin metrics-component-theme($theme, $app-theme) {
+  $primary: map-get($theme, primary);
+  $background: map-get($theme, background);
+  $tree-background-color:  mat-color($background, background);
+  $is-dark: map-get($theme, is-dark);
+
+  // Last item uses background color to overwrisr the side bar to make it appear
+  // like its the last item in th tree
+  .tree li:last-child::before {
+    background-color: $tree-background-color;
+  }
+
+  .metrics-tree__root {
+    // Should match .mat-drawer-container
+    @if $is-dark == true {
+      background-color: #ffffff;
+    } @else {
+      background-color: mat-contrast($primary, 300);
+    }
+  }
+}
diff --git a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.ts b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.ts
index 348b5ebf48..090a536487 100644
--- a/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.ts
+++ b/src/frontend/packages/core/src/features/metrics/metrics/metrics.component.ts
@@ -4,12 +4,16 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, first, map } from 'rxjs/operators';
 
-import { MetricsAPIAction, MetricsAPITargets } from '../../../../../store/src/actions/metrics-api.actions';
+import {
+  MetricsAPIAction,
+  MetricsAPITargets,
+  MetricsStratosAction,
+} from '../../../../../store/src/actions/metrics-api.actions';
 import { AppState } from '../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
 import { getIdFromRoute } from '../../../core/utils.service';
 import { IHeaderBreadcrumb } from '../../../shared/components/page-header/page-header.types';
 import { EndpointIcon } from '../../endpoints/endpoint-helpers';
+import { mapMetricsData, MetricsEndpointInfo } from '../metrics.helpers';
 import { MetricsEndpointProvider, MetricsService } from '../services/metrics-service';
 
 interface EndpointMetadata {
@@ -40,57 +44,48 @@ interface PrometheusJobs {
   styleUrls: ['./metrics.component.scss']
 })
 export class MetricsComponent {
-
-  public metricsEndpoint$: Observable<MetricsInfo>;
+  public metricsEndpoint$: Observable<MetricsEndpointProvider>;
+  public metricsInfo$: Observable<MetricsEndpointInfo[]>;
   public breadcrumbs$: Observable<IHeaderBreadcrumb[]>;
   public jobDetails$: Observable<PrometheusJobs>;
 
+  // Was there an error retrieving data from the Prometheus server?
+  public error = false;
+
   constructor(
     private activatedRoute: ActivatedRoute,
     private metricsService: MetricsService,
     private store: Store<AppState>,
-
   ) {
 
     const metricsGuid = getIdFromRoute(this.activatedRoute, 'metricsId');
-    const metricsAction = new MetricsAPIAction(metricsGuid, 'targets');
-    this.store.dispatch(metricsAction);
+    this.store.dispatch(new MetricsAPIAction(metricsGuid, 'targets'));
+    this.store.dispatch(new MetricsStratosAction(metricsGuid));
 
+    // Raw endpoint data for this metrics endpoint
     this.metricsEndpoint$ = this.metricsService.metricsEndpoints$.pipe(
       map((ep) => ep.find((item) => item.provider.guid === metricsGuid)),
-      map((ep) => {
-        const metadata = {};
-        ep.endpoints.forEach(endpoint => {
-          const catalogEndpoint = entityCatalog.getEndpoint(endpoint.cnsi_type, endpoint.sub_type);
-          metadata[endpoint.guid] = {
-            type: catalogEndpoint.definition.type,
-            icon: catalogEndpoint.definition.icon
-          };
-        });
-        return {
-          entity: ep,
-          metadata
-        };
+    );
+
+    // Processed endpoint data
+    this.metricsInfo$ = this.metricsEndpoint$.pipe(map((ep) => {
+      if (ep.provider && ep.provider.metadata && ep.provider.metadata && ep.provider.metadata.metrics_stratos
+        && (ep.provider.metadata.metrics_stratos as any).error) {
+        this.error = true;
       }
-      ));
+      return mapMetricsData(ep);
+    }));
 
+    // Breadcrumbs
     this.breadcrumbs$ = this.metricsEndpoint$.pipe(
-      map(() => ([
-        {
-          breadcrumbs: [
-            {
-              value: 'Endpoints',
-              routerLink: `/endpoints`
-            }
-          ]
-        }
-      ])),
+      map(() => ([ { breadcrumbs: [ { value: 'Endpoints', routerLink: `/endpoints` } ] } ])),
       first()
     );
 
+    // Job details obtained from the Prometheus server
     this.jobDetails$ = this.metricsEndpoint$.pipe(
-      filter(mi => !!mi && !!mi.entity.provider && !!mi.entity.provider.metadata && !!mi.entity.provider.metadata.metrics_targets),
-      map(mi => mi.entity.provider.metadata.metrics_targets),
+      filter(mi => !!mi && !!mi.provider && !!mi.provider.metadata && !!mi.provider.metadata.metrics_targets),
+      map(mi => mi.provider.metadata.metrics_targets),
       map((targetsData: MetricsAPITargets) => targetsData.activeTargets.reduce((mapped, t) => {
         if (t.labels && t.labels.job) {
           mapped[t.labels.job] = t;
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 dfdea1cb9a..4f4257a11a 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
@@ -71,17 +71,23 @@ export class CardComponent<T> {
       return;
     }
     const { component, entityKey, entity } = this.getComponent(componentType, item);
-    if (component) {
+    if (!this.cardComponent && component) {
       const componentFactory = this.componentFactoryResolver.resolveComponentFactory(component);
       if (componentFactory) {
         this.clear();
         this.componentRef = this.target.createComponent(componentFactory);
         this.cardComponent = this.componentRef.instance as CardCell<T>;
-        this.cardComponent.row = entity;
-        this.cardComponent.dataSource = dataSource;
-        this.cardComponent.entityKey = entityKey;
       }
     }
+    this.updateComponentInputs(dataSource, entityKey, entity);
+  }
+
+  private updateComponentInputs(dataSource, entityKey, entity) {
+    if (this.cardComponent) {
+      this.cardComponent.row = entity;
+      this.cardComponent.dataSource = dataSource;
+      this.cardComponent.entityKey = entityKey;
+    }
   }
 
   private clear() {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.html b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.html
index a9cd96a7f3..be2ec31af4 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.html
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.html
@@ -1,5 +1,5 @@
 <div class="table-row-wrapper"
-  [ngClass]="{'table-row-wrapper__blocked': isBlocked$ | async, 'table-row-wrapper__warning': inWarningState$ | async,'table-row-wrapper__errored': inErrorState$ | async,'table-row-wrapper__highlighted': isHighlighted$ | async }">
+  [ngClass]="{'table-row-wrapper__blocked': isBlocked$ | async, 'table-row-wrapper__warning': inWarningState$ | async,'table-row-wrapper__errored': inErrorState$ | async }">
   <div *ngIf="isDeleting$ | async" class="table-row__deletion-bar-wrapper">
     <div class="table-row__deletion-bar-inner">
       <div class="table-row__deletion-bar-text">Deleting</div>
@@ -11,7 +11,7 @@
     <div class="mat-row table-row__inner">
       <mat-expansion-panel class="table-row__inner__expansion" [togglePosition]="'before'" [disabled]="!expandComponent"
         (opened)="panelOpened()" (closed)="expandedService.collapse(rowId)" [expanded]="expandedService.expanded[rowId]"
-        [hideToggle]="true">
+        [hideToggle]="true" [ngClass]="{'table-row-wrapper__highlighted': isHighlighted$ | async}">
         <mat-expansion-panel-header class="table-row__inner__expansion--header"
           [ngClass]="{'in-expanded-row': !!inExpandedRow, 'has-expanded-row': expandComponent}"
           [collapsedHeight]="'auto'" [expandedHeight]="'auto'"
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.scss b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.scss
index e9e23bd47a..06621f3b97 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.scss
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table-row/table-row.component.scss
@@ -21,10 +21,11 @@
       display: flex;
     }
   }
-  &__highlighted {
+  &__highlighted.mat-expansion-panel {
     border-left-style: solid;
     border-left-width: 4px;
-    .table-row__inner {
+    border-radius: 0;
+    mat-expansion-panel-header {
       margin-left: -4px; // Cancel out highlighted padding (border left in theme)
     }
   }
@@ -92,8 +93,6 @@
     }
 
     .table-row__inner__expansion.mat-expansion-panel {
-      box-shadow: none;
-      box-sizing: inherit;
       width: 100%;
 
       .table-row__inner__expansion--header {
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 ced96a6e62..0ac4538dad 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
@@ -11,6 +11,14 @@
     &.in-expanded-row {
       border-left-color: mat-color($foreground, divider);
     }
+
+    &__inner {
+      .table-row__inner__expansion.mat-expansion-panel {
+        box-shadow: none;
+        box-sizing: inherit;
+      }
+    }
+
   }
   .table-row-wrapper {
     &__errored {
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.spec.ts b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.spec.ts
index f7aae439d7..329ae6d4f2 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.spec.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/endpoint/endpoint-card/endpoint-card.component.spec.ts
@@ -1,7 +1,12 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing';
 
 import { EndpointModel } from '../../../../../../../../store/src/types/endpoint.types';
 import { BaseTestModules } from '../../../../../../../test-framework/core-test.helper';
+import {
+  MetricsEndpointDetailsComponent,
+} from '../../../../../../features/metrics/metrics-endpoint-details/metrics-endpoint-details.component';
+import { MetricsService } from '../../../../../../features/metrics/services/metrics-service';
 import { EndpointListHelper } from '../endpoint-list.helpers';
 import { EndpointCardComponent } from './endpoint-card.component';
 
@@ -11,11 +16,18 @@ describe('EndpointCardComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [],
+      declarations: [MetricsEndpointDetailsComponent],
       imports: [
         ...BaseTestModules
       ],
-      providers: [EndpointListHelper]
+      providers: [
+        EndpointListHelper,
+        MetricsService
+      ],
+    }).overrideModule(BrowserDynamicTestingModule, {
+      set: {
+        entryComponents: [MetricsEndpointDetailsComponent],
+      }
     })
       .compileComponents();
   }));
diff --git a/src/frontend/packages/store/src/actions/metrics-api.actions.ts b/src/frontend/packages/store/src/actions/metrics-api.actions.ts
index d6254bf9da..2fe8232094 100644
--- a/src/frontend/packages/store/src/actions/metrics-api.actions.ts
+++ b/src/frontend/packages/store/src/actions/metrics-api.actions.ts
@@ -1,4 +1,5 @@
 import { Action } from '@ngrx/store';
+
 import { environment } from '../../../core/src/environments/environment';
 
 export const METRIC_API_START = '[Metrics] API Start';
@@ -8,7 +9,8 @@ export const METRIC_API_FAILED = '[Metrics] API Failed';
 const { proxyAPIVersion } = environment;
 
 export const MetricAPIQueryTypes = {
-  TARGETS: 'targets'
+  TARGETS: 'targets',
+  STRATOS_METADATA: 'stratos'
 };
 
 export interface MetricAPIResponse {
@@ -29,6 +31,11 @@ export interface MetricsAPITargets {
   }[];
 }
 
+export interface MetricsStratosInfo {
+  name: string;
+
+}
+
 export class MetricsAPIAction implements Action {
   public url;
   constructor(public endpointGuid: string, public query: string, public queryType = MetricAPIQueryTypes.TARGETS) {
@@ -37,6 +44,15 @@ export class MetricsAPIAction implements Action {
   type = METRIC_API_START;
 }
 
+export class MetricsStratosAction implements Action {
+  public url;
+  public queryType = MetricAPIQueryTypes.STRATOS_METADATA;
+  constructor(public endpointGuid: string) {
+    this.url = `/pp/${proxyAPIVersion}/proxy/stratos`;
+  }
+  type = METRIC_API_START;
+}
+
 export class MetricsAPIActionSuccess implements Action {
   constructor(public endpointGuid: string, public data: MetricAPIResponse, public queryType = MetricAPIQueryTypes.TARGETS) { }
   type = METRIC_API_SUCCESS;
diff --git a/src/frontend/packages/store/src/effects/metrics.effects.ts b/src/frontend/packages/store/src/effects/metrics.effects.ts
index f4bc789531..3bd1d52cd2 100644
--- a/src/frontend/packages/store/src/effects/metrics.effects.ts
+++ b/src/frontend/packages/store/src/effects/metrics.effects.ts
@@ -4,7 +4,6 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { catchError, map, mergeMap } from 'rxjs/operators';
 
-import { entityCatalog } from '../entity-catalog/entity-catalog.service';
 import {
   METRIC_API_FAILED,
   METRIC_API_START,
@@ -13,6 +12,7 @@ import {
 } from '../actions/metrics-api.actions';
 import { getFullMetricQueryQuery, METRICS_START, MetricsAction } from '../actions/metrics.actions';
 import { DispatchOnlyAppState } from '../app-state';
+import { entityCatalog } from '../entity-catalog/entity-catalog.service';
 import { IMetricsResponse } from '../types/base-metric.types';
 import { StartRequestAction, WrapperRequestActionFailed, WrapperRequestActionSuccess } from './../types/request.types';
 
@@ -78,7 +78,7 @@ export class MetricsEffect {
       }).pipe(
         map(metrics => {
           const metric = metrics[action.endpointGuid];
-          return new MetricsAPIActionSuccess(action.endpointGuid, metric);
+          return new MetricsAPIActionSuccess(action.endpointGuid, metric, action.queryType);
         })
       ).pipe(catchError(errObservable => {
         return [
diff --git a/src/frontend/packages/store/src/reducers/system-endpoints.reducer.ts b/src/frontend/packages/store/src/reducers/system-endpoints.reducer.ts
index 175e6539f3..40fdc63271 100644
--- a/src/frontend/packages/store/src/reducers/system-endpoints.reducer.ts
+++ b/src/frontend/packages/store/src/reducers/system-endpoints.reducer.ts
@@ -111,7 +111,20 @@ function updateMetricsInfo(state: IRequestEntityTypeState<EndpointModel>, action
         }
       },
     };
+  } else if (action.queryType === MetricAPIQueryTypes.STRATOS_METADATA) {
+    const existingEndpoint = state[action.endpointGuid];
+    return {
+      ...state,
+      [action.endpointGuid]: {
+        ...existingEndpoint,
+        metadata: {
+          ...existingEndpoint.metadata,
+          metrics_stratos: action.data
+        }
+      },
+    };
   }
+
   return state;
 
 }
diff --git a/src/frontend/packages/store/src/types/endpoint.types.ts b/src/frontend/packages/store/src/types/endpoint.types.ts
index 83bf97984a..aedd7673fd 100644
--- a/src/frontend/packages/store/src/types/endpoint.types.ts
+++ b/src/frontend/packages/store/src/types/endpoint.types.ts
@@ -1,6 +1,6 @@
 import { ScopeStrings } from '../../../core/src/core/current-user-permissions.config';
 import { EndpointType } from '../../../core/src/core/extension/extension-types';
-import { MetricsAPITargets } from '../actions/metrics-api.actions';
+import { MetricsAPITargets, MetricsStratosInfo } from '../actions/metrics-api.actions';
 import { endpointSchemaKey } from '../helpers/entity-factory';
 import { RequestSectionKeys, TRequestTypeKeys } from '../reducers/api-request-reducer/types';
 
@@ -51,6 +51,7 @@ export interface EndpointModel {
     metrics_job?: string;
     metrics_environment?: string;
     metrics_targets?: MetricsAPITargets;
+    metrics_stratos?: MetricsStratosInfo;
     userInviteAllowed?: 'true' | any;
   };
   system_shared_token: boolean;

From d5e4a980d0385b103fd34f2a3b43e53a5bdb58a0 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Sat, 9 May 2020 07:19:15 +0100
Subject: [PATCH 083/176] Improve view that shows details for a metrics
 endpoint (#4258)

* Improve metrics view

* Fix code climate issues

* Fix 2 more code climate issues

* Fix merge issue

* Fix multiple metrics requests due to recreated list cards

* Fix most additional /stratos requests on load of endpoints page with metrics

* Fix unit tests

* Fix EndpointCardComponent test

Co-authored-by: Richard Cox <richard.cox@suse.com>

From 0da07e83bad763669af174760e6a209aeced1593 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Sat, 9 May 2020 07:19:31 +0100
Subject: [PATCH 084/176] Fix row highlight (see app github tab commit table)
 (#4257)

* Fix row highlight (see app github tab commit table)
- wasn't showing after list in list changes
- fixes #4243

* Fix dark mode box shadow
- dark mode styling overode disabling of box shadow

Co-authored-by: Neil MacDougall <neil.macdougall@suse.com>

From ee05bb7f173a5d23cb927d39423637a5c1e8fde8 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Sun, 10 May 2020 15:48:45 +0100
Subject: [PATCH 085/176] E2E Cleanup script: clean other users (#4269)

* E2E Cleanup script: clean other users and reduce time to 1 hour

* Remove superfluous blank lines

* Revert back to 2 hours
---
 deploy/ci/automation/e2e-clean-remnants.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/deploy/ci/automation/e2e-clean-remnants.sh b/deploy/ci/automation/e2e-clean-remnants.sh
index 7285afb277..9059f5ff5c 100755
--- a/deploy/ci/automation/e2e-clean-remnants.sh
+++ b/deploy/ci/automation/e2e-clean-remnants.sh
@@ -120,6 +120,7 @@ USERS=$(cf curl "/v2/users?results-per-page=100" | jq -r .resources[].entity.use
 clean "$USERS" "-" "delete-user" "^(acceptance\.e2e\.travisci)(-remove-users)\.(20[0-9]*)[Tt]([0-9]*)[zZ].*"
 clean "$USERS" "-" "delete-user" "^(acceptance\.e2e\.travis)(-remove-users)\.(20[0-9]*)[Tt]([0-9]*)[zZ].*"
 clean "$USERS" "-" "delete-user" "^(acceptancee2etravis)(invite[0-9])(20[0-9]*)[Tt]([0-9]*)[zZ].*"
+clean "$USERS" "-" "delete-user" "^(acceptance\.e2e\.travisci)(-manage-by-username)\.(20[0-9]*)[Tt]([0-9]*)[zZ].*"
 
 # Routes
 echo "Cleaning routes"

From 85d07abcb9ad3960772b1c51543770a009e72a1b Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Sun, 10 May 2020 18:48:27 +0100
Subject: [PATCH 086/176] Tidy up

---
 .../packages/core/src/core/user-favorite-helpers.ts   | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/frontend/packages/core/src/core/user-favorite-helpers.ts b/src/frontend/packages/core/src/core/user-favorite-helpers.ts
index cd802d69c4..73df67004c 100644
--- a/src/frontend/packages/core/src/core/user-favorite-helpers.ts
+++ b/src/frontend/packages/core/src/core/user-favorite-helpers.ts
@@ -1,6 +1,4 @@
-import { CfAPIResource } from '../../../cloud-foundry/src/store/types/cf-api.types';
 import { IEntityMetadata } from '../../../store/src/entity-catalog/entity-catalog.types';
-import { EndpointModel } from '../../../store/src/types/endpoint.types';
 import { IFavoriteMetadata, UserFavorite } from '../../../store/src/types/user-favorites.types';
 import { FavoritesConfigMapper } from '../shared/components/favorites-meta-card/favorite-config-mapper';
 import { entityCatalog } from './../../../store/src/entity-catalog/entity-catalog.service';
@@ -37,12 +35,3 @@ export function deriveEndpointFavoriteFromFavorite(favorite: UserFavorite<IFavor
   }
   return favorite;
 }
-
-function isEndpointEntity(endpoint: EndpointModel) {
-  return endpoint && endpoint.guid && endpoint.cnsi_type;
-}
-
-function isCfEntity(entity: CfAPIResource) {
-  return entity && entity.entity.cfGuid && entity.metadata && entity.metadata.guid;
-}
-

From e19bedd5fb39f2516648f5a5a136953f49297afd Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Sun, 10 May 2020 21:43:09 +0100
Subject: [PATCH 087/176] Version bump and change log for 3.2.0

---
 CHANGELOG.md             | 22 ++++++++++++++++++++++
 build/tools/changelog.sh |  4 ++--
 package-lock.json        |  2 +-
 package.json             |  2 +-
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 056b9f53aa..73a535617f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Change Log
 
+## 3.2.0
+
+[Full Changelog](https://github.com/cloudfoundry/stratos/compare/3.1.0...3.2.0)
+
+This release contains a number of fixes and improvements:
+
+**Improvements:**
+
+- Improve view that shows details for a metrics endpoint [\#4271](https://github.com/cloudfoundry/stratos/issues/4271)
+- Helm Chart: Add support for node selectors [\#4265](https://github.com/cloudfoundry/stratos/issues/4265)
+- Add documentation for list's 'max' feature, include info on 'fetch all' button [\#4259](https://github.com/cloudfoundry/stratos/issues/4259)
+- Backup Endpoints & Tokens [\#4228](https://github.com/cloudfoundry/stratos/issues/4228)
+
+**Fixes:**
+
+- Deployment time does not show correctly in diagnostics when deployed with Helm 3 [\#4261](https://github.com/cloudfoundry/stratos/issues/4261)
+- Pushing app from Stratos can sometimes fail due to expired token [\#4253](https://github.com/cloudfoundry/stratos/issues/4253)
+- Helm: Chart fails to render if `uaa` section is missing, docs misleading [\#4248](https://github.com/cloudfoundry/stratos/issues/4248)
+- Profile: Disabling polling fails to disable polling [\#4244](https://github.com/cloudfoundry/stratos/issues/4244)
+- App Summary: Github tab: Row highlight of deployed commit is obscured [\#4243](https://github.com/cloudfoundry/stratos/issues/4243)
+- Data Inaccuracies in PCF [\#4237](https://github.com/cloudfoundry/stratos/issues/4237)
+
 ## 3.1.0
 
 [Full Changelog](https://github.com/cloudfoundry/stratos/compare/3.0.0...3.1.0)
diff --git a/build/tools/changelog.sh b/build/tools/changelog.sh
index f81667f690..85cacfdd16 100755
--- a/build/tools/changelog.sh
+++ b/build/tools/changelog.sh
@@ -67,9 +67,9 @@ function log() {
   echo $1 | tee -a ${CHANGELOG}
 }
 
-QUERY="repo:${REPO}+milestone:3.1.0+state:closed"
+QUERY="repo:${REPO}+milestone:${MILESTONE}+state:closed"
 if [ -n "${FORK}" ]; then
-  FORK_QUERY="repo:${FORK}+milestone:3.1.0+state:closed"
+  FORK_QUERY="repo:${FORK}+milestone:${MILESTONE}+state:closed"
 fi
 
 BUGS="+label:bug"
diff --git a/package-lock.json b/package-lock.json
index b47f453c58..cb283a2c55 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 3725baa586..32c0f16a1e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stratos",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Stratos Console",
   "main": "index.js",
   "scripts": {

From 15de0361621c86dc9940a71b98fd1d5b4f8201ec Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Mon, 11 May 2020 08:01:24 +0100
Subject: [PATCH 088/176] E2E Test improvements (#4275)

* Speed up form fill

* Fix page set setting

* Remove whitespace
---
 .../cloud-foundry/manage-users-stepper-e2e.spec.ts   |  4 ++--
 src/test-e2e/helpers/e2e-helpers.ts                  |  8 ++++++++
 src/test-e2e/po/component.po.ts                      |  8 ++++++++
 src/test-e2e/po/list.po.ts                           | 12 ++++++++++--
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts b/src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts
index e16b6ecd1a..d89dc3eb6b 100644
--- a/src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts
@@ -58,8 +58,8 @@ describe('Manage Users Stepper', () => {
     cfPage.goToUsersTab();
 
     const usersTable = new CFUsersListComponent();
-    // Not suew we can do this, if the pager is not in view?
-    // usersTable.pagination.setPageSize('80', 'mat-select-3');
+    usersTable.waitForNoLoadingIndicator();
+    usersTable.pagination.setPageSize('80', 'mat-select-3');
     usersTable.header.setSearchText(userName);
     let usersRow = -1;
     usersTable.table.findRow('username', userName)
diff --git a/src/test-e2e/helpers/e2e-helpers.ts b/src/test-e2e/helpers/e2e-helpers.ts
index 9223143afd..d4fd4b3632 100644
--- a/src/test-e2e/helpers/e2e-helpers.ts
+++ b/src/test-e2e/helpers/e2e-helpers.ts
@@ -154,6 +154,14 @@ export class E2EHelpers {
     });
   }
 
+  scrollToTop() {
+    return browser.executeScript('window.scrollTo(0,0);');
+  }
+
+  scrollToBottom() {
+    return browser.executeScript('window.scrollTo(0, document.body.scrollHeight);');
+  }
+
   waitForElementAndClick(element) {
     const until = protractor.ExpectedConditions;
     browser.wait(until.presenceOf(element), 10000);
diff --git a/src/test-e2e/po/component.po.ts b/src/test-e2e/po/component.po.ts
index 62157e2be0..8594172d09 100644
--- a/src/test-e2e/po/component.po.ts
+++ b/src/test-e2e/po/component.po.ts
@@ -48,6 +48,14 @@ export class Component {
     return Component.scrollIntoView(this.locator);
   }
 
+  scrollToTop(): promise.Promise<any> {
+    return new E2EHelpers().scrollToTop();
+  }
+
+  scrollToBottom(): promise.Promise<any> {
+    return new E2EHelpers().scrollToBottom();
+  }
+
   protected hasClass(cls, element = this.locator): promise.Promise<boolean> {
     return element.getAttribute('class')
       .then((classes) => {
diff --git a/src/test-e2e/po/list.po.ts b/src/test-e2e/po/list.po.ts
index 2519345d92..c5811e91cd 100644
--- a/src/test-e2e/po/list.po.ts
+++ b/src/test-e2e/po/list.po.ts
@@ -11,7 +11,7 @@ const until = protractor.ExpectedConditions;
 export interface CardMetadata {
   index: number;
   title: string;
-  click: Function;
+  click: () => void;
 }
 
 // Page Object for the List Table View
@@ -399,7 +399,15 @@ export class ListPaginationComponent extends Component {
 
   setPageSize(pageSize, customCtrlName?: string): promise.Promise<void> {
     const name = customCtrlName || 'mat-select-2';
-    return this.getPageSizeForm().fill({ [name]: pageSize });
+    // Only try to set the page size, if the page size control is shown
+    // Pagination controls will be hidden if there are not enough items to require more than 1 page
+    return this.getPageSizeForm().isDisplayed().then(displayed => {
+      if (displayed) {
+        this.scrollToBottom();
+        this.getPageSizeForm().fill({ [name]: pageSize });
+        return this.scrollToTop();
+      }
+    });
   }
 
   getPageSizeForm(): FormComponent {

From 3302f876f83d14f7b6af1645b2d1ffbb5931a0e3 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 11 May 2020 08:24:53 +0100
Subject: [PATCH 089/176] Update to Angular 9.1.6

---
 package-lock.json | 1025 +++++++++++++++++++++++++++++++++------------
 package.json      |   44 +-
 2 files changed, 781 insertions(+), 288 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e611c6e04e..0f906728b4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,12 +5,12 @@
   "requires": true,
   "dependencies": {
     "@angular-devkit/architect": {
-      "version": "0.901.1",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.1.tgz",
-      "integrity": "sha512-foWDAurMfBDYLAJxHpTFkJBub1c2A8+eWHbBjgqIHmT8xadnE7t8nSA9XDl+k/kIoWw/qFU+6IttPirudYc/vw==",
+      "version": "0.901.5",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.5.tgz",
+      "integrity": "sha512-VO+8qBkaq54xAjdtvhEhQ86gZxS0V1wC9hGblw3O+XXri/euHky4811B2BbEylPy8/kRy5sUYcuwcyZrVxJ2TQ==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "9.1.1",
+        "@angular-devkit/core": "9.1.5",
         "rxjs": "6.5.4"
       },
       "dependencies": {
@@ -26,21 +26,21 @@
       }
     },
     "@angular-devkit/build-angular": {
-      "version": "0.901.1",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.901.1.tgz",
-      "integrity": "sha512-6uEvo5htsJoxQHBVwHOGmM6YWq5q6m9UWMv/ughlek0RtSLFfOt9TZQ/yQHgtGQsCQvscD/jBzVoD0zD5Ax/SQ==",
+      "version": "0.901.5",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.901.5.tgz",
+      "integrity": "sha512-XottEBXE7cmkx6LPu33lXJCSAlxFkIu2ErWvV1oy+La6aZEuoJVntxzIKLprJmTiiD/4IDDQLWwp4m+EC96kyg==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.901.1",
-        "@angular-devkit/build-optimizer": "0.901.1",
-        "@angular-devkit/build-webpack": "0.901.1",
-        "@angular-devkit/core": "9.1.1",
+        "@angular-devkit/architect": "0.901.5",
+        "@angular-devkit/build-optimizer": "0.901.5",
+        "@angular-devkit/build-webpack": "0.901.5",
+        "@angular-devkit/core": "9.1.5",
         "@babel/core": "7.9.0",
         "@babel/generator": "7.9.3",
         "@babel/preset-env": "7.9.0",
         "@babel/template": "7.8.6",
         "@jsdevtools/coverage-istanbul-loader": "3.0.3",
-        "@ngtools/webpack": "9.1.1",
+        "@ngtools/webpack": "9.1.5",
         "ajv": "6.12.0",
         "autoprefixer": "9.7.4",
         "babel-loader": "8.0.6",
@@ -50,6 +50,7 @@
         "circular-dependency-plugin": "5.2.0",
         "copy-webpack-plugin": "5.1.1",
         "core-js": "3.6.4",
+        "css-loader": "3.5.1",
         "cssnano": "4.1.10",
         "file-loader": "6.0.0",
         "find-cache-dir": "3.3.1",
@@ -77,7 +78,6 @@
         "semver": "7.1.3",
         "source-map": "0.7.3",
         "source-map-loader": "0.2.4",
-        "source-map-support": "0.5.16",
         "speed-measure-webpack-plugin": "1.3.1",
         "style-loader": "1.1.3",
         "stylus": "0.54.7",
@@ -91,7 +91,7 @@
         "webpack-merge": "4.2.2",
         "webpack-sources": "1.4.3",
         "webpack-subresource-integrity": "1.4.0",
-        "worker-plugin": "4.0.2"
+        "worker-plugin": "4.0.3"
       },
       "dependencies": {
         "core-js": {
@@ -172,12 +172,12 @@
       }
     },
     "@angular-devkit/build-ng-packagr": {
-      "version": "0.901.1",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-ng-packagr/-/build-ng-packagr-0.901.1.tgz",
-      "integrity": "sha512-shoWppF08glJmfZV3NdZ48MMjZWETAaiZHGV/TBWzgr3O84Sl6juauqeApHZW27inpjEqyJUktp3PA7eMnpeag==",
+      "version": "0.901.5",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-ng-packagr/-/build-ng-packagr-0.901.5.tgz",
+      "integrity": "sha512-/2H8TIxzGOhtZIVSHT2FRTO/Gs17iVO8tNfKVgHLnkv58gsMdppPfIcZo2DY+DjnhXrVPcwwODCWFf2NG3ZU+w==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.901.1",
+        "@angular-devkit/architect": "0.901.5",
         "rxjs": "6.5.4"
       },
       "dependencies": {
@@ -193,9 +193,9 @@
       }
     },
     "@angular-devkit/build-optimizer": {
-      "version": "0.901.1",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.901.1.tgz",
-      "integrity": "sha512-o0A9CcyDQSUnC5CQIKf92VH8amIYRYrMgLf2kdhSMcy0QV+rEJyN81dSvwX/Yxgnr9NbWEAQg7jnyKk06vfhOw==",
+      "version": "0.901.5",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.901.5.tgz",
+      "integrity": "sha512-xmAMvLMSa8BvqlZ0wsC37Qop/7/pEaQRKLeowC3CCI3jiYDF10Tihar+Hjc04NVSal8ZBP9/+Gp3Yr0x61HcFA==",
       "dev": true,
       "requires": {
         "loader-utils": "2.0.0",
@@ -220,13 +220,13 @@
       }
     },
     "@angular-devkit/build-webpack": {
-      "version": "0.901.1",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.901.1.tgz",
-      "integrity": "sha512-9oNI+wPSk8yECy+f0EebfMx4PH3uDJRrifYZAxcr84IpzEbpfpRuYhE3ecwqd7k0zu2Kdjw1uUrGxBuH4/sbGg==",
+      "version": "0.901.5",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.901.5.tgz",
+      "integrity": "sha512-4HHOFFRu3yUBe0otaDHh4PID99XvnBJj7hYzvbB5BvP0ULif4/W0aoU2STnern4lH4pJmrtqYawBZ84ETXN/Ag==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.901.1",
-        "@angular-devkit/core": "9.1.1",
+        "@angular-devkit/architect": "0.901.5",
+        "@angular-devkit/core": "9.1.5",
         "rxjs": "6.5.4"
       },
       "dependencies": {
@@ -242,9 +242,9 @@
       }
     },
     "@angular-devkit/core": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.1.tgz",
-      "integrity": "sha512-57MNew2u1QwVb69jxZyhXgdW9kqcGyWyRy2ui/hWCkWLg7RumWtyypmdTs89FNExB4HqtXlQ2eO3JZxfs7QR3w==",
+      "version": "9.1.5",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.5.tgz",
+      "integrity": "sha512-i0BJ6Ad3bcDE6e4Ev9Flbw7P0bz9p94FDVfEOPGBTrbJQZSqOm3CqaH2y5LGfl7acSPUi54hK481h1QRUFBkTQ==",
       "dev": true,
       "requires": {
         "ajv": "6.12.0",
@@ -272,12 +272,12 @@
       }
     },
     "@angular-devkit/schematics": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.1.tgz",
-      "integrity": "sha512-6wx2HcvafHvEjEa1tjDzW2hXrOiSE8ALqJUArb3+NoO1BDM42aGcqyPo0ODzKtDk12CgSsFXdNKRpQ5AmpSPtw==",
+      "version": "9.1.5",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.5.tgz",
+      "integrity": "sha512-nkNiGrVl7xLaYYj/oT1wOBowa4Driv2f4abn78AJI/pd/EXA45G/rI9gO/kEG8lHn+FAMQedaywX9N4JDOxCGg==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "9.1.1",
+        "@angular-devkit/core": "9.1.5",
         "ora": "4.0.3",
         "rxjs": "6.5.4"
       },
@@ -294,29 +294,29 @@
       }
     },
     "@angular/animations": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-9.1.2.tgz",
-      "integrity": "sha512-5UJ8SzCtFj4vZChVsni4K9oa4qE9tQ67bwnP6DKxkLEJKQWWyasYp+2siAi/7zD2ro2XA0qRMYhgQz5Vj6eBoQ=="
+      "version": "9.1.6",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-9.1.6.tgz",
+      "integrity": "sha512-7Pp7aqNNcH4fu1BnOVpvqJJHjE7RZ5K1oD396OWCh35pgpLowLSpFjhbVhzGrcAuxHyKnnHSX3etLn2hDaHxmQ=="
     },
     "@angular/cdk": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-9.2.1.tgz",
-      "integrity": "sha512-aSG1UNPszkSnpNuDCNd7ZgT29oQ8vqHPmoqjvJI0JkEv3i6uEs5tRuhWl3TK39wDNuwdlq0AY47XTa/0Ppb5RQ==",
+      "version": "9.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-9.2.3.tgz",
+      "integrity": "sha512-tQr/yt8GNGsZ/DTT+PMq7XdRmL56hwVCyf8F12JQAawutSLfTfMb+S1lpN7L/0Pb/L5JBuCfG2HmXK7vHo02gw==",
       "requires": {
         "parse5": "^5.0.0"
       }
     },
     "@angular/cli": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-9.1.1.tgz",
-      "integrity": "sha512-sjRAV4UF8M5v+2gw+EwCYSgciBZDc05AbNxQt+uUdxdfR1QU9hifWq8WDxfOR6jdDP5YqMtQsNaFNwrUyjJJoQ==",
+      "version": "9.1.5",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-9.1.5.tgz",
+      "integrity": "sha512-Decn0p+s0SLc5p2GN7k8dUrOY43hBuCz8PxueW0gEln7NjlpdmHk+6JQn0ZRl2/2Dbk+eTGzPXyCxGwqsW3jjw==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.901.1",
-        "@angular-devkit/core": "9.1.1",
-        "@angular-devkit/schematics": "9.1.1",
-        "@schematics/angular": "9.1.1",
-        "@schematics/update": "0.901.1",
+        "@angular-devkit/architect": "0.901.5",
+        "@angular-devkit/core": "9.1.5",
+        "@angular-devkit/schematics": "9.1.5",
+        "@schematics/angular": "9.1.5",
+        "@schematics/update": "0.901.5",
         "@yarnpkg/lockfile": "1.1.0",
         "ansi-colors": "4.1.1",
         "debug": "4.1.1",
@@ -379,19 +379,19 @@
       }
     },
     "@angular/common": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-9.1.2.tgz",
-      "integrity": "sha512-MAQW0DGq2NhvJSETLTwuImdzwI+wboG+5Uzgc0L8C/hX7SrEE65Hmz4nIjmGi2CPGLpodfWEcCPlV0R0dHun4A=="
+      "version": "9.1.6",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-9.1.6.tgz",
+      "integrity": "sha512-L9vw//wE+8QcSArOA411uJ68znnszCiPrbzSBV0BRZeadc7X68MwANA9qjtiTWZx5Xh9pNfHHwsCUyv2lUeinQ=="
     },
     "@angular/compiler": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.1.2.tgz",
-      "integrity": "sha512-82DitvlZA5DoE++qiiJdgx6HE71h96sfLHCjjvYJHApoOcnX+zBZFBrflpbXK9W4YdvydU4Lc1Ql1eleQPeT/g=="
+      "version": "9.1.6",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.1.6.tgz",
+      "integrity": "sha512-tHOQEjWuWqSkrk6/vI6BK7uJnpAyFajCXPW37rH5xspF/aMbetrpoOiGBNUQg/HLaFh04nOAnnFntjLkW0ooaA=="
     },
     "@angular/compiler-cli": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-9.1.2.tgz",
-      "integrity": "sha512-zC/oIuT68vtuiYrgXqWsDNi/0DQ1Ti6J6gMTrXVvZXlEDikEExTAJKrrBV5jo6B0bpUofe/dDcJaKR3Ys3cM3Q==",
+      "version": "9.1.6",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-9.1.6.tgz",
+      "integrity": "sha512-1b7m9tvSQJE4y95wNCdi34MORcsmXPC1vaylYlzChVM2et9Y2eKHYcRs+4g329j66irLBGpS/7cgTT2pgJ+IbA==",
       "dev": true,
       "requires": {
         "canonical-path": "1.0.0",
@@ -450,9 +450,9 @@
           }
         },
         "chokidar": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz",
-          "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==",
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
+          "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
           "dev": true,
           "requires": {
             "anymatch": "~3.1.1",
@@ -462,7 +462,7 @@
             "is-binary-path": "~2.1.0",
             "is-glob": "~4.0.1",
             "normalize-path": "~3.0.0",
-            "readdirp": "~3.3.0"
+            "readdirp": "~3.4.0"
           }
         },
         "cliui": {
@@ -522,9 +522,9 @@
           }
         },
         "fsevents": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
-          "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+          "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
           "dev": true,
           "optional": true
         },
@@ -610,12 +610,12 @@
           "dev": true
         },
         "readdirp": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz",
-          "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==",
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
+          "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
           "dev": true,
           "requires": {
-            "picomatch": "^2.0.7"
+            "picomatch": "^2.2.1"
           }
         },
         "require-main-filename": {
@@ -702,9 +702,9 @@
           }
         },
         "yargs-parser": {
-          "version": "18.1.2",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz",
-          "integrity": "sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==",
+          "version": "18.1.3",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
           "dev": true,
           "requires": {
             "camelcase": "^5.0.0",
@@ -714,9 +714,9 @@
       }
     },
     "@angular/core": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.1.2.tgz",
-      "integrity": "sha512-nAqRl+5drAnZlBT7AgSo2JJubmPNrGCvhZ83dosPEUqJoLr69/lYipnF/iqKzYn5xo4MM1O27WIhSNDtDjBmzQ=="
+      "version": "9.1.6",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.1.6.tgz",
+      "integrity": "sha512-iXgPh5DebLwkMzLtQ6WKiv/mo4hpwMOwYex3O4F2CKToR2tKPnXbV5WC/ADGm0XYXiocSKQPiyL4ZrUjVeKEqA=="
     },
     "@angular/flex-layout": {
       "version": "9.0.0-beta.29",
@@ -724,49 +724,49 @@
       "integrity": "sha512-93sxR+kYfYMOdnlWL0Q77FZ428gg8XnBu0YZm6GsCdkw/vLggIT/G1ZAqHlCPIODt6pxmCJ5KXh4ShvniIYDsA=="
     },
     "@angular/forms": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-9.1.2.tgz",
-      "integrity": "sha512-/f2WhMiKDo1/RoisTI71Dy4Z4+sAsAuzgIxJEXvgDGSYvzLl9G8erFx4N6be8Cy/xXwErmp3JOwXIAXjzxF8tA=="
+      "version": "9.1.6",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-9.1.6.tgz",
+      "integrity": "sha512-3KiFjLDipZVgS5rfnZ8EoKlkUokOR8dmuw2xdjKHgzflWFFeuaY9ZtQgjZGw9/jkwWlc9P38BOSEHbK8NakdDw=="
     },
     "@angular/language-service": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-9.1.2.tgz",
-      "integrity": "sha512-0BnDIFbIAtFKS/2HDI0efcnW3DSkAAFhUWluBnssvwGzuMHikOKGeamuWM27ki3IzPQKGJ7fGS2fz8A7sMeIYQ==",
+      "version": "9.1.6",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-9.1.6.tgz",
+      "integrity": "sha512-pB18hVoAbIuk1Wus8ur7yUxSukfPR4pCXiOfbxDQ94qlCzLAzIwXbaNV4erpBfL/fUKxMY3h8RrVt0dfm6M5RQ==",
       "dev": true
     },
     "@angular/material": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/material/-/material-9.2.1.tgz",
-      "integrity": "sha512-nqn/0Eg04DxwnkRGSM1xnmGgtfHYOBcEPbFeTu8c1qAbjFEozd6tpw4y6dQrCCL/JLNIRQPsxsUsVnKeWDF/4Q=="
+      "version": "9.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/material/-/material-9.2.3.tgz",
+      "integrity": "sha512-QJltLNp8a/eoozPgkFLISEWgdlX9q9+fZaLJ8c9tHEp2IT5sFYBFHf8dPl0pUyxgOXkS/0HD43I1qki71/T7Kw=="
     },
     "@angular/material-moment-adapter": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-9.2.1.tgz",
-      "integrity": "sha512-i3tbL3DJQspO23cPAgW6pAvztuv2D8tkGhxl+bTUlq8FgGBqKrOa0T/maN1fik46AXZojowUVZoCG7EvV2T7nQ=="
+      "version": "9.2.3",
+      "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-9.2.3.tgz",
+      "integrity": "sha512-+B+njuV0rr2GKOglgXlFzgT6Pq7VMsPsMHhTkJWeRe96RVEIuT6pMehlHJAEQgaFi+LRjH1MIHLH2jcc0myDvg=="
     },
     "@angular/platform-browser": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-9.1.2.tgz",
-      "integrity": "sha512-/3L4DdvnebvaJUurusaq8RJBFfr/SHWG6DMmV1VVpADxe8kjREyN0LdNDSkZgVf/QcUSwNEA6153iwcF92Otew=="
+      "version": "9.1.6",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-9.1.6.tgz",
+      "integrity": "sha512-ebQhbT0Z55vwlQwAY4+s3Bcf1Q4wEN5Yk43iCuVt4g2kFkg09UP0z8aYtbuh7VQDyv/W4TTIGX8smGBWstoedQ=="
     },
     "@angular/platform-browser-dynamic": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.1.2.tgz",
-      "integrity": "sha512-BWHxy8S71z+NmUQmtR+/Dkohlj3LQIXltOqeVdCSpjV9cultBNN3bE1w0Rjp3BmCRGCIDH7qFlr4U5woHa7ldw=="
+      "version": "9.1.6",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.1.6.tgz",
+      "integrity": "sha512-7AL3hWu4oY0LRiMS9ZEFXPW2uqybWcVNFDHjPp3UwsDIT4+sW3DIm8P+UvAOFkkRwaHpPDqm4chTTiAHygC/1Q=="
     },
     "@angular/platform-server": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-9.1.2.tgz",
-      "integrity": "sha512-GjDWEglkmBgpDZ5pWlaC4zMXUAXRmTsE2me277OGQlKKZwsBfFZWai0NHAbDVq0SE4/f3x0QKo33TxOy47LXng==",
+      "version": "9.1.6",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-9.1.6.tgz",
+      "integrity": "sha512-hLAwh/J9a2v9opLIZVIiykPIsxmRozY3OjXH1phbIDFQQCHCNLlODOowxVnn7DF90DyVSLCTKNnqNjZW3DdlVg==",
       "requires": {
         "domino": "^2.1.2",
         "xhr2": "^0.2.0"
       }
     },
     "@angular/router": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.1.2.tgz",
-      "integrity": "sha512-csxE4HkuhVR1X932Q3kSDqBoF7Awuq5dsjv0nFk78raiHgG3CNnfMLHt8xD9XtOmR7ZT+D4yh/YmIK6W7J5hbQ=="
+      "version": "9.1.6",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-9.1.6.tgz",
+      "integrity": "sha512-Oz4nVQUR6t68DSzZuSrVaqrzmA7/0PIEi0sc85CE+UuOEoAqGMwN0NdQYizFT62WZ16DRI/1tZ+TTWvdmpEv8w=="
     },
     "@babel/code-frame": {
       "version": "7.5.5",
@@ -778,12 +778,12 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.0.tgz",
-      "integrity": "sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.6.tgz",
+      "integrity": "sha512-5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.9.1",
+        "browserslist": "^4.11.1",
         "invariant": "^2.2.4",
         "semver": "^5.5.0"
       }
@@ -890,13 +890,13 @@
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.8.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz",
-      "integrity": "sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz",
+      "integrity": "sha512-x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.8.6",
-        "browserslist": "^4.9.1",
+        "@babel/compat-data": "^7.9.6",
+        "browserslist": "^4.11.1",
         "invariant": "^2.2.4",
         "levenary": "^1.1.1",
         "semver": "^5.5.0"
@@ -1034,15 +1034,123 @@
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz",
-      "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz",
+      "integrity": "sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==",
       "dev": true,
       "requires": {
         "@babel/helper-member-expression-to-functions": "^7.8.3",
         "@babel/helper-optimise-call-expression": "^7.8.3",
-        "@babel/traverse": "^7.8.6",
-        "@babel/types": "^7.8.6"
+        "@babel/traverse": "^7.9.6",
+        "@babel/types": "^7.9.6"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.8.3",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.8.3"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.9.6",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz",
+          "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.9.6",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.13",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.9.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
+          "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.8.3",
+            "@babel/template": "^7.8.3",
+            "@babel/types": "^7.9.5"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.9.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+          "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.9.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.9.6",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz",
+          "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==",
+          "dev": true
+        },
+        "@babel/traverse": {
+          "version": "7.9.6",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz",
+          "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.8.3",
+            "@babel/generator": "^7.9.6",
+            "@babel/helper-function-name": "^7.9.5",
+            "@babel/helper-split-export-declaration": "^7.8.3",
+            "@babel/parser": "^7.9.6",
+            "@babel/types": "^7.9.6",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.13"
+          }
+        },
+        "@babel/types": {
+          "version": "7.9.6",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz",
+          "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.9.5",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
+          },
+          "dependencies": {
+            "@babel/helper-validator-identifier": {
+              "version": "7.9.5",
+              "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz",
+              "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==",
+              "dev": true
+            }
+          }
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "globals": {
+          "version": "11.12.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "@babel/helper-simple-access": {
@@ -1083,14 +1191,122 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.9.2",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz",
-      "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz",
+      "integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==",
       "dev": true,
       "requires": {
         "@babel/template": "^7.8.3",
-        "@babel/traverse": "^7.9.0",
-        "@babel/types": "^7.9.0"
+        "@babel/traverse": "^7.9.6",
+        "@babel/types": "^7.9.6"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.8.3",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.8.3"
+          }
+        },
+        "@babel/generator": {
+          "version": "7.9.6",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz",
+          "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.9.6",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.13",
+            "source-map": "^0.5.0"
+          }
+        },
+        "@babel/helper-function-name": {
+          "version": "7.9.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
+          "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-get-function-arity": "^7.8.3",
+            "@babel/template": "^7.8.3",
+            "@babel/types": "^7.9.5"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.9.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+          "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.9.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.9.6",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz",
+          "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==",
+          "dev": true
+        },
+        "@babel/traverse": {
+          "version": "7.9.6",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz",
+          "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.8.3",
+            "@babel/generator": "^7.9.6",
+            "@babel/helper-function-name": "^7.9.5",
+            "@babel/helper-split-export-declaration": "^7.8.3",
+            "@babel/parser": "^7.9.6",
+            "@babel/types": "^7.9.6",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.13"
+          }
+        },
+        "@babel/types": {
+          "version": "7.9.6",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz",
+          "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.9.5",
+            "lodash": "^4.17.13",
+            "to-fast-properties": "^2.0.0"
+          },
+          "dependencies": {
+            "@babel/helper-validator-identifier": {
+              "version": "7.9.5",
+              "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz",
+              "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==",
+              "dev": true
+            }
+          }
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "globals": {
+          "version": "11.12.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "@babel/highlight": {
@@ -1170,9 +1386,9 @@
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz",
-      "integrity": "sha512-VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz",
+      "integrity": "sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.3",
@@ -1364,9 +1580,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.9.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-          "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
+          "version": "7.9.6",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz",
+          "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.9.5",
@@ -1467,38 +1683,38 @@
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz",
-      "integrity": "sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz",
+      "integrity": "sha512-zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==",
       "dev": true,
       "requires": {
         "@babel/helper-module-transforms": "^7.9.0",
         "@babel/helper-plugin-utils": "^7.8.3",
-        "babel-plugin-dynamic-import-node": "^2.3.0"
+        "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz",
-      "integrity": "sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz",
+      "integrity": "sha512-7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==",
       "dev": true,
       "requires": {
         "@babel/helper-module-transforms": "^7.9.0",
         "@babel/helper-plugin-utils": "^7.8.3",
         "@babel/helper-simple-access": "^7.8.3",
-        "babel-plugin-dynamic-import-node": "^2.3.0"
+        "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz",
-      "integrity": "sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz",
+      "integrity": "sha512-NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg==",
       "dev": true,
       "requires": {
         "@babel/helper-hoist-variables": "^7.8.3",
         "@babel/helper-module-transforms": "^7.9.0",
         "@babel/helper-plugin-utils": "^7.8.3",
-        "babel-plugin-dynamic-import-node": "^2.3.0"
+        "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-umd": {
@@ -1715,9 +1931,9 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.9.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz",
-      "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz",
+      "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==",
       "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.4"
@@ -1896,32 +2112,32 @@
       }
     },
     "@ngrx/effects": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-9.1.0.tgz",
-      "integrity": "sha512-DPMtp/2YTrvuxMqaehQ39FeoNODuMcRB6xDImvrnMFPIkUcP3mDHnIg6UB5c2JvfHlZZClKR+Fb+RE2nuVub8w=="
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-9.1.2.tgz",
+      "integrity": "sha512-H9jbGUzP5izk9Ap8BQJicO1+xheyDyHBbvv6b1NkaRHpDizhPOSBjoFWExFfsejXo0dafaIsu6aI+y+Fp+LSsg=="
     },
     "@ngrx/router-store": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-9.1.0.tgz",
-      "integrity": "sha512-zdIBUsfyrrA64mUqajHMARSwttOAOJ5FSyVJLHQfBlz9/vil6Kby1KhVLEG7mGmkz799YYlIM135QsrJhgf7wA=="
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-9.1.2.tgz",
+      "integrity": "sha512-zqAm7fOdJ34dY2Tlts2YV9MDcDP2CqB+hLEytjo/bOIkUo/lQA1R5VAUI+Z8+tUlmPqSVIJkzsGuCxO6XnLEjQ=="
     },
     "@ngrx/store": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-9.1.0.tgz",
-      "integrity": "sha512-Ah2nApPZXTvKl7ybaFMIFwEdMg8b7PvIKATigbDTUftAsFxked2+T7blNv6aCgSfEqbOVMBTYPk7OsLCYZoz4Q=="
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-9.1.2.tgz",
+      "integrity": "sha512-FQXFonF8hSGJDqgLaoWHy2mkeJwVdoa3jLoT1YpkJWxsFMG4U0T6JYG4VrtuymDgo9XwWBBJqIiNpdTgHhofSQ=="
     },
     "@ngrx/store-devtools": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-9.1.0.tgz",
-      "integrity": "sha512-KDvuNBxfTgDHjESiouEoPXq8GCUYbHnA+jOs8MzzwVDmxNLeZuDy3amaVzKv9Q5nncI6mNGcXOzTKWzapET8Sw=="
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-9.1.2.tgz",
+      "integrity": "sha512-i9gwj9FlUVrei9yMwwFx15RV0JWOI73cjbjKhZ2lUWmCF6bfZeuPYZmEs3/80L8r3R9nZWnBoX9xxQslte65iw=="
     },
     "@ngtools/webpack": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.1.1.tgz",
-      "integrity": "sha512-4RPlk6aIlYhk9isTvXbMaA2G0LhxOzcZ+2iG7zV9Yj/Vm8+lrRexpQ/kC/Dh0GI/oCtKIkVpUzx5LTozYeTLdQ==",
+      "version": "9.1.5",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-9.1.5.tgz",
+      "integrity": "sha512-6VzmlXRnf7phwLOiy0WrxHFHD5TuNQgVVpD/VFkZjtCTOsZyGQYGVPfaqxvn13M4Mm8bjrN4mk06VowCFm2oHw==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "9.1.1",
+        "@angular-devkit/core": "9.1.5",
         "enhanced-resolve": "4.1.1",
         "rxjs": "6.5.4",
         "webpack-sources": "1.4.3"
@@ -2069,23 +2285,23 @@
       }
     },
     "@schematics/angular": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.1.tgz",
-      "integrity": "sha512-V0DcDNgHQ2YR+PGZI6+pf/mUNNxt5SusShkZ1PbwIMk/HUQpzEGkLjm3v1Jw9eIZKiuDx615GNU1xDzQ/KyNRQ==",
+      "version": "9.1.5",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.5.tgz",
+      "integrity": "sha512-kMscfnwd9TGLo8V+dE/Pzu4wNxZej/6F6z5XzMOQVFTbL+RqMDvtkHf9CarhiKBd5ogm4npfKV8ToNTUecFJkA==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "9.1.1",
-        "@angular-devkit/schematics": "9.1.1"
+        "@angular-devkit/core": "9.1.5",
+        "@angular-devkit/schematics": "9.1.5"
       }
     },
     "@schematics/update": {
-      "version": "0.901.1",
-      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.901.1.tgz",
-      "integrity": "sha512-g5B8hjXKCbUNLKCkWQxc5r2D9lOQXRTLZJNIqva+l/ck0AML5MpelxkqQId9ZGLfQqfFk/XjdSHRWgcmUs1WnA==",
+      "version": "0.901.5",
+      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.901.5.tgz",
+      "integrity": "sha512-JmB+AuU6C9eM8x/CxeBEDigRuypzuWx7gnloK9D5i2gP9r39clFNtWT7eM3YW3kl4uyEMzrQHx6esMWNUScVBw==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "9.1.1",
-        "@angular-devkit/schematics": "9.1.1",
+        "@angular-devkit/core": "9.1.5",
+        "@angular-devkit/schematics": "9.1.5",
         "@yarnpkg/lockfile": "1.1.0",
         "ini": "1.3.5",
         "npm-package-arg": "^8.0.0",
@@ -3003,6 +3219,14 @@
         "bn.js": "^4.0.0",
         "inherits": "^2.0.1",
         "minimalistic-assert": "^1.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.8",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+          "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+          "dev": true
+        }
       }
     },
     "assert": {
@@ -3204,9 +3428,9 @@
       }
     },
     "babel-plugin-dynamic-import-node": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz",
-      "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
+      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
       "dev": true,
       "requires": {
         "object.assign": "^4.1.0"
@@ -3372,9 +3596,9 @@
       "dev": true
     },
     "bn.js": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.1.tgz",
+      "integrity": "sha512-IUTD/REb78Z2eodka1QZyyEk66pciRcP6Sroka0aI3tG/iwIdYLrBD62RsubR7vqdt3WyX8p4jxeatzmRSphtA==",
       "dev": true
     },
     "body-parser": {
@@ -3625,21 +3849,43 @@
       "requires": {
         "bn.js": "^4.1.0",
         "randombytes": "^2.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.8",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+          "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+          "dev": true
+        }
       }
     },
     "browserify-sign": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.1",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.2",
-        "elliptic": "^6.0.0",
-        "inherits": "^2.0.1",
-        "parse-asn1": "^5.0.0"
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.1.0.tgz",
+      "integrity": "sha512-VYxo7cDCeYUoBZ0ZCy4UyEUCP3smyBd4DRQM5nrFS1jJjPJjX7rP3oLRpPoWfkhQfyJ0I9ZbHbKafrFD/SGlrg==",
+      "dev": true,
+      "requires": {
+        "bn.js": "^5.1.1",
+        "browserify-rsa": "^4.0.1",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.2",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.5",
+        "readable-stream": "^3.6.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
       }
     },
     "browserify-zlib": {
@@ -4737,12 +4983,12 @@
       "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
     },
     "core-js-compat": {
-      "version": "3.6.4",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.4.tgz",
-      "integrity": "sha512-zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA==",
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
+      "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.8.3",
+        "browserslist": "^4.8.5",
         "semver": "7.0.0"
       },
       "dependencies": {
@@ -4792,6 +5038,14 @@
       "requires": {
         "bn.js": "^4.1.0",
         "elliptic": "^6.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.8",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+          "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+          "dev": true
+        }
       }
     },
     "create-hash": {
@@ -4895,6 +5149,61 @@
         "timsort": "^0.3.0"
       }
     },
+    "css-loader": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.5.1.tgz",
+      "integrity": "sha512-0G4CbcZzQ9D1Q6ndOfjFuMDo8uLYMu5vc9Abs5ztyHcKvmil6GJrMiNjzzi3tQvUF+mVRuDg7bE6Oc0Prolgig==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.3.1",
+        "cssesc": "^3.0.0",
+        "icss-utils": "^4.1.1",
+        "loader-utils": "^1.2.3",
+        "normalize-path": "^3.0.0",
+        "postcss": "^7.0.27",
+        "postcss-modules-extract-imports": "^2.0.0",
+        "postcss-modules-local-by-default": "^3.0.2",
+        "postcss-modules-scope": "^2.2.0",
+        "postcss-modules-values": "^3.0.0",
+        "postcss-value-parser": "^4.0.3",
+        "schema-utils": "^2.6.5",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
     "css-parse": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
@@ -5591,6 +5900,14 @@
         "bn.js": "^4.1.0",
         "miller-rabin": "^4.0.0",
         "randombytes": "^2.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.8",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+          "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+          "dev": true
+        }
       }
     },
     "dir-glob": {
@@ -5680,9 +5997,9 @@
       "dev": true
     },
     "domino": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.4.tgz",
-      "integrity": "sha512-l70mlQ7IjPKC8kT7GljQXJZmt5OqFL+RE91ik5y5WWQtsd9wP8R7gpFnNu96fK5MqAAZRXfLLsnzKtkty5fWGQ=="
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.5.tgz",
+      "integrity": "sha512-vMDo7f6ogUV9PkzmxXLiXzJkJZqU09Le4C40mj+HmAGS/2FPmdetoNOQZXpu2kekn0GJKvtwKMAVoruTj60Xww=="
     },
     "domutils": {
       "version": "1.7.0",
@@ -5772,6 +6089,14 @@
         "inherits": "^2.0.1",
         "minimalistic-assert": "^1.0.0",
         "minimalistic-crypto-utils": "^1.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.8",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+          "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+          "dev": true
+        }
       }
     },
     "emoji-regex": {
@@ -5930,9 +6255,9 @@
       "dev": true
     },
     "entities": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
-      "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.2.tgz",
+      "integrity": "sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw==",
       "dev": true
     },
     "err-code": {
@@ -6901,9 +7226,9 @@
           }
         },
         "make-dir": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz",
-          "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
           "dev": true,
           "requires": {
             "semver": "^6.0.0"
@@ -8433,13 +8758,33 @@
       "dev": true
     },
     "hash-base": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
       }
     },
     "hash.js": {
@@ -8515,9 +8860,9 @@
       "dev": true
     },
     "html-entities": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
-      "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz",
+      "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==",
       "dev": true
     },
     "html-escaper": {
@@ -8671,6 +9016,15 @@
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
+    "icss-utils": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
+      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.14"
+      }
+    },
     "ieee754": {
       "version": "1.1.13",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
@@ -9282,12 +9636,6 @@
         "isobject": "^3.0.1"
       }
     },
-    "is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-      "dev": true
-    },
     "is-property": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
@@ -9391,10 +9739,13 @@
       "dev": true
     },
     "is-wsl": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz",
-      "integrity": "sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==",
-      "dev": true
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "requires": {
+        "is-docker": "^2.0.0"
+      }
     },
     "is-yarn-global": {
       "version": "0.3.0",
@@ -9583,15 +9934,12 @@
       }
     },
     "istanbul-lib-instrument": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz",
-      "integrity": "sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.7.5",
-        "@babel/parser": "^7.7.5",
-        "@babel/template": "^7.7.4",
-        "@babel/traverse": "^7.7.4",
         "@istanbuljs/schema": "^0.1.2",
         "istanbul-lib-coverage": "^3.0.0",
         "semver": "^6.3.0"
@@ -10674,9 +11022,9 @@
       }
     },
     "loglevel": {
-      "version": "1.6.7",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz",
-      "integrity": "sha512-cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A==",
+      "version": "1.6.8",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz",
+      "integrity": "sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==",
       "dev": true
     },
     "loose-envify": {
@@ -11097,6 +11445,14 @@
       "requires": {
         "bn.js": "^4.0.0",
         "brorand": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.8",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+          "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+          "dev": true
+        }
       }
     },
     "mime": {
@@ -11913,9 +12269,9 @@
       },
       "dependencies": {
         "semver": {
-          "version": "7.2.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.2.1.tgz",
-          "integrity": "sha512-aHhm1pD02jXXkyIpq25qBZjr3CQgg8KST8uX0OWXch3xE6jw+1bfbWnCjzMwojsTquroUmKFHNzU6x26mEiRxw==",
+          "version": "7.3.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
           "dev": true
         }
       }
@@ -11947,9 +12303,9 @@
           }
         },
         "semver": {
-          "version": "7.2.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.2.1.tgz",
-          "integrity": "sha512-aHhm1pD02jXXkyIpq25qBZjr3CQgg8KST8uX0OWXch3xE6jw+1bfbWnCjzMwojsTquroUmKFHNzU6x26mEiRxw==",
+          "version": "7.3.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
           "dev": true
         }
       }
@@ -11977,17 +12333,17 @@
       },
       "dependencies": {
         "semver": {
-          "version": "7.2.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.2.1.tgz",
-          "integrity": "sha512-aHhm1pD02jXXkyIpq25qBZjr3CQgg8KST8uX0OWXch3xE6jw+1bfbWnCjzMwojsTquroUmKFHNzU6x26mEiRxw==",
+          "version": "7.3.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
           "dev": true
         }
       }
     },
     "npm-registry-fetch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.3.tgz",
-      "integrity": "sha512-WGvUx0lkKFhu9MbiGFuT9nG2NpfQ+4dCJwRwwtK2HK5izJEvwDxMeUyqbuMS7N/OkpVCqDorV6rO5E4V9F8lJw==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.4.tgz",
+      "integrity": "sha512-6jb34hX/iYNQebqWUHtU8YF6Cjb1H6ouTFPClYsyiW6lpFkljTpdeftm53rRojtja1rKAvKNIIiTS5Sjpw4wsA==",
       "dev": true,
       "requires": {
         "JSONStream": "^1.3.4",
@@ -12012,9 +12368,9 @@
           }
         },
         "safe-buffer": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-          "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
           "dev": true
         }
       }
@@ -12176,10 +12532,95 @@
       "dev": true
     },
     "object-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz",
-      "integrity": "sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==",
-      "dev": true
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz",
+      "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.5",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+          "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
+          "dev": true,
+          "requires": {
+            "es-to-primitive": "^1.2.1",
+            "function-bind": "^1.1.1",
+            "has": "^1.0.3",
+            "has-symbols": "^1.0.1",
+            "is-callable": "^1.1.5",
+            "is-regex": "^1.0.5",
+            "object-inspect": "^1.7.0",
+            "object-keys": "^1.1.1",
+            "object.assign": "^4.1.0",
+            "string.prototype.trimleft": "^2.1.1",
+            "string.prototype.trimright": "^2.1.1"
+          }
+        },
+        "es-to-primitive": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+          "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+          "dev": true,
+          "requires": {
+            "is-callable": "^1.1.4",
+            "is-date-object": "^1.0.1",
+            "is-symbol": "^1.0.2"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+          "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+          "dev": true
+        },
+        "is-callable": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
+          "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
+          "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+          "dev": true,
+          "requires": {
+            "has": "^1.0.3"
+          }
+        },
+        "object-inspect": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
+          "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
+          "dev": true
+        },
+        "string.prototype.trimleft": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz",
+          "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==",
+          "dev": true,
+          "requires": {
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.17.5",
+            "string.prototype.trimstart": "^1.0.0"
+          }
+        },
+        "string.prototype.trimright": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz",
+          "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==",
+          "dev": true,
+          "requires": {
+            "define-properties": "^1.1.3",
+            "es-abstract": "^1.17.5",
+            "string.prototype.trimend": "^1.0.0"
+          }
+        }
+      }
     },
     "object-keys": {
       "version": "1.1.1",
@@ -13246,9 +13687,9 @@
       "dev": true
     },
     "portfinder": {
-      "version": "1.0.25",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz",
-      "integrity": "sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==",
+      "version": "1.0.26",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz",
+      "integrity": "sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==",
       "dev": true,
       "requires": {
         "async": "^2.6.2",
@@ -13591,6 +14032,47 @@
         }
       }
     },
+    "postcss-modules-extract-imports": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
+      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.5"
+      }
+    },
+    "postcss-modules-local-by-default": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz",
+      "integrity": "sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==",
+      "dev": true,
+      "requires": {
+        "icss-utils": "^4.1.1",
+        "postcss": "^7.0.16",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.0.0"
+      }
+    },
+    "postcss-modules-scope": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
+      "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.6",
+        "postcss-selector-parser": "^6.0.0"
+      }
+    },
+    "postcss-modules-values": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz",
+      "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
+      "dev": true,
+      "requires": {
+        "icss-utils": "^4.0.0",
+        "postcss": "^7.0.6"
+      }
+    },
     "postcss-normalize-charset": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
@@ -14160,6 +14642,14 @@
         "parse-asn1": "^5.0.0",
         "randombytes": "^2.0.1",
         "safe-buffer": "^5.1.2"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.8",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+          "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+          "dev": true
+        }
       }
     },
     "pump": {
@@ -15213,9 +15703,9 @@
       },
       "dependencies": {
         "fsevents": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
-          "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+          "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
           "dev": true,
           "optional": true
         }
@@ -15247,13 +15737,10 @@
       }
     },
     "run-async": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz",
-      "integrity": "sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==",
-      "dev": true,
-      "requires": {
-        "is-promise": "^2.1.0"
-      }
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+      "dev": true
     },
     "run-parallel": {
       "version": "1.1.9",
@@ -15700,9 +16187,9 @@
       "dev": true
     },
     "schema-utils": {
-      "version": "2.6.5",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz",
-      "integrity": "sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==",
+      "version": "2.6.6",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.6.tgz",
+      "integrity": "sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.0",
@@ -17334,12 +17821,12 @@
       "dev": true
     },
     "tar": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.1.tgz",
-      "integrity": "sha512-bKhKrrz2FJJj5s7wynxy/fyxpE0CmCjmOQ1KV4KkgXFWOgoIT/NbTMnB1n+LFNrNk0SSBVGGxcK5AGsyC+pW5Q==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.2.tgz",
+      "integrity": "sha512-Glo3jkRtPcvpDlAs/0+hozav78yoXKFr+c4wgw62NNMO3oo4AaJdCo21Uu7lcwr55h39W2XD1LMERc64wtbItg==",
       "dev": true,
       "requires": {
-        "chownr": "^1.1.3",
+        "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
         "minipass": "^3.0.0",
         "minizlib": "^2.1.0",
@@ -17347,6 +17834,12 @@
         "yallist": "^4.0.0"
       },
       "dependencies": {
+        "chownr": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+          "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+          "dev": true
+        },
         "mkdirp": {
           "version": "1.0.4",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -18813,9 +19306,9 @@
           }
         },
         "mime": {
-          "version": "2.4.4",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-          "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+          "version": "2.4.5",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz",
+          "integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==",
           "dev": true
         }
       }
@@ -19241,9 +19734,9 @@
       }
     },
     "worker-plugin": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-4.0.2.tgz",
-      "integrity": "sha512-V+1zSZMOOKk+uBzKyNIODLQLsx59zSIOaI75J1EMS0iR1qy+KQR3y/pQ3T0vIhvPfDFapGRMsoMvQNEL3okqSA==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-4.0.3.tgz",
+      "integrity": "sha512-7hFDYWiKcE3yHZvemsoM9lZis/PzurHAEX1ej8PLCu818Rt6QqUAiDdxHPCKZctzmhqzPpcFSgvMCiPbtooqAg==",
       "dev": true,
       "requires": {
         "loader-utils": "^1.1.0"
diff --git a/package.json b/package.json
index dd48317e89..89a1ef664b 100644
--- a/package.json
+++ b/package.json
@@ -46,23 +46,23 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "@angular/animations": "^9.1.2",
-    "@angular/cdk": "^9.2.1",
-    "@angular/common": "^9.1.2",
-    "@angular/compiler": "^9.1.2",
-    "@angular/core": "^9.1.2",
+    "@angular/animations": "^9.1.6",
+    "@angular/cdk": "^9.2.3",
+    "@angular/common": "^9.1.6",
+    "@angular/compiler": "^9.1.6",
+    "@angular/core": "^9.1.6",
     "@angular/flex-layout": "^9.0.0-beta.29",
-    "@angular/forms": "^9.1.2",
-    "@angular/material": "^9.2.1",
-    "@angular/material-moment-adapter": "^9.2.1",
-    "@angular/platform-browser": "^9.1.2",
-    "@angular/platform-browser-dynamic": "^9.1.2",
-    "@angular/platform-server": "^9.1.2",
-    "@angular/router": "^9.1.2",
-    "@ngrx/effects": "^9.1.0",
-    "@ngrx/router-store": "^9.1.0",
-    "@ngrx/store": "^9.1.0",
-    "@ngrx/store-devtools": "^9.1.0",
+    "@angular/forms": "^9.1.6",
+    "@angular/material": "^9.2.3",
+    "@angular/material-moment-adapter": "^9.2.3",
+    "@angular/platform-browser": "^9.1.6",
+    "@angular/platform-browser-dynamic": "^9.1.6",
+    "@angular/platform-server": "^9.1.6",
+    "@angular/router": "^9.1.6",
+    "@ngrx/effects": "^9.1.2",
+    "@ngrx/router-store": "^9.1.2",
+    "@ngrx/store": "^9.1.2",
+    "@ngrx/store-devtools": "^9.1.2",
     "@swimlane/ngx-charts": "^13.0.3",
     "@types/moment-timezone": "^0.5.13",
     "@types/marked": "^0.7.4",
@@ -94,12 +94,12 @@
     "node": "12.13.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.901.1",
-    "@angular-devkit/build-ng-packagr": "~0.901.1",
-    "@angular-devkit/schematics": "^9.1.1",
-    "@angular/cli": "^9.1.1",
-    "@angular/compiler-cli": "^9.1.2",
-    "@angular/language-service": "^9.1.2",
+    "@angular-devkit/build-angular": "~0.901.5",
+    "@angular-devkit/build-ng-packagr": "~0.901.5",
+    "@angular-devkit/schematics": "^9.1.5",
+    "@angular/cli": "^9.1.5",
+    "@angular/compiler-cli": "^9.1.6",
+    "@angular/language-service": "^9.1.6",
     "@types/jasmine": "^3.5.10",
     "@types/jasminewd2": "~2.0.8",
     "@types/karma": "^5.0.0",

From 5ffa624ae9514ddf65e12cb92a35e29bffd3c34d Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Mon, 11 May 2020 11:41:59 +0100
Subject: [PATCH 090/176] Add ability to provided a wildcard in path when
 matching urls (#4277)

---
 docs/sso.md                             | 6 ++++--
 src/jetstream/default.config.properties | 1 +
 src/jetstream/stringutils/utils.go      | 5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/sso.md b/docs/sso.md
index e1ae6d9b60..8f9f747c67 100644
--- a/docs/sso.md
+++ b/docs/sso.md
@@ -55,11 +55,13 @@ uaac client update cf --authorized_grant_types authorization_code
 When SSO has been configured Stratos's log in request will contain a URL that tells SSO where to return to. When using a browser this is automatically populated. To avoid situations where this can be hijacked or called separately an SSO `state` whitelist can be provided via the environment variable `SSO_WHITELIST`. This is a comma separated list. For example...
 
 ```
-SSO_WHITELIST=https://your.domain
+SSO_WHITELIST=https://your.domain/*
 ```
 
 ```
-SSO_WHITELIST=https://your.domain,https://your.other.domain
+SSO_WHITELIST=https://your.domain/*,https://your.other.domain/*
 ```
 
 When set, any requests to log in with a different `state` will be denied.
+
+In order for the SSO `state` to match an entry from the whitelist the schema, hostname, port and path must match exactly. A wildcard `*` can be provided for the path to match anything.
\ No newline at end of file
diff --git a/src/jetstream/default.config.properties b/src/jetstream/default.config.properties
index c5058a354a..97625cf784 100644
--- a/src/jetstream/default.config.properties
+++ b/src/jetstream/default.config.properties
@@ -25,6 +25,7 @@ LOG_TO_JSON=false
 LOG_API_REQUESTS=true
 
 SSO_LOGIN=false
+# Whitelist for the SSO redirect url. Paths can contain wildcard `*`
 SSO_WHITELIST=
 
 # Enable feature in tech preview
diff --git a/src/jetstream/stringutils/utils.go b/src/jetstream/stringutils/utils.go
index b34c4c22ec..16e056bc17 100644
--- a/src/jetstream/stringutils/utils.go
+++ b/src/jetstream/stringutils/utils.go
@@ -26,7 +26,8 @@ func RemoveSpaces(str string) string {
 	}, str)
 }
 
-// CompareURL compares two URLs, taking into account default HTTP/HTTPS ports and ignoring query string
+// CompareURL compares two URLs, taking into account default HTTP/HTTPS ports and ignoring query string. Allows `b` to contain a wildcard `*`
+// to match any path of `a`s
 func CompareURL(a, b string) bool {
 
 	ua, err := url.Parse(a)
@@ -41,7 +42,7 @@ func CompareURL(a, b string) bool {
 
 	aPort := getPort(ua)
 	bPort := getPort(ub)
-	return ua.Scheme == ub.Scheme && ua.Hostname() == ub.Hostname() && aPort == bPort && ua.Path == ub.Path
+	return ua.Scheme == ub.Scheme && ua.Hostname() == ub.Hostname() && aPort == bPort && (ua.Path == ub.Path || ub.Path == "/*")
 }
 
 func getPort(u *url.URL) string {

From e31fb9ec846f42ff84c428fa4ce02b41c4914fdf Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 11 May 2020 11:43:39 +0100
Subject: [PATCH 091/176] Update releas notes

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73a535617f..c59c3a084c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ This release contains a number of fixes and improvements:
 
 **Improvements:**
 
+- SSO_WHITELIST should be able to ignore path [\#4273](https://github.com/cloudfoundry/stratos/issues/4273)
 - Improve view that shows details for a metrics endpoint [\#4271](https://github.com/cloudfoundry/stratos/issues/4271)
 - Helm Chart: Add support for node selectors [\#4265](https://github.com/cloudfoundry/stratos/issues/4265)
 - Add documentation for list's 'max' feature, include info on 'fetch all' button [\#4259](https://github.com/cloudfoundry/stratos/issues/4259)

From ea6b0cdf7e3ef2cbba5775c95e59a9a2b2397efa Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 12 May 2020 12:05:37 +0100
Subject: [PATCH 092/176] Only show metrics details on endpoint card/list when
 connected

---
 .../metrics-endpoint-details.component.ts                        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts
index 0b47762037..32afc58d33 100644
--- a/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts
+++ b/src/frontend/packages/core/src/features/metrics/metrics-endpoint-details/metrics-endpoint-details.component.ts
@@ -53,6 +53,7 @@ export class MetricsEndpointDetailsComponent extends EndpointListDetailsComponen
     ).pipe(
       map(([endpoints, guid]) => endpoints.find((item) => item.provider.guid === guid)),
       filter(provider => !!provider),
+      filter(data => data.provider.connectionStatus === 'connected'),
       tap(data => {
         if (!this.hasStratosData(data)) {
           this.store.dispatch(new MetricsStratosAction(data.provider.guid));

From f9d675d8a9fb994cc6fee95b1ba04fb8c275fb0f Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 12 May 2020 12:13:51 +0100
Subject: [PATCH 093/176] Fix icon alignment on service marketplace view

---
 .../service-tabs-base.component.html               | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.html b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.html
index 54643a3378..839286509e 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/service-tabs-base/service-tabs-base.component.html
@@ -1,13 +1,13 @@
 <app-page-header [tabs]="tabLinks" tabsHeader="Service" [breadcrumbs]="breadcrumbs">
   <div class="app-page-header">
     {{ getServiceLabel() | async }}
-    <div class="page-header-right">
-      <ng-container *appUserPermission="canCreateServiceInstance">
-        <button mat-icon-button name="add-service-instance" [routerLink]="addServiceInstanceLink()" [queryParams]="isServiceSpaceScoped() | async" [disabled]="!(hasVisiblePlans$ | async)">
-          <mat-icon [matTooltip]="toolTipText$ | async">add</mat-icon>
-        </button>
-      </ng-container>
-    </div>
+  </div>
+  <div class="page-header-right">
+    <ng-container *appUserPermission="canCreateServiceInstance">
+      <button mat-icon-button name="add-service-instance" [routerLink]="addServiceInstanceLink()" [queryParams]="isServiceSpaceScoped() | async" [disabled]="!(hasVisiblePlans$ | async)">
+        <mat-icon [matTooltip]="toolTipText$ | async">add</mat-icon>
+      </button>
+    </ng-container>
   </div>
 </app-page-header>
 <app-loading-page [text]="'Retrieving Service details'" class="router-component">

From 7354a8f4f164b20b85a7a3a4e2f0a1b69d653480 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Wed, 13 May 2020 10:43:27 +0100
Subject: [PATCH 094/176] Fix issue where user profile was fetched repeatidly
 (#4285)

- remove calls to fetchUserProfile
- ensure entity service is used instead of monitor (will fetch profile)
- update FetchUserProfileAction action to a EntityRequestAction
- there's no response to update profile, so ensure we fetch profile again afterwards
- also fixed issue where metrics endpoint reporting a k8s endpoint would cause a console.error
---
 .../packages/core/src/core/core.module.ts     | 12 ++--
 .../core/src/core/user-profile.service.ts     | 68 +++++++++++--------
 .../src/features/metrics/metrics.helpers.ts   | 61 +++++++++--------
 .../edit-profile-info.component.ts            |  9 +--
 .../profile-info/profile-info.component.ts    | 14 ++--
 .../page-header/page-header.component.ts      |  8 +--
 .../store/src/actions/user-profile.actions.ts | 12 +++-
 .../store/src/effects/user-profile.effects.ts | 32 ++++-----
 8 files changed, 111 insertions(+), 105 deletions(-)

diff --git a/src/frontend/packages/core/src/core/core.module.ts b/src/frontend/packages/core/src/core/core.module.ts
index 0c5547ad70..79a776828f 100644
--- a/src/frontend/packages/core/src/core/core.module.ts
+++ b/src/frontend/packages/core/src/core/core.module.ts
@@ -1,22 +1,24 @@
 import { PortalModule } from '@angular/cdk/portal';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { RouterModule } from '@angular/router';
 import { Title } from '@angular/platform-browser';
+import { RouterModule } from '@angular/router';
 import { MomentModule } from 'ngx-moment';
 
+import { EntityServiceFactory } from '../../../store/src/entity-service-factory.service';
 import { NoContentMessageComponent } from '../shared/components/no-content-message/no-content-message.component';
 import { RecentEntitiesComponent } from '../shared/components/recent-entities/recent-entities.component';
+import { UserAvatarComponent } from './../shared/components/user-avatar/user-avatar.component';
 import { AuthGuardService } from './auth-guard.service';
 import { ButtonBlurOnClickDirective } from './button-blur-on-click.directive';
 import { BytesToHumanSize, MegaBytesToHumanSize } from './byte-formatters.pipe';
 import { ClickStopPropagationDirective } from './click-stop-propagation.directive';
+import { APP_TITLE, appTitleFactory } from './core.types';
 import { CurrentUserPermissionsService } from './current-user-permissions.service';
 import { DisableRouterLinkDirective } from './disable-router-link.directive';
 import { DotContentComponent } from './dot-content/dot-content.component';
 import { EndpointsService } from './endpoints.service';
 import { EntityFavoriteStarComponent } from './entity-favorite-star/entity-favorite-star.component';
-import { EntityServiceFactory } from '../../../store/src/entity-service-factory.service';
 import { EventWatcherService } from './event-watcher/event-watcher.service';
 import { InfinityPipe } from './infinity.pipe';
 import { LogOutDialogComponent } from './log-out-dialog/log-out-dialog.component';
@@ -28,12 +30,10 @@ import { PageNotFoundComponentComponent } from './page-not-found-component/page-
 import { SafeImgPipe } from './safe-img.pipe';
 import { StatefulIconComponent } from './stateful-icon/stateful-icon.component';
 import { TruncatePipe } from './truncate.pipe';
+import { UserProfileService } from './user-profile.service';
 import { UserService } from './user.service';
 import { UtilsService } from './utils.service';
 import { WindowRef } from './window-ref/window-ref.service';
-import { APP_TITLE, appTitleFactory } from './core.types';
-import { UserProfileService } from './user-profile.service';
-import { UserAvatarComponent } from './../shared/components/user-avatar/user-avatar.component';
 
 @NgModule({
   imports: [
@@ -76,8 +76,8 @@ import { UserAvatarComponent } from './../shared/components/user-avatar/user-ava
     LoggerService,
     EndpointsService,
     UserService,
-    EntityServiceFactory,
     UserProfileService,
+    EntityServiceFactory,
     CurrentUserPermissionsService,
     {
       provide: APP_TITLE,
diff --git a/src/frontend/packages/core/src/core/user-profile.service.ts b/src/frontend/packages/core/src/core/user-profile.service.ts
index 95fd5c5a4b..3aa3b562c1 100644
--- a/src/frontend/packages/core/src/core/user-profile.service.ts
+++ b/src/frontend/packages/core/src/core/user-profile.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of as observableOf, of } from 'rxjs';
-import { filter, first, map } from 'rxjs/operators';
+import { filter, first, map, publishReplay, refCount, switchMap } from 'rxjs/operators';
 
 import {
   FetchUserProfileAction,
@@ -9,22 +9,15 @@ import {
   UpdateUserProfileAction,
 } from '../../../store/src/actions/user-profile.actions';
 import { AppState } from '../../../store/src/app-state';
-import { UserProfileEffect, userProfilePasswordUpdatingKey } from '../../../store/src/effects/user-profile.effects';
-import {
-  ActionState,
-  getDefaultActionState,
-  rootUpdatingKey,
-} from '../../../store/src/reducers/api-request-reducer/types';
+import { userProfilePasswordUpdatingKey } from '../../../store/src/effects/user-profile.effects';
+import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog.service';
+import { EntityService } from '../../../store/src/entity-service';
+import { EntityServiceFactory } from '../../../store/src/entity-service-factory.service';
+import { ActionState, getDefaultActionState, rootUpdatingKey } from '../../../store/src/reducers/api-request-reducer/types';
 import { AuthState } from '../../../store/src/reducers/auth.reducer';
 import { selectRequestInfo, selectUpdateInfo } from '../../../store/src/selectors/api.selectors';
-import {
-  UserProfileInfo,
-  UserProfileInfoEmail,
-  UserProfileInfoUpdates,
-} from '../../../store/src/types/user-profile.types';
+import { UserProfileInfo, UserProfileInfoEmail, UserProfileInfoUpdates } from '../../../store/src/types/user-profile.types';
 import { userProfileEntitySchema } from '../base-entity-schemas';
-import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog.service';
-import { EntityMonitor } from '../../../store/src/monitors/entity-monitor';
 
 
 @Injectable()
@@ -34,40 +27,57 @@ export class UserProfileService {
 
   isFetching$: Observable<boolean>;
 
-  entityMonitor: EntityMonitor<UserProfileInfo>;
+  entityService: Observable<EntityService<UserProfileInfo>>;
 
   userProfile$: Observable<UserProfileInfo>;
 
   private stratosUserConfig = entityCatalog.getEntity(userProfileEntitySchema.endpointType, userProfileEntitySchema.entityType);
 
-  constructor(private store: Store<AppState>) {
+  constructor(
+    private store: Store<AppState>,
+    esf: EntityServiceFactory
+  ) {
     if (!this.stratosUserConfig) {
       console.error('Can not get user profile entity');
       this.userProfile$ = of({} as UserProfileInfo);
       return;
     }
 
-    this.entityMonitor = this.stratosUserConfig.getEntityMonitor(this.store, UserProfileEffect.guid);
+    this.entityService = this.createFetchUserAction().pipe(
+      first(),
+      map(action => esf.create<UserProfileInfo>(action.guid, action)),
+      publishReplay(1),
+      refCount()
+    );
 
-    this.userProfile$ = this.entityMonitor.entity$.pipe(
+    this.userProfile$ = this.entityService.pipe(
+      switchMap(service => service.waitForEntity$),
+      map(({ entity }) => entity),
       filter(data => data && !!data.id)
     );
-    this.isFetching$ = this.entityMonitor.isFetchingEntity$;
+    this.isFetching$ = this.entityService.pipe(
+      switchMap(service => service.isFetchingEntity$)
+    );
 
-    this.isError$ = this.store.select(selectRequestInfo(this.stratosUserConfig.entityKey, UserProfileEffect.guid)).pipe(
+    this.isError$ = this.store.select(selectRequestInfo(this.stratosUserConfig.entityKey, FetchUserProfileAction.guid)).pipe(
       filter(requestInfo => !!requestInfo && !requestInfo.fetching),
       map(requestInfo => requestInfo.error)
     );
   }
 
-  fetchUserProfile() {
-    // Once we have the user's guid, fetch their profile
-    this.store.select(s => s.auth).pipe(
+  private createFetchUserAction(): Observable<FetchUserProfileAction> {
+    return this.store.select(s => s.auth).pipe(
       filter((auth: AuthState) => !!(auth && auth.sessionData)),
       map((auth: AuthState) => auth.sessionData),
-      first()
-    ).subscribe(data => {
-      this.store.dispatch(new FetchUserProfileAction(data.user.guid));
+      first(),
+      map(data => new FetchUserProfileAction(data.user.guid))
+    );
+  }
+
+  fetchUserProfile() {
+    // Once we have the user's guid, fetch their profile
+    this.createFetchUserAction().pipe(first()).subscribe(action => {
+      this.store.dispatch(action);
     });
   }
 
@@ -99,7 +109,7 @@ export class UserProfileService {
   updateProfile(profile: UserProfileInfo, profileChanges: UserProfileInfoUpdates): Observable<[ActionState, ActionState]> {
     const didChangeProfile = (profileChanges.givenName !== undefined ||
       profileChanges.familyName !== undefined ||
-      profileChanges.emailAddress !== undefined );
+      profileChanges.emailAddress !== undefined);
     const didChangePassword = !!(profileChanges.newPassword && profileChanges.currentPassword);
     const profileObs$ = didChangeProfile ? this.updateProfileInfo(profile, profileChanges) : observableOf(getDefaultActionState());
     const passwordObs$ = didChangePassword ? this.updatePassword(profile, profileChanges) : observableOf(getDefaultActionState());
@@ -125,7 +135,7 @@ export class UserProfileService {
     }
     this.store.dispatch(new UpdateUserProfileAction(updatedProfile, profileChanges.currentPassword));
     const actionState = selectUpdateInfo(this.stratosUserConfig.entityKey,
-      UserProfileEffect.guid,
+      FetchUserProfileAction.guid,
       rootUpdatingKey);
     return this.store.select(actionState).pipe(
       filter(item => item && !item.busy)
@@ -139,7 +149,7 @@ export class UserProfileService {
     };
     this.store.dispatch(new UpdateUserPasswordAction(profile.id, passwordUpdates));
     const actionState = selectUpdateInfo(this.stratosUserConfig.entityKey,
-      UserProfileEffect.guid,
+      FetchUserProfileAction.guid,
       userProfilePasswordUpdatingKey);
     return this.store.select(actionState).pipe(
       filter(item => item && !item.busy)
diff --git a/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts b/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts
index f3bb9d0763..d6558b2918 100644
--- a/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts
+++ b/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts
@@ -22,37 +22,38 @@ export interface MetricsEndpointInfo {
 // Process the endpoint and Stratos marker file data to give a single list of endpoitns
 // linked to this metrics endpoint, comprising those that are known in Stratos and those that are not
 export function mapMetricsData(ep: MetricsEndpointProvider): MetricsEndpointInfo[] {
-    const data: MetricsEndpointInfo[] = [];
+  const data: MetricsEndpointInfo[] = [];
 
-    // Add all of the known endpoints first
-    ep.endpoints.forEach(endpoint => {
-      const catalogEndpoint = entityCatalog.getEndpoint(endpoint.cnsi_type, endpoint.sub_type);
+  // Add all of the known endpoints first
+  ep.endpoints.forEach(endpoint => {
+    const catalogEndpoint = entityCatalog.getEndpoint(endpoint.cnsi_type, endpoint.sub_type);
 
-      data.push({
-        known: true,
-        name: endpoint.name,
-        url: getFullEndpointApiUrl(endpoint),
-        type: catalogEndpoint.definition.label,
-        icon: {
-          name: catalogEndpoint.definition.icon,
-          font: 'stratos-icons'
-        },
-        metadata: {
-          metrics_job: endpoint.metadata ? endpoint.metadata.metrics_job : null,
-          metrics_environment: endpoint.metadata ? endpoint.metadata.metrics_environment : null
-        },
-        status: observableOf(StratosStatus.OK)
-      });
+    data.push({
+      known: true,
+      name: endpoint.name,
+      url: getFullEndpointApiUrl(endpoint),
+      type: catalogEndpoint.definition.label,
+      icon: {
+        name: catalogEndpoint.definition.icon,
+        font: 'stratos-icons'
+      },
+      metadata: {
+        metrics_job: endpoint.metadata ? endpoint.metadata.metrics_job : null,
+        metrics_environment: endpoint.metadata ? endpoint.metadata.metrics_environment : null
+      },
+      status: observableOf(StratosStatus.OK)
     });
+  });
 
-    // Add all of the potentially unknown endpoints
-    if (ep.provider && ep.provider.metadata && ep.provider.metadata && ep.provider.metadata.metrics_stratos
+  // Add all of the potentially unknown endpoints
+  if (ep.provider && ep.provider.metadata && ep.provider.metadata && ep.provider.metadata.metrics_stratos
     && Array.isArray(ep.provider.metadata.metrics_stratos)) {
-      ep.provider.metadata.metrics_stratos.forEach(endp => {
-        // See if we already know about this endpoint
-        const hasEndpoint = data.findIndex(i => i.url === endp.url || i.url === endp.cfEndpoint) !== -1;
-        if (!hasEndpoint) {
-          const catalogEndpoint = entityCatalog.getEndpoint(endp.type, '');
+    ep.provider.metadata.metrics_stratos.forEach(endp => {
+      // See if we already know about this endpoint
+      const hasEndpoint = data.findIndex(i => i.url === endp.url || i.url === endp.cfEndpoint) !== -1;
+      if (!hasEndpoint) {
+        const catalogEndpoint = entityCatalog.getEndpoint(endp.type, '');
+        if (catalogEndpoint) { // Provider metadata could give k8 endpoint
           data.push({
             known: false,
             name: '<Unregistered Endpoint>',
@@ -68,7 +69,9 @@ export function mapMetricsData(ep: MetricsEndpointProvider): MetricsEndpointInfo
             status: observableOf(StratosStatus.WARNING)
           });
         }
-      });
-    }
-    return data;
+
+      }
+    });
   }
+  return data;
+}
diff --git a/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.ts b/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.ts
index bfbb522036..8f14434f3a 100644
--- a/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.ts
+++ b/src/frontend/packages/core/src/features/user-profile/edit-profile-info/edit-profile-info.component.ts
@@ -2,13 +2,13 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from '@angular/forms';
 import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material/core';
 import { Subscription } from 'rxjs';
-import { first, map, take } from 'rxjs/operators';
+import { first, map, take, tap } from 'rxjs/operators';
 
 import { UserProfileInfo, UserProfileInfoUpdates } from '../../../../../store/src/types/user-profile.types';
 import { CurrentUserPermissions } from '../../../core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../core/current-user-permissions.service';
-import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component';
 import { UserProfileService } from '../../../core/user-profile.service';
+import { StepOnNextFunction } from '../../../shared/components/stepper/step/step.component';
 
 
 @Component({
@@ -58,7 +58,6 @@ export class EditProfileInfoComponent implements OnInit, OnDestroy {
   public passwordRequired = false;
 
   ngOnInit() {
-    this.userProfileService.fetchUserProfile();
     this.userProfileService.userProfile$.pipe(first()).subscribe(profile => {
       // UAA needs the user's password for email changes. Local user does not
       // Both need it for password change
@@ -131,6 +130,8 @@ export class EditProfileInfoComponent implements OnInit, OnDestroy {
           redirect: okay,
           message: okay ? '' : `An error occurred whilst updating your profile: ${message}`
         };
-      }));
+      }),
+      tap(() => this.userProfileService.fetchUserProfile())
+    );
   }
 }
diff --git a/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.ts b/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.ts
index de1f19f360..d5984a3886 100644
--- a/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.ts
+++ b/src/frontend/packages/core/src/features/user-profile/profile-info/profile-info.component.ts
@@ -1,5 +1,4 @@
-import { SetGravatarEnabledAction } from './../../../../../store/src/actions/dashboard-actions';
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
@@ -9,15 +8,16 @@ import { DashboardOnlyAppState } from '../../../../../store/src/app-state';
 import { selectDashboardState } from '../../../../../store/src/selectors/dashboard.selectors';
 import { UserProfileInfo } from '../../../../../store/src/types/user-profile.types';
 import { ThemeService } from '../../../core/theme.service';
-import { UserService } from '../../../core/user.service';
 import { UserProfileService } from '../../../core/user-profile.service';
+import { UserService } from '../../../core/user.service';
+import { SetGravatarEnabledAction } from './../../../../../store/src/actions/dashboard-actions';
 
 @Component({
   selector: 'app-profile-info',
   templateUrl: './profile-info.component.html',
   styleUrls: ['./profile-info.component.scss']
 })
-export class ProfileInfoComponent implements OnInit {
+export class ProfileInfoComponent {
 
   public timeoutSession$ = this.store.select(selectDashboardState).pipe(
     map(dashboardState => dashboardState.timeoutSession ? 'true' : 'false')
@@ -31,7 +31,7 @@ export class ProfileInfoComponent implements OnInit {
     map(dashboardState => dashboardState.gravatarEnabled ? 'true' : 'false')
   );
 
-  public allowGravatar$ =  this.store.select(selectDashboardState).pipe(
+  public allowGravatar$ = this.store.select(selectDashboardState).pipe(
     map(dashboardState => dashboardState.gravatarEnabled)
   );
 
@@ -85,8 +85,4 @@ export class ProfileInfoComponent implements OnInit {
     this.hasMultipleThemes = themeService.getThemes().length > 1;
   }
 
-  ngOnInit() {
-    this.userProfileService.fetchUserProfile();
-  }
-
 }
diff --git a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.ts b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.ts
index 4a595b6138..a253c51cbd 100644
--- a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.ts
+++ b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.ts
@@ -1,4 +1,3 @@
-import { selectDashboardState } from './../../../../../store/src/selectors/dashboard.selectors';
 import { TemplatePortal } from '@angular/cdk/portal';
 import { AfterViewInit, Component, Input, OnDestroy, TemplateRef, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
@@ -11,18 +10,18 @@ import { Logout } from '../../../../../store/src/actions/auth.actions';
 import { ToggleSideNav } from '../../../../../store/src/actions/dashboard-actions';
 import { AddRecentlyVisitedEntityAction } from '../../../../../store/src/actions/recently-visited.actions';
 import { EntityCatalogHelpers } from '../../../../../store/src/entity-catalog/entity-catalog.helper';
-import { AuthState } from '../../../../../store/src/reducers/auth.reducer';
 import { selectIsMobile } from '../../../../../store/src/selectors/dashboard.selectors';
 import { InternalEventSeverity } from '../../../../../store/src/types/internal-events.types';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../store/src/types/user-favorites.types';
 import { TabNavService } from '../../../../tab-nav.service';
+import { UserProfileService } from '../../../core/user-profile.service';
 import { IPageSideNavTab } from '../../../features/dashboard/page-side-nav/page-side-nav.component';
 import { GlobalEventService, IGlobalEvent } from '../../global-events.service';
 import { StratosStatus } from '../../shared.types';
 import { FavoritesConfigMapper } from '../favorites-meta-card/favorite-config-mapper';
-import { BREADCRUMB_URL_PARAM, IHeaderBreadcrumb, IHeaderBreadcrumbLink } from './page-header.types';
-import { UserProfileService } from '../../../core/user-profile.service';
+import { selectDashboardState } from './../../../../../store/src/selectors/dashboard.selectors';
 import { UserProfileInfo } from './../../../../../store/src/types/user-profile.types';
+import { BREADCRUMB_URL_PARAM, IHeaderBreadcrumb, IHeaderBreadcrumbLink } from './page-header.types';
 
 @Component({
   selector: 'app-page-header',
@@ -170,7 +169,6 @@ export class PageHeaderComponent implements OnDestroy, AfterViewInit {
     this.breadcrumbKey = route.snapshot.queryParams[BREADCRUMB_URL_PARAM] || null;
 
     this.user$ = this.userProfileService.userProfile$;
-    this.userProfileService.fetchUserProfile();
 
     this.username$ = this.user$.pipe(
       map(profile => {
diff --git a/src/frontend/packages/store/src/actions/user-profile.actions.ts b/src/frontend/packages/store/src/actions/user-profile.actions.ts
index 8c033646da..00234f772e 100644
--- a/src/frontend/packages/store/src/actions/user-profile.actions.ts
+++ b/src/frontend/packages/store/src/actions/user-profile.actions.ts
@@ -1,14 +1,20 @@
-import { schema } from 'normalizr';
 import { Action } from '@ngrx/store';
+
+import { userProfileEntitySchema } from '../../../core/src/base-entity-schemas';
+import { EntityRequestAction } from '../types/request.types';
 import { UserProfileInfo, UserProfilePasswordUpdate } from '../types/user-profile.types';
 
 export const GET_USERPROFILE = '[UserProfile] Get';
 export const UPDATE_USERPROFILE = '[UserProfile] Update';
 export const UPDATE_USERPASSWORD = '[UserPassword] Update';
 
-export class FetchUserProfileAction implements Action {
+export class FetchUserProfileAction implements EntityRequestAction {
+  static guid = 'userProfile';
   type = GET_USERPROFILE;
-  constructor(public guid: string) { }
+  constructor(public userGuid: string) { }
+  entityType = userProfileEntitySchema.entityType;
+  endpointType = userProfileEntitySchema.endpointType;
+  guid = FetchUserProfileAction.guid;
 }
 
 export class UpdateUserProfileAction implements Action {
diff --git a/src/frontend/packages/store/src/effects/user-profile.effects.ts b/src/frontend/packages/store/src/effects/user-profile.effects.ts
index c58d969600..a37166b61b 100644
--- a/src/frontend/packages/store/src/effects/user-profile.effects.ts
+++ b/src/frontend/packages/store/src/effects/user-profile.effects.ts
@@ -5,7 +5,6 @@ import { Store } from '@ngrx/store';
 import { catchError, mergeMap, switchMap } from 'rxjs/operators';
 
 import { userProfileEntitySchema } from '../../../core/src/base-entity-schemas';
-import { entityCatalog } from '../entity-catalog/entity-catalog.service';
 import { environment } from '../../../core/src/environments/environment';
 import {
   FetchUserProfileAction,
@@ -15,6 +14,7 @@ import {
   UpdateUserPasswordAction,
   UpdateUserProfileAction,
 } from '../actions/user-profile.actions';
+import { entityCatalog } from '../entity-catalog/entity-catalog.service';
 import { rootUpdatingKey } from '../reducers/api-request-reducer/types';
 import { UserProfileInfo } from '../types/user-profile.types';
 import { DispatchOnlyAppState } from './../app-state';
@@ -33,8 +33,6 @@ export const userProfilePasswordUpdatingKey = 'password';
 @Injectable()
 export class UserProfileEffect {
 
-  public static guid = 'userProfile';
-
   stratosUserConfig = entityCatalog.getEntity(userProfileEntitySchema.endpointType, userProfileEntitySchema.entityType);
   private stratosUserEntityType = userProfileEntitySchema.entityType;
   private stratosUserEndpointType = userProfileEntitySchema.endpointType;
@@ -48,24 +46,18 @@ export class UserProfileEffect {
   @Effect() getUserProfileInfo$ = this.actions$.pipe(
     ofType<FetchUserProfileAction>(GET_USERPROFILE),
     mergeMap(action => {
-      const apiAction = {
-        entityType: this.stratosUserEntityType,
-        endpointType: this.stratosUserEndpointType,
-        guid: UserProfileEffect.guid,
-        type: action.type,
-      } as EntityRequestAction;
-      this.store.dispatch(new StartRequestAction(apiAction));
-      return this.httpClient.get(`/pp/${proxyAPIVersion}/users/${action.guid}`).pipe(
+      this.store.dispatch(new StartRequestAction(action));
+      return this.httpClient.get(`/pp/${proxyAPIVersion}/users/${action.userGuid}`).pipe(
         mergeMap((info: UserProfileInfo) => {
           return [
             new WrapperRequestActionSuccess({
-              entities: { [this.stratosUserConfig.entityKey]: { [UserProfileEffect.guid]: info } },
-              result: [UserProfileEffect.guid]
-            }, apiAction)
+              entities: { [this.stratosUserConfig.entityKey]: { [action.guid]: info } },
+              result: [action.guid]
+            }, action)
           ];
         }), catchError((e) => {
           return [
-            new WrapperRequestActionFailed('Could not get User Profile Info', apiAction),
+            new WrapperRequestActionFailed('Could not get User Profile Info', action),
           ];
         }));
     }));
@@ -76,7 +68,7 @@ export class UserProfileEffect {
       const apiAction = {
         entityType: this.stratosUserEntityType,
         endpointType: this.stratosUserEndpointType,
-        guid: UserProfileEffect.guid,
+        guid: FetchUserProfileAction.guid,
         type: action.type,
         updatingKey: rootUpdatingKey
       } as EntityRequestAction;
@@ -93,9 +85,9 @@ export class UserProfileEffect {
         mergeMap((info: UserProfileInfo) => {
           return [
             new WrapperRequestActionSuccess({
-              entities: { [this.stratosUserConfig.entityKey]: { [UserProfileEffect.guid]: info } },
-              result: [UserProfileEffect.guid]
-            }, apiAction)
+              entities: {},
+              result: []
+            }, apiAction),
           ];
         }), catchError((e) => {
           return [
@@ -110,7 +102,7 @@ export class UserProfileEffect {
       const apiAction = {
         entityType: this.stratosUserEntityType,
         endpointType: this.stratosUserEndpointType,
-        guid: UserProfileEffect.guid,
+        guid: FetchUserProfileAction.guid,
         type: action.type,
         updatingKey: userProfilePasswordUpdatingKey
       } as EntityRequestAction;

From e31bcb6505cfde20ec044bdda54b1fe8e03c6428 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 13 May 2020 12:21:02 +0100
Subject: [PATCH 095/176] CF Push: A better fix for the token expiry issue

---
 .../plugins/cfapppush/connection_wrapper.go   | 53 +++++++++++++++++++
 src/jetstream/plugins/cfapppush/deploy.go     | 24 ++++-----
 src/jetstream/plugins/cfapppush/info.go       |  1 +
 src/jetstream/plugins/cfapppush/main.go       |  1 -
 src/jetstream/plugins/cfapppush/pushapp.go    | 16 ++++--
 5 files changed, 77 insertions(+), 18 deletions(-)
 create mode 100644 src/jetstream/plugins/cfapppush/connection_wrapper.go

diff --git a/src/jetstream/plugins/cfapppush/connection_wrapper.go b/src/jetstream/plugins/cfapppush/connection_wrapper.go
new file mode 100644
index 0000000000..4d72c4425f
--- /dev/null
+++ b/src/jetstream/plugins/cfapppush/connection_wrapper.go
@@ -0,0 +1,53 @@
+package cfapppush
+
+import (
+	"time"
+
+	"code.cloudfoundry.org/cli/api/cloudcontroller"
+	"code.cloudfoundry.org/cli/command"
+
+	"github.com/cloudfoundry-incubator/stratos/src/jetstream/repository/interfaces"
+)
+
+// PushConnectionWrapper can wrap a given connection allowing the wrapper to modify
+// all requests going in and out of the given connection.
+type PushConnectionWrapper struct {
+	inner       cloudcontroller.Connection
+	portalProxy interfaces.PortalProxy
+	config      *CFPushAppConfig
+	cmdConfig   command.Config
+}
+
+// Wrap an existing connection
+func (cw PushConnectionWrapper) Wrap(innerconnection cloudcontroller.Connection) cloudcontroller.Connection {
+	cw.inner = innerconnection
+	return cw
+}
+
+// Make makes an HTTP request
+func (cw PushConnectionWrapper) Make(request *cloudcontroller.Request, passedResponse *cloudcontroller.Response) error {
+	// Check to see if the token is about to expire, if it is, refresh it first
+	token, found := cw.portalProxy.GetCNSITokenRecord(cw.config.EndpointID, cw.config.UserID)
+	if found {
+		// Aways update the access token, in case someone else refreshed it
+		cw.config.AuthToken = token.AuthToken
+
+		// Check if this is about to expire in the next 30 seconds
+		expiry := token.TokenExpiry - 30
+		expTime := time.Unix(expiry, 0)
+		if expTime.Before(time.Now()) {
+			cnsiRecord, err := cw.portalProxy.GetCNSIRecord(cw.config.EndpointID)
+			if err == nil {
+				// Refresh token first - makes sure it will be valid when we do the push
+				refreshedTokenRec, err := cw.portalProxy.RefreshOAuthToken(cnsiRecord.SkipSSLValidation, cnsiRecord.GUID, cw.config.UserID, cnsiRecord.ClientId, cnsiRecord.ClientSecret, cnsiRecord.TokenEndpoint)
+				if err == nil {
+					cw.config.AuthToken = refreshedTokenRec.AuthToken
+				}
+			}
+		}
+	}
+
+	cw.cmdConfig.SetAccessToken("bearer " + cw.config.AuthToken)
+
+	return cw.inner.Make(request, passedResponse)
+}
diff --git a/src/jetstream/plugins/cfapppush/deploy.go b/src/jetstream/plugins/cfapppush/deploy.go
index a6f1ad7a47..efe17e714f 100644
--- a/src/jetstream/plugins/cfapppush/deploy.go
+++ b/src/jetstream/plugins/cfapppush/deploy.go
@@ -82,7 +82,9 @@ func (cfAppPush *CFAppPush) deploy(echoContext echo.Context) error {
 	// App ID is this is a redeploy
 	appID := echoContext.QueryParam("app")
 
+	log.Debug("UpgradeToWebSocket")
 	clientWebSocket, pingTicker, err := interfaces.UpgradeToWebSocket(echoContext)
+	log.Debug("UpgradeToWebSocket done")
 	if err != nil {
 		log.Errorf("Upgrade to websocket failed due to: %+v", err)
 		return err
@@ -197,9 +199,9 @@ func (cfAppPush *CFAppPush) deploy(echoContext echo.Context) error {
 	pushConfig.DialTimeout = dialTimeout
 
 	// Initialise Push Command
-	cfAppPush.cfPush = Constructor(pushConfig, cfAppPush.portalProxy)
+	cfPush := Constructor(pushConfig, cfAppPush.portalProxy)
 
-	err = cfAppPush.cfPush.Init(appDir, manifestFile, overrides)
+	err = cfPush.Init(appDir, manifestFile, overrides)
 	if err != nil {
 		log.Warnf("Failed to parse due to: %+v", err)
 		sendErrorMessage(clientWebSocket, err, CLOSE_FAILURE)
@@ -208,7 +210,7 @@ func (cfAppPush *CFAppPush) deploy(echoContext echo.Context) error {
 
 	sendEvent(clientWebSocket, EVENT_PUSH_STARTED)
 
-	err = cfAppPush.cfPush.Run(cfAppPush, clientWebSocket)
+	err = cfPush.Run(cfAppPush, clientWebSocket)
 	if err != nil {
 		log.Warnf("Failed to execute due to: %+v", err)
 		sendErrorMessage(clientWebSocket, err, CLOSE_PUSH_ERROR)
@@ -479,21 +481,14 @@ func (cfAppPush *CFAppPush) getConfigData(echoContext echo.Context, cnsiGUID str
 		sendErrorMessage(clientWebSocket, err, CLOSE_NO_SESSION)
 		return nil, err
 	}
-	_, found := cfAppPush.portalProxy.GetCNSITokenRecord(cnsiGUID, userID)
+
+	token, found := cfAppPush.portalProxy.GetCNSITokenRecord(cnsiGUID, userID)
 	if !found {
 		log.Warnf("Failed to retrieve record for CNSI %s", cnsiGUID)
 		sendErrorMessage(clientWebSocket, err, CLOSE_NO_CNSI_USERTOKEN)
 		return nil, errors.New("Failed to find token record")
 	}
 
-	// Refresh token first - makes sure it will be valid when we do the push
-	refreshedTokenRec, err := cfAppPush.portalProxy.RefreshOAuthToken(cnsiRecord.SkipSSLValidation, cnsiRecord.GUID, userID, cnsiRecord.ClientId, cnsiRecord.ClientSecret, cnsiRecord.TokenEndpoint)
-	if err != nil {
-		log.Warnf("Couldn't get refresh token for endpoint with GUID %s", cnsiRecord.GUID)
-		sendErrorMessage(clientWebSocket, err, CLOSE_NO_CNSI_USERTOKEN)
-		return nil, fmt.Errorf("Couldn't get refresh token for endpoint with GUID %s", cnsiRecord.GUID)
-	}
-
 	config := &CFPushAppConfig{
 		AuthorizationEndpoint:  cnsiRecord.AuthorizationEndpoint,
 		CFClient:               cnsiRecord.ClientId,
@@ -501,12 +496,13 @@ func (cfAppPush *CFAppPush) getConfigData(echoContext echo.Context, cnsiGUID str
 		APIEndpointURL:         cnsiRecord.APIEndpoint.String(),
 		DopplerLoggingEndpoint: cnsiRecord.DopplerLoggingEndpoint,
 		SkipSSLValidation:      cnsiRecord.SkipSSLValidation,
-		AuthToken:              refreshedTokenRec.AuthToken,
-		RefreshToken:           refreshedTokenRec.RefreshToken,
+		AuthToken:              token.AuthToken,
 		OrgGUID:                orgGUID,
 		OrgName:                orgName,
 		SpaceGUID:              spaceGUID,
 		SpaceName:              spaceName,
+		EndpointID:             cnsiGUID,
+		UserID:                 userID,
 	}
 
 	return config, nil
diff --git a/src/jetstream/plugins/cfapppush/info.go b/src/jetstream/plugins/cfapppush/info.go
index c32b34cc2c..e273385dce 100644
--- a/src/jetstream/plugins/cfapppush/info.go
+++ b/src/jetstream/plugins/cfapppush/info.go
@@ -30,6 +30,7 @@ func (c *CFPushApp) setEndpointInfo(config *configv3.Config) error {
 		// Got the info we need - update the config with it
 		config.SetTargetInformation(apiEndpoint, info.APIVersion, info.AuthorizationEndpoint, info.MinCLIVersion, info.DopplerLoggingEndpoint, info.RoutingEndpoint, skipSSLValidation)
 		config.SetAccessToken("bearer " + c.config.AuthToken)
+		// Note: We do not give the refresh token to the CLI code as we do NOT want it to refresh the token
 	} else {
 		return errors.New("Did not get a CF /v2/info response")
 	}
diff --git a/src/jetstream/plugins/cfapppush/main.go b/src/jetstream/plugins/cfapppush/main.go
index 25a3596697..6fb15d46a4 100644
--- a/src/jetstream/plugins/cfapppush/main.go
+++ b/src/jetstream/plugins/cfapppush/main.go
@@ -10,7 +10,6 @@ import (
 // CFAppPush is a plugin to allow applications to be pushed to Cloud Foundry from Stratos
 type CFAppPush struct {
 	portalProxy interfaces.PortalProxy
-	cfPush      CFPush
 }
 
 // Init creates a new CFAppPush
diff --git a/src/jetstream/plugins/cfapppush/pushapp.go b/src/jetstream/plugins/cfapppush/pushapp.go
index 11a1c00976..0b033e0247 100644
--- a/src/jetstream/plugins/cfapppush/pushapp.go
+++ b/src/jetstream/plugins/cfapppush/pushapp.go
@@ -52,13 +52,14 @@ type CFPushAppConfig struct {
 	DopplerLoggingEndpoint string
 	SkipSSLValidation      bool
 	AuthToken              string
-	RefreshToken           string
 	OrgGUID                string
 	OrgName                string
 	SpaceGUID              string
 	SpaceName              string
 	OutputWriter           io.Writer
 	DialTimeout            string
+	EndpointID             string
+	UserID                 string
 }
 
 // CFPushAppOverrides represents the document that can be sent from the client with the app overrrides for the push
@@ -308,8 +309,8 @@ func (c *CFPushApp) Run(msgSender DeployAppMessageSender, clientWebsocket *webso
 	return nil
 }
 
-func (push *CFPushApp) setup(config command.Config, ui command.UI, msgSender DeployAppMessageSender, clientWebsocket *websocket.Conn) error {
-	cmd := push.pushCommand
+func (c *CFPushApp) setup(config command.Config, ui command.UI, msgSender DeployAppMessageSender, clientWebsocket *websocket.Conn) error {
+	cmd := c.pushCommand
 	cmd.UI = ui
 	cmd.Config = config
 	sharedActor := sharedaction.NewActor(config)
@@ -320,6 +321,15 @@ func (push *CFPushApp) setup(config command.Config, ui command.UI, msgSender Dep
 		return err
 	}
 
+	// Initialize connection wrapper that will refresh the auto token if needed
+	pushConnectionWrapper := PushConnectionWrapper{
+		portalProxy: c.portalProxy,
+		config:      c.config,
+		cmdConfig:   config,
+	}
+
+	ccClient.WrapConnection(pushConnectionWrapper)
+
 	ccClientV3, _, err := sharedV3.NewV3BasedClients(config, ui, true)
 	if err != nil {
 		return err

From 57be9d54fe650e50217cea883c735c61f904fdeb Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Wed, 13 May 2020 13:39:25 +0100
Subject: [PATCH 096/176] Update changelog for 3.2.0 (#4291)

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c59c3a084c..4922e56735 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,8 @@ This release contains a number of fixes and improvements:
 
 **Fixes:**
 
+- User profile is fetched on most page changes [\#4284](https://github.com/cloudfoundry/stratos/issues/4284)
+- Servicves Marketplace: Create service icon is incorrectly aligned [\#4280](https://github.com/cloudfoundry/stratos/issues/4280)
 - Deployment time does not show correctly in diagnostics when deployed with Helm 3 [\#4261](https://github.com/cloudfoundry/stratos/issues/4261)
 - Pushing app from Stratos can sometimes fail due to expired token [\#4253](https://github.com/cloudfoundry/stratos/issues/4253)
 - Helm: Chart fails to render if `uaa` section is missing, docs misleading [\#4248](https://github.com/cloudfoundry/stratos/issues/4248)

From c84ef63780608e0c85523137d691108e68c0633e Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 14 May 2020 17:30:52 +0100
Subject: [PATCH 097/176] Changes following review

---
 .../src/actions/feature-flags.actions.ts      |  2 +-
 .../src/actions/space.actions.ts              |  2 +-
 .../applications/application.service.ts       | 34 ++++-----
 .../tabs/build-tab/build-tab.component.ts     |  3 +-
 .../create-application-step3.component.ts     | 34 ++++++---
 .../edit-organization-step.component.ts       | 18 ++---
 .../edit-space-step.component.ts              | 26 +++----
 .../service-catalog/services-helper.ts        | 25 +------
 .../service-catalog/services.service.ts       | 73 +++++++------------
 .../create-service-instance-helper.service.ts | 11 +--
 .../select-plan-step.component.ts             |  2 +-
 ...specify-user-provided-details.component.ts | 11 +--
 .../app-service-binding-card.component.ts     |  6 +-
 ...app-service-binding-list-config.service.ts |  2 +-
 .../list-types/app/cf-apps-data-source.ts     |  4 +-
 .../cf-service-instances-list-config.base.ts  |  2 +-
 .../cf-user-service-instances-list-config.ts  |  2 +-
 .../service-instance-card.component.ts        |  6 +-
 ...rovided-service-instance-card.component.ts |  6 +-
 .../service-plan-public.component.ts          |  9 +--
 .../service-action-helper.service.ts          | 32 +++-----
 .../store/effects/app-variables.effects.ts    | 19 +++--
 .../edit-quota-step.component.ts              | 29 ++++----
 .../edit-space-quota-step.component.ts        | 29 +++-----
 .../src/features/metrics/metrics.helpers.ts   |  2 +-
 .../table-cell-service.component.ts           | 12 ++-
 ...-foundry-user-provided-services.service.ts | 23 +-----
 .../entity-catalog-entity-store-helpers.ts    | 19 +++--
 28 files changed, 174 insertions(+), 269 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/actions/feature-flags.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/feature-flags.actions.ts
index 98a6d9974b..6ec461e70b 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/feature-flags.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/feature-flags.actions.ts
@@ -10,7 +10,7 @@ import { createEntityRelationPaginationKey } from '../entity-relations/entity-re
 import { CFStartAction } from './cf-action.types';
 
 export class GetAllFeatureFlags extends CFStartAction implements PaginatedAction {
-  constructor(public endpointGuid: string, public paginationKey: string = '') {
+  constructor(public endpointGuid: string, public paginationKey: string = null) {
     super();
     this.paginationKey = this.paginationKey || createEntityRelationPaginationKey(endpointSchemaKey, this.endpointGuid);
     this.options = new HttpRequest(
diff --git a/src/frontend/packages/cloud-foundry/src/actions/space.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/space.actions.ts
index 9aef2ed1d3..2bfa76daa7 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/space.actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/space.actions.ts
@@ -62,7 +62,7 @@ export class GetSpace extends CFStartAction implements ICFAction, EntityInlinePa
     GET_SPACE_FAILED
   ];
   entity = [cfEntityFactory(spaceEntityType)];
-  schemaKey = '';
+  schemaKey = ''; // Required by builder
   entityType = spaceEntityType;
   options: HttpRequest<any>;
 }
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts
index 625cf6bc8e..456f2bf2c3 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts
@@ -1,7 +1,7 @@
 import { Inject, Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { combineLatest, filter, first, map, publishReplay, refCount, startWith, switchMap } from 'rxjs/operators';
+import { combineLatest, filter, first, map, pairwise, publishReplay, refCount, startWith, switchMap } from 'rxjs/operators';
 
 import { AppMetadataTypes } from '../../../../cloud-foundry/src/actions/app-metadata.actions';
 import {
@@ -25,19 +25,16 @@ import {
   ApplicationStateService,
 } from '../../../../core/src/shared/components/application-state/application-state.service';
 import { APP_GUID, CF_GUID } from '../../../../core/src/shared/entity.tokens';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
 import { EntityService } from '../../../../store/src/entity-service';
 import { ActionState, rootUpdatingKey } from '../../../../store/src/reducers/api-request-reducer/types';
 import {
   getCurrentPageRequestInfo,
   PaginationObservables,
 } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
-import { selectUpdateInfo } from '../../../../store/src/selectors/api.selectors';
 import { endpointEntitiesSelector } from '../../../../store/src/selectors/endpoint.selectors';
 import { APIResource, EntityInfo } from '../../../../store/src/types/api.types';
 import { PaginationEntityState } from '../../../../store/src/types/pagination.types';
 import { cfEntityCatalog } from '../../cf-entity-catalog';
-import { CF_ENDPOINT_TYPE } from '../../cf-types';
 import { createEntityRelationKey } from '../../entity-relations/entity-relations.types';
 import { AppStat } from '../../store/types/app-metadata.types';
 import {
@@ -50,13 +47,13 @@ export function createGetApplicationAction(guid: string, endpointGuid: string) {
   return new GetApplication(
     guid,
     endpointGuid, [
-    createEntityRelationKey(applicationEntityType, routeEntityType),
-    createEntityRelationKey(applicationEntityType, spaceEntityType),
-    createEntityRelationKey(applicationEntityType, stackEntityType),
-    createEntityRelationKey(applicationEntityType, serviceBindingEntityType),
-    createEntityRelationKey(routeEntityType, domainEntityType),
-    createEntityRelationKey(spaceEntityType, organizationEntityType),
-  ]
+      createEntityRelationKey(applicationEntityType, routeEntityType),
+      createEntityRelationKey(applicationEntityType, spaceEntityType),
+      createEntityRelationKey(applicationEntityType, stackEntityType),
+      createEntityRelationKey(applicationEntityType, serviceBindingEntityType),
+      createEntityRelationKey(routeEntityType, domainEntityType),
+      createEntityRelationKey(spaceEntityType, organizationEntityType),
+    ]
   );
 }
 
@@ -289,21 +286,18 @@ export class ApplicationService {
     updatedApplication: UpdateApplication,
     updateEntities?: AppMetadataTypes[],
     existingApplication?: IApp): Observable<ActionState> {
-    this.store.dispatch(new UpdateExistingApplication(
+    return cfEntityCatalog.application.api.update<ActionState>(
       this.appGuid,
       this.cfGuid,
       { ...updatedApplication },
       existingApplication,
       updateEntities
-    ));
-
-    // Create an Observable that can be used to determine when the update completed
-    const actionState = selectUpdateInfo(
-      entityCatalog.getEntityKey(CF_ENDPOINT_TYPE, applicationEntityType),
-      this.appGuid,
-      UpdateExistingApplication.updateKey
+    ).pipe(
+      pairwise(),
+      filter(([oldS, newS]) => oldS.busy && !newS.busy),
+      map(([, newS]) => newS),
+      first()
     );
-    return this.store.select(actionState).pipe(filter(item => !item.busy), first());
   }
 }
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts
index 7c3d7744d6..7c54753efb 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts
@@ -239,10 +239,9 @@ export class BuildTabComponent implements OnInit {
 
   restageApplication() {
     const { cfGuid, appGuid } = this.applicationService;
-    const restageAppAction = cfEntityCatalog.application.actions.restage(appGuid, cfGuid)
     this.confirmAndPollForState(
       appRestageConfirmation,
-      () => this.store.dispatch(restageAppAction),
+      () => cfEntityCatalog.application.api.restage(appGuid, cfGuid),
       'starting',
       'STARTED',
       () => { }
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step3/create-application-step3.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step3/create-application-step3.component.ts
index 2b478a9249..af0e43ce23 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step3/create-application-step3.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step3/create-application-step3.component.ts
@@ -3,7 +3,7 @@ import { AbstractControl, FormControl, FormGroup, Validators } from '@angular/fo
 import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material/core';
 import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of as observableOf } from 'rxjs';
-import { catchError, filter, first, map, mergeMap, switchMap, tap } from 'rxjs/operators';
+import { catchError, filter, first, map, mergeMap, pairwise, switchMap, tap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
 import { domainEntityType, organizationEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
@@ -12,7 +12,11 @@ import { CreateNewApplicationState } from '../../../../../../cloud-foundry/src/s
 import { IDomain } from '../../../../../../core/src/core/cf-api.types';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
-import { getDefaultRequestState, RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
+import {
+  ActionState,
+  getDefaultRequestState,
+  RequestInfoState,
+} from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource } from '../../../../../../store/src/types/api.types';
 import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { createEntityRelationKey } from '../../../../entity-relations/entity-relations.types';
@@ -89,11 +93,9 @@ export class CreateApplicationStep3Component implements OnInit {
     const obs$ = cfEntityCatalog.application.api.create<RequestInfoState>(
       newAppGuid,
       cloudFoundry, {
-      name,
-      space_guid: space
-    }).pipe(
-      filter(ris => !!ris.response)
-    );
+        name,
+        space_guid: space
+      });
     return this.wrapObservable(obs$, 'Could not create application');
   }
 
@@ -115,8 +117,6 @@ export class CreateApplicationStep3Component implements OnInit {
           domain_guid: selectedDomainGuid,
           host: hostName
         }
-      ).pipe(
-        filter(ris => !!ris.response)
       )
       return this.wrapObservable(obs$, 'Application created. Could not create route');
     }
@@ -127,13 +127,25 @@ export class CreateApplicationStep3Component implements OnInit {
   }
 
   associateRoute(appGuid: string, routeGuid: string, endpointGuid: string): Observable<RequestInfoState> {
-    const obs$ = cfEntityCatalog.application.api.assignRoute<RequestInfoState>(endpointGuid, routeGuid, appGuid)
+    const obs$ = cfEntityCatalog.application.api.assignRoute<ActionState>(endpointGuid, routeGuid, appGuid).pipe(
+      map((actionState: ActionState): RequestInfoState => ({
+        creating: actionState.busy,
+        error: actionState.error,
+        message: actionState.message,
+        fetching: null,
+        updating: null,
+        deleting: null,
+        response: null
+      }))
+    )
     return this.wrapObservable(obs$, 'Application and route created. Could not associated route with app');
   }
 
   private wrapObservable(obs$: Observable<RequestInfoState>, errorString: string): Observable<RequestInfoState> {
     return obs$.pipe(
-      filter((state: RequestInfoState) => state && !state.creating),
+      pairwise(),
+      filter(([oldS, newS]) => oldS.creating && !newS.creating),
+      map(([, newS]) => newS),
       first(),
       tap(state => {
         if (state.error) {
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts
index 90d2855b74..d2e3105007 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-organization/edit-organization-step/edit-organization-step.component.ts
@@ -2,9 +2,8 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { AbstractControl, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms';
 import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
-import { filter, map, take, tap } from 'rxjs/operators';
+import { filter, map, pairwise, take, tap } from 'rxjs/operators';
 
-import { UpdateOrganization } from '../../../../../../cloud-foundry/src/actions/organization.actions';
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
 import { organizationEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
 import {
@@ -18,8 +17,8 @@ import {
 } from '../../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { endpointSchemaKey } from '../../../../../../store/src/helpers/entity-factory';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
+import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
-import { selectRequestInfo } from '../../../../../../store/src/selectors/api.selectors';
 import { APIResource } from '../../../../../../store/src/types/api.types';
 import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../../cf-entity-factory';
@@ -133,17 +132,14 @@ export class EditOrganizationStepComponent implements OnInit, OnDestroy {
   }
 
   submit: StepOnNextFunction = () => {
-    const action = new UpdateOrganization(this.orgGuid, this.cfGuid, {
+    return cfEntityCatalog.org.api.update<ActionState>(this.orgGuid, this.cfGuid, {
       name: this.editOrgName.value.orgName,
       quota_definition_guid: this.editOrgName.value.quotaDefinition,
       status: this.status ? OrgStatus.ACTIVE : OrgStatus.SUSPENDED
-    });
-    this.store.dispatch(action);
-
-    // Update action
-    return this.store.select(selectRequestInfo(action, this.orgGuid)).pipe(
-      filter(o => !!o && !o.updating[UpdateOrganization.UpdateExistingOrg].busy),
-      map(o => o.updating[UpdateOrganization.UpdateExistingOrg]),
+    }).pipe(
+      pairwise(),
+      filter(([oldS, newS]) => oldS.busy && !newS.busy),
+      map(([, newS]) => newS),
       map(o => ({
         success: !o.error,
         redirect: !o.error,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.ts
index 1821334376..ab2f460630 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.ts
@@ -5,10 +5,9 @@ import { Store } from '@ngrx/store';
 import { Observable, of, Subscription } from 'rxjs';
 import { filter, map, pairwise, switchMap, take, tap } from 'rxjs/operators';
 
-import { AssociateSpaceQuota } from '../../../../../../cloud-foundry/src/actions/quota-definitions.actions';
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
 import { StepOnNextFunction } from '../../../../../../core/src/shared/components/stepper/step/step.component';
-import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
+import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { AddEditSpaceStepBase } from '../../add-edit-space-step-base';
 import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
@@ -95,36 +94,31 @@ export class EditSpaceStepComponent extends AddEditSpaceStepBase implements OnDe
           return of({ success: true, redirect: true });
         }
 
-        return this.updateSpaceQuota$();
+        return this.updateSpaceQuota();
       }),
     );
   }
 
   updateSpace() {
-    const action = cfEntityCatalog.space.actions.update(this.spaceGuid, this.cfGuid, {
+    return cfEntityCatalog.space.api.update<ActionState>(this.spaceGuid, this.cfGuid, {
       name: this.editSpaceForm.value.spaceName,
       allow_ssh: this.editSpaceForm.value.toggleSsh as boolean,
-    })
-    this.store.dispatch(action);
-    return cfEntityCatalog.space.store.getEntityMonitor(this.spaceGuid).getUpdatingSection(action.updatingKey).pipe(
+    }).pipe(
       pairwise(),
       filter(([oldS, newS]) => oldS.busy && !newS.busy),
       map(([, newS]) => newS),
     );
   }
 
-  updateSpaceQuota$() {
+  updateSpaceQuota() {
     const spaceQuotaGuid = this.editSpaceForm.value.quotaDefinition;
     const mon = spaceQuotaGuid ?
-      cfEntityCatalog.spaceQuota.api.associateWithSpace<RequestInfoState>(this.spaceGuid, this.cfGuid, spaceQuotaGuid) :
-      cfEntityCatalog.spaceQuota.api.disassociateFromSpace<RequestInfoState>(this.spaceGuid, this.cfGuid, this.originalSpaceQuotaGuid)
+      cfEntityCatalog.spaceQuota.api.associateWithSpace<ActionState>(this.spaceGuid, this.cfGuid, spaceQuotaGuid) :
+      cfEntityCatalog.spaceQuota.api.disassociateFromSpace<ActionState>(this.spaceGuid, this.cfGuid, this.originalSpaceQuotaGuid)
     return mon.pipe(
-      filter(o => {
-        return !!o &&
-          o.updating[AssociateSpaceQuota.UpdateExistingSpaceQuota] &&
-          !o.updating[AssociateSpaceQuota.UpdateExistingSpaceQuota].busy;
-      }),
-      map((state) => state.updating[AssociateSpaceQuota.UpdateExistingSpaceQuota]),
+      pairwise(),
+      filter(([oldS, newS]) => oldS.busy && !newS.busy),
+      map(([, newS]) => newS),
       map(stateAction => ({
         success: !stateAction.error,
         redirect: !stateAction.error,
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/services-helper.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/services-helper.ts
index b34883e357..46ae08775a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/services-helper.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/services-helper.ts
@@ -20,12 +20,7 @@ import { PaginationMonitorFactory } from '../../../../store/src/monitors/paginat
 import { APIResource } from '../../../../store/src/types/api.types';
 import { CFAppState } from '../../cf-app-state';
 import { cfEntityCatalog } from '../../cf-entity-catalog';
-import {
-  organizationEntityType,
-  serviceInstancesEntityType,
-  servicePlanEntityType,
-  spaceEntityType,
-} from '../../cf-entity-types';
+import { organizationEntityType, servicePlanEntityType, spaceEntityType } from '../../cf-entity-types';
 import { QParam, QParamJoiners } from '../../shared/q-param';
 import { fetchTotalResults } from '../cloud-foundry/cf.helpers';
 import { ServicePlanAccessibility } from './services.service';
@@ -73,11 +68,6 @@ export const isEditServiceInstanceMode = (activatedRoute: ActivatedRoute) => {
   return !!cfId && !!serviceInstanceId;
 };
 
-export const getServiceInstancesInCf = (cfGuid: string) => {
-  const paginationKey = createEntityRelationPaginationKey(serviceInstancesEntityType, cfGuid);
-  return cfEntityCatalog.serviceInstance.store.getPaginationService(cfGuid, paginationKey).entities$;
-};
-
 export const fetchServiceInstancesCount = (
   cfGuid: string,
   orgGuid: string = null,
@@ -194,26 +184,15 @@ export const populateServicePlanExtraTyped = (servicePlan: APIResource<IServiceP
   };
 };
 
-
-export const getServiceBroker = (
-  serviceBrokerGuid: string,
-  cfGuid: string,
-): EntityService<APIResource<IServiceBroker>> => cfEntityCatalog.serviceBroker.store.getEntityService(serviceBrokerGuid, cfGuid, {});
-
 export const getServiceBrokerName = (
   serviceBrokerGuid: string,
   cfGuid: string,
-): Observable<string> => getServiceBroker(serviceBrokerGuid, cfGuid).waitForEntity$.pipe(
+): Observable<string> => cfEntityCatalog.serviceBroker.store.getEntityService(serviceBrokerGuid, cfGuid, {}).waitForEntity$.pipe(
   filter(res => !!res),
   map(a => a.entity.entity.name),
   first()
 );
 
-export const getCfService = (
-  serviceGuid: string,
-  cfGuid: string,
-): EntityService<APIResource<IService>> => cfEntityCatalog.service.store.getEntityService(serviceGuid, cfGuid, {});
-
 export const getCfServiceInstance = (
   serviceInstanceGuid: string,
   cfGuid: string,
diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/services.service.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/services.service.ts
index e7db49a1d4..b4d6f656a0 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/services.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/services.service.ts
@@ -15,9 +15,9 @@ import { getIdFromRoute } from '../../../../core/src/core/utils.service';
 import { EntityService } from '../../../../store/src/entity-service';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { cfEntityCatalog } from '../../cf-entity-catalog';
-import { serviceBrokerEntityType, servicePlanVisibilityEntityType } from '../../cf-entity-types';
+import { serviceBrokerEntityType, serviceInstancesEntityType, servicePlanVisibilityEntityType } from '../../cf-entity-types';
 import { createEntityRelationPaginationKey } from '../../entity-relations/entity-relations.types';
-import { getCfService, getServiceInstancesInCf, getServiceName, getServicePlans } from './services-helper';
+import { getServiceName, getServicePlans } from './services-helper';
 
 
 export interface ServicePlanAccessibility {
@@ -61,7 +61,7 @@ export class ServicesService {
       return;
     }
 
-    this.serviceEntityService = getCfService(this.serviceGuid, this.cfGuid);
+    this.serviceEntityService = cfEntityCatalog.service.store.getEntityService(this.serviceGuid, this.cfGuid, {});
     this.service$ = this.serviceEntityService.waitForEntity$.pipe(
       filter(o => !!o && !!o.entity),
       map(o => o.entity),
@@ -72,18 +72,6 @@ export class ServicesService {
     this.initBaseObservables();
   }
 
-  getServicePlanVisibilities = () => {
-    const paginationKey = createEntityRelationPaginationKey(servicePlanVisibilityEntityType, this.cfGuid);
-    return cfEntityCatalog.servicePlanVisibility.store.getPaginationService(this.cfGuid, paginationKey, {}).entities$
-  }
-  private getServiceInstances = () => {
-    return getServiceInstancesInCf(this.cfGuid);
-  }
-
-  private getServiceBrokers = () => {
-    const paginationKey = createEntityRelationPaginationKey(serviceBrokerEntityType, this.cfGuid);
-    return cfEntityCatalog.serviceBroker.store.getPaginationService(this.cfGuid, paginationKey, {}).entities$
-  }
 
   getServiceBrokerById = (guid: string): Observable<APIResource<IServiceBroker>> => this.serviceBrokers$
     .pipe(
@@ -94,37 +82,17 @@ export class ServicesService {
       first()
     )
 
-  getServiceName = () => {
-    return this.service$
-      .pipe(
-        map(getServiceName)
-      );
-  }
-
-  getServiceProviderName = () => {
-    return observableCombineLatest(this.serviceExtraInfo$, this.service$)
-      .pipe(
-        map(([extraInfo]) => {
-          if (extraInfo && extraInfo.providerDisplayName) {
-            return extraInfo.providerDisplayName;
-          } else {
-            return '';
-          }
-        }));
-  }
+  getServiceName = () => this.service$.pipe(
+    map(getServiceName)
+  )
 
-  getServiceDescription = () => {
-    return observableCombineLatest(this.serviceExtraInfo$, this.service$)
-      .pipe(
-        map(([extraInfo, service]) => {
-          if (extraInfo && extraInfo.longDescription) {
-            return extraInfo.longDescription;
-          } else {
-            return service.entity.description;
-          }
-        }));
-  }
+  getServiceProviderName = () => observableCombineLatest(this.serviceExtraInfo$, this.service$).pipe(
+    map(([extraInfo]) => extraInfo && extraInfo.providerDisplayName ? extraInfo.providerDisplayName : '')
+  );
 
+  getServiceDescription = () => observableCombineLatest(this.serviceExtraInfo$, this.service$).pipe(
+    map(([extraInfo, service]) => extraInfo && extraInfo.longDescription ? extraInfo.longDescription : service.entity.description)
+  );
 
   getDocumentationUrl = () => this.serviceExtraInfo$.pipe(
     map(p => p ? p.documentationUrl : null)
@@ -153,10 +121,18 @@ export class ServicesService {
   )
 
   private initBaseObservables() {
-    this.servicePlanVisibilities$ = this.getServicePlanVisibilities();
+    this.servicePlanVisibilities$ = cfEntityCatalog.servicePlanVisibility.store.getPaginationService(
+      this.cfGuid,
+      createEntityRelationPaginationKey(servicePlanVisibilityEntityType, this.cfGuid),
+      {}
+    ).entities$;
     this.serviceExtraInfo$ = this.service$.pipe(map(o => JSON.parse(o.entity.extra)));
     this.servicePlans$ = getServicePlans(this.service$, this.cfGuid);
-    this.serviceBrokers$ = this.getServiceBrokers();
+    this.serviceBrokers$ = cfEntityCatalog.serviceBroker.store.getPaginationService(
+      this.cfGuid,
+      createEntityRelationPaginationKey(serviceBrokerEntityType, this.cfGuid),
+      {}
+    ).entities$;
     this.serviceBroker$ = this.serviceBrokers$.pipe(
       filter(p => !!p && p.length > 0),
       combineLatest(this.service$),
@@ -185,7 +161,10 @@ export class ServicesService {
         }
       })
     );
-    this.allServiceInstances$ = this.getServiceInstances();
+    this.allServiceInstances$ = cfEntityCatalog.serviceInstance.store.getPaginationService(
+      this.cfGuid,
+      createEntityRelationPaginationKey(serviceInstancesEntityType, this.cfGuid)
+    ).entities$;
     this.serviceInstances$ = this.allServiceInstances$.pipe(
       map(instances => instances.filter(instance => instance.entity.service_guid === this.serviceGuid))
     );
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/create-service-instance-helper.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/create-service-instance-helper.service.ts
index 23ec1f9838..20838641bf 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/create-service-instance-helper.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/create-service-instance-helper.service.ts
@@ -22,12 +22,7 @@ import { getPaginationObservables } from '../../../../../store/src/reducers/pagi
 import { APIResource } from '../../../../../store/src/types/api.types';
 import { cfEntityCatalog } from '../../../cf-entity-catalog';
 import { cfEntityFactory } from '../../../cf-entity-factory';
-import {
-  getCfService,
-  getServiceBroker,
-  getServiceName,
-  getServicePlans,
-} from '../../../features/service-catalog/services-helper';
+import { getServiceName, getServicePlans } from '../../../features/service-catalog/services-helper';
 import { QParam, QParamJoiners } from '../../q-param';
 
 export class CreateServiceInstanceHelper {
@@ -48,7 +43,7 @@ export class CreateServiceInstanceHelper {
 
   initBaseObservables = () => {
 
-    this.service$ = getCfService(this.serviceGuid, this.cfGuid).waitForEntity$.pipe(
+    this.service$ = cfEntityCatalog.service.store.getEntityService(this.serviceGuid, this.cfGuid, {}).waitForEntity$.pipe(
       filter(o => !!o && !!o.entity && !!o.entity.entity && !!o.entity.entity.service_plans),
       // filter(o => !!o && !!o.entity),
       map(o => o.entity),
@@ -57,7 +52,7 @@ export class CreateServiceInstanceHelper {
     );
 
     this.serviceBroker$ = this.service$.pipe(
-      map(service => getServiceBroker(service.entity.service_broker_guid, this.cfGuid)),
+      map(service => cfEntityCatalog.serviceBroker.store.getEntityService(service.entity.service_broker_guid, this.cfGuid, {})),
       switchMap(serviceService => serviceService.waitForEntity$),
       map(entity => entity.entity)
     );
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/select-plan-step/select-plan-step.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/select-plan-step/select-plan-step.component.ts
index 2912f86215..84ad89c15f 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/select-plan-step/select-plan-step.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/select-plan-step/select-plan-step.component.ts
@@ -119,7 +119,7 @@ export class SelectPlanStepComponent implements OnDestroy {
         tap(selectedServicePlan => {
           getServicePlanAccessibilityCardStatus(
             selectedServicePlan,
-            this.cSIHelperService.getServicePlanVisibilities(),
+            this.cSIHelperService.servicePlanVisibilities$,
             this.cSIHelperService.serviceBroker$).pipe(
               first()
             ).subscribe(cardStatus => this.selectedPlanAccessibility$.next(cardStatus));
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts
index b40f8dda75..a6b6ea2406 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.ts
@@ -8,10 +8,7 @@ import { Store } from '@ngrx/store';
 import { BehaviorSubject, combineLatest as obsCombineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
 import { combineLatest, filter, first, map, publishReplay, refCount, startWith, switchMap } from 'rxjs/operators';
 
-import {
-  IUserProvidedServiceInstanceData,
-  UpdateUserProvidedServiceInstance,
-} from '../../../../../../cloud-foundry/src/actions/user-provided-service.actions';
+import { IUserProvidedServiceInstanceData } from '../../../../../../cloud-foundry/src/actions/user-provided-service.actions';
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
 import {
   serviceBindingEntityType,
@@ -305,9 +302,9 @@ export class SpecifyUserProvidedDetailsComponent implements OnDestroy {
       updateData
     ).pipe(
       map(er => ({
-        success: !er.updating[UpdateUserProvidedServiceInstance.updateServiceInstance].error,
-        redirect: !er.updating[UpdateUserProvidedServiceInstance.updateServiceInstance].error,
-        message: `Failed to update service instance: ${er.updating[UpdateUserProvidedServiceInstance.updateServiceInstance].message}`
+        success: !er.error,
+        redirect: !er.error,
+        message: `Failed to update service instance: ${er.message}`
       }))
     );
   }
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts
index 4ccaeafd9b..010dc45f7d 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts
@@ -26,7 +26,6 @@ import { serviceBindingEntityType } from '../../../../../../cf-entity-types';
 import { ApplicationService } from '../../../../../../features/applications/application.service';
 import { isUserProvidedServiceInstance } from '../../../../../../features/cloud-foundry/cf.helpers';
 import {
-  getCfService,
   getServiceBrokerName,
   getServiceName,
   getServicePlanName,
@@ -124,7 +123,8 @@ export class AppServiceBindingCardComponent extends CardCell<APIResource<IServic
     ).waitForEntity$;
     this.serviceInstance$ = serviceInstance$;
     this.service$ = serviceInstance$.pipe(
-      switchMap(o => getCfService(o.entity.entity.service_guid, this.appService.cfGuid).waitForEntity$),
+      switchMap(o => cfEntityCatalog.service.store.getEntityService(o.entity.entity.service_guid, this.appService.cfGuid, {})
+        .waitForEntity$),
       filter(service => !!service)
     );
     this.listData = [{
@@ -236,7 +236,7 @@ export class AppServiceBindingCardComponent extends CardCell<APIResource<IServic
     );
   }
 
-  private edit = () => this.serviceActionHelperService.editServiceBinding(
+  private edit = () => this.serviceActionHelperService.startEditServiceBindingStepper(
     this.row.entity.service_instance_guid,
     this.appService.cfGuid,
     { appId: this.appService.appGuid },
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts
index 6dd1fccbab..3cf8d48518 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts
@@ -55,7 +55,7 @@ export class AppServiceBindingListConfigService extends BaseCfListConfig<APIReso
 
   private listActionEdit: IListAction<APIResource<IServiceBinding>> = {
     action: (item) => {
-      this.serviceActionHelperService.editServiceBinding(
+      this.serviceActionHelperService.startEditServiceBindingStepper(
         item.entity.service_instance_guid,
         this.appService.cfGuid,
         { appId: this.appService.appGuid },
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-apps-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-apps-data-source.ts
index dead5bc6b5..2e636a341a 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-apps-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/cf-apps-data-source.ts
@@ -48,10 +48,10 @@ export class CfAppsDataSource extends CFListDataSource<APIResource> {
     transformEntities?: any[],
     paginationKey = CfAppsDataSource.paginationKey,
     seedPaginationKey = CfAppsDataSource.paginationKey,
-    startingCfGuidFilter?: string
+    cfGuid?: string
   ) {
     const syncNeeded = paginationKey !== seedPaginationKey;
-    const action = cfEntityCatalog.application.actions.getMultiple(undefined, CfAppsDataSource.paginationKey, {
+    const action = cfEntityCatalog.application.actions.getMultiple(cfGuid, CfAppsDataSource.paginationKey, {
       includeRelations: CfAppsDataSource.includeRelations,
     });
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts
index 8ae65a4138..eb3fd2981d 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-service-instances-list-config.base.ts
@@ -149,7 +149,7 @@ export class CfServiceInstancesListConfigBase implements IListConfig<APIResource
 
   private listActionEdit: IListAction<APIResource> = {
     action: (item: APIResource<IServiceInstance>) =>
-      this.serviceActionHelperService.editServiceBinding(item.metadata.guid, item.entity.cfGuid, {
+      this.serviceActionHelperService.startEditServiceBindingStepper(item.metadata.guid, item.entity.cfGuid, {
         [CANCEL_SPACE_ID_PARAM]: item.entity.space_guid,
         [CANCEL_ORG_ID_PARAM]: item.entity.space.entity.organization_guid
       }),
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts
index 707759b41b..325c011b31 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-user-service-instances-list-config.ts
@@ -144,7 +144,7 @@ export class CfUserServiceInstancesListConfigBase implements IListConfig<APIReso
 
   private listActionEdit: IListAction<APIResource> = {
     action: (item: APIResource<IUserProvidedServiceInstance>) =>
-      this.serviceActionHelperService.editServiceBinding(
+      this.serviceActionHelperService.startEditServiceBindingStepper(
         item.metadata.guid,
         item.entity.cfGuid,
         {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts
index 1ade4946cc..35dd58eabd 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/service-instance-card/service-instance-card.component.ts
@@ -110,7 +110,7 @@ export class ServiceInstanceCardComponent extends CardCell<APIResource<IServiceI
   cfOrgSpace: CfOrgSpaceLabelService;
   serviceBrokerName$: Observable<string>;
 
-  detach = () => {
+  private detach = () => {
     this.serviceActionHelperService.detachServiceBinding(
       this.serviceInstanceEntity.entity.service_bindings,
       this.serviceInstanceEntity.metadata.guid,
@@ -119,13 +119,13 @@ export class ServiceInstanceCardComponent extends CardCell<APIResource<IServiceI
     );
   }
 
-  delete = () => this.serviceActionHelperService.deleteServiceInstance(
+  private delete = () => this.serviceActionHelperService.deleteServiceInstance(
     this.serviceInstanceEntity.metadata.guid,
     this.serviceInstanceEntity.entity.name,
     this.serviceInstanceEntity.entity.cfGuid
   )
 
-  edit = () => this.serviceActionHelperService.editServiceBinding(
+  private edit = () => this.serviceActionHelperService.startEditServiceBindingStepper(
     this.serviceInstanceEntity.metadata.guid,
     this.serviceInstanceEntity.entity.cfGuid,
     null
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts
index e21657ecd0..e244daf18e 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component.ts
@@ -98,7 +98,7 @@ export class UserProvidedServiceInstanceCardComponent extends CardCell<APIResour
     super();
   }
 
-  detach = () => {
+  private detach = () => {
     this.serviceActionHelperService.detachServiceBinding(
       this.serviceInstanceEntity.entity.service_bindings,
       this.serviceInstanceEntity.metadata.guid,
@@ -108,14 +108,14 @@ export class UserProvidedServiceInstanceCardComponent extends CardCell<APIResour
     );
   }
 
-  delete = () => this.serviceActionHelperService.deleteServiceInstance(
+  private delete = () => this.serviceActionHelperService.deleteServiceInstance(
     this.serviceInstanceEntity.metadata.guid,
     this.serviceInstanceEntity.entity.name,
     this.serviceInstanceEntity.entity.cfGuid,
     true
   )
 
-  edit = () => this.serviceActionHelperService.editServiceBinding(
+  private edit = () => this.serviceActionHelperService.startEditServiceBindingStepper(
     this.serviceInstanceEntity.metadata.guid,
     this.serviceInstanceEntity.entity.cfGuid,
     null,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.ts
index a278c89b7d..46e6f3348b 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.ts
@@ -3,14 +3,13 @@ import { Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 
 import {
-  getCfService,
-  getServiceBroker,
   getServicePlanAccessibilityCardStatus,
 } from '../../../../../cloud-foundry/src/features/service-catalog/services-helper';
 import { ServicesService } from '../../../../../cloud-foundry/src/features/service-catalog/services.service';
 import { IServiceBroker, IServicePlan } from '../../../../../core/src/core/cf-api-svc.types';
 import { StratosStatus } from '../../../../../core/src/shared/shared.types';
 import { APIResource } from '../../../../../store/src/types/api.types';
+import { cfEntityCatalog } from '../../../cf-entity-catalog';
 
 @Component({
   selector: 'app-service-plan-public',
@@ -34,7 +33,7 @@ export class ServicePlanPublicComponent {
     }
     this.planAccessibility$ = getServicePlanAccessibilityCardStatus(
       servicePlan,
-      this.servicesService.getServicePlanVisibilities(),
+      this.servicesService.servicePlanVisibilities$,
       this.getServiceBroker(servicePlan.entity.service_guid, servicePlan.entity.cfGuid)
     );
     this.planAccessibilityMessage$ = this.planAccessibility$.pipe(
@@ -54,8 +53,8 @@ export class ServicePlanPublicComponent {
   }
 
   private getServiceBroker(serviceGuid: string, cfGuid: string): Observable<APIResource<IServiceBroker>> {
-    return getCfService(serviceGuid, cfGuid).waitForEntity$.pipe(
-      map(service => getServiceBroker(service.entity.entity.service_broker_guid, cfGuid)),
+    return cfEntityCatalog.service.store.getEntityService(serviceGuid, cfGuid, {}).waitForEntity$.pipe(
+      map(service => cfEntityCatalog.serviceBroker.store.getEntityService(service.entity.entity.service_broker_guid, cfGuid, {})),
       switchMap(serviceService => serviceService.waitForEntity$),
       map(entity => entity.entity)
     );
diff --git a/src/frontend/packages/cloud-foundry/src/shared/data-services/service-action-helper.service.ts b/src/frontend/packages/cloud-foundry/src/shared/data-services/service-action-helper.service.ts
index 6fb379d819..44a1ccb775 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/data-services/service-action-helper.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/data-services/service-action-helper.service.ts
@@ -3,17 +3,16 @@ import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { filter, first, map, pairwise } from 'rxjs/operators';
 
-import { UpdateUserProvidedServiceInstance } from '../../../../cloud-foundry/src/actions/user-provided-service.actions';
 import { CFAppState } from '../../../../cloud-foundry/src/cf-app-state';
 import { serviceInstancesEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
-import { IServiceBinding, IServiceInstance, IUserProvidedServiceInstance } from '../../../../core/src/core/cf-api-svc.types';
+import { IServiceBinding } from '../../../../core/src/core/cf-api-svc.types';
 import { ConfirmationDialogConfig } from '../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../core/src/shared/components/confirmation-dialog.service';
 import { RouterNav, RouterQueryParams } from '../../../../store/src/actions/router.actions';
 import { EntityCatalogEntityConfig } from '../../../../store/src/entity-catalog/entity-catalog.types';
+import { EntityService } from '../../../../store/src/entity-service';
 import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
-import { APIResource, EntityInfo } from '../../../../store/src/types/api.types';
-import { UpdateServiceInstance } from '../../actions/service-instances.actions';
+import { APIResource } from '../../../../store/src/types/api.types';
 import { cfEntityCatalog } from '../../cf-entity-catalog';
 import { CF_ENDPOINT_TYPE } from '../../cf-types';
 import {
@@ -87,7 +86,7 @@ export class ServiceActionHelperService {
   }
 
 
-  editServiceBinding = (
+  startEditServiceBindingStepper = (
     guid: string,
     endpointGuid: string,
     query: RouterQueryParams = {},
@@ -100,17 +99,13 @@ export class ServiceActionHelperService {
       }
     ));
 
-    const obs: Observable<EntityInfo<APIResource>> = userProvided ?
-      this.createUserProvidedServiceInstanceObs(guid, endpointGuid) :
-      this.createServiceInstanceObs(guid, endpointGuid);
+    const es: EntityService = userProvided ?
+      cfEntityCatalog.userProvidedService.store.getEntityService(guid, endpointGuid, {}) :
+      cfEntityCatalog.serviceInstance.store.getEntityService(guid, endpointGuid);
 
-    const updatingKey = userProvided ?
-      UpdateUserProvidedServiceInstance.updateServiceInstance :
-      UpdateServiceInstance.updateServiceInstance;
-
-    return obs.pipe(
+    return es.entityObs$.pipe(
       filter(res => !!res),
-      map(res => res.entityRequestInfo.updating[updatingKey]),
+      map(res => res.entityRequestInfo.updating[es.action.updatingKey]),
       filter(res => !!res),
       pairwise(),
       filter(([oldV, newV]) => oldV.busy && !newV.busy),
@@ -122,13 +117,4 @@ export class ServiceActionHelperService {
   private getRouteKey(userProvided: boolean) {
     return userProvided ? SERVICE_INSTANCE_TYPES.USER_SERVICE : SERVICE_INSTANCE_TYPES.SERVICE;
   }
-
-  private createUserProvidedServiceInstanceObs(guid: string, endpointGuid: string):
-    Observable<EntityInfo<APIResource<IUserProvidedServiceInstance>>> {
-    return cfEntityCatalog.userProvidedService.store.getEntityService(guid, endpointGuid, {}).entityObs$;
-  }
-
-  private createServiceInstanceObs(guid: string, endpointGuid: string): Observable<EntityInfo<APIResource<IServiceInstance>>> {
-    return cfEntityCatalog.serviceInstance.store.getEntityService(guid, endpointGuid).entityObs$;
-  }
 }
diff --git a/src/frontend/packages/cloud-foundry/src/store/effects/app-variables.effects.ts b/src/frontend/packages/cloud-foundry/src/store/effects/app-variables.effects.ts
index 3d4fa68bd3..740a102f1e 100644
--- a/src/frontend/packages/cloud-foundry/src/store/effects/app-variables.effects.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/effects/app-variables.effects.ts
@@ -2,9 +2,10 @@ import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { map } from 'rxjs/operators';
 
+import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
 import { AppMetadataTypes } from '../../actions/app-metadata.actions';
 import { AppVariables, AppVariablesUpdate } from '../../actions/app-variables.actions';
-import { UpdateExistingApplication } from '../../actions/application.actions';
+import { cfEntityCatalog } from '../../cf-entity-catalog';
 
 
 @Injectable()
@@ -16,14 +17,12 @@ export class AppVariablesEffect {
 
   @Effect() apiRequestStart$ = this.actions$.pipe(
     ofType<AppVariablesUpdate>(AppVariables.UPDATE),
-    map((apiAction: AppVariablesUpdate) => {
-      return new UpdateExistingApplication(
-        apiAction.appGuid,
-        apiAction.cfGuid,
-        { ...apiAction.updatedApplication },
-        null,
-        [AppMetadataTypes.ENV_VARS]
-      );
-    }));
+    map((apiAction: AppVariablesUpdate) => cfEntityCatalog.application.api.update<ActionState>(
+      apiAction.appGuid,
+      apiAction.cfGuid,
+      { ...apiAction.updatedApplication },
+      null,
+      [AppMetadataTypes.ENV_VARS]
+    )));
 }
 
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts b/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts
index b15cbe0a71..9cb9c559e9 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts
+++ b/src/frontend/packages/core/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.ts
@@ -8,6 +8,7 @@ import { cfEntityCatalog } from '../../../../../../cloud-foundry/src/cf-entity-c
 import { ActiveRouteCfOrgSpace } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import { AppState } from '../../../../../../store/src/app-state';
+import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource } from '../../../../../../store/src/types/api.types';
 import { IOrgQuotaDefinition } from '../../../../core/cf-api.types';
 import { safeUnsubscribe } from '../../../../core/utils.service';
@@ -57,22 +58,18 @@ export class EditQuotaStepComponent implements OnDestroy {
 
   validate = () => this.form && this.form.valid();
 
-  submit: StepOnNextFunction = () => {
-    const formValues = this.form.formGroup.value;
-    const action = cfEntityCatalog.quotaDefinition.actions.update(this.quotaGuid, this.cfGuid, formValues);
-    this.store.dispatch(action);
-    return cfEntityCatalog.quotaDefinition.store.getEntityMonitor(this.quotaGuid)
-      .getUpdatingSection(action.updatingKey).pipe(
-        pairwise(),
-        filter(([oldV, newV]) => oldV.busy && !newV.busy),
-        map(([, newV]) => newV),
-        map(requestInfo => ({
-          success: !requestInfo.error,
-          redirect: !requestInfo.error,
-          message: requestInfo.error ? `Failed to update quota: ${requestInfo.message}` : ''
-        }))
-      );
-  }
+  submit: StepOnNextFunction = () =>
+    cfEntityCatalog.quotaDefinition.api.update<ActionState>(this.quotaGuid, this.cfGuid, this.form.formGroup.value).pipe(
+      pairwise(),
+      filter(([oldV, newV]) => oldV.busy && !newV.busy),
+      map(([, newV]) => newV),
+      map(requestInfo => ({
+        success: !requestInfo.error,
+        redirect: !requestInfo.error,
+        message: requestInfo.error ? `Failed to update quota: ${requestInfo.message}` : ''
+      }))
+    );
+
 
   ngOnDestroy() {
     safeUnsubscribe(this.quotaSubscription);
diff --git a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts b/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
index fa68b038ff..ab7903e127 100644
--- a/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
+++ b/src/frontend/packages/core/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.ts
@@ -8,6 +8,7 @@ import { cfEntityCatalog } from '../../../../../../cloud-foundry/src/cf-entity-c
 import { ActiveRouteCfOrgSpace } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
 import { AppState } from '../../../../../../store/src/app-state';
+import { ActionState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource } from '../../../../../../store/src/types/api.types';
 import { ISpaceQuotaDefinition } from '../../../../core/cf-api.types';
 import { safeUnsubscribe } from '../../../../core/utils.service';
@@ -58,24 +59,18 @@ export class EditSpaceQuotaStepComponent implements OnDestroy {
 
   validate = () => !!this.form && this.form.valid();
 
-  submit: StepOnNextFunction = () => {
-    const formValues = this.form.formGroup.value;
+  submit: StepOnNextFunction = () =>
+    cfEntityCatalog.spaceQuota.api.update<ActionState>(this.spaceQuotaGuid, this.cfGuid, this.form.formGroup.value).pipe(
+      pairwise(),
+      filter(([oldV, newV]) => oldV.busy && !newV.busy),
+      map(([, newV]) => newV),
+      map(requestInfo => ({
+        success: !requestInfo.error,
+        redirect: !requestInfo.error,
+        message: requestInfo.error ? `Failed to update space quota: ${requestInfo.message}` : ''
+      }))
+    );
 
-    const action = cfEntityCatalog.spaceQuota.actions.update(this.spaceQuotaGuid, this.cfGuid, formValues);
-    this.store.dispatch(action);
-    return cfEntityCatalog.spaceQuota.store.getEntityMonitor(this.spaceQuotaGuid)
-      .getUpdatingSection(action.updatingKey)
-      .pipe(
-        pairwise(),
-        filter(([oldV, newV]) => oldV.busy && !newV.busy),
-        map(([, newV]) => newV),
-        map(requestInfo => ({
-          success: !requestInfo.error,
-          redirect: !requestInfo.error,
-          message: requestInfo.error ? `Failed to update space quota: ${requestInfo.message}` : ''
-        }))
-      );
-  }
 
   ngOnDestroy() {
     safeUnsubscribe(this.spaceQuotaSubscription);
diff --git a/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts b/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts
index d6558b2918..ef5b53a8b6 100644
--- a/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts
+++ b/src/frontend/packages/core/src/features/metrics/metrics.helpers.ts
@@ -2,7 +2,7 @@ import { Observable, of as observableOf } from 'rxjs';
 
 import { StratosStatus } from '../../shared/shared.types';
 import { EndpointIcon, getFullEndpointApiUrl } from '../endpoints/endpoint-helpers';
-import { entityCatalog } from './../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from './../../../../store/src/entity-catalog/entity-catalog';
 import { MetricsEndpointProvider } from './services/metrics-service';
 
 // Info for an endpoint that a metrics endpoint provides for
diff --git a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.ts b/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.ts
index 02ae1b0203..000db7d0fd 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.ts
+++ b/src/frontend/packages/core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.ts
@@ -5,10 +5,7 @@ import { filter, first, map, switchMap } from 'rxjs/operators';
 import { cfEntityCatalog } from '../../../../../../../../cloud-foundry/src/cf-entity-catalog';
 import { userProvidedServiceInstanceEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types';
 import { CF_ENDPOINT_TYPE } from '../../../../../../../../cloud-foundry/src/cf-types';
-import {
-  getCfService,
-  getServiceName,
-} from '../../../../../../../../cloud-foundry/src/features/service-catalog/services-helper';
+import { getServiceName } from '../../../../../../../../cloud-foundry/src/features/service-catalog/services-helper';
 import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/entity-catalog';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { IServiceInstance } from '../../../../../../core/cf-api-svc.types';
@@ -38,9 +35,10 @@ export class TableCellServiceComponent extends TableCellCustom<APIResource<IServ
       this.entityKey === entityCatalog.getEntityKey(CF_ENDPOINT_TYPE, userProvidedServiceInstanceEntityType);
 
     if (!this.isUserProvidedServiceInstance) {
-      const service$ = getCfService(this.row.entity.service_guid, this.row.entity.cfGuid).waitForEntity$.pipe(
-        filter(s => !!s),
-      );
+      const service$ = cfEntityCatalog.service.store.getEntityService(this.row.entity.service_guid, this.row.entity.cfGuid, {})
+        .waitForEntity$.pipe(
+          filter(s => !!s),
+        );
 
       this.serviceName$ = service$.pipe(
         map(s => getServiceName(s.entity))
diff --git a/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts b/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts
index 5883b92246..5b9c84b4c1 100644
--- a/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts
+++ b/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts
@@ -16,7 +16,7 @@ import { QParam, QParamJoiners } from '../../../../cloud-foundry/src/shared/q-pa
 import { ClearPaginationOfType } from '../../../../store/src/actions/pagination.actions';
 import { EntityCatalogEntityConfig } from '../../../../store/src/entity-catalog/entity-catalog.types';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
-import { RequestInfoState } from '../../../../store/src/reducers/api-request-reducer/types';
+import { ActionState, RequestInfoState } from '../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { IUserProvidedServiceInstance } from '../../core/cf-api-svc.types';
 
@@ -100,24 +100,7 @@ export class CloudFoundryUserProvidedServicesService {
     cfGuid: string,
     guid: string,
     data: Partial<IUserProvidedServiceInstanceData>,
-  ): Observable<RequestInfoState> {
-    const updatingKey = cfEntityCatalog.userProvidedService.actions.update(guid, cfGuid, data).updatingKey;
-    return cfEntityCatalog.userProvidedService.api.update<RequestInfoState>(
-      guid,
-      cfGuid,
-      data,
-      // this.userProvidedServiceInstancesEntityConfig
-    ).pipe(
-      filter(v => !!v.updating[updatingKey]),
-      pairwise(),
-      filter(([oldV, newV]) =>
-        oldV.updating[updatingKey].busy &&
-        !newV.updating[updatingKey].busy),
-      map(([, newV]) => newV)
-    );
+  ): Observable<ActionState> {
+    return cfEntityCatalog.userProvidedService.api.update<ActionState>(guid, cfGuid, data);
   }
-
 }
-
-
-
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts
index 3654e3625c..c1dcabd861 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts
@@ -4,7 +4,7 @@ import { EntityService } from '../../entity-service';
 import { EntitySchema } from '../../helpers/entity-schema';
 import { EntityMonitor } from '../../monitors/entity-monitor';
 import { PaginationMonitor } from '../../monitors/pagination-monitor';
-import { ListActionState, RequestInfoState } from '../../reducers/api-request-reducer/types';
+import { ActionState, ListActionState, RequestInfoState } from '../../reducers/api-request-reducer/types';
 import { PaginationObservables } from '../../reducers/pagination-reducer/pagination-reducer.types';
 import { isPaginatedAction, PaginatedAction } from '../../types/pagination.types';
 import { EntityRequestAction, RequestAction } from '../../types/request.types';
@@ -21,9 +21,10 @@ import {
   EntityCatalogEntityStore,
 } from './entity-catalog-entity.types';
 
-type ActionDispatcher<K extends keyof ABC, ABC extends OrchestratedActionBuilders> = <T extends RequestInfoState | ListActionState>(
-  ...args: Parameters<ABC[K]>
-) => Observable<T>;
+type ActionDispatcher<K extends keyof ABC, ABC extends OrchestratedActionBuilders> =
+  <T extends RequestInfoState | ActionState | ListActionState>(
+    ...args: Parameters<ABC[K]>
+  ) => Observable<T>;
 
 export type ActionDispatchers<ABC extends OrchestratedActionBuilders> = {
   [K in keyof ABC]: ActionDispatcher<K, ABC>
@@ -102,7 +103,7 @@ export class EntityCatalogEntityStoreHelpers {
     builder: OrchestratedActionBuilder,
     actionKey: string,
   ): ActionDispatcher<K, ABC> {
-    return <T extends RequestInfoState | ListActionState>(
+    return <T extends RequestInfoState | ActionState | ListActionState>(
       ...args: Parameters<ABC[K]>): Observable<T> => {
       const helper = EntityCatalogHelpers.GetEntityCatalogHelper();
 
@@ -120,14 +121,16 @@ export class EntityCatalogEntityStoreHelpers {
       if (!rAction.guid) {
         throw new Error(`\`${actionKey}\` action for entity \`${rAction.entityType}\` has no guid`);
       }
-
-      return es.getEntityMonitor(
+      const entityMonitor = es.getEntityMonitor(
         rAction.guid,
         {
           schemaKey,
           startWithNull: false
         }
-      ).entityRequest$ as unknown as Observable<T>;
+      );
+      return rAction.updatingKey ?
+        entityMonitor.getUpdatingSection(rAction.updatingKey) as Observable<T> :
+        entityMonitor.entityRequest$ as Observable<T>;
     };
   }
 

From e0fc06c8e2bc25f420eea30d43f664a428a21c0c Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 14 May 2020 17:37:30 +0100
Subject: [PATCH 098/176] Don't fetch all domains when creating cf endpoint
 service

---
 .../services/cloud-foundry-endpoint.service.ts             | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service.ts
index 091e3f43b5..51ffb15a14 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service.ts
@@ -4,7 +4,6 @@ import { Observable } from 'rxjs';
 import { filter, first, map, publishReplay, refCount } from 'rxjs/operators';
 
 import { GetAllApplications } from '../../../../../cloud-foundry/src/actions/application.actions';
-import { DeleteOrganization } from '../../../../../cloud-foundry/src/actions/organization.actions';
 import { CFAppState } from '../../../../../cloud-foundry/src/cf-app-state';
 import {
   domainEntityType,
@@ -174,8 +173,6 @@ export class CloudFoundryEndpointService {
     this.usersCount$ = this.cfUserService.fetchTotalUsers(this.cfGuid);
 
     this.constructAppObs();
-
-    this.fetchDomains();
   }
 
   constructAppObs() {
@@ -225,12 +222,12 @@ export class CloudFoundryEndpointService {
       .reduce((a, t) => a + t, 0) : 0;
   }
 
-  public fetchDomains = () => {
+  public fetchDomains() {
     cfEntityCatalog.domain.api.getMultiple(this.cfGuid, null, {});
   }
 
   public deleteOrg(orgGuid: string, endpointGuid: string) {
-    this.store.dispatch(new DeleteOrganization(orgGuid, endpointGuid));
+    cfEntityCatalog.org.api.remove(orgGuid, endpointGuid);
   }
 
   fetchApps() {

From b556db3d02819c94556d099896fe388cf58d1e66 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 15 May 2020 09:12:33 +0100
Subject: [PATCH 099/176] Fix tests

---
 .../service-plan-public.component.spec.ts                 | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.spec.ts
index 017e056564..0ecf090c2a 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/service-plan-public/service-plan-public.component.spec.ts
@@ -1,14 +1,14 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { of } from 'rxjs';
 
-import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { StratosStatus } from '../../../../../core/src/shared/shared.types';
+import { EntityService } from '../../../../../store/src/entity-service';
+import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { generateCfBaseTestModulesNoShared } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import * as servicesHelpers from '../../../features/service-catalog/services-helper';
 import { ServicesService } from '../../../features/service-catalog/services.service';
 import { ServicesServiceMock } from '../../../features/service-catalog/services.service.mock';
 import { ServicePlanPublicComponent } from './service-plan-public.component';
-import { EntityService } from '../../../../../store/src/entity-service';
 
 const getCfService = {
   waitForEntity$: {
@@ -69,24 +69,20 @@ describe('ServicePlanPublicComponent', () => {
   it('should display if service plan is reachable', () => {
     const planAccessibility$ = of(StratosStatus.WARNING);
     const s0 = spyOn(servicesHelpers, 'getServicePlanAccessibilityCardStatus').and.returnValue(planAccessibility$);
-    const s1 = spyOn(servicesHelpers, 'getCfService').and.returnValue(getCfService);
     component.servicePlan = servicesService.servicePlan;
     fixture.detectChanges();
 
     expect(s0).toHaveBeenCalled();
-    expect(s1).toHaveBeenCalled();
     expect(element.textContent).toContain('Service Plan has limited visibility');
   });
 
   it('should display if service plan is not reachable', () => {
     const planAccessibility$ = of(StratosStatus.ERROR);
     const s0 = spyOn(servicesHelpers, 'getServicePlanAccessibilityCardStatus').and.returnValue(planAccessibility$);
-    const s1 = spyOn(servicesHelpers, 'getCfService').and.returnValue(getCfService);
     component.servicePlan = servicesService.servicePlan;
     fixture.detectChanges();
 
     expect(s0).toHaveBeenCalled();
-    expect(s1).toHaveBeenCalled();
     expect(element.textContent).toContain('Service Plan has no visibility');
   });
 });

From 718ec2c74ec47310628aba15e4f21eadf694de3c Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 15 May 2020 09:59:26 +0100
Subject: [PATCH 100/176] Fix e2e tests

---
 .../routes/add-routes/add-routes.component.ts | 31 +++++--------------
 .../store/effects/app-variables.effects.ts    |  7 ++---
 2 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.ts
index e680fb1398..1f5d40d65f 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.ts
@@ -2,20 +2,19 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { Store } from '@ngrx/store';
 import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs';
-import { filter, map, mergeMap, pairwise, switchMap, take, tap } from 'rxjs/operators';
+import { filter, map, mergeMap, pairwise, switchMap, tap } from 'rxjs/operators';
 
 import { CFAppState } from '../../../../../../cloud-foundry/src/cf-app-state';
 import { domainEntityType, spaceEntityType } from '../../../../../../cloud-foundry/src/cf-entity-types';
 import { createEntityRelationKey } from '../../../../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { Route, RouteMode } from '../../../../../../cloud-foundry/src/store/types/route.types';
 import { IDomain } from '../../../../../../core/src/core/cf-api.types';
-import { pathGet } from '../../../../../../core/src/core/utils.service';
 import {
   StepOnNextFunction,
   StepOnNextResult,
 } from '../../../../../../core/src/shared/components/stepper/step/step.component';
 import { RouterNav } from '../../../../../../store/src/actions/router.actions';
-import { RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
+import { ActionState, RequestInfoState } from '../../../../../../store/src/reducers/api-request-reducer/types';
 import { APIResource } from '../../../../../../store/src/types/api.types';
 import { cfEntityCatalog } from '../../../../cf-entity-catalog';
 import { ApplicationService } from '../../application.service';
@@ -224,16 +223,15 @@ export class AddRoutesComponent implements OnInit, OnDestroy {
   }
 
   private mapRoute(routeGuid: string): Observable<StepOnNextResult> {
-    return cfEntityCatalog.application.api.assignRoute<RequestInfoState>(this.cfGuid, routeGuid, this.appGuid).pipe(
+    return cfEntityCatalog.application.api.assignRoute<ActionState>(this.cfGuid, routeGuid, this.appGuid).pipe(
       pairwise(),
-      filter(([oldApp, newApp]) => {
-        return pathGet('updating.Assigning-Route.busy', oldApp) && !pathGet('updating.Assigning-Route.busy', newApp);
-      }),
-      map(([oldApp, newApp]) => newApp),
-      map((requestState: RequestInfoState) => {
+      filter(([oldR, newR]) => oldR.busy && !newR.busy),
+      map(([, newR]) => newR),
+      map((requestState: ActionState) => {
         if (requestState.error) {
           return { success: false, message: `Failed to associate route with app: ${requestState.error}` };
         }
+        cfEntityCatalog.route.api.getAllForApplication(this.appGuid, this.cfGuid)
         this.store.dispatch(new RouterNav({ path: ['/applications', this.cfGuid, this.appGuid, 'routes'] }));
         return { success: true };
       })
@@ -241,21 +239,8 @@ export class AddRoutesComponent implements OnInit, OnDestroy {
   }
 
   private mapRouteSubmit(): Observable<StepOnNextResult> {
-
     return this.selectedRoute$.pipe(
-      tap(route => cfEntityCatalog.application.api.assignRoute(this.cfGuid, route.metadata.guid, this.appGuid)),
-      switchMap(() => this.appService.app$),
-      map(requestInfo => requestInfo.entityRequestInfo.updating['Assigning-Route']),
-      filter(requestInfo => !requestInfo.busy),
-      take(1),
-      map(requestInfo => {
-        if (requestInfo.error) {
-          return { success: false, message: `Failed to associate route with app: ${requestInfo.message}` };
-        } else {
-          cfEntityCatalog.route.api.getAllForApplication(this.appGuid, this.cfGuid)
-          return { success: true, redirect: true };
-        }
-      })
+      switchMap(route => this.mapRoute(route.metadata.guid))
     );
   }
 
diff --git a/src/frontend/packages/cloud-foundry/src/store/effects/app-variables.effects.ts b/src/frontend/packages/cloud-foundry/src/store/effects/app-variables.effects.ts
index 740a102f1e..43a64dac5a 100644
--- a/src/frontend/packages/cloud-foundry/src/store/effects/app-variables.effects.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/effects/app-variables.effects.ts
@@ -2,7 +2,6 @@ import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { map } from 'rxjs/operators';
 
-import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
 import { AppMetadataTypes } from '../../actions/app-metadata.actions';
 import { AppVariables, AppVariablesUpdate } from '../../actions/app-variables.actions';
 import { cfEntityCatalog } from '../../cf-entity-catalog';
@@ -17,12 +16,12 @@ export class AppVariablesEffect {
 
   @Effect() apiRequestStart$ = this.actions$.pipe(
     ofType<AppVariablesUpdate>(AppVariables.UPDATE),
-    map((apiAction: AppVariablesUpdate) => cfEntityCatalog.application.api.update<ActionState>(
+    map((apiAction: AppVariablesUpdate) => cfEntityCatalog.application.actions.update(
       apiAction.appGuid,
       apiAction.cfGuid,
       { ...apiAction.updatedApplication },
       null,
       [AppMetadataTypes.ENV_VARS]
-    )));
+    ))
+  )
 }
-

From 6e38c4aa5cd6901906a7a13f83c03576f4f0c6cd Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 15 May 2020 11:05:24 +0100
Subject: [PATCH 101/176] Changes following review

---
 .../app-service-binding-list-config.service.ts             | 1 +
 .../cloud-foundry-user-provided-services.service.ts        | 6 +++++-
 .../entity-catalog-entity-store-helpers.ts                 | 7 ++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts
index 3cf8d48518..b37f826ab9 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.ts
@@ -55,6 +55,7 @@ export class AppServiceBindingListConfigService extends BaseCfListConfig<APIReso
 
   private listActionEdit: IListAction<APIResource<IServiceBinding>> = {
     action: (item) => {
+      // FIXME: If the user cancels stepper this leaks #4295
       this.serviceActionHelperService.startEditServiceBindingStepper(
         item.entity.service_instance_guid,
         this.appService.cfGuid,
diff --git a/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts b/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts
index 5b9c84b4c1..3e3f70484f 100644
--- a/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts
+++ b/src/frontend/packages/core/src/shared/services/cloud-foundry-user-provided-services.service.ts
@@ -101,6 +101,10 @@ export class CloudFoundryUserProvidedServicesService {
     guid: string,
     data: Partial<IUserProvidedServiceInstanceData>,
   ): Observable<ActionState> {
-    return cfEntityCatalog.userProvidedService.api.update<ActionState>(guid, cfGuid, data);
+    return cfEntityCatalog.userProvidedService.api.update<ActionState>(guid, cfGuid, data).pipe(
+      pairwise(),
+      filter(([oldV, newV]) => oldV.busy && !newV.busy),
+      map(([, newV]) => newV),
+    );
   }
 }
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts
index c1dcabd861..2e88c4f518 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity-store-helpers.ts
@@ -21,8 +21,10 @@ import {
   EntityCatalogEntityStore,
 } from './entity-catalog-entity.types';
 
+type ActionDispatcherReturnTypes = RequestInfoState | ActionState | ListActionState;
+
 type ActionDispatcher<K extends keyof ABC, ABC extends OrchestratedActionBuilders> =
-  <T extends RequestInfoState | ActionState | ListActionState>(
+  <T extends ActionDispatcherReturnTypes>(
     ...args: Parameters<ABC[K]>
   ) => Observable<T>;
 
@@ -103,8 +105,7 @@ export class EntityCatalogEntityStoreHelpers {
     builder: OrchestratedActionBuilder,
     actionKey: string,
   ): ActionDispatcher<K, ABC> {
-    return <T extends RequestInfoState | ActionState | ListActionState>(
-      ...args: Parameters<ABC[K]>): Observable<T> => {
+    return <T extends ActionDispatcherReturnTypes>(...args: Parameters<ABC[K]>): Observable<T> => {
       const helper = EntityCatalogHelpers.GetEntityCatalogHelper();
 
       const action = builder(...args);

From 0f3d97560f6a1e99bfadbd502ca6574c474b9d3d Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 15 May 2020 14:14:32 +0100
Subject: [PATCH 102/176] Fix create service instance

---
 .../service-catalog/services.service.ts       | 62 +++++++++++--------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/features/service-catalog/services.service.ts b/src/frontend/packages/cloud-foundry/src/features/service-catalog/services.service.ts
index b4d6f656a0..54fa5f9add 100644
--- a/src/frontend/packages/cloud-foundry/src/features/service-catalog/services.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/service-catalog/services.service.ts
@@ -57,19 +57,11 @@ export class ServicesService {
     this.cfGuid = getIdFromRoute(activatedRoute, 'endpointId');
     this.serviceGuid = getIdFromRoute(activatedRoute, 'serviceId');
 
-    if (!this.serviceGuid) {
-      return;
-    }
-
-    this.serviceEntityService = cfEntityCatalog.service.store.getEntityService(this.serviceGuid, this.cfGuid, {});
-    this.service$ = this.serviceEntityService.waitForEntity$.pipe(
-      filter(o => !!o && !!o.entity),
-      map(o => o.entity),
-      publishReplay(1),
-      refCount()
-    );
+    this.initServicesObservables();
 
-    this.initBaseObservables();
+    if (this.serviceGuid) {
+      this.initServiceObservables();
+    }
   }
 
 
@@ -120,19 +112,19 @@ export class ServicesService {
     )
   )
 
-  private initBaseObservables() {
-    this.servicePlanVisibilities$ = cfEntityCatalog.servicePlanVisibility.store.getPaginationService(
-      this.cfGuid,
-      createEntityRelationPaginationKey(servicePlanVisibilityEntityType, this.cfGuid),
-      {}
-    ).entities$;
+  /**
+   * Init observables specific to a service
+   */
+  private initServiceObservables() {
+    this.serviceEntityService = cfEntityCatalog.service.store.getEntityService(this.serviceGuid, this.cfGuid, {});
+    this.service$ = this.serviceEntityService.waitForEntity$.pipe(
+      filter(o => !!o && !!o.entity),
+      map(o => o.entity),
+      publishReplay(1),
+      refCount()
+    );
     this.serviceExtraInfo$ = this.service$.pipe(map(o => JSON.parse(o.entity.extra)));
     this.servicePlans$ = getServicePlans(this.service$, this.cfGuid);
-    this.serviceBrokers$ = cfEntityCatalog.serviceBroker.store.getPaginationService(
-      this.cfGuid,
-      createEntityRelationPaginationKey(serviceBrokerEntityType, this.cfGuid),
-      {}
-    ).entities$;
     this.serviceBroker$ = this.serviceBrokers$.pipe(
       filter(p => !!p && p.length > 0),
       combineLatest(this.service$),
@@ -161,12 +153,30 @@ export class ServicesService {
         }
       })
     );
+    this.serviceInstances$ = this.allServiceInstances$.pipe(
+      map(instances => instances.filter(instance => instance.entity.service_guid === this.serviceGuid))
+    );
+  }
+
+  /**
+   * Init observables of service related cf level types
+   */
+  private initServicesObservables() {
+    this.servicePlanVisibilities$ = cfEntityCatalog.servicePlanVisibility.store.getPaginationService(
+      this.cfGuid,
+      createEntityRelationPaginationKey(servicePlanVisibilityEntityType, this.cfGuid),
+      {}
+    ).entities$;
+
+    this.serviceBrokers$ = cfEntityCatalog.serviceBroker.store.getPaginationService(
+      this.cfGuid,
+      createEntityRelationPaginationKey(serviceBrokerEntityType, this.cfGuid),
+      {}
+    ).entities$;
+
     this.allServiceInstances$ = cfEntityCatalog.serviceInstance.store.getPaginationService(
       this.cfGuid,
       createEntityRelationPaginationKey(serviceInstancesEntityType, this.cfGuid)
     ).entities$;
-    this.serviceInstances$ = this.allServiceInstances$.pipe(
-      map(instances => instances.filter(instance => instance.entity.service_guid === this.serviceGuid))
-    );
   }
 }

From e87be6f2c31e6dc4f2e5cc9724cca3953107fa6f Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Fri, 15 May 2020 14:15:51 +0100
Subject: [PATCH 103/176] Update to latest Stratos icon font

---
 .../assets/fonts/stratos/stratos-icons.eot    | Bin 32930 -> 60942 bytes
 .../assets/fonts/stratos/stratos-icons.svg    | 334 +++++++++++++++---
 .../assets/fonts/stratos/stratos-icons.ttf    | Bin 32752 -> 60780 bytes
 .../assets/fonts/stratos/stratos-icons.woff   | Bin 19328 -> 34364 bytes
 .../assets/fonts/stratos/stratos-icons.woff2  | Bin 16348 -> 29072 bytes
 5 files changed, 291 insertions(+), 43 deletions(-)

diff --git a/src/frontend/packages/core/assets/fonts/stratos/stratos-icons.eot b/src/frontend/packages/core/assets/fonts/stratos/stratos-icons.eot
index 7d8b8a1547bd2a1125204927868622ea5930e6a5..8082a90cb7f274bd2c7741484b9722f7af8478e6 100644
GIT binary patch
delta 33624
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
H?$7cce_qP2

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

diff --git a/src/frontend/packages/core/assets/fonts/stratos/stratos-icons.svg b/src/frontend/packages/core/assets/fonts/stratos/stratos-icons.svg
index 6e4b814e31..0cc8ced7f6 100644
--- a/src/frontend/packages/core/assets/fonts/stratos/stratos-icons.svg
+++ b/src/frontend/packages/core/assets/fonts/stratos/stratos-icons.svg
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 <metadata>
-Created by FontForge 20180321 at Fri Jan 31 19:10:36 2020
+Created by FontForge 20180321 at Fri May 15 14:10:56 2020
  By Neil MacDougall
 </metadata>
 <defs>
@@ -18,10 +18,18 @@ Created by FontForge 20180321 at Fri Jan 31 19:10:36 2020
     bbox="-0.595506 -64.5 512 448"
     underline-thickness="25"
     underline-position="-76"
-    unicode-range="U+005F-F141"
+    unicode-range="U+005F-F187"
   />
 <missing-glyph horiz-adv-x="187" 
 d="M17 0v341h136v-341h-136zM34 17h102v307h-102v-307z" />
+    <glyph glyph-name="abstract_incomplete" unicode="abstract_incomplete" horiz-adv-x="426" 
+d="M420 213q6 -10 6 -22q0 -11 -5 -20l-86 -150q-5 -8 -15.5 -14.5t-21.5 -6.5h-170q-7 0 -14.5 3t-13.5 8t-9 10l-85 150q-6 10 -6 21t6 21l85 150q5 8 15.5 14.5t21.5 6.5h170q10 0 21 -6.5t16 -14.5zM213 178v1q0 35 -25 60t-60 25q-14 0 -31 -6.5t-27 -15.5l58 99h170
+l3 -5q2 -2 3 -4l74 -130l4 -10l-55 -99q-14 -5 -29 -6q-34 0 -59 24.5t-26 59.5v1v6z" />
+    <glyph glyph-name="abstract_instance" unicode="abstract_instance" horiz-adv-x="426" 
+d="M420 213q6 -10 6 -22q0 -11 -6 -20l-85 -150q-5 -8 -16 -14.5t-21 -6.5h-171q-10 0 -20.5 6.5t-15.5 14.5l-85 150q-6 10 -6 21t6 21l85 150q5 8 15.5 14.5t20.5 6.5h171q10 0 20.5 -6.5t15.5 -14.5zM212.5 149q17.5 0 30 12.5t12.5 30.5t-12.5 30.5t-30 12.5t-30 -12.5
+t-12.5 -30.5t12.5 -30.5t30 -12.5z" />
+    <glyph glyph-name="abstract" unicode="abstract" horiz-adv-x="426" 
+d="M298 384q7 0 14.5 -3t13.5 -8t9 -10l86 -150q5 -10 5 -21t-5 -21l-86 -150q-5 -8 -15.5 -14.5t-21.5 -6.5h-170q-7 0 -14.5 3t-13.5 8t-9 10l-85 150q-6 10 -6 21t6 21l85 150q5 8 15.5 14.5t21.5 6.5h170z" />
     <glyph glyph-name="action_chains" unicode="action_chains" horiz-adv-x="470" 
 d="M342 21.5q0 26.5 18.5 45t45 18.5t45.5 -18.5t19 -45t-19 -45.5t-45.5 -19t-45 19t-18.5 45.5zM363 384q44 0 75 -31.5t31 -75.5t-31 -75t-75 -31h-68q-6 -18 -24 -30t-36 -12t-36 12t-24 30h-68q-27 0 -45.5 -19t-18.5 -45.5t18.5 -45t45.5 -18.5h128v64l85 -86l-85 -85
 v64h-128q-44 0 -75.5 31.5t-31.5 75.5t31.5 75t75.5 31h68q6 18 23.5 30t36 12t36.5 -12t24 -30h68q26 0 45 19t19 45.5t-19 45t-45 18.5h-239q-6 -17 -23.5 -29.5t-36.5 -12.5q-26 0 -45 18.5t-19 45t19 45.5t45 19q12 0 24.5 -6t22 -15.5t13.5 -21.5h239z" />
@@ -30,14 +38,23 @@ d="M43 277v43h341v-43h-341zM85 363v42h256v-42h-256zM384 235q18 0 30.5 -12.5t12.5
     <glyph glyph-name="admin" unicode="admin" horiz-adv-x="384" 
 d="M192 427l192 -86v-128q0 -89 -55 -162.5t-137 -93.5q-82 20 -137 93.5t-55 162.5v128zM192 343q-26 0 -45 -18.5t-19 -45t19 -45.5t45 -19t45 19t19 45.5t-19 45t-45 18.5zM192 175q-23 0 -52 -7t-52.5 -23t-23.5 -36q19 -28 56.5 -48t71.5 -20t71.5 20t56.5 48
 q0 15 -14 28t-34.5 21t-41.5 12.5t-38 4.5z" />
+    <glyph glyph-name="api" unicode="api" horiz-adv-x="427" 
+d="M240 203v21h43v-21h-43zM384 363q18 0 30.5 -12.5t12.5 -30.5v-256q0 -18 -12.5 -30.5t-30.5 -12.5h-341q-18 0 -30.5 12.5t-12.5 30.5v256q0 18 12.5 30.5t30.5 12.5h341zM137 128h34l-47 128h-34l-47 -128h34l10 26h41zM315 203v21v1q0 13 -9 22t-22 9h-1h-75v-128h32
+v43h43h1q13 0 22 9t9 22v1zM384 128v128h-32v-128h32zM95 176l12 33l12 -33h-24z" />
     <glyph glyph-name="application_incomplete" unicode="application_incomplete" horiz-adv-x="426" 
 d="M420 213q6 -10 6 -22q0 -11 -5 -20l-86 -150q-5 -8 -15.5 -14.5t-21.5 -6.5h-170q-7 0 -14.5 3t-13.5 8t-9 10l-85 150q-6 10 -6 21t6 21l85 150q5 8 15.5 14.5t21.5 6.5h170q10 0 21 -6.5t16 -14.5zM213 178v1q0 35 -25 60t-60 25q-14 0 -31 -6.5t-27 -15.5l58 99h170
 l3 -5q2 -2 3 -4l74 -130l4 -10l-55 -99q-14 -5 -29 -6q-34 0 -59 24.5t-26 59.5v1v6z" />
     <glyph glyph-name="application_instance" unicode="application_instance" horiz-adv-x="426" 
 d="M420 213q6 -10 6 -22q0 -11 -6 -20l-85 -150q-5 -8 -16 -14.5t-21 -6.5h-171q-10 0 -20.5 6.5t-15.5 14.5l-85 150q-6 10 -6 21t6 21l85 150q5 8 15.5 14.5t20.5 6.5h171q10 0 20.5 -6.5t15.5 -14.5zM212.5 149q17.5 0 30 12.5t12.5 30.5t-12.5 30.5t-30 12.5t-30 -12.5
 t-12.5 -30.5t12.5 -30.5t30 -12.5z" />
+    <glyph glyph-name="application_window" unicode="application_window" horiz-adv-x="469" 
+d="M43 277h384q17 0 29.5 -12.5t12.5 -29.5v-214q0 -17 -12.5 -29.5t-29.5 -12.5h-384q-18 0 -30.5 12.5t-12.5 29.5v214q0 11 5.5 21t15.5 15.5t22 5.5zM0 384q0 18 12.5 30.5t30.5 12.5h384q17 0 29.5 -12.5t12.5 -30.5v-43h-469v43zM64 363q9 0 15 6t6 15t-6 15t-15 6
+t-15 -6t-6 -15t6 -15t15 -6zM128 363q9 0 15 6t6 15t-6 15t-15 6t-15 -6t-6 -15t6 -15t15 -6zM0 235v85h469v-85h-469z" />
     <glyph glyph-name="application" unicode="application" horiz-adv-x="426" 
 d="M298 384q7 0 14.5 -3t13.5 -8t9 -10l86 -150q5 -10 5 -21t-5 -21l-86 -150q-5 -8 -15.5 -14.5t-21.5 -6.5h-170q-7 0 -14.5 3t-13.5 8t-9 10l-85 150q-6 10 -6 21t6 21l85 150q5 8 15.5 14.5t21.5 6.5h170z" />
+    <glyph glyph-name="autoinstallation" unicode="autoinstallation" horiz-adv-x="427" 
+d="M179 96l67 -66q-26 -8 -54 -8q-79 0 -135.5 56t-56.5 136q0 52 25.5 96.5t70 70t96.5 25.5q75 0 131.5 -53.5t60.5 -128.5h-95v-128h-110zM139 213q0 -22 15.5 -37.5t37.5 -15.5t37.5 15.5t15.5 37.5t-15.5 38t-37.5 16t-37.5 -16t-15.5 -38zM427 64l-85 -85l-85 85h64
+v128h42v-128h64z" />
     <glyph glyph-name="background_tasks" unicode="background_tasks" 
 d="M128 352v32h192v-32h-192zM64 288v32h32v-32h-32zM64 352v32h32v-32h-32zM64 224v32h32v-32h-32zM96 192v-32h-53q-18 0 -30.5 12.5t-12.5 30.5v202q0 18 12.5 30.5t30.5 12.5h298q18 0 30.5 -12.5t12.5 -30.5v-85h-32v96h-320v-224h64zM469 288q18 0 30.5 -12.5
 t12.5 -30.5v-202q0 -18 -12.5 -30.5t-30.5 -12.5h-117v-32h32v-32h-128v31h33v33h-118q-18 0 -30.5 12.5t-12.5 30.5v202q0 18 12.5 30.5t30.5 12.5h298zM480 32v224h-320v-224h320z" />
@@ -48,6 +65,9 @@ v-43h256z" />
 d="M426 339q12 -7 20 -21t8 -27v-198q0 -13 -8 -27t-20 -20l-172 -100q-11 -7 -27 -7t-27 7l-173 100q-11 6 -19 20t-8 27v199q0 13 8 26.5t19 20.5l173 99q11 7 27 7q15 0 27 -7z" />
     <glyph glyph-name="cleanup" unicode="cleanup" horiz-adv-x="427" 
 d="M384 128v-43h-341v43h106q0 18 12.5 30.5t30.5 12.5l88 234l37 -13l-82 -221q17 0 29.5 -12.5t12.5 -30.5h107zM384 64l43 -85h-43h-341h-43l43 85h341z" />
+    <glyph glyph-name="cloud_controller_manager" unicode="cloud_controller_manager" 
+d="M192 235h171v-43h-171v43zM512 235v-43h-64v-43h-43v128h43v-42h64zM192 21h171v-42h-171v42zM512 21v-42h-64v-43h-43v128h43v-43h64zM512 85h-171v43h171v-43zM192 85v43h64v43h43v-128h-43v42h-64zM149 299v-192h-21q-53 0 -90.5 37.5t-37.5 90.5q0 47 33.5 84.5
+t80.5 42.5q19 35 60.5 60.5t81.5 25.5q54 0 100 -38t57 -91q30 -2 55 -20h-319z" />
     <glyph glyph-name="cloud_foundry_space" unicode="cloud_foundry_space" horiz-adv-x="427" 
 d="M213.5 405q88.5 0 151 -62.5t62.5 -150.5t-62.5 -150.5t-151 -62.5t-151 62.5t-62.5 150.5t62.5 150.5t151 62.5zM213.5 21q70.5 0 120.5 50t50 121t-50 121t-120.5 50t-120.5 -50t-50 -121t50 -121t120.5 -50zM182 288q0 13 9 22.5t22 9.5t22.5 -9.5t9.5 -22.5
 q0 -8 -4 -15.5t-11.5 -12t-16 -4.5t-16 4.5t-11.5 12t-4 15.5zM182 96q0 13 9 22.5t22 9.5t22.5 -9.5t9.5 -22.5q0 -8 -4 -15.5t-11.5 -12t-16 -4.5t-16 4.5t-11.5 12t-4 15.5zM278 192q0 13 9 22.5t22 9.5t22.5 -9.5t9.5 -22.5t-9.5 -22.5t-22.5 -9.5t-22 9.5t-9 22.5z
@@ -61,19 +81,40 @@ q2 2 3 4q6 6 15 10q6 3 12 4q9 2 14 2q5 1 14 0q15 -1 30 -6l5 3q9 6 10 6q8 6 9 7l3
 t1 12.5t3.5 18t9.5 21t16 21l2 2q5 6 9.5 14.5t8 17.5t5.5 19t2 18q0 44 -31.5 75.5t-76.5 31.5h-2q-29 0 -54 -14.5t-39.5 -39t-14.5 -53.5q0 -17 7.5 -37t17.5 -33l2 -1q17 -19 24.5 -38.5t6.5 -29.5zM226 240q-15 -12 -25.5 -34t-10.5 -47q-1 -44 3 -105q35 -5 35 -18
 q0 -8 -17 -15.5t-40 -7.5t-40 7.5t-17 15.5q0 13 35 18q4 61 3 105q-1 25 -11 47t-25 34q-25 21 -24 50q0 29 23 48.5t56 19.5q21 0 39.5 -9t29 -24.5t10.5 -34.5q1 -29 -24 -50zM226 240q-15 -12 -25.5 -34t-10.5 -47q-1 -44 3 -105q35 -5 35 -18q0 -8 -17 -15.5t-40 -7.5
 t-40 7.5t-17 15.5q0 13 35 18q4 61 3 105q-1 25 -11 47t-25 34q-25 21 -24 50q0 29 23 48.5t56 19.5q21 0 39.5 -9t29 -24.5t10.5 -34.5q1 -29 -24 -50z" />
+    <glyph glyph-name="cluster_role_binding" unicode="cluster_role_binding" horiz-adv-x="448" 
+d="M64 235h107v-43h-107v43zM140 -21h-97q-18 0 -30.5 12.5t-12.5 29.5v299q0 18 12.5 30.5t30.5 12.5h89q3 8 9.5 16t14.5 14t17.5 9t18.5 3q19 0 36.5 -12.5t23.5 -29.5h89q18 0 30.5 -12.5t12.5 -30.5v-130q-11 2 -21 2h-22v64h-298v-85h121q-25 -17 -40 -43h-81v-85h66
+q6 -37 31 -64zM171 341.5q0 -8.5 6 -15t15 -6.5t15 6.5t6 15t-6 15t-15 6.5t-15 -6.5t-6 -15zM320 213.5q0 -8.5 -6.5 -15t-15 -6.5t-15 6.5t-6.5 15t6.5 15t15 6.5t15 -6.5t6.5 -15zM64 64v43h50q-7 -21 -7 -43h-43zM256 213.5q0 -8.5 -6.5 -15t-15 -6.5t-15 6.5t-6.5 15
+t6.5 15t15 6.5t15 -6.5t6.5 -15zM277 21v-42h-42q-36 0 -61 25t-25 60t25 60t61 25h42v-42h-42q-18 0 -30.5 -12.5t-12.5 -30.5t12.5 -30.5t30.5 -12.5h42zM448 64q0 -35 -25 -60t-60 -25h-43v42h43q17 0 29.5 12.5t12.5 30.5t-12.5 30.5t-29.5 12.5h-43v42h43
+q23 0 42.5 -11.5t31 -31t11.5 -42.5zM341 43h-85v42h85v-42z" />
+    <glyph glyph-name="cluster_role" unicode="cluster_role" horiz-adv-x="384" 
+d="M341 363q9 0 17 -3.5t13.5 -9.5t9 -13.5t3.5 -16.5v-299q0 -17 -12.5 -29.5t-30.5 -12.5h-298q-18 0 -30.5 12.5t-12.5 29.5v299q0 18 12.5 30.5t30.5 12.5h89q6 17 23.5 29.5t36.5 12.5t36.5 -12.5t23.5 -29.5h89zM192 363q-9 0 -15 -6.5t-6 -15t6 -15t15 -6.5t15 6.5
+t6 14.5q0 6 -2.5 11t-7.5 8t-11 3zM341 43v85h-298v-85h298zM341 171v85h-298v-85h298zM277 213q0 9 6.5 15.5t15.5 6.5t15 -6.5t6 -15.5t-6 -15t-15 -6q-6 0 -11 3t-8 8t-3 10zM213 213q0 9 6.5 15.5t15.5 6.5t15 -6.5t6 -15.5t-6 -15t-15 -6q-6 0 -11 3t-8 8t-3 10z
+M213 85q0 9 6.5 15.5t15.5 6.5t15 -6.5t6 -15.5t-6 -15t-15 -6t-15.5 6t-6.5 15zM277 85q0 9 6.5 15.5t15.5 6.5t15 -6.5t6 -15.5t-6 -15t-15 -6t-15.5 6t-6.5 15zM64 192v43h107v-43h-107zM64 64v43h107v-43h-107z" />
     <glyph glyph-name="cog" unicode="cog" horiz-adv-x="494" 
 d="M458 143q13 -23 36 -36l-51 -87q-35 20 -74 9.5t-59 -44.5q-13 -23 -13 -49h-101q0 40 -28.5 68.5t-68.5 28.5q-26 0 -49 -13l-50 88q35 20 45.5 59t-9.5 74q-13 22 -36 35l50 88q35 -21 74.5 -10.5t59.5 45.5q13 23 13 49h100q0 -27 13 -49.5t35.5 -35.5t49 -13t49.5 13
 l50 -87q-35 -20 -45.5 -59t9.5 -74zM247 88q43 0 73.5 30.5t30.5 73.5t-30.5 73.5t-73.5 30.5t-73.5 -30.5t-30.5 -73.5t30.5 -73.5t73.5 -30.5z" />
     <glyph glyph-name="collocation" unicode="collocation" horiz-adv-x="427" 
 d="M384 405q18 0 30.5 -12.5t12.5 -29.5v-342q0 -17 -12.5 -29.5t-30.5 -12.5h-341q-18 0 -30.5 12.5t-12.5 29.5v342q0 17 12.5 29.5t30.5 12.5h341zM384 21v342h-341v-342h341zM118 64h1q-22 0 -38 15.5t-16 37.5t16 38t38 16l50 87q-9 14 -9 30q0 22 15.5 37.5t38 15.5
 t38 -15.5t15.5 -37.5q0 -16 -9 -30l51 -87h1q22 0 38 -16t16 -38t-16 -37.5t-38 -15.5q-11 0 -22.5 5.5t-19.5 15.5t-10 22h-87q-4 -18 -19.5 -30.5t-33.5 -12.5zM185 243l-44 -78q10 -4 18.5 -15t11.5 -22h86q3 11 11.5 22t18.5 15l-45 78q-13 -8 -28.5 -8t-28.5 8z" />
+    <glyph glyph-name="config_map" unicode="config_map" horiz-adv-x="466" 
+d="M206 163q2 -1 2 -4q0 -1 -1 -2l-21 -37q-2 -3 -5 -3h-2l-26 11q-9 -6 -18 -10l-4 -29q-1 -4 -6 -4h-42q-5 0 -6 4l-4 29q-10 3 -18 10l-26 -11h-2q-3 0 -5 3l-21 37q-1 1 -1 2q0 3 2 4l23 18q-1 5 -1 10.5t1 10.5l-23 18q-2 1 -2 4q0 1 1 3l21 36q2 3 5 3h2l26 -11
+q9 6 18 11l4 28q1 4 6 4h42q5 0 5 -4l4 -28q10 -4 19 -11l26 11h2q3 0 5 -3l21 -36q1 -2 1 -3q0 -3 -2 -4l-23 -18q1 -5 1 -10q0 -6 -1 -11zM104 160v0q13 0 22.5 9t9.5 22.5t-9.5 23t-22.5 9.5t-22.5 -9.5t-9.5 -23t9.5 -22.5t22.5 -9zM402 448l64 -64v-128
+q0 -9 -6.5 -15.5t-15.5 -6.5h-128q-6 0 -10.5 3t-7.5 8t-3 11v85h-170v-21h-43v64h213v42q0 9 6.5 15.5t14.5 6.5h86zM391 373h59l-59 59v-59zM402 149l64 -64v-128q0 -9 -6.5 -15t-15.5 -6h-128q-9 0 -15 6t-6 15v43h-213v64h43v-22h170v86q0 9 6.5 15t14.5 6h86zM391 74
+h59l-59 59v-59z" />
     <glyph glyph-name="configuration_file" unicode="configuration_file" horiz-adv-x="341" 
-d="M139 146q12 0 20.5 -8t8.5 -20t-8.5 -20.5t-20.5 -8.5t-20.5 8.5t-8.5 20t8.5 20t20.5 8.5zM213 405l128 -128v-256q0 -17 -12.5 -29.5t-29.5 -12.5h-256q-18 0 -30.5 12.5t-12.5 29.5v342q0 17 12.5 29.5t30.5 12.5h170zM232 85q1 2 1 4t-2 3l-21 16v9v5v5l21 16
-q2 1 2 2.5t-2 3.5l-19 33q-1 2 -4 2h-1l-24 -9q-8 5 -17 9l-3 25q-1 4 -5 4h-38q-4 0 -5 -3l-4 -25q-9 -4 -16 -10l-24 10h-2q-3 0 -4 -2l-19 -34q-1 -1 -1 -3t2 -4l21 -16v-9v-9l-21 -16q-2 -2 -2 -4t1 -3l19 -32q1 -3 4 -3q1 0 2 1l24 9q7 -6 16 -9l4 -25q0 -4 5 -4h39
-q4 0 5 4l3 25q9 4 16 9l24 -9q1 -1 2 -1q3 0 4 3zM192 256h117l-117 117v-117z" />
-    <glyph glyph-name="constraint" unicode="constraint" horiz-adv-x="426" 
-d="M426 342l-426 -2v43l426 1v-42zM426 256l-426 -1v43l426 1v-43zM234 171l-234 -1v42l234 2v-43zM234 86l-234 -2v43l234 1v-42zM234 0l-234 -1v43l234 1v-43zM405 128q8 -1 14.5 -7t6.5 -14v-86q0 -8 -6.5 -14t-14.5 -7h-107q-8 1 -14.5 7t-6.5 14v86q0 8 6.5 14t14.5 7
-v32q0 14 7.5 26.5t19.5 19.5t27 7q22 0 37.5 -15.5t15.5 -37.5v-32zM384 128v32q0 13 -9.5 22.5t-23 9.5t-22.5 -9.5t-9 -22.5v-32h64z" />
+d="M139 146q12 0 20.5 -8.5t8.5 -20t-8.5 -20t-20.5 -8.5t-20.5 8.5t-8.5 20t8.5 20t20.5 8.5zM213 405l128 -128v-256q0 -17 -12.5 -29.5t-29.5 -13.5h-257q-17 1 -29.5 13t-12.5 30v341v1q0 17 12.5 29.5t30.5 12.5h170zM232 86v2q0 3 -1 4l-21 16q1 5 1 10t-1 9l20 16
+q2 1 2 4v2l-20 33q-1 3 -4 3q-1 0 -2 -1l-23 -9q-8 6 -17 9l-3 25q-1 5 -5 5h-38q-4 -1 -5 -5l-4 -25q-9 -4 -16 -9l-24 9q-1 1 -2 1q-2 0 -4 -3l-19 -33q-1 -1 -1 -2q0 -3 2 -4l20 -16v-9.5v-9.5l-20 -16q-2 -1 -2 -4q0 -1 1 -2l19 -33q2 -3 4 -3q1 0 2 1l24 9q7 -6 16 -9
+l4 -25q0 -4 5 -4h38q4 0 5 4l3 25q9 4 17 9l24 -9q0 -1 1 -1q3 0 5 3zM192 256h117l-117 117v-117z" />
+    <glyph glyph-name="constraint" unicode="constraint" horiz-adv-x="427" 
+d="M405 128q9 -1 15 -7t7 -14v-86q-1 -8 -7 -14t-15 -7h-106q-4 0 -8 2t-7 5t-4.5 6.5t-2.5 7.5v86q1 8 7 14t15 7v32q0 22 15.5 37.5t37.5 15.5t37.5 -15.5t15.5 -37.5v-32zM384 128v32q0 13 -9.5 22.5t-22.5 9.5t-22.5 -9.5t-9.5 -22.5v-32h64zM427 341h-427v43h427v-43z
+M427 256h-427v43h427v-43zM235 171h-235v42h235v-42zM235 85h-235v43h235v-43zM235 0h-235v43h235v-43z" />
+    <glyph glyph-name="container" unicode="container" horiz-adv-x="427" 
+d="M384 235q18 0 30.5 -12.5t12.5 -30.5v-171q0 -17 -12.5 -29.5t-30.5 -12.5h-341q-18 0 -30.5 12.5t-12.5 29.5v171q0 18 12.5 30.5t30.5 12.5h32l113 73q-17 13 -17 34h21v-1q0 -8 6 -14.5t15 -6.5t15 6.5t6 15t-6 15t-15 6.5v42h22v-27q9 -5 15 -15.5t6 -20.5
+q0 -21 -17 -34l113 -73h32zM213 299l-99 -64h199l-99 64h-1zM107 64v85q0 9 -6.5 15.5t-15.5 6.5q-5 0 -10 -3t-8 -8t-3 -11v-85q0 -9 6.5 -15t14.5 -6q6 0 11 2.5t8 7.5t3 11zM192 64v85q0 9 -6 15.5t-15 6.5t-15 -6.5t-6 -15.5v-85q0 -9 6 -15t15 -6t15 6t6 15zM278 64v85
+q0 9 -6.5 15.5t-15.5 6.5t-15 -6.5t-6 -15.5v-85q0 -9 6 -15t15 -6t15.5 6t6.5 15zM363 64v85q0 9 -6 15.5t-15 6.5t-15 -6.5t-6 -15.5v-85q0 -9 6 -15t15 -6t15 6t6 15z" />
+    <glyph glyph-name="content_lifecycle_management" unicode="content_lifecycle_management" horiz-adv-x="427" 
+d="M85 256v43h171v-43h-171zM85 171v42h256v-42h-256zM85 85v43h64v-43h-64zM256 384l-64 -64v43h-149v-342h85v-42h-85q-18 0 -30.5 12.5t-12.5 29.5v342q0 17 12.5 29.5t30.5 12.5h149v43zM171 0l64 64v-43h149v342h-85v42h85q18 0 30.5 -12.5t12.5 -29.5v-342
+q0 -17 -12.5 -29.5t-30.5 -12.5h-149v-43z" />
     <glyph glyph-name="counting" unicode="counting" 
 d="M43 -21v426h42v-426h-42zM43 363h426v-43h-426v43zM427 -21v426h42v-426h-42zM128 341q0 18 12.5 30.5t30 12.5t30 -12.5t12.5 -30t-12.5 -30t-29.5 -12.5q-9 0 -17 3t-13.5 9t-9 14t-3.5 16zM43 235h426v-43h-426v43zM171 213.5q0 17.5 12.5 30t30 12.5t30 -12.5
 t12.5 -30t-12.5 -30t-30 -12.5t-30 12.5t-12.5 30zM299 213.5q0 17.5 12.5 30t30 12.5t30 -12.5t12.5 -30t-12.5 -30t-30 -12.5t-30 12.5t-12.5 30zM43 107h426v-43h-426v43zM0 0h512v-43h-512v43zM128 85q0 18 12.5 30.5t30 12.5t30 -12.5t12.5 -30t-12.5 -30t-29.5 -12.5
@@ -85,14 +126,38 @@ M0 213h64v-21h-64v21zM0 256h64v-21h-64v21zM0 171h64v-22h-64v22zM0 299h64v-22h-64
     <glyph glyph-name="critical_bug" unicode="critical_bug" horiz-adv-x="341" 
 d="M341 277v-42h-44q2 -11 2 -22v-21h42v-43h-42v-21q0 -11 -2 -21h44v-43h-59q-10 -17 -28.5 -32t-40.5 -23.5t-42 -8.5t-42 8.5t-40.5 23.5t-28.5 32h-60v43h45q-2 10 -2 21v21h-43v43h43v21q0 11 2 22h-45v42h60q15 26 39 43l-35 34l30 30l47 -46q14 3 30 3v0q15 0 30 -3
 l46 46l30 -30l-34 -34q24 -17 39 -43h59zM192 64v43h-43v-43h43zM192 149v128h-43v-128h43z" />
+    <glyph glyph-name="cronjob" unicode="cronjob" horiz-adv-x="448" 
+d="M192 384v42h128v-42h-128zM406 290q17 -22 29.5 -57t12.5 -63q0 -79 -56.5 -135.5t-135.5 -56.5t-135.5 56.5t-56.5 135.5h-64l85 86l86 -86h-64q0 -62 43.5 -105.5t105.5 -43.5q26 0 57 13t49 31l-106 106v149q-20 -1 -45.5 -9t-41.5 -19l-30 31q21 16 55.5 27.5
+t61.5 11.5q28 0 63 -12t57 -30l30 31l31 -30z" />
+    <glyph glyph-name="csv_file" unicode="csv_file" horiz-adv-x="448" 
+d="M298 20l43 1v-43h-299q-17 0 -29.5 12.5t-12.5 30.5v341q0 18 12.5 30.5t30.5 12.5h170l43 -42l42 -42l43 -44v-42h-43v21h-107v107h-149v-343h256zM411 64h-32l-38 128h32l22 -73l21 73h32zM171 192q8 0 14.5 -6.5t6.5 -15.5v-21h-32v11h-43v-64h43v10h32v-21
+q0 -9 -6.5 -15t-14.5 -6h-64q-9 0 -15.5 6t-6.5 15v85q0 9 6.5 15.5t15.5 6.5h64zM320 160h-75v-16h54q8 0 14.5 -6.5t6.5 -15.5v-37q0 -9 -6.5 -15t-14.5 -6h-86v32h75v16h-53q-9 0 -15.5 6t-6.5 15v37q0 9 6.5 15.5t15.5 6.5h85v-32z" />
+    <glyph glyph-name="daemon_set" unicode="daemon_set" horiz-adv-x="469" 
+d="M43 -21q-18 0 -30.5 12.5t-12.5 29.5v299h43v-299h341v-42h-341zM322 235q-4 0 -7 1q-12 5 -12 18q0 8 5.5 13.5t13.5 5.5t13.5 -5.5t5.5 -13.5q0 -5 -2.5 -9.5t-7 -7t-9.5 -2.5zM212 196h131q-8 -20 -26 -32q-18 -13 -40 -13t-40 13q-17 12 -25 32zM232 235q-3 0 -7 1
+q-12 5 -12 18q0 8 5.5 13.5t13.5 5.5t14 -5.5t6 -13.5t-6 -13.5t-14 -5.5zM469 361v-253q0 -9 -3.5 -17t-9.5 -14t-14 -9.5t-17 -3.5h-296q-18 0 -31 13t-13 31v253q0 19 13 31.5t31 12.5h296q18 0 31 -12.5t13 -31.5zM383 268q0 2 1 3t1.5 2.5t1.5 3t1 3.5q4 11 4 23
+q0 13 -5 26q-5 11 -14 20t-22 14v0v0q4 -7 6 -13q4 -11 4 -22q0 -12 -4 -23v0v0q-8 8 -17 14q-29 18 -63 18t-62 -18q-9 -6 -17 -14v0v0q-3 8 -4 15v7v8q1 8 3.5 14.5t6.5 13.5v0v0q-13 -5 -22 -14q-19 -18 -20 -44v-3q0 -11 4 -22q1 -2 1.5 -3.5l1 -3t1.5 -2.5t2 -3
+q-3 -5 -4 -11q-6 -17 -6 -35q0 -48 34 -81.5t81.5 -33.5t81 33.5t33.5 81.5q0 18 -5 35q-2 6 -4 11z" />
+    <glyph glyph-name="daemon" unicode="daemon" horiz-adv-x="384" 
+d="M368 248q16 -37 16 -77q0 -80 -56.5 -136t-135.5 -56t-135.5 56t-56.5 136q0 40 16 77q-2 5 -4.5 9.5t-4.5 9.5q-7 18 -7 38q0 30 20.5 59.5t48.5 40.5h1q-13 -21 -16 -45q-1 -7 -1 -13q0 -19 6 -37h1q26 25 59 39q35 14 73 14t73 -14q33 -14 59 -39h1q7 18 7 38
+q0 31 -17 57h1q11 -4 23 -13t21.5 -20.5t14.5 -22.5q9 -21 9 -44q0 -20 -7 -38q-2 -5 -4.5 -9.5t-4.5 -9.5zM266.5 256q-13.5 0 -22.5 -9t-9 -22.5t9 -23t22.5 -9.5t23 9.5t9.5 23t-9.5 22.5t-23 9zM117 256v0q-13 0 -22.5 -9t-9.5 -22.5t9.5 -23t23 -9.5t22.5 9.5t9 23
+t-9 22.5t-23 9zM192 53q37 0 67 21q12 8 24.5 24t17.5 30h-218q5 -14 17.5 -30t24.5 -24q30 -21 67 -21z" />
     <glyph glyph-name="database" unicode="database" 
 d="M256 448q106 0 181 -23.5t75 -56.5v-64q0 -33 -75 -56.5t-181 -23.5t-181 23.5t-75 56.5v64q0 33 75 56.5t181 23.5zM256 176q106 0 181 23.5t75 56.5v-96q0 -33 -75 -56.5t-181 -23.5t-181 23.5t-75 56.5v96q0 -33 75 -56.5t181 -23.5zM256 32q106 0 181 23.5t75 56.5
 v-96q0 -33 -75 -56.5t-181 -23.5t-181 23.5t-75 56.5v96q0 -33 75 -56.5t181 -23.5z" />
+    <glyph glyph-name="deploy" unicode="deploy" 
+d="M512 21v-43h-512v43h85v21q-17 0 -29.5 12.5t-12.5 30.5v213q0 12 5.5 21.5t15.5 15.5t21 6h43v-43h-43v-213h342v213h-43v43h43q17 0 29.5 -12.5t12.5 -30.5v-213q0 -18 -12.5 -30.5t-29.5 -12.5v-21h85zM320 149h-43v-43h-42v43h-43l64 64zM341 319.5
+q0 -35.5 -25 -60.5t-60 -25t-60 25t-25 60.5t25 60.5t60 25t60 -25t25 -60.5zM247 256v12q-7 0 -12 5t-5 12v9l-37 37q-1 -6 -1 -12q0 -23 16 -41.5t39 -21.5zM304 278q16 18 16 42q0 17 -11.5 34t-27.5 24q0 -4 -2.5 -7.5t-6 -6t-8.5 -2.5h-17v-17q0 -8 -8 -8h-17v-18h51
+q8 0 8 -8v-26h9q9 0 14 -7z" />
     <glyph glyph-name="disk" unicode="disk" horiz-adv-x="427" 
 d="M352 54q22 -25 2 -45q-17 -17 -36 -4q-10 7 -15 18q-14 36 -36 95q-5 13 4.5 18t17.5 -6q5 -6 63 -76zM427 448v-512h-427v512h427zM384 405h-341v-426h21v32q0 4 3 7t7.5 3t7.5 -3t3 -7v-32h22v32q0 3 1.5 5t3.5 3.5t5 1.5q5 0 8 -3t3 -7v-32h21v32q0 4 3.5 7t7.5 3
 t7.5 -3t3.5 -7v-32h213v426zM213 256q6 0 11 -3t8 -8t3 -10q0 -9 -6.5 -15.5t-15.5 -6.5q-4 0 -8 2t-7 4.5t-4.5 6.5t-1.5 9q0 8 6.5 14.5t14.5 6.5zM213 384q62 0 106 -43.5t44 -105.5q0 -63 -45 -107q-9 11 -12 15q-12 16 -30 16q-16 0 -26 -14q-10 -15 -3 -34l8 -20
 q-21 -6 -42 -6q-62 0 -105.5 44t-43.5 106t43.5 105.5t105.5 43.5zM159.5 323.5q20.5 12.5 45.5 13.5l2 17q-30 -1 -55.5 -16.5t-40.5 -41.5l16 -6q12 21 32.5 33.5zM177 295q10 6 22 9l3 17q-18 -2 -33.5 -11.5t-25.5 -24.5l16 -6q8 10 18 16zM256 235q0 11 -5.5 21
 t-15.5 15.5t-22 5.5q-17 0 -29.5 -12.5t-12.5 -30t12.5 -30t30 -12.5t30 12.5t12.5 30.5z" />
+    <glyph glyph-name="dns" unicode="dns" horiz-adv-x="469" 
+d="M75 11v64h42v-64h-42zM427 149q17 0 29.5 -12.5t12.5 -29.5v-128q0 -18 -12.5 -30.5t-29.5 -12.5h-384q-18 0 -30.5 12.5t-12.5 30.5v128q0 17 12.5 29.5t30.5 12.5h384zM149 11v64q0 13 -9 22.5t-22 9.5h-1h-74v-128h74h1q13 0 22 9t9 22v1zM288 -21v128h-27v-75l-53 75
+h-27v-128h27v74l54 -74h26zM427 74v33h-86q-8 0 -14.5 -6.5t-6.5 -15.5v-37q0 -9 6.5 -15.5t14.5 -6.5h54v-15h-75v-32h85q9 0 15.5 6t6.5 15v37q0 9 -6.5 15t-15.5 6h-53v16h75zM70 192h-44q-5 21 -5 43q0 88 62.5 150.5t151 62.5t151 -62.5t62.5 -150.5q0 -22 -4 -43h-44
+q5 21 5 43q0 21 -5 42h-72q2 -21 3 -42q-1 -22 -3 -43h-43q3 21 3 43q0 21 -3 42h-100q-3 -21 -4 -42q1 -22 4 -43h-43q-3 21 -3 43q0 21 3 42h-72q-6 -21 -6 -42q0 -22 6 -43zM382 320q-13 23 -40 45t-52 31q19 -36 29 -76h63zM235 404q-27 -39 -41 -84h81q-13 45 -40 84z
+M179 396q-25 -9 -52 -31t-40 -45h63q10 40 29 76z" />
     <glyph glyph-name="docker" unicode="docker" 
 d="M103 79q11 0 19.5 8t8.5 19t-8 18.5t-20 7.5t-20 -7.5t-8 -18.5t8.5 -19t19.5 -8zM444 224h1q34 9 61 -7l6 -4l-4 -7q-19 -38 -75 -35q-34 -82 -103 -122.5t-161 -40.5q-105 0 -151 77v1l-5 9q-16 36 -12 76l1 8h342q20 0 36 5q3 1 9 4l8 4q-9 13 -11 33q-3 31 13 49l5 7
 l7 -6q29 -22 33 -51zM274 245v0v-52h-52v52h52zM274 310v-52h-52v52h52zM274 376v-52h-52v52h52zM337 245v0v-52h-52v52h52zM145 245v0v-52h-52v52h52zM210 245v0v-52h-52v52h52zM81 245h1v-52h-52v52h51zM210 310v0v-52h-52v52h52zM145 310v0v-52h-51v52h51z" />
@@ -102,9 +167,11 @@ d="M384 170h-256v-106h21v-85h-85v85h21v106h-85v43h256v107h-21v85h85v-85h-21v-107
 d="M0 343l27 27l357 -357l-27 -27l-185 184h-31v-106h21v-85h-85v85h21v106h-85v43h117zM312 213h85v-43h-116l-42 43h30v107h-21v85h85v-85h-21v-107z" />
     <glyph glyph-name="endpoints" unicode="endpoints" horiz-adv-x="384" 
 d="M0 171v43h43v-43h-43zM85 85v43h42v-43h-42zM85 171v43h42v-43h-42zM170 171v43h43v-43h-43zM256 171v43h42v-43h-42zM341 171v43h43v-43h-43zM256 256v42h42v-42h-42zM63 -21v85h86v-85h-86zM234 320v85h86v-85h-86z" />
+    <glyph glyph-name="enhancement" unicode="enhancement" horiz-adv-x="426" 
+d="M0 -22v172h85v-172h-85zM149 -22v256h86v-256h-86zM426 320h-42v-342h-86v342h-42l85 85z" />
     <glyph glyph-name="file_system" unicode="file_system" horiz-adv-x="384" 
-d="M235 171q-6 0 -11 2.5t-8 7.5t-3 11v21h-106v-149h106v21q0 9 6.5 15.5t15.5 6.5h42l22 -22h64q8 0 14.5 -6t6.5 -15v-64q0 -9 -6.5 -15t-14.5 -6h-128q-9 0 -15.5 6t-6.5 15v21h-149v278h-43q-8 0 -14.5 6t-6.5 15v85q0 9 6.5 15.5t14.5 6.5h43l21 -22h64q9 0 15.5 -6
-t6.5 -15v-64q0 -9 -6.5 -15t-15.5 -6h-42v-43h106v21q0 9 6.5 15.5t15.5 6.5h42l22 -22h64q8 0 14.5 -6t6.5 -15v-64q0 -9 -6.5 -15t-14.5 -6h-128z" />
+d="M235 171q-9 0 -15.5 6t-6.5 15v21h-106v-149h106v21q0 9 6.5 15.5t15.5 6.5h42l22 -22h64q8 0 14.5 -6t6.5 -15v-64q0 -9 -6.5 -15t-14.5 -6h-128q-6 0 -11 2.5t-8 7.5t-3 11v21h-149v278h-43q-8 0 -14.5 6t-6.5 15v85q0 9 6.5 15.5t14.5 6.5h43l21 -22h64q4 0 7 -1t6 -3
+t5 -4.5t3 -6t1 -6.5v-64q0 -9 -6.5 -15t-15.5 -6h-42v-43h106v21q0 9 6.5 15.5t15.5 6.5h42l22 -22h64q8 0 14.5 -6t6.5 -15v-64q0 -9 -6.5 -15t-14.5 -6h-128z" />
     <glyph glyph-name="git_branch" unicode="git_branch" horiz-adv-x="320" 
 d="M320 288q0 -36 -33 -55h1q-3 -60 -40 -97q-38 -38 -88 -40q-18 0 -30 -5q-2 -1 -6 -4.5l-8 -7t-5 -3.5q17 -19 17 -44q0 -27 -18.5 -45.5t-45.5 -18.5t-45.5 18.5t-18.5 45.5q0 36 32 55v210q-9 5 -16 14t-11.5 20t-4.5 21q0 27 18.5 45.5t45 18.5t45.5 -18.5t19 -45.5
 q0 -15 -9.5 -31t-22.5 -24v-152q24 13 64 14q25 1 44 20t20 44v10q-13 8 -22.5 24t-9.5 31q0 27 18.5 45.5t45.5 18.5t45.5 -18.5t18.5 -45.5zM64 390q-16 0 -27 -11t-11 -27t11 -27t27 -11t27 11t11 27t-11 27t-27 11zM64 -7q16 0 27 11.5t11 27.5q0 10 -5 19t-14 14t-19 5
@@ -134,6 +201,25 @@ l-11 -33l-18 -48h-13l-18 48l-11 33h-1l2 -12t1 -13q1 -10 1 -14q1 -6 1 -12v-41h-32
     <glyph glyph-name="image" unicode="image" horiz-adv-x="320" 
 d="M277 384l43 21v-384q0 -17 -12.5 -29.5t-30.5 -12.5h-234q-18 0 -30.5 12.5t-12.5 29.5v320q0 18 12.5 30.5t30.5 12.5h234zM43 320v-43h170v43h-170zM128 21v43h-43v-43h43zM128 149v-42h85v42h-85zM277 21v43h-128v-43h128zM277 107v42h-42v-42h42zM277 192v43h-106
 v-43h106zM277 277v43h-42v-43h42z" />
+    <glyph glyph-name="inbound" unicode="inbound" horiz-adv-x="427" 
+d="M384 405q18 0 30.5 -12.5t12.5 -29.5v-214h-43v171l-171 -107l-170 107v-213h170v-43h-170q-18 0 -30.5 12.5t-12.5 30.5v256q0 17 12.5 29.5t30.5 12.5h341zM213 256l171 107h-341zM341 171v-64h86v-43h-86v-64l-85 85z" />
+    <glyph glyph-name="ingress" unicode="ingress" horiz-adv-x="469" 
+d="M277 -64h-85v85h85v-85zM320 234h-64v-170h-43v170h-64l22 22l21 21l21 21l22 22l21 -22l21 -21l22 -21zM0 107v277q0 9 3 17q7 15 23 22q8 4 17 4h384q8 0 16 -4q16 -6 23 -22q3 -8 3 -17v-277q0 -9 -3 -17q-7 -16 -23 -23q-8 -3 -16 -3h-128v42h128v278h-384v-278h128
+v-42h-128q-9 0 -17 3q-16 7 -23 23q-3 8 -3 17z" />
+    <glyph glyph-name="ip" unicode="ip" horiz-adv-x="469" 
+d="M70 192h-44q-5 21 -5 43q0 88 62.5 150.5t151 62.5t151 -62.5t62.5 -150.5q0 -22 -4 -43h-44q5 21 5 43q0 21 -5 42h-72q2 -21 3 -42q-1 -22 -3 -43h-43q3 21 3 43q0 21 -3 42h-100q-3 -21 -4 -42q1 -22 4 -43h-43q-3 21 -3 43q0 21 3 42h-72q-6 -21 -6 -42q0 -22 6 -43z
+M382 320q-13 23 -40 45t-52 31q19 -36 29 -76h63zM235 404q-27 -39 -41 -84h81q-13 45 -40 84zM179 396q-25 -9 -52 -31t-40 -45h63q10 40 29 76zM251 53v22h42v-22h-42zM427 149q17 0 29.5 -12.5t12.5 -29.5v-128q0 -18 -12.5 -30.5t-29.5 -12.5h-384q-18 0 -30.5 12.5
+t-12.5 30.5v128q0 17 12.5 29.5t30.5 12.5h384zM176 -21v128h-32v-128h32zM325 53v22q0 13 -9 22.5t-22 9.5h-1h-74v-128h32v42h42h1q13 0 22 9.5t9 22.5z" />
+    <glyph glyph-name="job" unicode="job" horiz-adv-x="405" 
+d="M341 101q6 -3 11 -9.5t8 -13.5t3 -14q0 -18 -12.5 -30.5t-30.5 -12.5t-30.5 12.5t-12.5 30.5q0 10 6.5 21t15.5 16v112l-43 43h-149v-64h64v-85h-64v-64h48q5 8 16 14.5t21 6.5q18 0 30.5 -12.5t12.5 -30t-12.5 -30t-30.5 -12.5q-10 0 -21 6t-16 15h-91v43v64h-64v85h64
+v128h-64v85h171v-85h-64v-21h149l64 64l85 -86l-64 -64v-112zM21 341h128v43h-128v-43zM192 43q-9 0 -15 -6.5t-6 -15t6 -15t15 -6.5t15 6.5t6 14.5q0 6 -2.5 11t-7.5 8t-11 3zM149 171h-128v-43h128v43zM320 333l-55 -56l55 -55l55 55zM320 43q9 0 15 6t6 15t-6 15t-15 6
+t-15 -6t-6 -15t6 -15t15 -6z" />
+    <glyph glyph-name="kubelet" unicode="kubelet" 
+d="M60 128h-60l27 59l26 58l27 59l27 59h59l-26 -59l-27 -59l-27 -58zM171 406v-22h-64v22q0 4 1 8q6 13 20 13h47q-1 -3 -2 -5.5t-1.5 -5t-0.5 -5.5v-5zM107 85q0 -5 0.5 -11t2 -11t4 -10.5t5.5 -9.5h-34q-11 0 -21 5.5t-15.5 15.5t-5.5 21h16h16h16h16zM341 406v-22h-128
+v22q0 4 2 8q6 13 20 13h85q9 0 15 -6.5t6 -14.5zM326 107l-16 -16l-16 -16l-16 -16l-16 -16h-70q-18 0 -30.5 12.5t-12.5 29.5v22h177zM331 128h-224l26 59l27 58l27 59l26 59h128l16 -34l15 -34l16 -34l15 -34q-5 -2 -10.5 -5t-10.5 -6t-9.5 -6.5t-8.5 -7.5
+q-13 -13 -22.5 -34.5t-10.5 -39.5zM320 256q0 11 -5.5 21t-15.5 15.5t-21 5.5q-18 0 -30.5 -12.5t-12.5 -30t12.5 -30t30.5 -12.5q11 0 22.5 7.5t16.5 18.5q3 8 3 17zM320 -40q-1 -1 -3 -2t-3 -1h-1q-2 0 -4 1.5t-4 2.5l-6 7l-6 6l-6 6l-6 6q-2 1 -3 3t-1 4t1 4t3 4l24 24
+l24 24l25 25l24 24q-5 12 -5 24q0 7 2 14q2 10 7 19q10 19 30 29q10 5 20 7q6 1 12 1q5 0 9 -1q11 -1 20 -6l-11 -12l-12 -11l-11 -12l-12 -12l8 -8l8 -8l8 -8l8 -8l12 12l12 11l11 12l12 11q4 -9 5 -20q1 -5 1 -9q0 -6 -1 -12q-2 -10 -6 -20q-5 -10 -13 -18q-8 -7 -17 -12
+t-19 -7q-7 -1 -14 -1q-12 0 -24 4l-25 -24l-24 -24l-24 -24z" />
     <glyph glyph-name="kubernetes" unicode="kubernetes" horiz-adv-x="497" 
 d="M454 341l43 -186q2 -15 -7 -27l-120 -149q-10 -13 -26 -12h-191q-15 1 -26 12l-120 149q-9 12 -6 27l42 187q4 15 17 21l174 84q4 1 14 1q9 0 14 -3l174 -83q14 -7 18 -21zM427 162q-1 0 -1 1t-2 1h-7q-2 0 -3 1h-1q-10 1 -19 3q-3 1 -4 4v0l-5 1q3 24 -2 50
 q-6 25 -20 47l3 3v1q0 3 2 5q6 6 16 11q1 1 2 1.5l1 0.5l4 2t3 2h0.5t0.5 1v1q10 7 3 16q-3 4 -8 4q-4 0 -8 -3l-1 -1q-1 -1 -2 -1q-3 -3 -4 -5l-2 -2q-7 -8 -15 -13q-2 -1 -3 -1q-2 0 -2 1h-1l-4 -3q-3 2 -7.5 6.5l-7.5 7.5q-32 25 -74 29v5v-1q-2 1 -3 5q0 12 1 19v1
@@ -149,68 +235,166 @@ d="M460 46q27 -46 9 -78t-71 -32h-320q-53 0 -71 32t9 78l158 263v107h-16q-7 0 -11.
 d="M214 130q-11 0 -18 8q-36 35 -36 86t36 86l96 96q35 36 85.5 36t86.5 -35.5t36 -86.5t-36 -86l-44 -44q-7 -8 -18 -8t-18.5 7.5t-7.5 18.5t8 19l43 43q21 21 21 50t-20.5 49.5t-49.5 20.5t-50 -21l-96 -96q-20 -20 -20 -49t20 -50q8 -7 8 -18t-7.5 -18.5t-18.5 -7.5z
 M121.5 -58q-50.5 0 -86 35.5t-35.5 86.5t36 86l44 44q5 5 11.5 7t13 0t11.5 -7q8 -7 8 -18t-8 -19l-44 -44q-20 -20 -20 -49t20.5 -49.5t49.5 -20.5t49 20l96 96q21 21 21 50t-21 49q-7 8 -7 19t7.5 18.5t18.5 7.5t18 -8q36 -35 36 -86t-36 -86l-96 -96q-36 -36 -86.5 -36z
 " />
+    <glyph glyph-name="master" unicode="master" horiz-adv-x="427" 
+d="M43 21h341v-42h-341v42zM405.5 341q8.5 0 15 -6t6.5 -15t-6.5 -15t-15.5 -6h-1l-10 -117l-10 -118h-341l-10 118l-10 117h-0.5h-1.5q-8 0 -14.5 6t-6.5 15t6.5 15t15 6t15 -6t6.5 -15q0 -4 -1.5 -7t-3.5 -6l45 -36l45 -36l37 65l38 66q-5 3 -8 7.5t-3 10.5q0 9 6.5 15
+t15 6t15 -6t6.5 -15q0 -6 -3 -10.5t-8 -7.5l37 -66l38 -65l45 36l45 36q-2 3 -3.5 6t-1.5 7q0 9 6.5 15t15 6z" />
     <glyph glyph-name="meter" unicode="meter" 
 d="M256 416q106 0 181 -75t75 -181q0 -71 -36 -131t-96 -93h-248q-60 33 -96 93t-36 131q0 106 75 181t181 75zM401 15q60 60 60 145h-45v32h42q-5 34 -21 64h-53v32h32q-7 9 -15 17q-35 35 -81 50v-35h-32v43q-16 2 -32 2t-32 -2v-43h-32v35q-46 -15 -81 -50q-8 -8 -15 -17
 h32v-32h-53q-16 -30 -22 -64h43v-32h-45q0 -85 60 -145q8 -8 17 -15h96l18 256h28l18 -256h96q9 7 17 15z" />
     <glyph glyph-name="miscellaneous" unicode="miscellaneous" horiz-adv-x="384" 
-d="M320 171l21 -168v-3q0 -9 -6 -15t-15 -6h-256q-9 0 -15.5 6t-6.5 15v2l22 169h256zM0 192v42h384v-42h-384zM250 324q16 -10 30 -30t18 -38h-42q0 9 -6.5 15t-15 6t-15 -6t-6.5 -15h-43q0 9 -6 15t-15 6t-15 -6t-6 -15h-43q4 18 18.5 37.5t30.5 29.5q-6 20 -6 40v3
-q0 25 6 43t15 18q6 0 11 -8.5t7.5 -22.5t2.5 -30q0 -14 -2 -28q12 3 24 3t24 -3q-3 13 -3 27v1q0 25 6.5 43t15 18t15 -18t6.5 -42v-3q0 -21 -6 -40z" />
+d="M320 171l21 -168v-3q0 -9 -6 -15t-15 -6h-256q-9 0 -15 6t-6 15v3l21 168h256zM384 235v-43h-384v43h384zM250 324q16 -10 30 -30t19 -38h-43q0 9 -6.5 15t-15 6t-15 -6t-6.5 -15h-42q0 9 -6.5 15t-15 6t-15 -6t-6.5 -15h-43q5 18 19 38t30 30q-6 20 -6 40v2q0 25 6 43
+t15 18t15.5 -18t6.5 -43q0 -14 -3 -28q12 3 24 3t24 -3q-3 14 -3 28v0q0 25 6.5 43t15.5 18t15 -18t6 -43v-2q0 -20 -6 -40z" />
+    <glyph glyph-name="modified_date" unicode="modified_date" horiz-adv-x="427" 
+d="M384 384q12 0 21.5 -5.5t15.5 -15.5t6 -22v-341q0 -18 -12.5 -30.5t-30.5 -12.5h-341q-18 0 -30.5 12.5t-12.5 30.5v341q0 12 5.5 22t15.5 15.5t22 5.5h21v43h43v-43h213v43h43v-43h21zM118 0l201 201l-76 75l-200 -201v-75h75zM378 260q6 6 6 14.5t-6 13.5l-47 47
+q-6 6 -14 6t-14 -6l-40 -39l76 -75z" />
+    <glyph glyph-name="molecules" unicode="molecules" 
+d="M448 256q26 0 45 -19t19 -45t-19 -45t-45 -19q-4 0 -8 1l-31 -63q18 -19 18 -45t-19 -45t-45 -19q-19 0 -36.5 12.5t-23.5 30.5h-94q-6 -18 -23.5 -30.5t-36.5 -12.5q-26 0 -45 19t-19 45t18 45l-31 63q-4 -1 -8 -1q-26 0 -45 19t-19 45t19 45t45 19q4 0 8 -1l31 63
+q-18 19 -18 45t19 45t45 19q19 0 36.5 -12.5t23.5 -30.5h94q6 18 23.5 30.5t36.5 12.5q17 0 32 -8.5t23.5 -23.5t8.5 -32q0 -26 -18 -45l31 -63q4 1 8 1zM371 85l31 63q-18 18 -18 44t18 44l-32 63h-10q-18 0 -35 12.5t-22 29.5h-94q-6 -17 -23.5 -29.5t-36.5 -12.5h-7
+l-32 -63q18 -18 18 -44t-18 -44l32 -63h7q19 0 36.5 -12.5t23.5 -29.5h94q6 17 23.5 29.5t36.5 12.5h8z" />
+    <glyph glyph-name="move" unicode="move" horiz-adv-x="427" 
+d="M427 192l-85 -86v64h-107v-106h64l-85 -86l-86 86h64v106h-107l1 -64l-86 86l85 85v-64h107v107h-64l86 85l85 -85h-64v-107h107v64z" />
     <glyph glyph-name="multistate" unicode="multistate" horiz-adv-x="469" 
 d="M0 362.5q0 26.5 18.5 45.5t45.5 19q17 0 32 -8.5t23.5 -23.5t8.5 -32q0 -27 -18.5 -45.5t-45.5 -18.5t-45.5 18.5t-18.5 45zM64 128q-26 0 -45 19t-19 45t19 45t45 19t45 -19t19 -45t-19 -45t-45 -19zM64 235q-18 0 -30.5 -12.5t-12.5 -30.5t12.5 -30.5t30.5 -12.5
 t30.5 12.5t12.5 30.5t-12.5 30.5t-30.5 12.5zM234.5 -43q-26.5 0 -45 19t-18.5 45.5t18.5 45t45 18.5t45.5 -18.5t19 -45t-19 -45.5t-45.5 -19zM234.5 64q-17.5 0 -30 -12.5t-12.5 -30t12.5 -30t30 -12.5t30 12.5t12.5 30t-12.5 30t-30 12.5zM405.5 299q-26.5 0 -45.5 18.5
 t-19 45t19 45.5t45.5 19t45 -19t18.5 -45.5t-18.5 -45t-45 -18.5zM405.5 405q-17.5 0 -30 -12.5t-12.5 -30t12.5 -30t29.5 -12.5q12 0 22 5.5t15.5 15.5t5.5 22q0 17 -12.5 29.5t-30 12.5zM0 21q0 18 8.5 32.5t23.5 23t32 8.5q27 0 45.5 -18.5t18.5 -45t-18.5 -45.5
 t-45.5 -19t-45.5 19t-18.5 45zM171 362.5q0 26.5 18.5 45.5t45.5 19q17 0 32 -8.5t23.5 -23.5t8.5 -32q0 -27 -19 -45.5t-45.5 -18.5t-45 18.5t-18.5 45zM171 192q0 27 18.5 45.5t45 18.5t45.5 -18.5t19 -45.5t-19 -45.5t-45.5 -18.5t-45 18.5t-18.5 45.5zM341 192
 q0 27 19 45.5t45.5 18.5t45 -18.5t18.5 -45.5q0 -13 -5 -25t-13.5 -20.5t-20.5 -13.5t-25 -5q-26 0 -45 18.5t-19 45.5zM341 21.5q0 26.5 19 45t45.5 18.5t45 -18.5t18.5 -45t-18.5 -45.5t-45 -19t-45.5 19t-19 45.5z" />
+    <glyph glyph-name="namespace" unicode="namespace" horiz-adv-x="469" 
+d="M469 213v-42q-13 0 -17 -6t-4 -22v-96q0 -39 -21 -53.5t-64 -14.5v42h10t9 0.5t7 1t6.5 1.5t4 3t3.5 5t1.5 7.5t0.5 10.5v92v5q0 15 7 28t21 17q-14 4 -21 17t-7 28v5v92q0 6 -0.5 10.5t-1.5 7.5t-3.5 5t-4 3t-6.5 1.5t-7 1t-9 0.5h-10v42q43 0 64 -14.5t21 -53.5v-96
+q0 -16 4 -22t17 -6zM0 213q13 0 17 6t4 22v96q0 39 21 53.5t65 14.5v-42h-11t-9 -0.5t-7 -1t-6 -1.5t-4 -3t-3.5 -5t-1.5 -7.5t-1 -10.5v-92v-5q0 -15 -6 -28q-8 -13 -22 -17q14 -4 22 -17q6 -13 6 -28v-5v-92q0 -14 4 -20t9.5 -7t19.5 -2h3.5h3h3.5v-42q-44 0 -65 14.5
+t-21 53.5v96q0 16 -4 22t-17 6v42zM363 256v-128h-256v128h256zM149 213v-42h171v42h-171z" />
     <glyph glyph-name="network_file_system" unicode="network_file_system" horiz-adv-x="427" 
 d="M299 85v-21h128v-43h-128v-21h-171v21h-128v43h128v21h64v86h43v-86h64zM277 171h-192q-8 0 -14.5 6t-6.5 15v171q0 8 6.5 14.5t14.5 6.5h107l21 -21h128q9 0 15.5 -6.5t6.5 -15.5v-149q0 -9 -6.5 -15t-15.5 -6h-64z" />
+    <glyph glyph-name="network_policy" unicode="network_policy" 
+d="M235 426.5q0 8.5 6 15t15 6.5t15 -6.5t6 -15t-6 -15t-15 -6.5t-15 6.5t-6 15zM64 299q-9 0 -15 6t-6 15t6 15t15 6t15 -6t6 -15t-6 -15t-15 -6zM149.5 384q-8.5 0 -15 6.5t-6.5 15t6.5 15t15 6.5t15 -6.5t6.5 -15t-6.5 -15t-15 -6.5zM362.5 384q-8.5 0 -15 6.5t-6.5 15
+t6.5 15t15 6.5t15 -6.5t6.5 -15t-6.5 -15t-15 -6.5zM448 299q-9 0 -15 6t-6 15t6 15t15 6t15 -6t6 -15t-6 -15t-15 -6zM228 24q-59 10 -101 59t-42 109q0 46 23 85.5t62.5 62.5t85.5 23q43 0 87 -27t64 -65l-23 10l-27 -11q-20 26 -50 39q-1 -13 -11 -22.5t-23 -9.5h-34v-34
+q0 -7 -5 -12t-12 -5h-34v-34h25v-91q-8 10 -8 23v17l-75 74q-2 -11 -2 -23q0 -39 25.5 -74t61.5 -47q4 -24 13 -47zM149.5 0q8.5 0 15 -6.5t6.5 -15t-6.5 -15t-15 -6.5t-15 6.5t-6.5 15t6.5 15t15 6.5zM256 -21q9 0 15 -6.5t6 -15t-6 -15t-15 -6.5t-15 6.5t-6 14.5
+q0 6 2.5 11t7.5 8t11 3zM64 85q9 0 15 -6t6 -15t-6 -15t-15 -6t-15 6t-6 15t6 15t15 6zM21 213q6 0 11 -2.5t8 -7.5t3 -11q0 -9 -6.5 -15t-15 -6t-15 6t-6.5 15t6.5 15t14.5 6zM512 181v-82q-1 -35 -18.5 -69.5t-46.5 -59.5t-63 -34q-51 14 -88.5 61.5t-39.5 100.5v83
+l128 54z" />
     <glyph glyph-name="network_route" unicode="network_route" horiz-adv-x="427" 
 d="M427 15v-42h-128v-22h-171v22h-128v42h128v22h64v42h43v-42h149h-85v-22h128zM215 430q70 0 119.5 -49.5t49.5 -119.5t-49.5 -119.5t-119.5 -49.5q-46 0 -85 22.5t-61.5 61.5t-22.5 85q0 70 49.5 119.5t119.5 49.5zM332 329q-25 43 -73 60q15 -28 23 -60h50zM215 396
 q-22 -32 -32 -67h64q-11 35 -32 67zM84 227h57q-2 20 -2 34t2 34h-57q-4 -18 -4 -34t4 -34zM98 193q25 -44 73 -60q-15 28 -23 60h-50zM148 329q8 32 23 60q-48 -17 -73 -60h50zM215 126q21 31 32 67h-64q10 -36 32 -67zM255 227q2 20 2 34t-2 34h-80q-2 -20 -2 -34t2 -34
 h80zM259 133q48 16 73 60h-50q-8 -32 -23 -60zM289 227h57q4 18 4 34t-4 34h-57q2 -20 2 -34t-2 -34z" />
+    <glyph glyph-name="network" unicode="network" 
+d="M256 363q71 0 121 -50t50 -121t-50 -121t-121 -50t-121 50t-50 121t50 121t121 50zM128 192q0 -46 32.5 -83.5t78.5 -43.5v25q-14 0 -24 10t-10 24v17l-75 74q-2 -11 -2 -23zM324 124q19 0 29 -16q13 15 22 39.5t9 44.5q0 35 -22.5 69.5t-54.5 47.5q-1 -13 -11 -22.5
+t-23 -9.5h-34v-34q0 -7 -5 -12t-12 -5h-34v-34h102q7 0 12 -5t5 -12v-51h17zM277 426.5q0 -8.5 -6 -15t-15 -6.5t-15 6.5t-6 15t6 15t15 6.5t15 -6.5t6 -15zM384 405.5q0 -8.5 -6.5 -15t-15 -6.5t-15 6.5t-6.5 15t6.5 15t15 6.5t15 -6.5t6.5 -15zM469 320q0 -9 -6 -15
+t-15 -6t-15 6t-6 15t6 15t15 6t15 -6t6 -15zM512 192q0 -9 -6.5 -15t-15 -6t-15 6t-6.5 15t6.5 15t15.5 6q5 0 10 -2.5t8 -7.5t3 -11zM469 64q0 -9 -6 -15t-15 -6t-15 6t-6 15t6 15t15 6t15 -6t6 -15zM384 -21.5q0 -8.5 -6.5 -15t-15 -6.5t-15 6.5t-6.5 15t6.5 15t15 6.5
+t15 -6.5t6.5 -15zM277 -42.5q0 -8.5 -6 -15t-15 -6.5t-15 6.5t-6 14.5q0 6 2.5 11t7.5 8t11 3q9 0 15 -6.5t6 -15zM171 -21.5q0 -8.5 -6.5 -15t-15 -6.5t-15 6.5t-6.5 15t6.5 15t15 6.5t15 -6.5t6.5 -15zM85 64q0 -9 -6 -15t-15 -6t-15 6t-6 15t6 15t15 6t15 -6t6 -15z
+M43 192q0 -9 -6.5 -15t-15 -6t-15 6t-6.5 15t6.5 15t14.5 6q6 0 11 -2.5t8 -7.5t3 -11zM85 320q0 -9 -6 -15t-15 -6t-15 6t-6 15t6 15t15 6t15 -6t6 -15zM171 405.5q0 -8.5 -6.5 -15t-15 -6.5t-15 6.5t-6.5 15t6.5 15t15 6.5t15 -6.5t6.5 -15z" />
+    <glyph glyph-name="node" unicode="node" horiz-adv-x="384" 
+d="M171 384q0 9 6 15t15 6t15 -6t6 -15t-6 -15t-15 -6t-15 6t-6 15zM341 277q0 9 6.5 15.5t15.5 6.5t15 -6.5t6 -15.5t-6 -15t-15 -6t-15.5 6t-6.5 15zM341 107q0 9 6.5 15t15.5 6t15 -6t6 -15q0 -6 -3 -11t-8 -8t-10 -3q-9 0 -15.5 6.5t-6.5 15.5zM0 277q0 9 6 15.5t15 6.5
+t15.5 -6.5t6.5 -15.5t-6.5 -15t-15.5 -6t-15 6t-6 15zM0 107q0 9 6 15t15 6t15.5 -6t6.5 -15t-6.5 -15.5t-15.5 -6.5t-15 6.5t-6 15.5zM363 149h-1q-11 0 -21 -5.5t-15.5 -15.5t-5.5 -21q0 -17 11 -29l-102 -57q-9 16 -26 20v110q13 3 22.5 15t9.5 26q0 18 -12.5 30.5
+t-30.5 12.5t-30.5 -12.5t-12.5 -30.5q0 -14 9.5 -26t22.5 -15v-110q-17 -4 -26 -20l-102 57q11 12 11 29t-12.5 29.5t-29.5 12.5h-1v86h1q17 0 29.5 12.5t12.5 29.5t-11 29l102 57q5 -9 16 -15.5t21 -6.5t21 6.5t16 15.5l102 -57q-11 -12 -11 -29t12.5 -29.5t29.5 -12.5h1
+v-86zM171 0q0 9 6 15t15 6t15 -6t6 -15t-6 -15t-15 -6t-15 6t-6 15zM171 192q0 9 6 15t15 6t15 -6t6 -15t-6 -15t-15 -6t-15 6t-6 15z" />
+    <glyph glyph-name="organisms" unicode="organisms" horiz-adv-x="470" 
+d="M438 213q13 0 22.5 -9t9.5 -22.5t-9.5 -23t-22.5 -9.5q-4 0 -8 1l-32 -55q8 -9 8 -21q0 -8 -4.5 -15.5t-12 -11.5t-15.5 -4q-10 0 -18.5 6t-11.5 15h-47q-2 -6 -6.5 -11t-11 -7.5t-12.5 -2.5q-4 0 -7 1l-32 -56q7 -9 7 -20q0 -13 -9.5 -22.5t-22.5 -9.5q-9 0 -18 6
+t-12 15h-47q-3 -8 -11.5 -14.5t-18.5 -6.5q-13 0 -22.5 9.5t-9.5 22.5q0 11 7 20l-32 56q-3 -1 -7 -1q-13 0 -22.5 9t-9.5 22.5t9.5 23t22.5 9.5q4 0 7 -1l32 56q-7 8 -7 19.5t7 19.5l-32 56q-3 -1 -7 -1q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q4 0 7 -1l32 56
+q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5q6 0 12.5 -3t11 -8t6.5 -11h47q3 9 12 15.5t18 6.5q13 0 22.5 -9.5t9.5 -22.5q0 -11 -7 -20l32 -56q4 1 7 1q9 0 18 -6.5t12 -14.5h47q3 8 11.5 14.5t18.5 6.5q13 0 22.5 -9.5t9.5 -22.5q0 -11 -7 -20l32 -55h7zM374 107q3 0 6 -1l32 56
+q-6 8 -6 19t7 20l-32 56q-4 -1 -8 -1q-9 0 -17.5 6.5t-11.5 14.5h-47q-3 -8 -12 -14.5t-18 -6.5q-4 0 -7 1l-32 -56q7 -8 7 -20q0 -11 -7 -19l32 -56q4 1 7 1q9 0 18 -6.5t12 -15.5h47q3 9 11.5 15.5t18.5 6.5zM203 0q3 0 7 -1l32 56q-7 9 -7 20t7 19l-32 56q-4 -1 -7 -1
+q-10 0 -18.5 6.5t-11.5 15.5h-47q-3 -9 -11.5 -15.5t-18.5 -6.5q-3 0 -7 1l-32 -56q7 -8 7 -19t-7 -20l33 -56q3 1 6 1q10 0 18.5 -6.5t11.5 -14.5h47q2 5 6.5 10t11 8t12.5 3zM57 308q7 -9 7 -20t-7 -20l33 -55h6q10 0 18.5 -6t11.5 -15h47q3 9 12 15t18 6h7l32 55
+q-7 9 -7 20t7 20l-32 55h-7q-10 0 -18.5 6t-11.5 15h-47q-2 -6 -6.5 -11t-10.5 -7.5t-13 -2.5h-7z" />
     <glyph glyph-name="organization" unicode="organization" horiz-adv-x="428" 
 d="M385 214h11v-86h-43v43h-117v-43h-43v43h-118v-43h-43v86h12h31h118v42h43v-42h117h32zM161 352q0 22 15.5 37.5t37.5 15.5t38 -15.5t16 -37.5t-16 -38t-38 -16t-37.5 16t-15.5 38zM0 32q0 22 15.5 38t37.5 16t38 -16t16 -38t-16 -37.5t-38 -15.5t-37.5 15.5t-15.5 37.5z
 M161 32q0 22 15.5 38t37.5 16t38 -16t16 -38t-16 -37.5t-38 -15.5t-37.5 15.5t-15.5 37.5zM321 32q0 22 15.5 38t37.5 16t38 -16t16 -38t-16 -37.5t-38 -15.5t-37.5 15.5t-15.5 37.5z" />
+    <glyph glyph-name="outbound" unicode="outbound" horiz-adv-x="427" 
+d="M384 405q18 0 30.5 -12.5t12.5 -29.5v-192h-43v149l-171 -107l-170 107v-213h170v-43h-170q-18 0 -30.5 12.5t-12.5 30.5v256q0 17 12.5 29.5t30.5 12.5h341zM213 256l171 107h-341zM427 85l-86 -85v64h-85v43h85v64z" />
+    <glyph glyph-name="package_upgrade" unicode="package_upgrade" horiz-adv-x="427" 
+d="M336 144l-144 -144h-107q-17 0 -29.5 12.5t-12.5 30.5v234h-43v43h427v-43h-43v-181zM85 107v-43h107v43h-107zM427 10l-30 -30l-61 60l-60 -60l-30 30l90 90l31 -30z" />
+    <glyph glyph-name="package" unicode="package" horiz-adv-x="427" 
+d="M0 320h427v-43h-43v-234q0 -12 -5.5 -22t-15.5 -15.5t-22 -5.5h-256q-17 0 -29.5 12.5t-12.5 30.5v234h-43v43zM192 64v43h-107v-43h107z" />
     <glyph glyph-name="packages" unicode="packages" horiz-adv-x="427" 
 d="M385 320v-43h-267h-74v43h341zM342 405v-43h-201h-55v43h256zM0 235h427v-43h-43v-171q0 -17 -12.5 -29.5t-30.5 -12.5h-256q-17 0 -29.5 12.5t-12.5 29.5v171h-43v43zM192 43v42h-107v-42h107z" />
+    <glyph glyph-name="patch_fixes" unicode="patch_fixes" horiz-adv-x="341" 
+d="M224 49l41 -42q-18 -12 -45.5 -20t-48.5 -8q-71 0 -121 50t-50 120v1q0 44 20 99.5t49 89.5l-1 -8v-2q0 -32 23 -54.5t55 -22.5q30 0 51.5 22t21.5 52q0 3 -1 5q-2 52 -15 103q57 -45 97.5 -128.5t40.5 -156.5q0 -11 -2 -24t-6.5 -26t-10 -25.5t-11.5 -21.5l-41 41
+q7 17 7 35q0 36 -25 60.5t-60 24.5q-17 0 -33 -6l56 -56l-46 -46l-56 56q-6 -16 -6 -33q0 -35 25 -60t60 -25q16 0 32 6z" />
+    <glyph glyph-name="patterns" unicode="patterns" horiz-adv-x="470" 
+d="M0 362.5q0 26.5 18.5 45t45.5 18.5t45.5 -18.5t18.5 -45t-18.5 -45.5t-45.5 -19t-45.5 19t-18.5 45.5zM299 191q0 -12 -6 -24.5t-15.5 -22t-21.5 -13.5v-50q18 -7 30.5 -24.5t12.5 -36.5q0 -26 -19 -44.5t-45 -18.5q-19 0 -36.5 12.5t-23.5 29.5h-51q-6 -17 -23.5 -29.5
+t-36.5 -12.5q-27 0 -45.5 18.5t-18.5 44.5q0 13 5.5 25.5t15.5 22t22 13.5v50q-18 7 -30.5 24.5t-12.5 36.5q0 26 19 45t45.5 19t45 -19t18.5 -45q0 -19 -12.5 -36.5t-30.5 -24.5v-50q12 -5 23.5 -16t15.5 -23h51q2 8 8.5 16t14.5 14t16 9v50q-18 7 -30.5 24.5t-12.5 36
+t12.5 36t30.5 24.5v50q-18 6 -30.5 24t-12.5 37q0 26 18.5 44.5t45.5 18.5q18 0 36 -12.5t24 -29.5h50q6 17 24 29.5t36 12.5t32.5 -8.5t23 -23t8.5 -32.5t-12.5 -36t-29.5 -24v-50q17 -7 30 -24.5t13 -36.5q0 -26 -19 -45t-45.5 -19t-45.5 19t-19 45q0 19 12.5 36.5
+t30.5 23.5v51q-12 4 -23.5 15.5t-15.5 23.5h-50q-4 -12 -15.5 -23t-23.5 -16v-50q18 -7 30.5 -24.5t12.5 -36.5zM341 20.5q0 26.5 19 45.5t45.5 19t45 -19t18.5 -45.5t-18.5 -45t-45 -18.5t-45.5 18.5t-19 45z" />
+    <glyph glyph-name="persistent_volume" unicode="persistent_volume" horiz-adv-x="427" 
+d="M384 427q12 0 22 -6t15.5 -15.5t5.5 -21.5v-341q0 -18 -12.5 -30.5t-30.5 -12.5h-50q8 21 8 43q0 53 -37.5 90.5t-90.5 37.5q-35 0 -64 -18q-11 6 -22 10v221q0 12 6 21.5t16 15.5t21 6h213zM150 384q0 -9 6 -15t15 -6t15 6t6 15t-6 15t-15 6t-15 -6t-6 -15zM278 171
+q44 0 75 31t31 75t-31 75.5t-75 31.5t-75.5 -31.5t-31.5 -75.5q0 -22 9 -42h55v-55q21 -9 43 -9zM384.5 21q8.5 0 15 6.5t6.5 15t-6.5 15t-15 6.5t-15 -6.5t-6.5 -15t6.5 -15t15 -6.5zM384.5 363q8.5 0 15 6t6.5 15t-6.5 15t-15 6t-15 -6t-6.5 -15t6.5 -15t15 -6zM214 -43
+q-16 0 -35 9t-29 21q-9 10 -15 26t-7 30q0 8 -3 16t-9 14t-14 9t-16 3q-18 0 -30.5 -12.5t-12.5 -30t12.5 -30t30.5 -12.5q9 0 17 4q6 -21 19 -38q-17 -9 -36 -9h-1q-35 0 -60 25t-25 60.5t25 60.5t60 25q16 0 35 -8.5t30 -20.5q6 -7 10.5 -16.5t7.5 -20.5t3 -19
+q0 -18 12.5 -30.5t30 -12.5t30 12.5t12.5 30.5q0 8 -3 16t-9 14t-14 9t-16.5 3t-16.5 -3q-7 20 -20 37q17 9 37 9q35 0 60 -25t25 -60.5t-25 -60.5t-60 -25zM235 277q0 18 12.5 30.5t30 12.5t30 -12.5t12.5 -30t-12.5 -30t-29.5 -12.5q-12 0 -21.5 5.5t-15.5 15.5t-6 21z
+" />
     <glyph glyph-name="pin" unicode="pin" horiz-adv-x="404" 
 d="M347 239l30 -30l-75 -76l102 -101l-30 -31l-102 102l-76 -75l-30 30v60l-121 121l-15 -15l-30 30l151 151l30 -30l-15 -15l121 -121h60z" />
+    <glyph glyph-name="pod_autoscaler" unicode="pod_autoscaler" 
+d="M128 48v16h256v-21q0 -18 -12.5 -30.5t-30.5 -12.5h-170q-18 0 -30.5 12.5t-12.5 30.5v5zM320 363v-22h-128v22q0 4 2 8q5 13 19 13h86q9 0 15 -6t6 -15zM347 261l26 -58l27 -59l27 -59h-342l27 59l27 59l26 58l27 59h128zM273 174q11 4 18.5 15.5t7.5 23.5
+q0 18 -12.5 30.5t-30.5 12.5t-30.5 -12.5t-12.5 -30t12.5 -30.5t30.5 -13q9 0 17 4zM437 157v14h-32v42h32v54l19 -19l19 -19l18 -18l19 -19l-19 -19l-18 -18l-19 -19l-19 -19v40zM75 171v-54l-19 19l-19 19l-18 18l-19 19l19 19l18 18l19 19l19 19v-54h32v-42h-32z" />
+    <glyph glyph-name="pod_security" unicode="pod_security" horiz-adv-x="427" 
+d="M235 362h-129v22q0 9 6.5 15t15.5 6h85q6 0 11 -2.5t8 -7.5t3 -11v-22zM213 107h-213l53 117l54 117h128l27 -61l28 -61l-38 -17l-39 -17v-78zM213 234.5q0 17.5 -12.5 30t-30 12.5t-30 -12.5t-12.5 -30t12.5 -30t30 -12.5t30 12.5t12.5 30zM215 85q3 -17 9 -33t16 -31
+h-155q-17 0 -29.5 12.5t-12.5 30.5v21h172zM427 171v-64q0 -19 -8 -43t-20 -38q-10 -15 -30.5 -29t-37.5 -18q-9 2 -19 7t-19 11t-17.5 13.5t-13.5 15.5q-11 14 -19 38t-8 43v64l48 21l48 21l48 -21zM331 190l-38 -17l-37 -16v-61h75v-95q12 4 27 14.5t23 21.5q20 26 24 59
+h-74v94z" />
+    <glyph glyph-name="pod" unicode="pod" horiz-adv-x="341" 
+d="M43 43v21h256v-21q0 -18 -12.5 -30.5t-30.5 -12.5h-171q-17 0 -29.5 12.5t-12.5 30.5zM235 363v-22h-128v22q0 9 6 15t15 6h85q9 0 15.5 -6t6.5 -15zM235 320l106 -235h-341l107 235h128zM171 170q18 0 30.5 12.5t12.5 30.5t-12.5 30.5t-30.5 12.5t-30.5 -12.5
+t-12.5 -30.5t12.5 -30.5t30.5 -12.5z" />
     <glyph glyph-name="primitive" unicode="primitive" horiz-adv-x="425" 
-d="M166 192q0 19 13.5 33t33 14t33 -14t13.5 -33t-13.5 -33t-33 -14t-33 14t-13.5 33zM418 311q12 -23 2 -54t-39 -65q29 -34 39 -65t-2 -54q-19 -32 -74 -32h-1q-14 0 -27 2q-7 1 -20 3q-15 -41 -36.5 -65t-47 -24t-47 24t-36.5 66q-23 -5 -47 -6q-56 0 -75 32
-q-12 23 -2 54t39 65q-63 72 -37 119q26 45 122 26q10 28 22.5 48t28.5 31t32.5 11t32.5 -11t28.5 -31t22.5 -47q18 3 20 3q79 10 102 -30zM319 317q-7 -1 -16 -4q9 -31 12 -63q26 -19 49 -41q16 18 25.5 35t11 30.5t-3.5 22.5q-11 22 -53 22q-13 0 -25 -2zM253 121
-q20 12 39 25q2 22 2 44v2v2q0 22 -2 44q-19 13 -39 24q-17 11 -40 22q-21 -10 -41 -21q-20 -12 -39 -25q-2 -22 -2 -44v-2q0 -23 2 -46q19 -13 39 -25q18 -10 41 -21q22 10 40 21zM288 114q-12 -8 -22 -14l-24 -12q19 -8 38 -13q5 18 8 39zM183 88q-11 5 -23 12
-q-10 6 -23 14q4 -21 9 -39q19 5 37 13zM107 165v27v27q-15 -13 -29 -27q14 -14 29 -27zM137 270q11 7 23 14q7 4 23 12q-18 8 -38 13q-4 -18 -8 -39zM242 296q16 -8 23 -12q10 -6 23 -14q-4 21 -8 39q-19 -5 -38 -13zM318 219v-27v-27q15 13 29 27q-14 14 -29 27zM213 403
-q-16 0 -32 -19t-28 -52q30 -9 60 -21q29 12 59 21q-11 33 -27 52t-32 19zM28 299q-17 -30 33 -90q23 22 49 41q4 33 12 64q-20 4 -40 5q-42 0 -54 -20zM28 85q17 -29 94 -17q-8 32 -12 64q-26 19 -49 42q-24 -27 -32.5 -51t-0.5 -38zM213 -19q10 0 21 8.5t21 24.5t17 38
-q-30 9 -59 22q-30 -13 -60 -22q12 -33 27.5 -52t32.5 -19zM397 85q8 14 -0.5 38t-32.5 51q-23 -23 -49 -42q-4 -31 -12 -62q2 -1 5 -1.5l6 -1t5 -0.5q63 -8 78 18z" />
-    <glyph glyph-name="product_subscriptions" unicode="product_subscriptions" horiz-adv-x="428" 
-d="M43 277v43h342v-43h-342zM86 362v43h256v-43h-256zM385 235q18 0 30.5 -12.5t12.5 -30.5v-170q0 -18 -12.5 -30.5t-30.5 -12.5h-342q-18 0 -30.5 12.5t-12.5 30.5v170q0 18 12.5 30.5t30.5 12.5h342zM272 16l-23 68l59 43h-72l-23 71l-22 -70h-72l58 -42l-22 -70l59 43z
-" />
+d="M166 192q0 19 13.5 33t33 14t33 -14t13.5 -33t-13.5 -33t-33 -14t-33 14t-13.5 33zM418 311q26 -46 -37 -119q63 -73 37 -119q-19 -32 -75 -32q-13 0 -27 2q-9 1 -20 3q-15 -41 -36.5 -65t-47 -24t-47 24t-36.5 66q-23 -5 -47 -6q-57 0 -75 32q-26 46 37 119
+q-63 73 -37 118.5t122 26.5q10 28 22.5 48t28.5 31t33 11q25 0 46.5 -24t36.5 -65q11 2 20 3q79 10 102 -30zM319 317q-3 0 -9 -1.5t-7 -1.5q8 -31 12 -63q26 -19 49 -41q51 58 33 89q-12 20 -53 20q-13 0 -25 -2zM253.5 121.5q20.5 11.5 38.5 24.5q2 23 2 46t-2 46
+q-18 13 -39 25q-18 11 -41 21q-21 -10 -40 -21q-20 -12 -39 -25q-2 -23 -2 -46t2 -46q19 -13 39 -25q19 -11 41 -21q20 10 40.5 21.5zM288 114q-12 -7 -22.5 -13.5t-23.5 -12.5q19 -7 38 -13q5 19 8 39zM183 88q-13 6 -23 12q-11 7 -23 14q3 -20 8 -39q19 5 38 13zM107 165
+v27v27q-15 -13 -29 -27q14 -14 29 -27zM137 270q12 7 23 14q10 6 23 12q-18 8 -38 13q-5 -20 -8 -39zM242 296q13 -6 23.5 -12.5t22.5 -13.5q-3 20 -8 39q-19 -6 -38 -13zM318 219v-27v-27q15 13 29 27q-14 14 -29 27zM213 403q-16 0 -32 -19t-28 -52q30 -9 59 -22
+q30 13 60 22q-12 33 -27.5 52t-31.5 19zM28 299q-17 -31 33 -89q23 22 49 41q4 32 12 63q-20 4 -40 4q-43 0 -54 -19zM28 85.5q17 -30.5 94 -15.5q-8 31 -12 63q-26 19 -49 41q-50 -58 -33 -88.5zM213 -19q16 0 31.5 19t27.5 52q-30 9 -59 22q-30 -13 -60 -22q12 -33 28 -52
+t32 -19zM397 85q18 31 -33 89q-23 -22 -49 -41q-4 -32 -12 -63q1 0 7 -1.5t9 -1.5q63 -8 78 18z" />
+    <glyph glyph-name="product_classes" unicode="product_classes" horiz-adv-x="427" 
+d="M107 405q8 0 14.5 -6t6.5 -15v-384q0 -6 -3 -11t-8 -7.5t-10 -2.5h-86q-8 0 -14.5 6t-6.5 15v384q0 9 6.5 15t14.5 6h86zM64 0q18 0 30.5 12.5t12.5 30t-12.5 30t-30.5 12.5t-30.5 -12.5t-12.5 -30t12.5 -30t30.5 -12.5zM107 192v192h-86v-192h86zM43 42.5q0 8.5 6 15
+t15 6.5t15.5 -6.5t6.5 -15t-6.5 -15t-15.5 -6.5t-15 6.5t-6 15zM171 405h107v-149v-43h-107v43v149zM320 405h107v-149v-43h-107v43v149zM171 171h107v-150v-42h-107v42v150zM320 171h107v-150v-42h-107v42v150z" />
+    <glyph glyph-name="product_subscriptions" unicode="product_subscriptions" horiz-adv-x="427" 
+d="M384 277h-341v43h341v-43zM341 405v-42h-256v42h256zM427 192v-171q0 -17 -12.5 -29.5t-30.5 -12.5h-341q-18 0 -30.5 12.5t-12.5 29.5v171q0 18 12.5 30.5t30.5 12.5h341q18 0 30.5 -12.5t12.5 -30.5zM254 84l50 43l-65 5l-26 60l-25 -60l-65 -5l49 -43l-15 -63l56 34
+l56 -34z" />
     <glyph glyph-name="products_classes" unicode="products_classes" horiz-adv-x="469" 
 d="M106.5 107q17.5 0 30 -12.5t12.5 -30.5t-12.5 -30.5t-30 -12.5t-30 12.5t-12.5 30.5t12.5 30.5t30 12.5zM106.5 43q8.5 0 15 6t6.5 15t-6.5 15t-15 6t-15 -6t-6.5 -15t6.5 -15t15 -6zM64 170v192h86v-192h-86zM448 427q9 0 15 -6.5t6 -15.5v-426q0 -9 -6 -15.5t-15 -6.5
 h-427q-8 0 -14.5 6.5t-6.5 15.5v426q0 9 6.5 15.5t14.5 6.5h427zM171 149v214q0 8 -6.5 14.5t-15.5 6.5h-85q-9 0 -15 -6.5t-6 -14.5v-342q0 -8 6 -14.5t15 -6.5h85q9 0 15.5 6.5t6.5 14.5v128zM299 0v43h-86v-43h86zM299 64v107h-86v-107h86zM299 213v43h-86v-43h86z
 M299 277v107h-86v-107h86zM427 0v43h-86v-43h86zM427 64v107h-86v-107h86zM427 213v43h-86v-43h86zM427 277v107h-86v-107h86z" />
-    <glyph glyph-name="products" unicode="products" horiz-adv-x="469" 
-d="M107 405q8 0 14.5 -6t6.5 -15v-384q0 -9 -6.5 -15t-14.5 -6h-86q-8 0 -14.5 6t-6.5 15v384q0 9 6.5 15t14.5 6h86zM64 0q18 0 30.5 12.5t12.5 30t-12.5 30t-30.5 12.5t-30.5 -12.5t-12.5 -30t12.5 -30t30.5 -12.5zM107 192v192h-86v-192h86zM43 42.5q0 8.5 6 15t15 6.5
-t15.5 -6.5t6.5 -15t-6.5 -15t-15.5 -6.5t-15 6.5t-6 15zM277 405q9 0 15.5 -6t6.5 -15v-384q0 -9 -6.5 -15t-15.5 -6h-85q-9 0 -15 6t-6 15v384q0 9 6 15t15 6h85zM234.5 0q17.5 0 30 12.5t12.5 30.5q0 11 -5.5 21t-15.5 15.5t-21 5.5q-18 0 -30.5 -12.5t-12.5 -30t12.5 -30
-t30 -12.5zM277 192v192h-85v-192h85zM214 42.5q0 8.5 6 15t15 6.5t15 -6.5t6 -15.5q0 -4 -1.5 -8t-4.5 -7t-7 -4.5t-8 -1.5q-9 0 -15 6.5t-6 15zM448 405q9 0 15 -6t6 -15v-384q0 -9 -6 -15t-15 -6h-85q-9 0 -15.5 6t-6.5 15v384q0 9 6.5 15t15.5 6h85zM405 0q12 0 22 5.5
-t15.5 15.5t5.5 22q0 17 -12.5 29.5t-30 12.5t-30 -12.5t-12.5 -30t12.5 -30t29.5 -12.5zM448 192v192h-85v-192h85zM384 42.5q0 8.5 6.5 15t15 6.5t15 -6.5t6.5 -15t-6.5 -15t-15 -6.5t-15 6.5t-6.5 15z" />
-    <glyph glyph-name="proxy" unicode="proxy" horiz-adv-x="405" 
-d="M405 315l-30 30l-98 -98q6 -6 10 -12q6 -10 9 -22h45v43l64 -65l-64 -64v43h-45q-3 -11 -9 -22q-5 -6 -10 -11l98 -98l30 30v-90h-90l30 30l-32 32l-71 71q-14 -5 -30 -5q-27 0 -51 18.5t-30 45.5h-51q-5 -9 -16 -15.5t-21 -6.5q-18 0 -30.5 12.5t-12.5 30.5t12.5 30.5
-t30.5 12.5q10 0 21 -6.5t16 -15.5h51q4 15 16 31t25 24h2q6 3 11 5h3q6 2 12 3t13 1l7 -1h5l10 -2h2l5 -2l71 71l32 32l-30 30h90v-90z" />
+    <glyph glyph-name="products" unicode="products" horiz-adv-x="427" 
+d="M107 405q8 0 14.5 -6t6.5 -15v-384q0 -6 -3 -11t-8 -7.5t-10 -2.5h-86q-8 0 -14.5 6t-6.5 15v384q0 9 6.5 15t14.5 6h86zM64 0q18 0 30.5 12.5t12.5 30t-12.5 30t-30.5 12.5t-30.5 -12.5t-12.5 -30t12.5 -30t30.5 -12.5zM107 192v192h-86v-192h86zM85 43q0 -6 -2.5 -11
+t-7.5 -8t-11 -3q-9 0 -15 6.5t-6 15t6 15t15 6.5t15 -6.5t6 -14.5zM256 405q9 0 15 -6t6 -15v-384q0 -9 -6 -15t-15 -6h-85q-9 0 -15.5 6t-6.5 15v384q0 9 6.5 15t15.5 6h85zM213.5 0q17.5 0 30 12.5t12.5 30.5q0 8 -3.5 16t-9 14t-13.5 9t-17 3q-11 0 -21 -5.5t-15.5 -15.5
+t-5.5 -21q0 -18 12.5 -30.5t30 -12.5zM256 192v192h-85v-192h85zM235 42.5q0 -5.5 -3 -10.5t-8 -8t-11 -3q-8 0 -14.5 6.5t-6.5 15t6.5 15t14.5 6.5q6 0 11 -3t8 -8t3 -10.5zM405 405q9 0 15.5 -6t6.5 -15v-384q0 -9 -6.5 -15t-15.5 -6h-85q-9 0 -15 6t-6 15v384q0 9 6 15
+t15 6h85zM362.5 0q17.5 0 30 12.5t12.5 30t-12.5 30t-30 12.5t-30 -12.5t-12.5 -30t12.5 -30t30 -12.5zM405 192v192h-85v-192h85zM384 42.5q0 -8.5 -6.5 -15t-15 -6.5t-15 6.5t-6.5 15t6.5 15t15 6.5t15 -6.5t6.5 -15z" />
+    <glyph glyph-name="project" unicode="project" horiz-adv-x="384" 
+d="M341 363q12 0 22 -6t15.5 -15.5t5.5 -21.5v-299q0 -17 -12.5 -29.5t-30.5 -12.5h-298q-18 0 -30.5 12.5t-12.5 29.5v299q0 18 12.5 30.5t30.5 12.5h89q6 17 23.5 29.5t36.5 12.5t36.5 -12.5t23.5 -29.5h89zM192 363q-9 0 -15 -6.5t-6 -15t6 -15t15 -6.5t15 6.5t6 14.5
+q0 6 -2.5 11t-7.5 8t-11 3zM149 256l-85 -85l30 -30l55 55l60 -60l84 84l27 -28v85h-85l28 -27l-54 -54zM341 43v42h-298v-42h298z" />
+    <glyph glyph-name="proxy" unicode="proxy" horiz-adv-x="406" 
+d="M278 248q13 -15 18 -35h46v43l64 -64l-64 -64v43h-46q-5 -19 -18 -34l97 -98l31 30v-90h-91l30 30l-103 103q-14 -5 -29 -5q-27 0 -51 18.5t-31 45.5h-51q-5 -9 -16 -15.5t-21 -6.5q-18 0 -30.5 12.5t-12.5 30.5t12.5 30.5t30.5 12.5q10 0 20.5 -6.5t16.5 -15.5h51
+q7 27 31 45.5t51 18.5q15 0 29 -5l103 103l-30 30h91v-90l-31 30z" />
+    <glyph glyph-name="quota" unicode="quota" horiz-adv-x="469" 
+d="M235 192h192v-21q0 -89 -62.5 -151.5t-151 -62.5t-151 62.5t-62.5 151t62.5 151t150.5 62.5h22v-192zM277 235v192q80 0 136 -56.5t56 -135.5h-192z" />
+    <glyph glyph-name="replica_set" unicode="replica_set" horiz-adv-x="448" 
+d="M405 171q18 0 30.5 -12.5t12.5 -30.5v-128q0 -18 -12.5 -30.5t-30.5 -12.5h-128q-17 0 -29.5 12.5t-12.5 30.5v128q0 18 12.5 30.5t29.5 12.5h128zM405 0v128h-128v-128h128zM299 299v-86h-43v86h-128v-128h64v-43h-64q-18 0 -30.5 12.5t-12.5 30.5v128q0 17 12.5 29.5
+t30.5 12.5h128q18 0 30.5 -12.5t12.5 -29.5zM43 256h-43v128q0 9 3.5 16.5t9 13.5t13.5 9.5t17 3.5h128v-43h-128v-128z" />
+    <glyph glyph-name="replica" unicode="replica" horiz-adv-x="363" 
+d="M320 213q12 0 21.5 -5.5t15.5 -15.5t6 -21v-128q0 -18 -12.5 -30.5t-30.5 -12.5h-128q-18 0 -30.5 12.5t-12.5 30.5v128q0 17 12.5 29.5t30.5 12.5h128zM320 43v128h-128v-128h128zM171 384q17 0 29.5 -12.5t12.5 -30.5v-85h-42v85h-128v-128h64v-42h-64q-12 0 -22 5.5
+t-15.5 15.5t-5.5 21v128q0 18 12.5 30.5t30.5 12.5h128z" />
     <glyph glyph-name="repositories" unicode="repositories" horiz-adv-x="341" 
 d="M85 -43v86h107v-86l-53 32zM85 299v42h43v-42h-43zM85 192v43h43v-43h-43zM85 85v43h43v-43h-43zM306 426q15 -3 25 -15t10 -27v-341q0 -12 -5.5 -22t-15.5 -15.5t-21 -5.5h-64v43h64v341h-256v-384q-18 0 -30.5 12.5t-12.5 30.5v341q0 18 12.5 30.5t30.5 12.5h256
 q4 0 7 -1z" />
     <glyph glyph-name="resource" unicode="resource" horiz-adv-x="384" 
 d="M363 235h21v-43h-43v-21q0 -31 -14 -60.5t-38.5 -52t-53.5 -30.5v-49h-86v49q-44 13 -75 55t-31 88v21h-43v43h85v170h43v-170h128v170h43v-170h64z" />
+    <glyph glyph-name="role_binding" unicode="role_binding" horiz-adv-x="491" 
+d="M299 64h85v-43h-85v43zM406 128q35 0 60 -25t25 -60q0 -10 -3.5 -21.5t-9 -22t-12.5 -17.5q-10 -10 -28 -17.5t-32 -7.5h-43v43h43q17 0 29.5 12.5t12.5 29.5q0 18 -12.5 30.5t-29.5 12.5h-43v43h43zM235 43v0q0 -18 12 -30.5t30 -12.5h43v-43h-43q-35 0 -60 25t-25 60
+q0 8 2 16.5t5.5 16.5t8 15.5t9.5 12.5q7 7 17 12.5t21.5 9t21.5 3.5h43v-43h-43q-18 0 -30 -12t-12 -30zM150 42.5q0 -5.5 1 -10.5q0 -5 1 -11h-109q-18 0 -30.5 12.5t-12.5 30.5v299q0 11 5.5 21t15.5 15.5t22 5.5h89q7 19 23 31t37 12t37 -12t23 -31h89q18 0 30.5 -12.5
+t12.5 -29.5v-192h-106q-15 0 -29 -4q-14 -3 -27 -10q-9 2 -16.5 2.5t-13.5 0.5q-42 -1 -80 -17q-48 -20 -48 -49v-30h88q-1 -6 -1 -11q-1 -5 -1 -10.5zM192 405q-9 0 -15 -6t-6 -15q0 -6 2.5 -11t7.5 -7.5t11 -2.5q9 0 15 6t6 15t-6 15t-15 6zM192 320q-27 0 -45.5 -18.5
+t-18.5 -45t18.5 -45.5t45.5 -19q17 0 32 8.5t23.5 23.5t8.5 32q0 13 -5 25t-13.5 20.5t-20.5 13.5t-25 5z" />
     <glyph glyph-name="route" unicode="route" horiz-adv-x="405" 
-d="M64 352q26 0 45 -18.5t19 -44.5q0 -22 -16 -51t-32 -48l-16 -19q-7 8 -17.5 20.5t-28.5 44t-18 52.5q0 26 19 45t45 19zM64 267v-1q10 0 16.5 6.5t6.5 15.5v1q0 10 -6.5 16.5t-16 6.5t-16 -6.5t-6.5 -16t6.5 -16t15.5 -6.5zM384 207q9 -5 15 -15.5t6 -20.5
-q0 -18 -12.5 -30.5t-30 -12.5t-30 12.5t-12.5 30.5q0 10 6.5 20.5t14.5 15.5v92v1q0 26 -18.5 45t-45.5 19q-26 0 -44.5 -18.5t-19.5 -44.5v-216v-21q0 -35 -25 -60t-60 -25t-60 25t-25 60v43h42v-43v0q0 -18 12.5 -30.5t30.5 -12.5t30.5 12.5t12.5 30.5v0v21v216
-q0 44 31.5 75t74.5 31q44 0 75.5 -31.5t31.5 -75.5v-1v-92z" />
+d="M64 352q26 0 44.5 -18.5t18.5 -45.5q0 -21 -16 -50.5t-32 -48.5l-15 -19q-8 8 -18.5 21t-28 44.5t-17.5 52.5q0 27 18.5 45.5t44.5 18.5h1zM63.5 266q9.5 0 16 6.5t6.5 15.5q0 5 -1.5 9t-4.5 7.5t-7.5 5t-8.5 1.5q-10 0 -16.5 -6.5t-6.5 -16t6.5 -16t16 -6.5zM384 207
+q8 -5 14.5 -16t6.5 -21q0 -17 -12.5 -29.5t-30.5 -12.5t-30.5 12.5t-12.5 29.5q0 5 2 10.5t5 10.5t7 9.5t8 6.5v92q0 26 -18.5 45t-45.5 19q-25 0 -44 -18t-20 -44v-5v-40v-171v-21q0 -35 -25 -60t-60.5 -25t-60.5 25t-25 60v42h43v-41v0v-1q0 -17 12.5 -29.5t30 -12.5
+t30 12.5t12.5 29.5v1v20v192v19v5q2 43 33 73t74 30q33 0 63 -22.5t39 -54.5q4 -14 5 -28v-92z" />
+    <glyph glyph-name="sandbox" unicode="sandbox" horiz-adv-x="393" 
+d="M118 256q0 9 6.5 15.5t15 6.5t15 -6.5t6.5 -15.5t-6.5 -15t-15 -6t-15 6t-6.5 15zM150 192q0 9 6.5 15.5t15 6.5t15 -6.5t6.5 -15.5t-6.5 -15t-15 -6t-15 6t-6.5 15zM86 192q0 6 3 11t8 8t11 3q8 0 14.5 -6.5t6.5 -15.5t-6.5 -15t-15 -6t-15 6t-6.5 15zM341 251l43 43
+v-251q0 -18 -12.5 -30.5t-30.5 -12.5h-298q-18 0 -30.5 12.5t-12.5 30.5v298q0 18 12.5 30.5t30.5 12.5h251l-43 -43h-208v-213h85q0 -26 19 -45t45 -19t45 19t19 45h85v123zM299 233q5 -7 2.5 -14t-10.5 -11l-27 -16v0q0 15 -10.5 25.5t-24.5 10.5h-1q-6 0 -12 -3
+q-4 9 -13.5 16t-18.5 9l25 41q4 8 11 10t13 -4l17 -16l-6 -6l31 -30l6 5zM275 245l-31 30l6 6l112 112l31 -30l-113 -113z" />
     <glyph glyph-name="sap" unicode="sap" horiz-adv-x="427" 
 d="M323 231q24 0 24 -18q0 -19 -24 -19h-10v37h10zM213 216h1l15 -46q-7 -2 -15 -2q-7 0 -14 3zM213.5 405q88.5 0 151 -62.5t62.5 -150.5t-62.5 -150.5t-151 -62.5t-151 62.5t-62.5 150.5t62.5 150.5t151 62.5zM327 163q27 0 42 12.5t15 35.5q0 50 -64 50h-45v-109l-40 109
 h-42l-34 -91q-2 11 -10.5 18.5t-15.5 11t-20 7.5q-25 8 -25 16q0 9 21 9q18 0 34 -9l15 28q-24 12 -51 12h-3q-24 0 -42 -17q-10 -10 -11 -25v-2q0 -19 16 -30q14 -9 31 -14q23 -7 23 -15q-1 -4 -3 -7q-6 -4 -13 -4h-2h-2q-20 0 -36 10l-14 -28q24 -13 52 -13h2h1
 q22 0 38 13q1 1 2 1l-5 -12h42l7 21q12 -3 24 -3h1q12 0 23 3l7 -21h68v43h14z" />
-    <glyph glyph-name="service_instance" unicode="service_instance" horiz-adv-x="429" 
-d="M385 405h1q18 0 30.5 -12.5t12.5 -29.5v-344q0 -17 -12.5 -29.5t-30.5 -12.5h-343q-18 0 -30.5 12.5t-12.5 29.5v344q0 17 12.5 29.5t30.5 12.5h342zM213.5 149q17.5 0 30 12.5t12.5 30.5t-12.5 30.5t-30 12.5t-30 -12.5t-12.5 -30.5t12.5 -30.5t30 -12.5z" />
+    <glyph glyph-name="secure_data" unicode="secure_data" horiz-adv-x="469" 
+d="M283 128h-155v-43h134q-6 -12 -6 -25v-18h-213q-12 0 -22 6t-15.5 16t-5.5 21v299q0 17 12.5 29.5t30.5 12.5h341q18 0 30.5 -12.5t12.5 -29.5v-180q-21 9 -43 9h-171v-43h86q-13 -19 -16 -42zM384 256v42h-171v-42h171zM128 384v-43h256v43h-256zM85 85v43h-43v-43h43z
+M85 341v43h-43v-43h43zM128 298v-42h43v42h-43zM128 170h43v43h-43v-43zM444 85q5 0 9.5 -2.5t8 -6.5t5.5 -8.5t2 -10.5v-74q-1 -11 -9 -18.5t-18 -7.5h-118q-10 1 -17.5 9t-7.5 19v74q0 10 7.5 17.5t17.5 8.5v32q3 22 20.5 37.5t39.5 15.5q15 0 28 -7t21.5 -19t10.5 -27
+v-32zM416 85v32q-1 12 -9.5 20t-19.5 8h-3h-3q-11 0 -19.5 -8t-9.5 -20v-32h64z" />
+    <glyph glyph-name="service_instance" unicode="service_instance" horiz-adv-x="384" 
+d="M0 0v64v64h22h21v-64v-64h-21h-22zM202 -21l-63 13l-62 14q-13 3 -13 15v86q0 5 4 10q3 4 9 5l102 13l102 14l3 -11l3 -12q0 -13 -12 -19l-42 -11l-43 -11l35 -14l34 -13l49 13l47 14q2 1 5 1q4 0 8 -2q6 -4 7 -10l4 -16l5 -17v-4q0 -12 -12 -15l-77 -21l-78 -22
+q-4 -1 -8 -1h-2q-3 0 -5 1zM320 267l-74 -48l-75 -48v96v96l75 -48z" />
     <glyph glyph-name="service_plan" unicode="service_plan" horiz-adv-x="427" 
 d="M107 405q8 0 14.5 -6t6.5 -15v-384q0 -6 -3 -11t-8 -7.5t-10 -2.5h-86q-8 0 -14.5 6t-6.5 15v384q0 9 6.5 15t14.5 6h86zM64 0q18 0 30.5 12.5t12.5 30t-12.5 30t-30.5 12.5t-30.5 -12.5t-12.5 -30t12.5 -30t30.5 -12.5zM107 192v192h-86v-192h86zM43 42.5q0 8.5 6 15
 t15 6.5t15.5 -6.5t6.5 -15t-6.5 -15t-15.5 -6.5t-15 6.5t-6 15zM256 362v43h171v-43h-171zM171 362v43h43v-43h-43zM256 277v43h171v-43h-171zM171 277v43h43v-43h-43zM256 192v43h171v-43h-171zM171 192v43h43v-43h-43z" />
@@ -224,6 +408,9 @@ t26 7l27 -46q-19 -11 -24.5 -32t5.5 -40zM352 238q23 0 39.5 16.5t16.5 39.5q0 15 -7
     <glyph glyph-name="smt" unicode="smt" horiz-adv-x="427" 
 d="M85 -43v86h107v-86l-53 32zM85 299v42h43v-42h-43zM85 192v43h43v-43h-43zM85 85v43h43v-43h-43zM392 427q14 -3 24.5 -15.5t10.5 -26.5v-1v-341q0 -18 -12.5 -30.5t-30.5 -12.5h-64v-43l-53 32l-54 -32v470h171h4h4zM320 85v43h-43v-43h43zM320 192v43h-43v-43h43z
 M320 299v42h-43v-42h43zM43 427h149v-43h-149v-384q-18 0 -30.5 12.5t-12.5 30.5v341q0 18 12.5 30.5t30.5 12.5z" />
+    <glyph glyph-name="snapshot_rollback" unicode="snapshot_rollback" horiz-adv-x="427" 
+d="M43 405h85v-42h-85v-86h-43v86q0 17 12.5 29.5t30.5 12.5zM299 405h85q18 0 30.5 -12.5t12.5 -29.5v-86h-43v86h-85v42zM299 -21v42h85v86h43v-86q0 -17 -12.5 -29.5t-30.5 -12.5h-85zM43 21h85v-42h-85q-18 0 -30.5 12.5t-12.5 29.5v86h43v-86zM221 245q38 0 73 -25.5
+t47 -60.5l-30 -10q-9 27 -35.5 46t-54.5 19q-18 0 -39 -9.5t-33 -23.5l43 -42h-107v106l43 -41q16 17 43 29t50 12z" />
     <glyph glyph-name="software" unicode="software" horiz-adv-x="469" 
 d="M277 57v-36h43v-42h-171v42h43v43h-149q-12 0 -22 5.5t-15.5 15.5t-5.5 22v256q0 17 12.5 29.5t30.5 12.5h384q17 0 29.5 -12.5t12.5 -29.5v-94q-16 27 -42 45v49h-384v-256h176q10 -14 27 -28.5t31 -21.5zM341 320q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5
 t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5zM341.5 160q13.5 0 22.5 9.5t9 22.5t-9 22.5t-22.5 9.5t-23 -9.5t-9.5 -22.5t9.5 -22.5t23 -9.5z" />
@@ -232,16 +419,75 @@ d="M240 431q99 0 169.5 -70t70.5 -169.5t-70.5 -170t-169.5 -70.5t-169.5 70.5t-70.5
 q-16 28 -36 42q-11 8 -22 11v-94zM166 344q-12 -18 -20 -41h78v94q-11 -3 -22 -11q-20 -14 -36 -42zM224 271h-87q-7 -31 -9 -64h96v64zM48 111h56q-6 31 -8 64h-63q2 -33 15 -64zM128 175q2 -33 9 -64h87v64h-96zM224 79h-78q8 -22 20 -41q16 -27 36 -42q11 -7 22 -10v93z
 M314 38q12 19 20 41h-78v-93q11 3 22 10q20 15 36 42zM256 111h87q7 31 9 64h-96v-64zM384 207h63q-2 33 -15 64h-56q6 -31 8 -64zM415 303q-12 19 -28 35q-25 26 -57 41q23 -31 37 -76h48zM93 338q-16 -16 -28 -35h48q14 45 37 76q-32 -15 -57 -41zM65 79q12 -19 28 -35
 q25 -25 57 -41q-23 32 -37 76h-48zM387 44q16 16 28 35h-48q-14 -44 -37 -76q32 16 57 41z" />
-    <glyph glyph-name="state" unicode="state" horiz-adv-x="364" 
-d="M129 320h107v-256h-107v256zM215 171v128h-64v-128h64zM321 427q9 0 17 -3.5t13.5 -9.5t9 -13.5t3.5 -16.5v-384q0 -18 -12.5 -30.5t-30.5 -12.5h-278q-18 0 -30.5 12.5t-12.5 30.5v384q0 18 12.5 30.5t30.5 12.5h278zM321 0v384h-277v-384h277z" />
-    <glyph glyph-name="timeout" unicode="timeout" horiz-adv-x="426" 
-d="M179 171l-111 111q10 17 24 31l100 -100v-42l106 -64l36 -36q-14 -14 -31 -24zM364 41l27 -27l-27 -28l-30 30q16 11 30 25zM34 370l28 -27q-14 -14 -25 -30l-30 30zM298 107l-106 64v42v86h32v-112l96 -57l-16 -27zM364 41q-14 -14 -30 -25q-23 -15 -58 -26t-63 -11
-q-88 0 -150.5 62.5t-62.5 150.5q0 28 11 63t26 58q11 16 25 30l30 -30q-13 -14 -24 -31q-10 -17 -17.5 -43t-7.5 -46q0 -71 50 -121t121 -50q20 0 46 7.5t43 17.5q17 11 31 24zM213 363q-20 0 -46.5 -8t-43.5 -18l-31 31q22 15 57.5 26t62.5 11h1q88 0 150.5 -62.5
-t62.5 -150.5q0 -27 -11 -62.5t-27 -58.5l-31 31q6 8 10.5 19.5t8 23.5t5.5 24.5t2 22.5q0 71 -50 121t-120 50z" />
+    <glyph glyph-name="state" unicode="state" horiz-adv-x="363" 
+d="M128 320h107v-256h-107v256zM213 171v128h-64v-128h64zM320 427q9 0 16.5 -3.5t13.5 -9.5t9.5 -13.5t3.5 -16.5v-384q0 -18 -12.5 -30.5t-30.5 -12.5h-277q-18 0 -30.5 12.5t-12.5 30.5v384q0 18 12.5 30.5t30.5 12.5h277zM320 0v384h-277v-384h277z" />
+    <glyph glyph-name="stateful_set" unicode="stateful_set" horiz-adv-x="490" 
+d="M128 64h277v-43h-277q-18 0 -30.5 12.5t-12.5 30.5v0v277h43v-277zM43 -21h277v-43h-277q-18 0 -30.5 12.5t-12.5 30.5v0v277h43v-277zM330 261v0h1q22 0 44 5q19 4 35 13v-71q0 -11 -21 -21q-27 -11 -55 -11h-3.5h-3.5q-28 0 -55 11q-22 10 -22 21v71q17 -9 36 -13
+q21 -5 43 -5h1v0zM331 357h3q28 0 55 -11q21 -10 21 -21t-21 -21q-27 -11 -55 -11h-3v0h-1v0h-3q-28 0 -55 11q-22 10 -22 21t22 21q27 11 55 11h3v0h1v0zM448 427q17 0 29.5 -12.5t12.5 -30.5v-235q0 -11 -5.5 -21t-15.5 -15.5t-21 -5.5h-235q-18 0 -30.5 12.5t-12.5 29.5
+v235q0 18 12.5 30.5t30.5 12.5h235zM442 324v1q-1 14 -10 27t-22 19q-35 18 -75 18h-5v0v0h-4q-40 0 -76 -18q-12 -6 -21.5 -19t-10.5 -27v-117q1 -13 10.5 -26.5t21.5 -19.5q36 -18 76 -18h4v0v0h1v0h4q40 0 75 18q13 6 22 19.5t10 26.5v116z" />
+    <glyph glyph-name="storage_class" unicode="storage_class" horiz-adv-x="448" 
+d="M427 363v-86h-427v86h427zM85 299v42h-42v-42h42zM397 132l51 -68l-51 -68q-12 -17 -32 -17h-2h-150q-9 0 -15 6t-6 15v128q0 9 6 15t15 6h150q21 0 34 -17zM213 192q-18 0 -36 -12.5t-24 -30.5h-153v86h427v-73q-11 12 -29.5 21t-34.5 9h-150zM43 171h42v42h-42v-42z
+M149 107v-86h-149v86h149zM43 43h42v42h-42v-42z" />
+    <glyph glyph-name="subscription_management" unicode="subscription_management" horiz-adv-x="427" 
+d="M85 43h107v-86l-53 32l-54 -32v86zM384 427q18 0 30.5 -12.5t12.5 -30.5v-341q0 -18 -12.5 -30.5t-30.5 -12.5h-64v-43l-53 32l-54 -32v470h171zM256 341v-42h43v42h-43zM256 235v-43h43v43h-43zM256 128v-43h43v43h-43zM43 427h149v-43h-149v-384q-18 0 -30.5 12.5
+t-12.5 30.5v341q0 18 12.5 30.5t30.5 12.5zM85 299v42h43v-42h-43zM85 192v43h43v-43h-43zM85 85v43h43v-43h-43z" />
+    <glyph glyph-name="subscriptions_created" unicode="subscriptions_created" horiz-adv-x="427" 
+d="M43 277v43h341v-43h-341zM86 362v43h256v-43h-256zM384 235q18 0 30.5 -12.5t12.5 -30.5v-171q0 -17 -12.5 -29.5t-30.5 -12.5h-341q-18 0 -30.5 12.5t-12.5 29.5v171q0 12 5.5 21.5t15.5 15.5t22 6h341zM177 21l143 142l-30 30l-113 -113l-40 40l-30 -30z" />
+    <glyph glyph-name="symlink" unicode="symlink" horiz-adv-x="341" 
+d="M213 405l128 -128v-256q0 -17 -12.5 -29.5t-29.5 -12.5h-256q-18 0 -30.5 12.5t-12.5 29.5v342q0 17 12.5 29.5t30.5 12.5h170zM192 33l85 79l-85 80v-45q-105 -15 -128 -126q43 58 128 58v-46zM192 256h118l-118 117v-117z" />
+    <glyph glyph-name="system_group" unicode="system_group" horiz-adv-x="469" 
+d="M341 427v-43h-298v-192h-43v192q0 18 12.5 30.5t30.5 12.5h298zM427 341q17 0 29.5 -12.5t12.5 -29.5v-214q0 -17 -12.5 -29.5t-29.5 -12.5h-118v-33h32v-31h-128v31h33v33h-118q-18 0 -30.5 12.5t-12.5 29.5v214q0 17 12.5 29.5t30.5 12.5h299zM427 85v214h-299v-214
+h299z" />
+    <glyph glyph-name="system_image" unicode="system_image" horiz-adv-x="320" 
+d="M277 384l43 21v-384q0 -17 -12.5 -29.5t-30.5 -12.5h-234q-18 0 -30.5 12.5t-12.5 29.5v320q0 18 12.5 30.5t30.5 12.5h234zM43 320v-43h170v43h-170zM128 21v43h-43v-43h43zM128 149v-42h85v42h-85zM277 21v43h-128v-43h128zM277 107v42h-42v-42h42zM277 192v43h-106
+v-43h106zM277 277v43h-42v-43h42z" />
+    <glyph glyph-name="system_ok" unicode="system_ok" horiz-adv-x="469" 
+d="M427 405q17 0 29.5 -12.5t12.5 -29.5v-256q0 -18 -12.5 -30.5t-29.5 -12.5h-150v-43h43v-42h-171v42h43v43h-149q-18 0 -30.5 12.5t-12.5 30.5v256q0 17 12.5 29.5t30.5 12.5h384zM208 156l155 155l-30 30l-125 -124l-71 71l-30 -30l101 -102v0z" />
+    <glyph glyph-name="system_re_registered" unicode="system_re_registered" horiz-adv-x="469" 
+d="M427 405q17 0 29.5 -12.5t12.5 -29.5v-256q0 -12 -5.5 -22t-15.5 -15.5t-21 -5.5h-150v-43h43v-42h-171v42h43v43h-149q-12 0 -22 5.5t-15.5 15.5t-5.5 22v256q0 17 12.5 29.5t30.5 12.5h384zM427 256v107h-384v-107h106v64l86 -85l-86 -86v64h-106v-106h384v106h-150v43
+h150z" />
+    <glyph glyph-name="system_warning" unicode="system_warning" horiz-adv-x="469" 
+d="M427 405q17 0 29.5 -12.5t12.5 -29.5v-256q0 -12 -5.5 -22t-15.5 -15.5t-21 -5.5h-150v-43h43v-42h-171v42h43v43h-149q-12 0 -22 5.5t-15.5 15.5t-5.5 22v256q0 17 12.5 29.5t30.5 12.5h384zM427 107v256h-384v-256h384zM214 128v43h42v-43h-42zM214 214v128h42v-128
+h-42z" />
+    <glyph glyph-name="templates" unicode="templates" horiz-adv-x="384" 
+d="M341 405q18 0 30.5 -12.5t12.5 -29.5v-342q0 -11 -5.5 -21t-15.5 -15.5t-22 -5.5h-298q-18 0 -30.5 12.5t-12.5 29.5v342q0 8 3.5 16t9 14t13.5 9t17 3h298zM341 166l-106 -59l106 -62v121zM192 132l107 60h-214zM43 363v-43h298v43h-298zM43 277v-42h170v42h-170z
+M149 107l-106 62v-122zM192 83l-107 -62h214z" />
+    <glyph glyph-name="terminal" unicode="terminal" horiz-adv-x="427" 
+d="M384 341q18 0 30.5 -12.5t12.5 -29.5v-214q0 -17 -12.5 -29.5t-30.5 -12.5h-341q-18 0 -30.5 12.5t-12.5 29.5v214q0 17 12.5 29.5t30.5 12.5h341zM85 85l107 107l-107 107l-30 -30l77 -77l-77 -77zM363 85v43h-150v-43h150z" />
+    <glyph glyph-name="timeout" unicode="timeout" horiz-adv-x="427" 
+d="M123 337l-31 31q23 15 58.5 26t62.5 11q89 0 151.5 -62.5t62.5 -150.5q0 -27 -11 -62.5t-27 -58.5l-31 31q11 17 18.5 43.5t7.5 46.5q0 71 -50 121t-120 50q-14 0 -30.5 -3.5t-33 -9.5t-27.5 -13zM392 14l-28 -28l-30 30q-22 -15 -57.5 -26t-63.5 -11q-88 0 -150.5 62.5
+t-62.5 150.5q0 27 11 62.5t27 58.5l-30 30l27 27l27 -27l31 -30l99 -100v86h32v-112l96 -57l-16 -27l-5 4zM303 47l-123 124l-111 111q-11 -17 -18.5 -43.5t-7.5 -46.5q0 -71 50 -121t120 -50q20 0 46.5 8t43.5 18z" />
     <glyph glyph-name="troubleshooting" unicode="troubleshooting" 
-d="M491 213h21v-42h-43q-7 -73 -62.5 -129t-128.5 -63v-43h-42v42q-73 7 -129 63t-63 129h-44v42h44q7 72 63 128.5t128 63.5v44h42v-44q73 -7 129 -63t63 -128h22zM293 213h51q-6 22 -25.5 41.5t-41.5 25.5v-51q10 -6 16 -16zM344 171h-51q-6 -10 -16 -16v-51
-q22 6 41.5 25.5t25.5 41.5zM235 361q-55 -7 -98 -50t-50 -98h48q7 35 36 64t64 36v48zM219 213q6 10 16 16v51q-22 -6 -41.5 -25.5t-25.5 -41.5h51zM235 155q-10 6 -16 16h-51q6 -22 25.5 -41.5t41.5 -25.5v51zM87 171q4 -36 25.5 -68.5t54 -54t68.5 -25.5v48q-35 7 -64 36
-t-36 64h-48zM277 23q36 4 68.5 25.5t54 54t25.5 68.5h-48q-7 -35 -36 -64t-64 -36v-48zM377 213h48q-7 55 -50 98t-98 50v-48q35 -7 64 -36t36 -64z" />
+d="M491 213h21v-42h-44q-7 -72 -63 -128t-128 -63v-44h-42v44q-47 5 -89.5 32t-69.5 69.5t-32 89.5h-44v42h44q7 72 63 128t128 63v44h42v-44q36 -3 69.5 -20t59 -42.5t42.5 -59t20 -69.5h23zM293 213h51q-6 22 -25.5 41.5t-41.5 25.5v-51q10 -6 16 -16zM344 171h-51
+q-6 -10 -16 -16v-51q22 6 41.5 25.5t25.5 41.5zM235 361q-55 -7 -98 -50t-50 -98h48q7 35 36 64t64 36v48zM219 213q6 10 16 16v51q-22 -6 -41.5 -25.5t-25.5 -41.5h51zM235 155q-10 6 -16 16h-51q6 -22 25.5 -41.5t41.5 -25.5v51zM87 171q7 -55 50 -98t98 -50v48
+q-35 7 -64 36t-36 64h-48zM277 23q55 7 98 50t50 98h-48q-7 -35 -36 -64t-64 -36v-48zM377 213h48q-7 55 -50 98t-98 50v-48q35 -7 64 -36t36 -64z" />
+    <glyph glyph-name="trusted_organization" unicode="trusted_organization" horiz-adv-x="299" 
+d="M299 256q0 -21 -9 -45t-23.5 -45t-32.5 -33l65 -112l-48 -3l-26 -39l-74 128h-0.5h-1.5h-1l-74 -128l-26 40l-48 2l65 112q-27 19 -46 55t-19 68q0 62 44 105.5t105.5 43.5t105.5 -43.5t44 -105.5zM43 256q0 -44 31 -75.5t75 -31.5t75.5 31.5t31.5 75.5t-31.5 75.5
+t-75.5 31.5t-75 -31.5t-31 -75.5zM85 256q0 27 19 45.5t45.5 18.5t45 -18.5t18.5 -45.5t-18.5 -45.5t-45 -18.5t-45.5 18.5t-19 45.5z" />
+    <glyph glyph-name="virtual_guest" unicode="virtual_guest" horiz-adv-x="469" 
+d="M427 405q17 0 29.5 -12.5t12.5 -29.5v-256q0 -12 -5.5 -22t-15.5 -15.5t-21 -5.5h-150v-43h43v-42h-171v42h43v43h-149q-12 0 -22 5.5t-15.5 15.5t-5.5 22v256q0 17 12.5 29.5t30.5 12.5h384zM427 107v256h-384v-256h384zM107 299q0 8 6 14.5t15 6.5h213q9 0 15.5 -6.5
+t6.5 -14.5v-128q0 -9 -6.5 -15.5t-15.5 -6.5h-213q-9 0 -15 6.5t-6 15.5v128zM341 171v106h-213v-106h213z" />
+    <glyph glyph-name="virtual_host_manager" unicode="virtual_host_manager" horiz-adv-x="426" 
+d="M391 63q9 -1 17.5 -7.5t13 -15.5t4.5 -19v-1.5v-1.5q-2 -16 -14 -27.5t-29 -11.5q-10 0 -20.5 6t-15.5 15h-268q-5 -9 -15.5 -15t-20.5 -6h-7q-15 3 -25.5 15t-10.5 27q0 10 6 21t15 16v268q-8 6 -14.5 16.5t-6.5 20.5q0 18 12.5 30.5t30.5 12.5q15 0 27 -10.5t15 -24.5
+l177 -32q5 10 16 17t22 7q18 0 30.5 -12.5t12.5 -30.5q0 -20 -17 -33zM80 41q3 -5 4 -9h258l1 1l-41 23q-15 -14 -35 -14q-22 0 -37.5 15t-16.5 36v1v2q0 14 7 26l-26 31q-10 -3 -21 -3q-7 0 -14 2l-82 -105q2 -3 3 -6zM277 284l-35 -29q6 -15 6 -30q0 -17 -10 -35.5
+t-24 -27.5l21 -24q14 11 32 11q22 0 37.5 -15.5t15.5 -37.5v-2v-1q-1 -5 -2 -9l45 -26q2 2 5 3l-62 217h-7q-12 0 -22 6zM83 349l51 -61q18 11 39 11q15 0 31.5 -7.5t25.5 -18.5l32 27q-4 9 -4 18zM43 320v-256q9 0 17 -4l77 100q-10 5 -19 16t-14 24t-5 25q0 28 19 49
+l-48 56q-11 -10 -27 -10z" />
+    <glyph glyph-name="virtual_space" unicode="virtual_space" horiz-adv-x="427" 
+d="M213.5 405q88.5 0 151 -62.5t62.5 -150.5t-62.5 -150.5t-151 -62.5t-151 62.5t-62.5 150.5t62.5 150.5t151 62.5zM213.5 21q70.5 0 120.5 50t50 121t-50 121t-120.5 50t-120.5 -50t-50 -121t50 -121t120.5 -50zM182 288q0 13 9 22.5t22 9.5t22.5 -9.5t9.5 -22.5
+q0 -8 -4 -15.5t-11.5 -12t-16 -4.5t-16 4.5t-11.5 12t-4 15.5zM182 96q0 13 9 22.5t22 9.5t22.5 -9.5t9.5 -22.5q0 -8 -4 -15.5t-11.5 -12t-16 -4.5t-16 4.5t-11.5 12t-4 15.5zM278 192q0 13 9 22.5t22 9.5t22.5 -9.5t9.5 -22.5t-9.5 -22.5t-22.5 -9.5t-22 9.5t-9 22.5z
+M86 192q0 13 9 22.5t22 9.5t22.5 -9.5t9.5 -22.5t-9.5 -22.5t-22.5 -9.5t-22 9.5t-9 22.5zM192 192q0 9 6 15t15 6t15.5 -6t6.5 -15t-6.5 -15t-15.5 -6t-15 6t-6 15z" />
+    <glyph glyph-name="volume_binding" unicode="volume_binding" horiz-adv-x="427" 
+d="M85 43q0 -22 8 -43h-50q-18 0 -30.5 12.5t-12.5 30.5v341q0 18 12.5 30.5t30.5 12.5h213q9 0 16.5 -3.5t13.5 -9.5t9.5 -13.5t3.5 -16.5v-213h-86q-53 0 -90.5 -37.5t-37.5 -90.5zM256 405q-9 0 -15 -6t-6 -15t6 -15t15 -6t15 6t6 15t-6 15t-15 6zM149 384q-44 0 -75 -31
+t-31 -75q0 -23 9 -43h55v-55q20 -9 43 -9q44 0 75 31t31 75t-31 75.5t-75 31.5h-1zM43 405q-5 0 -9 -1.5t-6.5 -4.5t-4.5 -7t-2 -8q0 -9 6.5 -15t15 -6t15 6t6.5 15t-6.5 15t-14.5 6zM42.5 21q8.5 0 15 6.5t6.5 15t-6.5 15t-15 6.5t-15 -6.5t-6.5 -15t6.5 -15t15 -6.5z
+M107 277.5q0 17.5 12.5 30t30 12.5t30 -12.5t12.5 -30t-12.5 -30t-30 -12.5t-30 12.5t-12.5 30zM235 21v43h85v-43h-85zM341 128q36 0 61 -25t25 -60.5t-25 -60.5t-61 -25h-42v43h42q18 0 30.5 12.5t12.5 30.5q0 11 -5.5 21t-15.5 15.5t-22 5.5h-42v43h42zM256 0v-43h-43
+q-35 0 -60 25t-25 60.5t25 60.5t60 25h43v-43h-43q-11 0 -21 -5.5t-15.5 -15.5t-5.5 -21q0 -18 12.5 -30.5t29.5 -12.5h43z" />
+    <glyph glyph-name="volume" unicode="volume" horiz-adv-x="299" 
+d="M256 405q18 0 30.5 -12.5t12.5 -29.5v-342q0 -17 -12.5 -29.5t-30.5 -12.5h-213q-18 0 -30.5 12.5t-12.5 29.5v342q0 17 12.5 29.5t30.5 12.5h213zM42.5 384q-8.5 0 -15 -6.5t-6.5 -15t6.5 -15t15 -6.5t15 6.5t6.5 15t-6.5 15t-15 6.5zM42.5 0q8.5 0 15 6.5t6.5 15
+t-6.5 15t-15 6.5t-15 -6.5t-6.5 -15t6.5 -15t15 -6.5zM149 149q45 0 76 31.5t31 75.5t-31 75.5t-75.5 31.5t-75.5 -31.5t-31 -75.5q0 -22 9 -43h55v-55q20 -9 42 -9zM256 0q9 0 15 6.5t6 15t-6 15t-15 6.5t-15 -6.5t-6 -15t6 -15t15 -6.5zM256 341q6 0 11 3t7.5 8t2.5 11
+q0 8 -6 14.5t-15 6.5t-15 -6.5t-6 -15t6 -15t15 -6.5zM107 256q0 18 12.5 30.5t30 12.5t30 -12.5t12.5 -30.5t-12.5 -30.5t-30 -12.5t-30 12.5t-12.5 30.5z" />
+    <glyph glyph-name="workload" unicode="workload" horiz-adv-x="427" 
+d="M43 320v-299h298v-42h-298q-18 0 -30.5 12.5t-12.5 29.5v299h43zM171 192v43h170v-43h-170zM171 128v43h170v-43h-170zM245 342l24 -43l-24 -43h-50l-24 43l24 43h50zM384 405q18 0 30.5 -12.5t12.5 -29.5v-256q0 -12 -6 -22t-15.5 -15.5t-21.5 -5.5h-256
+q-18 0 -30.5 12.5t-12.5 30.5v256q0 11 6 21t15.5 15.5t21.5 5.5h256zM384 107v256h-256v-256h256z" />
     <glyph glyph-name="workloads" unicode="workloads" horiz-adv-x="427" 
 d="M43 320v-299h298v-42h-298q-18 0 -30.5 12.5t-12.5 29.5v299h43zM171 192v43h170v-43h-170zM171 128v43h170v-43h-170zM245 342l24 -43l-24 -43h-50l-24 43l24 43h50zM384 405q18 0 30.5 -12.5t12.5 -29.5v-256q0 -12 -6 -22t-15.5 -15.5t-21.5 -5.5h-256
 q-18 0 -30.5 12.5t-12.5 30.5v256q0 11 6 21t15.5 15.5t21.5 5.5h256zM384 107v256h-256v-256h256z" />
@@ -272,6 +518,8 @@ d="M0 0z" />
     <glyph glyph-name="h" unicode="h" 
 d="M0 0z" />
     <glyph glyph-name="i" unicode="i" 
+d="M0 0z" />
+    <glyph glyph-name="j" unicode="j" 
 d="M0 0z" />
     <glyph glyph-name="k" unicode="k" 
 d="M0 0z" />
diff --git a/src/frontend/packages/core/assets/fonts/stratos/stratos-icons.ttf b/src/frontend/packages/core/assets/fonts/stratos/stratos-icons.ttf
index cfaa5d45553aa721d769d7ea6314b819fbb67cc6..03e81ae367275d46da4e891143ee851d0ce3513d 100644
GIT binary patch
delta 33657
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

delta 6912
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%0Ay%@NPqzf$q%LMT~4aXD;
zJxZY3F(`x%^Te?c;c(^Q10q&TySu6f>}m>)1Lm%n-bG!f^BMMj2nL^s&~p*v@)K?<
zd&G#W6ZZhYUe|u`)IM=--<pS~vy~&yE}M7F%#0Q;r~$7GuXTwrpmyc8XPe8fBYi!O
z3zm-5HHuFX!{k`ua4+SB?X8<a!2pjBPD6uv<_}a^6sV6Qn$L^OM%c^N1J8=IM`Ra`
zYgcxHt?b6FTXyzu8Qwaa>1vFJ9f>7)sa)Q%>R}i4R8HlnBbDWpm}1-I$c`kt7SHw*
zWUObIcBY&4cx-KoWwJ~+NN-d9JT`o7-lI>RZqkjuXfzhM{9LW>jnTyE_;{dK4>)^j
zkKAedy?RXZdi;}vW{+X$x0_j`-X4rnpaS(sz01Pnlk<i?*;;7QJyNtb=B0<DdLZ_*
zLhI<l)@Z-(_1kwIsomoQ^q6iKJ?7w~-{aM2Q@~TtFwsG$UcrUVGdRiIgo<sy2rIvc
z+jc!JyqifDpC@+1&5x3M3-=s4*xj``6|1v?9wP4FvvWtUl50vJfkUEr=^vA2C}tYR
zfk2;h8s~=R1OzUe*fCrmxZ%FOjt)u=4Bv2l-|oKMTeoy%JF@B4hImcH4Ec4<r^v9d
zFbx|}b#umo1Cgynb~8;Svdn>GGZsrdGXUTc3V&nuQ=~95!y!S+>Xi>Z=S_1C8-ctj
z&&KCn>KLW3TWNXzy4LF!<hC|>VTd)Ju6+BshE^fHqbadXzOQLVTIiIwB_=!N(R^at
z3ydP&Dlc5uI&@2QOvU_W+_^&bz?E_NQ5nP5Zur-~rLoa3zj|=Y-}`Ig$N9l?&8O-1
z^`BQ_->Y|ij_=Y?u#0}{b-Z%ud&?&%KB^;2C3F?#!drzgqxYdakHYY*jH3Kvqm6In
zjNYYt9c}d8Ht0CA{yUf7y@0P)?)ZM9{3h;vudM%?{%V7Y&GrJy70yp>v>!nIne|^#
z)@OKD&Y_H;uraL7#(Z|8{$JFrFc_nK4F$Q*Rmogw2&w$^-}}mMa9_lYb(Mc!;Dl$y
zn0QG1lC(?tnwnI<=6S#y_MO+l+84Fo`hOMpH^Vd*jQ<Nh71|%V-;A3Nn?DU73SWvo
z61`MAS(mK)``F|4E%CDr-3|9OTud}2?rB<XKAY5&cPGD}nru1Q^7y7Bn|{#xiS*v|
zm)pMEo^1c_=8tqVc{=8qPEn3mw!QG5LZ+*|s}g_lemR3LvhAd+@^>%3J9^wDK|YD^
zfV=SxZxCO?u0zncf$Xi^_`}EOSmg^Zr7N$!)Fyk23k$QQiAw%Q-Ie$Js4>7#%ujnK
z=4aXeK9)=KXDUDWQLIIom|r=wTskw&Pb{qXCKgM}rHSI~*ol>CWwN+jJW*Vl5++Ma
zGnIG0+*kSL%kL<AW>!v2EuNWLo?7B(izkHH(wP}?4&6m<uCz2UH9K28Gc~`m<e6KU
zT`nyx7ni3(pnli<;>_5|((KgO((OyjQ*+uC*y8-k@|16Wak_Y>bcZXKvQV6uDNcj`
zLg|dUuvnUdP`6H53ybrUE0x7pT9YE0x83f;zhLH<O3U+$rKu%lacXIPWpQFkbQ$tX
z#f6Ia<E@ngKek)t<<cBPTJ|pkcVc#G>D2r@Te8Z8nw>9BE=liNoH{dcimZL&)qm0d
EA8O_h*#H0l

diff --git a/src/frontend/packages/core/assets/fonts/stratos/stratos-icons.woff b/src/frontend/packages/core/assets/fonts/stratos/stratos-icons.woff
index 6b34667c0a91e835c926f081fb3d05ff2ea6d501..15cb19f795e63d09183625a5abd8a0b4dcf9e4b4 100644
GIT binary patch
delta 32546
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
NCctO_U|9$<005lmYykiO

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

diff --git a/src/frontend/packages/core/assets/fonts/stratos/stratos-icons.woff2 b/src/frontend/packages/core/assets/fonts/stratos/stratos-icons.woff2
index 1c425babdd726b49d70e2a5a1bb8bdbf469a91c6..739e8a3ae22ec1d6205ca0d0a2470934984101c4 100644
GIT binary patch
literal 29072
zcmV(>K-j-`Pew8T0RR910CA825&!@I0PSo50C6V(0RR9100000000000000000000
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
TXxphfzWH}?odmHK00000goFXd

literal 16348
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


From 17296d41fe54c53f9aa692bd6a596f0d93519fff Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 15 May 2020 16:12:25 +0100
Subject: [PATCH 104/176] Fixes following merge

---
 .../edit-autoscaler-credential.component.ts                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts
index ad0895d862..b8446220fd 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts
@@ -16,7 +16,7 @@ import { safeUnsubscribe } from '../../../../core/src/core/utils.service';
 import { ConfirmationDialogConfig } from '../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../core/src/shared/components/confirmation-dialog.service';
 import { AppState } from '../../../../store/src/app-state';
-import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
 import { EntityService } from '../../../../store/src/entity-service';
 import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
 import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';

From 810de5ebc30325cd5a045a717ccacb059d60c7fc Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 15 May 2020 16:12:44 +0100
Subject: [PATCH 105/176] More space between create/delete and icon in manage
 credentials

---
 .../edit-autoscaler-credential.component.scss                  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.scss b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.scss
index 90941d50a4..10f365b810 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.scss
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.scss
@@ -9,6 +9,9 @@
     mat-card-header {
       align-items: center;
       display: flex;
+      mat-icon {
+        margin-right: 5px;
+      }
     }
   }
 

From a122ef97c27804e03e98996671a067d8ebb032b0 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 15 May 2020 16:12:57 +0100
Subject: [PATCH 106/176] Use autocomplete for custom metric type input field

---
 ...edit-autoscaler-policy-step2.component.html | 18 ++++++++----------
 .../edit-autoscaler-policy-step2.component.ts  | 15 ++-------------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html
index 3644b024ca..2048f67821 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html
@@ -12,22 +12,20 @@
           </mat-card-header>
           <mat-card-content class="autoscaler-policy-edit-trigger-item">
             <div *ngIf="editIndex!=index" class="autoscaler-policy-edit-trigger-item-desc">
-              If average {{rule.metric_type}} {{rule.operator}} {{rule.threshold}} {{getMetricUnit(rule.metric_type, rule.unit)}}
+              If average {{rule.metric_type}} {{rule.operator}} {{rule.threshold}}
+              {{getMetricUnit(rule.metric_type, rule.unit)}}
               for {{rule.breach_duration_secs}} seconds, then {{rule.adjustment}} instances. Cooldown:
               {{rule.cool_down_secs}} seconds.
             </div>
             <div *ngIf="editIndex==index">
               <form [formGroup]="editTriggerForm" validate>
                 If average
-                <mat-form-field *ngIf="metricTypes.length > 1" class="autoscaler-edit-select">
-                  <input matInput placeholder="Metric Type" type="text" name="metric_type"
-                    formControlName="metric_type">
-                  <mat-select class="reset-margin" placeholder="Metric Type" name="metric_type_select"
-                    formControlName="metric_type_select" required>
-                    <mat-option *ngFor="let metricType of metricTypes" [value]="metricType">
-                      {{ metricType }}
-                    </mat-option>
-                  </mat-select>
+                <mat-form-field *ngIf="metricTypes.length > 1">
+                  <input matInput placeholder="Metric Type" type="text" name="metric_type" formControlName="metric_type"
+                    [matAutocomplete]="metricTypeAuto" required>
+                  <mat-autocomplete #metricTypeAuto="matAutocomplete">
+                    <mat-option *ngFor="let metricType of metricTypes" [value]="metricType">{{metricType}}</mat-option>
+                  </mat-autocomplete>
                 </mat-form-field>
                 <mat-form-field *ngIf="metricTypes.length > 1">
                   <mat-select class="reset-margin" placeholder="Operator" name="operator" formControlName="operator"
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts
index faef01ecdd..33252d8387 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts
@@ -16,8 +16,8 @@ import {
 import {
   getThresholdMax,
   getThresholdMin,
-  numberWithFractionOrExceedRange,
   inValidMetricType,
+  numberWithFractionOrExceedRange,
 } from '../../../core/autoscaler-helpers/autoscaler-validation';
 import { AppAutoscalerInvalidPolicyError, AppAutoscalerPolicyLocal } from '../../../store/app-autoscaler.types';
 import { EditAutoscalerPolicy } from '../edit-autoscaler-policy-base-step';
@@ -58,7 +58,6 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp
     super(service, route);
     this.editTriggerForm = this.fb.group({
       metric_type: [0, [Validators.required, this.validateTriggerMetricType()]],
-      metric_type_select: [0, this.validateTriggerMetricTypeSelect()],
       operator: [0, this.validateTriggerOperator()],
       threshold: [0, [Validators.required, Validators.min(1), this.validateTriggerThreshold()]],
       unit: [0],
@@ -101,10 +100,9 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp
     this.editAdjustmentType = getAdjustmentType(this.currentPolicy.scaling_rules_form[index].adjustment);
     this.editTriggerForm.setValue({
       metric_type: this.editMetricType,
-      metric_type_select: this.editMetricType,
       operator: this.currentPolicy.scaling_rules_form[index].operator,
       threshold: this.currentPolicy.scaling_rules_form[index].threshold,
-      unit: this.currentPolicy.scaling_rules_form[index].unit || '' ,
+      unit: this.currentPolicy.scaling_rules_form[index].unit || '',
       adjustment: Math.abs(Number(this.currentPolicy.scaling_rules_form[index].adjustment)),
       breach_duration_secs: this.currentPolicy.scaling_rules_form[index].breach_duration_secs,
       cool_down_secs: this.currentPolicy.scaling_rules_form[index].cool_down_secs,
@@ -153,15 +151,6 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp
     };
   }
 
-  validateTriggerMetricTypeSelect(): ValidatorFn {
-    return (control: AbstractControl): { [key: string]: any } => {
-      if (this.editTriggerForm) {
-        this.editTriggerForm.controls.metric_type.setValue(control.value);
-      }
-      return null;
-    };
-  }
-
   validateTriggerOperator(): ValidatorFn {
     return (control: AbstractControl): { [key: string]: any } => {
       if (this.editTriggerForm) {

From 9b7bd93bed864b713b55173e72e702c75807a0f0 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 15 May 2020 17:24:32 +0100
Subject: [PATCH 107/176] Fixes following merge

---
 .../src/store/autoscaler-entity-generator.ts       |  3 +--
 .../cloud-foundry/src/cf-entity-catalog.ts         | 14 +++++++-------
 .../cloud-foundry/src/cloud-foundry.module.ts      |  4 +---
 .../cli-info-cloud-foundry.component.ts            |  6 +++---
 .../edit-space/edit-space.component.ts             |  4 ++--
 .../cloud-foundry-organization-base.component.ts   |  6 +++---
 .../cloud-foundry-space-base.component.ts          |  6 +++---
 .../core/src/core/user-favorite-helpers.ts         |  2 +-
 8 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
index 2bdd037b79..07daad6aa4 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
@@ -1,4 +1,3 @@
-import { IOrganization } from '../../../cloud-foundry/src/cf-api.types';
 import { cfEntityFactory } from '../../../cloud-foundry/src/cf-entity-factory';
 import { metricEntityType } from '../../../cloud-foundry/src/cf-entity-types';
 import { IOrgFavMetadata } from '../../../cloud-foundry/src/cf-metadata-types';
@@ -110,5 +109,5 @@ function generateMetricEntity(endpointDefinition: IStratosEndpointDefinition) {
     labelPlural: 'Autoscaler Metrics',
     endpoint: endpointDefinition,
   };
-  return new StratosCatalogEntity<IOrgFavMetadata, APIResource<IOrganization>>(definition);
+  return new StratosCatalogEntity<IOrgFavMetadata, APIResource<any>>(definition);
 }
diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-catalog.ts b/src/frontend/packages/cloud-foundry/src/cf-entity-catalog.ts
index ee85433d72..380c47cce7 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-catalog.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-catalog.ts
@@ -1,3 +1,8 @@
+import {
+  StratosBaseCatalogEntity,
+  StratosCatalogEndpointEntity,
+} from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { APIResource } from '../../store/src/types/api.types';
 import {
   IService,
   IServiceBinding,
@@ -6,7 +11,7 @@ import {
   IServicePlan,
   IServicePlanVisibility,
   IUserProvidedServiceInstance,
-} from '../../core/src/core/cf-api-svc.types';
+} from './cf-api-svc.types';
 import {
   CfEvent,
   IApp,
@@ -23,12 +28,7 @@ import {
   ISpace,
   ISpaceQuotaDefinition,
   IStack,
-} from '../../core/src/core/cf-api.types';
-import {
-  StratosBaseCatalogEntity,
-  StratosCatalogEndpointEntity,
-} from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
-import { APIResource } from '../../store/src/types/api.types';
+} from './cf-api.types';
 import { IAppFavMetadata, IBasicCFMetaData, IOrgFavMetadata, ISpaceFavMetadata } from './cf-metadata-types';
 import { AppEnvVarActionBuilders } from './entity-action-builders/application-env-var.action-builders';
 import { AppStatsActionBuilders } from './entity-action-builders/application-stats.action-builders';
diff --git a/src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts b/src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts
index 983514b240..688cf07f58 100644
--- a/src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts
@@ -2,9 +2,6 @@ import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 
 import { MDAppModule } from '../../core/src/core/md.module';
-import {
-  CloudFoundryUserProvidedServicesService,
-} from '../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { SharedModule } from '../../core/src/shared/shared.module';
 import { CfValidateEntitiesStart } from '../../store/src/actions/request.actions';
 import { EntityCatalogModule } from '../../store/src/entity-catalog.module';
@@ -23,6 +20,7 @@ import { CfUserService } from './shared/data-services/cf-user.service';
 import { CloudFoundryService } from './shared/data-services/cloud-foundry.service';
 import { LongRunningCfOperationsService } from './shared/data-services/long-running-cf-op.service';
 import { ServiceActionHelperService } from './shared/data-services/service-action-helper.service';
+import { CloudFoundryUserProvidedServicesService } from './shared/services/cloud-foundry-user-provided-services.service';
 import { CloudFoundryStoreModule } from './store/cloud-foundry.store.module';
 
 function shouldValidate(action: ICFAction, isValidated: boolean, entityInfo: RequestInfoState) {
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
index 2a7e384e12..b8c6b5c2a8 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
@@ -9,14 +9,14 @@ import { CurrentUserPermissionsChecker } from '../../../../../core/src/core/curr
 import { CurrentUserPermissions } from '../../../../../core/src/core/current-user-permissions.config';
 import { getFullEndpointApiUrl } from '../../../../../core/src/features/endpoints/endpoint-helpers';
 import { IHeaderBreadcrumb } from '../../../../../core/src/shared/components/page-header/page-header.types';
-import {
-  CloudFoundryUserProvidedServicesService,
-} from '../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { RouterNav } from '../../../../../store/src/actions/router.actions';
 import { APIResource, EntityInfo } from '../../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
 import { getPreviousRoutingState } from '../../../../../store/src/types/routing.type';
 import { IOrganization, ISpace } from '../../../cf-api.types';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../shared/services/cloud-foundry-user-provided-services.service';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers';
 import { CloudFoundryEndpointService } from '../services/cloud-foundry-endpoint.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.ts
index 4f70d85049..e1c96b852b 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space.component.ts
@@ -2,10 +2,10 @@ import { Component } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
+import { CfUserService } from '../../../shared/data-services/cf-user.service';
 import {
   CloudFoundryUserProvidedServicesService,
-} from '../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
-import { CfUserService } from '../../../shared/data-services/cf-user.service';
+} from '../../../shared/services/cloud-foundry-user-provided-services.service';
 import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers';
 import { CloudFoundryEndpointService } from '../services/cloud-foundry-endpoint.service';
 import { CloudFoundryOrganizationService } from '../services/cloud-foundry-organization.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts
index f5557a46ef..0c83c22d0f 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts
@@ -18,14 +18,14 @@ import {
   FavoritesConfigMapper,
 } from '../../../../../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
 import { IHeaderBreadcrumb } from '../../../../../../../core/src/shared/components/page-header/page-header.types';
-import {
-  CloudFoundryUserProvidedServicesService,
-} from '../../../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { EntitySchema } from '../../../../../../../store/src/helpers/entity-schema';
 import { UserFavorite } from '../../../../../../../store/src/types/user-favorites.types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CfUserService } from '../../../../../shared/data-services/cf-user.service';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../../../shared/services/cloud-foundry-user-provided-services.service';
 import { getActiveRouteCfOrgSpaceProvider } from '../../../cf.helpers';
 import { CloudFoundryEndpointService } from '../../../services/cloud-foundry-endpoint.service';
 import { CloudFoundryOrganizationService } from '../../../services/cloud-foundry-organization.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts
index 93c5bf96ff..c8c42c5c5a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts
@@ -21,14 +21,14 @@ import {
   FavoritesConfigMapper,
 } from '../../../../../../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
 import { IHeaderBreadcrumb } from '../../../../../../../../core/src/shared/components/page-header/page-header.types';
-import {
-  CloudFoundryUserProvidedServicesService,
-} from '../../../../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { RouterNav } from '../../../../../../../../store/src/actions/router.actions';
 import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
 import { CfUserService } from '../../../../../../shared/data-services/cf-user.service';
+import {
+  CloudFoundryUserProvidedServicesService,
+} from '../../../../../../shared/services/cloud-foundry-user-provided-services.service';
 import { getActiveRouteCfOrgSpaceProvider } from '../../../../cf.helpers';
 import { CloudFoundryEndpointService } from '../../../../services/cloud-foundry-endpoint.service';
 import { CloudFoundryOrganizationService } from '../../../../services/cloud-foundry-organization.service';
diff --git a/src/frontend/packages/core/src/core/user-favorite-helpers.ts b/src/frontend/packages/core/src/core/user-favorite-helpers.ts
index 73df67004c..6be08fe176 100644
--- a/src/frontend/packages/core/src/core/user-favorite-helpers.ts
+++ b/src/frontend/packages/core/src/core/user-favorite-helpers.ts
@@ -1,7 +1,7 @@
+import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
 import { IEntityMetadata } from '../../../store/src/entity-catalog/entity-catalog.types';
 import { IFavoriteMetadata, UserFavorite } from '../../../store/src/types/user-favorites.types';
 import { FavoritesConfigMapper } from '../shared/components/favorites-meta-card/favorite-config-mapper';
-import { entityCatalog } from './../../../store/src/entity-catalog/entity-catalog.service';
 
 export function isEndpointTypeFavorite(favorite: UserFavorite<IFavoriteMetadata>) {
   return !favorite.entityId;

From 76c961c30843bf7bc4d735f19b5bbb92b39e39e7 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 18 May 2020 09:17:12 +0100
Subject: [PATCH 108/176] Fixes following merge

---
 .../helm/create-release/create-release.component.ts | 13 +++++--------
 .../app/custom/helm/helm-entity-generator.ts        |  2 +-
 .../frontend/app/custom/helm/helm-testing.module.ts |  2 +-
 .../monocular-repository-list-config.service.ts     |  2 +-
 .../frontend/app/custom/helm/store/helm.effects.ts  |  8 ++++----
 .../kubernetes/kubernetes-entity-generator.ts       |  2 +-
 .../custom/kubernetes/kubernetes.testing.module.ts  |  2 +-
 .../kubernetes-pod-containers.component.ts          |  2 +-
 .../custom/kubernetes/store/kubernetes.effects.ts   |  2 +-
 .../kubernetes-summary.component.ts                 |  4 ++--
 .../kube-namespaces-filter-config.service.ts        |  6 ++----
 .../helm-release-tab-base.component.ts              |  2 +-
 .../release/tabs/helm-release-helper.service.ts     |  2 +-
 .../workloads/store/workloads-entity-generator.ts   |  8 ++++----
 .../kubernetes/workloads/store/workloads.effects.ts |  2 +-
 15 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts b/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts
index 87e87edc6b..b21b1e1910 100644
--- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts
+++ b/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts
@@ -10,7 +10,7 @@ import { BehaviorSubject, combineLatest, Observable, of, Subscription } from 'rx
 import { distinctUntilChanged, filter, first, map, pairwise, startWith, switchMap } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
+import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { EndpointsService } from '../../../core/endpoints.service';
 import { safeUnsubscribe } from '../../../core/utils.service';
 import { ConfirmationDialogConfig } from '../../../shared/components/confirmation-dialog.config';
@@ -64,7 +64,8 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     private store: Store<AppState>,
     private httpClient: HttpClient,
     private confirmDialog: ConfirmationDialogService,
-    private pmf: PaginationMonitorFactory
+    private pmf: PaginationMonitorFactory,
+    private emf: EntityMonitorFactory
   ) {
     const chart = this.route.snapshot.params;
     this.cancelUrl = `/monocular/charts/${chart.repo}/${chart.chartName}/${chart.version}`;
@@ -238,9 +239,7 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
       this.details.controls.endpoint.value);
     this.store.dispatch(action);
 
-    const namespaceEntityConfig = entityCatalog.getEntity(action);
-    const monitor = namespaceEntityConfig.getEntityMonitor(this.store, action.guid);
-    return monitor.entityRequest$.pipe(
+    return this.emf.create(action.guid, action).entityRequest$.pipe(
       pairwise(),
       filter(([oldVal, newVal]) => oldVal.creating && !newVal.creating),
       map(([, newVal]) => newVal),
@@ -271,10 +270,8 @@ export class CreateReleaseComponent implements OnInit, OnDestroy {
     const action = new HelmInstall(values);
     this.store.dispatch(action);
 
-    const releaseEntityConfig = entityCatalog.getEntity(action);
-
     // Wait for result of request
-    return releaseEntityConfig.getEntityMonitor(this.store, action.guid).entityRequest$.pipe(
+    return this.emf.create(action.guid, action).entityRequest$.pipe(
       filter(state => !!state),
       pairwise(),
       filter(([oldVal, newVal]) => (oldVal.creating && !newVal.creating)),
diff --git a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
index aef2cffc53..0fb65457a6 100644
--- a/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
+++ b/custom-src/frontend/app/custom/helm/helm-entity-generator.ts
@@ -2,7 +2,7 @@ import {
   StratosBaseCatalogEntity,
   StratosCatalogEndpointEntity,
   StratosCatalogEntity,
-} from '../../../../store/src/entity-catalog/entity-catalog-entity';
+} from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { StratosEndpointExtensionDefinition } from '../../../../store/src/entity-catalog/entity-catalog.types';
 import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
 import {
diff --git a/custom-src/frontend/app/custom/helm/helm-testing.module.ts b/custom-src/frontend/app/custom/helm/helm-testing.module.ts
index 62765f8b0d..9ee747eaf0 100644
--- a/custom-src/frontend/app/custom/helm/helm-testing.module.ts
+++ b/custom-src/frontend/app/custom/helm/helm-testing.module.ts
@@ -5,7 +5,7 @@ import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../../../store/src/entity-catalog.module';
-import { entityCatalog, TestEntityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog, TestEntityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
 import { createBasicStoreModule } from '../../../../store/testing/public-api';
 import { generateStratosEntities } from '../../base-entity-types';
 import { CoreModule } from '../../core/core.module';
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-config.service.ts
index b3d343ef8c..de28838e2b 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-config.service.ts
@@ -4,7 +4,7 @@ import { MatSnackBar } from '@angular/material';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { UnregisterEndpoint } from 'frontend/packages/store/src/actions/endpoint.actions';
-import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog';
 import { endpointSchemaKey } from 'frontend/packages/store/src/helpers/entity-factory';
 import { selectDeletionInfo } from 'frontend/packages/store/src/selectors/api.selectors';
 import { of as observableOf } from 'rxjs';
diff --git a/custom-src/frontend/app/custom/helm/store/helm.effects.ts b/custom-src/frontend/app/custom/helm/store/helm.effects.ts
index 4d3d1534dd..e79232c5d9 100644
--- a/custom-src/frontend/app/custom/helm/store/helm.effects.ts
+++ b/custom-src/frontend/app/custom/helm/store/helm.effects.ts
@@ -2,9 +2,10 @@ import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Action, Store } from '@ngrx/store';
+import { GET_ENDPOINTS_SUCCESS, GetAllEndpointsSuccess } from 'frontend/packages/store/src/actions/endpoint.actions';
 import { ClearPaginationOfType } from 'frontend/packages/store/src/actions/pagination.actions';
 import { AppState } from 'frontend/packages/store/src/app-state';
-import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog';
 import { ApiRequestTypes } from 'frontend/packages/store/src/reducers/api-request-reducer/request-helpers';
 import { NormalizedResponse } from 'frontend/packages/store/src/types/api.types';
 import {
@@ -13,11 +14,12 @@ import {
   WrapperRequestActionFailed,
   WrapperRequestActionSuccess,
 } from 'frontend/packages/store/src/types/request.types';
-import { Observable, of } from 'rxjs';
+import { Observable } from 'rxjs';
 import { catchError, flatMap, mergeMap } from 'rxjs/operators';
 
 import { environment } from '../../../environments/environment';
 import { isJetstreamError } from '../../../jetstream.helpers';
+import { HELM_ENDPOINT_TYPE } from '../helm-entity-factory';
 import {
   GET_HELM_VERSIONS,
   GET_MONOCULAR_CHARTS,
@@ -27,8 +29,6 @@ import {
   HelmInstall,
 } from './helm.actions';
 import { HelmVersion } from './helm.types';
-import { GetAllEndpointsSuccess, GET_ENDPOINTS_SUCCESS } from 'frontend/packages/store/src/actions/endpoint.actions';
-import { HELM_ENDPOINT_TYPE } from '../helm-entity-factory';
 
 @Injectable()
 export class HelmEffects {
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
index cd4b43f25a..dce03549e9 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -5,7 +5,7 @@ import {
   StratosBaseCatalogEntity,
   StratosCatalogEndpointEntity,
   StratosCatalogEntity,
-} from '../../../../store/src/entity-catalog/entity-catalog-entity';
+} from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { StratosEndpointExtensionDefinition } from '../../../../store/src/entity-catalog/entity-catalog.types';
 import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
 import { EndpointAuthTypeConfig, EndpointType } from '../../core/extension/extension-types';
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
index 9aa2016dfd..05ecca6666 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
@@ -4,7 +4,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../../../store/src/entity-catalog.module';
-import { entityCatalog, TestEntityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog, TestEntityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
 import { createBasicStoreModule } from '../../../../store/testing/public-api';
 import { generateStratosEntities } from '../../base-entity-types';
 import { CoreModule } from '../../core/core.module';
diff --git a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
index ecc31b5654..f83718f337 100644
--- a/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/list-types/kubernetes-pods/kubernetes-pod-containers/kubernetes-pod-containers.component.ts
@@ -6,7 +6,7 @@ import { of } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
 
 import { AppState } from '../../../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
 import { selectEntity } from '../../../../../../../store/src/selectors/api.selectors';
 import { BooleanIndicatorType } from '../../../../../shared/components/boolean-indicator/boolean-indicator.component';
 import { ITableListDataSource } from '../../../../../shared/components/list/data-sources-controllers/list-data-source-types';
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
index d5d36df44d..c55b3cca8a 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.effects.ts
@@ -9,7 +9,7 @@ import { of } from 'rxjs';
 import { catchError, first, flatMap, map, mergeMap, switchMap } from 'rxjs/operators';
 
 import { AppState } from '../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { NormalizedResponse } from '../../../../../store/src/types/api.types';
 import {
   StartRequestAction,
diff --git a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts
index a7c14df6ce..5f7d4cdd5d 100644
--- a/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/tabs/kubernetes-summary-tab/kubernetes-summary.component.ts
@@ -1,12 +1,13 @@
 import { HttpClient } from '@angular/common/http';
 import { Component, NgZone, OnDestroy, OnInit } from '@angular/core';
 import { SafeResourceUrl } from '@angular/platform-browser';
+import { Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { combineLatest, interval, Observable, Subscription } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 
 import { AppState } from '../../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { PaginatedAction } from '../../../../../../store/src/types/pagination.types';
@@ -17,7 +18,6 @@ import {
 } from '../../../../shared/components/simple-usage-chart/simple-usage-chart.types';
 import { KubernetesEndpointService } from '../../services/kubernetes-endpoint.service';
 import { GetKubernetesNamespaces, GetKubernetesNodes, GetKubernetesPods } from '../../store/kubernetes.actions';
-import { Router } from '@angular/router';
 
 interface IValueLabels {
   usedLabel?: string;
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts
index c41019c89a..6132e3fc47 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/list-types/kube-namespaces-filter-config.service.ts
@@ -3,10 +3,7 @@ import { Store } from '@ngrx/store';
 import { safeUnsubscribe } from 'frontend/packages/core/src/core/utils.service';
 import { AppState } from 'frontend/packages/store/src/app-state';
 import { PaginationMonitorFactory } from 'frontend/packages/store/src/monitors/pagination-monitor.factory';
-import {
-  getCurrentPageRequestInfo,
-  getPaginationObservables,
-} from 'frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper';
+import { getPaginationObservables } from 'frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { connectedEndpointsOfTypesSelector } from 'frontend/packages/store/src/selectors/endpoint.selectors';
 import { EndpointModel } from 'frontend/packages/store/src/types/endpoint.types';
 import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
@@ -22,6 +19,7 @@ import {
   withLatestFrom,
 } from 'rxjs/operators';
 
+import { getCurrentPageRequestInfo } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
 import { KUBERNETES_ENDPOINT_TYPE, kubernetesEntityFactory } from '../../kubernetes-entity-factory';
 import { KubernetesNamespace } from '../../store/kube.types';
 import { GetKubernetesNamespaces } from '../../store/kubernetes.actions';
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
index 0787289ab5..f3d8d9927a 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-tab-base.component.ts
@@ -4,7 +4,7 @@ import { Store } from '@ngrx/store';
 import { LoggerService } from 'frontend/packages/core/src/core/logger.service';
 import { IPageSideNavTab } from 'frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component';
 import { AppState } from 'frontend/packages/store/src/app-state';
-import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog';
 import { PaginatedAction } from 'frontend/packages/store/src/types/pagination.types';
 import { EntityRequestAction, WrapperRequestActionSuccess } from 'frontend/packages/store/src/types/request.types';
 import { Observable, Subject, Subscription } from 'rxjs';
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
index 723a77bd33..aa8a7b73c9 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/release/tabs/helm-release-helper.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { AppState } from 'frontend/packages/store/src/app-state';
-import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from 'frontend/packages/store/src/entity-catalog/entity-catalog';
 import { EntityServiceFactory } from 'frontend/packages/store/src/entity-service-factory.service';
 import { PaginationMonitorFactory } from 'frontend/packages/store/src/monitors/pagination-monitor.factory';
 import { selectEntity } from 'frontend/packages/store/src/selectors/api.selectors';
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts
index cddd1778f4..3f326da1ed 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads-entity-generator.ts
@@ -1,10 +1,10 @@
-import {
-  StratosBaseCatalogEntity,
-  StratosCatalogEntity,
-} from 'frontend/packages/store/src/entity-catalog/entity-catalog-entity';
 import { StratosEndpointExtensionDefinition } from 'frontend/packages/store/src/entity-catalog/entity-catalog.types';
 import { IFavoriteMetadata } from 'frontend/packages/store/src/types/user-favorites.types';
 
+import {
+  StratosBaseCatalogEntity,
+  StratosCatalogEntity,
+} from '../../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { kubernetesEntityFactory } from '../../kubernetes-entity-factory';
 import { HelmRelease, HelmReleaseGraph, HelmReleaseResource } from '../workload.types';
 import { helmReleaseEntityKey, helmReleaseGraphEntityType, helmReleaseResourceEntityType } from './workloads-entity-factory';
diff --git a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts
index 10656a97fc..086bc29fd8 100644
--- a/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts
+++ b/custom-src/frontend/app/custom/kubernetes/workloads/store/workloads.effects.ts
@@ -7,7 +7,7 @@ import { Observable } from 'rxjs';
 import { catchError, flatMap, mergeMap } from 'rxjs/operators';
 
 import { AppState } from '../../../../../../store/src/app-state';
-import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
+import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
 import { NormalizedResponse } from '../../../../../../store/src/types/api.types';
 import {
   EntityRequestAction,

From 83c114a281fa4e2524c999c5a5737830d53b98c2 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 18 May 2020 12:17:21 +0100
Subject: [PATCH 109/176] Fix autocomplete, improve e2e tests

---
 protractor.conf.js                                        | 2 +-
 .../edit-autoscaler-policy-step2.component.html           | 3 ++-
 .../edit-autoscaler-policy-step2.component.ts             | 8 +++++++-
 .../application/application-autoscaler-e2e.spec.ts        | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/protractor.conf.js b/protractor.conf.js
index 5c7242d12d..5e03887be3 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -235,7 +235,7 @@ const config = {
         if (resp.statusCode >= 400) {
           defer.reject('Failed to validate Github API Url. Status Code: ' + resp.statusCode);
         } else {
-          defer.fulfill('Github API Url responding');
+          defer.fulfill('Validated Github API Url successfully');
         }
       })
       .on("error", (err) => {
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html
index 2048f67821..086ffacca1 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.html
@@ -24,7 +24,8 @@
                   <input matInput placeholder="Metric Type" type="text" name="metric_type" formControlName="metric_type"
                     [matAutocomplete]="metricTypeAuto" required>
                   <mat-autocomplete #metricTypeAuto="matAutocomplete">
-                    <mat-option *ngFor="let metricType of metricTypes" [value]="metricType">{{metricType}}</mat-option>
+                    <mat-option *ngFor="let metricType of filteredMetricTypes$ | async" [value]="metricType">
+                      {{metricType}}</mat-option>
                   </mat-autocomplete>
                 </mat-form-field>
                 <mat-form-field *ngIf="metricTypes.length > 1">
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts
index 33252d8387..3c4df6dc89 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.ts
@@ -3,7 +3,7 @@ import { AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators } from
 import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material/core';
 import { ActivatedRoute } from '@angular/router';
 import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map, startWith } from 'rxjs/operators';
 
 import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
 import { safeUnsubscribe } from '../../../../../core/src/core/utils.service';
@@ -35,6 +35,7 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp
 
   policyAlert = PolicyAlert;
   metricTypes = AutoscalerConstants.MetricTypes;
+  filteredMetricTypes$: Observable<string[]>;
   private metricUnitSubject = new BehaviorSubject(this.metricTypes[0]);
   metricUnit$: Observable<string>;
   operatorTypes = AutoscalerConstants.UpperOperators.concat(AutoscalerConstants.LowerOperators);
@@ -78,6 +79,11 @@ export class EditAutoscalerPolicyStep2Component extends EditAutoscalerPolicy imp
     this.subs.push(this.editTriggerForm.get('metric_type').valueChanges.pipe(
       map(value => this.getMetricUnit(value)),
     ).subscribe(unit => this.metricUnitSubject.next(unit)));
+
+    this.filteredMetricTypes$ = this.editTriggerForm.controls.metric_type.valueChanges.pipe(
+      startWith(''),
+      map(value => this.metricTypes.filter(type => type.toLocaleLowerCase().includes(value)))
+    )
   }
 
   addTrigger = () => {
diff --git a/src/test-e2e/application/application-autoscaler-e2e.spec.ts b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
index 2ba7f2faf6..e4c148492f 100644
--- a/src/test-e2e/application/application-autoscaler-e2e.spec.ts
+++ b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
@@ -88,7 +88,7 @@ describe('Autoscaler -', () => {
     });
 
     it('Check edit steps', () => {
-      expect(createPolicy.header.getTitleText()).toBe('Create AutoScaler Policy: ' + testAppName);
+      createPolicy.header.waitForTitleText('Create AutoScaler Policy: ' + testAppName)
       // Check the steps
       e2e.debugLog(`${loggingPrefix} Checking Steps`);
       createPolicy.stepper.getStepNames().then(steps => {

From 63aa409140e6f49f94526f7eca9a1697cb5c561a Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 18 May 2020 13:51:26 +0100
Subject: [PATCH 110/176] Fix alignment of table headers

---
 src/frontend/packages/core/sass/components/mat-table.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/packages/core/sass/components/mat-table.scss b/src/frontend/packages/core/sass/components/mat-table.scss
index ebb8b6457e..6eef03a63d 100644
--- a/src/frontend/packages/core/sass/components/mat-table.scss
+++ b/src/frontend/packages/core/sass/components/mat-table.scss
@@ -12,7 +12,7 @@ $mat-table-header-paginator-font-size: 13px;
 .stratos {
 
   // Only put right padding between cells
-  .mat-cell {
+  .mat-cell, .mat-header-cell {
     padding: 10px 10px 10px 0;
   }
 

From 34df5c3651baf537d8f07b618258bbd70d3aabc6 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 18 May 2020 13:52:03 +0100
Subject: [PATCH 111/176] Fix manage users header/row cells given checkbox
 hover/focus graphic

---
 .../manage-users-modify/manage-users-modify.component.ts    | 6 +++++-
 .../cf-users-space-roles-list-config.service.ts             | 3 +++
 .../shared/components/list/list-table/table.component.scss  | 6 ++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.ts
index 1db4ca0090..2431aa404f 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-modify/manage-users-modify.component.ts
@@ -83,6 +83,7 @@ export class UsersRolesModifyComponent implements OnInit, OnDestroy {
       columnId: 'manager',
       headerCell: () => 'Manager',
       cellComponent: TableCellRoleOrgSpaceComponent,
+      class: 'app-table__cell--table-column-additional-padding',
       cellConfig: {
         role: OrgUserRoleNames.MANAGER
       }
@@ -91,6 +92,7 @@ export class UsersRolesModifyComponent implements OnInit, OnDestroy {
       columnId: 'auditor',
       headerCell: () => 'Auditor',
       cellComponent: TableCellRoleOrgSpaceComponent,
+      class: 'app-table__cell--table-column-additional-padding',
       cellConfig: {
         role: OrgUserRoleNames.AUDITOR
       }
@@ -99,6 +101,7 @@ export class UsersRolesModifyComponent implements OnInit, OnDestroy {
       columnId: 'billingManager',
       headerCell: () => 'Billing Manager',
       cellComponent: TableCellRoleOrgSpaceComponent,
+      class: 'app-table__cell--table-column-additional-padding',
       cellConfig: {
         role: OrgUserRoleNames.BILLING_MANAGERS
       }
@@ -107,6 +110,7 @@ export class UsersRolesModifyComponent implements OnInit, OnDestroy {
       columnId: 'user',
       headerCell: () => 'User',
       cellComponent: TableCellRoleOrgSpaceComponent,
+      class: 'app-table__cell--table-column-additional-padding',
       cellConfig: {
         role: OrgUserRoleNames.USER
       }
@@ -304,7 +308,7 @@ export class UsersRolesModifyComponent implements OnInit, OnDestroy {
       this.store.select(selectUsersIsRemove).pipe(first()),
       this.cfRolesService.createRolesDiff(this.selectedOrgGuid)
     ]).pipe(
-      map(([isRemove, ]) => {
+      map(([isRemove,]) => {
         if (isRemove) {
           // If we're going to eventually remove the roles flip the add to remove
           this.store.dispatch(new UsersRolesFlipSetRoles());
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-list-config.service.ts
index 9f2cabb6aa..a45600a20b 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/cf-users-space-roles-list-config.service.ts
@@ -42,6 +42,7 @@ export class CfUsersSpaceRolesListConfigService implements IListConfig<APIResour
     columnId: 'manager',
     headerCell: () => 'Manager',
     cellComponent: TableCellRoleOrgSpaceComponent,
+    class: 'app-table__cell--table-column-additional-padding',
     cellConfig: {
       role: SpaceUserRoleNames.MANAGER,
       isSpace: true
@@ -50,6 +51,7 @@ export class CfUsersSpaceRolesListConfigService implements IListConfig<APIResour
     columnId: 'auditor',
     headerCell: () => 'Auditor',
     cellComponent: TableCellRoleOrgSpaceComponent,
+    class: 'app-table__cell--table-column-additional-padding',
     cellConfig: {
       role: SpaceUserRoleNames.AUDITOR,
       isSpace: true
@@ -58,6 +60,7 @@ export class CfUsersSpaceRolesListConfigService implements IListConfig<APIResour
     columnId: 'developer',
     headerCell: () => 'Developer',
     cellComponent: TableCellRoleOrgSpaceComponent,
+    class: 'app-table__cell--table-column-additional-padding',
     cellConfig: {
       role: SpaceUserRoleNames.DEVELOPER,
       isSpace: true
diff --git a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.scss b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.scss
index a6c0e9a071..8c2db26e14 100644
--- a/src/frontend/packages/core/src/shared/components/list/list-table/table.component.scss
+++ b/src/frontend/packages/core/src/shared/components/list/list-table/table.component.scss
@@ -87,6 +87,12 @@ mat-header-cell {
         word-break: break-all;
       }
     }
+
+    &--table-column-additional-padding {
+      app-table-cell {
+        padding-left: 15px;
+      }
+    }
   }
 
   &__row {

From ee3b841bde6c7949c2e1f3581de33b8fca01852d Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 18 May 2020 14:23:55 +0100
Subject: [PATCH 112/176] Fix list header left padding (aligns with cell
 padding)

---
 .../core/src/shared/components/list/list.component.scss       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.scss b/src/frontend/packages/core/src/shared/components/list/list.component.scss
index 2756aa86c1..d79a513a6a 100644
--- a/src/frontend/packages/core/src/shared/components/list/list.component.scss
+++ b/src/frontend/packages/core/src/shared/components/list/list.component.scss
@@ -17,6 +17,10 @@
     }
   }
 
+  .list-component__header-card {
+    padding-left: 20px;
+  }
+
   &__cards {
     .list-component__header-card {
       margin-bottom: 20px;

From d66b6c4d183c718d0663bc452c026cfac46bfcfe Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 18 May 2020 14:24:11 +0100
Subject: [PATCH 113/176] Fix event table given no left padding

---
 .../list/list-types/cf-events/cf-events-config.service.ts   | 6 +-----
 .../table-cell-event-actee.component.scss                   | 1 +
 .../table-cell-event-action.component.scss                  | 1 +
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/cf-events-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/cf-events-config.service.ts
index 10bf21bcfd..5b8c9b9e86 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/cf-events-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/cf-events-config.service.ts
@@ -50,11 +50,7 @@ export class CfEventsConfigService extends ListConfig<APIResource> implements IL
       columnId: 'detail', headerCell: () => 'Detail', cellComponent: TableCellEventDetailComponent, cellFlex: '6'
     },
     {
-      columnId: 'timestamp',
-      headerCell: () => 'Timestamp',
-      cellComponent: TableCellEventTimestampComponent,
-      sort: true,
-      cellFlex: '3'
+      columnId: 'timestamp', headerCell: () => 'Timestamp', cellComponent: TableCellEventTimestampComponent, sort: true, cellFlex: '3'
     },
   ];
   viewType = ListViewTypes.TABLE_ONLY;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-actee/table-cell-event-actee.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-actee/table-cell-event-actee.component.scss
index 5153bfd330..b1aab5797b 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-actee/table-cell-event-actee.component.scss
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-actee/table-cell-event-actee.component.scss
@@ -3,6 +3,7 @@
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
+  word-break: break-word;
 
   mat-icon {
     // Note - Should be 5px but some icons aren't 24x24 (`service-instance`)
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-action/table-cell-event-action.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-action/table-cell-event-action.component.scss
index aa898743b3..98ff207857 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-action/table-cell-event-action.component.scss
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/table-cell-event-action/table-cell-event-action.component.scss
@@ -3,6 +3,7 @@ div {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
+  word-break: break-word;
 
   mat-icon {
     margin-right: 10px;

From d5a249aa8173b95c3e4ccf5a4e81bd968f7efff3 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 18 May 2020 14:55:11 +0100
Subject: [PATCH 114/176] Fix Manage Users Stepper timeout

---
 src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts | 2 +-
 src/test-e2e/po/checkbox.po.ts                              | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts b/src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts
index f2fdc7f861..8906a184fe 100644
--- a/src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts
+++ b/src/test-e2e/cloud-foundry/manage-users-stepper-e2e.spec.ts
@@ -69,7 +69,7 @@ describe('Manage Users Stepper', () => {
         const selectUser = new CheckboxComponent(usersTable.table.getCell(usersRow, 0));
         selectUser.scrollIntoView();
         selectUser.waitUntilShown();
-        selectUser.getComponent().click();
+        selectUser.click();
 
         const usersButton = usersTable.header.getIconButton('people');
         browser.wait(until.visibilityOf(usersButton));
diff --git a/src/test-e2e/po/checkbox.po.ts b/src/test-e2e/po/checkbox.po.ts
index 4838289ddc..efb3015053 100644
--- a/src/test-e2e/po/checkbox.po.ts
+++ b/src/test-e2e/po/checkbox.po.ts
@@ -1,4 +1,4 @@
-import { promise, by, ElementFinder, element } from 'protractor';
+import { by, element, ElementFinder, promise } from 'protractor';
 
 import { Component } from './component.po';
 
@@ -15,4 +15,8 @@ export class CheckboxComponent extends Component {
   isDisabled(): promise.Promise<boolean> {
     return this.locator.element(by.css(`input`)).isEnabled().then(enabled => !enabled);
   }
+
+  click(): promise.Promise<void> {
+    return this.getComponent().element(by.css('.mat-checkbox-inner-container')).click();
+  }
 }

From 447ef24efc4f83ab43d1abf3089bb2bcee88b9ee Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 18 May 2020 15:19:39 +0100
Subject: [PATCH 115/176] Fix unit tests

---
 .../edit-quota-step/edit-quota-step.component.spec.ts          | 1 -
 .../edit-space-quota-step.component.spec.ts                    | 1 -
 .../specify-user-provided-details.component.spec.ts            | 3 ---
 3 files changed, 5 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts
index 996a04123b..3267ef2916 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-quota/edit-quota-step/edit-quota-step.component.spec.ts
@@ -3,7 +3,6 @@ import { ActivatedRoute } from '@angular/router';
 
 import { CFBaseTestModules } from '../../../../../../cloud-foundry/test-framework/cf-test-helper';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
-import { CFBaseTestModules } from '../../../../../test-framework/cf-test-helper';
 import { QuotaDefinitionFormComponent } from '../../quota-definition-form/quota-definition-form.component';
 import { EditQuotaStepComponent } from './edit-quota-step.component';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts
index e10d1294eb..052372456f 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space-quota/edit-space-quota-step/edit-space-quota-step.component.spec.ts
@@ -3,7 +3,6 @@ import { ActivatedRoute } from '@angular/router';
 
 import { CFBaseTestModules } from '../../../../../../cloud-foundry/test-framework/cf-test-helper';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
-import { CFBaseTestModules } from '../../../../../test-framework/cf-test-helper';
 import { SpaceQuotaDefinitionFormComponent } from '../../space-quota-definition-form/space-quota-definition-form.component';
 import { EditSpaceQuotaStepComponent } from './edit-space-quota-step.component';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.spec.ts
index ee1f97e4ac..4fa276d943 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.spec.ts
@@ -2,9 +2,6 @@ import { HttpClientModule } from '@angular/common/http';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import {
-  CloudFoundryUserProvidedServicesService,
-} from '../../../../../../core/src/shared/services/cloud-foundry-user-provided-services.service';
 import { generateCfBaseTestModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { AppNameUniqueDirective } from '../../../directives/app-name-unique.directive/app-name-unique.directive';
 import { CloudFoundryUserProvidedServicesService } from '../../../services/cloud-foundry-user-provided-services.service';

From d2518e80382d7fffff3207918753cbd3f2f2ed48 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 18 May 2020 15:39:18 +0100
Subject: [PATCH 116/176] Move cf-entity-relations.getters to entity-relations
 folder

---
 .../cloud-foundry/src/cf-entity-generator.ts  |  2 +-
 .../cf-entity-relations.getters.ts            | 26 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)
 rename src/frontend/packages/cloud-foundry/src/{ => entity-relations}/cf-entity-relations.getters.ts (80%)

diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
index 950ce24dd6..4ab1f13fa9 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -53,7 +53,6 @@ import {
 } from './cf-api.types';
 import { cfEntityCatalog } from './cf-entity-catalog';
 import { cfEntityFactory } from './cf-entity-factory';
-import { addCfQParams, addCfRelationParams } from './cf-entity-relations.getters';
 import {
   appEnvVarsEntityType,
   applicationEntityType,
@@ -159,6 +158,7 @@ import {
   userProvidedServiceActionBuilder,
 } from './entity-action-builders/user-provided-service.action-builders';
 import { UserActionBuilders, userActionBuilders } from './entity-action-builders/user.action-builders';
+import { addCfQParams, addCfRelationParams } from './entity-relations/cf-entity-relations.getters';
 import { CfEndpointDetailsComponent } from './shared/components/cf-endpoint-details/cf-endpoint-details.component';
 import { updateApplicationRoutesReducer } from './store/reducers/application-route.reducer';
 import { updateOrganizationQuotaReducer } from './store/reducers/organization-quota.reducer';
diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-relations.getters.ts b/src/frontend/packages/cloud-foundry/src/entity-relations/cf-entity-relations.getters.ts
similarity index 80%
rename from src/frontend/packages/cloud-foundry/src/cf-entity-relations.getters.ts
rename to src/frontend/packages/cloud-foundry/src/entity-relations/cf-entity-relations.getters.ts
index b8cf91950c..d8a9527deb 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-relations.getters.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-relations/cf-entity-relations.getters.ts
@@ -1,26 +1,26 @@
 import { HttpParams, HttpRequest } from '@angular/common/http';
 
-import { InternalAppState } from '../../store/src/app-state';
-import { entityCatalog } from '../../store/src/entity-catalog/entity-catalog';
-import { StratosBaseCatalogEntity } from '../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
-import { EntityCatalogEntityConfig } from '../../store/src/entity-catalog/entity-catalog.types';
+import { InternalAppState } from '../../../store/src/app-state';
+import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
+import { StratosBaseCatalogEntity } from '../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
+import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
 import {
   getPaginationParams,
-} from '../../store/src/entity-request-pipeline/pagination-request-base-handlers/get-params.pipe';
-import { selectPaginationState } from '../../store/src/selectors/pagination.selectors';
-import { isPaginatedAction, PaginatedAction, PaginationParam } from '../../store/src/types/pagination.types';
-import { EntityRequestAction } from '../../store/src/types/request.types';
-import { listEntityRelations } from './entity-relations/entity-relations';
-import { EntityInlineParentAction, isEntityInlineParentAction } from './entity-relations/entity-relations.types';
-import { QParam } from './shared/q-param';
+} from '../../../store/src/entity-request-pipeline/pagination-request-base-handlers/get-params.pipe';
+import { selectPaginationState } from '../../../store/src/selectors/pagination.selectors';
+import { isPaginatedAction, PaginatedAction, PaginationParam } from '../../../store/src/types/pagination.types';
+import { EntityRequestAction } from '../../../store/src/types/request.types';
+import { QParam } from '../shared/q-param';
+import { listEntityRelations } from './entity-relations';
+import { EntityInlineParentAction, isEntityInlineParentAction } from './entity-relations.types';
 
-export function getEntityRelationsForEntityRequest(action: EntityInlineParentAction & EntityRequestAction) {
+function getEntityRelationsForEntityRequest(action: EntityInlineParentAction & EntityRequestAction) {
   return listEntityRelations(
     action,
   );
 }
 
-export function getEntityRelationsForPaginationRequest(action: EntityInlineParentAction & PaginatedAction) {
+function getEntityRelationsForPaginationRequest(action: EntityInlineParentAction & PaginatedAction) {
   if (action.__forcedPageEntityConfig__) {
     const entityConfig = action.__forcedPageEntityConfig__ as EntityCatalogEntityConfig;
     const catalogEntity = entityCatalog.getEntity(entityConfig.endpointType, entityConfig.entityType);

From 95069b93237fe3b663c4cba16892dcdbe9a9d3d1 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 18 May 2020 15:50:00 +0100
Subject: [PATCH 117/176] Review fixes

---
 .../cli-info-cloud-foundry.component.ts                  | 1 -
 .../packages/store/src/reducers/routing.reducer.ts       | 9 +++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
index e8b90dc72e..646025f4b5 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cli-info-cloud-foundry/cli-info-cloud-foundry.component.ts
@@ -101,7 +101,6 @@ export class CliInfoCloudFoundryComponent implements OnInit {
   private setupRouteObservable(defaultBackLink: string) {
     this.route$ = this.store.select(getPreviousRoutingState).pipe(
       map(route => {
-        console.log(route);
         return {
           url: route && route.state ? route.state.url : defaultBackLink,
           queryParams: route && route.state && route.state.queryParams ? route.state.queryParams : {}
diff --git a/src/frontend/packages/store/src/reducers/routing.reducer.ts b/src/frontend/packages/store/src/reducers/routing.reducer.ts
index e1c86325c3..0434a9bf1c 100644
--- a/src/frontend/packages/store/src/reducers/routing.reducer.ts
+++ b/src/frontend/packages/store/src/reducers/routing.reducer.ts
@@ -1,5 +1,6 @@
-import { RoutingHistory, defaultRoutingState } from '../types/routing.type';
-import { RouterNavigationAction, ROUTER_NAVIGATION } from '@ngrx/router-store';
+import { ROUTER_NAVIGATION, RouterNavigationAction } from '@ngrx/router-store';
+
+import { defaultRoutingState, RoutingHistory } from '../types/routing.type';
 
 export interface RouterRedirect {
   path: string;
@@ -20,8 +21,8 @@ export function routingReducer(state: RoutingHistory = defaultRoutingState, acti
         return state;
       }
 
-      // This changed in Anagular 9 - state no longer embdedded
-      // This deuiplicated the rotuerState
+      // This changed in Angular 9 - state no longer embdedded
+      // This deduplicated the rotuerState
       // We will keep it as before
       return {
         // ATM don't track change of route history

From d1e8abdb8c268a293228f74e0a31370de86683b8 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 18 May 2020 15:51:01 +0100
Subject: [PATCH 118/176] Increase node max old space size

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fcb4d00142..6e13f65f74 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "test-backend": "./build/bk-build.sh test",
     "update-webdriver": "webdriver-manager update",
     "build": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng build --prod",
-    "build-cf": "node --max_old_space_size=2692 --gc_interval=100 node_modules/@angular/cli/bin/ng build --prod",
+    "build-cf": "node --max_old_space_size=1500 --gc_interval=100 node_modules/@angular/cli/bin/ng build --prod",
     "build-dev": "ng build --dev",
     "prebuild-ui": "npm run customize && npm run build && gulp package-prebuild",
     "ng": "ng",

From 8078842e3228ac29ce4f1be148c7271effb16090 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 18 May 2020 16:06:40 +0100
Subject: [PATCH 119/176] Fix Autoscaler material imports for Angular 9

---
 .../edit-autoscaler-credential.component.ts              | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts
index b8446220fd..e2f4f14a6d 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.ts
@@ -1,12 +1,7 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
-import {
-  ErrorStateMatcher,
-  MatSnackBar,
-  MatSnackBarRef,
-  ShowOnDirtyErrorStateMatcher,
-  SimpleSnackBar,
-} from '@angular/material';
+import { ErrorStateMatcher, ShowOnDirtyErrorStateMatcher } from '@angular/material/core';
+import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';
 import { Store } from '@ngrx/store';
 import { BehaviorSubject, Observable, Subscription } from 'rxjs';
 import { delay, filter, first, map, pairwise, publishReplay, refCount, tap } from 'rxjs/operators';

From 826035338012bffac8017ecdec5c430e70550f50 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 18 May 2020 17:53:34 +0100
Subject: [PATCH 120/176] Multiple Changes - Move mock unit test classes into
 CF module - Move metric entity type string into common code - Move entity
 validation hook into entity config - Create entities validation hook in
 entity config - Remove some 'move to cf' comments - Move AppEffects to cf
 module

---
 .../autoscaler-base.component.spec.ts         |  4 +-
 .../autoscaler-metric-page.component.spec.ts  |  2 +-
 ...caler-scale-history-page.component.spec.ts |  2 +-
 ...autoscaler-tab-extension.component.spec.ts |  4 +-
 ...-autoscaler-policy-step1.component.spec.ts |  4 +-
 ...-autoscaler-policy-step2.component.spec.ts |  4 +-
 ...-autoscaler-policy-step3.component.spec.ts |  4 +-
 ...-autoscaler-policy-step4.component.spec.ts |  4 +-
 .../edit-autoscaler-policy.component.spec.ts  |  4 +-
 .../card-autoscaler-default.component.spec.ts |  2 +-
 ...p-autoscaler-events-config.service.spec.ts |  4 +-
 ...scaler-metric-chart-card.component.spec.ts |  4 +-
 .../combo-series-vertical.component.spec.ts   |  4 +-
 ...r-metric-chart-list-config.service.spec.ts |  4 +-
 .../src/store/autoscaler-entity-factory.ts    |  4 +
 .../src/store/autoscaler-entity-generator.ts  |  5 +-
 .../cloud-foundry/src/cf-api.types.ts         |  2 -
 .../cloud-foundry/src/cf-entity-factory.ts    | 36 ++++-----
 .../cloud-foundry/src/cf-entity-generator.ts  | 76 ++++++++++++++++++-
 .../cloud-foundry/src/cf-entity-types.ts      |  1 -
 .../cloud-foundry/src/cloud-foundry.module.ts | 44 -----------
 .../application-delete.component.spec.ts      |  2 +-
 .../delete-app-instances.component.spec.ts    |  2 +-
 .../delete-app-routes.component.spec.ts       |  2 +-
 .../applications/application.service.spec.ts  |  2 +-
 .../application-poll.component.spec.ts        |  2 +-
 .../application-tabs-base.component.spec.ts   |  2 +-
 .../build-tab/build-tab.component.spec.ts     |  2 +-
 .../gitscm-tab/gitscm-tab.component.spec.ts   |  2 +-
 .../instances-tab.component.spec.ts           |  2 +-
 .../log-stream-tab.component.spec.ts          |  4 +-
 .../metrics-tab/metrics-tab.component.spec.ts |  4 +-
 .../routes-tab/routes-tab.component.spec.ts   |  4 +-
 .../services-tab.component.spec.ts            |  4 +-
 .../variables-tab.component.spec.ts           |  2 +-
 .../cli-info-application.component.spec.ts    |  2 +-
 .../edit-application.component.spec.ts        |  4 +-
 .../add-route-stepper.component.spec.ts       |  2 +-
 .../add-routes/add-routes.component.spec.ts   |  2 +-
 .../map-routes/map-routes.component.spec.ts   |  2 +-
 .../ssh-application.component.spec.ts         |  2 +-
 .../add-quota/add-quota.component.ts          |  2 -
 .../edit-space-step.component.spec.ts         |  2 +-
 .../cloud-foundry-cell-base.component.ts      |  2 +-
 ...ndry-organization-spaces.component.spec.ts |  2 +-
 ...cloud-foundry-space-apps.component.spec.ts |  8 +-
 ...oud-foundry-space-routes.component.spec.ts |  8 +-
 ...-space-service-instances.component.spec.ts |  4 +-
 ...ud-foundry-space-summary.component.spec.ts |  4 +-
 ...e-user-service-instances.component.spec.ts |  6 +-
 ...loud-foundry-space-users.component.spec.ts |  8 +-
 ...dry-organization-summary.component.spec.ts |  6 +-
 ...undry-organization-users.component.spec.ts |  6 +-
 .../manage-users.component.spec.ts            |  2 +-
 .../remove-user/remove-user.component.spec.ts |  4 +-
 .../card-app-instances.component.spec.ts      |  2 +-
 .../card-app-status.component.spec.ts         |  4 +-
 .../card-app-uptime.component.spec.ts         |  2 +-
 .../card-app-usage.component.spec.ts          |  2 +-
 ...card-cf-org-user-details.component.spec.ts | 12 +--
 .../card-cf-space-details.component.spec.ts   | 10 +--
 .../cf-role-checkbox.component.spec.ts        |  4 +-
 .../cf-app-instances-config.service.spec.ts   |  4 +-
 .../cf-app-instances-config.service.ts        |  1 -
 ...app-map-routes-list-config.service.spec.ts |  2 +-
 .../cf-app-routes-list-config.service.spec.ts |  2 +-
 ...app-service-binding-card.component.spec.ts |  4 +-
 ...ervice-binding-list-config.service.spec.ts |  2 +-
 ...-app-variables-list-config.service.spec.ts |  2 +-
 .../cf-cell-apps/cf-cell-apps-source.ts       |  2 -
 .../cf-cell-health-list-config.service.ts     |  5 --
 .../cf-cells/cf-cells-data-source.ts          |  7 +-
 .../cf-org-users-list-config.service.spec.ts  |  2 +-
 ...cell-route-apps-attached.component.spec.ts |  2 +-
 .../cf-space-apps-list-config.service.spec.ts |  2 +-
 ...f-space-routes-list-config.service.spec.ts |  2 +-
 ...cf-space-users-list-config.service.spec.ts |  4 +-
 ...vice-instances-list-config.service.spec.ts |  2 +-
 .../table-cell-service.component.ts           |  2 -
 ...able-cell-org-space-role.component.spec.ts |  2 +-
 .../table-cell-select-org.component.spec.ts   |  4 +-
 .../cf-user-list-config.service.spec.ts       |  4 +-
 ...b-commits-list-config-base.service.spec.ts |  3 +-
 .../src/store/cloud-foundry.store.module.ts   |  4 +-
 .../src/store}/effects/app.effects.ts         | 16 ++--
 .../application-service-helper.ts             | 19 ++---
 .../cloud-foundry-endpoint-service.helper.ts  |  2 +-
 ...cloud-foundry-organization.service.mock.ts |  2 -
 .../cloud-foundry-space.service.mock.ts       |  6 +-
 .../test-framework/user-service-helper.ts     |  2 +-
 .../packages/core/src/base-entity-schemas.ts  |  2 +
 .../core/current-user-permissions.config.ts   |  1 +
 .../edit-endpoint-step.component.ts           | 53 +++++++------
 .../store/src/actions/endpoint.actions.ts     |  4 +-
 .../store/src/actions/metrics.actions.ts      |  2 +-
 .../entity-catalog-entity.ts                  | 23 +++++-
 .../entity-catalog/entity-catalog.types.ts    | 23 +++++-
 .../entity-request-pipeline.types.ts          | 13 +++-
 .../src/entity-service-factory.service.ts     | 13 ++--
 .../packages/store/src/entity-service.ts      |  8 +-
 .../pagination-reducer.helper.ts              | 46 +++--------
 .../packages/store/src/store.module.ts        |  2 -
 102 files changed, 339 insertions(+), 330 deletions(-)
 rename src/frontend/packages/{store/src => cloud-foundry/src/store}/effects/app.effects.ts (75%)
 rename src/frontend/packages/{core => cloud-foundry}/test-framework/application-service-helper.ts (83%)
 rename src/frontend/packages/{core => cloud-foundry}/test-framework/cloud-foundry-organization.service.mock.ts (93%)
 rename src/frontend/packages/{core => cloud-foundry}/test-framework/cloud-foundry-space.service.mock.ts (87%)
 rename src/frontend/packages/{core => cloud-foundry}/test-framework/user-service-helper.ts (75%)

diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-base.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-base.component.spec.ts
index 83cb58eb35..fb7e09d975 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-base.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-base.component.spec.ts
@@ -2,13 +2,13 @@ import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createEmptyStoreModule } from '@stratos/store/testing';
 
 import { ApplicationService } from '../../../cloud-foundry/src/features/applications/application.service';
+import { ApplicationServiceMock } from '../../../cloud-foundry/test-framework/application-service-helper';
 import { CoreModule } from '../../../core/src/core/core.module';
 import { SharedModule } from '../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../core/tab-nav.service';
-import { ApplicationServiceMock } from '../../../core/test-framework/application-service-helper';
-import { createEmptyStoreModule } from '@stratos/store/testing';
 import { CfAutoscalerTestingModule } from '../cf-autoscaler-testing.module';
 import { AutoscalerBaseComponent } from './autoscaler-base.component';
 
diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts
index e59ab50816..e387014816 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-metric-page/autoscaler-metric-page.component.spec.ts
@@ -5,10 +5,10 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { createEmptyStoreModule } from '@stratos/store/testing';
 
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
+import { ApplicationServiceMock } from '../../../../cloud-foundry/test-framework/application-service-helper';
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../core/tab-nav.service';
-import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper';
 import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module';
 import { AutoscalerMetricPageComponent } from './autoscaler-metric-page.component';
 
diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-scale-history-page/autoscaler-scale-history-page.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-scale-history-page/autoscaler-scale-history-page.component.spec.ts
index 043a399200..ccb88d5a1b 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-scale-history-page/autoscaler-scale-history-page.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-scale-history-page/autoscaler-scale-history-page.component.spec.ts
@@ -5,10 +5,10 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { createEmptyStoreModule } from '@stratos/store/testing';
 
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
+import { ApplicationServiceMock } from '../../../../cloud-foundry/test-framework/application-service-helper';
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../core/tab-nav.service';
-import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper';
 import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module';
 import { AutoscalerScaleHistoryPageComponent } from './autoscaler-scale-history-page.component';
 
diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.spec.ts
index 6b77f493a5..68b583fc77 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.spec.ts
@@ -2,6 +2,7 @@ import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createEmptyStoreModule } from '@stratos/store/testing';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
@@ -14,11 +15,10 @@ import {
 import {
   RunningInstancesComponent,
 } from '../../../../cloud-foundry/src/shared/components/running-instances/running-instances.component';
+import { ApplicationServiceMock } from '../../../../cloud-foundry/test-framework/application-service-helper';
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../core/tab-nav.service';
-import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper';
-import { createEmptyStoreModule } from '@stratos/store/testing';
 import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module';
 import { CardAutoscalerDefaultComponent } from '../../shared/card-autoscaler-default/card-autoscaler-default.component';
 import { AutoscalerTabExtensionComponent } from './autoscaler-tab-extension.component';
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.spec.ts
index 978d5b751a..ac3ca5bcab 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component.spec.ts
@@ -2,13 +2,13 @@ import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createEmptyStoreModule } from '@stratos/store/testing';
 
 import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
+import { ApplicationServiceMock } from '../../../../../cloud-foundry/test-framework/application-service-helper';
 import { CoreModule } from '../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../core/tab-nav.service';
-import { ApplicationServiceMock } from '../../../../../core/test-framework/application-service-helper';
-import { createEmptyStoreModule } from '@stratos/store/testing';
 import { CfAutoscalerTestingModule } from '../../../cf-autoscaler-testing.module';
 import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service';
 import { EditAutoscalerPolicyStep1Component } from './edit-autoscaler-policy-step1.component';
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.spec.ts
index 039bf8b918..f6dc925fa8 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step2/edit-autoscaler-policy-step2.component.spec.ts
@@ -2,13 +2,13 @@ import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createEmptyStoreModule } from '@stratos/store/testing';
 
 import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
+import { ApplicationServiceMock } from '../../../../../cloud-foundry/test-framework/application-service-helper';
 import { CoreModule } from '../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../core/tab-nav.service';
-import { ApplicationServiceMock } from '../../../../../core/test-framework/application-service-helper';
-import { createEmptyStoreModule } from '@stratos/store/testing';
 import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service';
 import { EditAutoscalerPolicyStep2Component } from './edit-autoscaler-policy-step2.component';
 
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.spec.ts
index 5a8379443c..52b26205f7 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step3/edit-autoscaler-policy-step3.component.spec.ts
@@ -2,13 +2,13 @@ import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createEmptyStoreModule } from '@stratos/store/testing';
 
 import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
+import { ApplicationServiceMock } from '../../../../../cloud-foundry/test-framework/application-service-helper';
 import { CoreModule } from '../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../core/tab-nav.service';
-import { ApplicationServiceMock } from '../../../../../core/test-framework/application-service-helper';
-import { createEmptyStoreModule } from '@stratos/store/testing';
 import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service';
 import { EditAutoscalerPolicyStep3Component } from './edit-autoscaler-policy-step3.component';
 
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.spec.ts
index 20d3a17bfe..8bf205e4f0 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component.spec.ts
@@ -2,13 +2,13 @@ import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createEmptyStoreModule } from '@stratos/store/testing';
 
 import { ApplicationService } from '../../../../../cloud-foundry/src/features/applications/application.service';
+import { ApplicationServiceMock } from '../../../../../cloud-foundry/test-framework/application-service-helper';
 import { CoreModule } from '../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../core/tab-nav.service';
-import { ApplicationServiceMock } from '../../../../../core/test-framework/application-service-helper';
-import { createEmptyStoreModule } from '@stratos/store/testing';
 import { CfAutoscalerTestingModule } from '../../../cf-autoscaler-testing.module';
 import { EditAutoscalerPolicyService } from '../edit-autoscaler-policy-service';
 import { EditAutoscalerPolicyStep4Component } from './edit-autoscaler-policy-step4.component';
diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.spec.ts
index b10ff34509..b9e5aac8c8 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-policy/edit-autoscaler-policy.component.spec.ts
@@ -2,13 +2,13 @@ import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createEmptyStoreModule } from '@stratos/store/testing';
 
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
+import { ApplicationServiceMock } from '../../../../cloud-foundry/test-framework/application-service-helper';
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../core/tab-nav.service';
-import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper';
-import { createEmptyStoreModule } from '@stratos/store/testing';
 import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module';
 import { EditAutoscalerPolicyService } from './edit-autoscaler-policy-service';
 import { EditAutoscalerPolicyStep1Component } from './edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component';
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts
index 30e403a72f..e0b1c180b2 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/card-autoscaler-default/card-autoscaler-default.component.spec.ts
@@ -8,12 +8,12 @@ import {
   RunningInstancesComponent,
 } from '../../../../cloud-foundry/src/shared/components/running-instances/running-instances.component';
 import { ApplicationStateService } from '../../../../cloud-foundry/src/shared/services/application-state.service';
+import { ApplicationServiceMock } from '../../../../cloud-foundry/test-framework/application-service-helper';
 import { CoreModule } from '../../../../core/src/core/core.module';
 import {
   CopyToClipboardComponent,
 } from '../../../../core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component';
 import { MetadataItemComponent } from '../../../../core/src/shared/components/metadata-item/metadata-item.component';
-import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper';
 import { AppTestModule } from '../../../../core/test-framework/core-test.helper';
 import { EntityCatalogHelper } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service';
 import { EntityMonitorFactory } from '../../../../store/src/monitors/entity-monitor.factory.service';
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts
index 4f00ffdaef..a30d9ddc7e 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-event/cf-app-autoscaler-events-config.service.spec.ts
@@ -9,9 +9,11 @@ import { GetApplication } from '../../../../../cloud-foundry/src/actions/applica
 import { cfEntityFactory } from '../../../../../cloud-foundry/src/cf-entity-factory';
 import { applicationEntityType } from '../../../../../cloud-foundry/src/cf-entity-types';
 import { ApplicationsModule } from '../../../../../cloud-foundry/src/features/applications/applications.module';
+import {
+  generateTestApplicationServiceProvider,
+} from '../../../../../cloud-foundry/test-framework/application-service-helper';
 import { CoreModule } from '../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
-import { generateTestApplicationServiceProvider } from '../../../../../core/test-framework/application-service-helper';
 import { AppTestModule } from '../../../../../core/test-framework/core-test.helper';
 import { generateTestEntityServiceProvider } from '../../../../../core/test-framework/entity-service.helper';
 import { EntityCatalogHelper } from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service';
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts
index 6304bd8fd5..1061670864 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/app-autoscaler-metric-chart-card.component.spec.ts
@@ -10,9 +10,11 @@ import {
   ServiceActionHelperService,
 } from '../../../../../../cloud-foundry/src/shared/data-services/service-action-helper.service';
 import { ApplicationStateService } from '../../../../../../cloud-foundry/src/shared/services/application-state.service';
+import {
+  generateTestApplicationServiceProvider,
+} from '../../../../../../cloud-foundry/test-framework/application-service-helper';
 import { CoreModule } from '../../../../../../core/src/core/core.module';
 import { ConfirmationDialogService } from '../../../../../../core/src/shared/components/confirmation-dialog.service';
-import { generateTestApplicationServiceProvider } from '../../../../../../core/test-framework/application-service-helper';
 import { AppTestModule } from '../../../../../../core/test-framework/core-test.helper';
 import {
   EntityCatalogHelper,
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.spec.ts
index 31df0d2711..d8ec4e79aa 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component.spec.ts
@@ -2,14 +2,14 @@ import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { createEmptyStoreModule } from '@stratos/store/testing';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import { ApplicationService } from '../../../../../../../cloud-foundry/src/features/applications/application.service';
+import { ApplicationServiceMock } from '../../../../../../../cloud-foundry/test-framework/application-service-helper';
 import { CoreModule } from '../../../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../../../core/tab-nav.service';
-import { ApplicationServiceMock } from '../../../../../../../core/test-framework/application-service-helper';
-import { createEmptyStoreModule } from '@stratos/store/testing';
 import { AppAutoscalerComboSeriesVerticalComponent } from './combo-series-vertical.component';
 
 describe('AppAutoscalerComboSeriesVerticalComponent', () => {
diff --git a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts
index 3abfa03516..383469b8a8 100644
--- a/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-list-config.service.spec.ts
@@ -6,8 +6,10 @@ import {
   ApplicationEnvVarsHelper,
 } from '../../../../../cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service';
 import { ApplicationStateService } from '../../../../../cloud-foundry/src/shared/services/application-state.service';
+import {
+  generateTestApplicationServiceProvider,
+} from '../../../../../cloud-foundry/test-framework/application-service-helper';
 import { MetricsRangeSelectorService } from '../../../../../core/src/shared/services/metrics-range-selector.service';
-import { generateTestApplicationServiceProvider } from '../../../../../core/test-framework/application-service-helper';
 import { AppTestModule } from '../../../../../core/test-framework/core-test.helper';
 import { EntityCatalogHelper } from '../../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog.service';
 import { EntityServiceFactory } from '../../../../../store/src/entity-service-factory.service';
diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-factory.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-factory.ts
index 1c3cfbc7c5..c3f3216b80 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-factory.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-factory.ts
@@ -1,6 +1,7 @@
 import { Schema, schema } from 'normalizr';
 
 import { getAPIResourceGuid } from '../../../cloud-foundry/src/store/selectors/api.selectors';
+import { metricEntityType } from '../../../core/src/base-entity-schemas';
 import { EntitySchema } from '../../../store/src/helpers/entity-schema';
 
 export const appAutoscalerInfoEntityType = 'autoscalerInfo';
@@ -67,6 +68,9 @@ entityCache[appAutoscalerAppMetricEntityType] = new AutoscalerEntitySchema(
   { idAttribute: getAPIResourceGuid }
 );
 
+const MetricSchema = new AutoscalerEntitySchema(metricEntityType);
+entityCache[metricEntityType] = MetricSchema;
+
 export function autoscalerEntityFactory(key: string): EntitySchema {
   const entity = entityCache[key];
   if (!entity) {
diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
index 07daad6aa4..689089fe0a 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
@@ -1,6 +1,5 @@
-import { cfEntityFactory } from '../../../cloud-foundry/src/cf-entity-factory';
-import { metricEntityType } from '../../../cloud-foundry/src/cf-entity-types';
 import { IOrgFavMetadata } from '../../../cloud-foundry/src/cf-metadata-types';
+import { metricEntityType } from '../../../core/src/base-entity-schemas';
 import {
   StratosBaseCatalogEntity,
   StratosCatalogEntity,
@@ -104,7 +103,7 @@ function generateAppMetricEntity(endpointDefinition: IStratosEndpointDefinition)
 function generateMetricEntity(endpointDefinition: IStratosEndpointDefinition) {
   const definition = {
     type: metricEntityType,
-    schema: cfEntityFactory(metricEntityType),
+    schema: autoscalerEntityFactory(metricEntityType),
     label: 'Autoscaler Metric',
     labelPlural: 'Autoscaler Metrics',
     endpoint: endpointDefinition,
diff --git a/src/frontend/packages/cloud-foundry/src/cf-api.types.ts b/src/frontend/packages/cloud-foundry/src/cf-api.types.ts
index 79b53ee1fd..c057292810 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-api.types.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-api.types.ts
@@ -2,8 +2,6 @@ import { APIResource } from '../../store/src/types/api.types';
 import { IService, IServiceBinding } from './cf-api-svc.types';
 import { CfUser } from './store/types/user.types';
 
-// TODO: Move file to CF package (#3769)
-
 export interface StratosCFEntity {
   cfGuid: string;
 }
diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-factory.ts b/src/frontend/packages/cloud-foundry/src/cf-entity-factory.ts
index 98cb1f0234..0f2d1ebb9e 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-factory.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-factory.ts
@@ -1,3 +1,4 @@
+import { metricEntityType } from '../../core/src/base-entity-schemas';
 import { EntitySchema } from '../../store/src/helpers/entity-schema';
 import { APIResource } from '../../store/src/types/api.types';
 import {
@@ -24,7 +25,6 @@ import {
   gitBranchesEntityType,
   gitCommitEntityType,
   gitRepoEntityType,
-  metricEntityType,
   organizationEntityType,
   privateDomainsEntityType,
   quotaDefinitionEntityType,
@@ -200,24 +200,24 @@ const CFUserSchema = new CFUserEntitySchema({
     audited_spaces: [createUserOrgSpaceSchema(spaceEntityType, {}, CfUserRoleParams.AUDITED_SPACES)],
   }
 }, {
-  idAttribute: getAPIResourceGuid,
-  processStrategy: (user: APIResource<CfUser>) => {
-    if (user.entity.username) {
-      return user;
-    }
-    const entity = {
-      ...user.entity,
-      username: user.metadata.guid
-    };
-
-    return user.metadata ? {
-      entity,
-      metadata: user.metadata
-    } : {
-        entity
+    idAttribute: getAPIResourceGuid,
+    processStrategy: (user: APIResource<CfUser>) => {
+      if (user.entity.username) {
+        return user;
+      }
+      const entity = {
+        ...user.entity,
+        username: user.metadata.guid
       };
-  }
-});
+
+      return user.metadata ? {
+        entity,
+        metadata: user.metadata
+      } : {
+          entity
+        };
+    }
+  });
 entityCache[cfUserEntityType] = CFUserSchema;
 
 const coreSpaceSchemaParams = {
diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
index 4ab1f13fa9..d51933087e 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -4,8 +4,10 @@ import { combineLatest, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { EndpointHealthCheck } from '../../core/endpoints-health-checks';
+import { metricEntityType } from '../../core/src/base-entity-schemas';
 import { urlValidationExpression } from '../../core/src/core/utils.service';
 import { BaseEndpointAuth } from '../../core/src/features/endpoints/endpoint-auth';
+import { CfValidateEntitiesStart } from '../../store/src/actions/request.actions';
 import { AppState } from '../../store/src/app-state';
 import {
   StratosBaseCatalogEntity,
@@ -19,12 +21,14 @@ import {
 import {
   JetstreamError,
 } from '../../store/src/entity-request-pipeline/entity-request-base-handlers/handle-multi-endpoints.pipe';
-import { JetstreamResponse } from '../../store/src/entity-request-pipeline/entity-request-pipeline.types';
+import { ActionDispatcher, JetstreamResponse } from '../../store/src/entity-request-pipeline/entity-request-pipeline.types';
 import { EntitySchema } from '../../store/src/helpers/entity-schema';
+import { RequestInfoState } from '../../store/src/reducers/api-request-reducer/types';
 import { selectSessionData } from '../../store/src/reducers/auth.reducer';
 import { endpointDisconnectRemoveEntitiesReducer } from '../../store/src/reducers/endpoint-disconnect-application.reducer';
-import { APIResource } from '../../store/src/types/api.types';
-import { PaginatedAction } from '../../store/src/types/pagination.types';
+import { APIResource, EntityInfo } from '../../store/src/types/api.types';
+import { PaginatedAction, PaginationEntityState } from '../../store/src/types/pagination.types';
+import { ICFAction } from '../../store/src/types/request.types';
 import {
   IService,
   IServiceBinding,
@@ -67,7 +71,6 @@ import {
   gitBranchesEntityType,
   gitCommitEntityType,
   gitRepoEntityType,
-  metricEntityType,
   organizationEntityType,
   privateDomainsEntityType,
   quotaDefinitionEntityType,
@@ -159,6 +162,7 @@ import {
 } from './entity-action-builders/user-provided-service.action-builders';
 import { UserActionBuilders, userActionBuilders } from './entity-action-builders/user.action-builders';
 import { addCfQParams, addCfRelationParams } from './entity-relations/cf-entity-relations.getters';
+import { isEntityInlineParentAction } from './entity-relations/entity-relations.types';
 import { CfEndpointDetailsComponent } from './shared/components/cf-endpoint-details/cf-endpoint-details.component';
 import { updateApplicationRoutesReducer } from './store/reducers/application-route.reducer';
 import { updateOrganizationQuotaReducer } from './store/reducers/organization-quota.reducer';
@@ -172,6 +176,42 @@ import { CFResponse } from './store/types/cf-api.types';
 import { GitBranch, GitCommit, GitRepo } from './store/types/git.types';
 import { CfUser } from './store/types/user.types';
 
+
+function getPaginationCompareString(paginationEntity: PaginationEntityState) {
+  if (!paginationEntity) {
+    return '';
+  }
+  let params = '';
+  if (paginationEntity.params) {
+    params = JSON.stringify(paginationEntity.params);
+  }
+  // paginationEntity.totalResults included to ensure we cover the 'ResetPagination' case, for instance after AddParam
+  return paginationEntity.totalResults + paginationEntity.currentPage + params + paginationEntity.pageCount;
+}
+
+function shouldValidate(action: ICFAction, isValidated: boolean, entityInfo: RequestInfoState) {
+  // Validate if..
+  // 1) The action is the correct type
+  const parentAction = isEntityInlineParentAction(action);
+  if (!parentAction) {
+    return false;
+  }
+  // 2) We have basic request info
+  // 3) The action states it should not be skipped
+  // 4) It's already been validated
+  // 5) There are actual relations to validate
+  if (!entityInfo || action.skipValidation || isValidated || parentAction.includeRelations.length === 0) {
+    return false;
+  }
+  // 6) The entity isn't in the process of being updated
+  return !entityInfo.fetching &&
+    !entityInfo.error &&
+    !entityInfo.deleting.busy &&
+    !entityInfo.deleting.deleted &&
+    // This is required to ensure that we don't continue trying to fetch missing relations when we're already fetching missing relations
+    !Object.keys(entityInfo.updating).find(key => entityInfo.updating[key].busy);
+}
+
 export interface CFBasePipelineRequestActionMeta {
   /**
    * Define a set of children that a cf entity should have, for instance organisation --> space, application --> space --> organisation
@@ -234,6 +274,34 @@ export function generateCFEntities(): StratosBaseCatalogEntity[] {
         return message;
       }, 'Multiple Cloud Foundry Errors. ');
     },
+    entityEmitHandler: (action: ICFAction, dispatcher: ActionDispatcher) => {
+      let validated = false;
+      return (entityInfo: EntityInfo) => {
+        if (!entityInfo || entityInfo.entity) {
+          if (shouldValidate(action, validated, entityInfo.entityRequestInfo)) {
+            validated = true;
+            dispatcher(new CfValidateEntitiesStart(
+              action,
+              [action.guid]
+            ));
+          }
+        }
+      };
+    },
+    entitiesEmitHandler: (action: PaginatedAction | PaginatedAction[], dispatcher: ActionDispatcher) => {
+      let lastValidationFootprint: string;
+      const arrayAction = Array.isArray(action) ? action : [action];
+      return (state: PaginationEntityState) => {
+        const newValidationFootprint = getPaginationCompareString(state);
+        if (lastValidationFootprint !== newValidationFootprint) {
+          lastValidationFootprint = newValidationFootprint;
+          arrayAction.forEach(action => dispatcher(new CfValidateEntitiesStart(
+            action,
+            state.ids[action.__forcedPageNumber__ || state.currentPage]
+          )));
+        }
+      };
+    },
     paginationConfig: {
       getEntitiesFromResponse: (response: CFResponse) => response.resources,
       getTotalPages: (responseWithPages: JetstreamResponse<CFResponse | CFResponse[]>) =>
diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-types.ts b/src/frontend/packages/cloud-foundry/src/cf-entity-types.ts
index a058e5a008..91555203d5 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-types.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-types.ts
@@ -53,7 +53,6 @@ export const securityGroupEntityType = 'securityGroup';
 export const featureFlagEntityType = 'featureFlag';
 export const privateDomainsEntityType = 'private_domains';
 export const spaceQuotaEntityType = 'space_quota_definition';
-export const metricEntityType = 'metrics';
 export const servicePlanVisibilityEntityType = 'servicePlanVisibility';
 export const serviceBrokerEntityType = 'serviceBroker';
 export const userProvidedServiceInstanceEntityType = 'userProvidedServiceInstance';
diff --git a/src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts b/src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts
index 688cf07f58..40bc688274 100644
--- a/src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts
@@ -3,14 +3,8 @@ import { NgModule } from '@angular/core';
 
 import { MDAppModule } from '../../core/src/core/md.module';
 import { SharedModule } from '../../core/src/shared/shared.module';
-import { CfValidateEntitiesStart } from '../../store/src/actions/request.actions';
 import { EntityCatalogModule } from '../../store/src/entity-catalog.module';
-import { ENTITY_INFO_HANDLER } from '../../store/src/entity-service';
-import { RequestInfoState } from '../../store/src/reducers/api-request-reducer/types';
-import { EntityInfo } from '../../store/src/types/api.types';
-import { ICFAction } from '../../store/src/types/request.types';
 import { generateCFEntities } from './cf-entity-generator';
-import { isEntityInlineParentAction } from './entity-relations/entity-relations.types';
 import { ApplicationsModule } from './features/applications/applications.module';
 import { CloudFoundryModule } from './features/cloud-foundry/cloud-foundry.module';
 import { ServiceCatalogModule } from './features/service-catalog/service-catalog.module';
@@ -23,43 +17,6 @@ import { ServiceActionHelperService } from './shared/data-services/service-actio
 import { CloudFoundryUserProvidedServicesService } from './shared/services/cloud-foundry-user-provided-services.service';
 import { CloudFoundryStoreModule } from './store/cloud-foundry.store.module';
 
-function shouldValidate(action: ICFAction, isValidated: boolean, entityInfo: RequestInfoState) {
-  // Validate if..
-  // 1) The action is the correct type
-  const parentAction = isEntityInlineParentAction(action);
-  if (!parentAction) {
-    return false;
-  }
-  // 2) We have basic request info
-  // 3) The action states it should not be skipped
-  // 4) It's already been validated
-  // 5) There are actual relations to validate
-  if (!entityInfo || action.skipValidation || isValidated || parentAction.includeRelations.length === 0) {
-    return false;
-  }
-  // 6) The entity isn't in the process of being updated
-  return !entityInfo.fetching &&
-    !entityInfo.error &&
-    !entityInfo.deleting.busy &&
-    !entityInfo.deleting.deleted &&
-    // This is required to ensure that we don't continue trying to fetch missing relations when we're already fetching missing relations
-    !Object.keys(entityInfo.updating).find(key => entityInfo.updating[key].busy);
-}
-
-function infoValidator(action: ICFAction, dispatcher) {
-  let validated = false;
-  return (entityInfo: EntityInfo) => {
-    if (!entityInfo || entityInfo.entity) {
-      if (shouldValidate(action, validated, entityInfo.entityRequestInfo)) {
-        validated = true;
-        dispatcher(new CfValidateEntitiesStart(
-          action,
-          [action.guid]
-        ));
-      }
-    }
-  };
-}
 @NgModule({
   imports: [
     EntityCatalogModule.forFeature(generateCFEntities),
@@ -80,7 +37,6 @@ function infoValidator(action: ICFAction, dispatcher) {
     // ])
   ],
   providers: [
-    { provide: ENTITY_INFO_HANDLER, useFactory: () => infoValidator },
     CfUserService,
     CloudFoundryService,
     ServiceActionHelperService,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/application-delete.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/application-delete.component.spec.ts
index 10e739a4d5..7e8ac98783 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/application-delete.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/application-delete.component.spec.ts
@@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { GetApplication } from '../../../../../cloud-foundry/src/actions/application.actions';
 import { cfEntityFactory } from '../../../../../cloud-foundry/src/cf-entity-factory';
 import { TabNavService } from '../../../../../core/tab-nav.service';
-import { generateTestApplicationServiceProvider } from '../../../../../core/test-framework/application-service-helper';
 import { generateTestEntityServiceProvider } from '../../../../../core/test-framework/entity-service.helper';
+import { generateTestApplicationServiceProvider } from '../../../../test-framework/application-service-helper';
 import { generateCfBaseTestModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { applicationEntityType } from '../../../cf-entity-types';
 import { ApplicationsModule } from '../applications.module';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.spec.ts
index 3cd2e19cb9..cc133e9d3b 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-instances/delete-app-instances.component.spec.ts
@@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { GetApplication } from '../../../../../../cloud-foundry/src/actions/application.actions';
 import { cfEntityFactory } from '../../../../../../cloud-foundry/src/cf-entity-factory';
-import { generateTestApplicationServiceProvider } from '../../../../../../core/test-framework/application-service-helper';
 import { generateTestEntityServiceProvider } from '../../../../../../core/test-framework/entity-service.helper';
+import { generateTestApplicationServiceProvider } from '../../../../../test-framework/application-service-helper';
 import { generateCfBaseTestModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { applicationEntityType } from '../../../../cf-entity-types';
 import { ServiceActionHelperService } from '../../../../shared/data-services/service-action-helper.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-routes/delete-app-routes.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-routes/delete-app-routes.component.spec.ts
index 763d19e9e0..28b04b412d 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-routes/delete-app-routes.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application-delete/delete-app-routes/delete-app-routes.component.spec.ts
@@ -3,8 +3,8 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { GetApplication } from '../../../../../../cloud-foundry/src/actions/application.actions';
 import { cfEntityFactory } from '../../../../../../cloud-foundry/src/cf-entity-factory';
-import { generateTestApplicationServiceProvider } from '../../../../../../core/test-framework/application-service-helper';
 import { generateTestEntityServiceProvider } from '../../../../../../core/test-framework/entity-service.helper';
+import { generateTestApplicationServiceProvider } from '../../../../../test-framework/application-service-helper';
 import { generateCfBaseTestModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { applicationEntityType } from '../../../../cf-entity-types';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application.service.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application.service.spec.ts
index 42ba5c9893..aba0ea3567 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application.service.spec.ts
@@ -6,11 +6,11 @@ import { cfEntityFactory } from '../../../../cloud-foundry/src/cf-entity-factory
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { ExtensionService } from '../../../../core/src/core/extension/extension-service';
 import { getGitHubAPIURL, GITHUB_API_URL } from '../../../../core/src/core/github.helpers';
-import { generateTestApplicationServiceProvider } from '../../../../core/test-framework/application-service-helper';
 import { generateTestEntityServiceProvider } from '../../../../core/test-framework/entity-service.helper';
 import { EntityMonitorFactory } from '../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { AppStoreModule } from '../../../../store/src/store.module';
+import { generateTestApplicationServiceProvider } from '../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { applicationEntityType } from '../../cf-entity-types';
 import { LongRunningCfOperationsService } from '../../shared/data-services/long-running-cf-op.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-poll/application-poll.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-poll/application-poll.component.spec.ts
index 052864aa51..096eebe3f7 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-poll/application-poll.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-poll/application-poll.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { generateTestApplicationServiceProvider } from '../../../../../../../core/test-framework/application-service-helper';
 import { generateTestEntityServiceProvider } from '../../../../../../../core/test-framework/entity-service.helper';
+import { generateTestApplicationServiceProvider } from '../../../../../../test-framework/application-service-helper';
 import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { GetApplication } from '../../../../../actions/application.actions';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.spec.ts
index 5245f9e37a..55f591b111 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.spec.ts
@@ -12,8 +12,8 @@ import { getGitHubAPIURL, GITHUB_API_URL } from '../../../../../../core/src/core
 import { MDAppModule } from '../../../../../../core/src/core/md.module';
 import { SharedModule } from '../../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../../core/tab-nav.service';
-import { generateTestApplicationServiceProvider } from '../../../../../../core/test-framework/application-service-helper';
 import { generateTestEntityServiceProvider } from '../../../../../../core/test-framework/entity-service.helper';
+import { generateTestApplicationServiceProvider } from '../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { applicationEntityType } from '../../../../cf-entity-types';
 import { ApplicationStateService } from '../../../../shared/services/application-state.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.spec.ts
index d64402168e..71731cb35b 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.spec.ts
@@ -9,9 +9,9 @@ import { GITHUB_API_URL } from '../../../../../../../../core/src/core/github.hel
 import { APP_GUID, CF_GUID, ENTITY_SERVICE } from '../../../../../../../../core/src/shared/entity.tokens';
 import { SharedModule } from '../../../../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../../../../core/tab-nav.service';
-import { ApplicationServiceMock } from '../../../../../../../../core/test-framework/application-service-helper';
 import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { AppStoreModule } from '../../../../../../../../store/src/store.module';
+import { ApplicationServiceMock } from '../../../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { CloudFoundrySharedModule } from '../../../../../../shared/cf-shared.module';
 import { ApplicationStateService } from '../../../../../../shared/services/application-state.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.spec.ts
index f7a0939e21..81fa6de062 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/gitscm-tab/gitscm-tab.component.spec.ts
@@ -8,7 +8,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { CoreModule } from '../../../../../../../../core/src/core/core.module';
 import { getGitHubAPIURL, GITHUB_API_URL } from '../../../../../../../../core/src/core/github.helpers';
 import { SharedModule } from '../../../../../../../../core/src/shared/shared.module';
-import { ApplicationServiceMock } from '../../../../../../../../core/test-framework/application-service-helper';
+import { ApplicationServiceMock } from '../../../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ApplicationService } from '../../../../application.service';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.spec.ts
index 8649396f5f..fc079a8720 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.spec.ts
@@ -6,8 +6,8 @@ import { testSCFEndpointGuid } from '@stratos/store/testing';
 import { CoreModule } from '../../../../../../../../core/src/core/core.module';
 import { CF_GUID } from '../../../../../../../../core/src/shared/entity.tokens';
 import { SharedModule } from '../../../../../../../../core/src/shared/shared.module';
-import { ApplicationServiceMock } from '../../../../../../../../core/test-framework/application-service-helper';
 import { AppStoreModule } from '../../../../../../../../store/src/store.module';
+import { ApplicationServiceMock } from '../../../../../../../test-framework/application-service-helper';
 import {
   generateCfStoreModules,
   generateTestCfEndpointServiceProvider,
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component.spec.ts
index 362e8fc328..b300ad4f84 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/log-stream-tab/log-stream-tab.component.spec.ts
@@ -8,13 +8,11 @@ import { cfEntityFactory } from '../../../../../../../../cloud-foundry/src/cf-en
 import { CoreModule } from '../../../../../../../../core/src/core/core.module';
 import { MDAppModule } from '../../../../../../../../core/src/core/md.module';
 import { LogViewerComponent } from '../../../../../../../../core/src/shared/components/log-viewer/log-viewer.component';
-import {
-  generateTestApplicationServiceProvider,
-} from '../../../../../../../../core/test-framework/application-service-helper';
 import { generateTestEntityServiceProvider } from '../../../../../../../../core/test-framework/entity-service.helper';
 import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { AppStoreModule } from '../../../../../../../../store/src/store.module';
+import { generateTestApplicationServiceProvider } from '../../../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { applicationEntityType } from '../../../../../../cf-entity-types';
 import { ApplicationStateService } from '../../../../../../shared/services/application-state.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/metrics-tab/metrics-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/metrics-tab/metrics-tab.component.spec.ts
index 8cd276c7bc..6bb64cb28b 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/metrics-tab/metrics-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/metrics-tab/metrics-tab.component.spec.ts
@@ -5,10 +5,8 @@ import { GetApplication } from '../../../../../../../../cloud-foundry/src/action
 import { cfEntityFactory } from '../../../../../../../../cloud-foundry/src/cf-entity-factory';
 import { MDAppModule } from '../../../../../../../../core/src/core/md.module';
 import { SharedModule } from '../../../../../../../../core/src/shared/shared.module';
-import {
-  generateTestApplicationServiceProvider,
-} from '../../../../../../../../core/test-framework/application-service-helper';
 import { generateTestEntityServiceProvider } from '../../../../../../../../core/test-framework/entity-service.helper';
+import { generateTestApplicationServiceProvider } from '../../../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { applicationEntityType } from '../../../../../../cf-entity-types';
 import { ApplicationStateService } from '../../../../../../shared/services/application-state.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component.spec.ts
index b1914fc5d2..e24947c5cf 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component.spec.ts
@@ -1,9 +1,7 @@
 import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import {
-  generateTestApplicationServiceProvider,
-} from '../../../../../../../../../core/test-framework/application-service-helper';
+import { generateTestApplicationServiceProvider } from '../../../../../../../../test-framework/application-service-helper';
 import { generateCfBaseTestModules } from '../../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ApplicationStateService } from '../../../../../../../shared/services/application-state.service';
 import { ApplicationEnvVarsHelper } from '../../build-tab/application-env-vars.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/services-tab/services-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/services-tab/services-tab.component.spec.ts
index 37f1e5ff66..a608c0b054 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/services-tab/services-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/services-tab/services-tab.component.spec.ts
@@ -1,11 +1,9 @@
 import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import {
-  generateTestApplicationServiceProvider,
-} from '../../../../../../../../core/test-framework/application-service-helper';
 import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
+import { generateTestApplicationServiceProvider } from '../../../../../../../test-framework/application-service-helper';
 import { generateCfBaseTestModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ServiceActionHelperService } from '../../../../../../shared/data-services/service-action-helper.service';
 import { ApplicationStateService } from '../../../../../../shared/services/application-state.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/variables-tab/variables-tab.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/variables-tab/variables-tab.component.spec.ts
index 59803701f9..08e4ab844a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/variables-tab/variables-tab.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/variables-tab/variables-tab.component.spec.ts
@@ -5,7 +5,7 @@ import { StoreModule } from '@ngrx/store';
 import { CoreModule } from '../../../../../../../../core/src/core/core.module';
 import { MDAppModule } from '../../../../../../../../core/src/core/md.module';
 import { SharedModule } from '../../../../../../../../core/src/shared/shared.module';
-import { ApplicationServiceMock } from '../../../../../../../../core/test-framework/application-service-helper';
+import { ApplicationServiceMock } from '../../../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ApplicationStateService } from '../../../../../../shared/services/application-state.service';
 import { ApplicationService } from '../../../../application.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.spec.ts
index 48091fca47..c3ead1317a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.spec.ts
@@ -7,8 +7,8 @@ import { CoreModule } from '../../../../../core/src/core/core.module';
 import { MDAppModule } from '../../../../../core/src/core/md.module';
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../core/tab-nav.service';
-import { generateTestApplicationServiceProvider } from '../../../../../core/test-framework/application-service-helper';
 import { generateTestEntityServiceProvider } from '../../../../../core/test-framework/entity-service.helper';
+import { generateTestApplicationServiceProvider } from '../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { applicationEntityType } from '../../../cf-entity-types';
 import { CloudFoundrySharedModule } from '../../../shared/cf-shared.module';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/edit-application/edit-application.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/edit-application/edit-application.component.spec.ts
index e69e917396..f25b7fa87f 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/edit-application/edit-application.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/edit-application/edit-application.component.spec.ts
@@ -9,11 +9,11 @@ import { cfEntityFactory } from '../../../../../cloud-foundry/src/cf-entity-fact
 import { CoreModule } from '../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../core/tab-nav.service';
+import { generateTestEntityServiceProvider } from '../../../../../core/test-framework/entity-service.helper';
 import {
   ApplicationServiceMock,
   generateTestApplicationServiceProvider,
-} from '../../../../../core/test-framework/application-service-helper';
-import { generateTestEntityServiceProvider } from '../../../../../core/test-framework/entity-service.helper';
+} from '../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { applicationEntityType } from '../../../cf-entity-types';
 import { ApplicationStateService } from '../../../shared/services/application-state.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-route-stepper/add-route-stepper.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-route-stepper/add-route-stepper.component.spec.ts
index 67e7b3fc5e..f06e6bbbd2 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-route-stepper/add-route-stepper.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-route-stepper/add-route-stepper.component.spec.ts
@@ -6,7 +6,7 @@ import { CoreModule } from '../../../../../../core/src/core/core.module';
 import { SteppersModule } from '../../../../../../core/src/shared/components/stepper/steppers.module';
 import { SharedModule } from '../../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../../core/tab-nav.service';
-import { ApplicationServiceMock } from '../../../../../../core/test-framework/application-service-helper';
+import { ApplicationServiceMock } from '../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ApplicationService } from '../../application.service';
 import { AddRoutesComponent } from '../add-routes/add-routes.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.spec.ts
index ce92e35982..3d91ab69af 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/routes/add-routes/add-routes.component.spec.ts
@@ -4,7 +4,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 
 import { CoreModule } from '../../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../../core/src/shared/shared.module';
-import { ApplicationServiceMock } from '../../../../../../core/test-framework/application-service-helper';
+import { ApplicationServiceMock } from '../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ApplicationService } from '../../application.service';
 import { MapRoutesComponent } from '../map-routes/map-routes.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/routes/map-routes/map-routes.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/routes/map-routes/map-routes.component.spec.ts
index f55c3a3216..00d73580e0 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/routes/map-routes/map-routes.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/routes/map-routes/map-routes.component.spec.ts
@@ -6,7 +6,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { CoreModule } from '../../../../../../core/src/core/core.module';
 import { ListConfig } from '../../../../../../core/src/shared/components/list/list.component.types';
 import { SharedModule } from '../../../../../../core/src/shared/shared.module';
-import { ApplicationServiceMock } from '../../../../../../core/test-framework/application-service-helper';
+import { ApplicationServiceMock } from '../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ApplicationService } from '../../application.service';
 import { MapRoutesComponent } from './map-routes.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/ssh-application/ssh-application.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/applications/ssh-application/ssh-application.component.spec.ts
index 315cea2227..3454569951 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/ssh-application/ssh-application.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/ssh-application/ssh-application.component.spec.ts
@@ -4,7 +4,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { CoreModule } from '../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../core/tab-nav.service';
-import { ApplicationServiceMock } from '../../../../../core/test-framework/application-service-helper';
+import { ApplicationServiceMock } from '../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ApplicationService } from '../application.service';
 import { SshApplicationComponent } from './ssh-application.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.ts
index 29625aad97..092e9eee7c 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/add-quota/add-quota.component.ts
@@ -3,8 +3,6 @@ import { Component } from '@angular/core';
 import { ActiveRouteCfOrgSpace } from '../cf-page.types';
 import { getActiveRouteCfOrgSpaceProvider } from '../cf.helpers';
 
-// TODO: Move CF code to CF Module #3769. There's a few quota related components to move
-
 @Component({
   selector: 'app-add-quota',
   templateUrl: './add-quota.component.html',
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.spec.ts
index 4dd6fbacb2..96634d0f66 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/edit-space/edit-space-step/edit-space-step.component.spec.ts
@@ -1,10 +1,10 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { CloudFoundrySpaceServiceMock } from '../../../../../../core/test-framework/cloud-foundry-space.service.mock';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
 } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { CloudFoundrySpaceServiceMock } from '../../../../../test-framework/cloud-foundry-space.service.mock';
 import { CloudFoundrySpaceService } from '../../services/cloud-foundry-space.service';
 import { EditSpaceStepComponent } from './edit-space-step.component';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.ts
index 042c3dd232..07a77cddd6 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-cells/cloud-foundry-cell/cloud-foundry-cell-base/cloud-foundry-cell-base.component.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { Observable } from 'rxjs';
 import { first, map } from 'rxjs/operators';
 
-import { metricEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types';
+import { metricEntityType } from '../../../../../../../../core/src/base-entity-schemas';
 import { IPageSideNavTab } from '../../../../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component';
 import { IHeaderBreadcrumb } from '../../../../../../../../core/src/shared/components/page-header/page-header.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.spec.ts
index 54782e02b2..b7ab24ec95 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/cloud-foundry-organization-spaces.component.spec.ts
@@ -7,7 +7,7 @@ import {
 } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import {
   CloudFoundryOrganizationServiceMock,
-} from '../../../../../../../core/test-framework/cloud-foundry-organization.service.mock';
+} from '../../../../../../test-framework/cloud-foundry-organization.service.mock';
 import { CloudFoundryOrganizationService } from '../../../services/cloud-foundry-organization.service';
 import { CloudFoundryOrganizationSpacesComponent } from './cloud-foundry-organization-spaces.component';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.spec.ts
index b7aefc0de0..35860a494a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-apps/cloud-foundry-space-apps.component.spec.ts
@@ -1,12 +1,8 @@
 import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import {
-  generateCfBaseTestModules,
-} from '../../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import {
-  CloudFoundrySpaceServiceMock,
-} from '../../../../../../../../../core/test-framework/cloud-foundry-space.service.mock';
+import { generateCfBaseTestModules } from '../../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { CloudFoundrySpaceServiceMock } from '../../../../../../../../test-framework/cloud-foundry-space.service.mock';
 import { CloudFoundrySpaceService } from '../../../../../services/cloud-foundry-space.service';
 import { CloudFoundrySpaceAppsComponent } from './cloud-foundry-space-apps.component';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.spec.ts
index 4e2ffdb6e1..1b27ca28c7 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-routes/cloud-foundry-space-routes.component.spec.ts
@@ -1,12 +1,8 @@
 import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import {
-  generateCfBaseTestModules,
-} from '../../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import {
-  CloudFoundrySpaceServiceMock,
-} from '../../../../../../../../../core/test-framework/cloud-foundry-space.service.mock';
+import { generateCfBaseTestModules } from '../../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { CloudFoundrySpaceServiceMock } from '../../../../../../../../test-framework/cloud-foundry-space.service.mock';
 import { CloudFoundrySpaceService } from '../../../../../services/cloud-foundry-space.service';
 import { CloudFoundrySpaceRoutesComponent } from './cloud-foundry-space-routes.component';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.spec.ts
index 2fde286c22..d1598bc08b 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-service-instances/cloud-foundry-space-service-instances.component.spec.ts
@@ -1,16 +1,16 @@
-/* tslint:disable:max-line-length */
 import { CommonModule, DatePipe } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { getCfSpaceServiceMock } from '../../../../../../../../../core/test-framework/cloud-foundry-space.service.mock';
 import { generateCfBaseTestModules } from '../../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { getCfSpaceServiceMock } from '../../../../../../../../test-framework/cloud-foundry-space.service.mock';
 import {
   TableCellAppCfOrgSpaceHeaderComponent,
 } from '../../../../../../../shared/components/list/list-types/app/table-cell-app-cforgspace-header/table-cell-app-cforgspace-header.component';
 import { ServiceActionHelperService } from '../../../../../../../shared/data-services/service-action-helper.service';
 import { CloudFoundrySpaceServiceInstancesComponent } from './cloud-foundry-space-service-instances.component';
 
+/* tslint:disable:max-line-length */
 /* tslint:enable:max-line-length */
 
 @NgModule({
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts
index a70ec66c5f..7153674c1d 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.spec.ts
@@ -1,13 +1,11 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { TabNavService } from '../../../../../../../../../core/tab-nav.service';
-import {
-  CloudFoundrySpaceServiceMock,
-} from '../../../../../../../../../core/test-framework/cloud-foundry-space.service.mock';
 import {
   generateActiveRouteCfOrgSpaceMock,
   generateCfBaseTestModules,
 } from '../../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { CloudFoundrySpaceServiceMock } from '../../../../../../../../test-framework/cloud-foundry-space.service.mock';
 import {
   CardCfRecentAppsComponent,
 } from '../../../../../../../shared/components/cards/card-cf-recent-apps/card-cf-recent-apps.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.spec.ts
index 1a7dbc15f0..c8ec3532b6 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-user-service-instances/cloud-foundry-space-user-service-instances.component.spec.ts
@@ -1,10 +1,8 @@
 import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import {
-  generateCfBaseTestModules,
-} from '../../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { getCfSpaceServiceMock } from '../../../../../../../../../core/test-framework/cloud-foundry-space.service.mock';
+import { generateCfBaseTestModules } from '../../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { getCfSpaceServiceMock } from '../../../../../../../../test-framework/cloud-foundry-space.service.mock';
 import { ServiceActionHelperService } from '../../../../../../../shared/data-services/service-action-helper.service';
 import { CloudFoundrySpaceUserServiceInstancesComponent } from './cloud-foundry-space-user-service-instances.component';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts
index b18fed16ef..73714b2742 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts
@@ -1,16 +1,16 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { TabNavService } from '../../../../../../../../../core/tab-nav.service';
-import {
-  CloudFoundryOrganizationServiceMock,
-} from '../../../../../../../../../core/test-framework/cloud-foundry-organization.service.mock';
 import {
   CloudFoundrySpaceServiceMock,
 } from '../../../../../../../../../core/test-framework/cloud-foundry-space.service.mock';
 import {
   generateCfBaseTestModules,
-  generateTestCfEndpointServiceProvider,
+  genera../../../../../../../../ test - framework / cloud - foundry - space.service.mock
 } from '../../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import {
+  CloudFoundryOrganizationServiceMock,
+} from '../../../../../../../../test-framework/cloud-foundry-organization.service.mock';
 import { CloudFoundryOrganizationService } from '../../../../../services/cloud-foundry-organization.service';
 import { CloudFoundrySpaceService } from '../../../../../services/cloud-foundry-space.service';
 import { CfAdminAddUserWarningComponent } from '../../../../cf-admin-add-user-warning/cf-admin-add-user-warning.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.spec.ts
index ad1c2e77fb..86b4a72c57 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-summary/cloud-foundry-organization-summary.component.spec.ts
@@ -1,13 +1,13 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { TabNavService } from '../../../../../../../core/tab-nav.service';
-import {
-  CloudFoundryOrganizationServiceMock,
-} from '../../../../../../../core/test-framework/cloud-foundry-organization.service.mock';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
 } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import {
+  CloudFoundryOrganizationServiceMock,
+} from '../../../../../../test-framework/cloud-foundry-organization.service.mock';
 import {
   CardCfOrgUserDetailsComponent,
 } from '../../../../../shared/components/cards/card-cf-org-user-details/card-cf-org-user-details.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.spec.ts
index 441ce3c22e..352fc409a2 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.spec.ts
@@ -1,13 +1,13 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { TabNavService } from '../../../../../../../core/tab-nav.service';
-import {
-  CloudFoundryOrganizationServiceMock,
-} from '../../../../../../../core/test-framework/cloud-foundry-organization.service.mock';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
 } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import {
+  CloudFoundryOrganizationServiceMock,
+} from '../../../../../../test-framework/cloud-foundry-organization.service.mock';
 import { CloudFoundryOrganizationService } from '../../../services/cloud-foundry-organization.service';
 import { CfAdminAddUserWarningComponent } from '../../cf-admin-add-user-warning/cf-admin-add-user-warning.component';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.spec.ts
index a62e2b598e..49c4be9fc8 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users.component.spec.ts
@@ -7,8 +7,8 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { CoreModule } from '../../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../../core/tab-nav.service';
-import { CfUserServiceTestProvider } from '../../../../../../core/test-framework/user-service-helper';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { CfUserServiceTestProvider } from '../../../../../test-framework/user-service-helper';
 import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
 import { CfRolesService } from './cf-roles.service';
 import { UsersRolesConfirmComponent } from './manage-users-confirm/manage-users-confirm.component';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.spec.ts
index 74ec27b8e9..5879a847df 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/remove-user/remove-user.component.spec.ts
@@ -1,3 +1,4 @@
+import { HttpClientModule } from '@angular/common/http';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
@@ -7,12 +8,11 @@ import { CoreModule } from '../../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../../core/tab-nav.service';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { CfUserServiceTestProvider } from '../../../../../../core/test-framework/user-service-helper';
+import { CfUserServiceTestProvider } from '../../../../../test-framework/user-service-helper';
 import { ActiveRouteCfOrgSpace } from '../../cf-page.types';
 import { CfRolesService } from '../manage-users//cf-roles.service';
 import { UsersRolesConfirmComponent } from '../manage-users/manage-users-confirm/manage-users-confirm.component';
 import { RemoveUserComponent } from './remove-user.component';
-import { HttpClientModule } from '@angular/common/http';
 
 describe('RemoveUserComponent', () => {
   let component: RemoveUserComponent;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.spec.ts
index 14e8fe5c9e..4eacf1721f 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-instances/card-app-instances.component.spec.ts
@@ -14,8 +14,8 @@ import {
 } from '../../../../../../core/src/shared/components/application-state/application-state.component';
 import { CardStatusComponent } from '../../../../../../core/src/shared/components/cards/card-status/card-status.component';
 import { ConfirmationDialogService } from '../../../../../../core/src/shared/components/confirmation-dialog.service';
-import { ApplicationServiceMock } from '../../../../../../core/test-framework/application-service-helper';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
+import { ApplicationServiceMock } from '../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ApplicationService } from '../../../../features/applications/application.service';
 import { ApplicationStateService } from '../../../services/application-state.service';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-status/card-app-status.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-status/card-app-status.component.spec.ts
index 44a3c70cc5..c3a4e7dc27 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-status/card-app-status.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-status/card-app-status.component.spec.ts
@@ -11,7 +11,7 @@ import {
   ApplicationStateComponent,
 } from '../../../../../../core/src/shared/components/application-state/application-state.component';
 import { CardStatusComponent } from '../../../../../../core/src/shared/components/cards/card-status/card-status.component';
-import { ApplicationServiceMock } from '../../../../../../core/test-framework/application-service-helper';
+import { ApplicationServiceMock } from '../../../../../test-framework/application-service-helper';
 import { ApplicationService } from '../../../../features/applications/application.service';
 import { CardAppStatusComponent } from './card-app-status.component';
 
@@ -35,7 +35,7 @@ describe('CardAppStatusComponent', () => {
         { provide: ApplicationService, useClass: ApplicationServiceMock },
       ]
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-uptime/card-app-uptime.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-uptime/card-app-uptime.component.spec.ts
index 7c0ee13707..654313f9e3 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-uptime/card-app-uptime.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-uptime/card-app-uptime.component.spec.ts
@@ -18,7 +18,7 @@ import {
 } from '../../../../../../core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component';
 import { MetadataItemComponent } from '../../../../../../core/src/shared/components/metadata-item/metadata-item.component';
 import { UptimePipe } from '../../../../../../core/src/shared/pipes/uptime.pipe';
-import { ApplicationServiceMock } from '../../../../../../core/test-framework/application-service-helper';
+import { ApplicationServiceMock } from '../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ApplicationMonitorService } from '../../../../features/applications/application-monitor.service';
 import { ApplicationService } from '../../../../features/applications/application.service';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-usage/card-app-usage.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-usage/card-app-usage.component.spec.ts
index 5e067e8926..f0bc17b90a 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-usage/card-app-usage.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-app-usage/card-app-usage.component.spec.ts
@@ -17,7 +17,7 @@ import {
   TableCellStatusDirective,
 } from '../../../../../../core/src/shared/components/list/list-table/table-cell-status.directive';
 import { PercentagePipe } from '../../../../../../core/src/shared/pipes/percentage.pipe';
-import { ApplicationServiceMock } from '../../../../../../core/test-framework/application-service-helper';
+import { ApplicationServiceMock } from '../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ApplicationMonitorService } from '../../../../features/applications/application-monitor.service';
 import { ApplicationService } from '../../../../features/applications/application.service';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-org-user-details/card-cf-org-user-details.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-org-user-details/card-cf-org-user-details.component.spec.ts
index 0a217fd438..7b9e5540dd 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-org-user-details/card-cf-org-user-details.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-org-user-details/card-cf-org-user-details.component.spec.ts
@@ -1,27 +1,27 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
 import {
   BooleanIndicatorComponent,
 } from '../../../../../../core/src/shared/components/boolean-indicator/boolean-indicator.component';
+import {
+  CopyToClipboardComponent,
+} from '../../../../../../core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component';
 import { MetadataItemComponent } from '../../../../../../core/src/shared/components/metadata-item/metadata-item.component';
+import { CapitalizeFirstPipe } from '../../../../../../core/src/shared/pipes/capitalizeFirstLetter.pipe';
+import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
 import { EntityMonitorFactory } from '../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
-import { CapitalizeFirstPipe } from '../../../../../../core/src/shared/pipes/capitalizeFirstLetter.pipe';
 import {
   generateCfBaseTestModulesNoShared,
   generateTestCfEndpointServiceProvider,
 } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import {
-  CloudFoundryOrganizationServiceMock,
-} from '../../../../../../core/test-framework/cloud-foundry-organization.service.mock';
+import { CloudFoundryOrganizationServiceMock } from '../../../../../test-framework/cloud-foundry-organization.service.mock';
 import {
   CloudFoundryOrganizationService,
 } from '../../../../features/cloud-foundry/services/cloud-foundry-organization.service';
 import { CfOrgSpaceDataService } from '../../../data-services/cf-org-space-service.service';
 import { CfUserService } from '../../../data-services/cf-user.service';
 import { CardCfOrgUserDetailsComponent } from './card-cf-org-user-details.component';
-import { CopyToClipboardComponent } from '../../../../../../core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component';
 
 describe('CardCfOrgUserDetailsComponent', () => {
   let component: CardCfOrgUserDetailsComponent;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.spec.ts
index 09b1e0b5a0..11aadb41a3 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-space-details/card-cf-space-details.component.spec.ts
@@ -3,15 +3,15 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import {
   BooleanIndicatorComponent,
 } from '../../../../../../core/src/shared/components/boolean-indicator/boolean-indicator.component';
+import {
+  CopyToClipboardComponent,
+} from '../../../../../../core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component';
 import { MetadataItemComponent } from '../../../../../../core/src/shared/components/metadata-item/metadata-item.component';
 import { EntityMonitorFactory } from '../../../../../../store/src/monitors/entity-monitor.factory.service';
-import {
-  generateCfBaseTestModulesNoShared,
-} from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { CloudFoundrySpaceServiceMock } from '../../../../../../core/test-framework/cloud-foundry-space.service.mock';
+import { generateCfBaseTestModulesNoShared } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { CloudFoundrySpaceServiceMock } from '../../../../../test-framework/cloud-foundry-space.service.mock';
 import { CloudFoundrySpaceService } from '../../../../features/cloud-foundry/services/cloud-foundry-space.service';
 import { CardCfSpaceDetailsComponent } from './card-cf-space-details.component';
-import { CopyToClipboardComponent } from '../../../../../../core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component';
 
 describe('CardCfSpaceDetailsComponent', () => {
   let component: CardCfSpaceDetailsComponent;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.spec.ts
index d47b10ad55..a1620f3c8e 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cf-role-checkbox/cf-role-checkbox.component.spec.ts
@@ -1,3 +1,4 @@
+import { HttpClientModule } from '@angular/common/http';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
@@ -5,11 +6,10 @@ import { CoreModule } from '../../../../../core/src/core/core.module';
 import { EntityMonitorFactory } from '../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../../store/src/monitors/pagination-monitor.factory';
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { CfUserServiceTestProvider } from '../../../../../core/test-framework/user-service-helper';
+import { CfUserServiceTestProvider } from '../../../../test-framework/user-service-helper';
 import { ActiveRouteCfOrgSpace } from '../../../features/cloud-foundry/cf-page.types';
 import { CfRolesService } from '../../../features/cloud-foundry/users/manage-users/cf-roles.service';
 import { CfRoleCheckboxComponent } from './cf-role-checkbox.component';
-import { HttpClientModule } from '@angular/common/http';
 
 describe('CfRoleCheckboxComponent', () => {
   let component: CfRoleCheckboxComponent;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.spec.ts
index 55ce1e5919..d015f401ca 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.spec.ts
@@ -1,13 +1,13 @@
 import { CommonModule } from '@angular/common';
 import { inject, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
+import { testSCFEndpointGuid } from '@stratos/store/testing';
 
 import { CoreModule } from '../../../../../../../core/src/core/core.module';
 import { CF_GUID } from '../../../../../../../core/src/shared/entity.tokens';
 import { SharedModule } from '../../../../../../../core/src/shared/shared.module';
-import { generateTestApplicationServiceProvider } from '../../../../../../../core/test-framework/application-service-helper';
 import { generateTestEntityServiceProvider } from '../../../../../../../core/test-framework/entity-service.helper';
-import { testSCFEndpointGuid } from '@stratos/store/testing';
+import { generateTestApplicationServiceProvider } from '../../../../../../test-framework/application-service-helper';
 import {
   generateCfStoreModules,
   generateTestCfEndpointServiceProvider,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts
index 83d7992262..1559dfec06 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service.ts
@@ -32,7 +32,6 @@ import { CfAppInstancesDataSource } from './cf-app-instances-data-source';
 import { TableCellCfCellComponent } from './table-cell-cf-cell/table-cell-cf-cell.component';
 import { TableCellUsageComponent } from './table-cell-usage/table-cell-usage.component';
 
-// TODO: Move file to CF package (#3769)
 export function createAppInstancesMetricAction(appGuid: string, cfGuid: string): FetchApplicationMetricsAction {
   return new FetchApplicationMetricsAction(
     appGuid,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-map-routes-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-map-routes-list-config.service.spec.ts
index 30c29cf8e4..1c3df42e10 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-map-routes-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-map-routes-list-config.service.spec.ts
@@ -5,7 +5,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 
 import { CoreModule } from '../../../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../../../core/src/shared/shared.module';
-import { ApplicationServiceMock } from '../../../../../../../core/test-framework/application-service-helper';
+import { ApplicationServiceMock } from '../../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { ApplicationService } from '../../../../../features/applications/application.service';
 import { CfAppMapRoutesListConfigService } from './cf-app-map-routes-list-config.service';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-list-config.service.spec.ts
index 55b1bafe3e..3094755217 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-route/cf-app-routes-list-config.service.spec.ts
@@ -7,7 +7,7 @@ import { CoreModule } from '../../../../../../../core/src/core/core.module';
 import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
 import { ConfirmationDialogService } from '../../../../../../../core/src/shared/components/confirmation-dialog.service';
 import { SharedModule } from '../../../../../../../core/src/shared/shared.module';
-import { ApplicationServiceMock } from '../../../../../../../core/test-framework/application-service-helper';
+import { ApplicationServiceMock } from '../../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { CFAppState } from '../../../../../cf-app-state';
 import { ApplicationService } from '../../../../../features/applications/application.service';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.spec.ts
index 941b20b328..c92ca3f71b 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.spec.ts
@@ -2,12 +2,10 @@ import { DatePipe } from '@angular/common';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
-import {
-  generateTestApplicationServiceProvider,
-} from '../../../../../../../../core/test-framework/application-service-helper';
 import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
+import { generateTestApplicationServiceProvider } from '../../../../../../../test-framework/application-service-helper';
 import { generateCfBaseTestModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { IServiceInstance } from '../../../../../../cf-api-svc.types';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.spec.ts
index 076d755dd6..2d365bb272 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-list-config.service.spec.ts
@@ -1,7 +1,7 @@
 import { DatePipe } from '@angular/common';
 import { inject, TestBed } from '@angular/core/testing';
 
-import { generateTestApplicationServiceProvider } from '../../../../../../../core/test-framework/application-service-helper';
+import { generateTestApplicationServiceProvider } from '../../../../../../test-framework/application-service-helper';
 import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import {
   ApplicationEnvVarsHelper,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.spec.ts
index 971875ddcf..4eea9c86fc 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/cf-app-variables-list-config.service.spec.ts
@@ -4,8 +4,8 @@ import { RouterTestingModule } from '@angular/router/testing';
 
 import { CoreModule } from '../../../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../../../core/src/shared/shared.module';
-import { generateTestApplicationServiceProvider } from '../../../../../../../core/test-framework/application-service-helper';
 import { generateTestEntityServiceProvider } from '../../../../../../../core/test-framework/entity-service.helper';
+import { generateTestApplicationServiceProvider } from '../../../../../../test-framework/application-service-helper';
 import { generateCfStoreModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { GetApplication } from '../../../../../actions/application.actions';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-source.ts
index a2190a35e2..6e834f3121 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-apps/cf-cell-apps-source.ts
@@ -24,8 +24,6 @@ import { IApp } from '../../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { createEntityRelationKey } from '../../../../../entity-relations/entity-relations.types';
 
-// TODO: Move file to CF package (#3769)
-
 export interface CfCellApp {
   metric: IMetricApplication;
   appGuid: string;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-health/cf-cell-health-list-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-health/cf-cell-health-list-config.service.ts
index 7f859aa4bb..86bb2ee270 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-health/cf-cell-health-list-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cell-health/cf-cell-health-list-config.service.ts
@@ -24,11 +24,6 @@ import {
 import { BaseCfListConfig } from '../base-cf/base-cf-list-config';
 import { CfCellHealthDataSource, CfCellHealthEntry, CfCellHealthState } from './cf-cell-health-source';
 
-// tslint:disable:max-line-length
-
-// TODO: Move file to CF package (#3769)
-// tslint:enable:max-line-length
-
 @Injectable()
 export class CfCellHealthListConfigService extends BaseCfListConfig<CfCellHealthEntry> {
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cells/cf-cells-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cells/cf-cells-data-source.ts
index 56d0a0a5ca..033ef32875 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cells/cf-cells-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-cells/cf-cells-data-source.ts
@@ -1,7 +1,9 @@
 import { Store } from '@ngrx/store';
 import { map } from 'rxjs/operators';
 
-import { ListDataSource } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
+import {
+  ListDataSource,
+} from '../../../../../../../core/src/shared/components/list/data-sources-controllers/list-data-source';
 import { IListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
 import { IMetrics, IMetricVectorResult } from '../../../../../../../store/src/types/base-metric.types';
 import { IMetricCell } from '../../../../../../../store/src/types/metric.types';
@@ -9,9 +11,6 @@ import { FetchCFCellMetricsPaginatedAction } from '../../../../../actions/cf-met
 import { CFAppState } from '../../../../../cf-app-state';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 
-
-
-// TODO: Move file to CF package (#3769)
 export class CfCellsDataSource
   extends ListDataSource<IMetricVectorResult<IMetricCell>, IMetrics<IMetricVectorResult<IMetricCell>>> {
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-org-users/cf-org-users-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-org-users/cf-org-users-list-config.service.spec.ts
index f6c0b51a50..10944e2dd7 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-org-users/cf-org-users-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-org-users/cf-org-users-list-config.service.spec.ts
@@ -10,7 +10,7 @@ import {
 } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import {
   CloudFoundryOrganizationServiceMock,
-} from '../../../../../../../core/test-framework/cloud-foundry-organization.service.mock';
+} from '../../../../../../test-framework/cloud-foundry-organization.service.mock';
 import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
 import { CloudFoundryEndpointService } from '../../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/table-cell-route-apps-attached/table-cell-route-apps-attached.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/table-cell-route-apps-attached/table-cell-route-apps-attached.component.spec.ts
index 71d085e1d7..9ac357c8b7 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/table-cell-route-apps-attached/table-cell-route-apps-attached.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-routes/table-cell-route-apps-attached/table-cell-route-apps-attached.component.spec.ts
@@ -4,7 +4,7 @@ import { AppChipsComponent } from '../../../../../../../../core/src/shared/compo
 import {
   generateCfBaseTestModulesNoShared,
 } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { CloudFoundrySpaceServiceMock } from '../../../../../../../../core/test-framework/cloud-foundry-space.service.mock';
+import { CloudFoundrySpaceServiceMock } from '../../../../../../../test-framework/cloud-foundry-space.service.mock';
 import { CloudFoundrySpaceService } from '../../../../../../features/cloud-foundry/services/cloud-foundry-space.service';
 import { TableCellRouteAppsAttachedComponent } from './table-cell-route-apps-attached.component';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.spec.ts
index 95ea99eef0..81ce704340 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-apps/cf-space-apps-list-config.service.spec.ts
@@ -2,7 +2,7 @@ import { DatePipe } from '@angular/common';
 import { inject, TestBed } from '@angular/core/testing';
 
 import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { CloudFoundrySpaceServiceMock } from '../../../../../../../core/test-framework/cloud-foundry-space.service.mock';
+import { CloudFoundrySpaceServiceMock } from '../../../../../../test-framework/cloud-foundry-space.service.mock';
 import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service';
 import { CfSpaceAppsListConfigService } from './cf-space-apps-list-config.service';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-list-config.service.spec.ts
index 9889896e9d..7f8531ebd3 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-routes/cf-space-routes-list-config.service.spec.ts
@@ -2,7 +2,7 @@ import { DatePipe } from '@angular/common';
 import { inject, TestBed } from '@angular/core/testing';
 
 import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { CloudFoundrySpaceServiceMock } from '../../../../../../../core/test-framework/cloud-foundry-space.service.mock';
+import { CloudFoundrySpaceServiceMock } from '../../../../../../test-framework/cloud-foundry-space.service.mock';
 import { CloudFoundrySpaceService } from '../../../../../features/cloud-foundry/services/cloud-foundry-space.service';
 import { CfSpaceRoutesListConfigService } from './cf-space-routes-list-config.service';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.spec.ts
index fda94b5235..a7705b3dae 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.spec.ts
@@ -1,11 +1,11 @@
 import { HttpClient, HttpHandler } from '@angular/common/http';
 import { inject, TestBed } from '@angular/core/testing';
 
+import { CloudFoundrySpaceServiceMock } from '../../../../../../../core/test-framework/cloud-foundry-space.service.mock';
 import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import {
   CloudFoundryOrganizationServiceMock,
-} from '../../../../../../../core/test-framework/cloud-foundry-organization.service.mock';
-import { CloudFoundrySpaceServiceMock } from '../../../../../../../core/test-framework/cloud-foundry-space.service.mock';
+} from '../../../../../../test-framework/cloud../../../../../../test-framework/cloud-foundry-space.service.mock';
 import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
 import { CloudFoundryEndpointService } from '../../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-list-config.service.spec.ts
index 534bd94e9a..035322ecdc 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/cf-spaces-service-instances-list-config.service.spec.ts
@@ -2,7 +2,7 @@ import { DatePipe } from '@angular/common';
 import { inject, TestBed } from '@angular/core/testing';
 
 import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { getCfSpaceServiceMock } from '../../../../../../../core/test-framework/cloud-foundry-space.service.mock';
+import { getCfSpaceServiceMock } from '../../../../../../test-framework/cloud-foundry-space.service.mock';
 import { ServiceActionHelperService } from '../../../../data-services/service-action-helper.service';
 import { CfSpacesServiceInstancesListConfigService } from './cf-spaces-service-instances-list-config.service';
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.ts
index f2bf0f9ea4..80434fe3b8 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component.ts
@@ -11,8 +11,6 @@ import { entityCatalog } from '../../../../../../../../store/src/entity-catalog/
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { IServiceInstance } from '../../../../../../cf-api-svc.types';
 
-// TODO: Move CF code to CF Module #3769
-
 @Component({
   selector: 'app-table-cell-service',
   templateUrl: './table-cell-service.component.html',
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.spec.ts
index 6f8b033576..7fe7843b9a 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component.spec.ts
@@ -3,11 +3,11 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
 import { CoreModule } from '../../../../../../../../core/src/core/core.module';
-import { CfUserServiceTestProvider } from '../../../../../../../../core/test-framework/user-service-helper';
 import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { CfUserServiceTestProvider } from '../../../../../../../test-framework/user-service-helper';
 import { ISpace } from '../../../../../../cf-api.types';
 import { ActiveRouteCfOrgSpace } from '../../../../../../features/cloud-foundry/cf-page.types';
 import { CfRolesService } from '../../../../../../features/cloud-foundry/users/manage-users/cf-roles.service';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component.spec.ts
index d1c65811b8..cd24bca07c 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component.spec.ts
@@ -1,3 +1,4 @@
+import { HttpClientModule } from '@angular/common/http';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
@@ -5,12 +6,11 @@ import { CoreModule } from '../../../../../../../../core/src/core/core.module';
 import { EntityMonitorFactory } from '../../../../../../../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../../../../../../../store/src/monitors/pagination-monitor.factory';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { CfUserServiceTestProvider } from '../../../../../../../../core/test-framework/user-service-helper';
+import { CfUserServiceTestProvider } from '../../../../../../../test-framework/user-service-helper';
 import { ActiveRouteCfOrgSpace } from '../../../../../../features/cloud-foundry/cf-page.types';
 import { CfRolesService } from '../../../../../../features/cloud-foundry/users/manage-users/cf-roles.service';
 import { CfUserService } from '../../../../../data-services/cf-user.service';
 import { TableCellSelectOrgComponent } from './table-cell-select-org.component';
-import { HttpClientModule } from '@angular/common/http';
 
 describe('TableCellSelectOrgComponent', () => {
   let component: TableCellSelectOrgComponent;
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.spec.ts
index c19f06a636..bacbc667ec 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.spec.ts
@@ -4,14 +4,14 @@ import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
+import { CloudFoundrySpaceServiceMock } from '../../../../../../../core/test-framework/cloud-foundry-space.service.mock';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
 } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import {
   CloudFoundryOrganizationServiceMock,
-} from '../../../../../../../core/test-framework/cloud-foundry-organization.service.mock';
-import { CloudFoundrySpaceServiceMock } from '../../../../../../../core/test-framework/cloud-foundry-space.service.mock';
+} from '../../../../../../test-framework/cloud../../../../../../test-framework/cloud-foundry-space.service.mock';
 import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
 import {
   CloudFoundryOrganizationService,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.spec.ts
index 977fd14079..f0446539cd 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/github-commits/github-commits-list-config-base.service.spec.ts
@@ -4,12 +4,11 @@ import { inject, TestBed } from '@angular/core/testing';
 import { ApplicationService } from '../../../../../../../cloud-foundry/src/features/applications/application.service';
 import { CoreModule } from '../../../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../../../core/src/shared/shared.module';
-import { ApplicationServiceMock } from '../../../../../../../core/test-framework/application-service-helper';
 import { CoreTestingModule } from '../../../../../../../core/test-framework/core-test.modules';
 import { createBasicStoreModule } from '../../../../../../../store/testing/public-api';
+import { ApplicationServiceMock } from '../../../../../../test-framework/application-service-helper';
 import { GithubCommitsListConfigServiceBase } from './github-commits-list-config-base.service';
 
-// TODO: Move this file to cf package - #3769
 describe('GithubCommitsListConfigService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
diff --git a/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.store.module.ts b/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.store.module.ts
index c15f0f84ac..a565d27695 100644
--- a/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.store.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.store.module.ts
@@ -3,6 +3,7 @@ import { EffectsModule } from '@ngrx/effects';
 
 import { CloudFoundryReducersModule } from './cloud-foundry.reducers.module';
 import { AppVariablesEffect } from './effects/app-variables.effects';
+import { AppEffects } from './effects/app.effects';
 import { CloudFoundryEffects } from './effects/cloud-foundry.effects';
 import { CreateAppPageEffects } from './effects/create-app-effects';
 import { DeployAppEffects } from './effects/deploy-app.effects';
@@ -23,7 +24,8 @@ import { ServiceInstanceEffects } from './effects/service-instance.effects';
       RouteEffect,
       PermissionsEffects,
       PermissionEffects,
-      ServiceInstanceEffects
+      ServiceInstanceEffects,
+      AppEffects
     ])
   ]
 })
diff --git a/src/frontend/packages/store/src/effects/app.effects.ts b/src/frontend/packages/cloud-foundry/src/store/effects/app.effects.ts
similarity index 75%
rename from src/frontend/packages/store/src/effects/app.effects.ts
rename to src/frontend/packages/cloud-foundry/src/store/effects/app.effects.ts
index d4ddf1346d..af2ac64c00 100644
--- a/src/frontend/packages/store/src/effects/app.effects.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/effects/app.effects.ts
@@ -3,17 +3,17 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { first, map } from 'rxjs/operators';
 
-import { ASSIGN_ROUTE_SUCCESS } from '../../../cloud-foundry/src/actions/application-service-routes.actions';
-import { UPDATE_SUCCESS, UpdateExistingApplication } from '../../../cloud-foundry/src/actions/application.actions';
-import { cfEntityCatalog } from '../../../cloud-foundry/src/cf-entity-catalog';
+import { endpointHasMetrics } from '../../../../core/src/features/endpoints/endpoint-helpers';
+import { EndpointOnlyAppState } from '../../../../store/src/app-state';
+import { APISuccessOrFailedAction } from '../../../../store/src/types/request.types';
+import { ASSIGN_ROUTE_SUCCESS } from '../../actions/application-service-routes.actions';
+import { UPDATE_SUCCESS, UpdateExistingApplication } from '../../actions/application.actions';
+import { cfEntityCatalog } from '../../cf-entity-catalog';
 import {
   createAppInstancesMetricAction,
-} from '../../../cloud-foundry/src/shared/components/list/list-types/app-instance/cf-app-instances-config.service';
-import { endpointHasMetrics } from '../../../core/src/features/endpoints/endpoint-helpers';
-import { EndpointOnlyAppState } from '../app-state';
-import { APISuccessOrFailedAction } from '../types/request.types';
+} from '../../shared/components/list/list-types/app-instance/cf-app-instances-config.service';
 
-// TODO: Move this file to cf package - #3769
+// TODO: RC search for cloud-foundry
 @Injectable()
 export class AppEffects {
 
diff --git a/src/frontend/packages/core/test-framework/application-service-helper.ts b/src/frontend/packages/cloud-foundry/test-framework/application-service-helper.ts
similarity index 83%
rename from src/frontend/packages/core/test-framework/application-service-helper.ts
rename to src/frontend/packages/cloud-foundry/test-framework/application-service-helper.ts
index 5ae467dc01..6c07e9ba8f 100644
--- a/src/frontend/packages/core/test-framework/application-service-helper.ts
+++ b/src/frontend/packages/cloud-foundry/test-framework/application-service-helper.ts
@@ -2,20 +2,17 @@ import { Store } from '@ngrx/store';
 import { Observable, of as observableOf } from 'rxjs';
 import { map } from 'rxjs/internal/operators/map';
 
-import { IApp, IAppSummary, IDomain, ISpace } from '../../cloud-foundry/src/cf-api.types';
-import { CFAppState } from '../../cloud-foundry/src/cf-app-state';
-import { ApplicationData, ApplicationService } from '../../cloud-foundry/src/features/applications/application.service';
+import { RequestInfoState } from '../../store/src/reducers/api-request-reducer/types';
+import { APIResource, EntityInfo } from '../../store/src/types/api.types';
+import { IApp, IAppSummary, IDomain, ISpace } from '../src/cf-api.types';
+import { CFAppState } from '../src/cf-app-state';
+import { ApplicationData, ApplicationService } from '../src/features/applications/application.service';
 import {
   ApplicationEnvVarsHelper,
   EnvVarStratosProject,
-} from '../../cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service';
-import {
-  ApplicationStateData,
-  ApplicationStateService,
-} from '../../cloud-foundry/src/shared/services/application-state.service';
-import { AppStat } from '../../cloud-foundry/src/store/types/app-metadata.types';
-import { RequestInfoState } from '../../store/src/reducers/api-request-reducer/types';
-import { APIResource, EntityInfo } from '../../store/src/types/api.types';
+} from '../src/features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service';
+import { ApplicationStateData, ApplicationStateService } from '../src/shared/services/application-state.service';
+import { AppStat } from '../src/store/types/app-metadata.types';
 
 function createEntity<T>(entity: T): APIResource<T> {
   return {
diff --git a/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts
index 16dfe9045f..dfb1e5297e 100644
--- a/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts
+++ b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-endpoint-service.helper.ts
@@ -8,7 +8,6 @@ import { testSCFEndpointGuid } from '@stratos/store/testing';
 import { CoreModule } from '../../core/src/core/core.module';
 import { SharedModule } from '../../core/src/shared/shared.module';
 import { AppTestModule } from '../../core/test-framework/core-test.helper';
-import { CfUserServiceTestProvider } from '../../core/test-framework/user-service-helper';
 import { EntityServiceFactory } from '../../store/src/entity-service-factory.service';
 import { EntityMonitorFactory } from '../../store/src/monitors/entity-monitor.factory.service';
 import { PaginationMonitorFactory } from '../../store/src/monitors/pagination-monitor.factory';
@@ -25,6 +24,7 @@ import { CfOrgSpaceDataService } from '../src/shared/data-services/cf-org-space-
 import { CfUserService } from '../src/shared/data-services/cf-user.service';
 import { CloudFoundryService } from '../src/shared/data-services/cloud-foundry.service';
 import { createUserRoleInOrg } from '../src/store/types/user.types';
+import { CfUserServiceTestProvider } from './user-service-helper';
 
 export const cfEndpointServiceProviderDeps = [
   EntityServiceFactory,
diff --git a/src/frontend/packages/core/test-framework/cloud-foundry-organization.service.mock.ts b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-organization.service.mock.ts
similarity index 93%
rename from src/frontend/packages/core/test-framework/cloud-foundry-organization.service.mock.ts
rename to src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-organization.service.mock.ts
index effdd309a0..5d765b0e0a 100644
--- a/src/frontend/packages/core/test-framework/cloud-foundry-organization.service.mock.ts
+++ b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-organization.service.mock.ts
@@ -3,8 +3,6 @@ import { Observable, of as observableOf } from 'rxjs';
 import { getDefaultRequestState } from '../../store/src/reducers/api-request-reducer/types';
 import { APIResource, EntityInfo } from '../../store/src/types/api.types';
 
-// TODO: Move this file to cf package - #3769
-
 export class CloudFoundryOrganizationServiceMock {
   org$: Observable<EntityInfo<APIResource<any>>> = observableOf(
     {
diff --git a/src/frontend/packages/core/test-framework/cloud-foundry-space.service.mock.ts b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-space.service.mock.ts
similarity index 87%
rename from src/frontend/packages/core/test-framework/cloud-foundry-space.service.mock.ts
rename to src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-space.service.mock.ts
index 18d32543f4..385bf3b793 100644
--- a/src/frontend/packages/core/test-framework/cloud-foundry-space.service.mock.ts
+++ b/src/frontend/packages/cloud-foundry/test-framework/cloud-foundry-space.service.mock.ts
@@ -1,10 +1,6 @@
 import { Observable, of as observableOf } from 'rxjs';
 
-import {
-  CloudFoundrySpaceService,
-} from '../../cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-space.service';
-
-// TODO: Move this file to cf package - #3769
+import { CloudFoundrySpaceService } from '../src/features/cloud-foundry/services/cloud-foundry-space.service';
 
 export class CloudFoundrySpaceServiceMock {
 
diff --git a/src/frontend/packages/core/test-framework/user-service-helper.ts b/src/frontend/packages/cloud-foundry/test-framework/user-service-helper.ts
similarity index 75%
rename from src/frontend/packages/core/test-framework/user-service-helper.ts
rename to src/frontend/packages/cloud-foundry/test-framework/user-service-helper.ts
index 824f8e9211..74970be342 100644
--- a/src/frontend/packages/core/test-framework/user-service-helper.ts
+++ b/src/frontend/packages/cloud-foundry/test-framework/user-service-helper.ts
@@ -1,7 +1,7 @@
 import { HttpBackend, HttpClient } from '@angular/common/http';
 import { HttpTestingController } from '@angular/common/http/testing';
 
-import { CfUserService } from '../../cloud-foundry/src/shared/data-services/cf-user.service';
+import { CfUserService } from '../src/shared/data-services/cf-user.service';
 
 
 export const CfUserServiceTestProvider = [
diff --git a/src/frontend/packages/core/src/base-entity-schemas.ts b/src/frontend/packages/core/src/base-entity-schemas.ts
index 4242afd616..19da225c8b 100644
--- a/src/frontend/packages/core/src/base-entity-schemas.ts
+++ b/src/frontend/packages/core/src/base-entity-schemas.ts
@@ -7,6 +7,8 @@ import {
 } from '../../store/src/helpers/entity-factory';
 import { EntitySchema } from '../../store/src/helpers/entity-schema';
 
+export const metricEntityType = 'metrics';
+
 export const STRATOS_ENDPOINT_TYPE = 'stratos';
 export const ENDPOINT_TYPE = 'endpoint';
 
diff --git a/src/frontend/packages/core/src/core/current-user-permissions.config.ts b/src/frontend/packages/core/src/core/current-user-permissions.config.ts
index df9cdd2fa1..301d6ac136 100644
--- a/src/frontend/packages/core/src/core/current-user-permissions.config.ts
+++ b/src/frontend/packages/core/src/core/current-user-permissions.config.ts
@@ -1,5 +1,6 @@
 import { CFFeatureFlagTypes } from '../shared/components/cf-auth/cf-auth.types';
 
+// TODO: RC REMOVE ALL CF???
 export enum CurrentUserPermissions {
   APPLICATION_VIEW = 'view.application',
   APPLICATION_EDIT = 'edit.application',
diff --git a/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts b/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts
index 52be77c211..1376e3e6b7 100644
--- a/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts
+++ b/src/frontend/packages/core/src/features/endpoints/edit-endpoint/edit-endpoint-step/edit-endpoint-step.component.ts
@@ -3,7 +3,7 @@ import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
-import { filter, first, map, pairwise } from 'rxjs/operators';
+import { filter, first, map, pairwise, switchMap } from 'rxjs/operators';
 
 import { AppState } from '../../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
@@ -124,29 +124,36 @@ export class EditEndpointStepComponent implements OnDestroy, IStepperStep {
   }
 
   onNext: StepOnNextFunction = () => {
-    const action = new UpdateEndpoint(
-      this.endpointID,
-      this.editEndpoint.value.name,
-      this.editEndpoint.value.skipSSL,
-      this.editEndpoint.value.setClientInfo,
-      this.editEndpoint.value.clientID,
-      this.editEndpoint.value.clientSecret,
-      this.editEndpoint.value.allowSSO,
-    );
-
-    this.store.dispatch(action);
-    return this.store.select(selectUpdateInfo('stratosEndpoint', this.endpointID, 'updating')).pipe(
-      pairwise(),
-      filter(([oldV, newV]) => oldV.busy && !newV.busy),
-      map(([, newV]) => newV),
-      map(o => {
-        return {
-          success: !o.error,
-          message: o.message,
-          redirect: !o.error
-        };
+    return this.endpoint$.pipe(
+      first(),
+      switchMap(endpoint => {
+        const action = new UpdateEndpoint(
+          endpoint.cnsi_type,
+          this.endpointID,
+          this.editEndpoint.value.name,
+          this.editEndpoint.value.skipSSL,
+          this.editEndpoint.value.setClientInfo,
+          this.editEndpoint.value.clientID,
+          this.editEndpoint.value.clientSecret,
+          this.editEndpoint.value.allowSSO,
+        );
+
+        this.store.dispatch(action);
+
+        return this.store.select(selectUpdateInfo('stratosEndpoint', this.endpointID, 'updating')).pipe(
+          pairwise(),
+          filter(([oldV, newV]) => oldV.busy && !newV.busy),
+          map(([, newV]) => newV),
+          map(o => {
+            return {
+              success: !o.error,
+              message: o.message,
+              redirect: !o.error
+            };
+          })
+        )
       })
-    );
+    )
   }
 
   ngOnDestroy(): void {
diff --git a/src/frontend/packages/store/src/actions/endpoint.actions.ts b/src/frontend/packages/store/src/actions/endpoint.actions.ts
index c0a728eb06..cd4540b8eb 100644
--- a/src/frontend/packages/store/src/actions/endpoint.actions.ts
+++ b/src/frontend/packages/store/src/actions/endpoint.actions.ts
@@ -1,6 +1,5 @@
 import { Action } from '@ngrx/store';
 
-import { CF_ENDPOINT_TYPE } from '../../../cloud-foundry/src/cf-types';
 import { STRATOS_ENDPOINT_TYPE } from '../../../core/src/base-entity-schemas';
 import { EndpointType } from '../../../core/src/core/extension/extension-types';
 import { endpointSchemaKey } from '../helpers/entity-factory';
@@ -45,7 +44,7 @@ export class EndpointActionComplete implements Action {
 
 export class EndpointAction implements Action {
   type: string;
-  endpointType: EndpointType = CF_ENDPOINT_TYPE;
+  endpointType: EndpointType;
 }
 
 // Different Auth Type support for connecting to Endpoints
@@ -150,6 +149,7 @@ export class UpdateEndpoint extends EndpointAction {
   type = UPDATE_ENDPOINT;
 
   constructor(
+    public endpointType: EndpointType,
     public id: string,
     public name: string,
     public skipSSL: boolean,
diff --git a/src/frontend/packages/store/src/actions/metrics.actions.ts b/src/frontend/packages/store/src/actions/metrics.actions.ts
index 62a41d43bf..43b068a14d 100644
--- a/src/frontend/packages/store/src/actions/metrics.actions.ts
+++ b/src/frontend/packages/store/src/actions/metrics.actions.ts
@@ -1,4 +1,4 @@
-import { metricEntityType } from '../../../cloud-foundry/src/cf-entity-types';
+import { metricEntityType } from '../../../core/src/base-entity-schemas';
 import { environment } from '../../../core/src/environments/environment';
 import { MetricQueryType } from '../../../core/src/shared/services/metrics-range-selector.types';
 import { EntityRequestAction } from '../types/request.types';
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts
index f6207fcff1..7a4faf6d8a 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts
@@ -4,6 +4,7 @@ import { endpointEntitySchema, STRATOS_ENDPOINT_TYPE } from '../../../../core/sr
 import { KnownKeys, NonOptionalKeys } from '../../../../core/src/core/utils.service';
 import { getFullEndpointApiUrl } from '../../../../core/src/features/endpoints/endpoint-helpers';
 import { IRequestEntityTypeState } from '../../app-state';
+import { EntitiesInfoHandler, EntityInfoHandler } from '../../entity-request-pipeline/entity-request-pipeline.types';
 import {
   PaginationPageIteratorConfig,
 } from '../../entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe';
@@ -128,8 +129,8 @@ export class StratosBaseCatalogEntity<
       }
       return newSchema;
     }, {
-      default: entitySchemas.default
-    });
+        default: entitySchemas.default
+      });
   }
 
   private getEndpointType(definition: IStratosBaseEntityDefinition) {
@@ -250,6 +251,14 @@ export class StratosBaseCatalogEntity<
       this.definition.paginationConfig :
       null;
   }
+
+  public getEntityEmitHandler(): EntityInfoHandler {
+    return this.definition.entityEmitHandler;
+  }
+
+  public getEntitiesEmitHandler(): EntitiesInfoHandler {
+    return this.definition.entitiesEmitHandler;
+  }
 }
 
 export class StratosCatalogEntity<
@@ -271,6 +280,16 @@ export class StratosCatalogEntity<
       this.definition.paginationConfig :
       this.definition.endpoint ? this.definition.endpoint.paginationConfig : null;
   }
+
+  public getEntityEmitHandler(): EntityInfoHandler {
+    return this.definition.entityEmitHandler ||
+      this.definition.endpoint ? this.definition.endpoint.entityEmitHandler : null;
+  }
+
+  public getEntitiesEmitHandler(): EntitiesInfoHandler {
+    return this.definition.entitiesEmitHandler ||
+      this.definition.endpoint ? this.definition.endpoint.entitiesEmitHandler : null
+  }
 }
 
 export class StratosCatalogEndpointEntity extends StratosBaseCatalogEntity<IEndpointFavMetadata, EndpointModel> {
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts
index 35d8deddcb..de7ba6438e 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts
@@ -8,6 +8,8 @@ import { StratosStatus } from '../../../core/src/shared/shared.types';
 import { GeneralEntityAppState } from '../app-state';
 import {
   ApiErrorMessageHandler,
+  EntitiesInfoHandler,
+  EntityInfoHandler,
   PreApiRequest,
   PrePaginationApiRequest,
   SuccessfulApiResponseDataMapper,
@@ -71,6 +73,14 @@ export interface IStratosBaseEntityDefinition<T = EntitySchema | EntityCatalogSc
   readonly subTypes?: Omit<IStratosBaseEntityDefinition, 'schema' | 'subTypes'>[];
   readonly paginationConfig?: PaginationPageIteratorConfig;
   readonly tableConfig?: EntityTableConfig<any>;
+  /**
+    * Hook that will fire before an entity is emitted by an entity service. This could be used, for example, entity validation
+    */
+  readonly entityEmitHandler?: EntityInfoHandler;
+  /**
+   * Hook that will fire before an entity is emitted by an entity service. This could be used, for example, entity validation
+   */
+  readonly entitiesEmitHandler?: EntitiesInfoHandler;
 }
 
 
@@ -92,11 +102,16 @@ export interface IStratosEndpointDefinition<T = EntityCatalogSchemas | EntitySch
   readonly urlValidationRegexString?: string;
   readonly authTypes: EndpointAuthTypeConfig[];
   readonly subTypes?: Omit<IStratosEndpointDefinition, 'schema' | 'subTypes'>[];
-  // Allows an entity to manipulate the data that is returned from an api request before it makes it into the store.
-  // This will be used for all entities with this endpoint type.
+
+  /**
+   * Allows an entity to manipulate the data that is returned from an api request before it makes it into the store.
+   * This will be used for all entities with this endpoint type.
+   */
   readonly globalSuccessfulRequestDataMapper?: SuccessfulApiResponseDataMapper;
-  // Allows an entity to manipulate the request object before it's sent.
-  // This will be used for all entities with this endpoint type unless the entity has it's own prerequest config.
+  /**
+   * Allows an entity to manipulate the request object before it's sent.
+   * This will be used for all entities with this endpoint type unless the entity has it's own prerequest config.
+   */
   readonly globalPreRequest?: PreApiRequest;
   readonly globalPrePaginationRequest?: PrePaginationApiRequest;
   readonly globalErrorMessageHandler?: ApiErrorMessageHandler;
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts
index 4ae26e792a..289f748417 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts
@@ -9,8 +9,8 @@ import {
   StratosCatalogEndpointEntity,
 } from '../entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { ApiRequestTypes } from '../reducers/api-request-reducer/request-helpers';
-import { NormalizedResponse } from '../types/api.types';
-import { PaginatedAction } from '../types/pagination.types';
+import { EntityInfo, NormalizedResponse } from '../types/api.types';
+import { PaginatedAction, PaginationEntityState } from '../types/pagination.types';
 import { EntityRequestAction } from '../types/request.types';
 import { JetstreamError } from './entity-request-base-handlers/handle-multi-endpoints.pipe';
 import { PipelineHttpClient } from './pipline-http-client.service';
@@ -121,3 +121,12 @@ export interface BasePipelineConfig<T extends AppState = InternalAppState, Y ext
 export interface PagedJetstreamResponse<T = any> {
   [endpointId: string]: T[] | JetStreamErrorResponse[];
 }
+
+export type EntityInfoHandler = (action: EntityRequestAction, actionDispatcher: ActionDispatcher) => (entityInfo: EntityInfo) => void;
+
+export type EntitiesInfoHandler = (
+  action: PaginatedAction | PaginatedAction[],
+  actionDispatcher: ActionDispatcher,
+) => (
+    state: PaginationEntityState,
+  ) => void;
\ No newline at end of file
diff --git a/src/frontend/packages/store/src/entity-service-factory.service.ts b/src/frontend/packages/store/src/entity-service-factory.service.ts
index 42e02864b6..0fcf144042 100644
--- a/src/frontend/packages/store/src/entity-service-factory.service.ts
+++ b/src/frontend/packages/store/src/entity-service-factory.service.ts
@@ -1,12 +1,12 @@
-import { Inject, Injectable, Optional } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 
 import { GeneralEntityAppState } from './app-state';
-import { EntityRequestAction } from './types/request.types';
-import { EntityMonitorFactory } from './monitors/entity-monitor.factory.service';
 import { entityCatalog } from './entity-catalog/entity-catalog';
 import { EntityActionBuilderEntityConfig } from './entity-catalog/entity-catalog.types';
-import { ENTITY_INFO_HANDLER, EntityInfoHandler, EntityService } from './entity-service';
+import { EntityService } from './entity-service';
+import { EntityMonitorFactory } from './monitors/entity-monitor.factory.service';
+import { EntityRequestAction } from './types/request.types';
 
 @Injectable()
 export class EntityServiceFactory {
@@ -19,7 +19,6 @@ export class EntityServiceFactory {
   constructor(
     private store: Store<GeneralEntityAppState>,
     private entityMonitorFactory: EntityMonitorFactory,
-    @Optional() @Inject(ENTITY_INFO_HANDLER) private entityInfoHandler: EntityInfoHandler
   ) { }
 
   // FIXME: See #3833. Improve typing of action passed to entity service factory create
@@ -50,9 +49,9 @@ export class EntityServiceFactory {
         config.entityGuid,
         config.endpointGuid,
         config.actionMetadata || {}
-      ), this.entityInfoHandler);
+      ));
     }
-    return new EntityService<T>(this.store, entityMonitor, action, this.entityInfoHandler);
+    return new EntityService<T>(this.store, entityMonitor, action);
   }
 
 }
diff --git a/src/frontend/packages/store/src/entity-service.ts b/src/frontend/packages/store/src/entity-service.ts
index f138ed1e40..f9f168bd6f 100644
--- a/src/frontend/packages/store/src/entity-service.ts
+++ b/src/frontend/packages/store/src/entity-service.ts
@@ -1,4 +1,3 @@
-import { Inject, Optional } from '@angular/core';
 import { compose, Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
 import { filter, first, map, publishReplay, refCount, switchMap, tap, withLatestFrom } from 'rxjs/operators';
@@ -6,17 +5,12 @@ import { filter, first, map, publishReplay, refCount, switchMap, tap, withLatest
 import { GeneralEntityAppState } from './app-state';
 import { entityCatalog } from './entity-catalog/entity-catalog';
 import { EntityActionBuilderEntityConfig } from './entity-catalog/entity-catalog.types';
-import { ActionDispatcher } from './entity-request-pipeline/entity-request-pipeline.types';
 import { EntityMonitor } from './monitors/entity-monitor';
 import { RequestInfoState, UpdatingSection } from './reducers/api-request-reducer/types';
 import { getEntityUpdateSections, getUpdateSectionById } from './selectors/api.selectors';
 import { EntityInfo } from './types/api.types';
 import { EntityRequestAction } from './types/request.types';
 
-export const ENTITY_INFO_HANDLER = '__ENTITY_INFO_HANDLER__';
-
-export type EntityInfoHandler = (action: EntityRequestAction, actionDispatcher: ActionDispatcher) => (entityInfo: EntityInfo) => void;
-
 export function isEntityBlocked(entityRequestInfo: RequestInfoState) {
   if (!entityRequestInfo) {
     return false;
@@ -47,9 +41,9 @@ export class EntityService<T = any> {
     store: Store<GeneralEntityAppState>,
     public entityMonitor: EntityMonitor<T>,
     actionOrConfig: EntityRequestAction | EntityActionBuilderEntityConfig,
-    @Optional() @Inject(ENTITY_INFO_HANDLER) entityInfoHandlerBuilder?: EntityInfoHandler
   ) {
     this.action = this.getAction(actionOrConfig);
+    const entityInfoHandlerBuilder = entityCatalog.getEntity(this.action).getEntityEmitHandler();
     const actionInfoHandler = entityInfoHandlerBuilder ? entityInfoHandlerBuilder(
       this.action, (action) => store.dispatch(action)
     ) : () => { };
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts
index 2153fec07a..547c39de82 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts
@@ -16,7 +16,6 @@ import {
 import { populatePaginationFromParent } from '../../../../cloud-foundry/src/entity-relations/entity-relations';
 import { sortStringify } from '../../../../core/src/core/utils.service';
 import { SetInitialParams } from '../../actions/pagination.actions';
-import { CfValidateEntitiesStart } from '../../actions/request.actions';
 import { AppState, GeneralEntityAppState } from '../../app-state';
 import { entityCatalog } from '../../entity-catalog/entity-catalog';
 import { PaginationMonitor } from '../../monitors/pagination-monitor';
@@ -43,7 +42,7 @@ export function removeEmptyParams(params: PaginationParam) {
 export function getActionType(action) {
   return action.type;
 }
-// FIXME: Add typings, shouldbe done with #1477
+// FIXME: Add typings, should be done with #1477
 export function getAction(action): PaginatedAction {
   if (!action) {
     return null;
@@ -51,7 +50,7 @@ export function getAction(action): PaginatedAction {
   return action.apiAction ? action.apiAction : action;
 }
 
-// FIXME: Add typings, shouldbe done with #1477
+// FIXME: Add typings, should be done with #1477
 function getEntityConfigFromAction(action): PaginatedAction {
   if (action && action.entityConfig) {
     return action.entityConfig;
@@ -59,7 +58,7 @@ function getEntityConfigFromAction(action): PaginatedAction {
   return getAction(action);
 }
 
-// FIXME: Add typings, shouldbe done with #1477
+// FIXME: Add typings, should be done with #1477
 export function getActionPaginationEntityKey(action): string {
   const apiAction = getAction(action);
   const entityConfig = apiAction.proxyPaginationEntityConfig || getEntityConfigFromAction(action);
@@ -76,7 +75,7 @@ export const getPaginationObservables = <T = any, Y extends AppState = AppState>
   { store, action, paginationMonitor }: {
     store: Store<Y>,
     action: PaginatedAction | PaginatedAction[],
-    paginationMonitor: PaginationMonitor
+    paginationMonitor: PaginationMonitor,
   },
   isLocal = false
 ): PaginationObservables<T> => {
@@ -171,7 +170,7 @@ function getObservables<T = any>(
   paginationKey: string,
   paginationAction: PaginatedAction | PaginatedAction[],
   paginationMonitor: PaginationMonitor,
-  isLocal = false
+  isLocal = false,
 )
   : PaginationObservables<T> {
   let hasDispatchedOnce = false;
@@ -194,30 +193,21 @@ function getObservables<T = any>(
     map(([, newPag]) => newPag)
   );
 
-  let lastValidationFootprint: string;
+  const entitiesInfoHandlerBuilder = entityCatalog.getEntity(arrayAction[0]).getEntitiesEmitHandler();
+  const actionInfoHandler = entitiesInfoHandlerBuilder ? entitiesInfoHandlerBuilder(
+    paginationAction, (action) => store.dispatch(action)
+  ) : () => { };
+
   const entities$: Observable<T[]> =
     combineLatest(
       store.select(selectEntities(entityKey)),
       fetchPagination$,
     )
       .pipe(
-        filter(([, pagination]) => {
-          return !!pagination && isPageReady(pagination, isLocal);
-        }),
+        filter(([, pagination]) => !!pagination && isPageReady(pagination, isLocal)),
         publishReplay(1),
         refCount(),
-        tap(([, pagination]) => {
-          const newValidationFootprint = getPaginationCompareString(pagination);
-          if (lastValidationFootprint !== newValidationFootprint) {
-            lastValidationFootprint = newValidationFootprint;
-            // FIXME: Move cf - #3675
-            // This should use something similar to ENTITY_INFO_HANDLER or come from entity itself
-            arrayAction.forEach(action => store.dispatch(new CfValidateEntitiesStart(
-              action,
-              pagination.ids[action.__forcedPageNumber__ || pagination.currentPage]
-            )));
-          }
-        }),
+        tap(([, pagination]) => actionInfoHandler(pagination)),
         switchMap(() => paginationMonitor.currentPage$),
       );
 
@@ -241,18 +231,6 @@ function getObservables<T = any>(
   };
 }
 
-function getPaginationCompareString(paginationEntity: PaginationEntityState) {
-  if (!paginationEntity) {
-    return '';
-  }
-  let params = '';
-  if (paginationEntity.params) {
-    params = JSON.stringify(paginationEntity.params);
-  }
-  // paginationEntity.totalResults included to ensure we cover the 'ResetPagination' case, for instance after AddParam
-  return paginationEntity.totalResults + paginationEntity.currentPage + params + paginationEntity.pageCount;
-}
-
 export function isPageReady(pagination: PaginationEntityState, isLocal = false) {
   if (!pagination) {
     return false;
diff --git a/src/frontend/packages/store/src/store.module.ts b/src/frontend/packages/store/src/store.module.ts
index 6006f82e03..f84d01d8eb 100644
--- a/src/frontend/packages/store/src/store.module.ts
+++ b/src/frontend/packages/store/src/store.module.ts
@@ -4,7 +4,6 @@ import { EffectsModule } from '@ngrx/effects';
 
 import { ActionHistoryEffect } from './effects/action-history.effects';
 import { APIEffect } from './effects/api.effects';
-import { AppEffects } from './effects/app.effects';
 import { AuthEffect } from './effects/auth.effects';
 import { DashboardEffect } from './effects/dashboard.effects';
 import { EndpointApiError } from './effects/endpoint-api-errors.effects';
@@ -52,7 +51,6 @@ import { AppReducersModule } from './reducers.module';
       UserProfileEffect,
       UsersRolesEffects,
       RecursiveDeleteEffect,
-      AppEffects,
       UserFavoritesEffect
     ])
   ]

From 476d46bab44d2c98d2aeaf1e7bd470efea8345e6 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Mon, 18 May 2020 20:11:02 +0100
Subject: [PATCH 121/176] Remove checked on radio buttons as well as value

---
 .../manage-users-set-usernames.component.html                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.html b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.html
index e743c0cb7e..c1d88ad0d8 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.html
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.html
@@ -1,10 +1,10 @@
 <div class="usernames" *ngIf="!(blocked$ | async)">
   <div class="usernames__addRemove">
     <mat-radio-group [value]="(canRemove$ | async) && (canAdd$ | async)" (change)="setIsRemove($event)">
-      <mat-radio-button [disabled]="!(canAdd$ | async)" [value]="true" [checked]="!(canRemove$ | async)">
+      <mat-radio-button [disabled]="!(canAdd$ | async)" [value]="true">
         Add Roles{{(canAdd$ | async) ? '' : ' (Disabled via feature flag)'}}
       </mat-radio-button>
-      <mat-radio-button [disabled]="!(canRemove$ | async)" [value]="false" [checked]="!(canAdd$ | async)">
+      <mat-radio-button [disabled]="!(canRemove$ | async)" [value]="false">
         Remove Roles{{(canRemove$ | async) ? '' : ' (Disabled via feature flag)'}}</mat-radio-button>
     </mat-radio-group>
   </div>

From c6818b5894b3882d91d08614595e333cde1e9e4d Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 19 May 2020 12:03:32 +0100
Subject: [PATCH 122/176] Move CfValidateEffects to cf, added some todos

---
 .../card-cf-info/card-cf-info.component.ts    |  2 +-
 ...cell-feature-flag-description.component.ts |  2 +-
 .../src/store/cloud-foundry.store.module.ts   |  4 +++-
 .../src/store/effects/app.effects.ts          |  3 ++-
 .../src/store}/effects/request.effects.ts     | 20 +++++++++----------
 .../application-state.component.ts            |  1 +
 .../components/cf-auth/cf-auth.service.ts     |  2 +-
 .../packages/core/src/shared/shared.module.ts |  8 ++++----
 .../store/src/helpers/store-helpers.ts        |  1 +
 .../packages/store/src/store.module.ts        |  2 --
 .../packages/store/src/types/api.types.ts     |  1 +
 11 files changed, 24 insertions(+), 22 deletions(-)
 rename src/frontend/packages/{store/src => cloud-foundry/src/store}/effects/request.effects.ts (84%)

diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts
index 63033fe1d4..503ac52c40 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/cards/card-cf-info/card-cf-info.component.ts
@@ -1,12 +1,12 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { ICfV2Info } from 'frontend/packages/cloud-foundry/src/cf-api.types';
 import { APIResource, EntityInfo } from 'frontend/packages/store/src/types/api.types';
 import { Observable, Subscription } from 'rxjs';
 import { map, tap } from 'rxjs/operators';
 
 import { fetchAutoscalerInfo } from '../../../../../../cf-autoscaler/src/core/autoscaler-helpers/autoscaler-available';
 import { EntityServiceFactory } from '../../../../../../store/src/entity-service-factory.service';
+import { ICfV2Info } from '../../../../cf-api.types';
 import { CloudFoundryEndpointService } from '../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
 import {
   UserInviteConfigurationDialogComponent,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/table-cell-feature-flag-description/table-cell-feature-flag-description.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/table-cell-feature-flag-description/table-cell-feature-flag-description.component.ts
index 5d7938f1f7..de671fa58f 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/table-cell-feature-flag-description/table-cell-feature-flag-description.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-feature-flags/table-cell-feature-flag-description/table-cell-feature-flag-description.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
-import { IFeatureFlag } from 'frontend/packages/cloud-foundry/src/cf-api.types';
 import { TableCellCustom } from 'frontend/packages/core/src/shared/components/list/list.types';
 
+import { IFeatureFlag } from '../../../../../../cf-api.types';
 import { FeatureFlagDescriptions } from '../cf-feature-flags-data-source';
 
 @Component({
diff --git a/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.store.module.ts b/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.store.module.ts
index a565d27695..6179afe8da 100644
--- a/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.store.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.store.module.ts
@@ -9,6 +9,7 @@ import { CreateAppPageEffects } from './effects/create-app-effects';
 import { DeployAppEffects } from './effects/deploy-app.effects';
 import { GithubEffects } from './effects/github.effects';
 import { PermissionEffects, PermissionsEffects } from './effects/permissions.effect';
+import { CfValidateEffects } from './effects/request.effects';
 import { RouteEffect } from './effects/route.effects';
 import { ServiceInstanceEffects } from './effects/service-instance.effects';
 
@@ -25,7 +26,8 @@ import { ServiceInstanceEffects } from './effects/service-instance.effects';
       PermissionsEffects,
       PermissionEffects,
       ServiceInstanceEffects,
-      AppEffects
+      AppEffects,
+      CfValidateEffects
     ])
   ]
 })
diff --git a/src/frontend/packages/cloud-foundry/src/store/effects/app.effects.ts b/src/frontend/packages/cloud-foundry/src/store/effects/app.effects.ts
index af2ac64c00..bd5992abe5 100644
--- a/src/frontend/packages/cloud-foundry/src/store/effects/app.effects.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/effects/app.effects.ts
@@ -13,7 +13,8 @@ import {
   createAppInstancesMetricAction,
 } from '../../shared/components/list/list-types/app-instance/cf-app-instances-config.service';
 
-// TODO: RC search for cloud-foundry
+// TODO: RC search for cloud-foundry in store
+// TODO: RC search for cloud-foundry in others
 @Injectable()
 export class AppEffects {
 
diff --git a/src/frontend/packages/store/src/effects/request.effects.ts b/src/frontend/packages/cloud-foundry/src/store/effects/request.effects.ts
similarity index 84%
rename from src/frontend/packages/store/src/effects/request.effects.ts
rename to src/frontend/packages/cloud-foundry/src/store/effects/request.effects.ts
index 35b5fe0175..cc74996118 100644
--- a/src/frontend/packages/store/src/effects/request.effects.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/effects/request.effects.ts
@@ -3,19 +3,19 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { catchError, first, map, mergeMap, withLatestFrom } from 'rxjs/operators';
 
-import { CFAppState } from '../../../cloud-foundry/src/cf-app-state';
-import { validateEntityRelations } from '../../../cloud-foundry/src/entity-relations/entity-relations';
-import { LoggerService } from '../../../core/src/core/logger.service';
-import { SET_PAGE_BUSY } from '../actions/pagination.actions';
+import { LoggerService } from '../../../../core/src/core/logger.service';
+import { SET_PAGE_BUSY } from '../../../../store/src/actions/pagination.actions';
 import {
   CfValidateEntitiesComplete,
   CfValidateEntitiesStart,
   EntitiesPipelineActionTypes,
-} from '../actions/request.actions';
-import { rootUpdatingKey } from '../reducers/api-request-reducer/types';
-import { getAPIRequestDataState } from '../selectors/api.selectors';
-import { getPaginationState } from '../selectors/pagination.selectors';
-import { UpdateCfAction } from '../types/request.types';
+} from '../../../../store/src/actions/request.actions';
+import { rootUpdatingKey } from '../../../../store/src/reducers/api-request-reducer/types';
+import { getAPIRequestDataState } from '../../../../store/src/selectors/api.selectors';
+import { getPaginationState } from '../../../../store/src/selectors/pagination.selectors';
+import { UpdateCfAction } from '../../../../store/src/types/request.types';
+import { CFAppState } from '../../cf-app-state';
+import { validateEntityRelations } from '../../entity-relations/entity-relations';
 
 /**
  * Now purely looks after ad-hoc validation of an entity or list of entities
@@ -43,8 +43,6 @@ export class CfValidateEffects {
    * 5) alternatively... if we've reached here for the same space but from an api request for that space.. ensure that the routes have not
    *    been dropped because their count is over 50
    */
-  // TODO Move this into Cf - #3769...
-  // ... See `ENTITY_INFO_HANDLER` (which should also be used, in a roundabout way, in getPaginationObservables/getObservables)
   @Effect() validateEntities$ = this.actions$.pipe(
     ofType<CfValidateEntitiesStart>(EntitiesPipelineActionTypes.VALIDATE),
     mergeMap(action => {
diff --git a/src/frontend/packages/core/src/shared/components/application-state/application-state.component.ts b/src/frontend/packages/core/src/shared/components/application-state/application-state.component.ts
index f548f70336..dffa6c1686 100644
--- a/src/frontend/packages/core/src/shared/components/application-state/application-state.component.ts
+++ b/src/frontend/packages/core/src/shared/components/application-state/application-state.component.ts
@@ -4,6 +4,7 @@ import { map, startWith } from 'rxjs/operators';
 
 import { StratosStatus, StratosStatusMetadata } from '../../shared.types';
 
+// TODO: RC MOVE
 @Component({
   selector: 'app-application-state',
   templateUrl: './application-state.component.html',
diff --git a/src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.service.ts b/src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.service.ts
index f4caccccdb..05bbb258ad 100644
--- a/src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.service.ts
+++ b/src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.service.ts
@@ -11,7 +11,7 @@ import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
 import { CFAuthAction, CFAuthResource, CfAuthUserSummary, CfAuthUserSummaryMapped, CFFeatureFlags } from './cf-auth.types';
 import { CfAuthPrinciple } from './principal';
 
-
+// TODO: RC REMOVE
 /**
  * NOTE - WIP
  * This is the port of basic cf auth from v1. It's missing a number of things
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index 4e0d1a8f0c..7f737d8f79 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -151,9 +151,9 @@ import { UserPermissionDirective } from './user-permission.directive';
     EndpointsMissingComponent,
     DialogErrorComponent,
     SshViewerComponent,
-    ApplicationStateIconPipe,
-    ApplicationStateIconComponent,
-    ApplicationStateComponent,
+    ApplicationStateIconPipe, // TODO: RC MOVE
+    ApplicationStateIconComponent,// TODO: RC MOVE
+    ApplicationStateComponent,// TODO: RC MOVE
     TileComponent,
     TileGroupComponent,
     TileGridComponent,
@@ -175,7 +175,7 @@ import { UserPermissionDirective } from './user-permission.directive';
     AppChipsComponent,
     CardBooleanMetricComponent,
     CardNumberMetricComponent,
-    EnvVarViewComponent,
+    EnvVarViewComponent,// TODO: RC MOVE
     RingChartComponent,
     MetricsChartComponent,
     StratosTitleComponent,
diff --git a/src/frontend/packages/store/src/helpers/store-helpers.ts b/src/frontend/packages/store/src/helpers/store-helpers.ts
index 15f69e72db..d235f06cb4 100644
--- a/src/frontend/packages/store/src/helpers/store-helpers.ts
+++ b/src/frontend/packages/store/src/helpers/store-helpers.ts
@@ -33,6 +33,7 @@ export function getFavoriteInfoObservable(store: Store<AppState>): Observable<IF
   );
 }
 
+// TODO: RC move to CF
 export const getRowMetadata = (entity: APIResource | MultiActionListEntity) => {
   if (entity instanceof MultiActionListEntity) {
     return entity.entity.metadata ? entity.entity.metadata.guid : null;
diff --git a/src/frontend/packages/store/src/store.module.ts b/src/frontend/packages/store/src/store.module.ts
index f84d01d8eb..9c97589dc3 100644
--- a/src/frontend/packages/store/src/store.module.ts
+++ b/src/frontend/packages/store/src/store.module.ts
@@ -11,7 +11,6 @@ import { EndpointsEffect } from './effects/endpoint.effects';
 import { MetricsEffect } from './effects/metrics.effects';
 import { PaginationEffects } from './effects/pagination.effects';
 import { RecursiveDeleteEffect } from './effects/recursive-entity-delete.effect';
-import { CfValidateEffects } from './effects/request.effects';
 import { RouterEffect } from './effects/router.effects';
 import { SetClientFilterEffect } from './effects/set-client-filter.effect';
 import { SnackBarEffects } from './effects/snackBar.effects';
@@ -47,7 +46,6 @@ import { AppReducersModule } from './reducers.module';
       SnackBarEffects,
       SetClientFilterEffect,
       MetricsEffect,
-      CfValidateEffects,
       UserProfileEffect,
       UsersRolesEffects,
       RecursiveDeleteEffect,
diff --git a/src/frontend/packages/store/src/types/api.types.ts b/src/frontend/packages/store/src/types/api.types.ts
index b61f650483..0305640783 100644
--- a/src/frontend/packages/store/src/types/api.types.ts
+++ b/src/frontend/packages/store/src/types/api.types.ts
@@ -7,6 +7,7 @@ export interface EntityInfo<T = any> {
   entity: T;
 }
 
+// TODO: RC move to CF
 export interface APIResource<T = any> {
   metadata: APIResourceMetadata;
   entity: T;

From 29cc80e04817224c0b13fc90575e1675e8c09594 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 19 May 2020 13:46:08 +0100
Subject: [PATCH 123/176] Autoscaler E2E Test debugging

---
 .../application-autoscaler-e2e.spec.ts        |  2 +-
 src/test-e2e/helpers/cf-helpers.ts            |  7 +++--
 src/test-e2e/helpers/request-helpers.ts       | 30 +++++++++++++++----
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/test-e2e/application/application-autoscaler-e2e.spec.ts b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
index e4c148492f..8497444acf 100644
--- a/src/test-e2e/application/application-autoscaler-e2e.spec.ts
+++ b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
@@ -19,7 +19,7 @@ import { PageAutoscalerMetricBase } from './po/page-autoscaler-metric-base.po';
 
 let applicationE2eHelper: ApplicationE2eHelper;
 
-describe('Autoscaler -', () => {
+fdescribe('Autoscaler -', () => {
 
   beforeAll(() => {
     const setup = e2e.setup(ConsoleUserType.user)
diff --git a/src/test-e2e/helpers/cf-helpers.ts b/src/test-e2e/helpers/cf-helpers.ts
index b5d3a2238e..2bfb93a41b 100644
--- a/src/test-e2e/helpers/cf-helpers.ts
+++ b/src/test-e2e/helpers/cf-helpers.ts
@@ -52,8 +52,8 @@ export class CFHelpers {
     return this.fetchUsers(cnsiGuid).then(users => {
       const testUser = this.findUser(users, endpoint.creds.nonAdmin.username);
       const testAdminUser = this.findUser(users, endpoint.creds.admin.username);
-      expect(testUser).toBeDefined();
-      expect(testAdminUser).toBeDefined();
+      expect(testUser).toBeDefined('Could not find test user');
+      expect(testAdminUser).toBeDefined('Could not find test admin user');
       CFHelpers.cachedNonAdminGuid = testUser.metadata.guid;
       CFHelpers.cachedAdminGuid = testAdminUser.metadata.guid;
     });
@@ -168,6 +168,9 @@ export class CFHelpers {
 
   fetchUsers(cnsiGuid): promise.Promise<APIResource<CfUser>[]> {
     return this.cfRequestHelper.sendCfGet<CFResponse<CfUser>>(cnsiGuid, 'users').then(json => {
+      console.log('--------------------------');
+      console.log('fetch users');
+      console.log(JSON.stringify(json, null, 4));
       return json.resources;
     });
   }
diff --git a/src/test-e2e/helpers/request-helpers.ts b/src/test-e2e/helpers/request-helpers.ts
index 8567263a7e..5d0d02b9a4 100644
--- a/src/test-e2e/helpers/request-helpers.ts
+++ b/src/test-e2e/helpers/request-helpers.ts
@@ -85,10 +85,10 @@ export class RequestHelpers {
     }
 
     E2E.debugLog('REQ: ' + options.method + ' ' + options.url);
-    E2E.debugLog('   > ' + JSON.stringify(options));
+    this.showOptions(options);
 
     reqObj(options).then((response) => {
-      E2E.debugLog('OK');
+      E2E.debugLog('   + OK : ' + response.statusCode);
 
       // Get XSRF Token
       if (response.headers && response.headers['x-xsrf-token']) {
@@ -96,15 +96,35 @@ export class RequestHelpers {
       }
       p.fulfill(response.body);
     }).catch((e) => {
-      E2E.debugLog('ERROR');
-      E2E.debugLog(e);
-      E2E.debugLog(e.statusCode + ' : ' + e.message);
+      // E2E.debugLog('ERROR');
+      // E2E.debugLog(e);
+      E2E.debugLog('   - ERR: ' + e.statusCode + ' : ' + e.message);
       p.reject(e);
     });
 
     return p.promise;
   }
 
+  showOptions(options: any) {
+    if (!options) {
+      return;
+    }
+    const cpy = JSON.parse(JSON.stringify(options));
+    this.sanitizeOption(cpy);
+    E2E.debugLog('   > ' + JSON.stringify(cpy));
+  }
+
+  sanitizeOption(options) {
+    Object.keys(options).forEach(key => {
+      const v = options[key];
+      if (typeof v === 'string' && key === 'password') {
+        options[key]='******';
+      } else if  (typeof v === 'object') {
+        this.sanitizeOption(options[key]);
+      }
+    });
+  }
+
   /**
    * @createSession
    * @description Create a session

From d0f4ac4e86e30fa667b9c43a0696cfcfa2ded0fd Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 19 May 2020 13:46:08 +0100
Subject: [PATCH 124/176] Autoscaler E2E Test debugging

---
 .../application-autoscaler-e2e.spec.ts        |  2 +-
 src/test-e2e/helpers/cf-helpers.ts            |  7 +++--
 src/test-e2e/helpers/request-helpers.ts       | 30 +++++++++++++++----
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/test-e2e/application/application-autoscaler-e2e.spec.ts b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
index e4c148492f..8497444acf 100644
--- a/src/test-e2e/application/application-autoscaler-e2e.spec.ts
+++ b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
@@ -19,7 +19,7 @@ import { PageAutoscalerMetricBase } from './po/page-autoscaler-metric-base.po';
 
 let applicationE2eHelper: ApplicationE2eHelper;
 
-describe('Autoscaler -', () => {
+fdescribe('Autoscaler -', () => {
 
   beforeAll(() => {
     const setup = e2e.setup(ConsoleUserType.user)
diff --git a/src/test-e2e/helpers/cf-helpers.ts b/src/test-e2e/helpers/cf-helpers.ts
index b5d3a2238e..2bfb93a41b 100644
--- a/src/test-e2e/helpers/cf-helpers.ts
+++ b/src/test-e2e/helpers/cf-helpers.ts
@@ -52,8 +52,8 @@ export class CFHelpers {
     return this.fetchUsers(cnsiGuid).then(users => {
       const testUser = this.findUser(users, endpoint.creds.nonAdmin.username);
       const testAdminUser = this.findUser(users, endpoint.creds.admin.username);
-      expect(testUser).toBeDefined();
-      expect(testAdminUser).toBeDefined();
+      expect(testUser).toBeDefined('Could not find test user');
+      expect(testAdminUser).toBeDefined('Could not find test admin user');
       CFHelpers.cachedNonAdminGuid = testUser.metadata.guid;
       CFHelpers.cachedAdminGuid = testAdminUser.metadata.guid;
     });
@@ -168,6 +168,9 @@ export class CFHelpers {
 
   fetchUsers(cnsiGuid): promise.Promise<APIResource<CfUser>[]> {
     return this.cfRequestHelper.sendCfGet<CFResponse<CfUser>>(cnsiGuid, 'users').then(json => {
+      console.log('--------------------------');
+      console.log('fetch users');
+      console.log(JSON.stringify(json, null, 4));
       return json.resources;
     });
   }
diff --git a/src/test-e2e/helpers/request-helpers.ts b/src/test-e2e/helpers/request-helpers.ts
index 8567263a7e..5d0d02b9a4 100644
--- a/src/test-e2e/helpers/request-helpers.ts
+++ b/src/test-e2e/helpers/request-helpers.ts
@@ -85,10 +85,10 @@ export class RequestHelpers {
     }
 
     E2E.debugLog('REQ: ' + options.method + ' ' + options.url);
-    E2E.debugLog('   > ' + JSON.stringify(options));
+    this.showOptions(options);
 
     reqObj(options).then((response) => {
-      E2E.debugLog('OK');
+      E2E.debugLog('   + OK : ' + response.statusCode);
 
       // Get XSRF Token
       if (response.headers && response.headers['x-xsrf-token']) {
@@ -96,15 +96,35 @@ export class RequestHelpers {
       }
       p.fulfill(response.body);
     }).catch((e) => {
-      E2E.debugLog('ERROR');
-      E2E.debugLog(e);
-      E2E.debugLog(e.statusCode + ' : ' + e.message);
+      // E2E.debugLog('ERROR');
+      // E2E.debugLog(e);
+      E2E.debugLog('   - ERR: ' + e.statusCode + ' : ' + e.message);
       p.reject(e);
     });
 
     return p.promise;
   }
 
+  showOptions(options: any) {
+    if (!options) {
+      return;
+    }
+    const cpy = JSON.parse(JSON.stringify(options));
+    this.sanitizeOption(cpy);
+    E2E.debugLog('   > ' + JSON.stringify(cpy));
+  }
+
+  sanitizeOption(options) {
+    Object.keys(options).forEach(key => {
+      const v = options[key];
+      if (typeof v === 'string' && key === 'password') {
+        options[key]='******';
+      } else if  (typeof v === 'object') {
+        this.sanitizeOption(options[key]);
+      }
+    });
+  }
+
   /**
    * @createSession
    * @description Create a session

From 49ab381211ec62b0be59a46c8e2ad2ba1b53ff58 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 19 May 2020 14:56:54 +0100
Subject: [PATCH 125/176] Just run autoscaler tests

---
 .travis.yml                                   | 25 ++-----------------
 .../application-autoscaler-e2e.spec.ts        |  2 +-
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7f87e2619e..6028919567 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,8 @@ sudo: required
 dist: bionic
 services:
   - docker
+env:
+  - STRATOS_E2E_DEBUG=true
 addons:
   chrome: stable
 before_install:
@@ -64,34 +66,11 @@ jobs:
         - eval "$(gimme 1.13.4)"
       script:
         - npm run test-backend
-    - name: Helm Chart Unit Tests
-      script:
-        - "./deploy/ci/travis/helm-chart-unit-tests.sh"
-    - name: E2E Tests - Long Suites
-      before_script:
-        - "./deploy/ci/travis/job-e2e-before_script.sh"
-      script:
-        - "./deploy/ci/travis/job-e2e-script.sh longSuite"
-    - name: E2E Tests - Manage Users
-      before_script:
-        - "./deploy/ci/travis/job-e2e-before_script.sh true"
-      script:
-        - "./deploy/ci/travis/job-e2e-script.sh manageUsers"
-    - name: E2E Tests - Core
-      before_script:
-        - "./deploy/ci/travis/job-e2e-before_script.sh true"
-      script:
-        - "./deploy/ci/travis/job-e2e-script.sh core"
     - name: E2E Tests - Autoscaler
       before_script:
         - "./deploy/ci/travis/job-e2e-before_script.sh"
       script:
         - "./deploy/ci/travis/job-e2e-script.sh autoscaler"
-    - name: E2E Tests - All Other Suite
-      before_script:
-        - "./deploy/ci/travis/job-e2e-before_script.sh"
-      script:
-        - "./deploy/ci/travis/job-e2e-script.sh fullMinusOtherSuites"
 notifications:
   slack:
     secure: s5SFnFKwzfxLrjGR5lJ2AJG1FSWCKtHdQi8K2Kmx5ZhrYL/7P+KLc/ks18WnzCPoy705LbHCBSULcnWbLjqCpnkKxNjsFAyFl2nZZPxBjl2/mHpulbr3gmultDOrMDbmYL4oWPKBlxKResElz9nQwknlLWZ/L94AIx8zuMfRIWdEt1bJBDAQts4fx2D4cIEx0yZUq7JGAKjSiXKR9eDyMWFb+SWw6mvr5WtFM8uq35rPvRVEfm56LIgSuMUpVeYtnYiY2JP7W8iKX0gD+54wAiSXRZiQVCLJq606/TlJo7j8Na9Dn1Q5XDkX3b3XzcgmEZThoO1GFtv3yNYOVxv+50p2tSnc8CT0VEVOYOGJuz17AESZAYK+AyjEmeZmDiroj1czmIq8/ZYKbmvDYSZgGuDcSkQurX/6BPac6ra69WmSQmwv0tS3A/IzDw7X+CuC+3QubQ7GfaiVe25PUU+tRSEDM4PMUJY8QRF5Q+oeN5NjjWmJBqf/ic2TO2xTU1j+qysdqK34qIV1qyVcPMUIiYW+5ltH71qiy05TSvvfGS+oatRBMzINRl3zl2gOV1CKNU801XehRKCx9XDCw5NL1HSx5HD5psOyBRpAMYYBOqa+rv9VAza9MsfpslCoibg5rdrq4rZqqUgRhayNp/LKzlhe/g62+qbGNT+iFuHtB+Y=
diff --git a/src/test-e2e/application/application-autoscaler-e2e.spec.ts b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
index 8497444acf..e4c148492f 100644
--- a/src/test-e2e/application/application-autoscaler-e2e.spec.ts
+++ b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
@@ -19,7 +19,7 @@ import { PageAutoscalerMetricBase } from './po/page-autoscaler-metric-base.po';
 
 let applicationE2eHelper: ApplicationE2eHelper;
 
-fdescribe('Autoscaler -', () => {
+describe('Autoscaler -', () => {
 
   beforeAll(() => {
     const setup = e2e.setup(ConsoleUserType.user)

From ff259554993d97728a08862e3d6a1c9910f194de Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 19 May 2020 15:18:07 +0100
Subject: [PATCH 126/176] Fix autoscaler events page - events weren't showing
 due to earlier init of metrics list. fixed by adding extra checks - access
 events as list when needed - fixed custom metrics time window drop down in
 dark mode

---
 .../autoscaler-tab-extension.component.html   |  4 +--
 .../autoscaler-tab-extension.component.ts     | 36 ++++++++++++-------
 .../src/store/app-autoscaler.types.ts         |  9 -----
 .../src/store/autoscaler-entity-generator.ts  |  9 ++---
 .../components/list/list.component.scss       |  8 -----
 .../metrics-range-selector.component.scss     |  3 --
 ...etrics-range-selector.component.theme.scss | 10 +++++-
 .../metrics-range-selector.service.ts         |  2 +-
 8 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html
index 5e44e8f544..2a20fe1798 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html
+++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html
@@ -196,7 +196,7 @@
           </mat-card-header>
           <mat-card-content>
             <div class="app-metadata app-metadata-table">
-              <table mat-table [dataSource]="scalingHistory.resources">
+              <table mat-table [dataSource]="scalingHistory">
                 <ng-container matColumnDef="event">
                   <th mat-header-cell *matHeaderCellDef> Event </th>
                   <td mat-cell *matCellDef="let element"> Instances scaled
@@ -218,7 +218,7 @@
                 <tr mat-header-row *matHeaderRowDef="scalingHistoryColumns"></tr>
                 <tr mat-row *matRowDef="let row; columns: scalingHistoryColumns;"></tr>
               </table>
-              <div class="autoscaler-tab-table-no-record" *ngIf="scalingHistory.resources.length == 0">
+              <div class="autoscaler-tab-table-no-record" *ngIf="scalingHistory.length == 0">
                 No events.</div>
             </div>
           </mat-card-content>
diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
index 4536721329..1ed3d7f453 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
@@ -22,6 +22,10 @@ import { EntityServiceFactory } from '../../../../store/src/entity-service-facto
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
 import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+import {
+  getCurrentPageRequestInfo,
+  PaginationObservables,
+} from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
 import { selectDeletionInfo } from '../../../../store/src/selectors/api.selectors';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { fetchAutoscalerInfo, isAutoscalerEnabled } from '../../core/autoscaler-helpers/autoscaler-available';
@@ -35,9 +39,9 @@ import {
 } from '../../store/app-autoscaler.actions';
 import {
   AppAutoscaleMetricChart,
+  AppAutoscalerEvent,
   AppAutoscalerMetricData,
   AppAutoscalerPolicyLocal,
-  AppAutoscalerScalingHistory,
   AppScalingTrigger,
 } from '../../store/app-autoscaler.types';
 import { appAutoscalerAppMetricEntityType, autoscalerEntityFactory } from '../../store/autoscaler-entity-factory';
@@ -72,10 +76,10 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
   metricTypes: string[] = AutoscalerConstants.MetricTypes;
 
   appAutoscalerPolicyService: EntityService<APIResource<AppAutoscalerPolicyLocal>>;
-  public appAutoscalerScalingHistoryService: EntityService<APIResource<AppAutoscalerScalingHistory>>;
+  public appAutoscalerScalingHistoryService: PaginationObservables<AppAutoscalerEvent>;
   appAutoscalerPolicy$: Observable<AppAutoscalerPolicyLocal>;
   appAutoscalerPolicySafe$: Observable<AppAutoscalerPolicyLocal>;
-  appAutoscalerScalingHistory$: Observable<AppAutoscalerScalingHistory>;
+  appAutoscalerScalingHistory$: Observable<APIResource<AppAutoscalerEvent[]>>;
   appAutoscalerAppMetricNames$: Observable<AppAutoscaleMetricChart[]>;
 
   public showNoPolicyMessage$: Observable<boolean>;
@@ -179,15 +183,20 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
       createEntityRelationPaginationKey(applicationEntityType, this.applicationService.appGuid, 'latest'),
       this.applicationService.appGuid,
       this.applicationService.cfGuid,
-      true,
+      false,
       this.paramsHistory
     );
-    this.appAutoscalerScalingHistoryService = this.entityServiceFactory.create(
-      this.applicationService.appGuid,
-      this.scalingHistoryAction
-    );
-    this.appAutoscalerScalingHistory$ = this.appAutoscalerScalingHistoryService.entityObs$.pipe(
-      map(({ entity }) => entity && entity.entity),
+    this.appAutoscalerScalingHistoryService = getPaginationObservables({
+      store: this.store,
+      action: this.scalingHistoryAction,
+      paginationMonitor: this.paginationMonitorFactory.create(
+        this.scalingHistoryAction.paginationKey,
+        this.scalingHistoryAction,
+        true
+      ),
+    }, true);
+    this.appAutoscalerScalingHistory$ = this.appAutoscalerScalingHistoryService.entities$.pipe(
+      map(entities => entities.map(entity => entity.entity)),
       publishReplay(1),
       refCount()
     );
@@ -197,7 +206,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
       this.appAutoscalerPolicy$,
       this.appAutoscalerScalingHistory$
     ]).pipe(
-      map(([policy, history]) => !!policy || (!!history && history.total_results > 0)),
+      map(([policy, history]) => !!policy || (!!history && history.length > 0)),
       publishReplay(1),
       refCount()
     );
@@ -206,7 +215,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
       this.appAutoscalerPolicy$,
       this.appAutoscalerScalingHistory$
     ]).pipe(
-      map(([policy, history]) => !policy && (!history || history.total_results === 0)),
+      map(([policy, history]) => !policy && (!history || history.length === 0)),
       publishReplay(1),
       refCount()
     );
@@ -261,7 +270,8 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
     if (this.appAutoscalerScalingHistoryErrorSub) {
       this.appAutoscalerScalingHistoryErrorSub.unsubscribe();
     }
-    this.appAutoscalerScalingHistoryErrorSub = this.appAutoscalerScalingHistoryService.entityMonitor.entityRequest$.pipe(
+    this.appAutoscalerScalingHistoryErrorSub = this.appAutoscalerScalingHistoryService.pagination$.pipe(
+      map(pagination => getCurrentPageRequestInfo(pagination)),
       filter(request => !!request.error),
       map(request => request.message),
       distinctUntilChanged(),
diff --git a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts
index bfb1e3c860..fca0b9fcbb 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts
@@ -69,15 +69,6 @@ export interface AppAutoscalerHealth {
   };
 }
 
-export interface AppAutoscalerScalingHistory {
-  next_url: string;
-  prev_url: string;
-  page: number;
-  resources: AppAutoscalerEvent[];
-  total_pages: number;
-  total_results: number;
-}
-
 export interface AppAutoscalerEvent {
   app_id: string;
   error: string;
diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
index 62b7334098..20944089d2 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
@@ -9,12 +9,7 @@ import {
 import { IStratosEndpointDefinition } from '../../../store/src/entity-catalog/entity-catalog.types';
 import { APIResource } from '../../../store/src/types/api.types';
 import { IFavoriteMetadata } from '../../../store/src/types/user-favorites.types';
-import {
-  AppAutoscalerHealth,
-  AppAutoscalerPolicy,
-  AppAutoscalerScalingHistory,
-  AppScalingTrigger,
-} from './app-autoscaler.types';
+import { AppAutoscalerEvent, AppAutoscalerHealth, AppAutoscalerPolicy, AppScalingTrigger } from './app-autoscaler.types';
 import {
   appAutoscalerAppMetricEntityType,
   appAutoscalerCredentialEntityType,
@@ -101,7 +96,7 @@ function generateScalingEntity(endpointDefinition: IStratosEndpointDefinition) {
     schema: autoscalerEntityFactory(appAutoscalerScalingHistoryEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, APIResource<AppAutoscalerScalingHistory>>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, APIResource<AppAutoscalerEvent>>(definition);
 }
 
 function generateAppMetricEntity(endpointDefinition: IStratosEndpointDefinition) {
diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.scss b/src/frontend/packages/core/src/shared/components/list/list.component.scss
index d79a513a6a..1e2bd8a3b6 100644
--- a/src/frontend/packages/core/src/shared/components/list/list.component.scss
+++ b/src/frontend/packages/core/src/shared/components/list/list.component.scss
@@ -85,14 +85,6 @@
         padding: 10px 10px 10px 0;
       }
 
-      &--metrics-range {
-        padding-left: 10px;
-
-        app-metrics-range-selector {
-          padding-left: 10px;
-        }
-      }
-
       &--multi-actions {
         button {
           &:first-of-type {
diff --git a/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.scss b/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.scss
index 9175080272..0bcddcdc56 100644
--- a/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.scss
+++ b/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.scss
@@ -6,7 +6,6 @@
   display: flex;
 
   &__overlay {
-    background-color: rgba(0, 0, 0, 0);
     left: 0;
     overflow: hidden;
     position: absolute;
@@ -29,7 +28,6 @@
     }
 
     &-show {
-      background-color: rgba(0, 0, 0, .6);
       transition-delay: 0s;
       visibility: visible;
 
@@ -39,7 +37,6 @@
     }
 
     &-inner {
-      box-shadow: -4px 3px 41px -1px rgba(0, 0, 0, .36);
       padding: 50px;
       position: relative;
       transform: translateY(-100%);
diff --git a/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.theme.scss b/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.theme.scss
index bc0be4568d..47911410fe 100644
--- a/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.theme.scss
@@ -1,10 +1,18 @@
 @import '~@angular/material/theming';
 @mixin metrics-range-selector-theme($theme, $app-theme) {
   $primary: map-get($theme, primary);
+  $background-color: map-get($app-theme, app-background-color);
+  $foreground: map-get($theme, foreground);
+
   .metrics-range-selector {
     &__overlay {
+      background-color: $background-color;
+      &-show {
+        background-color: rgba($background-color, .6);
+      }
       &-inner {
-        background-color: mat-contrast($primary, 500);
+        background-color: $background-color;
+        box-shadow: -4px 3px 41px -1px rgba(0, 0, 0, .36);
       }
     }
   }
diff --git a/src/frontend/packages/core/src/shared/services/metrics-range-selector.service.ts b/src/frontend/packages/core/src/shared/services/metrics-range-selector.service.ts
index 321129e196..ee5b4e64c0 100644
--- a/src/frontend/packages/core/src/shared/services/metrics-range-selector.service.ts
+++ b/src/frontend/packages/core/src/shared/services/metrics-range-selector.service.ts
@@ -75,7 +75,7 @@ export class MetricsRangeSelectorService {
         };
       } else {
         return {
-          timeRange: metrics.query.params && metrics.query.params.window ?
+          timeRange: metrics.query && metrics.query.params && metrics.query.params.window ?
             times.find(time => time.value === metrics.query.params.window) :
             this.getDefaultTimeRange(times)
         };

From c665f4aa229746979fdff19be1d9c66e9ddcd769 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Tue, 19 May 2020 15:19:22 +0100
Subject: [PATCH 127/176] Remove debugging

---
 src/test-e2e/application/application-autoscaler-e2e.spec.ts | 2 +-
 src/test-e2e/helpers/cf-helpers.ts                          | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/test-e2e/application/application-autoscaler-e2e.spec.ts b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
index 8497444acf..e4c148492f 100644
--- a/src/test-e2e/application/application-autoscaler-e2e.spec.ts
+++ b/src/test-e2e/application/application-autoscaler-e2e.spec.ts
@@ -19,7 +19,7 @@ import { PageAutoscalerMetricBase } from './po/page-autoscaler-metric-base.po';
 
 let applicationE2eHelper: ApplicationE2eHelper;
 
-fdescribe('Autoscaler -', () => {
+describe('Autoscaler -', () => {
 
   beforeAll(() => {
     const setup = e2e.setup(ConsoleUserType.user)
diff --git a/src/test-e2e/helpers/cf-helpers.ts b/src/test-e2e/helpers/cf-helpers.ts
index 2bfb93a41b..15b7433dfc 100644
--- a/src/test-e2e/helpers/cf-helpers.ts
+++ b/src/test-e2e/helpers/cf-helpers.ts
@@ -168,9 +168,6 @@ export class CFHelpers {
 
   fetchUsers(cnsiGuid): promise.Promise<APIResource<CfUser>[]> {
     return this.cfRequestHelper.sendCfGet<CFResponse<CfUser>>(cnsiGuid, 'users').then(json => {
-      console.log('--------------------------');
-      console.log('fetch users');
-      console.log(JSON.stringify(json, null, 4));
       return json.resources;
     });
   }

From 8d4e4a01da1308e58f22af20e7fa91b0b84c2fb5 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 19 May 2020 16:08:10 +0100
Subject: [PATCH 128/176] Fix typing

---
 .../autoscaler-tab-extension.component.ts                     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
index 1ed3d7f453..dfee79bace 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
@@ -76,10 +76,10 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
   metricTypes: string[] = AutoscalerConstants.MetricTypes;
 
   appAutoscalerPolicyService: EntityService<APIResource<AppAutoscalerPolicyLocal>>;
-  public appAutoscalerScalingHistoryService: PaginationObservables<AppAutoscalerEvent>;
+  public appAutoscalerScalingHistoryService: PaginationObservables<APIResource<AppAutoscalerEvent>>;
   appAutoscalerPolicy$: Observable<AppAutoscalerPolicyLocal>;
   appAutoscalerPolicySafe$: Observable<AppAutoscalerPolicyLocal>;
-  appAutoscalerScalingHistory$: Observable<APIResource<AppAutoscalerEvent[]>>;
+  appAutoscalerScalingHistory$: Observable<AppAutoscalerEvent[]>;
   appAutoscalerAppMetricNames$: Observable<AppAutoscaleMetricChart[]>;
 
   public showNoPolicyMessage$: Observable<boolean>;

From f3324a66c1d3d1bc431d8cf713a71defbaafcbef Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 19 May 2020 16:26:42 +0100
Subject: [PATCH 129/176] Move entity relation stuff out of store pagination
 observables - added two hooks which allow endpoints to override the default
 way to fetch an entity/entities - this allows the cf world to populate a list
 from it's parent's inline list

---
 .../cloud-foundry/src/cf-entity-generator.ts  | 19 +++++++++++---
 .../entity-catalog-entity.ts                  | 25 ++++++++++++++++++-
 .../entity-catalog/entity-catalog.types.ts    | 14 +++++++++--
 .../entity-request-pipeline.types.ts          |  8 ++++--
 .../packages/store/src/entity-service.ts      | 13 +++++++---
 .../pagination-reducer.helper.ts              | 23 ++++++++---------
 .../store/src/selectors/endpoint.selectors.ts |  2 +-
 7 files changed, 79 insertions(+), 25 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
index d51933087e..f0550242a3 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -1,14 +1,14 @@
-import { Store } from '@ngrx/store';
+import { Action, Store } from '@ngrx/store';
 import * as moment from 'moment';
-import { combineLatest, of } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { combineLatest, Observable, of } from 'rxjs';
+import { first, map } from 'rxjs/operators';
 
 import { EndpointHealthCheck } from '../../core/endpoints-health-checks';
 import { metricEntityType } from '../../core/src/base-entity-schemas';
 import { urlValidationExpression } from '../../core/src/core/utils.service';
 import { BaseEndpointAuth } from '../../core/src/features/endpoints/endpoint-auth';
 import { CfValidateEntitiesStart } from '../../store/src/actions/request.actions';
-import { AppState } from '../../store/src/app-state';
+import { AppState, GeneralEntityAppState } from '../../store/src/app-state';
 import {
   StratosBaseCatalogEntity,
   StratosCatalogEndpointEntity,
@@ -162,6 +162,7 @@ import {
 } from './entity-action-builders/user-provided-service.action-builders';
 import { UserActionBuilders, userActionBuilders } from './entity-action-builders/user.action-builders';
 import { addCfQParams, addCfRelationParams } from './entity-relations/cf-entity-relations.getters';
+import { populatePaginationFromParent } from './entity-relations/entity-relations';
 import { isEntityInlineParentAction } from './entity-relations/entity-relations.types';
 import { CfEndpointDetailsComponent } from './shared/components/cf-endpoint-details/cf-endpoint-details.component';
 import { updateApplicationRoutesReducer } from './store/reducers/application-route.reducer';
@@ -176,6 +177,11 @@ import { CFResponse } from './store/types/cf-api.types';
 import { GitBranch, GitCommit, GitRepo } from './store/types/git.types';
 import { CfUser } from './store/types/user.types';
 
+function safePopulatePaginationFromParent(store: Store<GeneralEntityAppState>, action: PaginatedAction): Observable<Action> {
+  return populatePaginationFromParent(store, action).pipe(
+    map(newAction => newAction || action)
+  );
+}
 
 function getPaginationCompareString(paginationEntity: PaginationEntityState) {
   if (!paginationEntity) {
@@ -302,6 +308,11 @@ export function generateCFEntities(): StratosBaseCatalogEntity[] {
         }
       };
     },
+    entitiesFetchHandler: (store: Store<GeneralEntityAppState>, actions: PaginatedAction[]) => () => {
+      combineLatest(actions.map(action => safePopulatePaginationFromParent(store, action))).pipe(
+        first(),
+      ).subscribe(actions => actions.forEach(action => store.dispatch(action)));
+    },
     paginationConfig: {
       getEntitiesFromResponse: (response: CFResponse) => response.resources,
       getTotalPages: (responseWithPages: JetstreamResponse<CFResponse | CFResponse[]>) =>
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts
index 7a4faf6d8a..d02ba1eadd 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity.ts
@@ -4,7 +4,12 @@ import { endpointEntitySchema, STRATOS_ENDPOINT_TYPE } from '../../../../core/sr
 import { KnownKeys, NonOptionalKeys } from '../../../../core/src/core/utils.service';
 import { getFullEndpointApiUrl } from '../../../../core/src/features/endpoints/endpoint-helpers';
 import { IRequestEntityTypeState } from '../../app-state';
-import { EntitiesInfoHandler, EntityInfoHandler } from '../../entity-request-pipeline/entity-request-pipeline.types';
+import {
+  EntitiesFetchHandler,
+  EntitiesInfoHandler,
+  EntityFetchHandler,
+  EntityInfoHandler,
+} from '../../entity-request-pipeline/entity-request-pipeline.types';
 import {
   PaginationPageIteratorConfig,
 } from '../../entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe';
@@ -259,6 +264,14 @@ export class StratosBaseCatalogEntity<
   public getEntitiesEmitHandler(): EntitiesInfoHandler {
     return this.definition.entitiesEmitHandler;
   }
+
+  public getEntityFetchHandler(): EntityFetchHandler {
+    return this.definition.entityFetchHandler;
+  }
+
+  public getEntitiesFetchHandler(): EntitiesFetchHandler {
+    return this.definition.entitiesFetchHandler;
+  }
 }
 
 export class StratosCatalogEntity<
@@ -290,6 +303,16 @@ export class StratosCatalogEntity<
     return this.definition.entitiesEmitHandler ||
       this.definition.endpoint ? this.definition.endpoint.entitiesEmitHandler : null
   }
+
+  public getEntityFetchHandler(): EntityFetchHandler {
+    return this.definition.entityFetchHandler ||
+      this.definition.endpoint ? this.definition.endpoint.entityFetchHandler : null;
+  }
+
+  public getEntitiesFetchHandler(): EntitiesFetchHandler {
+    return this.definition.entitiesFetchHandler ||
+      this.definition.endpoint ? this.definition.endpoint.entitiesFetchHandler : null;
+  }
 }
 
 export class StratosCatalogEndpointEntity extends StratosBaseCatalogEntity<IEndpointFavMetadata, EndpointModel> {
diff --git a/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts b/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts
index de7ba6438e..130194253b 100644
--- a/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts
+++ b/src/frontend/packages/store/src/entity-catalog/entity-catalog.types.ts
@@ -8,7 +8,9 @@ import { StratosStatus } from '../../../core/src/shared/shared.types';
 import { GeneralEntityAppState } from '../app-state';
 import {
   ApiErrorMessageHandler,
+  EntitiesFetchHandler,
   EntitiesInfoHandler,
+  EntityFetchHandler,
   EntityInfoHandler,
   PreApiRequest,
   PrePaginationApiRequest,
@@ -74,13 +76,21 @@ export interface IStratosBaseEntityDefinition<T = EntitySchema | EntityCatalogSc
   readonly paginationConfig?: PaginationPageIteratorConfig;
   readonly tableConfig?: EntityTableConfig<any>;
   /**
-    * Hook that will fire before an entity is emitted by an entity service. This could be used, for example, entity validation
-    */
+   * Hook that will fire before an entity is emitted by an entity service. This could be used, for example, entity validation
+   */
   readonly entityEmitHandler?: EntityInfoHandler;
   /**
    * Hook that will fire before an entity is emitted by an entity service. This could be used, for example, entity validation
    */
   readonly entitiesEmitHandler?: EntitiesInfoHandler;
+  /**
+   * Hook that can override the way an entity is fetched
+   */
+  readonly entityFetchHandler?: EntityFetchHandler;
+  /**
+   * Hook that can override the way entities are fetched
+   */
+  readonly entitiesFetchHandler?: EntitiesFetchHandler;
 }
 
 
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts
index 289f748417..31c9d8ae63 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts
@@ -3,7 +3,7 @@ import { Action, Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
 
 import { JetStreamErrorResponse } from '../../../core/src/jetstream.helpers';
-import { AppState, InternalAppState } from '../app-state';
+import { AppState, GeneralEntityAppState, InternalAppState } from '../app-state';
 import {
   StratosBaseCatalogEntity,
   StratosCatalogEndpointEntity,
@@ -129,4 +129,8 @@ export type EntitiesInfoHandler = (
   actionDispatcher: ActionDispatcher,
 ) => (
     state: PaginationEntityState,
-  ) => void;
\ No newline at end of file
+  ) => void;
+
+
+export type EntityFetchHandler = <T>(store: Store<GeneralEntityAppState>, action: EntityRequestAction) => (entity: T) => void;
+export type EntitiesFetchHandler = (store: Store<GeneralEntityAppState>, actions: PaginatedAction[]) => () => void;
diff --git a/src/frontend/packages/store/src/entity-service.ts b/src/frontend/packages/store/src/entity-service.ts
index f9f168bd6f..3cc234e8d4 100644
--- a/src/frontend/packages/store/src/entity-service.ts
+++ b/src/frontend/packages/store/src/entity-service.ts
@@ -53,12 +53,18 @@ export class EntityService<T = any> {
       this.actionDispatch(this.refreshKey);
     };
 
+    const catalogEntity = entityCatalog.getEntity(this.action);
+    const entityFetchHandler = catalogEntity.getEntityFetchHandler();
+    const fetchHandler = entityFetchHandler ?
+      entityFetchHandler(store, this.action) :
+      (entity: T) => this.actionDispatch('');
+
     this.updatingSection$ = entityMonitor.updatingSection$;
     this.isDeletingEntity$ = entityMonitor.isDeletingEntity$;
     this.isFetchingEntity$ = entityMonitor.isFetchingEntity$;
     this.entityObs$ = this.getEntityObservable(
       entityMonitor,
-      this.actionDispatch,
+      fetchHandler,
     ).pipe(
       publishReplay(1),
       refCount(),
@@ -92,14 +98,15 @@ export class EntityService<T = any> {
   updatingSection$: Observable<UpdatingSection>;
   private getEntityObservable = (
     entityMonitor: EntityMonitor<T>,
-    actionDispatch: (key?: string) => void
+    actionDispatch: (entity: T) => void
   ): Observable<EntityInfo> => {
     const cleanEntityInfo$ = this.getCleanEntityInfoObs(entityMonitor);
+
     return entityMonitor.entityRequest$.pipe(
       withLatestFrom(entityMonitor.entity$),
       tap(([entityRequestInfo, entity]) => {
         if (actionDispatch && this.shouldCallAction(entityRequestInfo, entity)) {
-          actionDispatch();
+          actionDispatch(entity);;
         }
       }),
       first(),
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts
index 547c39de82..68d27c5974 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts
@@ -1,9 +1,8 @@
-import { Action, Store } from '@ngrx/store';
+import { Store } from '@ngrx/store';
 import { combineLatest, Observable } from 'rxjs';
 import {
   distinctUntilChanged,
   filter,
-  first,
   map,
   pairwise,
   publishReplay,
@@ -13,7 +12,6 @@ import {
   tap,
 } from 'rxjs/operators';
 
-import { populatePaginationFromParent } from '../../../../cloud-foundry/src/entity-relations/entity-relations';
 import { sortStringify } from '../../../../core/src/core/utils.service';
 import { SetInitialParams } from '../../actions/pagination.actions';
 import { AppState, GeneralEntityAppState } from '../../app-state';
@@ -158,11 +156,8 @@ function shouldFetchNonLocalList(pagination: PaginationEntityState): boolean {
   return !hasError(pagination) && !hasValidOrGettingPage(pagination);
 }
 
-function safePopulatePaginationFromParent(store: Store<GeneralEntityAppState>, action: PaginatedAction): Observable<Action> {
-  return populatePaginationFromParent(store, action).pipe(
-    map(newAction => newAction || action)
-  );
-}
+const defaultEntitiesFetchHandler = (store: Store<GeneralEntityAppState>, actions: PaginatedAction[]) => () =>
+  actions.forEach(action => store.dispatch(action));
 
 function getObservables<T = any>(
   store: Store<GeneralEntityAppState>,
@@ -178,6 +173,12 @@ function getObservables<T = any>(
   const paginationSelect$ = store.select(selectPaginationState(entityKey, paginationKey));
   const pagination$: Observable<PaginationEntityState> = paginationSelect$.pipe(filter(pagination => !!pagination));
 
+  const entity = entityCatalog.getEntity(arrayAction[0]);
+  const entitiesFetchHandler = entity.getEntitiesFetchHandler();
+  const fetchHandler = entitiesFetchHandler ?
+    entitiesFetchHandler(store, arrayAction) :
+    defaultEntitiesFetchHandler(store, arrayAction);
+
   // Keep this separate, we don't want tap executing every time someone subscribes
   const fetchPagination$ = paginationSelect$.pipe(
     startWith(null),
@@ -185,15 +186,13 @@ function getObservables<T = any>(
     tap(([prevPag, newPag]: [PaginationEntityState, PaginationEntityState]) => {
       if (shouldFetchLocalOrNonLocalList(isLocal, hasDispatchedOnce, newPag, prevPag)) {
         hasDispatchedOnce = true; // Ensure we set this first, otherwise we're called again instantly
-        combineLatest(arrayAction.map(action => safePopulatePaginationFromParent(store, action))).pipe(
-          first(),
-        ).subscribe(actions => actions.forEach(action => store.dispatch(action)));
+        fetchHandler();
       }
     }),
     map(([, newPag]) => newPag)
   );
 
-  const entitiesInfoHandlerBuilder = entityCatalog.getEntity(arrayAction[0]).getEntitiesEmitHandler();
+  const entitiesInfoHandlerBuilder = entity.getEntitiesEmitHandler();
   const actionInfoHandler = entitiesInfoHandlerBuilder ? entitiesInfoHandlerBuilder(
     paginationAction, (action) => store.dispatch(action)
   ) : () => { };
diff --git a/src/frontend/packages/store/src/selectors/endpoint.selectors.ts b/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
index ee89fa29f4..0400350b59 100644
--- a/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
+++ b/src/frontend/packages/store/src/selectors/endpoint.selectors.ts
@@ -31,7 +31,7 @@ export const endpointOfTypeSelector = (endpointType: string) => compose(
 );
 
 // TODO: Move this #3769
-export const cfEndpointEntitiesSelector = endpointOfType('cf');
+const cfEndpointEntitiesSelector = endpointOfType('cf');
 
 const getConnectedEndpoints = (endpoints: IRequestEntityTypeState<EndpointModel>) =>
   Object.values(endpoints || {}).reduce((connected, endpoint) => {

From 437ba8a2ced8b464e3efc18d1b12ace73f137328 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 19 May 2020 16:37:37 +0100
Subject: [PATCH 130/176] Move endpointDisconnectRemoveEntitiesReducer

---
 .../cloud-foundry/src/cf-entity-generator.ts         |  2 +-
 .../endpoint-disconnect-application.reducer.ts       | 12 ++++++++----
 .../packages/store/src/actions/request.actions.ts    |  3 +++
 .../packages/store/src/effects/pagination.effects.ts |  4 ++--
 .../packages/store/src/effects/update-app-effects.ts |  2 +-
 .../src/reducers/api-request-reducers.generator.ts   |  9 ++++++---
 .../pagination-reducer-remove-params.ts              |  1 +
 7 files changed, 22 insertions(+), 11 deletions(-)
 rename src/frontend/packages/{store/src => cloud-foundry/src/store}/reducers/endpoint-disconnect-application.reducer.ts (74%)

diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
index f0550242a3..5222f31da3 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -25,7 +25,6 @@ import { ActionDispatcher, JetstreamResponse } from '../../store/src/entity-requ
 import { EntitySchema } from '../../store/src/helpers/entity-schema';
 import { RequestInfoState } from '../../store/src/reducers/api-request-reducer/types';
 import { selectSessionData } from '../../store/src/reducers/auth.reducer';
-import { endpointDisconnectRemoveEntitiesReducer } from '../../store/src/reducers/endpoint-disconnect-application.reducer';
 import { APIResource, EntityInfo } from '../../store/src/types/api.types';
 import { PaginatedAction, PaginationEntityState } from '../../store/src/types/pagination.types';
 import { ICFAction } from '../../store/src/types/request.types';
@@ -166,6 +165,7 @@ import { populatePaginationFromParent } from './entity-relations/entity-relation
 import { isEntityInlineParentAction } from './entity-relations/entity-relations.types';
 import { CfEndpointDetailsComponent } from './shared/components/cf-endpoint-details/cf-endpoint-details.component';
 import { updateApplicationRoutesReducer } from './store/reducers/application-route.reducer';
+import { endpointDisconnectRemoveEntitiesReducer } from './store/reducers/endpoint-disconnect-application.reducer';
 import { updateOrganizationQuotaReducer } from './store/reducers/organization-quota.reducer';
 import { updateOrganizationSpaceReducer } from './store/reducers/organization-space.reducer';
 import { routeReducer, updateAppSummaryRoutesReducer } from './store/reducers/routes.reducer';
diff --git a/src/frontend/packages/store/src/reducers/endpoint-disconnect-application.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/endpoint-disconnect-application.reducer.ts
similarity index 74%
rename from src/frontend/packages/store/src/reducers/endpoint-disconnect-application.reducer.ts
rename to src/frontend/packages/cloud-foundry/src/store/reducers/endpoint-disconnect-application.reducer.ts
index 254e9462d9..7e6d015061 100644
--- a/src/frontend/packages/store/src/reducers/endpoint-disconnect-application.reducer.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/endpoint-disconnect-application.reducer.ts
@@ -1,7 +1,11 @@
-import { StratosCFEntity } from '../../../cloud-foundry/src/cf-api.types';
-import { DISCONNECT_ENDPOINTS_SUCCESS, DisconnectEndpoint, UNREGISTER_ENDPOINTS_SUCCESS } from '../actions/endpoint.actions';
-import { IRequestEntityTypeState } from '../app-state';
-import { APIResource } from '../types/api.types';
+import {
+  DISCONNECT_ENDPOINTS_SUCCESS,
+  DisconnectEndpoint,
+  UNREGISTER_ENDPOINTS_SUCCESS,
+} from '../../../../store/src/actions/endpoint.actions';
+import { IRequestEntityTypeState } from '../../../../store/src/app-state';
+import { APIResource } from '../../../../store/src/types/api.types';
+import { StratosCFEntity } from '../../cf-api.types';
 
 // #3704 - These can be removed after this ticket is completed
 export function endpointDisconnectRemoveEntitiesReducer() {
diff --git a/src/frontend/packages/store/src/actions/request.actions.ts b/src/frontend/packages/store/src/actions/request.actions.ts
index 81c143cb8e..205255f1f1 100644
--- a/src/frontend/packages/store/src/actions/request.actions.ts
+++ b/src/frontend/packages/store/src/actions/request.actions.ts
@@ -23,6 +23,7 @@ export const EntitiesPipelineActionTypes = {
 
 export type EntitiesPipelineAction = ICFAction | PaginatedAction;
 
+// TODO: RC TWEAK/MOVE
 export class CfValidateEntitiesStart implements Action {
   type = EntitiesPipelineActionTypes.VALIDATE;
   constructor(
@@ -32,12 +33,14 @@ export class CfValidateEntitiesStart implements Action {
   }
 }
 
+// TODO: RC TWEAK/MOVE
 export class APIResponse {
   response: NormalizedResponse;
   totalResults: number;
   totalPages: number;
 }
 
+// TODO: RC TWEAK/MOVE
 export class CfValidateEntitiesComplete implements Action {
   type = EntitiesPipelineActionTypes.COMPLETE;
   constructor(
diff --git a/src/frontend/packages/store/src/effects/pagination.effects.ts b/src/frontend/packages/store/src/effects/pagination.effects.ts
index 1f8f3ff18a..5620253eae 100644
--- a/src/frontend/packages/store/src/effects/pagination.effects.ts
+++ b/src/frontend/packages/store/src/effects/pagination.effects.ts
@@ -3,7 +3,6 @@ import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { map } from 'rxjs/operators';
 
-import { CFAppState } from '../../../cloud-foundry/src/cf-app-state';
 import {
   ADD_PARAMS,
   AddParams,
@@ -13,13 +12,14 @@ import {
   SET_PARAMS,
   SetParams,
 } from '../actions/pagination.actions';
+import { AppState } from '../app-state';
 
 @Injectable()
 export class PaginationEffects {
 
   constructor(
     private actions$: Actions,
-    private store: Store<CFAppState>
+    private store: Store<AppState>
   ) { }
 
   @Effect({ dispatch: false }) clearPaginationOnParamChange$ = this.actions$.pipe(
diff --git a/src/frontend/packages/store/src/effects/update-app-effects.ts b/src/frontend/packages/store/src/effects/update-app-effects.ts
index c4cab46c0f..31e13dc388 100644
--- a/src/frontend/packages/store/src/effects/update-app-effects.ts
+++ b/src/frontend/packages/store/src/effects/update-app-effects.ts
@@ -7,7 +7,7 @@ import { UPDATE_SUCCESS, UpdateExistingApplication } from '../../../cloud-foundr
 import { cfEntityCatalog } from '../../../cloud-foundry/src/cf-entity-catalog';
 import { WrapperRequestActionSuccess } from '../types/request.types';
 
-
+// TODO: RC TWEAK/MOVE
 
 @Injectable()
 export class UpdateAppEffects {
diff --git a/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts b/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts
index 8ab5be4e86..a30650d238 100644
--- a/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts
@@ -1,14 +1,17 @@
 import { Action } from '@ngrx/store';
+
 import { appStatsEntityType } from '../../../cloud-foundry/src/cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../../../cloud-foundry/src/cf-types';
+import { appStatsReducer } from '../../../cloud-foundry/src/store/reducers/app-stats-request.reducer';
 import { IRequestEntityTypeState } from '../app-state';
+import { entityCatalog } from '../entity-catalog/entity-catalog';
 import { IRequestState } from '../types/entity.types';
 import { requestReducerFactory } from './api-request-reducer/request-reducer.factory';
 import { RequestInfoState } from './api-request-reducer/types';
 import { chainApiReducers, ExtraApiReducers, requestActions } from './api-request-reducers.generator.helpers';
-import { appStatsReducer } from '../../../cloud-foundry/src/store/reducers/app-stats-request.reducer';
-import { entityCatalog } from '../entity-catalog/entity-catalog';
-import { CF_ENDPOINT_TYPE } from '../../../cloud-foundry/src/cf-types';
 
+
+// TODO: RC TWEAK/MOVE
 /**
  * This module uses the request data reducer and request reducer factories to create
  * the reducers to be used when making http requests
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-remove-params.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-remove-params.ts
index a4ef542716..b81afcd157 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-remove-params.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-remove-params.ts
@@ -2,6 +2,7 @@ import { QParam } from '../../../../cloud-foundry/src/shared/q-param';
 import { RemoveParams } from '../../actions/pagination.actions';
 import { PaginationEntityState } from '../../types/pagination.types';
 
+// TODO: RC
 export function paginationRemoveParams(state: PaginationEntityState, action: RemoveParams) {
 
   const removeParamsState = {

From e4c5ef1c4902d65d2666ad825ee2103f8b7f4013 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 19 May 2020 17:05:33 +0100
Subject: [PATCH 131/176] Move relation actions and EnvVarViewComponent into cf
 module

---
 .../src/actions/relations-actions.ts          | 30 +++++++++++++++++++
 .../cloud-foundry/src/cf-entity-generator.ts  |  2 +-
 .../src/shared/cf-shared.module.ts            |  3 ++
 .../env-var-view/env-var-view.component.html  |  0
 .../env-var-view/env-var-view.component.scss  |  0
 .../env-var-view.component.spec.ts            |  8 +++--
 .../env-var-view/env-var-view.component.ts    |  2 +-
 .../app-service-binding-card.component.ts     |  2 +-
 .../table-cell-edit-variable.component.ts     |  4 +--
 .../src/store/effects/app.effects.ts          |  2 --
 .../src/store/effects/request.effects.ts      |  7 ++---
 .../core/current-user-permissions.config.ts   |  1 -
 .../application-state.component.ts            |  1 -
 .../packages/core/src/shared/shared.module.ts | 10 +++----
 .../store/src/actions/request.actions.ts      | 26 +---------------
 15 files changed, 50 insertions(+), 48 deletions(-)
 create mode 100644 src/frontend/packages/cloud-foundry/src/actions/relations-actions.ts
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/env-var-view/env-var-view.component.html (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/env-var-view/env-var-view.component.scss (100%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/env-var-view/env-var-view.component.spec.ts (74%)
 rename src/frontend/packages/{core => cloud-foundry}/src/shared/components/env-var-view/env-var-view.component.ts (87%)

diff --git a/src/frontend/packages/cloud-foundry/src/actions/relations-actions.ts b/src/frontend/packages/cloud-foundry/src/actions/relations-actions.ts
new file mode 100644
index 0000000000..7db107b837
--- /dev/null
+++ b/src/frontend/packages/cloud-foundry/src/actions/relations-actions.ts
@@ -0,0 +1,30 @@
+import { Action } from '@ngrx/store';
+
+import {
+  APIResponse,
+  EntitiesPipelineAction,
+  EntitiesPipelineActionTypes,
+} from '../../../store/src/actions/request.actions';
+import { ValidationResult } from '../entity-relations/entity-relations.types';
+
+export class CfValidateEntitiesStart implements Action {
+  type = EntitiesPipelineActionTypes.VALIDATE;
+  constructor(
+    public action: EntitiesPipelineAction,
+    public validateEntities: string[],
+  ) {
+  }
+}
+
+export class CfValidateEntitiesComplete implements Action {
+  type = EntitiesPipelineActionTypes.COMPLETE;
+  constructor(
+    public apiAction: EntitiesPipelineAction,
+    public apiResponse: APIResponse,
+    public validateAction: CfValidateEntitiesStart,
+    public validationResult: ValidationResult,
+    public independentUpdates: boolean
+  ) {
+
+  }
+}
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
index 5222f31da3..26a24ca124 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts
@@ -7,7 +7,6 @@ import { EndpointHealthCheck } from '../../core/endpoints-health-checks';
 import { metricEntityType } from '../../core/src/base-entity-schemas';
 import { urlValidationExpression } from '../../core/src/core/utils.service';
 import { BaseEndpointAuth } from '../../core/src/features/endpoints/endpoint-auth';
-import { CfValidateEntitiesStart } from '../../store/src/actions/request.actions';
 import { AppState, GeneralEntityAppState } from '../../store/src/app-state';
 import {
   StratosBaseCatalogEntity,
@@ -28,6 +27,7 @@ import { selectSessionData } from '../../store/src/reducers/auth.reducer';
 import { APIResource, EntityInfo } from '../../store/src/types/api.types';
 import { PaginatedAction, PaginationEntityState } from '../../store/src/types/pagination.types';
 import { ICFAction } from '../../store/src/types/request.types';
+import { CfValidateEntitiesStart } from './actions/relations-actions';
 import {
   IService,
   IServiceBinding,
diff --git a/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts b/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts
index 1d1e4255b8..ef7c9a3cef 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts
@@ -53,6 +53,7 @@ import { CloudFoundryEventsListComponent } from './components/cloud-foundry-even
 import {
   CreateApplicationStep1Component,
 } from './components/create-application/create-application-step1/create-application-step1.component';
+import { EnvVarViewComponent } from './components/env-var-view/env-var-view.component';
 import { GithubCommitAuthorComponent } from './components/github-commit-author/github-commit-author.component';
 import {
   TableCellCfCellComponent,
@@ -320,6 +321,7 @@ const cfListCards: Type<CardCell<any>>[] = [
     AppNameUniqueDirective,
     ApplicationInstanceChartComponent,
     GithubCommitAuthorComponent,
+    EnvVarViewComponent
   ],
   exports: [
     ServiceIconComponent,
@@ -361,6 +363,7 @@ const cfListCards: Type<CardCell<any>>[] = [
     AppNameUniqueDirective,
     ApplicationInstanceChartComponent,
     GithubCommitAuthorComponent,
+    EnvVarViewComponent
   ],
   entryComponents: [
     CfEndpointDetailsComponent,
diff --git a/src/frontend/packages/core/src/shared/components/env-var-view/env-var-view.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/env-var-view/env-var-view.component.html
similarity index 100%
rename from src/frontend/packages/core/src/shared/components/env-var-view/env-var-view.component.html
rename to src/frontend/packages/cloud-foundry/src/shared/components/env-var-view/env-var-view.component.html
diff --git a/src/frontend/packages/core/src/shared/components/env-var-view/env-var-view.component.scss b/src/frontend/packages/cloud-foundry/src/shared/components/env-var-view/env-var-view.component.scss
similarity index 100%
rename from src/frontend/packages/core/src/shared/components/env-var-view/env-var-view.component.scss
rename to src/frontend/packages/cloud-foundry/src/shared/components/env-var-view/env-var-view.component.scss
diff --git a/src/frontend/packages/core/src/shared/components/env-var-view/env-var-view.component.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/env-var-view/env-var-view.component.spec.ts
similarity index 74%
rename from src/frontend/packages/core/src/shared/components/env-var-view/env-var-view.component.spec.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/env-var-view/env-var-view.component.spec.ts
index 517a74b7ae..0047f9b5bb 100644
--- a/src/frontend/packages/core/src/shared/components/env-var-view/env-var-view.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/env-var-view/env-var-view.component.spec.ts
@@ -1,9 +1,11 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 
-import { BaseTestModulesNoShared } from '../../../../test-framework/core-test.helper';
-import { CodeBlockComponent } from '../code-block/code-block.component';
-import { CopyToClipboardComponent } from '../copy-to-clipboard/copy-to-clipboard.component';
+import { CodeBlockComponent } from '../../../../../core/src/shared/components/code-block/code-block.component';
+import {
+  CopyToClipboardComponent,
+} from '../../../../../core/src/shared/components/copy-to-clipboard/copy-to-clipboard.component';
+import { BaseTestModulesNoShared } from '../../../../../core/test-framework/core-test.helper';
 import { EnvVarViewComponent } from './env-var-view.component';
 
 describe('EnvVarViewComponent', () => {
diff --git a/src/frontend/packages/core/src/shared/components/env-var-view/env-var-view.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/env-var-view/env-var-view.component.ts
similarity index 87%
rename from src/frontend/packages/core/src/shared/components/env-var-view/env-var-view.component.ts
rename to src/frontend/packages/cloud-foundry/src/shared/components/env-var-view/env-var-view.component.ts
index 2037ff0df5..d8fd1aa334 100644
--- a/src/frontend/packages/core/src/shared/components/env-var-view/env-var-view.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/env-var-view/env-var-view.component.ts
@@ -1,4 +1,4 @@
-import { Component, Inject, OnInit } from '@angular/core';
+import { Component, Inject } from '@angular/core';
 import { MAT_DIALOG_DATA } from '@angular/material/dialog';
 
 
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts
index 4bea41c16b..f3219c6d18 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component.ts
@@ -7,7 +7,6 @@ import { filter, first, map, switchMap } from 'rxjs/operators';
 import { CurrentUserPermissions } from '../../../../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../../../../core/src/core/current-user-permissions.service';
 import { AppChip } from '../../../../../../../../core/src/shared/components/chips/chips.component';
-import { EnvVarViewComponent } from '../../../../../../../../core/src/shared/components/env-var-view/env-var-view.component';
 import {
   MetaCardMenuItem,
 } from '../../../../../../../../core/src/shared/components/list/list-cards/meta-card/meta-card-base/meta-card.component';
@@ -33,6 +32,7 @@ import {
 } from '../../../../../../features/service-catalog/services-helper';
 import { AppEnvVarsState } from '../../../../../../store/types/app-metadata.types';
 import { ServiceActionHelperService } from '../../../../../data-services/service-action-helper.service';
+import { EnvVarViewComponent } from '../../../../env-var-view/env-var-view.component';
 
 
 interface EnvVarData {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/table-cell-edit-variable/table-cell-edit-variable.component.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/table-cell-edit-variable/table-cell-edit-variable.component.ts
index 53d3e043d9..886357b248 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/table-cell-edit-variable/table-cell-edit-variable.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/table-cell-edit-variable/table-cell-edit-variable.component.ts
@@ -1,11 +1,11 @@
-/* tslint:disable:no-access-missing-member https://github.com/mgechev/codelyzer/issues/191*/
 import { Component } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 
-import { EnvVarViewComponent } from '../../../../../../../../core/src/shared/components/env-var-view/env-var-view.component';
 import { TableCellCustom } from '../../../../../../../../core/src/shared/components/list/list.types';
+import { EnvVarViewComponent } from '../../../../env-var-view/env-var-view.component';
 import { ListAppEnvVar } from '../cf-app-variables-data-source';
 
+/* tslint:disable:no-access-missing-member https://github.com/mgechev/codelyzer/issues/191*/
 @Component({
   selector: 'app-table-cell-edit-variable',
   templateUrl: './table-cell-edit-variable.component.html',
diff --git a/src/frontend/packages/cloud-foundry/src/store/effects/app.effects.ts b/src/frontend/packages/cloud-foundry/src/store/effects/app.effects.ts
index bd5992abe5..60657b138d 100644
--- a/src/frontend/packages/cloud-foundry/src/store/effects/app.effects.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/effects/app.effects.ts
@@ -13,8 +13,6 @@ import {
   createAppInstancesMetricAction,
 } from '../../shared/components/list/list-types/app-instance/cf-app-instances-config.service';
 
-// TODO: RC search for cloud-foundry in store
-// TODO: RC search for cloud-foundry in others
 @Injectable()
 export class AppEffects {
 
diff --git a/src/frontend/packages/cloud-foundry/src/store/effects/request.effects.ts b/src/frontend/packages/cloud-foundry/src/store/effects/request.effects.ts
index cc74996118..b7f66a5710 100644
--- a/src/frontend/packages/cloud-foundry/src/store/effects/request.effects.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/effects/request.effects.ts
@@ -5,15 +5,12 @@ import { catchError, first, map, mergeMap, withLatestFrom } from 'rxjs/operators
 
 import { LoggerService } from '../../../../core/src/core/logger.service';
 import { SET_PAGE_BUSY } from '../../../../store/src/actions/pagination.actions';
-import {
-  CfValidateEntitiesComplete,
-  CfValidateEntitiesStart,
-  EntitiesPipelineActionTypes,
-} from '../../../../store/src/actions/request.actions';
+import { EntitiesPipelineActionTypes } from '../../../../store/src/actions/request.actions';
 import { rootUpdatingKey } from '../../../../store/src/reducers/api-request-reducer/types';
 import { getAPIRequestDataState } from '../../../../store/src/selectors/api.selectors';
 import { getPaginationState } from '../../../../store/src/selectors/pagination.selectors';
 import { UpdateCfAction } from '../../../../store/src/types/request.types';
+import { CfValidateEntitiesComplete, CfValidateEntitiesStart } from '../../actions/relations-actions';
 import { CFAppState } from '../../cf-app-state';
 import { validateEntityRelations } from '../../entity-relations/entity-relations';
 
diff --git a/src/frontend/packages/core/src/core/current-user-permissions.config.ts b/src/frontend/packages/core/src/core/current-user-permissions.config.ts
index 301d6ac136..df9cdd2fa1 100644
--- a/src/frontend/packages/core/src/core/current-user-permissions.config.ts
+++ b/src/frontend/packages/core/src/core/current-user-permissions.config.ts
@@ -1,6 +1,5 @@
 import { CFFeatureFlagTypes } from '../shared/components/cf-auth/cf-auth.types';
 
-// TODO: RC REMOVE ALL CF???
 export enum CurrentUserPermissions {
   APPLICATION_VIEW = 'view.application',
   APPLICATION_EDIT = 'edit.application',
diff --git a/src/frontend/packages/core/src/shared/components/application-state/application-state.component.ts b/src/frontend/packages/core/src/shared/components/application-state/application-state.component.ts
index dffa6c1686..f548f70336 100644
--- a/src/frontend/packages/core/src/shared/components/application-state/application-state.component.ts
+++ b/src/frontend/packages/core/src/shared/components/application-state/application-state.component.ts
@@ -4,7 +4,6 @@ import { map, startWith } from 'rxjs/operators';
 
 import { StratosStatus, StratosStatusMetadata } from '../../shared.types';
 
-// TODO: RC MOVE
 @Component({
   selector: 'app-application-state',
   templateUrl: './application-state.component.html',
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index 7f737d8f79..56a3cda92d 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -5,6 +5,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
+import { EnvVarViewComponent } from '../../../cloud-foundry/src/shared/components/env-var-view/env-var-view.component';
 import { InternalEventMonitorFactory } from '../../../store/src/monitors/internal-event-monitor.factory';
 import { CoreModule } from '../core/core.module';
 import { AppActionMonitorIconComponent } from './components/app-action-monitor-icon/app-action-monitor-icon.component';
@@ -35,7 +36,6 @@ import { EditableDisplayValueComponent } from './components/editable-display-val
 import { EndpointsMissingComponent } from './components/endpoints-missing/endpoints-missing.component';
 import { EntitySummaryTitleComponent } from './components/entity-summary-title/entity-summary-title.component';
 import { EnumerateComponent } from './components/enumerate/enumerate.component';
-import { EnvVarViewComponent } from './components/env-var-view/env-var-view.component';
 import { FavoritesEntityListComponent } from './components/favorites-entity-list/favorites-entity-list.component';
 import { FavoritesGlobalListComponent } from './components/favorites-global-list/favorites-global-list.component';
 import { FavoritesMetaCardComponent } from './components/favorites-meta-card/favorites-meta-card.component';
@@ -151,9 +151,9 @@ import { UserPermissionDirective } from './user-permission.directive';
     EndpointsMissingComponent,
     DialogErrorComponent,
     SshViewerComponent,
-    ApplicationStateIconPipe, // TODO: RC MOVE
-    ApplicationStateIconComponent,// TODO: RC MOVE
-    ApplicationStateComponent,// TODO: RC MOVE
+    ApplicationStateIconPipe,
+    ApplicationStateIconComponent,
+    ApplicationStateComponent,
     TileComponent,
     TileGroupComponent,
     TileGridComponent,
@@ -175,7 +175,6 @@ import { UserPermissionDirective } from './user-permission.directive';
     AppChipsComponent,
     CardBooleanMetricComponent,
     CardNumberMetricComponent,
-    EnvVarViewComponent,// TODO: RC MOVE
     RingChartComponent,
     MetricsChartComponent,
     StratosTitleComponent,
@@ -271,7 +270,6 @@ import { UserPermissionDirective } from './user-permission.directive';
     AppChipsComponent,
     CardBooleanMetricComponent,
     CardNumberMetricComponent,
-    EnvVarViewComponent,
     MetricsChartComponent,
     StratosTitleComponent,
     IntroScreenComponent,
diff --git a/src/frontend/packages/store/src/actions/request.actions.ts b/src/frontend/packages/store/src/actions/request.actions.ts
index 205255f1f1..c847e4d048 100644
--- a/src/frontend/packages/store/src/actions/request.actions.ts
+++ b/src/frontend/packages/store/src/actions/request.actions.ts
@@ -1,6 +1,3 @@
-import { Action } from '@ngrx/store';
-
-import { ValidationResult } from '../../../cloud-foundry/src/entity-relations/entity-relations.types';
 import { NormalizedResponse } from '../types/api.types';
 import { PaginatedAction } from '../types/pagination.types';
 import { ICFAction } from '../types/request.types';
@@ -21,18 +18,9 @@ export const EntitiesPipelineActionTypes = {
   COMPLETE: '[Validation] Completed',
 };
 
+// TODO: RC TWEAK/MOVE ICFACTION
 export type EntitiesPipelineAction = ICFAction | PaginatedAction;
 
-// TODO: RC TWEAK/MOVE
-export class CfValidateEntitiesStart implements Action {
-  type = EntitiesPipelineActionTypes.VALIDATE;
-  constructor(
-    public action: EntitiesPipelineAction,
-    public validateEntities: string[],
-  ) {
-  }
-}
-
 // TODO: RC TWEAK/MOVE
 export class APIResponse {
   response: NormalizedResponse;
@@ -40,16 +28,4 @@ export class APIResponse {
   totalPages: number;
 }
 
-// TODO: RC TWEAK/MOVE
-export class CfValidateEntitiesComplete implements Action {
-  type = EntitiesPipelineActionTypes.COMPLETE;
-  constructor(
-    public apiAction: EntitiesPipelineAction,
-    public apiResponse: APIResponse,
-    public validateAction: CfValidateEntitiesStart,
-    public validationResult: ValidationResult,
-    public independentUpdates: boolean
-  ) {
 
-  }
-}

From a8f60358369a775754bd5f97fb5fa9ee34f909be Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 19 May 2020 17:40:09 +0100
Subject: [PATCH 132/176] Move update effect, convert appStatsReducer to effect
 (WIP)

---
 .../src/actions/relations-actions.ts          | 15 ++--
 .../src/store/cloud-foundry.store.module.ts   |  2 +
 .../src/store/effects/request.effects.ts      |  7 +-
 .../src/store}/effects/update-app-effects.ts  | 47 ++++++++--
 .../reducers/app-stats-request.reducer.ts     | 86 +++++++++----------
 .../store/src/actions/request.actions.ts      | 12 ---
 .../store/src/helpers/store-helpers.ts        |  1 -
 .../api-request-reducers.generator.ts         |  7 +-
 .../packages/store/src/store.module.ts        |  2 -
 .../packages/store/src/types/api.types.ts     |  1 -
 10 files changed, 101 insertions(+), 79 deletions(-)
 rename src/frontend/packages/{store/src => cloud-foundry/src/store}/effects/update-app-effects.ts (57%)

diff --git a/src/frontend/packages/cloud-foundry/src/actions/relations-actions.ts b/src/frontend/packages/cloud-foundry/src/actions/relations-actions.ts
index 7db107b837..f268cc8926 100644
--- a/src/frontend/packages/cloud-foundry/src/actions/relations-actions.ts
+++ b/src/frontend/packages/cloud-foundry/src/actions/relations-actions.ts
@@ -1,12 +1,17 @@
 import { Action } from '@ngrx/store';
 
-import {
-  APIResponse,
-  EntitiesPipelineAction,
-  EntitiesPipelineActionTypes,
-} from '../../../store/src/actions/request.actions';
+import { APIResponse } from '../../../store/src/actions/request.actions';
+import { PaginatedAction } from '../../../store/src/types/pagination.types';
+import { ICFAction } from '../../../store/src/types/request.types';
 import { ValidationResult } from '../entity-relations/entity-relations.types';
 
+type EntitiesPipelineAction = ICFAction | PaginatedAction;
+
+export const EntitiesPipelineActionTypes = {
+  VALIDATE: '[Validation] Starting',
+  COMPLETE: '[Validation] Completed',
+};
+
 export class CfValidateEntitiesStart implements Action {
   type = EntitiesPipelineActionTypes.VALIDATE;
   constructor(
diff --git a/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.store.module.ts b/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.store.module.ts
index 6179afe8da..cf172535cb 100644
--- a/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.store.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/cloud-foundry.store.module.ts
@@ -12,6 +12,7 @@ import { PermissionEffects, PermissionsEffects } from './effects/permissions.eff
 import { CfValidateEffects } from './effects/request.effects';
 import { RouteEffect } from './effects/route.effects';
 import { ServiceInstanceEffects } from './effects/service-instance.effects';
+import { UpdateAppEffects } from './effects/update-app-effects';
 
 @NgModule({
   imports: [
@@ -27,6 +28,7 @@ import { ServiceInstanceEffects } from './effects/service-instance.effects';
       PermissionEffects,
       ServiceInstanceEffects,
       AppEffects,
+      UpdateAppEffects,
       CfValidateEffects
     ])
   ]
diff --git a/src/frontend/packages/cloud-foundry/src/store/effects/request.effects.ts b/src/frontend/packages/cloud-foundry/src/store/effects/request.effects.ts
index b7f66a5710..9cd7107c35 100644
--- a/src/frontend/packages/cloud-foundry/src/store/effects/request.effects.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/effects/request.effects.ts
@@ -5,12 +5,15 @@ import { catchError, first, map, mergeMap, withLatestFrom } from 'rxjs/operators
 
 import { LoggerService } from '../../../../core/src/core/logger.service';
 import { SET_PAGE_BUSY } from '../../../../store/src/actions/pagination.actions';
-import { EntitiesPipelineActionTypes } from '../../../../store/src/actions/request.actions';
 import { rootUpdatingKey } from '../../../../store/src/reducers/api-request-reducer/types';
 import { getAPIRequestDataState } from '../../../../store/src/selectors/api.selectors';
 import { getPaginationState } from '../../../../store/src/selectors/pagination.selectors';
 import { UpdateCfAction } from '../../../../store/src/types/request.types';
-import { CfValidateEntitiesComplete, CfValidateEntitiesStart } from '../../actions/relations-actions';
+import {
+  CfValidateEntitiesComplete,
+  CfValidateEntitiesStart,
+  EntitiesPipelineActionTypes,
+} from '../../actions/relations-actions';
 import { CFAppState } from '../../cf-app-state';
 import { validateEntityRelations } from '../../entity-relations/entity-relations';
 
diff --git a/src/frontend/packages/store/src/effects/update-app-effects.ts b/src/frontend/packages/cloud-foundry/src/store/effects/update-app-effects.ts
similarity index 57%
rename from src/frontend/packages/store/src/effects/update-app-effects.ts
rename to src/frontend/packages/cloud-foundry/src/store/effects/update-app-effects.ts
index 31e13dc388..584be16007 100644
--- a/src/frontend/packages/store/src/effects/update-app-effects.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/effects/update-app-effects.ts
@@ -1,13 +1,12 @@
 import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
+import { Action } from '@ngrx/store';
 import { mergeMap } from 'rxjs/operators';
 
-import { AppMetadataTypes } from '../../../cloud-foundry/src/actions/app-metadata.actions';
-import { UPDATE_SUCCESS, UpdateExistingApplication } from '../../../cloud-foundry/src/actions/application.actions';
-import { cfEntityCatalog } from '../../../cloud-foundry/src/cf-entity-catalog';
-import { WrapperRequestActionSuccess } from '../types/request.types';
-
-// TODO: RC TWEAK/MOVE
+import { WrapperRequestActionSuccess } from '../../../../store/src/types/request.types';
+import { AppMetadataTypes } from '../../actions/app-metadata.actions';
+import { DeleteApplicationInstance, UPDATE_SUCCESS, UpdateExistingApplication } from '../../actions/application.actions';
+import { cfEntityCatalog } from '../../cf-entity-catalog';
 
 @Injectable()
 export class UpdateAppEffects {
@@ -45,6 +44,40 @@ export class UpdateAppEffects {
             break;
         }
       });
-      return actions;
+
+      return actions.concat(this.markAppStatsAsDeleted(updateAction));
     }));
+
+  private markAppStatsAsDeleted(action: UpdateExistingApplication): Action[] {
+    const actions = [];
+    // Only interest if we have the old and new app and either the app has been stopped or now contains zero instances
+    if (!action.newApplication || !action.existingApplication) {
+      return;
+    }
+    if (action.newApplication.state !== 'STOPPED' && action.newApplication.instances !== 0) {
+      return;
+    }
+    // TODO: RC 
+    // Delete root stat
+    // this.deleteState(action.guid)
+
+    // Delete each instance stat
+    const instances = action.existingApplication.instances || 0;
+    for (let i = 0; i < instances; i++) {
+      actions.push(this.deleteState(action.guid, i, action.endpointGuid));
+    }
+    return actions;
+  }
+
+  private deleteState(guid: string, instanceId: number = null, endpointGuid: string): Action {
+    return new WrapperRequestActionSuccess(
+      {
+        entities: {},
+        result: []
+      },
+      {
+        ...new DeleteApplicationInstance(guid, instanceId, endpointGuid)
+      }
+    )
+  }
 }
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/app-stats-request.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/app-stats-request.reducer.ts
index ab9cabad3d..34a3f086b4 100644
--- a/src/frontend/packages/cloud-foundry/src/store/reducers/app-stats-request.reducer.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/reducers/app-stats-request.reducer.ts
@@ -1,46 +1,46 @@
-import { UPDATE_SUCCESS, UpdateExistingApplication } from '../../actions/application.actions';
-import { IRequestEntityTypeState } from '../../../../store/src/app-state';
-import { RequestInfoState } from '../../../../store/src/reducers/api-request-reducer/types';
+// import { UPDATE_SUCCESS, UpdateExistingApplication } from '../../actions/application.actions';
+// import { IRequestEntityTypeState } from '../../../../store/src/app-state';
+// import { RequestInfoState } from '../../../../store/src/reducers/api-request-reducer/types';
 
-export function appStatsReducer(state: IRequestEntityTypeState<RequestInfoState>, action) {
-  switch (action.type) {
-    case UPDATE_SUCCESS:
-      const updateAction: UpdateExistingApplication = action.apiAction;
-      return markAppStatsAsDeleted(state, updateAction);
-    default:
-      return state;
-  }
-}
+// export function appStatsReducer(state: IRequestEntityTypeState<RequestInfoState>, action) {
+//   switch (action.type) {
+//     case UPDATE_SUCCESS:
+//       const updateAction: UpdateExistingApplication = action.apiAction;
+//       return markAppStatsAsDeleted(state, updateAction);
+//     default:
+//       return state;
+//   }
+// }
 
-function deleteAppStat(newState, key) {
-  const state = newState[key];
-  if (!state) {
-    return;
-  }
-  newState[key] = {
-    ...state,
-    deleting: {
-      ...state.deleting,
-      deleted: true,
-    }
-  };
-}
+// function deleteAppStat(newState, key) {
+//   const state = newState[key];
+//   if (!state) {
+//     return;
+//   }
+//   newState[key] = {
+//     ...state,
+//     deleting: {
+//       ...state.deleting,
+//       deleted: true,
+//     }
+//   };
+// }
 
-function markAppStatsAsDeleted(state: IRequestEntityTypeState<RequestInfoState>, action: UpdateExistingApplication) {
-  // Only interest if we have the old and new app and either the app has been stopped or now contains zero instances
-  if (!action.newApplication || !action.existingApplication) {
-    return state;
-  }
-  if (action.newApplication.state !== 'STOPPED' && action.newApplication.instances !== 0) {
-    return state;
-  }
-  const newState = { ...state };
-  // Delete root stat
-  deleteAppStat(newState, action.guid);
-  // Delete each instance stat
-  const instances = action.existingApplication.instances || 0;
-  for (let i = 0; i < instances; i++) {
-    deleteAppStat(newState, action.guid + '-' + i);
-  }
-  return newState;
-}
+// function markAppStatsAsDeleted(state: IRequestEntityTypeState<RequestInfoState>, action: UpdateExistingApplication) {
+//   // Only interest if we have the old and new app and either the app has been stopped or now contains zero instances
+//   if (!action.newApplication || !action.existingApplication) {
+//     return state;
+//   }
+//   if (action.newApplication.state !== 'STOPPED' && action.newApplication.instances !== 0) {
+//     return state;
+//   }
+//   const newState = { ...state };
+//   // Delete root stat
+//   deleteAppStat(newState, action.guid);
+//   // Delete each instance stat
+//   const instances = action.existingApplication.instances || 0;
+//   for (let i = 0; i < instances; i++) {
+//     deleteAppStat(newState, action.guid + '-' + i);
+//   }
+//   return newState;
+// }
diff --git a/src/frontend/packages/store/src/actions/request.actions.ts b/src/frontend/packages/store/src/actions/request.actions.ts
index c847e4d048..08694cbfcd 100644
--- a/src/frontend/packages/store/src/actions/request.actions.ts
+++ b/src/frontend/packages/store/src/actions/request.actions.ts
@@ -1,6 +1,4 @@
 import { NormalizedResponse } from '../types/api.types';
-import { PaginatedAction } from '../types/pagination.types';
-import { ICFAction } from '../types/request.types';
 
 export const ApiActionTypes = {
   API_REQUEST_START: 'API_REQUEST_START'
@@ -13,19 +11,9 @@ export const RequestTypes = {
   UPDATE: 'REQUEST_UPDATE'
 };
 
-export const EntitiesPipelineActionTypes = {
-  VALIDATE: '[Validation] Starting',
-  COMPLETE: '[Validation] Completed',
-};
-
-// TODO: RC TWEAK/MOVE ICFACTION
-export type EntitiesPipelineAction = ICFAction | PaginatedAction;
 
-// TODO: RC TWEAK/MOVE
 export class APIResponse {
   response: NormalizedResponse;
   totalResults: number;
   totalPages: number;
 }
-
-
diff --git a/src/frontend/packages/store/src/helpers/store-helpers.ts b/src/frontend/packages/store/src/helpers/store-helpers.ts
index d235f06cb4..15f69e72db 100644
--- a/src/frontend/packages/store/src/helpers/store-helpers.ts
+++ b/src/frontend/packages/store/src/helpers/store-helpers.ts
@@ -33,7 +33,6 @@ export function getFavoriteInfoObservable(store: Store<AppState>): Observable<IF
   );
 }
 
-// TODO: RC move to CF
 export const getRowMetadata = (entity: APIResource | MultiActionListEntity) => {
   if (entity instanceof MultiActionListEntity) {
     return entity.entity.metadata ? entity.entity.metadata.guid : null;
diff --git a/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts b/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts
index a30650d238..7f993949d8 100644
--- a/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts
@@ -1,17 +1,12 @@
 import { Action } from '@ngrx/store';
 
-import { appStatsEntityType } from '../../../cloud-foundry/src/cf-entity-types';
-import { CF_ENDPOINT_TYPE } from '../../../cloud-foundry/src/cf-types';
-import { appStatsReducer } from '../../../cloud-foundry/src/store/reducers/app-stats-request.reducer';
 import { IRequestEntityTypeState } from '../app-state';
-import { entityCatalog } from '../entity-catalog/entity-catalog';
 import { IRequestState } from '../types/entity.types';
 import { requestReducerFactory } from './api-request-reducer/request-reducer.factory';
 import { RequestInfoState } from './api-request-reducer/types';
 import { chainApiReducers, ExtraApiReducers, requestActions } from './api-request-reducers.generator.helpers';
 
 
-// TODO: RC TWEAK/MOVE
 /**
  * This module uses the request data reducer and request reducer factories to create
  * the reducers to be used when making http requests
@@ -19,7 +14,7 @@ import { chainApiReducers, ExtraApiReducers, requestActions } from './api-reques
 
 const baseRequestReducer = requestReducerFactory(requestActions);
 const extraReducers = {
-  [entityCatalog.getEntityKey(CF_ENDPOINT_TYPE, appStatsEntityType)]: [appStatsReducer]
+  // [entityCatalog.getEntityKey(CF_ENDPOINT_TYPE, appStatsEntityType)]: [appStatsReducer]// TODO: RC 
 } as ExtraApiReducers<IRequestEntityTypeState<RequestInfoState>>;
 const chainedReducers = chainApiReducers<IRequestEntityTypeState<RequestInfoState>>(baseRequestReducer, extraReducers);
 
diff --git a/src/frontend/packages/store/src/store.module.ts b/src/frontend/packages/store/src/store.module.ts
index 9c97589dc3..a29f7e5e41 100644
--- a/src/frontend/packages/store/src/store.module.ts
+++ b/src/frontend/packages/store/src/store.module.ts
@@ -16,7 +16,6 @@ import { SetClientFilterEffect } from './effects/set-client-filter.effect';
 import { SnackBarEffects } from './effects/snackBar.effects';
 import { SystemEffects } from './effects/system.effects';
 import { UAASetupEffect } from './effects/uaa-setup.effects';
-import { UpdateAppEffects } from './effects/update-app-effects';
 import { UserFavoritesEffect } from './effects/user-favorites-effect';
 import { UserProfileEffect } from './effects/user-profile.effects';
 import { UsersRolesEffects } from './effects/users-roles.effects';
@@ -38,7 +37,6 @@ import { AppReducersModule } from './reducers.module';
       AuthEffect,
       UAASetupEffect,
       EndpointsEffect,
-      UpdateAppEffects,
       PaginationEffects,
       ActionHistoryEffect,
       RouterEffect,
diff --git a/src/frontend/packages/store/src/types/api.types.ts b/src/frontend/packages/store/src/types/api.types.ts
index 0305640783..b61f650483 100644
--- a/src/frontend/packages/store/src/types/api.types.ts
+++ b/src/frontend/packages/store/src/types/api.types.ts
@@ -7,7 +7,6 @@ export interface EntityInfo<T = any> {
   entity: T;
 }
 
-// TODO: RC move to CF
 export interface APIResource<T = any> {
   metadata: APIResourceMetadata;
   entity: T;

From 303a11c802e9af80d62442ca9293b419a8d03dfb Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Wed, 20 May 2020 11:39:11 +0100
Subject: [PATCH 133/176] Fix autoscaler events page (#4304)

* Fix autoscaler events page
- events weren't showing due to earlier init of metrics list. fixed by adding extra checks
- access events as list when needed
- fixed custom metrics time window drop down in dark mode

* Fix typing
---
 .../autoscaler-tab-extension.component.html   |  4 +--
 .../autoscaler-tab-extension.component.ts     | 36 ++++++++++++-------
 .../src/store/app-autoscaler.types.ts         |  9 -----
 .../src/store/autoscaler-entity-generator.ts  |  9 ++---
 .../components/list/list.component.scss       |  8 -----
 .../metrics-range-selector.component.scss     |  3 --
 ...etrics-range-selector.component.theme.scss | 10 +++++-
 .../metrics-range-selector.service.ts         |  2 +-
 8 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html
index 5e44e8f544..2a20fe1798 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html
+++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.html
@@ -196,7 +196,7 @@
           </mat-card-header>
           <mat-card-content>
             <div class="app-metadata app-metadata-table">
-              <table mat-table [dataSource]="scalingHistory.resources">
+              <table mat-table [dataSource]="scalingHistory">
                 <ng-container matColumnDef="event">
                   <th mat-header-cell *matHeaderCellDef> Event </th>
                   <td mat-cell *matCellDef="let element"> Instances scaled
@@ -218,7 +218,7 @@
                 <tr mat-header-row *matHeaderRowDef="scalingHistoryColumns"></tr>
                 <tr mat-row *matRowDef="let row; columns: scalingHistoryColumns;"></tr>
               </table>
-              <div class="autoscaler-tab-table-no-record" *ngIf="scalingHistory.resources.length == 0">
+              <div class="autoscaler-tab-table-no-record" *ngIf="scalingHistory.length == 0">
                 No events.</div>
             </div>
           </mat-card-content>
diff --git a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
index 4536721329..dfee79bace 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/autoscaler-tab-extension/autoscaler-tab-extension.component.ts
@@ -22,6 +22,10 @@ import { EntityServiceFactory } from '../../../../store/src/entity-service-facto
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
 import { getPaginationObservables } from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
+import {
+  getCurrentPageRequestInfo,
+  PaginationObservables,
+} from '../../../../store/src/reducers/pagination-reducer/pagination-reducer.types';
 import { selectDeletionInfo } from '../../../../store/src/selectors/api.selectors';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { fetchAutoscalerInfo, isAutoscalerEnabled } from '../../core/autoscaler-helpers/autoscaler-available';
@@ -35,9 +39,9 @@ import {
 } from '../../store/app-autoscaler.actions';
 import {
   AppAutoscaleMetricChart,
+  AppAutoscalerEvent,
   AppAutoscalerMetricData,
   AppAutoscalerPolicyLocal,
-  AppAutoscalerScalingHistory,
   AppScalingTrigger,
 } from '../../store/app-autoscaler.types';
 import { appAutoscalerAppMetricEntityType, autoscalerEntityFactory } from '../../store/autoscaler-entity-factory';
@@ -72,10 +76,10 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
   metricTypes: string[] = AutoscalerConstants.MetricTypes;
 
   appAutoscalerPolicyService: EntityService<APIResource<AppAutoscalerPolicyLocal>>;
-  public appAutoscalerScalingHistoryService: EntityService<APIResource<AppAutoscalerScalingHistory>>;
+  public appAutoscalerScalingHistoryService: PaginationObservables<APIResource<AppAutoscalerEvent>>;
   appAutoscalerPolicy$: Observable<AppAutoscalerPolicyLocal>;
   appAutoscalerPolicySafe$: Observable<AppAutoscalerPolicyLocal>;
-  appAutoscalerScalingHistory$: Observable<AppAutoscalerScalingHistory>;
+  appAutoscalerScalingHistory$: Observable<AppAutoscalerEvent[]>;
   appAutoscalerAppMetricNames$: Observable<AppAutoscaleMetricChart[]>;
 
   public showNoPolicyMessage$: Observable<boolean>;
@@ -179,15 +183,20 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
       createEntityRelationPaginationKey(applicationEntityType, this.applicationService.appGuid, 'latest'),
       this.applicationService.appGuid,
       this.applicationService.cfGuid,
-      true,
+      false,
       this.paramsHistory
     );
-    this.appAutoscalerScalingHistoryService = this.entityServiceFactory.create(
-      this.applicationService.appGuid,
-      this.scalingHistoryAction
-    );
-    this.appAutoscalerScalingHistory$ = this.appAutoscalerScalingHistoryService.entityObs$.pipe(
-      map(({ entity }) => entity && entity.entity),
+    this.appAutoscalerScalingHistoryService = getPaginationObservables({
+      store: this.store,
+      action: this.scalingHistoryAction,
+      paginationMonitor: this.paginationMonitorFactory.create(
+        this.scalingHistoryAction.paginationKey,
+        this.scalingHistoryAction,
+        true
+      ),
+    }, true);
+    this.appAutoscalerScalingHistory$ = this.appAutoscalerScalingHistoryService.entities$.pipe(
+      map(entities => entities.map(entity => entity.entity)),
       publishReplay(1),
       refCount()
     );
@@ -197,7 +206,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
       this.appAutoscalerPolicy$,
       this.appAutoscalerScalingHistory$
     ]).pipe(
-      map(([policy, history]) => !!policy || (!!history && history.total_results > 0)),
+      map(([policy, history]) => !!policy || (!!history && history.length > 0)),
       publishReplay(1),
       refCount()
     );
@@ -206,7 +215,7 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
       this.appAutoscalerPolicy$,
       this.appAutoscalerScalingHistory$
     ]).pipe(
-      map(([policy, history]) => !policy && (!history || history.total_results === 0)),
+      map(([policy, history]) => !policy && (!history || history.length === 0)),
       publishReplay(1),
       refCount()
     );
@@ -261,7 +270,8 @@ export class AutoscalerTabExtensionComponent implements OnInit, OnDestroy {
     if (this.appAutoscalerScalingHistoryErrorSub) {
       this.appAutoscalerScalingHistoryErrorSub.unsubscribe();
     }
-    this.appAutoscalerScalingHistoryErrorSub = this.appAutoscalerScalingHistoryService.entityMonitor.entityRequest$.pipe(
+    this.appAutoscalerScalingHistoryErrorSub = this.appAutoscalerScalingHistoryService.pagination$.pipe(
+      map(pagination => getCurrentPageRequestInfo(pagination)),
       filter(request => !!request.error),
       map(request => request.message),
       distinctUntilChanged(),
diff --git a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts
index bfb1e3c860..fca0b9fcbb 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/app-autoscaler.types.ts
@@ -69,15 +69,6 @@ export interface AppAutoscalerHealth {
   };
 }
 
-export interface AppAutoscalerScalingHistory {
-  next_url: string;
-  prev_url: string;
-  page: number;
-  resources: AppAutoscalerEvent[];
-  total_pages: number;
-  total_results: number;
-}
-
 export interface AppAutoscalerEvent {
   app_id: string;
   error: string;
diff --git a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
index 62b7334098..20944089d2 100644
--- a/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
+++ b/src/frontend/packages/cf-autoscaler/src/store/autoscaler-entity-generator.ts
@@ -9,12 +9,7 @@ import {
 import { IStratosEndpointDefinition } from '../../../store/src/entity-catalog/entity-catalog.types';
 import { APIResource } from '../../../store/src/types/api.types';
 import { IFavoriteMetadata } from '../../../store/src/types/user-favorites.types';
-import {
-  AppAutoscalerHealth,
-  AppAutoscalerPolicy,
-  AppAutoscalerScalingHistory,
-  AppScalingTrigger,
-} from './app-autoscaler.types';
+import { AppAutoscalerEvent, AppAutoscalerHealth, AppAutoscalerPolicy, AppScalingTrigger } from './app-autoscaler.types';
 import {
   appAutoscalerAppMetricEntityType,
   appAutoscalerCredentialEntityType,
@@ -101,7 +96,7 @@ function generateScalingEntity(endpointDefinition: IStratosEndpointDefinition) {
     schema: autoscalerEntityFactory(appAutoscalerScalingHistoryEntityType),
     endpoint: endpointDefinition
   };
-  return new StratosCatalogEntity<IFavoriteMetadata, APIResource<AppAutoscalerScalingHistory>>(definition);
+  return new StratosCatalogEntity<IFavoriteMetadata, APIResource<AppAutoscalerEvent>>(definition);
 }
 
 function generateAppMetricEntity(endpointDefinition: IStratosEndpointDefinition) {
diff --git a/src/frontend/packages/core/src/shared/components/list/list.component.scss b/src/frontend/packages/core/src/shared/components/list/list.component.scss
index d79a513a6a..1e2bd8a3b6 100644
--- a/src/frontend/packages/core/src/shared/components/list/list.component.scss
+++ b/src/frontend/packages/core/src/shared/components/list/list.component.scss
@@ -85,14 +85,6 @@
         padding: 10px 10px 10px 0;
       }
 
-      &--metrics-range {
-        padding-left: 10px;
-
-        app-metrics-range-selector {
-          padding-left: 10px;
-        }
-      }
-
       &--multi-actions {
         button {
           &:first-of-type {
diff --git a/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.scss b/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.scss
index 9175080272..0bcddcdc56 100644
--- a/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.scss
+++ b/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.scss
@@ -6,7 +6,6 @@
   display: flex;
 
   &__overlay {
-    background-color: rgba(0, 0, 0, 0);
     left: 0;
     overflow: hidden;
     position: absolute;
@@ -29,7 +28,6 @@
     }
 
     &-show {
-      background-color: rgba(0, 0, 0, .6);
       transition-delay: 0s;
       visibility: visible;
 
@@ -39,7 +37,6 @@
     }
 
     &-inner {
-      box-shadow: -4px 3px 41px -1px rgba(0, 0, 0, .36);
       padding: 50px;
       position: relative;
       transform: translateY(-100%);
diff --git a/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.theme.scss b/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.theme.scss
index bc0be4568d..47911410fe 100644
--- a/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.theme.scss
+++ b/src/frontend/packages/core/src/shared/components/metrics-range-selector/metrics-range-selector.component.theme.scss
@@ -1,10 +1,18 @@
 @import '~@angular/material/theming';
 @mixin metrics-range-selector-theme($theme, $app-theme) {
   $primary: map-get($theme, primary);
+  $background-color: map-get($app-theme, app-background-color);
+  $foreground: map-get($theme, foreground);
+
   .metrics-range-selector {
     &__overlay {
+      background-color: $background-color;
+      &-show {
+        background-color: rgba($background-color, .6);
+      }
       &-inner {
-        background-color: mat-contrast($primary, 500);
+        background-color: $background-color;
+        box-shadow: -4px 3px 41px -1px rgba(0, 0, 0, .36);
       }
     }
   }
diff --git a/src/frontend/packages/core/src/shared/services/metrics-range-selector.service.ts b/src/frontend/packages/core/src/shared/services/metrics-range-selector.service.ts
index 321129e196..ee5b4e64c0 100644
--- a/src/frontend/packages/core/src/shared/services/metrics-range-selector.service.ts
+++ b/src/frontend/packages/core/src/shared/services/metrics-range-selector.service.ts
@@ -75,7 +75,7 @@ export class MetricsRangeSelectorService {
         };
       } else {
         return {
-          timeRange: metrics.query.params && metrics.query.params.window ?
+          timeRange: metrics.query && metrics.query.params && metrics.query.params.window ?
             times.find(time => time.value === metrics.query.params.window) :
             this.getDefaultTimeRange(times)
         };

From f804edf17d605217ad4b7ef0593f15d5a8abe181 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 20 May 2020 14:11:06 +0100
Subject: [PATCH 134/176] Remove cf-auth, this was never used

---
 .../components/cf-auth/cf-auth.module.ts      |  14 --
 .../cf-auth/cf-auth.service.spec.ts           |  22 ---
 .../components/cf-auth/cf-auth.service.ts     | 162 ------------------
 .../components/cf-auth/cf-auth.types.ts       |  80 ---------
 .../cf-auth/checkers/application-access.ts    |  71 --------
 .../cf-auth/checkers/base-access.ts           |  23 ---
 .../cf-auth/checkers/organization-access.ts   |  67 --------
 .../cf-auth/checkers/route-access.ts          |  66 -------
 .../checkers/service-instance-access.ts       |  63 -------
 .../cf-auth/checkers/space-access.ts          |  60 -------
 .../cf-auth/checkers/users-assign-access.ts   |  45 -----
 .../shared/components/cf-auth/principal.ts    |  88 ----------
 .../packages/core/src/shared/shared.module.ts |   2 -
 13 files changed, 763 deletions(-)
 delete mode 100644 src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.module.ts
 delete mode 100644 src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.service.spec.ts
 delete mode 100644 src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.service.ts
 delete mode 100644 src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.types.ts
 delete mode 100644 src/frontend/packages/core/src/shared/components/cf-auth/checkers/application-access.ts
 delete mode 100644 src/frontend/packages/core/src/shared/components/cf-auth/checkers/base-access.ts
 delete mode 100644 src/frontend/packages/core/src/shared/components/cf-auth/checkers/organization-access.ts
 delete mode 100644 src/frontend/packages/core/src/shared/components/cf-auth/checkers/route-access.ts
 delete mode 100644 src/frontend/packages/core/src/shared/components/cf-auth/checkers/service-instance-access.ts
 delete mode 100644 src/frontend/packages/core/src/shared/components/cf-auth/checkers/space-access.ts
 delete mode 100644 src/frontend/packages/core/src/shared/components/cf-auth/checkers/users-assign-access.ts
 delete mode 100644 src/frontend/packages/core/src/shared/components/cf-auth/principal.ts

diff --git a/src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.module.ts b/src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.module.ts
deleted file mode 100644
index 45af97b356..0000000000
--- a/src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.module.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { CfAuthService } from './cf-auth.service';
-
-@NgModule({
-  imports: [
-    CommonModule
-  ],
-  declarations: [],
-  providers: [
-    CfAuthService
-  ]
-})
-export class CfAuthModule { }
diff --git a/src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.service.spec.ts b/src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.service.spec.ts
deleted file mode 100644
index 312a2d8430..0000000000
--- a/src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.service.spec.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { inject, TestBed } from '@angular/core/testing';
-
-import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
-import { createBasicStoreModule } from '@stratos/store/testing';
-import { CfAuthService } from './cf-auth.service';
-
-describe('CfAuthService', () => {
-  beforeEach(() => {
-
-    TestBed.configureTestingModule({
-      providers: [CfAuthService],
-      imports: [
-        CoreTestingModule,
-        createBasicStoreModule(),
-      ]
-    });
-  });
-
-  it('should be created', inject([CfAuthService], (service: CfAuthService) => {
-    expect(service).toBeTruthy();
-  }));
-});
diff --git a/src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.service.ts b/src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.service.ts
deleted file mode 100644
index 05bbb258ad..0000000000
--- a/src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.service.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-import { Injectable } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
-
-import { AppState, IRequestEntityTypeState } from '../../../../../store/src/app-state';
-import { selectSessionData } from '../../../../../store/src/reducers/auth.reducer';
-import { endpointEntitiesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
-import { SessionData } from '../../../../../store/src/types/auth.types';
-import { EndpointModel } from '../../../../../store/src/types/endpoint.types';
-import { CFAuthAction, CFAuthResource, CfAuthUserSummary, CfAuthUserSummaryMapped, CFFeatureFlags } from './cf-auth.types';
-import { CfAuthPrinciple } from './principal';
-
-// TODO: RC REMOVE
-/**
- * NOTE - WIP
- * This is the port of basic cf auth from v1. It's missing a number of things
- * - Fetch the correct data, store in the store and fetch from store
- * - Handling fetch wait and error
- * - Calculate read-only admin and group auditor values from user scope and intergrate with principals (new, not in V1)
- * - Determine org or space 'suspended' state and intergrate with principals
- */
-@Injectable()
-export class CfAuthService {
-  endpoints$: Observable<IRequestEntityTypeState<EndpointModel>>;
-  sessionData$: Observable<SessionData>;
-  // WIP: RC Initialise previously released promise when all init requests finished. For the time being use this, then make selector
-  initialised$: Observable<boolean>;
-  // WIP: RC This should come from the store and populated using standard entity/non entity methods
-  featureFlags$: {
-    [key: string]: Observable<CFFeatureFlags>
-  };
-  // WIP: RC This should be in the store
-  principals: {
-    [key: string]: CfAuthPrinciple;
-  };
-  // WIP: RC This should come from the store and populated using standard entity/non entity methods
-  userSummaries$: {
-    [endpointGuid: string]: {
-      [userGuid: string]: Observable<CfAuthUserSummary>;
-    };
-  };
-
-
-  // WIP: Async/Sync calls. Need to review once store stuff done
-  session: SessionData;
-
-  constructor(private store: Store<AppState>) {
-    this.endpoints$ = store.select(endpointEntitiesSelector);
-    this.sessionData$ = store.select<SessionData>(selectSessionData());
-  }
-
-  initialise() {
-    observableCombineLatest(
-      this.endpoints$.pipe(take(1)),
-      this.sessionData$,
-    ).subscribe(([endpoints, session]: [IRequestEntityTypeState<EndpointModel>, SessionData]) => {
-      this.session = session;
-      Object.values(endpoints).forEach(endpoint => {
-        if (endpoint.connectionStatus !== 'connected') {
-          // User hasn't connected to this endpoint
-          return;
-        } else if (this.isInitialized(endpoint.guid)) {
-          // We have already initialised for this endpoint + user
-          return;
-        }
-        this.initializeForEndpoint(endpoint.guid, session);
-      });
-    });
-  }
-
-  /**
-   * is user allowed the certain action
-   */
-  isAllowed(endpointGuid: string, resourceType: CFAuthResource, action: CFAuthAction, ...args: any[]): boolean {
-    if (!this.isInitialized(endpointGuid)) {
-      return false;
-    }
-    return this.principals[endpointGuid].isAllowed.apply(this.principals[endpointGuid], args);
-  }
-
-  remove(endpointGuid) {
-    delete this.principals[endpointGuid];
-  }
-
-  /**
-   * convenience method to determine if the user has rights to execute the action against the resource
-   * in the organization or any of the organization's spaces
-   */
-  isOrgOrSpaceActionableByResource(endpointGuid: string, orgGuid: string, spaceGuids: string[], action: CFAuthAction): boolean {
-    // Is the organization valid?
-    if (this.isAllowed(endpointGuid, CFAuthResource.organization, action, orgGuid)) {
-      return true;
-    } else {
-      // Is any of the organization's spaces valid?
-      for (const spaceGuid in spaceGuids) {
-        if (this.isAllowed(endpointGuid, CFAuthResource.space, action, spaceGuid, orgGuid)) {
-          return true;
-        }
-      }
-      return false;
-    }
-  }
-
-  /**
-   * Is User Admin in endpoint
-   */
-  isAdmin(endpointGuid: string): boolean {
-    if (!this.isInitialized(endpointGuid)) {
-      return false;
-    }
-    return this.principals[endpointGuid].isAdmin;
-  }
-
-  private isInitialized(endpointGuid: string): boolean {
-    let initialised = !!this.principals[endpointGuid];
-
-    if (this.session.user && initialised) {
-      initialised = this.session.endpoints.cf[endpointGuid].user.guid === this.session.user.guid;
-    }
-    return !!initialised;
-  }
-
-  private initializeForEndpoint(endpointGuid: string, sessionData: SessionData) {
-    this.principals[endpointGuid] = null;
-    const cfUserGuid = sessionData.endpoints.cf[endpointGuid].user.guid;
-    const isAdmin = sessionData.endpoints.cf[endpointGuid].user.admin;
-
-    if (isAdmin) {
-      // WIP: RC Fetch user role data using the user summary endpoint
-      // User is an admin, therefore, we will use the more efficient userSummary request
-    } else {
-      // WIP: RC Fetch user role data using seperate org/space requests
-      // promises = promises.concat(_addOrganisationRolePromisesForUser(endpointGuid, userId));
-      // promises = promises.concat(_addSpaceRolePromisesForUser(endpointGuid, userId));
-    }
-
-    observableCombineLatest(
-      this.sessionData$,
-      this.featureFlags$[endpointGuid],
-      this.userSummaries$[endpointGuid][cfUserGuid],
-    ).pipe(take(1)).subscribe(([session, featureFlags, userSummary]: [SessionData, CFFeatureFlags, CfAuthUserSummary]) => {
-      const mappedSummary: CfAuthUserSummaryMapped = {
-        organizations: {
-          audited: userSummary.audited_organizations,
-          billingManaged: userSummary.billing_managed_organizations,
-          managed: userSummary.managed_organizations,
-          // User is a user in all these orgs
-          all: userSummary.organizations
-        },
-        spaces: {
-          audited: userSummary.audited_spaces,
-          managed: userSummary.managed_spaces,
-          // User is a developer in this spaces
-          all: userSummary.spaces
-        }
-      };
-      this.principals[endpointGuid] = new CfAuthPrinciple(cfUserGuid, session, mappedSummary, featureFlags);
-    });
-  }
-
-}
diff --git a/src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.types.ts b/src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.types.ts
deleted file mode 100644
index 5338ff9d32..0000000000
--- a/src/frontend/packages/core/src/shared/components/cf-auth/cf-auth.types.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-export enum CFAuthResource {
-  space,
-  user,
-  space_quota_definition,
-  user_provided_service_instance,
-  managed_service_instance,
-  service_instance,
-  organization,
-  application,
-  domain,
-  route
-}
-
-export enum CFAuthAction {
-  create,
-  update,
-  delete,
-  rename
-}
-
-export enum CFFeatureFlagTypes {
-  user_org_creation = 'user_org_creation',
-  private_domain_creation = 'private_domain_creation',
-  app_bits_upload = 'app_bits_upload',
-  app_scaling = 'app_scaling',
-  route_creation = 'route_creation',
-  service_instance_creation = 'service_instance_creation',
-  diego_docker = 'diego_docker',
-  set_roles_by_username = 'set_roles_by_username',
-  unset_roles_by_username = 'unset_roles_by_username',
-  task_creation = 'task_creation',
-  env_var_visibility = 'env_var_visibility',
-  space_scoped_private_broker_creation = 'space_scoped_private_broker_creation',
-  space_developer_env_var_visibility = 'space_developer_env_var_visibility',
-  service_instance_sharing = 'service_instance_sharing',
-}
-
-export interface CFFeatureFlags {
-  [type: string]: boolean;
-}
-
-export interface CfAuthUserSummary {
-  // Org User
-  organizations: string[];
-  // Org Manager
-  managed_organizations: string[];
-  // Org Billing Manager
-  billing_managed_organizations: string[];
-  // Space Auditor
-  audited_organizations: string[];
-  // Space Dev
-  spaces: string[];
-  // Space Manager
-  managed_spaces: string[];
-  // Space Autditor
-  audited_spaces: string[];
-}
-
-export interface CfAuthUserSummaryMapped {
-  organizations: {
-    audited: string[],
-    billingManaged: string[],
-    managed: string[],
-    // User is a user in all these orgs
-    all: string[]
-  };
-  spaces: {
-    audited: string[],
-    managed: string[],
-    // User is a developer in this spaces
-    all: string[]
-  };
-}
-
-export interface CFAuthChecker {
-  create: (spaceGuid?: string, orgGuid?: string) => boolean;
-  update: (spaceGuid?: string, orgGuid?: string, isSpace?: boolean) => boolean;
-  delete: (spaceGuid?: string, orgGuid?: string) => boolean;
-  canHandle: (CFAuthResources) => boolean;
-}
diff --git a/src/frontend/packages/core/src/shared/components/cf-auth/checkers/application-access.ts b/src/frontend/packages/core/src/shared/components/cf-auth/checkers/application-access.ts
deleted file mode 100644
index 073fc5b114..0000000000
--- a/src/frontend/packages/core/src/shared/components/cf-auth/checkers/application-access.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { CFAuthChecker, CFAuthResource } from '../cf-auth.types';
-import { CfAuthPrinciple } from '../principal';
-import { CfAuthBaseAccess } from './base-access';
-
-export class CFAuthCheckerApplication extends CfAuthBaseAccess implements CFAuthChecker {
-
-  /**
-   *
-   */
-  constructor(private principal: CfAuthPrinciple) {
-    super(principal);
-
-  }
-
-  /**
-   * User can deploy apps if:
-   * 1. User is an admin
-   * 2. User is a space developer
-   * @param  spaceGuid GUID of the space where the application resides
-   */
-  create(spaceGuid: string): boolean {
-
-    // Admin
-    if (super.baseCreate()) {
-      return true;
-    }
-
-    // If user is developer in space app belongs to
-    return super.doesContainGuid(this.principal.userSummary.spaces.all, spaceGuid);
-  }
-
-  /**
-   * User can manage apps if:
-   * 1. User is an admin
-   * 2. User is a space developer
-   * @param spaceGuid GUID of the space where the application resides
-   */
-  update(spaceGuid: string): boolean {
-    // Admin
-    if (super.baseUpdate()) {
-      return true;
-    }
-
-    // If user is developer in space app belongs to
-    return super.doesContainGuid(this.principal.userSummary.spaces.all, spaceGuid);
-  }
-
-  /**
-   * User can delete apps if:
-   * 1. User is an admin
-   * 2. User is a space developer
-   * @param spaceGuid GUID of the space where the application resides
-   */
-  delete(spaceGuid: string): boolean {
-    // Admin
-    if (super.baseUpdate()) {
-      return true;
-    }
-
-    // If user is developer in space app belongs to
-    return super.doesContainGuid(this.principal.userSummary.spaces.all, spaceGuid);
-  }
-
-  /**
-   * Specifies that this ACL checker can handle `application` permission
-   * @param resource - String representing the resource
-   */
-  canHandle(resource: CFAuthResource): boolean {
-    return resource === CFAuthResource.application;
-  }
-}
diff --git a/src/frontend/packages/core/src/shared/components/cf-auth/checkers/base-access.ts b/src/frontend/packages/core/src/shared/components/cf-auth/checkers/base-access.ts
deleted file mode 100644
index 3205471f75..0000000000
--- a/src/frontend/packages/core/src/shared/components/cf-auth/checkers/base-access.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { CfAuthPrinciple } from '../principal';
-export class CfAuthBaseAccess {
-
-  constructor(private basePrincipal: CfAuthPrinciple) { }
-
-  baseCreate() {
-    return this.basePrincipal.isAdmin;
-  }
-
-  baseUpdate() {
-    return this.basePrincipal.isAdmin;
-  }
-
-  baseDelete() {
-    return this.basePrincipal.isAdmin;
-  }
-
-  protected doesContainGuid(array, guid): boolean {
-    return !!array.find((entity) => {
-      return entity.metadata.guid;
-    });
-  }
-}
diff --git a/src/frontend/packages/core/src/shared/components/cf-auth/checkers/organization-access.ts b/src/frontend/packages/core/src/shared/components/cf-auth/checkers/organization-access.ts
deleted file mode 100644
index 50231cc678..0000000000
--- a/src/frontend/packages/core/src/shared/components/cf-auth/checkers/organization-access.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { CFAuthChecker, CFAuthResource, CFFeatureFlagTypes } from '../cf-auth.types';
-import { CfAuthPrinciple } from '../principal';
-import { CfAuthBaseAccess } from './base-access';
-
-export class CFAuthCheckerOrganization extends CfAuthBaseAccess implements CFAuthChecker {
-
-  /**
-   *
-   */
-  constructor(private principal: CfAuthPrinciple) {
-    super(principal);
-  }
-
-  /**
-   * Users can create an organization if:
-   * 1. User is and admin
-   * 2. the `user_org_creation` feature flag is enabled
-   */
-  create(orgGuid: string): boolean {
-
-    // Admin
-    if (super.baseCreate()) {
-      return true;
-    }
-
-    // If user is developer in space app belongs to
-    return this.principal.hasAccessTo(CFFeatureFlagTypes.user_org_creation);
-  }
-
-  /**
-   * Users can update an organization if:
-   * 1. User is and admin
-   * 2. is Org Manager
-   */
-  update(orgGuid: string): boolean {
-    // Admin
-    if (super.baseUpdate()) {
-      return true;
-    }
-
-    // If user is manager of org
-    return super.doesContainGuid(this.principal.userSummary.organizations.managed, orgGuid);
-  }
-
-  /**
-   * @description Users can delete an organization if:
-   * 1. User is and admin
-   * 2. is Org Manager
-   */
-  delete(orgGuid: string): boolean {
-    // Admin
-    if (super.baseDelete()) {
-      return true;
-    }
-
-    // If user is manager of org
-    return super.doesContainGuid(this.principal.userSummary.organizations.managed, orgGuid);
-  }
-
-  /**
-   * Specifies that this ACL checker can handle `application` permission
-   * @param resource - String representing the resource
-   */
-  canHandle(resource: CFAuthResource): boolean {
-    return resource === CFAuthResource.organization;
-  }
-}
diff --git a/src/frontend/packages/core/src/shared/components/cf-auth/checkers/route-access.ts b/src/frontend/packages/core/src/shared/components/cf-auth/checkers/route-access.ts
deleted file mode 100644
index 22d4de8403..0000000000
--- a/src/frontend/packages/core/src/shared/components/cf-auth/checkers/route-access.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { CFAuthChecker, CFAuthResource, CFFeatureFlagTypes } from '../cf-auth.types';
-import { CfAuthPrinciple } from '../principal';
-import { CfAuthBaseAccess } from './base-access';
-
-export class CFAuthCheckerRoute extends CfAuthBaseAccess implements CFAuthChecker {
-
-  /**
-   *
-   */
-  constructor(private principal: CfAuthPrinciple) {
-    super(principal);
-
-  }
-
-  /**
-   * User can create a route if:
-   * 1. User is admin
-   * 2. User is a space developer AND route_creation feature flag is turned on
-   */
-  create(spaceGuid: string): boolean {
-
-    // Admin
-    if (super.baseCreate()) {
-      return true;
-    }
-
-    // If user is developer in space app belongs to
-    return super.doesContainGuid(this.principal.userSummary.spaces.all, spaceGuid) &&
-      this.principal.hasAccessTo(CFFeatureFlagTypes.route_creation);
-  }
-
-  /**
-   * User can manage apps if:
-   * 1. User is an admin
-   * 2. User is a space developer
-   */
-  update(spaceGuid: string): boolean {
-    // Admin
-    if (super.baseUpdate()) {
-      return true;
-    }
-
-    return super.doesContainGuid(this.principal.userSummary.spaces.all, spaceGuid);
-  }
-
-  /**
-   * User can delete apps if:
-   * 1. User is an admin
-   * 2. User is a space developer
-   */
-  delete(spaceGuid: string): boolean {
-    // Admin
-    if (super.baseUpdate()) {
-      return true;
-    }
-
-    return super.doesContainGuid(this.principal.userSummary.spaces.all, spaceGuid);
-  }
-
-  /**
-   * Specifies that this ACL checker can handle `application` permission
-   */
-  canHandle(resource: CFAuthResource): boolean {
-    return resource === CFAuthResource.route;
-  }
-}
diff --git a/src/frontend/packages/core/src/shared/components/cf-auth/checkers/service-instance-access.ts b/src/frontend/packages/core/src/shared/components/cf-auth/checkers/service-instance-access.ts
deleted file mode 100644
index 842e6086ac..0000000000
--- a/src/frontend/packages/core/src/shared/components/cf-auth/checkers/service-instance-access.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { CFAuthChecker, CFAuthResource, CFFeatureFlagTypes } from '../cf-auth.types';
-import { CfAuthPrinciple } from '../principal';
-import { CfAuthBaseAccess } from './base-access';
-
-export class CFAuthCheckerServiceInstance extends CfAuthBaseAccess implements CFAuthChecker {
-
-  constructor(private principal: CfAuthPrinciple) {
-    super(principal);
-  }
-
-  /**
-   * A User is can create a service if:
-   * 1. User is an admin
-   * 2. Is a space developer and the feature flag is enabled
-   */
-  create(spaceGuid: string): boolean {
-
-    // If user is developer in space the service instances will
-    // belong to and the service_instance_creation flag is set
-    // Admin
-    if (super.baseCreate()) {
-      return true;
-    }
-
-    return super.doesContainGuid(this.principal.userSummary.spaces.all, spaceGuid) &&
-      this.principal.hasAccessTo(CFFeatureFlagTypes.service_instance_creation);
-  }
-
-  /**
-   * User can update a service instance if:
-   * 1. User is an admin
-   * 2. or a space developer
-   */
-  update(spaceGuid: string): boolean {
-    // Admin
-    if (super.baseUpdate()) {
-      return true;
-    }
-
-    return super.doesContainGuid(this.principal.userSummary.spaces.all, spaceGuid);
-  }
-
-  /**
-   * User can delete a service instance if:
-   * 1. They are an admin
-   * 2. or they are a space developer
-   */
-  delete(spaceGuid: string): boolean {
-    // Admin
-    if (super.baseUpdate()) {
-      return true;
-    }
-
-    return super.doesContainGuid(this.principal.userSummary.spaces.all, spaceGuid);
-  }
-
-  /**
-   * Specifies that this ACL checker can handle `application` permission
-   */
-  canHandle(resource: CFAuthResource): boolean {
-    return resource === CFAuthResource.managed_service_instance;
-  }
-}
diff --git a/src/frontend/packages/core/src/shared/components/cf-auth/checkers/space-access.ts b/src/frontend/packages/core/src/shared/components/cf-auth/checkers/space-access.ts
deleted file mode 100644
index f1ceea8a6f..0000000000
--- a/src/frontend/packages/core/src/shared/components/cf-auth/checkers/space-access.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { CFAuthChecker, CFAuthResource } from '../cf-auth.types';
-import { CfAuthPrinciple } from '../principal';
-import { CfAuthBaseAccess } from './base-access';
-
-export class CFAuthCheckerSpace extends CfAuthBaseAccess implements CFAuthChecker {
-
-  constructor(private principal: CfAuthPrinciple) {
-    super(principal);
-  }
-
-  /**
-   * User can create a space if:
-   * 1. User is an Admin
-   * 2. User is an Org Manager
-   */
-  create(spaceGuid: string): boolean {
-    if (super.baseCreate()) {
-      return true;
-    }
-
-    return super.doesContainGuid(this.principal.userSummary.organizations.managed, spaceGuid);
-  }
-
-  /**
-   * User can update a space if:
-   * 1. User is an admin
-   * 2. User is org manager
-   * 3. user is space manager
-   */
-  update(spaceGuid: string, orgGuid: string): boolean {
-    // Admin
-    if (super.baseUpdate()) {
-      return true;
-    }
-
-    return super.doesContainGuid(this.principal.userSummary.organizations.managed, orgGuid) ||
-      super.doesContainGuid(this.principal.userSummary.spaces.managed, spaceGuid);
-  }
-
-  /**
-   * User can delete space if:
-   * 1. user is an admin
-   * 2. user is the org manager
-   */
-  delete(orgGuid: string): boolean {
-    // Admin
-    if (super.baseUpdate()) {
-      return true;
-    }
-
-    return super.doesContainGuid(this.principal.userSummary.organizations.managed, orgGuid);
-  }
-
-  /**
-   * Specifies that this ACL checker can handle `application` permission
-   */
-  canHandle(resource: CFAuthResource): boolean {
-    return resource === CFAuthResource.space;
-  }
-}
diff --git a/src/frontend/packages/core/src/shared/components/cf-auth/checkers/users-assign-access.ts b/src/frontend/packages/core/src/shared/components/cf-auth/checkers/users-assign-access.ts
deleted file mode 100644
index 306859b618..0000000000
--- a/src/frontend/packages/core/src/shared/components/cf-auth/checkers/users-assign-access.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { CFAuthChecker, CFAuthResource } from '../cf-auth.types';
-import { CfAuthPrinciple } from '../principal';
-import { CfAuthBaseAccess } from './base-access';
-
-export class CFAuthCheckerUser extends CfAuthBaseAccess implements CFAuthChecker {
-
-  constructor(private principal: CfAuthPrinciple) {
-    super(principal);
-  }
-
-  create(): boolean {
-    return false;
-  }
-
-  /**
-   * User can update a space if:
-   * 1. User is an admin
-   * 2. User is org manager
-   * 3. user is space manager
-   */
-  update(spaceGuid: string, orgGuid: string, isSpace: boolean): boolean {
-    // Admin
-    if (super.baseUpdate()) {
-      return true;
-    }
-
-    if (isSpace) {
-      return super.doesContainGuid(this.principal.userSummary.organizations.managed, orgGuid) ||
-        super.doesContainGuid(this.principal.userSummary.spaces.managed, spaceGuid);
-    } else {
-      return super.doesContainGuid(this.principal.userSummary.organizations.managed, orgGuid);
-    }
-  }
-
-  delete(): boolean {
-    return false;
-  }
-
-  /**
-   * Specifies that this ACL checker can handle `application` permission
-   */
-  canHandle(resource: CFAuthResource): boolean {
-    return resource === CFAuthResource.user;
-  }
-}
diff --git a/src/frontend/packages/core/src/shared/components/cf-auth/principal.ts b/src/frontend/packages/core/src/shared/components/cf-auth/principal.ts
deleted file mode 100644
index e1b6e615ef..0000000000
--- a/src/frontend/packages/core/src/shared/components/cf-auth/principal.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { SessionData } from '../../../../../store/src/types/auth.types';
-import {
-  CFAuthAction,
-  CFAuthChecker,
-  CFAuthResource,
-  CfAuthUserSummaryMapped,
-  CFFeatureFlags,
-  CFFeatureFlagTypes,
-} from './cf-auth.types';
-import { CFAuthCheckerApplication } from './checkers/application-access';
-import { CFAuthCheckerOrganization } from './checkers/organization-access';
-import { CFAuthCheckerRoute } from './checkers/route-access';
-import { CFAuthCheckerServiceInstance } from './checkers/service-instance-access';
-import { CFAuthCheckerSpace } from './checkers/space-access';
-import { CFAuthCheckerUser } from './checkers/users-assign-access';
-
-export class CfAuthPrinciple {
-
-  checkers: any[];
-
-  isAdmin: boolean;
-  isAdminReadOnly: boolean;
-  isGlobalAuditor: boolean;
-
-
-  constructor(
-    private endpointGuid: string,
-    private session: SessionData,
-    public userSummary: CfAuthUserSummaryMapped,
-    private featureFlags: CFFeatureFlags) {
-    this.isAdmin = session.endpoints.cf[endpointGuid].user.admin;
-    this.isAdminReadOnly = false; // WIP: RC Calculate according to scope
-    this.isGlobalAuditor = false; // WIP: RC Calculate according to scope
-  }
-
-  /**
-   * Does user have access to operation based on feature flags
-   */
-  hasAccessTo(operation: CFFeatureFlagTypes): boolean {
-    return this.isAdmin || this.featureFlags[operation];
-  }
-
-  /**
-   * Is user permitted to do the action.
-   */
-  isAllowed(resourceType: CFAuthResource, action: CFAuthAction): boolean {
-
-    let args = Array.prototype.slice.call(arguments);
-    if (args.length > 2) {
-      // pass the rest of the arguments into accessChecker action
-      args = args.splice(2);
-    }
-
-    const accessChecker = this.getAccessChecker(resourceType);
-    return accessChecker[action].apply(accessChecker, args);
-  }
-
-  /**
-   * Internal method to create checker list
-   */
-  private _createAccessCheckerList(): CFAuthChecker[] {
-
-    const checkers = [];
-
-    checkers.push(new CFAuthCheckerApplication(this));
-    checkers.push(new CFAuthCheckerOrganization(this));
-    checkers.push(new CFAuthCheckerRoute(this));
-    checkers.push(new CFAuthCheckerServiceInstance(this));
-    checkers.push(new CFAuthCheckerSpace(this));
-    checkers.push(new CFAuthCheckerUser(this));
-    return checkers;
-  }
-
-  /**
-   * Get Access checker for a given resource type
-   */
-  private getAccessChecker(resourceType: CFAuthResource): CFAuthChecker {
-
-    if (!this.checkers || this.checkers.length === 0) {
-      this.checkers = this._createAccessCheckerList();
-    }
-
-    return this.checkers.find((checker: any) => {
-      return checker.canHandle(resourceType);
-    });
-  }
-
-}
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index 56a3cda92d..073a02b9bf 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -22,7 +22,6 @@ import { CardProgressOverlayComponent } from './components/card-progress-overlay
 import { CardBooleanMetricComponent } from './components/cards/card-boolean-metric/card-boolean-metric.component';
 import { CardNumberMetricComponent } from './components/cards/card-number-metric/card-number-metric.component';
 import { CardStatusComponent } from './components/cards/card-status/card-status.component';
-import { CfAuthModule } from './components/cf-auth/cf-auth.module';
 import { AppChipsComponent } from './components/chips/chips.component';
 import { CodeBlockComponent } from './components/code-block/code-block.component';
 import { ConfirmationDialogService } from './components/confirmation-dialog.service';
@@ -128,7 +127,6 @@ import { UserPermissionDirective } from './user-permission.directive';
     PageHeaderModule,
     RouterModule,
     SteppersModule,
-    CfAuthModule,
     CdkTableModule,
     NgxChartsModule,
   ],

From d3b7895d64b65878f81d4e2c0c6964f891f8e4c0 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 20 May 2020 14:11:49 +0100
Subject: [PATCH 135/176] Remove appStatsReducer, this was duplication of
 UpdateAppEffects

---
 .../src/store/effects/update-app-effects.ts   | 38 +--------------
 .../reducers/app-stats-request.reducer.ts     | 46 -------------------
 .../api-request-reducers.generator.ts         |  2 +-
 3 files changed, 3 insertions(+), 83 deletions(-)
 delete mode 100644 src/frontend/packages/cloud-foundry/src/store/reducers/app-stats-request.reducer.ts

diff --git a/src/frontend/packages/cloud-foundry/src/store/effects/update-app-effects.ts b/src/frontend/packages/cloud-foundry/src/store/effects/update-app-effects.ts
index 584be16007..a29f72b026 100644
--- a/src/frontend/packages/cloud-foundry/src/store/effects/update-app-effects.ts
+++ b/src/frontend/packages/cloud-foundry/src/store/effects/update-app-effects.ts
@@ -1,11 +1,10 @@
 import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
-import { Action } from '@ngrx/store';
 import { mergeMap } from 'rxjs/operators';
 
 import { WrapperRequestActionSuccess } from '../../../../store/src/types/request.types';
 import { AppMetadataTypes } from '../../actions/app-metadata.actions';
-import { DeleteApplicationInstance, UPDATE_SUCCESS, UpdateExistingApplication } from '../../actions/application.actions';
+import { UPDATE_SUCCESS, UpdateExistingApplication } from '../../actions/application.actions';
 import { cfEntityCatalog } from '../../cf-entity-catalog';
 
 @Injectable()
@@ -45,39 +44,6 @@ export class UpdateAppEffects {
         }
       });
 
-      return actions.concat(this.markAppStatsAsDeleted(updateAction));
+      return actions;
     }));
-
-  private markAppStatsAsDeleted(action: UpdateExistingApplication): Action[] {
-    const actions = [];
-    // Only interest if we have the old and new app and either the app has been stopped or now contains zero instances
-    if (!action.newApplication || !action.existingApplication) {
-      return;
-    }
-    if (action.newApplication.state !== 'STOPPED' && action.newApplication.instances !== 0) {
-      return;
-    }
-    // TODO: RC 
-    // Delete root stat
-    // this.deleteState(action.guid)
-
-    // Delete each instance stat
-    const instances = action.existingApplication.instances || 0;
-    for (let i = 0; i < instances; i++) {
-      actions.push(this.deleteState(action.guid, i, action.endpointGuid));
-    }
-    return actions;
-  }
-
-  private deleteState(guid: string, instanceId: number = null, endpointGuid: string): Action {
-    return new WrapperRequestActionSuccess(
-      {
-        entities: {},
-        result: []
-      },
-      {
-        ...new DeleteApplicationInstance(guid, instanceId, endpointGuid)
-      }
-    )
-  }
 }
diff --git a/src/frontend/packages/cloud-foundry/src/store/reducers/app-stats-request.reducer.ts b/src/frontend/packages/cloud-foundry/src/store/reducers/app-stats-request.reducer.ts
deleted file mode 100644
index 34a3f086b4..0000000000
--- a/src/frontend/packages/cloud-foundry/src/store/reducers/app-stats-request.reducer.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-// import { UPDATE_SUCCESS, UpdateExistingApplication } from '../../actions/application.actions';
-// import { IRequestEntityTypeState } from '../../../../store/src/app-state';
-// import { RequestInfoState } from '../../../../store/src/reducers/api-request-reducer/types';
-
-// export function appStatsReducer(state: IRequestEntityTypeState<RequestInfoState>, action) {
-//   switch (action.type) {
-//     case UPDATE_SUCCESS:
-//       const updateAction: UpdateExistingApplication = action.apiAction;
-//       return markAppStatsAsDeleted(state, updateAction);
-//     default:
-//       return state;
-//   }
-// }
-
-// function deleteAppStat(newState, key) {
-//   const state = newState[key];
-//   if (!state) {
-//     return;
-//   }
-//   newState[key] = {
-//     ...state,
-//     deleting: {
-//       ...state.deleting,
-//       deleted: true,
-//     }
-//   };
-// }
-
-// function markAppStatsAsDeleted(state: IRequestEntityTypeState<RequestInfoState>, action: UpdateExistingApplication) {
-//   // Only interest if we have the old and new app and either the app has been stopped or now contains zero instances
-//   if (!action.newApplication || !action.existingApplication) {
-//     return state;
-//   }
-//   if (action.newApplication.state !== 'STOPPED' && action.newApplication.instances !== 0) {
-//     return state;
-//   }
-//   const newState = { ...state };
-//   // Delete root stat
-//   deleteAppStat(newState, action.guid);
-//   // Delete each instance stat
-//   const instances = action.existingApplication.instances || 0;
-//   for (let i = 0; i < instances; i++) {
-//     deleteAppStat(newState, action.guid + '-' + i);
-//   }
-//   return newState;
-// }
diff --git a/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts b/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts
index 7f993949d8..104e891ee5 100644
--- a/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-reducers.generator.ts
@@ -14,7 +14,7 @@ import { chainApiReducers, ExtraApiReducers, requestActions } from './api-reques
 
 const baseRequestReducer = requestReducerFactory(requestActions);
 const extraReducers = {
-  // [entityCatalog.getEntityKey(CF_ENDPOINT_TYPE, appStatsEntityType)]: [appStatsReducer]// TODO: RC 
+  // ['entityKey']: [ reducer ]
 } as ExtraApiReducers<IRequestEntityTypeState<RequestInfoState>>;
 const chainedReducers = chainApiReducers<IRequestEntityTypeState<RequestInfoState>>(baseRequestReducer, extraReducers);
 

From 26964ac36e8702795830adb5bbbbf5ee14a8d495 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 20 May 2020 14:17:47 +0100
Subject: [PATCH 136/176] Fix CFFeatureFlagTypes

---
 .../packages/cloud-foundry/src/cf-api.types.ts  | 17 +++++++++++++++++
 .../deploy-application-steps.types.ts           |  2 +-
 .../src/features/cloud-foundry/cf.helpers.ts    |  3 +--
 .../cloud-foundry-space-users.component.ts      |  2 +-
 ...loud-foundry-organization-users.component.ts |  2 +-
 .../manage-users-set-usernames.component.ts     |  2 +-
 .../core/current-user-permissions.checker.ts    |  3 +--
 .../src/core/current-user-permissions.config.ts |  2 +-
 8 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/cf-api.types.ts b/src/frontend/packages/cloud-foundry/src/cf-api.types.ts
index c057292810..0ccae9e71a 100644
--- a/src/frontend/packages/cloud-foundry/src/cf-api.types.ts
+++ b/src/frontend/packages/cloud-foundry/src/cf-api.types.ts
@@ -365,3 +365,20 @@ export interface CfEvent {
   space_guid?: string;
   organization_guid?: string;
 }
+
+export enum CFFeatureFlagTypes {
+  user_org_creation = 'user_org_creation',
+  private_domain_creation = 'private_domain_creation',
+  app_bits_upload = 'app_bits_upload',
+  app_scaling = 'app_scaling',
+  route_creation = 'route_creation',
+  service_instance_creation = 'service_instance_creation',
+  diego_docker = 'diego_docker',
+  set_roles_by_username = 'set_roles_by_username',
+  unset_roles_by_username = 'unset_roles_by_username',
+  task_creation = 'task_creation',
+  env_var_visibility = 'env_var_visibility',
+  space_scoped_private_broker_creation = 'space_scoped_private_broker_creation',
+  space_developer_env_var_visibility = 'space_developer_env_var_visibility',
+  service_instance_sharing = 'service_instance_sharing',
+}
\ No newline at end of file
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-steps.types.ts b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-steps.types.ts
index a59c82a77e..eee27ea9b6 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-steps.types.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application-steps.types.ts
@@ -7,7 +7,7 @@ import { filter, first, map, publishReplay, refCount, switchMap } from 'rxjs/ope
 import { SourceType } from '../../../../../cloud-foundry/src/store/types/deploy-application.types';
 import { PermissionConfig, PermissionTypes } from '../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../core/src/core/current-user-permissions.service';
-import { CFFeatureFlagTypes } from '../../../../../core/src/shared/components/cf-auth/cf-auth.types';
+import { CFFeatureFlagTypes } from '../../../cf-api.types';
 import { CFAppState } from '../../../cf-app-state';
 import { cfEntityCatalog } from '../../../cf-entity-catalog';
 
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts
index a4160264fe..f94cb8b54a 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cf.helpers.ts
@@ -26,7 +26,6 @@ import {
 } from '../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../core/src/core/current-user-permissions.service';
 import { getIdFromRoute, pathGet } from '../../../../core/src/core/utils.service';
-import { CFFeatureFlagTypes } from '../../../../core/src/shared/components/cf-auth/cf-auth.types';
 import {
   extractActualListEntity,
 } from '../../../../core/src/shared/components/list/data-sources-controllers/local-filtering-sorting';
@@ -41,7 +40,7 @@ import { APIResource } from '../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 import { PaginatedAction, PaginationEntityState } from '../../../../store/src/types/pagination.types';
 import { IServiceInstance, IUserProvidedServiceInstance } from '../../cf-api-svc.types';
-import { ISpace } from '../../cf-api.types';
+import { CFFeatureFlagTypes, ISpace } from '../../cf-api.types';
 import { cfEntityFactory } from '../../cf-entity-factory';
 import { CFEntityConfig } from '../../cf-types';
 import { ActiveRouteCfCell, ActiveRouteCfOrgSpace } from './cf-page.types';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.ts
index b514e0762d..be30449c73 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.ts
@@ -6,8 +6,8 @@ import { CurrentUserPermissionsService } from 'frontend/packages/core/src/core/c
 import { combineLatest, Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 
-import { CFFeatureFlagTypes } from '../../../../../../../../../core/src/shared/components/cf-auth/cf-auth.types';
 import { ListConfig } from '../../../../../../../../../core/src/shared/components/list/list.component.types';
+import { CFFeatureFlagTypes } from '../../../../../../../cf-api.types';
 import {
   CfSpaceUsersListConfigService,
 } from '../../../../../../../shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.ts
index 2ad173707e..df764482bc 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-users/cloud-foundry-organization-users.component.ts
@@ -5,8 +5,8 @@ import { map, switchMap } from 'rxjs/operators';
 
 import { CurrentUserPermissions } from '../../../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
-import { CFFeatureFlagTypes } from '../../../../../../../core/src/shared/components/cf-auth/cf-auth.types';
 import { ListConfig } from '../../../../../../../core/src/shared/components/list/list.component.types';
+import { CFFeatureFlagTypes } from '../../../../../cf-api.types';
 import { CFAppState } from '../../../../../cf-app-state';
 import {
   CfOrgUsersListConfigService,
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.ts
index 3080140c03..a2e80aff1e 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/users/manage-users/manage-users-set-usernames/manage-users-set-usernames.component.ts
@@ -6,7 +6,6 @@ import { first, map, publishReplay, refCount, startWith, switchMap, take, tap }
 
 import { PermissionConfig, PermissionTypes } from '../../../../../../../core/src/core/current-user-permissions.config';
 import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
-import { CFFeatureFlagTypes } from '../../../../../../../core/src/shared/components/cf-auth/cf-auth.types';
 import {
   StackedInputActionConfig,
 } from '../../../../../../../core/src/shared/components/stacked-input-actions/stacked-input-action/stacked-input-action.component';
@@ -20,6 +19,7 @@ import {
   UsersRolesSetIsSetByUsername,
   UsersRolesSetUsers,
 } from '../../../../../actions/users-roles.actions';
+import { CFFeatureFlagTypes } from '../../../../../cf-api.types';
 import { CFAppState } from '../../../../../cf-app-state';
 import { CfUser } from '../../../../../store/types/user.types';
 import { ActiveRouteCfOrgSpace } from '../../../cf-page.types';
diff --git a/src/frontend/packages/core/src/core/current-user-permissions.checker.ts b/src/frontend/packages/core/src/core/current-user-permissions.checker.ts
index 5c646b2fbf..1d50f368f4 100644
--- a/src/frontend/packages/core/src/core/current-user-permissions.checker.ts
+++ b/src/frontend/packages/core/src/core/current-user-permissions.checker.ts
@@ -2,7 +2,7 @@ import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of as observableOf } from 'rxjs';
 import { distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators';
 
-import { IFeatureFlag } from '../../../cloud-foundry/src/cf-api.types';
+import { CFFeatureFlagTypes, IFeatureFlag } from '../../../cloud-foundry/src/cf-api.types';
 import { cfEntityCatalog } from '../../../cloud-foundry/src/cf-entity-catalog';
 import {
   getCurrentUserCFEndpointHasScope,
@@ -20,7 +20,6 @@ import {
   getCurrentUserStratosRole,
 } from '../../../store/src/selectors/current-user-role.selectors';
 import { connectedEndpointsSelector } from '../../../store/src/selectors/endpoint.selectors';
-import { CFFeatureFlagTypes } from '../shared/components/cf-auth/cf-auth.types';
 import {
   PermissionConfig,
   PermissionStrings,
diff --git a/src/frontend/packages/core/src/core/current-user-permissions.config.ts b/src/frontend/packages/core/src/core/current-user-permissions.config.ts
index df9cdd2fa1..3781f1ca24 100644
--- a/src/frontend/packages/core/src/core/current-user-permissions.config.ts
+++ b/src/frontend/packages/core/src/core/current-user-permissions.config.ts
@@ -1,4 +1,4 @@
-import { CFFeatureFlagTypes } from '../shared/components/cf-auth/cf-auth.types';
+import { CFFeatureFlagTypes } from '../../../cloud-foundry/src/cf-api.types';
 
 export enum CurrentUserPermissions {
   APPLICATION_VIEW = 'view.application',

From 1f8c2e9795d1cea816c3e6d51595587a49c87044 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 20 May 2020 14:28:49 +0100
Subject: [PATCH 137/176] Retry

---
 src/test-e2e/helpers/request-helpers.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/test-e2e/helpers/request-helpers.ts b/src/test-e2e/helpers/request-helpers.ts
index 5d0d02b9a4..bd8f00b8fb 100644
--- a/src/test-e2e/helpers/request-helpers.ts
+++ b/src/test-e2e/helpers/request-helpers.ts
@@ -130,13 +130,21 @@ export class RequestHelpers {
    * @description Create a session
    * @param {object} req - the request
    */
-  createSession(req, userType: ConsoleUserType): promise.Promise<any> {
+  createSession(req, userType: ConsoleUserType, retry = 1): promise.Promise<any> {
     const creds = e2e.secrets.getConsoleCredentials(userType);
     const formData = {
       username: creds.username || 'dev',
       password: creds.password || 'dev'
     };
-    return this.sendRequest(req, { method: 'POST', url: 'pp/v1/auth/login/uaa' }, null, formData);
+    return this.sendRequest(req, { method: 'POST', url: 'pp/v1/auth/login/uaa' }, null, formData).catch(e => {
+      console.log('***** createSession failed');
+      console.log(e);
+      if (retry < 3) {
+        console.log('Retrying... ' + retry);
+        return this.createSession(req, userType, retry + 1);
+      }
+      throw e;
+    })
   }
 
   // /**

From 9a82fb7832fe0364a9237b501896dd48d4143211 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 20 May 2020 14:29:39 +0100
Subject: [PATCH 138/176] Just run autoscaler tests

---
 .travis.yml | 33 ---------------------------------
 1 file changed, 33 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6028919567..94a34bc32c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,39 +33,6 @@ stages:
   - Test
 jobs:
   include:
-    - stage: Lint
-      name: Frontend Lint
-      script:
-        - npm run lint
-    - name: Backend Lint
-      before_script:
-        - curl -sL -o ~/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
-        - chmod +x ~/bin/gimme
-        - eval "$(gimme 1.13.4)"
-        - go get -u golang.org/x/lint/golint
-      script:
-        - golint src/jetstream/...
-        - ./deploy/ci/travis/update-go-report-card.sh
-    - stage: Build
-      name: Build Frontend and Backend
-      env:
-        - CI_ENV=true
-      script:
-        - "./deploy/ci/travis/e2e-build-script.sh build"
-    - stage: Test
-      name: Frontend Unit Tests
-      env:
-        - CI_ENV=true
-      script:
-        - npm run test
-        - npm run codecov
-    - name: Backend Unit Tests
-      before_script:
-        - curl -sL -o ~/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
-        - chmod +x ~/bin/gimme
-        - eval "$(gimme 1.13.4)"
-      script:
-        - npm run test-backend
     - name: E2E Tests - Autoscaler
       before_script:
         - "./deploy/ci/travis/job-e2e-before_script.sh"

From c3a0bf35f837b76503775004e33fcb6c8e6540db Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 20 May 2020 14:45:08 +0100
Subject: [PATCH 139/176] Travis file update

---
 .travis.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 94a34bc32c..02c9594754 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,26 @@ stages:
   - Test
 jobs:
   include:
+    - stage: Build
+      name: Build Frontend and Backend
+      env:
+        - CI_ENV=true
+      script:
+        - "./deploy/ci/travis/e2e-build-script.sh build"
+    - stage: Test
+      name: Frontend Unit Tests
+      env:
+        - CI_ENV=true
+      script:
+        - npm run test
+        - npm run codecov
+    - name: Backend Unit Tests
+      before_script:
+        - curl -sL -o ~/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
+        - chmod +x ~/bin/gimme
+        - eval "$(gimme 1.13.4)"
+      script:
+        - npm run test-backend
     - name: E2E Tests - Autoscaler
       before_script:
         - "./deploy/ci/travis/job-e2e-before_script.sh"

From 066c670541142109b62791a8ed6c8b42c45e5b1a Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 20 May 2020 14:54:35 +0100
Subject: [PATCH 140/176] Fix merge issues with cf code re-ogr

---
 .../src/shared/cf-shared.module.ts            |   2 +-
 .../shared/components/components.module.ts    | 340 ------------------
 2 files changed, 1 insertion(+), 341 deletions(-)
 delete mode 100644 src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts

diff --git a/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts b/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts
index 1d1e4255b8..a74c63abe7 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts
@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { ApplicationModule, NgModule, Type } from '@angular/core';
-import { MaterialDesignFrameworkModule } from 'stratos-angular6-json-schema-form';
+import { MaterialDesignFrameworkModule } from '@cfstratos/ajsf-material';
 
 import { CoreModule } from '../../../core/src/core/core.module';
 import { CardCell, TableCellCustom } from '../../../core/src/shared/components/list/list.types';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts b/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
deleted file mode 100644
index e5ea43da0b..0000000000
--- a/src/frontend/packages/cloud-foundry/src/shared/components/components.module.ts
+++ /dev/null
@@ -1,340 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { ApplicationModule, NgModule, Type } from '@angular/core';
-import { MaterialDesignFrameworkModule } from '@cfstratos/ajsf-material';
-
-import { CoreModule } from '../../../../core/src/core/core.module';
-import {
-  TableCellQuotaComponent,
-} from '../../../../core/src/shared/components/list/list-types/cf-quotas/table-cell-quota/table-cell-quota.component';
-import {
-  TableCellServiceLastOpComponent,
-} from '../../../../core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service-last-op/table-cell-service-last-op.component';
-import {
-  TableCellServiceComponent,
-} from '../../../../core/src/shared/components/list/list-types/cf-spaces-service-instances/table-cell-service/table-cell-service.component';
-import { CardCell, TableCellCustom } from '../../../../core/src/shared/components/list/list.types';
-import {
-  ServiceInstanceLastOpComponent,
-} from '../../../../core/src/shared/components/service-instance-last-op/service-instance-last-op.component';
-import { SharedModule } from '../../../../core/src/shared/shared.module';
-import {
-  AddServiceInstanceBaseStepComponent,
-} from './add-service-instance/add-service-instance-base-step/add-service-instance-base-step.component';
-import { AddServiceInstanceComponent } from './add-service-instance/add-service-instance/add-service-instance.component';
-import { BindAppsStepComponent } from './add-service-instance/bind-apps-step/bind-apps-step.component';
-import { NoServicePlansComponent } from './add-service-instance/no-service-plans/no-service-plans.component';
-import { SelectPlanStepComponent } from './add-service-instance/select-plan-step/select-plan-step.component';
-import { SpecifyDetailsStepComponent } from './add-service-instance/specify-details-step/specify-details-step.component';
-import {
-  SpecifyUserProvidedDetailsComponent,
-} from './add-service-instance/specify-user-provided-details/specify-user-provided-details.component';
-import { CardAppInstancesComponent } from './cards/card-app-instances/card-app-instances.component';
-import { CardAppStatusComponent } from './cards/card-app-status/card-app-status.component';
-import { CardAppUptimeComponent } from './cards/card-app-uptime/card-app-uptime.component';
-import { CardAppUsageComponent } from './cards/card-app-usage/card-app-usage.component';
-import { CardCfInfoComponent } from './cards/card-cf-info/card-cf-info.component';
-import { CardCfOrgUserDetailsComponent } from './cards/card-cf-org-user-details/card-cf-org-user-details.component';
-import { CardCfRecentAppsComponent } from './cards/card-cf-recent-apps/card-cf-recent-apps.component';
-import { CompactAppCardComponent } from './cards/card-cf-recent-apps/compact-app-card/compact-app-card.component';
-import { CardCfSpaceDetailsComponent } from './cards/card-cf-space-details/card-cf-space-details.component';
-import { CardCfUserInfoComponent } from './cards/card-cf-user-info/card-cf-user-info.component';
-import {
-  CompactServiceInstanceCardComponent,
-} from './cards/compact-service-instance-card/compact-service-instance-card.component';
-import { ServiceBrokerCardComponent } from './cards/service-broker-card/service-broker-card.component';
-import {
-  ServiceRecentInstancesCardComponent,
-} from './cards/service-recent-instances-card/service-recent-instances-card.component';
-import { ServiceSummaryCardComponent } from './cards/service-summary-card/service-summary-card.component';
-import { CfEndpointDetailsComponent } from './cf-endpoint-details/cf-endpoint-details.component';
-import { CfEndpointsMissingComponent } from './cf-endpoints-missing/cf-endpoints-missing.component';
-import { CfOrgSpaceLinksComponent } from './cf-org-space-links/cf-org-space-links.component';
-import { CfRoleCheckboxComponent } from './cf-role-checkbox/cf-role-checkbox.component';
-import { CliCommandComponent } from './cli-info/cli-command/cli-command.component';
-import { CliInfoComponent } from './cli-info/cli-info.component';
-import { CloudFoundryEventsListComponent } from './cloud-foundry-events-list/cloud-foundry-events-list.component';
-import {
-  CreateApplicationStep1Component,
-} from './create-application/create-application-step1/create-application-step1.component';
-import { TableCellCfCellComponent } from './list/list-types/app-instance/table-cell-cf-cell/table-cell-cf-cell.component';
-import { TableCellUsageComponent } from './list/list-types/app-instance/table-cell-usage/table-cell-usage.component';
-import {
-  AppServiceBindingCardComponent,
-} from './list/list-types/app-sevice-bindings/app-service-binding-card/app-service-binding-card.component';
-import {
-  TableCellEditVariableComponent,
-} from './list/list-types/app-variables/table-cell-edit-variable/table-cell-edit-variable.component';
-import { CardAppComponent } from './list/list-types/app/card/card-app.component';
-import {
-  TableCellAppCfOrgSpaceHeaderComponent,
-} from './list/list-types/app/table-cell-app-cforgspace-header/table-cell-app-cforgspace-header.component';
-import {
-  TableCellAppCfOrgSpaceComponent,
-} from './list/list-types/app/table-cell-app-cforgspace/table-cell-app-cforgspace.component';
-import {
-  TableCellAppInstancesComponent,
-} from './list/list-types/app/table-cell-app-instances/table-cell-app-instances.component';
-import { TableCellAppNameComponent } from './list/list-types/app/table-cell-app-name/table-cell-app-name.component';
-import { TableCellAppStatusComponent } from './list/list-types/app/table-cell-app-status/table-cell-app-status.component';
-import { CfBuildpackCardComponent } from './list/list-types/cf-buildpacks/cf-buildpack-card/cf-buildpack-card.component';
-import {
-  TableCellConfirmOrgSpaceComponent,
-} from './list/list-types/cf-confirm-roles/table-cell-confirm-org-space/table-cell-confirm-org-space.component';
-import {
-  TableCellConfirmRoleAddRemComponent,
-} from './list/list-types/cf-confirm-roles/table-cell-confirm-role-add-rem/table-cell-confirm-role-add-rem.component';
-import { EventMetadataComponent } from './list/list-types/cf-events/event-metadata/event-metadata.component';
-import {
-  TableCellEventActeeComponent,
-} from './list/list-types/cf-events/table-cell-event-actee/table-cell-event-actee.component';
-import { EventTabActorIconPipe } from './list/list-types/cf-events/table-cell-event-action/event-tab-actor-icon.pipe';
-import {
-  TableCellEventActionComponent,
-} from './list/list-types/cf-events/table-cell-event-action/table-cell-event-action.component';
-import {
-  TableCellEventDetailComponent,
-} from './list/list-types/cf-events/table-cell-event-detail/table-cell-event-detail.component';
-import {
-  TableCellEventTimestampComponent,
-} from './list/list-types/cf-events/table-cell-event-timestamp/table-cell-event-timestamp.component';
-import {
-  TableCellEventTypeComponent,
-} from './list/list-types/cf-events/table-cell-event-type/table-cell-event-type.component';
-import {
-  TableCellFeatureFlagDescriptionComponent,
-} from './list/list-types/cf-feature-flags/table-cell-feature-flag-description/table-cell-feature-flag-description.component';
-import {
-  TableCellFeatureFlagStateComponent,
-} from './list/list-types/cf-feature-flags/table-cell-feature-flag-state/table-cell-feature-flag-state.component';
-import { CfOrgCardComponent } from './list/list-types/cf-orgs/cf-org-card/cf-org-card.component';
-import {
-  TableCellRouteAppsAttachedComponent,
-} from './list/list-types/cf-routes/table-cell-route-apps-attached/table-cell-route-apps-attached.component';
-import { TableCellRouteComponent } from './list/list-types/cf-routes/table-cell-route/table-cell-route.component';
-import { TableCellTCPRouteComponent } from './list/list-types/cf-routes/table-cell-tcproute/table-cell-tcproute.component';
-import {
-  CfSecurityGroupsCardComponent,
-} from './list/list-types/cf-security-groups/cf-security-groups-card/cf-security-groups-card.component';
-import { CfServiceCardComponent } from './list/list-types/cf-services/cf-service-card/cf-service-card.component';
-import {
-  TableCellServiceActiveComponent,
-} from './list/list-types/cf-services/table-cell-service-active/table-cell-service-active.component';
-import {
-  TableCellServiceBindableComponent,
-} from './list/list-types/cf-services/table-cell-service-bindable/table-cell-service-bindable.component';
-import {
-  TableCellServiceCfBreadcrumbsComponent,
-} from './list/list-types/cf-services/table-cell-service-cf-breadcrumbs/table-cell-service-cf-breadcrumbs.component';
-import {
-  TableCellServiceProviderComponent,
-} from './list/list-types/cf-services/table-cell-service-provider/table-cell-service-provider.component';
-import {
-  TableCellServiceReferencesComponent,
-} from './list/list-types/cf-services/table-cell-service-references/table-cell-service-references.component';
-import {
-  TableCellServiceTagsComponent,
-} from './list/list-types/cf-services/table-cell-service-tags/table-cell-service-tags.component';
-import {
-  TableCellServiceInstanceAppsAttachedComponent,
-} from './list/list-types/cf-spaces-service-instances/table-cell-service-instance-apps-attached/table-cell-service-instance-apps-attached.component';
-import {
-  TableCellServiceInstanceTagsComponent,
-} from './list/list-types/cf-spaces-service-instances/table-cell-service-instance-tags/table-cell-service-instance-tags.component';
-import {
-  TableCellSpaceNameComponent,
-} from './list/list-types/cf-spaces-service-instances/table-cell-space-name/table-cell-space-name.component';
-import { CfSpaceCardComponent } from './list/list-types/cf-spaces/cf-space-card/cf-space-card.component';
-import { CfStacksCardComponent } from './list/list-types/cf-stacks/cf-stacks-card/cf-stacks-card.component';
-import {
-  TableCellRoleOrgSpaceComponent,
-} from './list/list-types/cf-users-org-space-roles/table-cell-org-space-role/table-cell-org-space-role.component';
-import {
-  TableCellSelectOrgComponent,
-} from './list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component';
-import {
-  CfOrgPermissionCellComponent,
-} from './list/list-types/cf-users/cf-org-permission-cell/cf-org-permission-cell.component';
-import {
-  CfSpacePermissionCellComponent,
-} from './list/list-types/cf-users/cf-space-permission-cell/cf-space-permission-cell.component';
-import {
-  TableCellAServicePlanExtrasComponent,
-} from './list/list-types/service-plans/table-cell-service-plan-extras/table-cell-service-plan-extras.component';
-import {
-  TableCellAServicePlanPriceComponent,
-} from './list/list-types/service-plans/table-cell-service-plan-price/table-cell-service-plan-price.component';
-import {
-  TableCellAServicePlanPublicComponent,
-} from './list/list-types/service-plans/table-cell-service-plan-public/table-cell-service-plan-public.component';
-import {
-  ServiceInstanceCardComponent,
-} from './list/list-types/services-wall/service-instance-card/service-instance-card.component';
-import {
-  UserProvidedServiceInstanceCardComponent,
-} from './list/list-types/services-wall/user-provided-service-instance-card/user-provided-service-instance-card.component';
-import { RunningInstancesComponent } from './running-instances/running-instances.component';
-import { SchemaFormComponent } from './schema-form/schema-form.component';
-import { SelectServiceComponent } from './select-service/select-service.component';
-import { ServiceIconComponent } from './service-icon/service-icon.component';
-import { ServicePlanPriceComponent } from './service-plan-price/service-plan-price.component';
-import { ServicePlanPublicComponent } from './service-plan-public/service-plan-public.component';
-
-// tslint:disable:max-line-length
-// tslint:enable:max-line-length
-
-const cfListTableCells: Type<TableCellCustom<any>>[] = [
-  TableCellServiceInstanceAppsAttachedComponent,
-  TableCellServiceComponent,
-  TableCellServiceLastOpComponent,
-  TableCellRouteAppsAttachedComponent,
-  CfOrgPermissionCellComponent,
-  CfSpacePermissionCellComponent,
-  TableCellFeatureFlagStateComponent,
-  TableCellFeatureFlagDescriptionComponent,
-  TableCellConfirmOrgSpaceComponent,
-  TableCellSelectOrgComponent,
-  TableCellAppStatusComponent,
-  TableCellRoleOrgSpaceComponent,
-  TableCellConfirmRoleAddRemComponent,
-  TableCellSpaceNameComponent,
-  TableCellAppCfOrgSpaceHeaderComponent,
-  TableCellAppCfOrgSpaceComponent,
-  TableCellAServicePlanPublicComponent,
-  TableCellAServicePlanPriceComponent,
-  TableCellAServicePlanExtrasComponent,
-  TableCellCfCellComponent,
-  TableCellRouteComponent,
-  TableCellTCPRouteComponent,
-  TableCellAppInstancesComponent,
-  TableCellAppNameComponent,
-  TableCellEditVariableComponent,
-  TableCellEventTimestampComponent,
-  TableCellEventTypeComponent,
-  TableCellEventActionComponent,
-  TableCellEventDetailComponent,
-  TableCellUsageComponent,
-  TableCellQuotaComponent,
-  TableCellEventActeeComponent,
-  TableCellServiceTagsComponent,
-  TableCellServiceCfBreadcrumbsComponent,
-  TableCellServiceProviderComponent,
-  TableCellServiceBindableComponent,
-  TableCellServiceActiveComponent,
-  TableCellServiceReferencesComponent,
-  TableCellServiceInstanceTagsComponent,
-];
-
-const cfListCards: Type<CardCell<any>>[] = [
-  AppServiceBindingCardComponent,
-  CardAppComponent,
-  CfOrgCardComponent,
-  CfSpaceCardComponent,
-  CfBuildpackCardComponent,
-  CfSecurityGroupsCardComponent,
-  CfStacksCardComponent,
-  CfServiceCardComponent,
-  ServiceInstanceCardComponent,
-  UserProvidedServiceInstanceCardComponent,
-];
-
-// listTableCells.push();
-
-@NgModule({
-  imports: [
-    CommonModule,
-    CoreModule,
-    SharedModule,
-    ApplicationModule,
-    MaterialDesignFrameworkModule,
-  ],
-  declarations: [
-    ServiceIconComponent,
-    CfEndpointDetailsComponent,
-    CliCommandComponent,
-    CliInfoComponent,
-    CfEndpointsMissingComponent,
-    CfRoleCheckboxComponent,
-    CfOrgSpaceLinksComponent,
-    SelectServiceComponent,
-    SpecifyDetailsStepComponent,
-    AddServiceInstanceComponent,
-    SelectPlanStepComponent,
-    NoServicePlansComponent,
-    BindAppsStepComponent,
-    SpecifyUserProvidedDetailsComponent,
-    AddServiceInstanceBaseStepComponent,
-    SchemaFormComponent,
-    CardAppStatusComponent,
-    CardAppInstancesComponent,
-    CardAppUsageComponent,
-    CardAppUptimeComponent,
-    CardCfInfoComponent,
-    CardCfUserInfoComponent,
-    CardCfOrgUserDetailsComponent,
-    CardCfSpaceDetailsComponent,
-    CardCfRecentAppsComponent,
-    CompactAppCardComponent,
-    ServiceSummaryCardComponent,
-    ServiceBrokerCardComponent,
-    ServiceRecentInstancesCardComponent,
-    CompactServiceInstanceCardComponent,
-    RunningInstancesComponent,
-    ServicePlanPublicComponent,
-    ServicePlanPriceComponent,
-    CreateApplicationStep1Component,
-    EventTabActorIconPipe,
-    CloudFoundryEventsListComponent,
-    EventMetadataComponent,
-    ...cfListTableCells,
-    ...cfListCards,
-    ServiceInstanceLastOpComponent,
-    TableCellFeatureFlagDescriptionComponent
-  ],
-  exports: [
-    ServiceIconComponent,
-    CfEndpointDetailsComponent,
-    CliCommandComponent,
-    CliInfoComponent,
-    CfEndpointsMissingComponent,
-    CfRoleCheckboxComponent,
-    CfOrgSpaceLinksComponent,
-    SelectServiceComponent,
-    SpecifyDetailsStepComponent,
-    AddServiceInstanceComponent,
-    SelectPlanStepComponent,
-    NoServicePlansComponent,
-    BindAppsStepComponent,
-    SpecifyUserProvidedDetailsComponent,
-    AddServiceInstanceBaseStepComponent,
-    CfServiceCardComponent,
-    SchemaFormComponent,
-    CardAppStatusComponent,
-    CardAppInstancesComponent,
-    CardAppUsageComponent,
-    CardAppUptimeComponent,
-    CardCfInfoComponent,
-    CardCfUserInfoComponent,
-    CardCfOrgUserDetailsComponent,
-    CardCfSpaceDetailsComponent,
-    CardCfRecentAppsComponent,
-    CompactAppCardComponent,
-    ServiceSummaryCardComponent,
-    ServiceBrokerCardComponent,
-    ServiceRecentInstancesCardComponent,
-    CompactServiceInstanceCardComponent,
-    RunningInstancesComponent,
-    ServicePlanPublicComponent,
-    ServicePlanPriceComponent,
-    CreateApplicationStep1Component,
-    CloudFoundryEventsListComponent
-  ],
-  entryComponents: [
-    CfEndpointDetailsComponent,
-    NoServicePlansComponent,
-    EventMetadataComponent,
-
-    ...cfListTableCells,
-    ...cfListCards
-  ]
-})
-export class CloudFoundryComponentsModule { }

From eca84ec1ccfa0c150eb841942cdd92f476a4ee8f Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 20 May 2020 15:09:09 +0100
Subject: [PATCH 141/176] More tidies...

---
 .../entity-relations-from-parent.spec.ts      |  2 +-
 .../entity-relations-validate.spec.ts         | 29 ++++++---------
 .../space-quota-definition.component.spec.ts  |  6 ++--
 .../src/shared/cf-shared.module.ts            |  2 +-
 .../entity-relations-spec-helper.ts           |  4 +--
 .../packages/core/src/shared/shared.module.ts |  2 --
 .../request-data-reducer.factory.spec.ts      |  9 ++---
 .../pagination.reducer.spec.ts                | 36 ++++++++++---------
 8 files changed, 40 insertions(+), 50 deletions(-)
 rename src/frontend/packages/{store/src/helpers/entity-relations => cloud-foundry/test-framework}/entity-relations-spec-helper.ts (92%)

diff --git a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-from-parent.spec.ts b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-from-parent.spec.ts
index a4cc4c4ad7..a2c6cf1dac 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-from-parent.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-from-parent.spec.ts
@@ -7,10 +7,10 @@ import { AppState } from '../../../store/src/app-state';
 import { EntityCatalogTestModuleManualStore, TEST_CATALOGUE_ENTITIES } from '../../../store/src/entity-catalog-test.module';
 import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
 import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
-import { EntityRelationSpecHelper } from '../../../store/src/helpers/entity-relations/entity-relations-spec-helper';
 import { APIResource } from '../../../store/src/types/api.types';
 import { WrapperRequestActionSuccess } from '../../../store/src/types/request.types';
 import { createBasicStoreModule, createEntityStoreState, TestStoreEntity } from '../../../store/testing/public-api';
+import { EntityRelationSpecHelper } from '../../test-framework/entity-relations-spec-helper';
 import { GetAllOrganizationSpaces } from '../actions/organization.actions';
 import { ISpace } from '../cf-api.types';
 import { CFAppState } from '../cf-app-state';
diff --git a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-validate.spec.ts b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-validate.spec.ts
index 7c6d7e0b99..ea5cb3eca5 100644
--- a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-validate.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-validate.spec.ts
@@ -1,33 +1,25 @@
 import { inject, TestBed } from '@angular/core/testing';
 import { Store } from '@ngrx/store';
+import { createBasicStoreModule, createEntityStoreState, TestStoreEntity } from '@stratos/store/testing';
 
-import {
-  EntityCatalogTestModuleManualStore,
-  TEST_CATALOGUE_ENTITIES,
-} from '../../../store/src/entity-catalog-test.module';
-import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
-import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
 import { environment } from '../../../core/src/environments/environment';
-import {
-  createBasicStoreModule,
-  createEntityStoreState,
-  TestStoreEntity,
-} from '@stratos/store/testing';
 import { SetInitialParams } from '../../../store/src/actions/pagination.actions';
 import { APIResponse } from '../../../store/src/actions/request.actions';
 import { InternalAppState, IRequestTypeState } from '../../../store/src/app-state';
-import {
-  entityRelationMissingQuotaGuid,
-  entityRelationMissingQuotaUrl,
-  entityRelationMissingSpacesUrl,
-  EntityRelationSpecHelper,
-} from '../../../store/src/helpers/entity-relations/entity-relations-spec-helper';
+import { EntityCatalogTestModuleManualStore, TEST_CATALOGUE_ENTITIES } from '../../../store/src/entity-catalog-test.module';
+import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
+import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
 import {
   EntityRequestAction,
   RequestEntityLocation,
   WrapperRequestActionSuccess,
 } from '../../../store/src/types/request.types';
-import { CF_ENDPOINT_TYPE } from '../cf-types';
+import {
+  entityRelationMissingQuotaGuid,
+  entityRelationMissingQuotaUrl,
+  entityRelationMissingSpacesUrl,
+  EntityRelationSpecHelper,
+} from '../../test-framework/entity-relations-spec-helper';
 import { GetOrganization } from '../actions/organization.actions';
 import { FetchRelationPaginatedAction, FetchRelationSingleAction } from '../actions/relation.actions';
 import { CFAppState } from '../cf-app-state';
@@ -40,6 +32,7 @@ import {
   routeEntityType,
   spaceEntityType,
 } from '../cf-entity-types';
+import { CF_ENDPOINT_TYPE } from '../cf-types';
 import { EntityTreeRelation } from './entity-relation-tree';
 import { validateEntityRelations } from './entity-relations';
 import { createEntityRelationKey, createEntityRelationPaginationKey } from './entity-relations.types';
diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.spec.ts
index 12c5447846..eb4f5d792b 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.spec.ts
@@ -1,19 +1,19 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
+import { testSCFEndpoint, testSCFEndpointGuid } from '@stratos/store/testing';
 
 import { endpointEntitySchema } from '../../../../../core/src/base-entity-schemas';
+import { TabNavService } from '../../../../../core/tab-nav.service';
 import { EntityCatalogHelpers } from '../../../../../store/src/entity-catalog/entity-catalog.helper';
 import { EntityCatalogEntityConfig } from '../../../../../store/src/entity-catalog/entity-catalog.types';
-import { TabNavService } from '../../../../../core/tab-nav.service';
-import { testSCFEndpoint, testSCFEndpointGuid } from '@stratos/store/testing';
-import { EntityRelationSpecHelper } from '../../../../../store/src/helpers/entity-relations/entity-relations-spec-helper';
 import { NormalizedResponse } from '../../../../../store/src/types/api.types';
 import { WrapperRequestActionSuccess } from '../../../../../store/src/types/request.types';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
 } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
+import { EntityRelationSpecHelper } from '../../../../test-framework/entity-relations-spec-helper';
 import { cfEntityFactory } from '../../../cf-entity-factory';
 import { organizationEntityType, spaceEntityType } from '../../../cf-entity-types';
 import { SpaceQuotaDefinitionComponent } from './space-quota-definition.component';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts b/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts
index ef7c9a3cef..c024e84633 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/cf-shared.module.ts
@@ -369,7 +369,7 @@ const cfListCards: Type<CardCell<any>>[] = [
     CfEndpointDetailsComponent,
     NoServicePlansComponent,
     EventMetadataComponent,
-
+    EnvVarViewComponent,
     ...cfListTableCells,
     ...cfListCards
   ],
diff --git a/src/frontend/packages/store/src/helpers/entity-relations/entity-relations-spec-helper.ts b/src/frontend/packages/cloud-foundry/test-framework/entity-relations-spec-helper.ts
similarity index 92%
rename from src/frontend/packages/store/src/helpers/entity-relations/entity-relations-spec-helper.ts
rename to src/frontend/packages/cloud-foundry/test-framework/entity-relations-spec-helper.ts
index 59c22c0183..d5e563a756 100644
--- a/src/frontend/packages/store/src/helpers/entity-relations/entity-relations-spec-helper.ts
+++ b/src/frontend/packages/cloud-foundry/test-framework/entity-relations-spec-helper.ts
@@ -1,5 +1,5 @@
-import { IOrganization, IOrgQuotaDefinition, ISpace } from '../../../../cloud-foundry/src/cf-api.types';
-import { APIResource } from '../../types/api.types';
+import { APIResource } from '../../store/src/types/api.types';
+import { IOrganization, IOrgQuotaDefinition, ISpace } from '../src/cf-api.types';
 
 export const entityRelationMissingSpacesUrl = 'spaces_url';
 export const entityRelationMissingQuotaGuid = 'quota_guid';
diff --git a/src/frontend/packages/core/src/shared/shared.module.ts b/src/frontend/packages/core/src/shared/shared.module.ts
index 073a02b9bf..b218f0e621 100644
--- a/src/frontend/packages/core/src/shared/shared.module.ts
+++ b/src/frontend/packages/core/src/shared/shared.module.ts
@@ -5,7 +5,6 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
-import { EnvVarViewComponent } from '../../../cloud-foundry/src/shared/components/env-var-view/env-var-view.component';
 import { InternalEventMonitorFactory } from '../../../store/src/monitors/internal-event-monitor.factory';
 import { CoreModule } from '../core/core.module';
 import { AppActionMonitorIconComponent } from './components/app-action-monitor-icon/app-action-monitor-icon.component';
@@ -316,7 +315,6 @@ import { UserPermissionDirective } from './user-permission.directive';
   ],
   entryComponents: [
     DialogConfirmComponent,
-    EnvVarViewComponent,
     SnackBarReturnComponent,
     MarkdownPreviewComponent,
   ],
diff --git a/src/frontend/packages/store/src/reducers/api-request-data-reducer/request-data-reducer.factory.spec.ts b/src/frontend/packages/store/src/reducers/api-request-data-reducer/request-data-reducer.factory.spec.ts
index e0226b57e3..ac27583902 100644
--- a/src/frontend/packages/store/src/reducers/api-request-data-reducer/request-data-reducer.factory.spec.ts
+++ b/src/frontend/packages/store/src/reducers/api-request-data-reducer/request-data-reducer.factory.spec.ts
@@ -1,5 +1,3 @@
-import { IDomain } from '../../../../cloud-foundry/src/cf-api.types';
-import { domainEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
 import { APIResource } from '../../types/api.types';
 import { EntityRequestAction, ISuccessRequestAction } from '../../types/request.types';
 import { requestDataReducerFactory } from './request-data-reducer.factory';
@@ -10,14 +8,13 @@ describe('RequestDataReducerFactory', () => {
     expect(reducer).toBeDefined();
   });
   it('should create with add new entity', () => {
-    const testEntityTypeUnused = 'test-unused';
-    const entityKey = domainEntityType;
+    const entityKey = 'entityKey';
     const guid = 'id123';
     const successType = 'SUCCESS_YO';
     const domain = {
       name: guid
-    } as IDomain;
-    const apiResource = { entity: domain, metadata: {} } as APIResource<IDomain>;
+    };
+    const apiResource: APIResource<{ name: string }> = { entity: domain, metadata: { created_at: '', guid, updated_at: '', url: '' } };
     const resEntity = {
       [guid]: apiResource
     };
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination.reducer.spec.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination.reducer.spec.ts
index ddf36ee94e..d3c48a2ad2 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination.reducer.spec.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination.reducer.spec.ts
@@ -1,13 +1,13 @@
-import { CF_ENDPOINT_TYPE } from '../../../../cloud-foundry/src/cf-types';
-import { cfEntityFactory } from '../../../../cloud-foundry/src/cf-entity-factory';
-import { getCFEntityKey } from '../../../../cloud-foundry/src/cf-entity-helpers';
-import { CFEntitySchema } from '../../../../cloud-foundry/src/cf-entity-schema-types';
-import { applicationEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
+import { HttpRequest } from '@angular/common/http';
+
+import { ENDPOINT_TYPE, endpointEntitySchema, STRATOS_ENDPOINT_TYPE } from '../../../../core/src/base-entity-schemas';
 import { RequestTypes } from '../../actions/request.actions';
+import { entityCatalog } from '../../entity-catalog/entity-catalog';
+import { EntityCatalogHelpers } from '../../entity-catalog/entity-catalog.helper';
+import { EntitySchema } from '../../helpers/entity-schema';
 import { PaginatedAction } from '../../types/pagination.types';
 import { StartRequestAction, WrapperRequestActionFailed, WrapperRequestActionSuccess } from '../../types/request.types';
 import { createPaginationReducer } from './pagination.reducer';
-import { HttpRequest } from '@angular/common/http';
 
 function getReducer() {
   return createPaginationReducer([
@@ -20,9 +20,9 @@ function getReducer() {
 class MockPagAction implements PaginatedAction {
   actions = ['ONE', 'TWO', 'THREE'];
   options = new HttpRequest('GET', 'fake123');
-  entity = cfEntityFactory(applicationEntityType);
-  entityType = applicationEntityType;
-  endpointType = CF_ENDPOINT_TYPE;
+  entity = endpointEntitySchema;
+  entityType = ENDPOINT_TYPE;
+  endpointType = STRATOS_ENDPOINT_TYPE;
   paginationKey = 'PaginationKey';
   type = RequestTypes.START;
 }
@@ -61,7 +61,7 @@ describe('PaginationReducer', () => {
     const apiAction = new MockPagAction();
     apiAction.paginationKey = 'PaginationKey';
 
-    const entityKey = getCFEntityKey(apiAction.entityType);
+    const entityKey = entityCatalog.getEntityKey(apiAction);
 
     const startApiAction = new StartRequestAction(apiAction, 'fetch');
     const newState = paginationReducer(
@@ -90,7 +90,7 @@ describe('PaginationReducer', () => {
               error: false,
               message: '',
               maxed: false,
-              baseEntityConfig: { entityType: applicationEntityType, endpointType: CF_ENDPOINT_TYPE, schemaKey: undefined },
+              baseEntityConfig: { entityType: apiAction.entityType, endpointType: apiAction.endpointType, schemaKey: undefined },
               entityConfig: null
             }
           },
@@ -112,8 +112,9 @@ describe('PaginationReducer', () => {
 
     const paginationReducer = getReducer();
 
+    const endpointType = 'EndpointType'
     const entityType = 'EntityKey';
-    const entityKey = getCFEntityKey(entityType);
+    const entityKey = EntityCatalogHelpers.buildEntityKey(entityType, endpointType);
     const paginationKey = 'PaginationKey';
 
     const successApiAction = new WrapperRequestActionSuccess(
@@ -125,11 +126,11 @@ describe('PaginationReducer', () => {
         ]
       },
       {
-        endpointType: CF_ENDPOINT_TYPE,
+        endpointType,
         entityType,
         paginationKey,
         type: 'type',
-        entity: {} as CFEntitySchema,
+        entity: {} as EntitySchema,
         options: new HttpRequest('GET', 'fake'),
         actions: []
       },
@@ -181,19 +182,20 @@ describe('PaginationReducer', () => {
 
     const paginationReducer = getReducer();
 
+    const endpointType = 'EndpointType'
     const entityType = 'EntityKey';
-    const entityKey = getCFEntityKey(entityType);
+    const entityKey = EntityCatalogHelpers.buildEntityKey(entityType, endpointType);
     const paginationKey = 'PaginationKey';
     const message = 'Failed';
 
     const failedApiAction = new WrapperRequestActionFailed(
       message,
       {
-        endpointType: CF_ENDPOINT_TYPE,
+        endpointType,
         entityType,
         paginationKey,
         type: 'type',
-        entity: {} as CFEntitySchema,
+        entity: {} as EntitySchema,
         actions: []
       },
       'fetch'

From 70829071f168851480e84bad1141bf9ee99da673 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 20 May 2020 15:33:23 +0100
Subject: [PATCH 142/176] Fix retry for create session

---
 src/test-e2e/helpers/request-helpers.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/test-e2e/helpers/request-helpers.ts b/src/test-e2e/helpers/request-helpers.ts
index bd8f00b8fb..c2276badb7 100644
--- a/src/test-e2e/helpers/request-helpers.ts
+++ b/src/test-e2e/helpers/request-helpers.ts
@@ -131,19 +131,21 @@ export class RequestHelpers {
    * @param {object} req - the request
    */
   createSession(req, userType: ConsoleUserType, retry = 1): promise.Promise<any> {
+    const _that = this;
     const creds = e2e.secrets.getConsoleCredentials(userType);
     const formData = {
       username: creds.username || 'dev',
       password: creds.password || 'dev'
     };
     return this.sendRequest(req, { method: 'POST', url: 'pp/v1/auth/login/uaa' }, null, formData).catch(e => {
-      console.log('***** createSession failed');
-      console.log(e);
+      console.log('***** createSession failed: ' + retry);
       if (retry < 3) {
-        console.log('Retrying... ' + retry);
-        return this.createSession(req, userType, retry + 1);
+        e2e.sleep(2500);
+        console.log('Retrying createSession ... ' + retry);
+        return _that.createSession(req, userType, retry + 1);
+      } else {
+        throw e;
       }
-      throw e;
     })
   }
 

From 4db6056a3fa54b7377b5a98202b4b67c155ea0a9 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 20 May 2020 15:41:45 +0100
Subject: [PATCH 143/176] Remove cf q param handling from remove params reducer

---
 .../cf-events/cf-events-config.service.ts     | 48 +++++--------------
 .../pagination-reducer-remove-params.ts       |  8 ----
 2 files changed, 11 insertions(+), 45 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/cf-events-config.service.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/cf-events-config.service.ts
index 95d10424cd..35965787ea 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/cf-events-config.service.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-events/cf-events-config.service.ts
@@ -12,7 +12,7 @@ import {
   ListConfig,
   ListViewTypes,
 } from '../../../../../../../core/src/shared/components/list/list.component.types';
-import { AddParams, RemoveParams } from '../../../../../../../store/src/actions/pagination.actions';
+import { AddParams } from '../../../../../../../store/src/actions/pagination.actions';
 import { APIResource } from '../../../../../../../store/src/types/api.types';
 import { PaginatedAction } from '../../../../../../../store/src/types/pagination.types';
 import { CfEvent } from '../../../../../cf-api.types';
@@ -109,44 +109,18 @@ export class CfEventsConfigService extends ListConfig<APIResource> implements IL
     ).subscribe(currentFilters => {
       const action = this.eventSource.action as PaginatedAction;
 
-
-      const addQs: { [key: string]: string } = {};
-      const removeQs: string[] = [];
-
-      if (!arraysEqual(values.type, currentFilters.type)) {
-        if (!!values.type && !!values.type.length) {
-          addQs.type = new QParam('type', values.type, QParamJoiners.in).toString();
-        } else {
-          removeQs.push('type');
+      // Recreate the whole q param and set it again using 'AddParams'
+      const typeChanged = !arraysEqual(values.type, currentFilters.type)
+      const acteeChanged = valueOrCommonFalsy(values.actee) !== valueOrCommonFalsy(currentFilters.actee)
+      if (typeChanged || acteeChanged) {
+        const newQ: string[] = [];
+        if (values.type && values.type.length) {
+          newQ.push(new QParam('type', values.type, QParamJoiners.in).toString());
         }
-      }
-
-      if (valueOrCommonFalsy(values.actee) !==
-        valueOrCommonFalsy(currentFilters.actee)) {
-
-        if (!!values.actee && !!values.actee.length) {
-          addQs.actee = new QParam('actee', values.actee, QParamJoiners.in).toString();
-        } else {
-          removeQs.push('actee');
+        if (values.actee && values.actee.length) {
+          newQ.push(new QParam('actee', values.actee, QParamJoiners.in).toString());
         }
-      }
-
-      if (!!Object.keys(addQs).length) {
-        const existingQ: { [key: string]: string } = {} = {};
-        if (currentFilters.type && currentFilters.type.length) {
-          existingQ.type = new QParam('type', currentFilters.type, QParamJoiners.in).toString();
-        }
-        if (currentFilters.actee) {
-          existingQ.actee = new QParam('actee', currentFilters.actee, QParamJoiners.in).toString();
-        }
-        const newQ = {
-          ...existingQ,
-          ...addQs
-        };
-        this.store.dispatch(new AddParams(action, this.eventSource.paginationKey, { q: Object.values(newQ) }));
-      }
-      if (!!removeQs.length) {
-        this.store.dispatch(new RemoveParams(action, action.paginationKey, [], removeQs));
+        this.store.dispatch(new AddParams(action, this.eventSource.paginationKey, { q: newQ }));
       }
     });
   }
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-remove-params.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-remove-params.ts
index b81afcd157..4daaa07acb 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-remove-params.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer-remove-params.ts
@@ -1,8 +1,6 @@
-import { QParam } from '../../../../cloud-foundry/src/shared/q-param';
 import { RemoveParams } from '../../actions/pagination.actions';
 import { PaginationEntityState } from '../../types/pagination.types';
 
-// TODO: RC
 export function paginationRemoveParams(state: PaginationEntityState, action: RemoveParams) {
 
   const removeParamsState = {
@@ -12,12 +10,6 @@ export function paginationRemoveParams(state: PaginationEntityState, action: Rem
     }
   };
 
-  if (state.params.q) {
-    removeParamsState.params.q = (state.params.q as string[]).filter((qs: string) => {
-      return !action.qs.find((removeParamKey: string) => QParam.keyFromString(qs) === removeParamKey);
-    });
-  }
-
   action.params.forEach((key) => {
     if (removeParamsState.params.hasOwnProperty(key)) {
       delete removeParamsState.params[key];

From 2c798dbe9d008f73418e64ef331f36a7e34f71c6 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 20 May 2020 15:47:43 +0100
Subject: [PATCH 144/176] Tidy up debugging

---
 src/test-e2e/helpers/cf-helpers.ts      | 3 ---
 src/test-e2e/helpers/request-helpers.ts | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/test-e2e/helpers/cf-helpers.ts b/src/test-e2e/helpers/cf-helpers.ts
index 1d30e3d34b..2c301906ef 100644
--- a/src/test-e2e/helpers/cf-helpers.ts
+++ b/src/test-e2e/helpers/cf-helpers.ts
@@ -168,9 +168,6 @@ export class CFHelpers {
 
   fetchUsers(cnsiGuid): promise.Promise<APIResource<CfUser>[]> {
     return this.cfRequestHelper.sendCfGet<CFResponse<CfUser>>(cnsiGuid, 'users').then(json => {
-      console.log('--------------------------');
-      console.log('fetch users');
-      console.log(JSON.stringify(json, null, 4));
       return json.resources;
     });
   }
diff --git a/src/test-e2e/helpers/request-helpers.ts b/src/test-e2e/helpers/request-helpers.ts
index c2276badb7..d1f681a9b3 100644
--- a/src/test-e2e/helpers/request-helpers.ts
+++ b/src/test-e2e/helpers/request-helpers.ts
@@ -138,10 +138,10 @@ export class RequestHelpers {
       password: creds.password || 'dev'
     };
     return this.sendRequest(req, { method: 'POST', url: 'pp/v1/auth/login/uaa' }, null, formData).catch(e => {
-      console.log('***** createSession failed: ' + retry);
+      e2e.debugLog('CreateSession failed: ' + retry);
       if (retry < 3) {
         e2e.sleep(2500);
-        console.log('Retrying createSession ... ' + retry);
+        e2e.debugLog('CreateSession retrying ... ' + retry + 1);
         return _that.createSession(req, userType, retry + 1);
       } else {
         throw e;

From 6f24ae4555d83425f0ed7775c2f039ead76bf3d4 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 20 May 2020 16:06:58 +0100
Subject: [PATCH 145/176] Fix some unit tests

---
 .../cloud-foundry-space-users.component.spec.ts             | 6 ++----
 .../core/src/core/current-user-permissions.service.spec.ts  | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts
index 73714b2742..3e7cbb2f19 100644
--- a/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-spaces/tabs/cloud-foundry-space-users/cloud-foundry-space-users.component.spec.ts
@@ -1,16 +1,14 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { TabNavService } from '../../../../../../../../../core/tab-nav.service';
-import {
-  CloudFoundrySpaceServiceMock,
-} from '../../../../../../../../../core/test-framework/cloud-foundry-space.service.mock';
 import {
   generateCfBaseTestModules,
-  genera../../../../../../../../ test - framework / cloud - foundry - space.service.mock
+  generateTestCfEndpointServiceProvider,
 } from '../../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import {
   CloudFoundryOrganizationServiceMock,
 } from '../../../../../../../../test-framework/cloud-foundry-organization.service.mock';
+import { CloudFoundrySpaceServiceMock } from '../../../../../../../../test-framework/cloud-foundry-space.service.mock';
 import { CloudFoundryOrganizationService } from '../../../../../services/cloud-foundry-organization.service';
 import { CloudFoundrySpaceService } from '../../../../../services/cloud-foundry-space.service';
 import { CfAdminAddUserWarningComponent } from '../../../../cf-admin-add-user-warning/cf-admin-add-user-warning.component';
diff --git a/src/frontend/packages/core/src/core/current-user-permissions.service.spec.ts b/src/frontend/packages/core/src/core/current-user-permissions.service.spec.ts
index a218218fe7..3e4184df98 100644
--- a/src/frontend/packages/core/src/core/current-user-permissions.service.spec.ts
+++ b/src/frontend/packages/core/src/core/current-user-permissions.service.spec.ts
@@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing';
 import { createBasicStoreModule, createEntityStoreState, TestStoreEntity } from '@stratos/store/testing';
 import { first, tap } from 'rxjs/operators';
 
-import { IFeatureFlag } from '../../../cloud-foundry/src/cf-api.types';
+import { CFFeatureFlagTypes, IFeatureFlag } from '../../../cloud-foundry/src/cf-api.types';
 import { cfEntityFactory } from '../../../cloud-foundry/src/cf-entity-factory';
 import { generateCFEntities } from '../../../cloud-foundry/src/cf-entity-generator';
 import { featureFlagEntityType } from '../../../cloud-foundry/src/cf-entity-types';
@@ -16,7 +16,6 @@ import { PaginationState } from '../../../store/src/types/pagination.types';
 import { AppTestModule } from '../../test-framework/core-test.helper';
 import { endpointEntitySchema } from '../base-entity-schemas';
 import { generateStratosEntities } from '../base-entity-types';
-import { CFFeatureFlagTypes } from '../shared/components/cf-auth/cf-auth.types';
 import {
   CurrentUserPermissions,
   PermissionConfig,

From 8ea28c87ac20971fa84a579b62404a5ae03e1237 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Wed, 20 May 2020 16:19:10 +0100
Subject: [PATCH 146/176] Fix other unit tests

---
 .../edit-autoscaler-credential.component.spec.ts              | 2 +-
 .../cf-space-users/cf-space-users-list-config.service.spec.ts | 4 ++--
 .../list-types/cf-users/cf-user-list-config.service.spec.ts   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.spec.ts b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.spec.ts
index 7db7aed1b8..131139620e 100644
--- a/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.spec.ts
+++ b/src/frontend/packages/cf-autoscaler/src/features/edit-autoscaler-credential/edit-autoscaler-credential.component.spec.ts
@@ -4,10 +4,10 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { ApplicationService } from '../../../../cloud-foundry/src/features/applications/application.service';
+import { ApplicationServiceMock } from '../../../../cloud-foundry/test-framework/application-service-helper';
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../core/tab-nav.service';
-import { ApplicationServiceMock } from '../../../../core/test-framework/application-service-helper';
 import { createBasicStoreModule } from '../../../../store/testing/public-api';
 import { CfAutoscalerTestingModule } from '../../cf-autoscaler-testing.module';
 import { EditAutoscalerCredentialComponent } from './edit-autoscaler-credential.component';
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.spec.ts
index a7705b3dae..17b9e153bf 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-space-users/cf-space-users-list-config.service.spec.ts
@@ -1,11 +1,11 @@
 import { HttpClient, HttpHandler } from '@angular/common/http';
 import { inject, TestBed } from '@angular/core/testing';
 
-import { CloudFoundrySpaceServiceMock } from '../../../../../../../core/test-framework/cloud-foundry-space.service.mock';
 import { generateCfBaseTestModules } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import {
   CloudFoundryOrganizationServiceMock,
-} from '../../../../../../test-framework/cloud../../../../../../test-framework/cloud-foundry-space.service.mock';
+} from '../../../../../../test-framework/cloud-foundry-organization.service.mock';
+import { CloudFoundrySpaceServiceMock } from '../../../../../../test-framework/cloud-foundry-space.service.mock';
 import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
 import { CloudFoundryEndpointService } from '../../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
 import {
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.spec.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.spec.ts
index bacbc667ec..33f477573a 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.spec.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-users/cf-user-list-config.service.spec.ts
@@ -4,14 +4,14 @@ import { Store } from '@ngrx/store';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { CurrentUserPermissionsService } from '../../../../../../../core/src/core/current-user-permissions.service';
-import { CloudFoundrySpaceServiceMock } from '../../../../../../../core/test-framework/cloud-foundry-space.service.mock';
 import {
   generateCfBaseTestModules,
   generateTestCfEndpointServiceProvider,
 } from '../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import {
   CloudFoundryOrganizationServiceMock,
-} from '../../../../../../test-framework/cloud../../../../../../test-framework/cloud-foundry-space.service.mock';
+} from '../../../../../../test-framework/cloud-foundry-organization.service.mock';
+import { CloudFoundrySpaceServiceMock } from '../../../../../../test-framework/cloud-foundry-space.service.mock';
 import { ActiveRouteCfOrgSpace } from '../../../../../features/cloud-foundry/cf-page.types';
 import {
   CloudFoundryOrganizationService,

From e02b8fc4b0125228fab0823d696a55020dbb4daf Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 20 May 2020 16:21:10 +0100
Subject: [PATCH 147/176] Fix retry message

---
 src/test-e2e/helpers/request-helpers.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test-e2e/helpers/request-helpers.ts b/src/test-e2e/helpers/request-helpers.ts
index d1f681a9b3..6100763d53 100644
--- a/src/test-e2e/helpers/request-helpers.ts
+++ b/src/test-e2e/helpers/request-helpers.ts
@@ -141,7 +141,7 @@ export class RequestHelpers {
       e2e.debugLog('CreateSession failed: ' + retry);
       if (retry < 3) {
         e2e.sleep(2500);
-        e2e.debugLog('CreateSession retrying ... ' + retry + 1);
+        e2e.debugLog('CreateSession retrying ... ' + (retry + 1));
         return _that.createSession(req, userType, retry + 1);
       } else {
         throw e;

From 55cd589ee30facb7514c99362bafee48af7726a8 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 20 May 2020 16:31:13 +0100
Subject: [PATCH 148/176] Docker image tweak

---
 deploy/ci/travis/run-e2e-tests.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/deploy/ci/travis/run-e2e-tests.sh b/deploy/ci/travis/run-e2e-tests.sh
index 857930c1ee..6c26992389 100755
--- a/deploy/ci/travis/run-e2e-tests.sh
+++ b/deploy/ci/travis/run-e2e-tests.sh
@@ -9,6 +9,10 @@ echo "Checking docker version"
 
 docker version
 
+# Pull the UAA image, to save time when we run it later
+echo "Spawning docker image pull for uaa container image"
+docker pull splatform/stratos-uaa &
+
 echo "Preparing for e2e tests..."
 
 wget https://travis.capbristol.com/yaml --no-check-certificate -O ./secrets.yaml

From 5859848f144a42bf9d366150dc3defa527b15c34 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 20 May 2020 19:48:56 +0100
Subject: [PATCH 149/176] Fix retry mechanism

---
 src/test-e2e/helpers/request-helpers.ts | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/test-e2e/helpers/request-helpers.ts b/src/test-e2e/helpers/request-helpers.ts
index 6100763d53..7489c58712 100644
--- a/src/test-e2e/helpers/request-helpers.ts
+++ b/src/test-e2e/helpers/request-helpers.ts
@@ -130,23 +130,33 @@ export class RequestHelpers {
    * @description Create a session
    * @param {object} req - the request
    */
-  createSession(req, userType: ConsoleUserType, retry = 1): promise.Promise<any> {
+  createSession(req, userType: ConsoleUserType, retry = 1, p = null): promise.Promise<any> {
     const _that = this;
+
+    if (!p) {
+      p = promise.defer<any>();
+    }
+
     const creds = e2e.secrets.getConsoleCredentials(userType);
     const formData = {
       username: creds.username || 'dev',
       password: creds.password || 'dev'
     };
-    return this.sendRequest(req, { method: 'POST', url: 'pp/v1/auth/login/uaa' }, null, formData).catch(e => {
+
+    this.sendRequest(req, { method: 'POST', url: 'pp/v1/auth/login/uaa' }, null, formData)
+    .then(r => p.resolve(r))
+    .catch(e => {
       e2e.debugLog('CreateSession failed: ' + retry);
       if (retry < 3) {
         e2e.sleep(2500);
         e2e.debugLog('CreateSession retrying ... ' + (retry + 1));
-        return _that.createSession(req, userType, retry + 1);
+        _that.createSession(req, userType, retry + 1, p);
       } else {
-        throw e;
+        p.reject(e);
       }
-    })
+    });
+
+    return p.promise;
   }
 
   // /**

From 400e05fe8bdc2158576443a2f44a753ca907a298 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 20 May 2020 20:08:53 +0100
Subject: [PATCH 150/176] Implement retry on all api calls

---
 src/test-e2e/helpers/request-helpers.ts | 37 ++++++++-----------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/test-e2e/helpers/request-helpers.ts b/src/test-e2e/helpers/request-helpers.ts
index 7489c58712..af8157991c 100644
--- a/src/test-e2e/helpers/request-helpers.ts
+++ b/src/test-e2e/helpers/request-helpers.ts
@@ -67,9 +67,9 @@ export class RequestHelpers {
    * @param {object?} body - the request body
    * @param {object?} formData - the form data
    */
-  sendRequest(req, options, body?: any, formData?): promise.Promise<any> {
-
-    const p = promise.defer<any>();
+  sendRequest(req, options, body?: any, formData?, promize = null, retry = 0): promise.Promise<any> {
+    const _that = this;
+    const p = promize || promise.defer<any>();
     const reqObj = req || this.newRequest();
 
     options.url = this.getHost() + '/' + options.url;
@@ -99,7 +99,13 @@ export class RequestHelpers {
       // E2E.debugLog('ERROR');
       // E2E.debugLog(e);
       E2E.debugLog('   - ERR: ' + e.statusCode + ' : ' + e.message);
-      p.reject(e);
+      if (retry < 2) {
+        retry++;
+        E2E.debugLog('   - Retrying .... ' + retry);
+        _that.sendRequest(req, options, body, formData, p, retry);
+      } else {
+        p.reject(e);
+      }
     });
 
     return p.promise;
@@ -130,33 +136,14 @@ export class RequestHelpers {
    * @description Create a session
    * @param {object} req - the request
    */
-  createSession(req, userType: ConsoleUserType, retry = 1, p = null): promise.Promise<any> {
-    const _that = this;
-
-    if (!p) {
-      p = promise.defer<any>();
-    }
-
+  createSession(req, userType: ConsoleUserType): promise.Promise<any> {
     const creds = e2e.secrets.getConsoleCredentials(userType);
     const formData = {
       username: creds.username || 'dev',
       password: creds.password || 'dev'
     };
 
-    this.sendRequest(req, { method: 'POST', url: 'pp/v1/auth/login/uaa' }, null, formData)
-    .then(r => p.resolve(r))
-    .catch(e => {
-      e2e.debugLog('CreateSession failed: ' + retry);
-      if (retry < 3) {
-        e2e.sleep(2500);
-        e2e.debugLog('CreateSession retrying ... ' + (retry + 1));
-        _that.createSession(req, userType, retry + 1, p);
-      } else {
-        p.reject(e);
-      }
-    });
-
-    return p.promise;
+    return this.sendRequest(req, { method: 'POST', url: 'pp/v1/auth/login/uaa' }, null, formData);
   }
 
   // /**

From 5f4caa7b3364f783999b1d9c20f92b41964007ee Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 20 May 2020 20:27:01 +0100
Subject: [PATCH 151/176] Fix retry mechanism

---
 src/test-e2e/helpers/request-helpers.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/test-e2e/helpers/request-helpers.ts b/src/test-e2e/helpers/request-helpers.ts
index af8157991c..78f140a6ae 100644
--- a/src/test-e2e/helpers/request-helpers.ts
+++ b/src/test-e2e/helpers/request-helpers.ts
@@ -67,9 +67,7 @@ export class RequestHelpers {
    * @param {object?} body - the request body
    * @param {object?} formData - the form data
    */
-  sendRequest(req, options, body?: any, formData?, promize = null, retry = 0): promise.Promise<any> {
-    const _that = this;
-    const p = promize || promise.defer<any>();
+  sendRequest(req, options, body?: any, formData?): promise.Promise<any> {
     const reqObj = req || this.newRequest();
 
     options.url = this.getHost() + '/' + options.url;
@@ -86,10 +84,15 @@ export class RequestHelpers {
 
     E2E.debugLog('REQ: ' + options.method + ' ' + options.url);
     this.showOptions(options);
+    return this.retryRequest(reqObj, options, body, formData);
+  }
+
+  retryRequest(reqObj, options, body?: any, formData?, promize = null, retry = 0): promise.Promise<any> {
+    const _that = this;
+    const p = promize || promise.defer<any>();
 
     reqObj(options).then((response) => {
       E2E.debugLog('   + OK : ' + response.statusCode);
-
       // Get XSRF Token
       if (response.headers && response.headers['x-xsrf-token']) {
         reqObj._xsrfToken = response.headers['x-xsrf-token'];
@@ -101,8 +104,8 @@ export class RequestHelpers {
       E2E.debugLog('   - ERR: ' + e.statusCode + ' : ' + e.message);
       if (retry < 2) {
         retry++;
-        E2E.debugLog('   - Retrying .... ' + retry);
-        _that.sendRequest(req, options, body, formData, p, retry);
+        E2E.debugLog('   - Retrying ' + options.method + ' ' + options.url + ' [' + retry + ']');
+        _that.retryRequest(reqObj, options, body, formData, p, retry);
       } else {
         p.reject(e);
       }

From 4b4db2a6600df53ed738c46a57352b8edc84e902 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Wed, 20 May 2020 20:42:46 +0100
Subject: [PATCH 152/176] Fix ertry when 401

---
 src/test-e2e/helpers/request-helpers.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test-e2e/helpers/request-helpers.ts b/src/test-e2e/helpers/request-helpers.ts
index 78f140a6ae..eb82f3489c 100644
--- a/src/test-e2e/helpers/request-helpers.ts
+++ b/src/test-e2e/helpers/request-helpers.ts
@@ -102,7 +102,7 @@ export class RequestHelpers {
       // E2E.debugLog('ERROR');
       // E2E.debugLog(e);
       E2E.debugLog('   - ERR: ' + e.statusCode + ' : ' + e.message);
-      if (retry < 2) {
+      if (e.statusCode !== 401 && retry < 2) {
         retry++;
         E2E.debugLog('   - Retrying ' + options.method + ' ' + options.url + ' [' + retry + ']');
         _that.retryRequest(reqObj, options, body, formData, p, retry);

From 7cea7c0884b933088a285a18b2339b3743069888 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Wed, 20 May 2020 21:38:32 +0100
Subject: [PATCH 153/176] Update .travis.yml

---
 .travis.yml | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 02c9594754..7f87e2619e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,6 @@ sudo: required
 dist: bionic
 services:
   - docker
-env:
-  - STRATOS_E2E_DEBUG=true
 addons:
   chrome: stable
 before_install:
@@ -33,6 +31,19 @@ stages:
   - Test
 jobs:
   include:
+    - stage: Lint
+      name: Frontend Lint
+      script:
+        - npm run lint
+    - name: Backend Lint
+      before_script:
+        - curl -sL -o ~/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
+        - chmod +x ~/bin/gimme
+        - eval "$(gimme 1.13.4)"
+        - go get -u golang.org/x/lint/golint
+      script:
+        - golint src/jetstream/...
+        - ./deploy/ci/travis/update-go-report-card.sh
     - stage: Build
       name: Build Frontend and Backend
       env:
@@ -53,11 +64,34 @@ jobs:
         - eval "$(gimme 1.13.4)"
       script:
         - npm run test-backend
+    - name: Helm Chart Unit Tests
+      script:
+        - "./deploy/ci/travis/helm-chart-unit-tests.sh"
+    - name: E2E Tests - Long Suites
+      before_script:
+        - "./deploy/ci/travis/job-e2e-before_script.sh"
+      script:
+        - "./deploy/ci/travis/job-e2e-script.sh longSuite"
+    - name: E2E Tests - Manage Users
+      before_script:
+        - "./deploy/ci/travis/job-e2e-before_script.sh true"
+      script:
+        - "./deploy/ci/travis/job-e2e-script.sh manageUsers"
+    - name: E2E Tests - Core
+      before_script:
+        - "./deploy/ci/travis/job-e2e-before_script.sh true"
+      script:
+        - "./deploy/ci/travis/job-e2e-script.sh core"
     - name: E2E Tests - Autoscaler
       before_script:
         - "./deploy/ci/travis/job-e2e-before_script.sh"
       script:
         - "./deploy/ci/travis/job-e2e-script.sh autoscaler"
+    - name: E2E Tests - All Other Suite
+      before_script:
+        - "./deploy/ci/travis/job-e2e-before_script.sh"
+      script:
+        - "./deploy/ci/travis/job-e2e-script.sh fullMinusOtherSuites"
 notifications:
   slack:
     secure: s5SFnFKwzfxLrjGR5lJ2AJG1FSWCKtHdQi8K2Kmx5ZhrYL/7P+KLc/ks18WnzCPoy705LbHCBSULcnWbLjqCpnkKxNjsFAyFl2nZZPxBjl2/mHpulbr3gmultDOrMDbmYL4oWPKBlxKResElz9nQwknlLWZ/L94AIx8zuMfRIWdEt1bJBDAQts4fx2D4cIEx0yZUq7JGAKjSiXKR9eDyMWFb+SWw6mvr5WtFM8uq35rPvRVEfm56LIgSuMUpVeYtnYiY2JP7W8iKX0gD+54wAiSXRZiQVCLJq606/TlJo7j8Na9Dn1Q5XDkX3b3XzcgmEZThoO1GFtv3yNYOVxv+50p2tSnc8CT0VEVOYOGJuz17AESZAYK+AyjEmeZmDiroj1czmIq8/ZYKbmvDYSZgGuDcSkQurX/6BPac6ra69WmSQmwv0tS3A/IzDw7X+CuC+3QubQ7GfaiVe25PUU+tRSEDM4PMUJY8QRF5Q+oeN5NjjWmJBqf/ic2TO2xTU1j+qysdqK34qIV1qyVcPMUIiYW+5ltH71qiy05TSvvfGS+oatRBMzINRl3zl2gOV1CKNU801XehRKCx9XDCw5NL1HSx5HD5psOyBRpAMYYBOqa+rv9VAza9MsfpslCoibg5rdrq4rZqqUgRhayNp/LKzlhe/g62+qbGNT+iFuHtB+Y=

From 599289381d3bcf84408ce63836207f2ccf593530 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 21 May 2020 08:44:28 +0100
Subject: [PATCH 154/176] Tweak logging

---
 deploy/ci/travis/e2e-build-script.sh      | 8 +++++---
 deploy/ci/travis/job-e2e-before_script.sh | 3 +++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/deploy/ci/travis/e2e-build-script.sh b/deploy/ci/travis/e2e-build-script.sh
index 0021032ab3..48f58af62f 100755
--- a/deploy/ci/travis/e2e-build-script.sh
+++ b/deploy/ci/travis/e2e-build-script.sh
@@ -13,12 +13,12 @@ LOCAL_BUILD="true"
 # TRAVIS_COMMIT
 
 if [ -z "$TRAVIS_REPO_SLUG" ]; then
-  echo "Need to be running in Trvis"
+  echo "Need to be running in Travis"
   exit 1
 fi
 
 if [ -z "$TRAVIS_COMMIT" ]; then
-  echo "Need to be running in Trvis"
+  echo "Need to be running in Travis"
   exit 1
 fi
 
@@ -40,9 +40,11 @@ function tryGetExistingBuild() {
   if [ $? -eq 0 ]; then
     # We found an existing build, so download and unpack it
     echo "Downloading build package"
-    tar -xvf ${GZIP_NAME}
+    tar -xvf ${GZIP_NAME} > /dev/null
     if [ $? -eq 0 ]; then
       LOCAL_BUILD="false"
+    else 
+      echo "Failed to untar the build package"
     fi
     rm -rf ${GZIP_NAME}
   fi
diff --git a/deploy/ci/travis/job-e2e-before_script.sh b/deploy/ci/travis/job-e2e-before_script.sh
index d744d27824..2f1436857c 100755
--- a/deploy/ci/travis/job-e2e-before_script.sh
+++ b/deploy/ci/travis/job-e2e-before_script.sh
@@ -5,6 +5,9 @@ MAILCATCHER=$1
 
 DIRPATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd ../../.. && pwd)"
 
+if [ "${MAILCATCHER}" == "true" ]; then
+  docker pull tophfr/mailcatcher &
+fi
 chmod +x ${DIRPATH}/deploy/ci/travis/run-e2e-tests.sh
 # We will install ffmpeg so we can capture a video of the display as the tests run
 # sudo apt-get update

From 7f40abae2739d6eac0b042614f9a38f6f6f5157c Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 21 May 2020 09:34:12 +0100
Subject: [PATCH 155/176] Add console logging during e2e tests

---
 package-lock.json                       | 43 +++++++++++++++++++++++++
 package.json                            |  1 +
 protractor.conf.js                      |  5 +++
 src/test-e2e/helpers/request-helpers.ts |  2 --
 4 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7da7d984c1..5682f9248e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14590,6 +14590,49 @@
         }
       }
     },
+    "protractor-console": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/protractor-console/-/protractor-console-3.0.0.tgz",
+      "integrity": "sha512-2BTh751CMjEAMxuZXb86jvs0TDWjvCk7fCnKTyb5vX/KE5f+olTeVCmcFm+4Aretpc6q/6yryuSJ8wjgL9QTKw==",
+      "dev": true,
+      "requires": {
+        "chalk": "^1.1.0",
+        "lodash": "^3.10.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
     "proxy-addr": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
diff --git a/package.json b/package.json
index 6e13f65f74..553d37662f 100644
--- a/package.json
+++ b/package.json
@@ -134,6 +134,7 @@
     "ng-packagr": "^9.1.1",
     "npm-run-all": "^4.1.5",
     "protractor": "^5.4.3",
+    "protractor-console": "^3.0.0",
     "ps-node": "^0.1.6",
     "q": "^1.4.1",
     "replace-in-file": "^5.0.2",
diff --git a/protractor.conf.js b/protractor.conf.js
index 0982165e4b..fc90778a5c 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -170,6 +170,10 @@ const config = {
     print: function () {}
   },
   params: secrets,
+  plugins: [{
+    package: 'protractor-console',
+    logLevels: ['info', 'warning', 'severe']
+  }],  
   onPrepare() {
     // https://webdriver.io/docs/api/chromium.html#setnetworkconditions
     // browser.driver.setNetworkConditions({
@@ -257,6 +261,7 @@ const config = {
 if (process.env['STRATOS_E2E_BASE_URL']) {
   config.baseUrl = process.env['STRATOS_E2E_BASE_URL'];
 }
+
 exports.config = config
 // Should we run e2e tests in headless Chrome?
 const headless = secrets.headless || process.env['STRATOS_E2E_HEADLESS'];
diff --git a/src/test-e2e/helpers/request-helpers.ts b/src/test-e2e/helpers/request-helpers.ts
index eb82f3489c..2d440ef58a 100644
--- a/src/test-e2e/helpers/request-helpers.ts
+++ b/src/test-e2e/helpers/request-helpers.ts
@@ -99,8 +99,6 @@ export class RequestHelpers {
       }
       p.fulfill(response.body);
     }).catch((e) => {
-      // E2E.debugLog('ERROR');
-      // E2E.debugLog(e);
       E2E.debugLog('   - ERR: ' + e.statusCode + ' : ' + e.message);
       if (e.statusCode !== 401 && retry < 2) {
         retry++;

From 86b8dd8e0927ebe5f7df2ebcb206818a7086f9c4 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 21 May 2020 09:59:58 +0100
Subject: [PATCH 156/176] Extend setup timeout

---
 src/test-e2e/e2e.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/test-e2e/e2e.ts b/src/test-e2e/e2e.ts
index f5f8550002..f011ced852 100644
--- a/src/test-e2e/e2e.ts
+++ b/src/test-e2e/e2e.ts
@@ -204,6 +204,10 @@ export class E2ESetup {
   private doSetup() {
     const p = promise.fulfilled(true);
 
+    // Extend the timeout for setup
+    const originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
+    jasmine.DEFAULT_TIMEOUT_INTERVAL = 30000;
+
     // Create the sessions neeed
     if (this.needAdminSession) {
       p.then(() => this.createSession(this.adminReq, ConsoleUserType.admin));
@@ -217,6 +221,9 @@ export class E2ESetup {
       p.then(() => protractor.promise.controlFlow().execute(() => op.bind(this)()));
     });
 
+    // Reset timeout
+    p.then(() => protractor.promise.controlFlow().execute(() => jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout));
+
     return promise;
   }
 

From 04ac0b9c61c64095875b5834c14c9809b7074eac Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 21 May 2020 10:30:33 +0100
Subject: [PATCH 157/176] Bump timeout, run UAA ealier

---
 deploy/ci/travis/job-e2e-before_script.sh | 6 +++---
 deploy/ci/travis/run-e2e-tests.sh         | 6 ------
 src/test-e2e/e2e.ts                       | 2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/deploy/ci/travis/job-e2e-before_script.sh b/deploy/ci/travis/job-e2e-before_script.sh
index 2f1436857c..b64b536ec5 100755
--- a/deploy/ci/travis/job-e2e-before_script.sh
+++ b/deploy/ci/travis/job-e2e-before_script.sh
@@ -5,9 +5,6 @@ MAILCATCHER=$1
 
 DIRPATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd ../../.. && pwd)"
 
-if [ "${MAILCATCHER}" == "true" ]; then
-  docker pull tophfr/mailcatcher &
-fi
 chmod +x ${DIRPATH}/deploy/ci/travis/run-e2e-tests.sh
 # We will install ffmpeg so we can capture a video of the display as the tests run
 # sudo apt-get update
@@ -19,6 +16,9 @@ if [ "${MAILCATCHER}" == "true" ]; then
   docker run -d -p 1080:80 -p 1025:25 --name mail tophfr/mailcatcher
 fi
 
+# Start a local UAA - this will take a few seconds to come up in the background
+docker run -d -p 8080:8080 splatform/stratos-uaa
+
 # Check that the S3 server is available
 curl -k --max-time 20 ${AWS_ENDPOINT}
 if [ $? -ne 0 ]; then
diff --git a/deploy/ci/travis/run-e2e-tests.sh b/deploy/ci/travis/run-e2e-tests.sh
index 6c26992389..deaaa724e4 100755
--- a/deploy/ci/travis/run-e2e-tests.sh
+++ b/deploy/ci/travis/run-e2e-tests.sh
@@ -9,10 +9,6 @@ echo "Checking docker version"
 
 docker version
 
-# Pull the UAA image, to save time when we run it later
-echo "Spawning docker image pull for uaa container image"
-docker pull splatform/stratos-uaa &
-
 echo "Preparing for e2e tests..."
 
 wget https://travis.capbristol.com/yaml --no-check-certificate -O ./secrets.yaml
@@ -44,8 +40,6 @@ fi
 
 echo "Using local deployment for e2e tests"
 # Quick deploy locally
-# Start a local UAA - this will take a few seconds to come up in the background
-docker run -d -p 8080:8080 splatform/stratos-uaa
 
 # Build if needed or use existing build for this commit
 DIRNAME="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
diff --git a/src/test-e2e/e2e.ts b/src/test-e2e/e2e.ts
index f011ced852..49318abf03 100644
--- a/src/test-e2e/e2e.ts
+++ b/src/test-e2e/e2e.ts
@@ -206,7 +206,7 @@ export class E2ESetup {
 
     // Extend the timeout for setup
     const originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
-    jasmine.DEFAULT_TIMEOUT_INTERVAL = 30000;
+    jasmine.DEFAULT_TIMEOUT_INTERVAL = 120000;
 
     // Create the sessions neeed
     if (this.needAdminSession) {

From 1b4df49bc9c0816cab919e4f076544e26524226f Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 21 May 2020 10:53:35 +0100
Subject: [PATCH 158/176] Enable e2e logging to be toggled by a label

---
 deploy/ci/travis/check-e2e-pr.sh  | 12 ++++++++++++
 deploy/ci/travis/run-e2e-tests.sh |  5 +++++
 2 files changed, 17 insertions(+)
 create mode 100755 deploy/ci/travis/check-e2e-pr.sh

diff --git a/deploy/ci/travis/check-e2e-pr.sh b/deploy/ci/travis/check-e2e-pr.sh
new file mode 100755
index 0000000000..89ab5b6346
--- /dev/null
+++ b/deploy/ci/travis/check-e2e-pr.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [ -n "${TRAVIS_PULL_REQUEST}" ]; then
+  if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
+    echo "Checking labels on ${TRAVIS_PULL_REQUEST_SLUG} #${TRAVIS_PULL_REQUEST}"
+    LABEL=$(curl -s "https://api.github.com/repos/${TRAVIS_PULL_REQUEST_SLUG}/pulls/${TRAVIS_PULL_REQUEST}" | jq -r '.labels[] | select(.name == "e2e-debug") | .name')
+    if [ "${LABEL}" == "e2e-debug" ]; then
+      echo "PR has the 'e2e-debug' label - enabling debug logging for E2E tests"
+      export STRATOS_E2E_DEBUG=true
+    fi
+  fi
+fi
diff --git a/deploy/ci/travis/run-e2e-tests.sh b/deploy/ci/travis/run-e2e-tests.sh
index 857930c1ee..0d8017bf06 100755
--- a/deploy/ci/travis/run-e2e-tests.sh
+++ b/deploy/ci/travis/run-e2e-tests.sh
@@ -5,6 +5,8 @@ set -e
 echo "Stratos e2e tests"
 echo "================="
 
+DIRPATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd ../../.. && pwd)"
+
 echo "Checking docker version"
 
 docker version
@@ -64,6 +66,9 @@ export STRATOS_E2E_BASE_URL="https://127.0.0.1:5443"
 
 E2E_TARGET="e2e -- --no-webdriver-update --dev-server-target= --base-url=https://127.0.0.1:5443 --suite=${SUITE}"
 
+# Set Stratos debug if running a PR with the appropriate label
+source "${DIRPATH}/deploy/ci/travis/check-e2e-pr.sh"
+
 # Capture video if configured
 if [ "$CAPTURE_VIDEO" == "video" ]; then
   echo "Waiting for ffmpeg install to complete..."

From 0a2b4d1a41867b6620eb7bd2310dab4ea12d9ad3 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 21 May 2020 10:55:48 +0100
Subject: [PATCH 159/176] Ensure we don't log passwords in e2e logs

---
 src/test-e2e/helpers/request-helpers.ts | 26 +++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/test-e2e/helpers/request-helpers.ts b/src/test-e2e/helpers/request-helpers.ts
index 8567263a7e..24290b3037 100644
--- a/src/test-e2e/helpers/request-helpers.ts
+++ b/src/test-e2e/helpers/request-helpers.ts
@@ -85,7 +85,7 @@ export class RequestHelpers {
     }
 
     E2E.debugLog('REQ: ' + options.method + ' ' + options.url);
-    E2E.debugLog('   > ' + JSON.stringify(options));
+    this.showOptions(options);
 
     reqObj(options).then((response) => {
       E2E.debugLog('OK');
@@ -96,15 +96,33 @@ export class RequestHelpers {
       }
       p.fulfill(response.body);
     }).catch((e) => {
-      E2E.debugLog('ERROR');
-      E2E.debugLog(e);
-      E2E.debugLog(e.statusCode + ' : ' + e.message);
+      E2E.debugLog('ERR: ' + e.statusCode + ' : ' + e.message);
       p.reject(e);
     });
 
     return p.promise;
   }
 
+  showOptions(options: any) {
+    if (!options) {
+      return;
+    }
+    const cpy = JSON.parse(JSON.stringify(options));
+    this.sanitizeOption(cpy);
+    E2E.debugLog('   > ' + JSON.stringify(cpy));
+  }
+
+  sanitizeOption(options) {
+    Object.keys(options).forEach(key => {
+      const v = options[key];
+      if (typeof v === 'string' && key === 'password') {
+        options[key] = '******';
+      } else if  (typeof v === 'object') {
+        this.sanitizeOption(options[key]);
+      }
+    });
+  }
+
   /**
    * @createSession
    * @description Create a session

From 566418e92e18fd1ef5439d69eeb6984f06c8892b Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil.macdougall@suse.com>
Date: Thu, 21 May 2020 11:00:38 +0100
Subject: [PATCH 160/176] Give more time for the tab to appear

---
 src/test-e2e/application/po/application-page.po.ts | 2 +-
 src/test-e2e/po/page-tabs.po.ts                    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test-e2e/application/po/application-page.po.ts b/src/test-e2e/application/po/application-page.po.ts
index d66ebd7f64..3fecf14176 100644
--- a/src/test-e2e/application/po/application-page.po.ts
+++ b/src/test-e2e/application/po/application-page.po.ts
@@ -65,7 +65,7 @@ export class ApplicationBasePage extends CFPage {
   }
 
   public waitForAutoscalerTab() {
-    return this.tabs.waitForItem('Autoscale');
+    return this.tabs.waitForItem('Autoscale', 15000);
   }
 
   private goToTab(label: string, urlSuffix: string) {
diff --git a/src/test-e2e/po/page-tabs.po.ts b/src/test-e2e/po/page-tabs.po.ts
index aaad18682b..9742f153e0 100644
--- a/src/test-e2e/po/page-tabs.po.ts
+++ b/src/test-e2e/po/page-tabs.po.ts
@@ -11,7 +11,7 @@ export class MenuItem {
   index: number;
   label: string;
   class: string;
-  click: Function;
+  click: () => {};
   disabled: boolean;
 }
 
@@ -46,9 +46,9 @@ export class PageTabsPo extends Component {
     return this.getItem(name).click();
   }
 
-  waitForItem(name: string): promise.Promise<void> {
+  waitForItem(name: string, waitDuration?: number): promise.Promise<void> {
     const item = new Component(this.getItem(name));
-    return item.waitUntilShown();
+    return item.waitUntilShown(`Waiting for tab: ${name} to be shown`, waitDuration);
   }
 
   goToItemAndWait(name: string, baseUrl: string, suffix: string): promise.Promise<any> {

From 6b738e7eb6383db019dc63b6f970b3a472a7e176 Mon Sep 17 00:00:00 2001
From: Aaron Gershman <5619476+aegershman@users.noreply.github.com>
Date: Thu, 21 May 2020 11:34:21 -0500
Subject: [PATCH 161/176] update kubernetes deploy doc to reference
 uaa.endpoint

noticed that in this commit which updates the stratos console uaa configuration to be simpler and leverage "uaa.endpoint" that the README was using an example referencing "uaa.url" (which I don't think is a param reference? could be wrong?) and still including uaa.port, uaa.host, etc., though it appears that was all replaced by `uaa.endpoint`

no rush; would appreciate if someone double-checked this, I didn't completely confirm or test this, to be honest. I'll look more into it this evening after work. apologies if I'm dead wrong.

thanks for the time
---
 deploy/kubernetes/console/README.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/deploy/kubernetes/console/README.md b/deploy/kubernetes/console/README.md
index dee1153dd4..50e003ce52 100644
--- a/deploy/kubernetes/console/README.md
+++ b/deploy/kubernetes/console/README.md
@@ -283,10 +283,7 @@ UAA configuration can be specified by providing the following configuration.
 Create a yaml file with the content below and and update according to your environment and save to a file called `uaa-config.yaml`.
 ```
 uaa:
-  url: https://uaa.cf-dev.io:2793
-  protocol: https://
-  port: 2793
-  host: uaa.cf-dev.io
+  endpoint: https://uaa.cf-dev.io:2793
   consoleClient:  cf
   consoleClientSecret: 
   consoleAdminIdentifier: cloud_controller.admin 

From 6d22276afbb320facd6fdba336fd9a9aa180eea3 Mon Sep 17 00:00:00 2001
From: Aaron Gershman <5619476+aegershman@users.noreply.github.com>
Date: Thu, 21 May 2020 11:39:28 -0500
Subject: [PATCH 162/176] k8s console deploy doc reference chart 3.2.0, fixup
 helm repo search console

- bumps doc to point to 3.2.0
- fixes the `helm search` command to `helm repo search` (at least that's what it is for helm3?)
---
 deploy/kubernetes/console/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/kubernetes/console/README.md b/deploy/kubernetes/console/README.md
index 50e003ce52..e4c920c061 100644
--- a/deploy/kubernetes/console/README.md
+++ b/deploy/kubernetes/console/README.md
@@ -20,9 +20,9 @@ helm repo add stratos https://cloudfoundry.github.io/stratos
 Check the repository was successfully added by searching for the `console`, for example:
 
 ```
-helm search console
+helm search repo console
 NAME               	CHART VERSION   APP VERSION	DESCRIPTION                                  
-stratos/console    	3.1.0           3.1.0      	A Helm chart for deploying Stratos UI Console
+stratos/console    	3.2.0           3.2.0      	A Helm chart for deploying Stratos UI Console
 ```
 
 > Note: Version numbers will depend on the version of Stratos available from the Helm repository

From 5dd26c903de66812628c4a5a6a90e91145ebc19d Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Thu, 21 May 2020 21:42:20 +0100
Subject: [PATCH 163/176] FIx issue with Angular build optimizer

---
 .../src/core/autoscaler.module.ts             |  5 +++++
 .../src/core/extension/extension-service.ts   | 22 +++++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
index c9a9c57078..bcde9e7af0 100644
--- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
+++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
@@ -47,6 +47,8 @@ import {
   AppAutoscalerComboSeriesVerticalComponent,
 } from '../shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component';
 import { AutoscalerRoutingModule } from './autoscaler.routing';
+import { ExtensionService } from 'frontend/packages/core/src/core/extension/extension-service';
+import { AutoscalerTabExtensionComponent } from '../features/autoscaler-tab-extension/autoscaler-tab-extension.component';
 
 
 @NgModule({
@@ -56,6 +58,9 @@ import { AutoscalerRoutingModule } from './autoscaler.routing';
     AutoscalerRoutingModule,
     NgxChartsModule,
     CloudFoundrySharedModule,
+    ExtensionService.declare([
+      AutoscalerTabExtensionComponent,
+    ])
   ],
   declarations: [
     AutoscalerBaseComponent,
diff --git a/src/frontend/packages/core/src/core/extension/extension-service.ts b/src/frontend/packages/core/src/core/extension/extension-service.ts
index 33664e86b5..f91ee90b0a 100644
--- a/src/frontend/packages/core/src/core/extension/extension-service.ts
+++ b/src/frontend/packages/core/src/core/extension/extension-service.ts
@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, NgModule, ModuleWithProviders } from '@angular/core';
 import { ActivatedRoute, Route, Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
@@ -90,14 +90,6 @@ function addExtensionTab(tab: StratosTabType, target: any, props: StratosTabMeta
   if (!extensionMetadata.extensionRoutes[tab]) {
     extensionMetadata.extensionRoutes[tab] = [];
   }
-
-  extensionMetadata.extensionRoutes[tab].push({
-    path: props.link,
-    component: target
-  });
-  extensionMetadata.tabs[tab].push({
-    ...props
-  });
 }
 
 function addExtensionAction(action: StratosActionType, target: any, props: StratosActionMetadata) {
@@ -120,6 +112,14 @@ export class ExtensionService {
 
   constructor(private router: Router) { }
 
+  // Declare extensions - this is a trick to ensure the Angular Build Optimiser does not
+  // optimize out any extension components
+  public static declare(components: any[]): ModuleWithProviders {
+    return {
+      ngModule: ExtEmptyModule
+    };
+  }
+
   /**
    * Initialize the extensions - to be invoked in the AppModule
    */
@@ -184,3 +184,7 @@ export function getTabsFromExtensions(tabType: StratosTabType): IPageSideNavTab[
 export function getActionsFromExtensions(actionType: StratosActionType): StratosActionMetadata[] {
   return extensionMetadata.actions[actionType] || [];
 }
+
+// Empty module used to support the registration of Extension Components
+@NgModule()
+export class ExtEmptyModule { }

From d9fb11f0d40a77056913c50f76f2fd5ea2018f71 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Fri, 22 May 2020 10:26:57 +0100
Subject: [PATCH 164/176] Fixes related to using browser back to starting point
 (#4288)

* Fix exception SidePanelService: container already set on browser back to & return from login
- hit browser back button until login screen temporarily hit
- ERROR Error: SidePanelService: container already set thrown
- This was due to DashboardBaseComponent initialising the side panel twice, once per nav from login pages
- fix is to ensure the panel service only lives in the DashboardBaseComponent rather than whole app

* Ensure initialRequest process is only set up once

* Fix issue where additional pages are refretched after return from log
- nav to marketplace. marketplace should contain over 100 services
- hit browser back to temporarily go to login page and back
- non-first pages were refetched, with one causing a 'write to protected obj' error
```
entity-request-pipeline.ts:94 TypeError: Cannot assign to read only property 'cfGuid' of object '[object Object]'
    at globalSuccessfulRequestDataMapper (cf-entity-generator.ts:173)
    at map-multi-endpoint.pipes.ts:37
    at Array.reduce (<anonymous>)
    at map-multi-endpoint.pipes.ts:35
    at Array.reduce (<anonymous>)
    at getEntities (map-multi-endpoint.pipes.ts:31)
    at map-multi-endpoint.pipes.ts:102
    at Array.map (<anonymous>)
    at mapMultiEndpointResponses (map-multi-endpoint.pipes.ts:101)
    at MapSubscriber.project (entity-pagination-request-pipeline.ts:134)
```

* Fix `+` icon in service summary page

* Fix side panel

* Revert "Fix `+` icon in service summary page"

This reverts commit e5d3916db0a8c61fba666c5b11ed7bafd07c762a.
---
 .../dashboard-base/dashboard-base.component.ts    |  1 +
 .../src/shared/services/side-panel.service.ts     | 15 +++++++++++++--
 .../entity-pagination-request-pipeline.ts         | 14 +++++++-------
 .../pagination-iterator.pipe.ts                   | 12 ++++++------
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts
index 5f0dd43422..327b3bfd4d 100644
--- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts
+++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts
@@ -150,6 +150,7 @@ export class DashboardBaseComponent implements OnInit, OnDestroy, AfterViewInit
   ngOnDestroy() {
     this.mobileSub.unsubscribe();
     this.closeSub.unsubscribe();
+    this.sidePanelService.unsetContainer();
   }
 
   isNoMarginView(route: ActivatedRouteSnapshot): boolean {
diff --git a/src/frontend/packages/core/src/shared/services/side-panel.service.ts b/src/frontend/packages/core/src/shared/services/side-panel.service.ts
index e2a13675cd..2b86182a17 100644
--- a/src/frontend/packages/core/src/shared/services/side-panel.service.ts
+++ b/src/frontend/packages/core/src/shared/services/side-panel.service.ts
@@ -1,8 +1,15 @@
-import { ComponentFactory, ComponentFactoryResolver, ComponentRef, Injectable, ViewContainerRef, Inject } from '@angular/core';
+import { DOCUMENT } from '@angular/common';
+import {
+  ComponentFactory,
+  ComponentFactoryResolver,
+  ComponentRef,
+  Inject,
+  Injectable,
+  ViewContainerRef,
+} from '@angular/core';
 import { Router } from '@angular/router';
 import { asapScheduler, BehaviorSubject, Observable, Subject } from 'rxjs';
 import { filter, observeOn, publishReplay, refCount, tap } from 'rxjs/operators';
-import { DOCUMENT } from '@angular/common';
 
 /**
  * Service to allow the overlay side panel to be shown or hidden.
@@ -35,6 +42,10 @@ export class SidePanelService {
     this.setupRouterListener();
   }
 
+  public unsetContainer() {
+    this.container = undefined;
+  }
+
   public setContainer(container: ViewContainerRef) {
     if (this.container) {
       throw new Error('SidePanelService: container already set');
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-pagination-request-pipeline.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-pagination-request-pipeline.ts
index 163ec04dc5..fa82840e99 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-pagination-request-pipeline.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-pagination-request-pipeline.ts
@@ -52,17 +52,17 @@ function getRequestObservable(
   request: HttpRequest<any>,
   paginationPageIterator?: PaginationPageIterator
 ): Observable<PagedJetstreamResponse> {
-  const initialRequest = makeRequestEntityPipe(
-    httpClient,
-    request,
-    entityCatalog.getEndpoint(action.endpointType, action.subType),
-    action.endpointGuid,
-    action.externalRequest
-  );
   if (action.flattenPagination && !paginationPageIterator) {
     console.warn('Action requires all request pages but no page flattener was given.');
   }
   if (!action.flattenPagination || !paginationPageIterator) {
+    const initialRequest = makeRequestEntityPipe(
+      httpClient,
+      request,
+      entityCatalog.getEndpoint(action.endpointType, action.subType),
+      action.endpointGuid,
+      action.externalRequest
+    );
     return initialRequest.pipe(map(response => singleRequestToPaged(response)));
   }
   return paginationPageIterator.mergeAllPagesEntities();
diff --git a/src/frontend/packages/store/src/entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe.ts b/src/frontend/packages/store/src/entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe.ts
index cbc69245b2..aeb8a466f6 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe.ts
@@ -1,7 +1,7 @@
 import { HttpRequest } from '@angular/common/http';
 import { Store } from '@ngrx/store';
 import { combineLatest, Observable, of, range } from 'rxjs';
-import { map, mergeMap, reduce, switchMap } from 'rxjs/operators';
+import { first, map, mergeMap, reduce, switchMap } from 'rxjs/operators';
 
 import { UpdatePaginationMaxedState } from '../../actions/pagination.actions';
 import { AppState } from '../../app-state';
@@ -95,10 +95,9 @@ export class PaginationPageIterator<R = any, E = any> {
   private handleRequests(initialResponse: JetstreamResponse<R>, action: PaginatedAction, totalPages: number, totalResults: number):
     Observable<[JetstreamResponse<R>, JetstreamResponse<R>[]]> {
 
-    const allResults = combineLatest(of(initialResponse), this.getAllOtherPageRequests(totalPages));
-
+    const createAllResults = () => combineLatest(of(initialResponse), this.getAllOtherPageRequests(totalPages));
     if (totalResults === 0 || (this.paginationMaxedState && this.paginationMaxedState.ignoreMaxed)) {
-      return allResults;
+      return createAllResults();
     }
 
     return this.config.maxedStateStartAt(this.store, action).pipe(
@@ -114,7 +113,7 @@ export class PaginationPageIterator<R = any, E = any> {
           );
           return combineLatest([of(initialResponse), of([])]);
         }
-        return allResults;
+        return createAllResults();
       })
     );
   }
@@ -126,7 +125,7 @@ export class PaginationPageIterator<R = any, E = any> {
   public mergeAllPagesEntities(): Observable<PagedJetstreamResponse> {
     const initialRequest = this.addPageToRequest(1);
     return this.makeRequest(initialRequest).pipe(
-      mergeMap(initialResponse => {
+      switchMap(initialResponse => {
         const totalPages = this.config.getTotalPages(initialResponse);
         const totalResults = this.config.getTotalEntities(initialResponse);
         return this.handleRequests(
@@ -135,6 +134,7 @@ export class PaginationPageIterator<R = any, E = any> {
           this.getValidNumber(totalPages),
           this.getValidNumber(totalResults)
         ).pipe(
+          first(),
           map(([initialRequestResponse, othersResponse]) => [initialRequestResponse, ...othersResponse]),
           map(responsePages => this.reducePages(responsePages)),
         );

From ee99293754987eb1ce5cc67384d35ee209b2a8c6 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Fri, 22 May 2020 11:33:08 +0100
Subject: [PATCH 165/176] Fix for autoscaler tab not appearing

---
 .../cf-autoscaler/src/cf-autoscaler.module.ts        |  4 ++++
 .../cf-autoscaler/src/core/autoscaler.module.ts      |  3 ---
 .../core/src/core/extension/extension-service.ts     | 12 +++++++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts
index a32adf024c..e7463eee23 100644
--- a/src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts
+++ b/src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts
@@ -14,6 +14,7 @@ import { AutoscalerModule } from './core/autoscaler.module';
 import { AutoscalerTabExtensionComponent } from './features/autoscaler-tab-extension/autoscaler-tab-extension.component';
 import { generateASEntities } from './store/autoscaler-entity-generator';
 import { AutoscalerEffects } from './store/autoscaler.effects';
+import { ExtensionService } from 'frontend/packages/core/src/core/extension/extension-service';
 
 // FIXME Work out why we need this and remove it.
 const customRoutes: Routes = [
@@ -44,6 +45,9 @@ const customRoutes: Routes = [
     EntityCatalogModule.forFeature(generateASEntities),
     EffectsModule.forFeature([
       AutoscalerEffects
+    ]),
+    ExtensionService.declare([
+      AutoscalerTabExtensionComponent,
     ])
   ],
   declarations: [
diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
index bcde9e7af0..4b47d078da 100644
--- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
+++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
@@ -58,9 +58,6 @@ import { AutoscalerTabExtensionComponent } from '../features/autoscaler-tab-exte
     AutoscalerRoutingModule,
     NgxChartsModule,
     CloudFoundrySharedModule,
-    ExtensionService.declare([
-      AutoscalerTabExtensionComponent,
-    ])
   ],
   declarations: [
     AutoscalerBaseComponent,
diff --git a/src/frontend/packages/core/src/core/extension/extension-service.ts b/src/frontend/packages/core/src/core/extension/extension-service.ts
index f91ee90b0a..82b7a305ff 100644
--- a/src/frontend/packages/core/src/core/extension/extension-service.ts
+++ b/src/frontend/packages/core/src/core/extension/extension-service.ts
@@ -90,6 +90,14 @@ function addExtensionTab(tab: StratosTabType, target: any, props: StratosTabMeta
   if (!extensionMetadata.extensionRoutes[tab]) {
     extensionMetadata.extensionRoutes[tab] = [];
   }
+
+  extensionMetadata.extensionRoutes[tab].push({
+    path: props.link,
+    component: target
+  });
+  extensionMetadata.tabs[tab].push({
+    ...props
+  });  
 }
 
 function addExtensionAction(action: StratosActionType, target: any, props: StratosActionMetadata) {
@@ -105,7 +113,9 @@ function addExtensionAction(action: StratosActionType, target: any, props: Strat
 }
 
 // Injectable Extension Service
-@Injectable()
+@Injectable({
+  providedIn: 'root',
+})
 export class ExtensionService {
 
   public metadata = extensionMetadata;

From 486d2328d3a7722fabf6602b2b806a5c4537e0c0 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 22 May 2020 12:17:52 +0100
Subject: [PATCH 166/176] Changes following review

---
 .../entity-request-pipeline.types.ts          |  3 +-
 .../packages/store/src/entity-service.ts      | 82 ++++++++++++-------
 .../pagination-reducer.helper.ts              |  6 +-
 3 files changed, 58 insertions(+), 33 deletions(-)

diff --git a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts
index 31c9d8ae63..bc71e61254 100644
--- a/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts
+++ b/src/frontend/packages/store/src/entity-request-pipeline/entity-request-pipeline.types.ts
@@ -132,5 +132,6 @@ export type EntitiesInfoHandler = (
   ) => void;
 
 
-export type EntityFetchHandler = <T>(store: Store<GeneralEntityAppState>, action: EntityRequestAction) => (entity: T) => void;
+export type EntityFetch<T = any> = (entity: T) => void;
+export type EntityFetchHandler<T = any> = (store: Store<GeneralEntityAppState>, action: EntityRequestAction) => EntityFetch<T>;
 export type EntitiesFetchHandler = (store: Store<GeneralEntityAppState>, actions: PaginatedAction[]) => () => void;
diff --git a/src/frontend/packages/store/src/entity-service.ts b/src/frontend/packages/store/src/entity-service.ts
index 3cc234e8d4..5d583342dd 100644
--- a/src/frontend/packages/store/src/entity-service.ts
+++ b/src/frontend/packages/store/src/entity-service.ts
@@ -4,10 +4,12 @@ import { filter, first, map, publishReplay, refCount, switchMap, tap, withLatest
 
 import { GeneralEntityAppState } from './app-state';
 import { entityCatalog } from './entity-catalog/entity-catalog';
+import { StratosBaseCatalogEntity } from './entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { EntityActionBuilderEntityConfig } from './entity-catalog/entity-catalog.types';
+import { EntityFetch, EntityFetchHandler } from './entity-request-pipeline/entity-request-pipeline.types';
 import { EntityMonitor } from './monitors/entity-monitor';
 import { RequestInfoState, UpdatingSection } from './reducers/api-request-reducer/types';
-import { getEntityUpdateSections, getUpdateSectionById } from './selectors/api.selectors';
+import { getEntityUpdateSections, getUpdateSectionById, selectEntity } from './selectors/api.selectors';
 import { EntityInfo } from './types/api.types';
 import { EntityRequestAction } from './types/request.types';
 
@@ -21,16 +23,34 @@ export function isEntityBlocked(entityRequestInfo: RequestInfoState) {
     entityRequestInfo.deleting.deleted;
 }
 
-const dispatcherFactory = (store: Store<GeneralEntityAppState>, action: EntityRequestAction) => (updatingKey?: string) => {
-  if (updatingKey) {
-    store.dispatch({
+type ActionDispatcher<T> = (updatingKey?: string, fetchEntity?: boolean) => EntityFetch<T>;
+const dispatcherFactory = <T>(
+  store: Store<GeneralEntityAppState>,
+  action: EntityRequestAction,
+  catalogEntity: StratosBaseCatalogEntity,
+
+): ActionDispatcher<T> =>
+  (updatingKey?: string, fetchEntity?: boolean) => {
+    // If we're dispatching the action in the updating world ensure the key is set
+    const updatedAction = {
       ...action,
       updatingKey
-    });
-  } else {
-    store.dispatch(action);
-  }
-};
+    }
+
+    // Do we have a fetch handler defined by the endpoint/entity?
+    const entityFetchHandler: EntityFetchHandler<T> = catalogEntity.getEntityFetchHandler()
+    const fetchHandler = entityFetchHandler ?
+      entityFetchHandler(store, updatedAction) :
+      (entity: T) => store.dispatch(updatedAction);
+
+    // Fetch handler requires the entity, this may be missing or stale to update if required
+    return fetchEntity ? (entity: T) => {
+      // Entity may be null or stale
+      store.select(selectEntity<T>(catalogEntity.entityKey, action.guid)).pipe(first()).subscribe(entity => fetchHandler(entity))
+      fetchHandler(entity)
+    } : fetchHandler;
+  };
+
 
 /**
  * Designed to be used in a service factory provider
@@ -43,32 +63,32 @@ export class EntityService<T = any> {
     actionOrConfig: EntityRequestAction | EntityActionBuilderEntityConfig,
   ) {
     this.action = this.getAction(actionOrConfig);
-    const entityInfoHandlerBuilder = entityCatalog.getEntity(this.action).getEntityEmitHandler();
-    const actionInfoHandler = entityInfoHandlerBuilder ? entityInfoHandlerBuilder(
+    const catalogEntity = entityCatalog.getEntity(this.action);
+
+    // Setup Fetch Handler
+    this.actionDispatch = dispatcherFactory<T>(store, this.action, catalogEntity);
+
+    // Setup Emit Handler
+    const entityEmitHandlerBuilder = catalogEntity.getEntityEmitHandler();
+    const entityEmitHandler = entityEmitHandlerBuilder ? entityEmitHandlerBuilder(
       this.action, (action) => store.dispatch(action)
     ) : () => { };
-    this.actionDispatch = dispatcherFactory(store, this.action);
+
 
     this.updateEntity = () => {
-      this.actionDispatch(this.refreshKey);
+      this.actionDispatch(this.refreshKey, true)(null);
     };
 
-    const catalogEntity = entityCatalog.getEntity(this.action);
-    const entityFetchHandler = catalogEntity.getEntityFetchHandler();
-    const fetchHandler = entityFetchHandler ?
-      entityFetchHandler(store, this.action) :
-      (entity: T) => this.actionDispatch('');
-
     this.updatingSection$ = entityMonitor.updatingSection$;
     this.isDeletingEntity$ = entityMonitor.isDeletingEntity$;
     this.isFetchingEntity$ = entityMonitor.isFetchingEntity$;
     this.entityObs$ = this.getEntityObservable(
       entityMonitor,
-      fetchHandler,
+      this.actionDispatch(),
     ).pipe(
       publishReplay(1),
       refCount(),
-      tap(actionInfoHandler)
+      tap(entityEmitHandler)
     );
 
     this.waitForEntity$ = this.entityObs$.pipe(
@@ -83,7 +103,7 @@ export class EntityService<T = any> {
 
   refreshKey = 'updating';
 
-  private actionDispatch: (key: string) => void;
+  private actionDispatch: ActionDispatcher<T>;
 
   updateEntity: () => void;
 
@@ -98,15 +118,15 @@ export class EntityService<T = any> {
   updatingSection$: Observable<UpdatingSection>;
   private getEntityObservable = (
     entityMonitor: EntityMonitor<T>,
-    actionDispatch: (entity: T) => void
+    actionDispatch: EntityFetch<T>
   ): Observable<EntityInfo> => {
     const cleanEntityInfo$ = this.getCleanEntityInfoObs(entityMonitor);
 
     return entityMonitor.entityRequest$.pipe(
       withLatestFrom(entityMonitor.entity$),
       tap(([entityRequestInfo, entity]) => {
-        if (actionDispatch && this.shouldCallAction(entityRequestInfo, entity)) {
-          actionDispatch(entity);;
+        if (this.shouldCallAction(entityRequestInfo, entity)) {
+          actionDispatch(entity);
         }
       }),
       first(),
@@ -163,9 +183,13 @@ export class EntityService<T = any> {
    * @param updateKey - The store updating key for the poll
    */
   poll(interval = 10000, updateKey = this.refreshKey) {
-    return this.entityMonitor.poll(interval, () => this.actionDispatch(updateKey), compose(
-      getUpdateSectionById(updateKey),
-      getEntityUpdateSections
-    ));
+    return this.entityMonitor.poll(
+      interval,
+      () => this.actionDispatch(updateKey, true)(null),
+      compose(
+        getUpdateSectionById(updateKey),
+        getEntityUpdateSections
+      )
+    );
   }
 }
diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts
index 68d27c5974..56a5e0bef4 100644
--- a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts
+++ b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts
@@ -192,8 +192,8 @@ function getObservables<T = any>(
     map(([, newPag]) => newPag)
   );
 
-  const entitiesInfoHandlerBuilder = entity.getEntitiesEmitHandler();
-  const actionInfoHandler = entitiesInfoHandlerBuilder ? entitiesInfoHandlerBuilder(
+  const entitiesEmitHandlerBuilder = entity.getEntitiesEmitHandler();
+  const actionEmitHandler = entitiesEmitHandlerBuilder ? entitiesEmitHandlerBuilder(
     paginationAction, (action) => store.dispatch(action)
   ) : () => { };
 
@@ -206,7 +206,7 @@ function getObservables<T = any>(
         filter(([, pagination]) => !!pagination && isPageReady(pagination, isLocal)),
         publishReplay(1),
         refCount(),
-        tap(([, pagination]) => actionInfoHandler(pagination)),
+        tap(([, pagination]) => actionEmitHandler(pagination)),
         switchMap(() => paginationMonitor.currentPage$),
       );
 

From 73c60c334d61183bd7d15b6aa0437168c5d4f366 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Fri, 22 May 2020 14:44:05 +0100
Subject: [PATCH 167/176] Update extensions docs

---
 docs/extensions.md | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/docs/extensions.md b/docs/extensions.md
index 72a5175213..918c25df18 100644
--- a/docs/extensions.md
+++ b/docs/extensions.md
@@ -81,7 +81,20 @@ For example:
 The approach for all of these is the same:
 
 1. Create a new component that will provide the tab contents
-2. Ensure that your component is included in the `EntryComponent` section of your custom module
+2. Ensure that your component is declared with the `ExtensionService` in the imports of your custom module, for example:
+```
+  @NgModule({
+    imports: [
+      ExtensionService.declare([
+        ExtensionComponent,
+      ])
+    ],
+    declarations: [
+      ExtensionComponent
+    ]
+  })
+```
+
 2. Decorate the component with the `StratosTab` decorator, for example:
 
 ```
@@ -122,8 +135,8 @@ An action is a icon button that appears at the top-right of a View. For example:
 The approach for all of these is the same:
 
 1. Create a new component that will provide the contents to show when the action is clicked
-2. Ensure that your component is included in the `EntryComponent` section of your custom module
-2. Decorate the component with the `StratosAction` decorator, for example:
+2. Ensure that your component is declared with the `ExtensionService` in the imports of your custom module
+3. Decorate the component with the `StratosAction` decorator, for example:
 
 ```
 @StratosAction({
@@ -243,16 +256,19 @@ export class ExampleTabExtensionComponent implements OnInit {
 Save the file.
 
 
-### Mark the component as an entry component
+### Mark the component as an extensions component
 
-The last thing we need to do is to mark our Extension component as an entry component.
+The last thing we need to do is to mark our Extension component as an extensions component.
 
-To do this, in a text editor, open the file `src/frontend/app/custom/custom.module.ts` and add the entry components section so it looks like this:
+To do this, in a text editor, open the file `src/frontend/app/custom/custom.module.ts` and add the `ExtensionService.declare` to the import sesion, so it looks like this:
 
 ```
 @NgModule({
   imports: [
-    CommonModule
+    CommonModule,
+    ExtensionService.declare([
+      ExampleTabExtensionComponent,
+    ])    
   ],
   declarations: [ExampleTabExtensionComponent],
   entryComponents: [ExampleTabExtensionComponent]

From 8cd73fd9cf91a263885c4ee487bca508d26b7caf Mon Sep 17 00:00:00 2001
From: Neil MacDougall <neil_macdougall@hotmail.com>
Date: Fri, 22 May 2020 15:00:09 +0100
Subject: [PATCH 168/176] Fix examples to ensure extensions are declared

---
 examples/custom-src/frontend/app/custom/custom.module.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/examples/custom-src/frontend/app/custom/custom.module.ts b/examples/custom-src/frontend/app/custom/custom.module.ts
index bc8da07ae5..279ef8a0b3 100644
--- a/examples/custom-src/frontend/app/custom/custom.module.ts
+++ b/examples/custom-src/frontend/app/custom/custom.module.ts
@@ -8,6 +8,7 @@ import { AcmeLoginComponent } from './acme-login/acme-login.component';
 import { AcmeSupportInfoComponent } from './acme-support-info/acme-support-info.component';
 import { AppActionExtensionComponent } from './app-action-extension/app-action-extension.component';
 import { AppTabExtensionComponent } from './app-tab-extension/app-tab-extension.component';
+import { ExtensionService } from '../core/extension/extension-service';
 
 const AcmeCustomizations: CustomizationsMetadata = {
   copyright: '&copy; 2018 ACME Corp',
@@ -20,6 +21,10 @@ const AcmeCustomizations: CustomizationsMetadata = {
     CoreModule,
     SharedModule,
     MDAppModule,
+    ExtensionService.declare([
+      AppTabExtensionComponent,
+      AppActionExtensionComponent,
+    ])
   ],
   declarations: [
     AcmeLoginComponent,

From fbc7ab03ce5e6c298cc7de3cf9899fa5733b2700 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 26 May 2020 13:27:21 +0100
Subject: [PATCH 169/176] Wrap check for missing env var in forked CI

---
 deploy/ci/travis/job-e2e-before_script.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/deploy/ci/travis/job-e2e-before_script.sh b/deploy/ci/travis/job-e2e-before_script.sh
index d744d27824..f8fc41109e 100755
--- a/deploy/ci/travis/job-e2e-before_script.sh
+++ b/deploy/ci/travis/job-e2e-before_script.sh
@@ -17,8 +17,10 @@ if [ "${MAILCATCHER}" == "true" ]; then
 fi
 
 # Check that the S3 server is available
-curl -k --max-time 20 ${AWS_ENDPOINT}
-if [ $? -ne 0 ]; then
-  echo "Can not contact S3 Server"
-  exit 1
+if [ -n "${AWS_ENDPOINT}" ]; then
+  curl -k --max-time 20 ${AWS_ENDPOINT}
+  if [ $? -ne 0 ]; then
+    echo "Can not contact S3 Server"
+    exit 1
+  fi
 fi
\ No newline at end of file

From 3be83a61a6a143d05653fd4bbf89001b8f153036 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 26 May 2020 15:11:12 +0100
Subject: [PATCH 170/176] Fix load of boolean indicator result when type has
 not yet been set

---
 .../boolean-indicator.component.ts            | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/frontend/packages/core/src/shared/components/boolean-indicator/boolean-indicator.component.ts b/src/frontend/packages/core/src/shared/components/boolean-indicator/boolean-indicator.component.ts
index b5739c317a..4a544a0d27 100644
--- a/src/frontend/packages/core/src/shared/components/boolean-indicator/boolean-indicator.component.ts
+++ b/src/frontend/packages/core/src/shared/components/boolean-indicator/boolean-indicator.component.ts
@@ -39,14 +39,33 @@ export class BooleanIndicatorComponent {
   @Input() inverse = false;
   // Should we use a subtle display - this won't show the No option as danger (typically red)
   @Input() subtle = true;
-  @Input() type: BooleanIndicatorType;
   @Input() showText = true;
 
-  @Input() set isTrue(isTrue: boolean) {
-    const isUnknown = typeof isTrue !== 'boolean';
+  private pType: BooleanIndicatorType;
+  @Input()
+  get type(): BooleanIndicatorType {
+    return this.pType;
+  }
+  set type(type: BooleanIndicatorType) {
+    this.pType = type;
+    this.updateBooleanOutput();
+  }
+
+  private pIsTrue: boolean;
+  @Input()
+  get isTrue(): boolean {
+    return this.pIsTrue;
+  }
+  set isTrue(isTrue: boolean) {
+    this.pIsTrue = isTrue;
+    this.updateBooleanOutput();
+  }
+
+  private updateBooleanOutput() {
+    const isUnknown = typeof this.isTrue !== 'boolean';
     this.booleanOutput = this.getIconTextAndSeverity({
-      isTrue,
-      isUnknown,
+      isTrue: this.isTrue,
+      isUnknown: isUnknown,
       inverse: this.inverse,
       subtle: this.subtle
     });
@@ -74,7 +93,7 @@ export class BooleanIndicatorComponent {
   private getIconTextAndSeverity = (
     { isTrue = false, isUnknown = false, inverse = false, subtle = true }: IBooleanConfig
   ): IBooleanOutput => {
-    if (isUnknown) {
+    if (isUnknown || !this.type) {
       return {
         icon: this.icons.Unknown,
         text: 'Unknown',

From f815d7925eb986c94f20157f7c8f6b46cc0eda97 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 26 May 2020 15:11:26 +0100
Subject: [PATCH 171/176] Remove uneeded imports

---
 .../packages/cf-autoscaler/src/core/autoscaler.module.ts    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
index 4b47d078da..2faabe86af 100644
--- a/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
+++ b/src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts
@@ -10,6 +10,9 @@ import { AutoscalerMetricPageComponent } from '../features/autoscaler-metric-pag
 import {
   AutoscalerScaleHistoryPageComponent,
 } from '../features/autoscaler-scale-history-page/autoscaler-scale-history-page.component';
+import {
+  EditAutoscalerCredentialComponent,
+} from '../features/edit-autoscaler-credential/edit-autoscaler-credential.component';
 import {
   EditAutoscalerPolicyStep1Component,
 } from '../features/edit-autoscaler-policy/edit-autoscaler-policy-step1/edit-autoscaler-policy-step1.component';
@@ -23,7 +26,6 @@ import {
   EditAutoscalerPolicyStep4Component,
 } from '../features/edit-autoscaler-policy/edit-autoscaler-policy-step4/edit-autoscaler-policy-step4.component';
 import { EditAutoscalerPolicyComponent } from '../features/edit-autoscaler-policy/edit-autoscaler-policy.component';
-import { EditAutoscalerCredentialComponent } from '../features/edit-autoscaler-credential/edit-autoscaler-credential.component';
 import { CardAutoscalerDefaultComponent } from '../shared/card-autoscaler-default/card-autoscaler-default.component';
 import {
   TableCellAutoscalerEventChangeIconPipe,
@@ -47,8 +49,6 @@ import {
   AppAutoscalerComboSeriesVerticalComponent,
 } from '../shared/list-types/app-autoscaler-metric-chart/app-autoscaler-metric-chart-card/combo-chart/combo-series-vertical.component';
 import { AutoscalerRoutingModule } from './autoscaler.routing';
-import { ExtensionService } from 'frontend/packages/core/src/core/extension/extension-service';
-import { AutoscalerTabExtensionComponent } from '../features/autoscaler-tab-extension/autoscaler-tab-extension.component';
 
 
 @NgModule({

From fc971613b2cddd0f0648c6017bb909fc9eee36ba Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 28 May 2020 11:36:44 +0100
Subject: [PATCH 172/176] Fix misaligned user button - fixes #4316

---
 .../src/shared/components/page-header/page-header.component.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.scss b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.scss
index fc803d0362..9df4ed9f79 100644
--- a/src/frontend/packages/core/src/shared/components/page-header/page-header.component.scss
+++ b/src/frontend/packages/core/src/shared/components/page-header/page-header.component.scss
@@ -103,6 +103,7 @@ $bottom-index: $top-index - 1;
     padding: 0 10px 0 5px;
   }
   &__menu-button {
+    align-items: center;
     display: flex;
     justify-content: center;
   }

From deaca46f501eaa933d677a8e660c037aac663261 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 29 May 2020 16:50:40 +0100
Subject: [PATCH 173/176] Fixes following merge

---
 .../kubedash-configuration.component.ts       |   2 +-
 .../kubernetes/kubernetes-entity-factory.ts   |   2 +-
 .../kubernetes/kubernetes-entity-generator.ts |   2 +-
 .../kubernetes/store/kubernetes.actions.ts    |   2 +-
 package-lock.json                             | 177 +++++++++++++++---
 package.json                                  |   1 +
 6 files changed, 157 insertions(+), 29 deletions(-)

diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts
index f2e26cfaf7..d7ec27b338 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-dashboard/kubedash-configuration/kubedash-configuration.component.ts
@@ -1,6 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Component, OnDestroy } from '@angular/core';
-import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material';
+import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';
 import { ActivatedRoute } from '@angular/router';
 import { BehaviorSubject, Observable, Subscription } from 'rxjs';
 import { distinctUntilChanged, filter, map } from 'rxjs/operators';
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
index 787e1a6024..1e0aed9df9 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-factory.ts
@@ -1,8 +1,8 @@
 import { Schema, schema } from 'normalizr';
 
-import { metricEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
 import { getAPIResourceGuid } from '../../../../cloud-foundry/src/store/selectors/api.selectors';
 import { EntitySchema } from '../../../../store/src/helpers/entity-schema';
+import { metricEntityType } from '../../base-entity-schemas';
 import { getKubeAPIResourceGuid } from './store/kube.selectors';
 import { KubernetesApp } from './store/kube.types';
 
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
index dce03549e9..8155fd83ce 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes-entity-generator.ts
@@ -1,6 +1,5 @@
 import { Validators } from '@angular/forms';
 
-import { metricEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
 import {
   StratosBaseCatalogEntity,
   StratosCatalogEndpointEntity,
@@ -8,6 +7,7 @@ import {
 } from '../../../../store/src/entity-catalog/entity-catalog-entity/entity-catalog-entity';
 import { StratosEndpointExtensionDefinition } from '../../../../store/src/entity-catalog/entity-catalog.types';
 import { IFavoriteMetadata } from '../../../../store/src/types/user-favorites.types';
+import { metricEntityType } from '../../base-entity-schemas';
 import { EndpointAuthTypeConfig, EndpointType } from '../../core/extension/extension-types';
 import { KubernetesAWSAuthFormComponent } from './auth-forms/kubernetes-aws-auth-form/kubernetes-aws-auth-form.component';
 import {
diff --git a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
index 6d1d44c4ef..e678c983b8 100644
--- a/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
+++ b/custom-src/frontend/app/custom/kubernetes/store/kubernetes.actions.ts
@@ -1,4 +1,4 @@
-import { SortDirection } from '@angular/material';
+import { SortDirection } from '@angular/material/sort';
 import { getActions } from 'frontend/packages/store/src/actions/action.helper';
 import { ApiRequestTypes } from 'frontend/packages/store/src/reducers/api-request-reducer/request-helpers';
 
diff --git a/package-lock.json b/package-lock.json
index 7ca911169a..be0e073481 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -319,7 +319,7 @@
         "@schematics/update": "0.901.5",
         "@yarnpkg/lockfile": "1.1.0",
         "ansi-colors": "4.1.1",
-        "debug": "^4.1.1",
+        "debug": "4.1.1",
         "ini": "1.3.5",
         "inquirer": "7.1.0",
         "npm-package-arg": "8.0.1",
@@ -2352,6 +2352,24 @@
         "d3-transition": "^1.3.2"
       }
     },
+    "@swimlane/ngx-graph": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@swimlane/ngx-graph/-/ngx-graph-7.0.1.tgz",
+      "integrity": "sha512-V85EuEJr61AM3J24slsiUkg6eak6J8IBy5zeD55fywLl3QbndRELRp3l/T2wu/HNpzyHzrC0/qpkEauqcHtRsA==",
+      "requires": {
+        "@swimlane/ngx-charts": "^13.0.1",
+        "d3-dispatch": "^1.0.3",
+        "d3-ease": "^1.0.5",
+        "d3-force": "^1.1.0",
+        "d3-selection": "^1.2.0",
+        "d3-shape": "^1.2.0",
+        "d3-timer": "^1.0.7",
+        "d3-transition": "^1.1.1",
+        "dagre": "^0.8.4",
+        "transformation-matrix": "^1.15.3",
+        "webcola": "^3.3.8"
+      }
+    },
     "@szmarczak/http-timer": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
@@ -2771,9 +2789,9 @@
       }
     },
     "acorn": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
-      "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz",
+      "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==",
       "dev": true
     },
     "acorn-jsx": {
@@ -4490,16 +4508,16 @@
       "dev": true
     },
     "codecov": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.6.1.tgz",
-      "integrity": "sha512-IUJB6WG47nWK7o50etF8jBadxdMw7DmoQg05yIljstXFBGB6clOZsIj6iD4P82T2YaIU3qq+FFu8K9pxgkCJDQ==",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/codecov/-/codecov-3.7.0.tgz",
+      "integrity": "sha512-uIixKofG099NbUDyzRk1HdGtaG8O+PBUAg3wfmjwXw2+ek+PZp+puRvbTohqrVfuudaezivJHFgTtSC3M8MXww==",
       "dev": true,
       "requires": {
-        "argv": "^0.0.2",
-        "ignore-walk": "^3.0.1",
-        "js-yaml": "^3.13.1",
-        "teeny-request": "^3.11.3",
-        "urlgrey": "^0.4.4"
+        "argv": "0.0.2",
+        "ignore-walk": "3.0.3",
+        "js-yaml": "3.13.1",
+        "teeny-request": "6.0.1",
+        "urlgrey": "0.4.4"
       }
     },
     "codelyzer": {
@@ -5425,6 +5443,11 @@
         "d3-transition": "1"
       }
     },
+    "d3-collection": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.7.tgz",
+      "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A=="
+    },
     "d3-color": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.0.tgz",
@@ -5449,6 +5472,17 @@
       "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.6.tgz",
       "integrity": "sha512-SZ/lVU7LRXafqp7XtIcBdxnWl8yyLpgOmzAk0mWBI9gXNzLDx5ybZgnRbH9dN/yY5tzVBqCQ9avltSnqVwessQ=="
     },
+    "d3-force": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.2.1.tgz",
+      "integrity": "sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==",
+      "requires": {
+        "d3-collection": "1",
+        "d3-dispatch": "1",
+        "d3-quadtree": "1",
+        "d3-timer": "1"
+      }
+    },
     "d3-format": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.4.tgz",
@@ -5472,6 +5506,11 @@
       "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz",
       "integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="
     },
+    "d3-quadtree": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.7.tgz",
+      "integrity": "sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA=="
+    },
     "d3-scale": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.1.tgz",
@@ -5528,6 +5567,15 @@
         "d3-timer": "1"
       }
     },
+    "dagre": {
+      "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/dagre/-/dagre-0.8.5.tgz",
+      "integrity": "sha512-/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw==",
+      "requires": {
+        "graphlib": "^2.1.8",
+        "lodash": "^4.17.15"
+      }
+    },
     "damerau-levenshtein": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz",
@@ -6011,7 +6059,7 @@
     },
     "duplexer": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
       "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
       "dev": true
     },
@@ -6705,7 +6753,7 @@
     },
     "event-stream": {
       "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+      "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
       "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
       "dev": true,
       "requires": {
@@ -8492,6 +8540,14 @@
       "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==",
       "dev": true
     },
+    "graphlib": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-2.1.8.tgz",
+      "integrity": "sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==",
+      "requires": {
+        "lodash": "^4.17.15"
+      }
+    },
     "gulp": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
@@ -10927,8 +10983,7 @@
     "lodash": {
       "version": "4.17.15",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-      "dev": true
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
     },
     "lodash-es": {
       "version": "4.17.15",
@@ -11186,7 +11241,7 @@
     },
     "map-stream": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
       "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
       "dev": true
     },
@@ -13524,7 +13579,7 @@
     },
     "pause-stream": {
       "version": "0.0.11",
-      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+      "resolved": "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
       "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
       "dev": true,
       "requires": {
@@ -17040,7 +17095,7 @@
     },
     "split": {
       "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+      "resolved": "http://registry.npmjs.org/split/-/split-0.3.3.tgz",
       "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
       "dev": true,
       "requires": {
@@ -17206,7 +17261,7 @@
     },
     "stream-combiner": {
       "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+      "resolved": "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
       "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
       "dev": true,
       "requires": {
@@ -17223,6 +17278,15 @@
         "stream-shift": "^1.0.0"
       }
     },
+    "stream-events": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz",
+      "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==",
+      "dev": true,
+      "requires": {
+        "stubs": "^3.0.0"
+      }
+    },
     "stream-exhaust": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
@@ -17558,6 +17622,12 @@
       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
       "dev": true
     },
+    "stubs": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
+      "integrity": "sha1-6NK6H6nJBXAwPAMLaQD31fiavls=",
+      "dev": true
+    },
     "style-loader": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.1.3.tgz",
@@ -17866,14 +17936,71 @@
       }
     },
     "teeny-request": {
-      "version": "3.11.3",
-      "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-3.11.3.tgz",
-      "integrity": "sha512-CKncqSF7sH6p4rzCgkb/z/Pcos5efl0DmolzvlqRQUNcpRIruOhY9+T1FsIlyEbfWd7MsFpodROOwHYh2BaXzw==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-6.0.1.tgz",
+      "integrity": "sha512-TAK0c9a00ELOqLrZ49cFxvPVogMUFaWY8dUsQc/0CuQPGF+BOxOQzXfE413BAk2kLomwNplvdtMpeaeGWmoc2g==",
       "dev": true,
       "requires": {
-        "https-proxy-agent": "^2.2.1",
+        "http-proxy-agent": "^4.0.0",
+        "https-proxy-agent": "^4.0.0",
         "node-fetch": "^2.2.0",
+        "stream-events": "^1.0.5",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.0.tgz",
+          "integrity": "sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw==",
+          "dev": true,
+          "requires": {
+            "debug": "4"
+          }
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "http-proxy-agent": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+          "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+          "dev": true,
+          "requires": {
+            "@tootallnate/once": "1",
+            "agent-base": "6",
+            "debug": "4"
+          }
+        },
+        "https-proxy-agent": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz",
+          "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==",
+          "dev": true,
+          "requires": {
+            "agent-base": "5",
+            "debug": "4"
+          },
+          "dependencies": {
+            "agent-base": {
+              "version": "5.1.1",
+              "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz",
+              "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==",
+              "dev": true
+            }
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "temp-fs": {
@@ -17887,7 +18014,7 @@
       "dependencies": {
         "rimraf": {
           "version": "2.5.4",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
+          "resolved": "http://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
           "integrity": "sha1-loAAk8vxoMhr2VtGJUZ1NcKd+gQ=",
           "dev": true,
           "requires": {
diff --git a/package.json b/package.json
index cf5ac3967c..408199839e 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,7 @@
     "@ngrx/store": "^9.1.2",
     "@ngrx/store-devtools": "^9.1.2",
     "@swimlane/ngx-charts": "^13.0.3",
+    "@swimlane/ngx-graph": "^7.0.1",
     "@types/moment-timezone": "^0.5.13",
     "@types/marked": "^0.7.4",
     "angular2-virtual-scroll": "^0.4.16",

From 23d690a7ffa9d7a79a76c9e5d7566fd3ea47078b Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 29 May 2020 17:05:15 +0100
Subject: [PATCH 174/176] More fixes

---
 custom-src/frontend/app/custom/custom-routing.module.ts       | 4 ++--
 .../custom/helm/create-release/create-release.component.ts    | 2 +-
 .../list-types/monocular-repository-list-config.service.ts    | 2 +-
 .../chart-details-usage/chart-details-usage.component.ts      | 3 ++-
 .../app/custom/helm/monocular/charts/charts.component.ts      | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/custom-src/frontend/app/custom/custom-routing.module.ts b/custom-src/frontend/app/custom/custom-routing.module.ts
index 3a69e8d96e..59ddebd3b8 100644
--- a/custom-src/frontend/app/custom/custom-routing.module.ts
+++ b/custom-src/frontend/app/custom/custom-routing.module.ts
@@ -21,7 +21,7 @@ const customRoutes: Routes = [
   },
   {
     path: 'kubernetes',
-    loadChildren: './kubernetes/kubernetes.module#KubernetesModule',
+    loadChildren: () => import('./kubernetes/kubernetes.module').then(m => m.KubernetesModule),
     data: {
       stratosNavigation: {
         text: 'Kubernetes',
@@ -34,7 +34,7 @@ const customRoutes: Routes = [
   },
   {
     path: 'monocular',
-    loadChildren: './helm/helm.module#HelmModule',
+    loadChildren: () => import('./helm/helm.module').then(m => m.HelmModule),
     data: {
       reuseRoute: true,
       stratosNavigation: {
diff --git a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts b/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts
index b21b1e1910..709dfdc928 100644
--- a/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts
+++ b/custom-src/frontend/app/custom/helm/create-release/create-release.component.ts
@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
-import { MatTextareaAutosize } from '@angular/material';
+import { MatTextareaAutosize } from '@angular/material/input';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { PaginationMonitorFactory } from 'frontend/packages/store/src/monitors/pagination-monitor.factory';
diff --git a/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-config.service.ts b/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-config.service.ts
index de28838e2b..84b0b50c70 100644
--- a/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-config.service.ts
+++ b/custom-src/frontend/app/custom/helm/list-types/monocular-repository-list-config.service.ts
@@ -1,6 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable, NgZone } from '@angular/core';
-import { MatSnackBar } from '@angular/material';
+import { MatSnackBar } from '@angular/material/snack-bar';
 import { ActivatedRoute } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { UnregisterEndpoint } from 'frontend/packages/store/src/actions/endpoint.actions';
diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts
index 87321f55e1..c8c3aa91cf 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details-usage/chart-details-usage.component.ts
@@ -1,5 +1,6 @@
 import { Component, Input, OnInit, ViewEncapsulation } from '@angular/core';
-import { MatIconRegistry, MatSnackBar } from '@angular/material';
+import { MatIconRegistry } from '@angular/material/icon';
+import { MatSnackBar } from '@angular/material/snack-bar';
 import { DomSanitizer } from '@angular/platform-browser';
 
 import { EndpointsService } from '../../../../../core/endpoints.service';
diff --git a/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.ts b/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.ts
index 711ee0d5ab..aaffa19cf0 100644
--- a/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { MatIconRegistry } from '@angular/material';
+import { MatIconRegistry } from '@angular/material/icon';
 import { DomSanitizer } from '@angular/platform-browser';
 import { ActivatedRoute, Params, Router } from '@angular/router';
 

From 968d4973ea6a94b9d41ac222743507ad8c4112ea Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 1 Jun 2020 11:22:13 +0100
Subject: [PATCH 175/176] Fix unit tests

---
 .../chart-details.component.spec.ts           | 61 -------------------
 .../monocular/charts/charts.component.spec.ts | 26 +++++---
 .../kubernetes/kubernetes.testing.module.ts   | 16 -----
 .../core/src/core/endpoints.service.ts        |  5 +-
 4 files changed, 21 insertions(+), 87 deletions(-)

diff --git a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.spec.ts
index 6b6940f420..d670ba09c3 100644
--- a/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/chart-details/chart-details.component.spec.ts
@@ -1,5 +1,3 @@
-import 'hammerjs';
-
 import { HttpClient, HttpClientModule } from '@angular/common/http';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { BrowserModule } from '@angular/platform-browser';
@@ -24,60 +22,6 @@ import { ChartDetailsUsageComponent } from './chart-details-usage/chart-details-
 import { ChartDetailsVersionsComponent } from './chart-details-versions/chart-details-versions.component';
 import { ChartDetailsComponent } from './chart-details.component';
 
-/* tslint:disable:no-unused-variable */
-// import { Angulartics2Module } from 'angulartics2';
-// import { ClipboardModule } from 'ngx-clipboard';
-
-// import { HeaderBarComponent } from '../header-bar/header-bar.component';
-// import { TruncatePipe } from '../shared/pipes/truncate.pipe';
-// import { SeoService } from '../shared/services/seo.service';
-// Shared
-// Components
-// Stub
-const mockData = {
-  data: {
-    attributes: {
-      description: 'Testing the chart',
-      home: 'helm.sh',
-      keywords: ['artifactory'],
-      maintainers: [
-        {
-          email: 'test@example.com',
-          name: 'Test'
-        }
-      ],
-      name: 'test',
-      repo: 'incubator',
-      sources: ['https://github.com/']
-    },
-    id: 'incubator/test',
-    relationships: {
-      latestChartVersion: {
-        data: {
-          created: '2017-02-13T04:33:57.218083521Z',
-          digest:
-            'eba0c51d4bc5b88d84f83d8b2ba0c5e5a3aad8bc19875598198bdbb0b675f683',
-          icons: [
-            {
-              name: '160x160-fit',
-              path: '/assets/incubator/test/4.16.0/logo-160x160-fit.png'
-            }
-          ],
-          readme: '/assets/incubator/test/4.16.0/README.md',
-          urls: [
-            'https://kubernetes-charts-incubator.storage.googleapis.com/test-4.16.0.tgz'
-          ],
-          version: '4.16.0'
-        },
-        links: {
-          self: '/v1/charts/incubator/test/versions/4.16.0'
-        }
-      }
-    },
-    type: 'chart'
-  }
-};
-
 describe('ChartDetailsComponent', () => {
   let component: ChartDetailsComponent;
   let fixture: ComponentFixture<ChartDetailsComponent>;
@@ -86,9 +30,7 @@ describe('ChartDetailsComponent', () => {
     async(() => {
       TestBed.configureTestingModule({
         imports: [
-          // ClipboardModule,
           BrowserModule,
-          // Angulartics2Module,
           RouterTestingModule,
           HttpClientModule,
           ...BaseTestModulesNoShared
@@ -101,9 +43,7 @@ describe('ChartDetailsComponent', () => {
           ChartDetailsUsageComponent,
           LoaderComponent,
           PanelComponent,
-          // HeaderBarComponent,
           ChartItemComponent,
-          // TruncatePipe,
           ListItemComponent,
           EntitySummaryTitleComponent
         ],
@@ -111,7 +51,6 @@ describe('ChartDetailsComponent', () => {
           HttpClient,
           { provide: ChartsService, useValue: new MockChartService() },
           { provide: ConfigService, useValue: { appName: 'appName' } },
-          // { provide: SeoService },
           { provide: MenuService },
           PaginationMonitorFactory,
         ]
diff --git a/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.spec.ts b/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.spec.ts
index fda675c9e7..d634d2c8de 100644
--- a/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.spec.ts
+++ b/custom-src/frontend/app/custom/helm/monocular/charts/charts.component.spec.ts
@@ -2,7 +2,9 @@ import { HttpClient } from '@angular/common/http';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { of } from 'rxjs';
 
 import { createBasicStoreModule } from '../../../../../../store/testing/public-api';
 import { LoggerService } from '../../../../core/logger.service';
@@ -17,14 +19,13 @@ import { MenuService } from '../shared/services/menu.service';
 import { ReposService } from '../shared/services/repos.service';
 import { ChartsComponent } from './charts.component';
 
-// import { HeaderBarComponent } from '../header-bar/header-bar.component';
-// import { SeoService } from '../shared/services/seo.service';
-describe('Component: Charts', () => {
+describe('ChartsComponent', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [
         HttpClientTestingModule,
-        createBasicStoreModule()
+        createBasicStoreModule(),
+        RouterTestingModule
       ],
       declarations: [
         ChartsComponent,
@@ -32,16 +33,23 @@ describe('Component: Charts', () => {
         ChartItemComponent,
         LoaderComponent,
         PanelComponent,
-        // HeaderBarComponent
       ],
       providers: [
         HttpClient,
         ConfigService,
         MenuService,
         { provide: ChartsService, useValue: new MockChartService() },
-        // { provide: SeoService },
-        { provide: ActivatedRoute },
-        { provide: Router },
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              params: {},
+              queryParams: {}
+            },
+            queryParams: of({}),
+            params: of({})
+          }
+        },
         ReposService,
         LoggerService
       ],
diff --git a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts b/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
index 05ecca6666..c87f6368fc 100644
--- a/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
+++ b/custom-src/frontend/app/custom/kubernetes/kubernetes.testing.module.ts
@@ -38,22 +38,6 @@ export const KubernetesBaseTestModules = [
   RouterTestingModule,
   CoreModule,
   createBasicStoreModule(),
-  // createBasicStoreModule({
-  //   auth: {
-  //     error: false,
-  //     errorResponse: {},
-  //     loggedIn: false,
-  //     loggingIn: false,
-  //     sessionData: {
-  //       config: {},
-  //       plugins: null,
-  //       sessionExpiresOn: 0,
-  //       valid: false,
-  //     },
-  //     user: null,
-  //     verifying: false,
-  //   },
-  // }),
   NoopAnimationsModule,
   HttpClientModule,
   SharedModule,
diff --git a/src/frontend/packages/core/src/core/endpoints.service.ts b/src/frontend/packages/core/src/core/endpoints.service.ts
index 842330f087..7160d50652 100644
--- a/src/frontend/packages/core/src/core/endpoints.service.ts
+++ b/src/frontend/packages/core/src/core/endpoints.service.ts
@@ -138,8 +138,11 @@ export class EndpointsService implements CanActivate {
       map(ep => {
         return Object.values(ep)
           .filter(endpoint => {
+            if (endpoint.cnsi_type !== type) {
+              return;
+            }
             const epType = entityCatalog.getEndpoint(endpoint.cnsi_type, endpoint.sub_type).definition;
-            return endpoint.cnsi_type === type && (epType.unConnectable || endpoint.connectionStatus === 'connected');
+            return epType.unConnectable || endpoint.connectionStatus === 'connected';
           });
       })
     );

From 1cacb5acc9bd74827207795189ef0f81a37f53da Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Thu, 11 Jun 2020 11:03:22 +0100
Subject: [PATCH 176/176] Fix istanbul cli error (replace with nyc) ```
 require(...).create is not a function TypeError: require(...).create is not a
 function     at Object.<anonymous>
 (/home/travis/build/SUSE/stratos/node_modules/istanbul/lib/report/html.js:7:40)
 ```

---
 angular.json                 |  60 ++-
 build/combine-coverage.js    |  10 -
 build/karma.conf.creator.js  |   8 +-
 build/karma.test.reporter.js |  85 ++--
 package-lock.json            | 827 ++++++++++++++++++++++++++++++++---
 package.json                 |   5 +-
 src/tsconfig.spec.json       |   2 +-
 7 files changed, 840 insertions(+), 157 deletions(-)
 delete mode 100644 build/combine-coverage.js

diff --git a/angular.json b/angular.json
index 12d5d6f658..75d6a32748 100644
--- a/angular.json
+++ b/angular.json
@@ -36,12 +36,10 @@
           },
           "configurations": {
             "production": {
-              "budgets": [
-                {
-                  "type": "anyComponentStyle",
-                  "maximumWarning": "6kb"
-                }
-              ],
+              "budgets": [{
+                "type": "anyComponentStyle",
+                "maximumWarning": "6kb"
+              }],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
@@ -51,12 +49,10 @@
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
-              "fileReplacements": [
-                {
-                  "replace": "src/frontend/packages/core/src/environments/environment.ts",
-                  "with": "src/frontend/packages/core/src/environments/environment.prod.ts"
-                }
-              ]
+              "fileReplacements": [{
+                "replace": "src/frontend/packages/core/src/environments/environment.ts",
+                "with": "src/frontend/packages/core/src/environments/environment.prod.ts"
+              }]
             }
           }
         },
@@ -132,18 +128,14 @@
           },
           "configurations": {
             "production": {
-              "budgets": [
-                {
-                  "type": "anyComponentStyle",
-                  "maximumWarning": "6kb"
-                }
-              ],
-              "fileReplacements": [
-                {
-                  "replace": "src/frontend/packages/core/src/environments/environment.ts",
-                  "with": "src/frontend/packages/core/src/environments/environment.prod.ts"
-                }
-              ],
+              "budgets": [{
+                "type": "anyComponentStyle",
+                "maximumWarning": "6kb"
+              }],
+              "fileReplacements": [{
+                "replace": "src/frontend/packages/core/src/environments/environment.ts",
+                "with": "src/frontend/packages/core/src/environments/environment.prod.ts"
+              }],
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
@@ -229,13 +221,13 @@
           "options": {
             "tsConfig": "src/frontend/packages/store/tsconfig.lib.json",
             "project": "src/frontend/packages/store/ng-package.json"
-          }
-        ,          "configurations": {
+          },
+          "configurations": {
             "production": {
               "tsConfig": "src/frontend/packages/store/tsconfig.lib.prod.json"
             }
           }
-},
+        },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
@@ -272,13 +264,13 @@
           "options": {
             "tsConfig": "src/frontend/packages/cloud-foundry/tsconfig.lib.json",
             "project": "src/frontend/packages/cloud-foundry/ng-package.json"
-          }
-        ,          "configurations": {
+          },
+          "configurations": {
             "production": {
               "tsConfig": "src/frontend/packages/cloud-foundry/tsconfig.lib.prod.json"
             }
           }
-},
+        },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
@@ -315,13 +307,13 @@
           "options": {
             "tsConfig": "src/frontend/packages/cf-autoscaler/tsconfig.lib.json",
             "project": "src/frontend/packages/cf-autoscaler/ng-package.json"
-          }
-        ,          "configurations": {
+          },
+          "configurations": {
             "production": {
               "tsConfig": "src/frontend/packages/cf-autoscaler/tsconfig.lib.prod.json"
             }
           }
-},
+        },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
@@ -361,4 +353,4 @@
   "cli": {
     "_defaultCollection": "@nrwl/angular"
   }
-}
\ No newline at end of file
+}
diff --git a/build/combine-coverage.js b/build/combine-coverage.js
deleted file mode 100644
index e7cb729cbc..0000000000
--- a/build/combine-coverage.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const createReporter = require('istanbul-api').createReporter;
-const istanbulCoverage = require('istanbul-lib-coverage');
-const coverage = require('../coverage/coverage-final.json');
-
-const map = istanbulCoverage.createCoverageMap();
-Object.keys(coverage).forEach(filename => map.addFileCoverage(coverage[filename]));
-
-const reporter = createReporter();
-reporter.addAll(['html', 'lcovonly', 'json']);
-reporter.write(map);
diff --git a/build/karma.conf.creator.js b/build/karma.conf.creator.js
index f530d5e903..d516e0fceb 100644
--- a/build/karma.conf.creator.js
+++ b/build/karma.conf.creator.js
@@ -27,7 +27,13 @@ module.exports = function (project) {
       coverageIstanbulReporter: {
         dir: path.join(repoRoot, 'coverage', project),
         reports: ['html', 'lcovonly', 'json'],
-        fixWebpackSourcePaths: true
+        fixWebpackSourcePaths: true,
+        'report-config': {
+          json: {
+            // Collate all coverage-final files into a single dir for nyc to combine (it can't pick them out from `coverage`)
+            file: path.join('..', 'nyc', project + '-coverage-final.json')
+          }
+        },
       },
       reporters: ['spec', 'kjhtml', 'stratos'],
       specReporter: {
diff --git a/build/karma.test.reporter.js b/build/karma.test.reporter.js
index edf859c2f7..cdb20c8b9d 100644
--- a/build/karma.test.reporter.js
+++ b/build/karma.test.reporter.js
@@ -1,4 +1,3 @@
-
 (function () {
   'use strict';
 
@@ -75,7 +74,7 @@
         fs.unlinkSync(this.summaryFile);
       }
 
-      const all =  this.runningTotals;
+      const all = this.runningTotals;
 
       this.writeSummaryFile(`${this.bold}${this.cyan}================================================================================${this.reset}`);
       this.writeSummaryFile(`${this.bold}${this.cyan}Test Summary${this.reset}`);
@@ -106,47 +105,47 @@
 
       try {
 
-      this.writeFile(`${this.bold}${this.cyan}Test results for package ${this.bluebg} ${process.env.NG_TEST_SUITE} ${this.reset}`);
-      this.writeFile(`Total    : ${this.bold}${this.cyan}${this.total}${this.reset}`)
-      this.writeFile(`Passed   : ${this.bold}${this.cyan}${passed}${this.reset}`)
-      this.writeFile(`Failed   : ${this.bold}${this.red}${this.failed.length}${this.reset}`)
-      this.writeFile(`Skipped  : ${this.bold}${this.yellow}${this.skipped}${this.reset}`)
-
-      if (this.failed.length === 0) {
-        fs.appendFileSync(this.file, 'All tests passed\n')
-      } else {
-        this.writeFile('Test failures:');
-        this.failed.forEach(f => {
-          this.writeFile(`${this.red}${this.bold} - ${f.fullName}${this.reset}`);
-          const logs = f.log || [];
-          logs.forEach(l => fs.appendFileSync(this.file, `${this.grey}    ${l}${this.reset}`));
-          // Add empty line
-          this.writeFile('');
-        });
-      }
-
-      // Update running totals JSON
-      this.runningTotals.total += this.total;
-      this.runningTotals.passed += passed;
-      this.runningTotals.failed += this.failed.length;
-      this.runningTotals.skipped += this.skipped;
-      fs.writeFileSync(this.jsonFile, JSON.stringify(this.runningTotals));
-
-      this.generateSummary();
-
-      // Write exit code
-      let newExitCode = this.exitCode;
-      if (result.exitCode > 0) {
-        newExitCode = result.exitCode
-      }
-
-      fs.writeFileSync(this.exitCodeFile, newExitCode.toString());
-
-      // Dump the summary for this test suite
-      var contents = fs.readFileSync(this.file, 'utf8');
-      console.log(contents);
-
-      } catch(e) {
+        this.writeFile(`${this.bold}${this.cyan}Test results for package ${this.bluebg} ${process.env.NG_TEST_SUITE} ${this.reset}`);
+        this.writeFile(`Total    : ${this.bold}${this.cyan}${this.total}${this.reset}`)
+        this.writeFile(`Passed   : ${this.bold}${this.cyan}${passed}${this.reset}`)
+        this.writeFile(`Failed   : ${this.bold}${this.red}${this.failed.length}${this.reset}`)
+        this.writeFile(`Skipped  : ${this.bold}${this.yellow}${this.skipped}${this.reset}`)
+
+        if (this.failed.length === 0) {
+          fs.appendFileSync(this.file, 'All tests passed\n')
+        } else {
+          this.writeFile('Test failures:');
+          this.failed.forEach(f => {
+            this.writeFile(`${this.red}${this.bold} - ${f.fullName}${this.reset}`);
+            const logs = f.log || [];
+            logs.forEach(l => fs.appendFileSync(this.file, `${this.grey}    ${l}${this.reset}`));
+            // Add empty line
+            this.writeFile('');
+          });
+        }
+
+        // Update running totals JSON
+        this.runningTotals.total += this.total;
+        this.runningTotals.passed += passed;
+        this.runningTotals.failed += this.failed.length;
+        this.runningTotals.skipped += this.skipped;
+        fs.writeFileSync(this.jsonFile, JSON.stringify(this.runningTotals));
+
+        this.generateSummary();
+
+        // Write exit code
+        let newExitCode = this.exitCode;
+        if (result.exitCode > 0) {
+          newExitCode = result.exitCode
+        }
+
+        fs.writeFileSync(this.exitCodeFile, newExitCode.toString());
+
+        // Dump the summary for this test suite
+        var contents = fs.readFileSync(this.file, 'utf8');
+        console.log(contents);
+
+      } catch (e) {
         console.log('ERROR while reporting test result');
         console.log(e);
       }
diff --git a/package-lock.json b/package-lock.json
index 3df7a6f7a8..0fa8335d5d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2801,6 +2801,76 @@
         "lodash-es": "^4.17.15"
       }
     },
+    "@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "resolve-from": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+          "dev": true
+        }
+      }
+    },
     "@istanbuljs/schema": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
@@ -3079,8 +3149,7 @@
           "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
           "requires": {
             "map-age-cleaner": "^0.1.1",
-            "mimic-fn": "^2.0.0",
-            "p-is-promise": "^2.0.0"
+            "mimic-fn": "^2.0.0"
           }
         },
         "micromatch": {
@@ -3655,9 +3724,9 @@
       }
     },
     "abbrev": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
+      "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
       "dev": true
     },
     "accepts": {
@@ -5152,6 +5221,35 @@
         }
       }
     },
+    "caching-transform": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz",
+      "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==",
+      "dev": true,
+      "requires": {
+        "hasha": "^5.0.0",
+        "make-dir": "^3.0.0",
+        "package-hash": "^4.0.0",
+        "write-file-atomic": "^3.0.0"
+      },
+      "dependencies": {
+        "make-dir": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+          "dev": true,
+          "requires": {
+            "semver": "^6.0.0"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        }
+      }
+    },
     "caller-callsite": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
@@ -7322,6 +7420,12 @@
         "next-tick": "^1.0.0"
       }
     },
+    "es6-error": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
+      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
+      "dev": true
+    },
     "es6-iterator": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
@@ -8105,6 +8209,7 @@
       "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==",
       "dev": true,
       "requires": {
+        "loader-utils": "^2.0.0",
         "schema-utils": "^2.6.5"
       },
       "dependencies": {
@@ -8120,22 +8225,15 @@
             "uri-js": "^4.2.2"
           }
         },
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
         "loader-utils": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
           "requires": {
             "big.js": "^5.2.2",
             "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
+            "json5": "^2.1.2"
           }
         },
         "schema-utils": {
@@ -8458,6 +8556,59 @@
         "for-in": "^1.0.1"
       }
     },
+    "foreground-child": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz",
+      "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^3.0.2"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+          "dev": true
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -8512,6 +8663,12 @@
         "readable-stream": "^2.0.0"
       }
     },
+    "fromentries": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.2.0.tgz",
+      "integrity": "sha512-33X7H/wdfO99GdRLLgkjUrD4geAFdq/Uv0kl3HD4da6HDixd2GUg8Mw7dahLCV9r/EARkmtYBB6Tch4EEokFTQ==",
+      "dev": true
+    },
     "front-matter": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/front-matter/-/front-matter-2.1.2.tgz",
@@ -8648,6 +8805,12 @@
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true
     },
+    "get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true
+    },
     "get-stream": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -9190,13 +9353,24 @@
       "dev": true
     },
     "handlebars": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
-      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
+      "version": "4.7.6",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz",
+      "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==",
       "dev": true,
       "requires": {
-        "default-gateway": "^4.2.0",
-        "ipaddr.js": "^1.9.0"
+        "minimist": "^1.2.5",
+        "neo-async": "^2.6.0",
+        "source-map": "^0.6.1",
+        "uglify-js": "^3.1.4",
+        "wordwrap": "^1.0.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
       }
     },
     "har-schema": {
@@ -9386,6 +9560,30 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
+    "hasha": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz",
+      "integrity": "sha512-2W+jKdQbAdSIrggA8Q35Br8qKadTrqCTC8+XZvBWepKDK6m9XkX6Iz1a2yh2KP01kzAR/dpuMeUnocoLYDcskw==",
+      "dev": true,
+      "requires": {
+        "is-stream": "^2.0.0",
+        "type-fest": "^0.8.0"
+      },
+      "dependencies": {
+        "is-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+          "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+          "dev": true
+        },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "dev": true
+        }
+      }
+    },
     "hex-color-regex": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
@@ -10365,17 +10563,6 @@
         "wordwrap": "^1.0.0"
       },
       "dependencies": {
-        "abbrev": {
-          "version": "1.0.9",
-          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-          "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
-          "dev": true
-        },
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
-        },
         "async": {
           "version": "1.5.2",
           "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
@@ -10413,25 +10600,6 @@
           "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
           "dev": true
         },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "strip-ansi": "^6.0.0"
-          },
-          "dependencies": {
-            "strip-ansi": {
-              "version": "6.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-              "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-              "requires": {
-                "ansi-regex": "^5.0.0"
-              }
-            }
-          }
-        },
         "supports-color": {
           "version": "3.2.3",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
@@ -10439,13 +10607,6 @@
           "dev": true,
           "requires": {
             "has-flag": "^1.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "4.1.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
-            }
           }
         }
       }
@@ -10544,6 +10705,88 @@
         }
       }
     },
+    "istanbul-lib-processinfo": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz",
+      "integrity": "sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw==",
+      "dev": true,
+      "requires": {
+        "archy": "^1.0.0",
+        "cross-spawn": "^7.0.0",
+        "istanbul-lib-coverage": "^3.0.0-alpha.1",
+        "make-dir": "^3.0.0",
+        "p-map": "^3.0.0",
+        "rimraf": "^3.0.0",
+        "uuid": "^3.3.3"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "make-dir": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+          "dev": true,
+          "requires": {
+            "semver": "^6.0.0"
+          }
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+          "dev": true
+        },
+        "rimraf": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
     "istanbul-lib-report": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz",
@@ -11668,6 +11911,12 @@
       "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
       "dev": true
     },
+    "lodash.flattendeep": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
+      "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
+      "dev": true
+    },
     "lodash.kebabcase": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
@@ -13005,9 +13254,18 @@
         }
       }
     },
-    "node-releases": {
-      "version": "1.1.58",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz",
+    "node-preload": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz",
+      "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==",
+      "dev": true,
+      "requires": {
+        "process-on-spawn": "^1.0.0"
+      }
+    },
+    "node-releases": {
+      "version": "1.1.58",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz",
       "integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==",
       "dev": true
     },
@@ -13297,6 +13555,327 @@
       "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
       "dev": true
     },
+    "nyc": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz",
+      "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==",
+      "dev": true,
+      "requires": {
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "caching-transform": "^4.0.0",
+        "convert-source-map": "^1.7.0",
+        "decamelize": "^1.2.0",
+        "find-cache-dir": "^3.2.0",
+        "find-up": "^4.1.0",
+        "foreground-child": "^2.0.0",
+        "get-package-type": "^0.1.0",
+        "glob": "^7.1.6",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-hook": "^3.0.0",
+        "istanbul-lib-instrument": "^4.0.0",
+        "istanbul-lib-processinfo": "^2.0.2",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.0.2",
+        "make-dir": "^3.0.0",
+        "node-preload": "^0.2.1",
+        "p-map": "^3.0.0",
+        "process-on-spawn": "^1.0.0",
+        "resolve-from": "^5.0.0",
+        "rimraf": "^3.0.0",
+        "signal-exit": "^3.0.2",
+        "spawn-wrap": "^2.0.0",
+        "test-exclude": "^6.0.0",
+        "yargs": "^15.0.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "dev": true,
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
+        "append-transform": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz",
+          "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==",
+          "dev": true,
+          "requires": {
+            "default-require-extensions": "^3.0.0"
+          }
+        },
+        "cliui": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^6.2.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "default-require-extensions": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz",
+          "integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==",
+          "dev": true,
+          "requires": {
+            "strip-bom": "^4.0.0"
+          }
+        },
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "istanbul-lib-hook": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz",
+          "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==",
+          "dev": true,
+          "requires": {
+            "append-transform": "^2.0.0"
+          }
+        },
+        "istanbul-lib-report": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+          "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+          "dev": true,
+          "requires": {
+            "istanbul-lib-coverage": "^3.0.0",
+            "make-dir": "^3.0.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "istanbul-lib-source-maps": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
+          "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
+          "dev": true,
+          "requires": {
+            "debug": "^4.1.1",
+            "istanbul-lib-coverage": "^3.0.0",
+            "source-map": "^0.6.1"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "make-dir": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+          "dev": true,
+          "requires": {
+            "semver": "^6.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "resolve-from": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+          "dev": true
+        },
+        "rimraf": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+          "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+          "dev": true
+        },
+        "wrap-ansi": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "yargs": {
+          "version": "15.3.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
+          "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
+          "dev": true,
+          "requires": {
+            "cliui": "^6.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^4.1.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^4.2.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^18.1.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "18.1.3",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
     "oauth-sign": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
@@ -13990,6 +14569,18 @@
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
       "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
     },
+    "package-hash": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz",
+      "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.15",
+        "hasha": "^5.0.0",
+        "lodash.flattendeep": "^4.4.0",
+        "release-zalgo": "^1.0.0"
+      }
+    },
     "package-json": {
       "version": "6.5.0",
       "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
@@ -14973,7 +15564,8 @@
       "dev": true,
       "requires": {
         "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0"
+        "postcss": "^7.0.0",
+        "postcss-value-parser": "^3.0.0"
       },
       "dependencies": {
         "find-up": {
@@ -15013,6 +15605,12 @@
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
           "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+        },
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
         }
       }
     },
@@ -15228,6 +15826,15 @@
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
       "dev": true
     },
+    "process-on-spawn": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz",
+      "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==",
+      "dev": true,
+      "requires": {
+        "fromentries": "^1.2.0"
+      }
+    },
     "progress": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
@@ -16070,6 +16677,15 @@
         }
       }
     },
+    "release-zalgo": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz",
+      "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=",
+      "dev": true,
+      "requires": {
+        "es6-error": "^4.0.1"
+      }
+    },
     "remove-bom-buffer": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
@@ -17702,9 +18318,9 @@
       }
     },
     "source-map-support": {
-      "version": "0.5.16",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
-      "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
       "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
@@ -17736,6 +18352,55 @@
       "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
       "dev": true
     },
+    "spawn-wrap": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz",
+      "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==",
+      "dev": true,
+      "requires": {
+        "foreground-child": "^2.0.0",
+        "is-windows": "^1.0.2",
+        "make-dir": "^3.0.0",
+        "rimraf": "^3.0.0",
+        "signal-exit": "^3.0.2",
+        "which": "^2.0.1"
+      },
+      "dependencies": {
+        "make-dir": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+          "dev": true,
+          "requires": {
+            "semver": "^6.0.0"
+          }
+        },
+        "rimraf": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
     "spdx-correct": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
@@ -18922,6 +19587,17 @@
         }
       }
     },
+    "test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "requires": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      }
+    },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -19250,6 +19926,25 @@
       "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==",
       "dev": true
     },
+    "uglify-js": {
+      "version": "3.9.4",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.4.tgz",
+      "integrity": "sha512-8RZBJq5smLOa7KslsNsVcSH+KOXf1uDU8yqLeNuVKwmT0T3FA0ZoXlinQfRad7SDcbZZRZE4ov+2v71EnxNyCA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "commander": "~2.20.3"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
     "ultron": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
diff --git a/package.json b/package.json
index 405f67bcbf..8e5d3381a3 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "test-frontend:store": "NG_TEST_SUITE=store ng test store --code-coverage --watch=false",
     "test-frontend:cloud-foundry": "NG_TEST_SUITE=cloud-foundry ng test cloud-foundry --code-coverage --watch=false",
     "test-frontend:cf-autoscaler": "NG_TEST_SUITE=autoscaler ng test cf-autoscaler --code-coverage --watch=false",
-    "posttest": "istanbul report json && node build/combine-coverage.js",
+    "posttest": "nyc report --reporter=html --reporter=lcovonly --reporter=json --tempDir=coverage/nyc",
     "codecov": "codecov -f coverage/coverage-final.json",
     "lint": "ng lint --format stylish",
     "sass-lint": "sass-lint -v",
@@ -135,6 +135,7 @@
     "mktemp": "^1.0.0",
     "ng-packagr": "^9.1.1",
     "npm-run-all": "^4.1.5",
+    "nyc": "^15.1.0",
     "protractor": "^5.4.3",
     "protractor-console": "^3.0.0",
     "ps-node": "^0.1.6",
@@ -145,7 +146,7 @@
     "rxjs-tslint": "^0.1.8",
     "sass-lint": "^1.12.1",
     "stratos-protractor-reporter": "^1.2.3",
-    "ts-node": "~8.8.2",
+    "ts-node": "^8.8.2",
     "tslint": "~6.1.1",
     "typescript": "3.8.3"
   }
diff --git a/src/tsconfig.spec.json b/src/tsconfig.spec.json
index b757b63ed4..4b6895009b 100644
--- a/src/tsconfig.spec.json
+++ b/src/tsconfig.spec.json
@@ -8,4 +8,4 @@
       "node"
     ]
   },
-}
\ No newline at end of file
+}